Permalink
Browse files

Merge branch 'make_fix' of https://github.com/danheberden/jquery into…

… danheberden-make_fix
  • Loading branch information...
2 parents 3dbd600 + 74dfc7f commit 35875acd03cc95eace495f887511f2b61f223f7a @jeresig jeresig committed Jan 20, 2011
Showing with 6 additions and 3 deletions.
  1. +4 −1 Makefile
  2. +2 −2 build/uglify.js
View
@@ -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}
View
@@ -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);

0 comments on commit 35875ac

Please sign in to comment.