Permalink
Browse files

Merge branch 'master' of https://github.com/firebug/firebug into issu…

…e6079
  • Loading branch information...
2 parents 19d54c7 + 74e98b7 commit cdeb2de760a051f849b0c454448e0c0bf11102f1 @SebastianZ SebastianZ committed Jun 2, 2013
Showing 926 changed files with 41,213 additions and 114,823 deletions.
View
@@ -21,6 +21,7 @@
/extension/build/
/extension/release/
/tests/FBTest/release/
+/trace/FBTrace/release/
*.graphml
/extension/bz-locale/
View
@@ -184,7 +184,7 @@ function prepareBuild()
copy({
source: "install.rdf.tpl.xml",
dest: buildDir + "/install.rdf"
- })
+ });
}
// ********************************************************************************************* //
@@ -414,7 +414,7 @@ function clean()
function zip(filename, directory, callback)
{
// Create final XPI package.
- var zip;
+ var zip = null;
if (os.platform() === "win32")
{
var params = "a -tzip " + filename + " " + directory + "/*";
@@ -426,10 +426,17 @@ function zip(filename, directory, callback)
//zip = spawn("zip", [ "-r", __dirname + "/" + xpiFileName, release ]);
}
- zip.on("exit", function()
+ if (zip)
+ {
+ zip.on("exit", function()
+ {
+ callback();
+ });
+ }
+ else
{
callback();
- });
+ }
}
// ********************************************************************************************* //
@@ -27,6 +27,7 @@ locale firebug es-AR locale/es-AR/
locale firebug es-CL locale/es-CL/
locale firebug es-ES locale/es-ES/
locale firebug et-EE locale/et-EE/
+locale firebug eu locale/eu/
locale firebug fa locale/fa/
locale firebug fa-IR locale/fa-IR/
locale firebug fi-FI locale/fi-FI/
@@ -20,6 +20,7 @@ locale firebug es locale/es/
locale firebug en-US locale/en-US/
locale firebug es-AR locale/es-AR/
locale firebug es-ES locale/es-ES/
+locale firebug eu locale/eu/
locale firebug fa locale/fa/
locale firebug fr locale/fr/
locale firebug he locale/he/
@@ -47,10 +48,10 @@ locale firebug zh-CN locale/zh-CN/
locale firebug zh-TW locale/zh-TW/
# Support for Mac
-override chrome://firebug/skin/debugger.css chrome://firebug/skin/mac/debugger.css os=Darwin
-override chrome://firebug-os/skin/firebug.css chrome://firebug/skin/mac/firebug.css os=Darwin
-override chrome://firebug-os/skin/panel.css chrome://firebug/skin/mac/panel.css os=Darwin
-override chrome://firebug-os/skin/window.css chrome://firebug/skin/mac/window.css os=Darwin
+override chrome://firebug-os/skin/debugger.css chrome://firebug/skin/mac/debugger.css os=Darwin
+override chrome://firebug-os/skin/firebug.css chrome://firebug/skin/mac/firebug.css os=Darwin
+override chrome://firebug-os/skin/panel.css chrome://firebug/skin/mac/panel.css os=Darwin
+override chrome://firebug-os/skin/window.css chrome://firebug/skin/mac/window.css os=Darwin
# Support for Linux
override chrome://firebug-os/skin/firebug.css chrome://firebug/skin/linux/firebug.css os=Linux
Oops, something went wrong.

0 comments on commit cdeb2de

Please sign in to comment.