diff options
| author | awgy <josh.varner@gmail.com> | 2011-02-12 03:35:41 +0100 |
|---|---|---|
| committer | Anton M <obhvsbypqghgc@gmail.com> | 2011-02-12 13:53:04 +0100 |
| commit | 2862f589db08b92c7b1f78fa961aff7354027c0b (patch) | |
| tree | 3b767a5b24876098b63e264b52ccaf7c75aa2728 | |
| parent | 3548ffaee244af2bd5e28e91ebfaa995adab93a7 (diff) | |
| download | jquery-2862f589db08b92c7b1f78fa961aff7354027c0b.tar.gz jquery-2862f589db08b92c7b1f78fa961aff7354027c0b.zip | |
Remove sed from post-build code, due to portability issues between GNU and BSD versions.
Follow up to ba43d37394b6018779d9a668c548e11579cd424a which apparently
didn't fix the problem completly on Mac OS X.
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | build/post-compile.js | 7 |
2 files changed, 10 insertions, 2 deletions
@@ -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\ @@ -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 diff --git a/build/post-compile.js b/build/post-compile.js new file mode 100644 index 000000000..4bcafe814 --- /dev/null +++ b/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;")); |