Revert uglify.js to original and handle build changes in make file

diff --git a/Makefile b/Makefile
index 2e6848d4948126b8eb337cec82dcf487b9463b3e..c708db5a1455adfe4ee75dfc3bdba5bef1fbff41 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,10 @@ min: ${JQ_MIN}
 
 ${JQ_MIN}: ${JQ}
        @@echo "Building" ${JQ_MIN}
-       @@${COMPILER} ${JQ} > ${JQ_MIN}
+       @@${COMPILER} ${JQ} > ${JQ_MIN}.tmp
+       @@echo ";" >> ${JQ_MIN}.tmp
+       @@sed 's/\*\/(/*\/ʩ(/' ${JQ_MIN}.tmp | tr "ʩ" "\n" > ${JQ_MIN}
+       @@rm -rf ${JQ_MIN}.tmp
 
 clean:
        @@echo "Removing Distribution directory:" ${DIST_DIR}

diff --git a/build/uglify.js b/build/uglify.js
index cba0586ffabefc7c4ede8ffddf259c1047e8df60..943ddd806620a59842cdf250e6b94ed10d403be1 100644 (file)
--- a/build/uglify.js
+++ b/build/uglify.js
@@ -143,7 +143,7 @@ function show_copyright(comments) {
                 if (c.type == "comment1") {
                         ret += "//" + c.value + "\n";
                 } else {
-                        ret += "/*" + c.value + "*/\n";
+                        ret += "/*" + c.value + "*/";
                 }
         }
         return ret;
@@ -181,7 +181,7 @@ function squeeze_it(code) {
                         });
                 if (options.ast)
                         return sys.inspect(ast, null, null);
-                result += time_it("generate", function(){ return pro.gen_code(ast, options.beautify && options.beautify_options) }) + ";";
+                result += time_it("generate", function(){ return pro.gen_code(ast, options.beautify && options.beautify_options) });
                 return result;
         } catch(ex) {
                 sys.debug(ex.stack);