git.asbjorn.biz / jquery.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 0307071)
Made a bunch of changes to the build system.
authorJohn Resig <jeresig@gmail.com>
Sun, 13 Aug 2006 18:58:58 +0000 (18:58 +0000)
committerJohn Resig <jeresig@gmail.com>
Sun, 13 Aug 2006 18:58:58 +0000 (18:58 +0000)
Makefile patch | blob | history
build/build/build.js [moved from build/build.js with 100% similarity] patch | blob | history
build/docs/docs.js [moved from build/docs.js with 100% similarity] patch | blob | history
build/docs/style/docs.xsl patch | blob | history
build/lite.js [new file with mode: 0644] patch | blob

diff --git a/Makefile b/Makefile
index f949811..5b2cae8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,10 @@
 SRC_DIR = src
 BUILD_DIR = build
 
-DOCS_DIR = docs
-DIST_DIR = dist
+PREFIX = .
+DOCS_DIR = ${PREFIX}/docs
+TEST_DIR = ${PREFIX}/test
+DIST_DIR = ${PREFIX}/dist
 
 MODULES = jquery event fx ajax
 JQ = ${DIST_DIR}/jquery.js
@@ -10,44 +12,63 @@ JQ_LITE = ${DIST_DIR}/jquery.lite.js
 JQ_PACK = ${DIST_DIR}/jquery.pack.js
 
 all: jquery lite pack docs
+       @@echo "jQuery build complete."
 
 ${DIST_DIR}:
-       mkdir -p ${DIST_DIR}
+       @@mkdir -p ${DIST_DIR}
 
 jquery: ${DIST_DIR} ${JQ}
 
 ${JQ}:
-       @@echo "Building" ${JQ};
+       @@echo "Building" ${JQ}
 
        @@for f in ${MODULES}; do \
-               echo "Adding module:" $$f;\
+               echo " - Adding module:" $$f;\
                cat ${SRC_DIR}/$$f/$$f.js >> ${JQ};\
        done
 
-       @@echo ${JQ} "built.";
+       @@echo ${JQ} "built."
+       @@echo
 
 lite: ${JQ_LITE}
 
-${JQ_LITE}: ${JQ}
-       @@echo "Building" ${JQ_LITE};
-       java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/lite.js ${JQ} ${JQ_LITE}
-       @@echo ${JQ_LITE} "built.";
+${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}
+       @@echo ${JQ_LITE} "built."
+       @@echo
 
 pack: ${JQ_PACK}
 
-${JQ_PACK}: ${JQ}
-       @@echo "Building" ${JQ_PACK};
-       java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/build.js ${JQ} ${JQ_PACK}
-       @@echo ${JQ_PACK} "built.";
+${JQ_PACK}: jquery
+       @@echo "Building" ${JQ_PACK}
+       @@echo " - Compressing using Packer"
+       @@java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/build.js ${JQ} ${JQ_PACK}
+       @@echo ${JQ_PACK} "built."
+       @@echo
 
-test:
+test: ${JQ}
 
 docs: ${JQ}
-       @@echo "Building Documentation";
-       java -jar ${BUILD_DIR}/js.jar ${BUILD_DIR}/docs.js ${JQ} ${DOCS_DIR}
-       @@echo "Documentation built.";
+       @@echo "Building Documentation"
+
+       @@echo " - Making Documentation Directory:" ${DOCS_DIR}
+       @@mkdir -p ${DOCS_DIR}
+       @@mkdir -p ${DOCS_DIR}/data
+
+       @@echo " - Copying over script files."
+       @@cp -R ${BUILD_DIR}/docs/js ${DOCS_DIR}/js
+
+       @@echo " - Copying over style files."
+       @@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}
+
+       @@echo "Documentation built."
+       @@echo
 
 clean:
-       rm -rf ${DIST_DIR}
-       rm -f ${DOCS_DIR}/index.xml
-       rm -f ${DOCS_DIR}/data/*
+       @@rm -rf ${DIST_DIR}
+       @@rm -rf ${DOCS_DIR}
diff --git a/build/build.js b/build/build/build.js
similarity index 100%
rename from build/build.js
rename to build/build/build.js
diff --git a/build/docs.js b/build/docs/docs.js
similarity index 100%
rename from build/docs.js
rename to build/docs/docs.js
diff --git a/build/docs/style/docs.xsl b/build/docs/style/docs.xsl
index 98b3ede..4adac37 100644 (file)
--- a/build/docs/style/docs.xsl
+++ b/build/docs/style/docs.xsl
@@ -6,10 +6,10 @@
 <head>
        <title>jQuery Docs - API</title>
        <link rel="stylesheet" href="style/style.css"/>
-       <script src="../jquery-svn.js"></script>
+       <script src="../dist/jquery-svn.js"></script>
        <script src="js/tooltip.js"></script>
        <script src="js/pager.js"></script>
-       <script src="js/doc2.js"></script>
+       <script src="js/doc.js"></script>
 </head>
 <body>
        <h1>jQuery Docs - API</h1>
diff --git a/build/lite.js b/build/lite.js
new file mode 100644 (file)
index 0000000..bcfb096
--- /dev/null
+++ b/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 );
JQuery