From 2862f589db08b92c7b1f78fa961aff7354027c0b Mon Sep 17 00:00:00 2001 From: awgy Date: Sat, 12 Feb 2011 03:35:41 +0100 Subject: [PATCH 1/1] 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. --- Makefile | 5 +++-- build/post-compile.js | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 build/post-compile.js diff --git a/Makefile b/Makefile index 48a885d..bf41bcc 100644 --- a/Makefile +++ b/Makefile @@ -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 0000000..4bcafe8 --- /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;")); -- 1.7.10.4