From: John Resig <jeresig@gmail.com>
Date: Sun, 13 Aug 2006 19:08:39 +0000 (+0000)
Subject: More fixes to the build system.
X-Git-Tag: 1.0~49
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9bdfc671fc19486f9cc1ca306bec2acd80ad77fc;p=jquery.git

More fixes to the build system.
---

diff --git a/Makefile b/Makefile
index 5b2cae8d9..0a65e8a91 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ lite: ${JQ_LITE}
 ${JQ_LITE}: jquery
 	@@echo "Building" ${JQ_LITE}
 	@@echo " - Removing ScriptDoc from" ${JQ}
-	@@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/lite.js ${JQ} ${JQ_LITE}
+	@@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/build/lite.js ${JQ} ${JQ_LITE}
 	@@echo ${JQ_LITE} "built."
 	@@echo
 
@@ -44,7 +44,7 @@ pack: ${JQ_PACK}
 ${JQ_PACK}: jquery
 	@@echo "Building" ${JQ_PACK}
 	@@echo " - Compressing using Packer"
-	@@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/build.js ${JQ} ${JQ_PACK}
+	@@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/build/pack.js ${JQ} ${JQ_PACK}
 	@@echo ${JQ_PACK} "built."
 	@@echo
 
@@ -64,7 +64,7 @@ docs: ${JQ}
 	@@cp -R ${BUILD_DIR}/docs/style ${DOCS_DIR}/style
 
 	@@echo " - Extracting ScriptDoc from" ${JQ}
-	@@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/docs.js ${JQ} ${DOCS_DIR}
+	@@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/docs/docs.js ${JQ} ${DOCS_DIR}
 
 	@@echo "Documentation built."
 	@@echo
diff --git a/build/build/lite.js b/build/build/lite.js
new file mode 100644
index 000000000..bcfb096b1
--- /dev/null
+++ b/build/build/lite.js
@@ -0,0 +1,6 @@
+load("build/js/writeFile.js");
+
+var blockMatch = /\s*\/\*\*\s*((.|\n)*?)\n*\*\/\s*/g;
+var f = readFile(arguments[0]).replace( blockMatch, "" );
+
+writeFile( arguments[1], f );
diff --git a/build/lite.js b/build/lite.js
deleted file mode 100644
index bcfb096b1..000000000
--- a/build/lite.js
+++ /dev/null
@@ -1,6 +0,0 @@
-load("build/js/writeFile.js");
-
-var blockMatch = /\s*\/\*\*\s*((.|\n)*?)\n*\*\/\s*/g;
-var f = readFile(arguments[0]).replace( blockMatch, "" );
-
-writeFile( arguments[1], f );