diff --git a/.gitignore b/.gitignore index 93b59b8d..bb97907e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ /files/ -/out/ diff --git a/build/build.sh b/build/build.sh index 8e64d205..1a556dc5 100755 --- a/build/build.sh +++ b/build/build.sh @@ -25,11 +25,11 @@ else MODE=$1 fi -# Create the out folder if it does not exist yet. -if [ ! -d ../out/ ] +# Create the dist folder if it does not exist yet. +if [ ! -d ../dist/ ] then - mkdir ../out/ + mkdir ../dist/ fi -./preprocess.sh ../src/paper.js ../out/paper.js "-DBROWSER" $MODE -./preprocess.sh ../src/paper.js ../out/paper-server.js "-DSERVER" $MODE +./preprocess.sh ../src/paper.js ../dist/paper.js "-DBROWSER" $MODE +./preprocess.sh ../src/paper.js ../dist/paper-server.js "-DSERVER" $MODE diff --git a/build/docs.sh b/build/docs.sh index 07658730..93f690e3 100755 --- a/build/docs.sh +++ b/build/docs.sh @@ -26,4 +26,4 @@ cd jsdoc-toolkit java -jar jsrun.jar app/run.js -c=conf/$MODE.conf -D="renderMode:$MODE" cd .. -./preprocess.sh ../src/paper.js ../out/docs/resources/js/paper.js "-DBROWSER" stripped \ No newline at end of file +./preprocess.sh ../src/paper.js ../dist/docs/resources/js/paper.js "-DBROWSER" stripped \ No newline at end of file diff --git a/build/jsdoc-toolkit/conf/docs.conf b/build/jsdoc-toolkit/conf/docs.conf index c677f6ac..6dcd1fc1 100644 --- a/build/jsdoc-toolkit/conf/docs.conf +++ b/build/jsdoc-toolkit/conf/docs.conf @@ -23,7 +23,7 @@ p: false, // use this directory as the output directory - d: "../../out/docs", + d: "../../dist/docs", // use this template t: "templates/jsdoc" diff --git a/build/jsdoc-toolkit/conf/templates.conf b/build/jsdoc-toolkit/conf/templates.conf index 14841ebc..301e9130 100644 --- a/build/jsdoc-toolkit/conf/templates.conf +++ b/build/jsdoc-toolkit/conf/templates.conf @@ -23,7 +23,7 @@ p: false, // use this directory as the output directory - d: "../../out/templates", + d: "../../dist/templates", // use this template t: "templates/jsdoc" diff --git a/build/jsdoc-toolkit/templates/jsdoc/publish.js b/build/jsdoc-toolkit/templates/jsdoc/publish.js index 9ad95d7a..c70e79b2 100644 --- a/build/jsdoc-toolkit/templates/jsdoc/publish.js +++ b/build/jsdoc-toolkit/templates/jsdoc/publish.js @@ -9,7 +9,7 @@ function publish(symbolSet) { var templates = renderMode == 'templates'; var extension = '.html'; var templateDir = JSDOC.opt.t || SYS.pwd + '../templates/jsdoc/'; - var outDir = JSDOC.opt.d || SYS.pwd + '../out/jsdoc/'; + var outDir = JSDOC.opt.d || SYS.pwd + '../dist/docs/'; publish.conf = { // trailing slash expected for dirs // Use no extensions in links for templates diff --git a/build/load.sh b/build/load.sh index 2475c915..b965b52c 100755 --- a/build/load.sh +++ b/build/load.sh @@ -16,4 +16,4 @@ echo "// Paper.js loader for development, as produced by the build/load.sh script var root = '../../'; document.write('');" > ../out/paper.js; \ No newline at end of file + + 'src/load.js\">');" > ../dist/paper.js; \ No newline at end of file diff --git a/examples/Animated/AnimatedStar.html b/examples/Animated/AnimatedStar.html index ee965f1e..f46bd572 100644 --- a/examples/Animated/AnimatedStar.html +++ b/examples/Animated/AnimatedStar.html @@ -4,7 +4,7 @@