Merged tlrobinson/master

280north · Aug 26, 2009 · 77e4359 · 77e4359
2 parents 7feb0f7 + d6d8dc4
commit 77e4359
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 8 deletions.
diff --git a/catalog.json b/catalog.json
@@ -223,7 +223,7 @@
             "location": "http://github.com/kriskowal/creolejs/zipball/master"
         },
         "browserjs": {
-            "name": "browser",
+            "name": "browserjs",
             "dependencies": [
                 "narwhal"
             ],
@@ -501,11 +501,54 @@
         },
         "activejs": {
             "name": "activejs",
+            "jars": [
+                "jars/mysql-connector-java-5.1.8-bin.jar"
+            ],
             "author": "Aptana Inc.",
             "description": "The Cross Platform JavaScript MVC, http://activejs.org/",
             "githubName": "activejs",
             "type": "zip",
-            "location": "http://github.com/tlrobinson/activejs/zipball/master"
+            "location": "http://github.com/tlrobinson/activejs/zipball/package"
+        },
+        "speller": {
+            "name": "speller",
+            "description": "A JavaScript spell-checker",
+            "author": "Panagiotis Astithas",
+            "keywords": [
+                "spell-checker",
+                "spelling",
+                "corrector"
+            ],
+            "githubName": "speller",
+            "type": "zip",
+            "location": "http://github.com/past/speller/zipball/master"
+        },
+        "objj": {
+            "name": "objj",
+            "dependencies": [
+                "narwhal",
+                "jack",
+                "browserjs"
+            ],
+            "lib": "lib-js",
+            "preload": [
+                "objj/loader"
+            ],
+            "description": "Objective-J and Cappuccino tools",
+            "keywords": [
+                "Objective-J",
+                "Cappuccino"
+            ],
+            "author": "280 North (http://280north.com/)",
+            "contributors": [
+                "Francisco Tolmasky (http://tolmasky.com/)",
+                "Ross Boucher (http://rossboucher.com/)",
+                "Tom Robinson (http://tlrobinson.net/)",
+                "Numerous others (http://contributors.cappuccino.org/)"
+            ],
+            "githubName": "cappuccino",
+            "type": "zip",
+            "location": "http://github.com/280north/cappuccino/zipball/package"
         }
     }
 }
diff --git a/engines/rhino/lib/binary-engine.js b/engines/rhino/lib/binary-engine.js
@@ -79,5 +79,6 @@ function wrapper(that) {
     return obj;
 }
 
-exports.ByteStringWrapper = wrapper;
-exports.ByteArrayWrapper = wrapper;
+// FIXME: disabling these because it broke several tests. figure out why.
+//exports.ByteStringWrapper = wrapper;
+//exports.ByteArrayWrapper = wrapper;
diff --git a/lib/narwhal/tusk/create-catalog.js b/lib/narwhal/tusk/create-catalog.js
@@ -36,11 +36,12 @@ parser.action(function (options) {
 
             } else if (source.type == "github") {
 
-                var githubName = source.name || name;
+                var githubName = source.name || name,
+                    githubRef = source.ref || "master";
                 if (!source.user)
                     throw new Error("package source " + util.enquote(name) + " did not have a github user name");
                 var project = source.user + '/' + githubName;
-                var url = "http://github.com/" + project + "/raw/master/package.json";
+                var url = "http://github.com/" + project + "/raw/" + githubRef + "/package.json";
 
                 // download package.json if not already provided
                 if (!info) {
@@ -60,7 +61,7 @@ parser.action(function (options) {
 
                 info.githubName = githubName;
                 info.type = "zip";
-                info.location = 'http://github.com/' + source.user + '/' + githubName + '/zipball/master';
+                info.location = 'http://github.com/' + source.user + '/' + githubName + '/zipball/' + githubRef;
 
             } else {
                 throw new Error(

diff --git a/sources.json b/sources.json
@@ -123,11 +123,18 @@
         },
         "activejs": {
             "type": "github",
-            "user": "tlrobinson"
+            "user": "tlrobinson",
+            "ref": "package"
         },
         "speller": {
             "type": "github",
             "user": "past"
+        },
+        "objj": {
+            "type": "github",
+            "name": "cappuccino",
+            "user": "280north",
+            "ref": "package"
         }
     }
 }