Switch from 'cfx' to 'jpm' for packaging (#203)

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "addon-sdk"]
-	path = addon-sdk
-	url = https://github.com/mozilla/addon-sdk.git

.travis.yml

@@ -23,14 +23,15 @@ addons:
 
 install:
   - pip install --user mozdownload
+  - npm install jpm --global
 
 before_script:
   - sh -e /etc/init.d/xvfb start
   - mozdownload $MOZDOWNLOADPARAMS
   - tar -xf *firefox*.tar.bz2
 
 script:
-  - ant test -Dbinary=`pwd`/firefox/firefox
+  - ant test -Dbinary=$PWD/firefox/firefox
 
 notifications:
   irc:

build.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<project name="memchaser" default="dev">
+<project name="memchaser@quality.mozilla.org" default="dev">
   <property name="xpi.dir" value="./xpi"/>
 
   <tstamp>
@@ -56,27 +56,24 @@
   <target name="build">
     <property name="build.filename" value="extension/${ant.project.name}.xpi"/>
     <delete file="${build.filename}"/>
-    <exec executable="/bin/sh" dir="addon-sdk" failonerror="true">
-      <arg value="-c"/>
-      <arg value=". bin/activate;cd ../extension;cfx ${cfx.verbose} xpi"/>
+    <exec executable="jpm" dir="extension" failonerror="true">
+      <arg line="${cfx.verbose} xpi"/>
     </exec>
     <echo>build.filename: ${build.filename}</echo>
   </target>
 
   <target name="run">
-    <exec executable="/bin/sh" dir="addon-sdk" failonerror="true">
-      <arg value="-c"/>
-      <arg value=". bin/activate;cd ../extension;cfx ${cfx.verbose} run ${cfx.binary}"/>
+    <exec executable="jpm" dir="extension" failonerror="true">
+      <arg line="${cfx.binary} run"/>
     </exec>
   </target>
 
   <target name="test">
-    <exec executable="/bin/sh"
-          dir="addon-sdk"
+    <exec executable="jpm"
+          dir="extension"
           resultproperty="test.result"
           failonerror="true">
-      <arg value="-c"/>
-      <arg value=". bin/activate;cd ../extension;cfx --verbose test ${cfx.binary}"/>
+      <arg line="--verbose ${cfx.binary} test"/>
     </exec>
     <fail message="Tests failed!">
       <condition>

extension/lib/main.js → extension/index.js

@@ -14,10 +14,10 @@ const tabs = require("sdk/tabs");
 const { ToggleButton } = require('sdk/ui/button/toggle');
 const { Toolbar } = require("sdk/ui/toolbar");
 
-const config = require("./config");
-const garbage_collector = require("./garbage-collector");
-const { Logger } = require("./logger");
-var memory = require("./memory");
+const config = require("lib/config");
+const garbage_collector = require("lib/garbage-collector");
+const { Logger } = require("lib/logger");
+var memory = require("lib/memory");
 
 Cu.import('resource://gre/modules/Services.jsm');
 

extension/package.json

@@ -10,7 +10,7 @@
         "Uchida Taishi"
     ],
     "version": "0.7",
-    "fullName": "MemChaser",
+    "title": "MemChaser",
     "id": "memchaser@quality.mozilla.org",
     "description": "Chasing garbage collection and memory usage",
     "preferences": [{

extension/test/test-garbage-collector.js

@@ -1,9 +1,9 @@
 const prefs = require("sdk/preferences/service");
 
-const config = require("./config");
+const config = require("../lib/config");
 
 exports.test_javascript_memory_pref_enabled = function (test) {
   // We have to require the garbage collector to initialize the module
-  var gc = require("./garbage-collector");
+  var gc = require("../lib/garbage-collector");
   test.assert(prefs.get(gc.reporter.pref_gc_notifications));
 }

extension/test/test-logger.js

@@ -1,6 +1,6 @@
 const { Cc, Ci, Cu } = require("chrome");
 
-const { Logger } = require("./logger");
+const { Logger } = require("../lib/logger");
 
 Cu.import('resource://gre/modules/Services.jsm');