Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove sed from post-build code, due to portability issues between GN…
…U and BSD versions.

Follow up to ba43d37 which apparently
didn't fix the problem completly on Mac OS X.
  • Loading branch information
joshvarner authored and jitter committed Feb 12, 2011
1 parent 3548ffa commit 2862f58
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Makefile
Expand Up @@ -9,6 +9,7 @@ DIST_DIR = ${PREFIX}/dist

JS_ENGINE ?= `which node nodejs`
COMPILER = ${JS_ENGINE} ${BUILD_DIR}/uglify.js --unsafe
POST_COMPILER = ${JS_ENGINE} ${BUILD_DIR}/post-compile.js

BASE_FILES = ${SRC_DIR}/core.js\
${SRC_DIR}/support.js\
Expand Down Expand Up @@ -106,8 +107,8 @@ ${JQ_MIN}: jquery
@@if test ! -z ${JS_ENGINE}; then \
echo "Minifying jQuery" ${JQ_MIN}; \
${COMPILER} ${JQ} > ${JQ_MIN}.tmp; \
sed '$ s#^\( \*/\)\(.\+\)#\1\n\2;#' ${JQ_MIN}.tmp > ${JQ_MIN}; \
rm -rf ${JQ_MIN}.tmp; \
${POST_COMPILER} ${JQ_MIN}.tmp > ${JQ_MIN}; \
rm -f ${JQ_MIN}.tmp; \
else \
echo "You must have NodeJS installed in order to minify jQuery."; \
fi
Expand Down
7 changes: 7 additions & 0 deletions build/post-compile.js
@@ -0,0 +1,7 @@
#!/usr/bin/env node

var print = require("sys").print,
src = require("fs").readFileSync(process.argv[2], "utf8");

// Previously done in sed but reimplemented here due to portability issues
print(src.replace(/^(\s*\*\/)(.+)/m, "$1\n$2;"));

0 comments on commit 2862f58

Please sign in to comment.