Makefile cleanups for build and dist directories

svaarala · svaarala · commit 2593fe41b995 · 2020-06-30T00:47:10.000+03:00
diff --git a/.github/workflows/build-workflow.yaml b/.github/workflows/build-workflow.yaml
@@ -12,11 +12,11 @@ jobs:
           sudo apt install build-essential make python python-yaml bc git
       - name: Build
         run: |
-          make duk dukd duk-g++ duk-clang duk-fuzzilli
+          make build/duk build/dukd build/duk-g++ build/duk-clang build/duk-fuzzilli
       - name: Test
         run: |
-          ./duk -e "print(Duktape.env); print('Hello world!');"
-          ./duk dist-files/mandel.js
+          build/duk -e "print(Duktape.env); print('Hello world!');"
+          build/duk dist-files/mandel.js
   build_duk_macos:
     name: Duk macOS 10.15
     runs-on: macos-10.15
@@ -28,11 +28,11 @@ jobs:
           python2 -m pip install PyYAML
       - name: Build
         run: |
-          make duk
+          make build/duk
       - name: Test
         run: |
-          ./duk -e "print(Duktape.env); print('Hello world!');"
-          ./duk dist-files/mandel.js
+          build/duk -e "print(Duktape.env); print('Hello world!');"
+          build/duk dist-files/mandel.js
   build_duk_windows:
     name: Duk VS2019
     runs-on: windows-2019
diff --git a/.github/workflows/test-workflow.yaml b/.github/workflows/test-workflow.yaml
@@ -12,7 +12,7 @@ jobs:
           sudo apt install build-essential make python python-yaml bc git nodejs
       - name: Build
         run: |
-          make duk
+          make build/duk
       - name: Ecmatest
         run: |
           make ecmatest
@@ -27,7 +27,7 @@ jobs:
           sudo apt install build-essential make python python-yaml bc git nodejs
       - name: Build
         run: |
-          make duk
+          make build/duk
       - name: Apitest
         run: |
           make apitest
diff --git a/.gitignore b/.gitignore
@@ -8,31 +8,8 @@ ms_print.*
 /*.gcda
 /*.su
 /_*
-/duk.*
 /duk
-/dukd
-/dukd.*
-/duk-clang
-/duk-fuzzilli
-/duk-sanitize-clang
-/duk-g++
-/duk-size
-/duk-perf
-/duk-perf.*
-/duk-perf-*
-/duk-pgo
-/duk-pgo.*
-/duk-pgo-*
-/duk-perf-pgo
-/duk-perf-pgo.*
-/duk-perf-pgo-*
-/duk-low
-/duk-low-norefc
-/duk-low-rom
-/libduktape.*
 /runtests/package-lock.json
-/docker-input.zip
-/docker-output.zip
 /docker/*/gitconfig
 /docker/*/prepare_repo.sh
 /deps/
@@ -42,11 +19,8 @@ ms_print.*
 /tmp/
 /site/
 /stuff/
-/duktape-releases/
 /doc/*.pdf
 /runtests/node_modules/
-/dukweb.js
-/dukweb.wasm
 /debugger/jquery-ui-1.11.2.zip
 /debugger/jquery-ui-1.11.2/
 /debugger/node_modules/
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
@@ -137,8 +137,8 @@ These are also **intended for Linux only**.  For example:
     # Build Docker images.  This takes a long time.
     $ make docker-images
 
-    # Equivalent of 'make dist', but runs inside a container.
-    $ make docker-dist-src-wd
+    # Equivalent of 'make dist-source', but runs inside a container.
+    $ make docker-dist-source-wd
 
     # Run a shell with /work/duktape containing a disposable master snapshot.
     $ make docker-shell-master
diff --git a/appveyor.yml b/appveyor.yml
@@ -25,6 +25,7 @@ build_script:
   # Make dist, ensure it works on Windows too.
 
   - cmd: cd C:\projects\duktape
+  - cmd: mkdir dist
   - cmd: python util\dist.py
 
   # Prep a few variants of headers and sources.
diff --git a/doc/release-checklist.rst b/doc/release-checklist.rst
@@ -209,7 +209,7 @@ Checklist for ordinary releases
     push it to the public repo until the tag is certain not to move anymore.
 
   - There can be commits to the repo after tagging but nothing that will
-    affect "make dist" output.
+    affect "make dist/source" output.
 
   - Make sure the tag is in the master commit chain, so that git describe will
     provide a useful output for dist packages built after the release
diff --git a/docker/duktape-base-ubuntu-18.04-s390x/Dockerfile b/docker/duktape-base-ubuntu-18.04-s390x/Dockerfile
@@ -51,7 +51,7 @@ RUN echo "=== Prepare duktape-prep repo ===" && \
 	cp -r repo-snapshots/duktape duktape-prep && \
 	cp -r repo-snapshots/duktape-releases duktape-prep/duktape-releases && \
 	cd duktape-prep && \
-	make linenoise && \
+	make deps/linenoise && \
 	make clean
 
 RUN echo "=== Versions ===" && \
diff --git a/docker/duktape-base-ubuntu-18.04-x64/Dockerfile b/docker/duktape-base-ubuntu-18.04-x64/Dockerfile
@@ -80,9 +80,9 @@ RUN echo "=== Prepare duktape-prep repo ===" && \
 	cp -r repo-snapshots/duktape duktape-prep && \
 	cp -r repo-snapshots/duktape-releases duktape-prep/duktape-releases && \
 	cd duktape-prep && \
-	make runtestsdeps linenoise UglifyJS2 && \
-	make duktape-releases lz-string jquery-1.11.2.js && \
-	make luajs underscore lodash bluebird.js closure-compiler && \
+	make runtestsdeps deps/linenoise deps/UglifyJS && \
+	make deps/duktape-releases deps/lz-string deps/jquery-1.11.2.js && \
+	make deps/luajs deps/underscore deps/lodash deps/bluebird.js deps/closure-compiler && \
 	make clean
 
 # Initialize Emscripten cached bytecode files.
diff --git a/docker/duktape-dist-ubuntu-18.04-x64/run.sh b/docker/duktape-dist-ubuntu-18.04-x64/run.sh
@@ -7,7 +7,7 @@ set -e
 source emsdk/emsdk_env.sh
 
 cd duktape
-make clean dist-src
-ls -l duktape-*.tar.*
-zip /tmp/out.zip duktape-*.tar.*
+make clean dist-source
+ls -l dist
+zip -r /tmp/out.zip dist
 cat /tmp/out.zip
diff --git a/docker/duktape-release-1-ubuntu-18.04-x64/run.sh b/docker/duktape-release-1-ubuntu-18.04-x64/run.sh
@@ -11,8 +11,8 @@ cd duktape
 ROOT=`pwd`
 
 test_combined_source_compilation() {
-	make clean dist
-	cd dist
+	make clean dist/source
+	cd dist/source
 	cat Makefile.cmdline
 	make -f Makefile.cmdline
 	ls -l duk; size duk
@@ -49,8 +49,8 @@ test_misc_compilation() {
 }
 
 test_configure_fastint() {
-	make clean dist
-	cd dist
+	make clean dist/source
+	cd dist/source
 	rm -rf /tmp/out
 	python tools/configure.py -DDUK_USE_FASTINT --output-directory /tmp/out
 	ls -l /tmp/out
@@ -62,8 +62,8 @@ test_releasetest() {
 }
 
 test_checklist_compile_test() {
-	make clean dist
-	cd dist
+	make clean dist/source
+	cd dist/source
 	bash ../util/checklist_compile_test.sh
 }
 
diff --git a/docker/duktape-site-ubuntu-18.04-x64/run.sh b/docker/duktape-site-ubuntu-18.04-x64/run.sh
@@ -8,6 +8,6 @@ source emsdk/emsdk_env.sh
 
 cd duktape
 make clean dist-site
-ls -l duktape-site-*.tar.*
-zip /tmp/out.zip duktape-site-*.tar.*
+ls -l dist/
+zip -r /tmp/out.zip dist/
 cat /tmp/out.zip
diff --git a/examples/cmdline/duk_cmdline_lowmem.c b/examples/cmdline/duk_cmdline_lowmem.c
@@ -316,7 +316,7 @@ duk_uint16_t lowmem_enc16(void *ud, void *p) {
 
 		/* We should really never be here: Duktape should only be
 		 * compressing pointers which are in the ROM compressed
-		 * pointers list, which are known at 'make dist' time.
+		 * pointers list, which are known when configuring sources.
 		 * We go on, causing a pointer compression error.
 		 */
 		fprintf(stderr, "lowmem_enc16: rom pointer: %p could not be compressed, should never happen\n", (void *) p);
diff --git a/extras/alloc-pool/duk_alloc_pool.c b/extras/alloc-pool/duk_alloc_pool.c
@@ -604,7 +604,7 @@ duk_uint16_t duk_alloc_pool_enc16_rom(void *ptr) {
 
 	/* We should really never be here: Duktape should only be
 	 * compressing pointers which are in the ROM compressed
-	 * pointers list, which are known at 'make dist' time.
+	 * pointers list, which are known when configuring sources.
 	 * We go on, causing a pointer compression error.
 	 */
 	return 0;
diff --git a/runtests/runtests.js b/runtests/runtests.js
@@ -267,7 +267,7 @@ function executeTest(options, callback) {
 
         // FIXME: listing specific options here is awkward, must match Makefile
         cmd = [ 'gcc', '-o', tempExe,
-                '-L.',
+                '-Lbuild',
                 '-Iprep/nondebug',  // this particularly is awkward
                 '-Wl,-rpath,.',
                 '-pedantic', '-ansi', '-std=c99', '-Wall', '-Wdeclaration-after-statement', '-fstrict-aliasing', '-D_POSIX_C_SOURCE=200809L', '-D_GNU_SOURCE', '-D_XOPEN_SOURCE', '-Os', '-fomit-frame-pointer',
diff --git a/util/checklist_compile_test.sh b/util/checklist_compile_test.sh
@@ -5,11 +5,13 @@
 
 set -x
 
-cat >opts1.yaml <<EOF
+mkdir -p tmp/checklist-compile
+
+cat >tmp/checklist-compile/opts1.yaml <<EOF
 DUK_USE_SELF_TESTS: true
 EOF
 
-cat >opts2.yaml <<EOF
+cat >tmp/checklist-compile/opts2.yaml <<EOF
 DUK_USE_SELF_TESTS: true
 DUK_USE_ASSERTIONS: true
 DUK_USE_DEBUG: true
@@ -20,32 +22,36 @@ EOF
 
 TESTCODE="for (var arr=[]; arr.length < 1e6; arr.push(1)); Duktape.compact(arr); var estimate = Duktape.info(arr).pbytes / arr.length; print('duk_tval size approximation:', estimate);"
 
+cleanup() {
+	rm -rf tmp/checklist-compile/duk tmp/checklist-compile/prep
+}
+
 for compiler in gcc clang; do
 	for archopt in -m64 -m32; do
 		echo "*** $compiler $archopt"
 
 		echo "- single source, normal options"
-		rm -f duk; rm -rf ./prep
-		python2 tools/configure.py --output-directory ./prep --source-directory ./src-input --config-metadata config --option-file opts1.yaml
-		$compiler -o duk $archopt -Os -pedantic -std=c99 -Wall -fstrict-aliasing -fomit-frame-pointer -DDUK_CMDLINE_PRINTALERT_SUPPORT -I./prep -Iextras/print-alert prep/duktape.c examples/cmdline/duk_cmdline.c extras/print-alert/duk_print_alert.c -lm
-		./duk -e 'print(Duktape.env)' -e "$TESTCODE" mandel.js
+		cleanup
+		python2 tools/configure.py --output-directory tmp/checklist-compile/prep --source-directory ./src-input --config-metadata config --option-file tmp/checklist-compile/opts1.yaml
+		$compiler -o tmp/checklist-compile/duk $archopt -Os -pedantic -std=c99 -Wall -fstrict-aliasing -fomit-frame-pointer -DDUK_CMDLINE_PRINTALERT_SUPPORT -Itmp/checklist-compile/prep -Iextras/print-alert tmp/checklist-compile/prep/duktape.c examples/cmdline/duk_cmdline.c extras/print-alert/duk_print_alert.c -lm
+		tmp/checklist-compile/duk -e 'print(Duktape.env)' -e "$TESTCODE" mandel.js
 
 		echo "- single source, debug options"
-		rm -f duk; rm -rf ./prep
-		python2 tools/configure.py --output-directory ./prep --source-directory ./src-input --config-metadata config --option-file opts2.yaml
-		$compiler -o duk $archopt -Os -pedantic -std=c99 -Wall -fstrict-aliasing -fomit-frame-pointer -DDUK_CMDLINE_PRINTALERT_SUPPORT -I./prep -Iextras/print-alert prep/duktape.c examples/cmdline/duk_cmdline.c extras/print-alert/duk_print_alert.c -lm
-		./duk -e 'print(Duktape.env)' -e "$TESTCODE" mandel.js
+		cleanup
+		python2 tools/configure.py --output-directory tmp/checklist-compile/prep --source-directory ./src-input --config-metadata config --option-file tmp/checklist-compile/opts2.yaml
+		$compiler -o tmp/checklist-compile/duk $archopt -Os -pedantic -std=c99 -Wall -fstrict-aliasing -fomit-frame-pointer -DDUK_CMDLINE_PRINTALERT_SUPPORT -Itmp/checklist-compile/prep -Iextras/print-alert tmp/checklist-compile/prep/duktape.c examples/cmdline/duk_cmdline.c extras/print-alert/duk_print_alert.c -lm
+		tmp/checklist-compile/duk -e 'print(Duktape.env)' -e "$TESTCODE" mandel.js
 
 		echo "- separate sources, normal options"
-		rm -f duk; rm -rf ./prep
-		python2 tools/configure.py --output-directory ./prep --source-directory ./src-input --config-metadata config --separate-sources --option-file opts1.yaml
-		$compiler -o duk $archopt -Os -pedantic -std=c99 -Wall -fstrict-aliasing -fomit-frame-pointer -DDUK_CMDLINE_PRINTALERT_SUPPORT -I./prep -Iextras/print-alert prep/*.c examples/cmdline/duk_cmdline.c extras/print-alert/duk_print_alert.c -lm
-		./duk -e 'print(Duktape.env)' -e "$TESTCODE" mandel.js
+		cleanup
+		python2 tools/configure.py --output-directory tmp/checklist-compile/prep --source-directory ./src-input --config-metadata config --separate-sources --option-file tmp/checklist-compile/opts1.yaml
+		$compiler -o tmp/checklist-compile/duk $archopt -Os -pedantic -std=c99 -Wall -fstrict-aliasing -fomit-frame-pointer -DDUK_CMDLINE_PRINTALERT_SUPPORT -Itmp/checklist-compile/prep -Iextras/print-alert tmp/checklist-compile/prep/*.c examples/cmdline/duk_cmdline.c extras/print-alert/duk_print_alert.c -lm
+		tmp/checklist-compile/duk -e 'print(Duktape.env)' -e "$TESTCODE" mandel.js
 
 		echo "- separate sources, debug options"
-		rm -f duk; rm -rf ./prep
-		python2 tools/configure.py --output-directory ./prep --source-directory ./src-input --config-metadata config --separate-sources --option-file opts2.yaml
-		$compiler -o duk $archopt -Os -pedantic -std=c99 -Wall -fstrict-aliasing -fomit-frame-pointer -DDUK_CMDLINE_PRINTALERT_SUPPORT -I./prep -Iextras/print-alert prep/*.c examples/cmdline/duk_cmdline.c extras/print-alert/duk_print_alert.c -lm
-		./duk -e 'print(Duktape.env)' -e "$TESTCODE" mandel.js
+		cleanup
+		python2 tools/configure.py --output-directory tmp/checklist-compile/prep --source-directory ./src-input --config-metadata config --separate-sources --option-file tmp/checklist-compile/opts2.yaml
+		$compiler -o tmp/checklist-compile/duk $archopt -Os -pedantic -std=c99 -Wall -fstrict-aliasing -fomit-frame-pointer -DDUK_CMDLINE_PRINTALERT_SUPPORT -Itmp/checklist-compile/prep -Iextras/print-alert tmp/checklist-compile/prep/*.c examples/cmdline/duk_cmdline.c extras/print-alert/duk_print_alert.c -lm
+		tmp/checklist-compile/duk -e 'print(Duktape.env)' -e "$TESTCODE" mandel.js
 	done
 done
diff --git a/util/dist.py b/util/dist.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python2
 #
-#  Create a distributable Duktape package into 'dist' directory.  The contents
+#  Create a distributable Duktape package into a dist directory.  The contents
 #  of this directory can then be packaged into a source distributable.
 #
 
@@ -250,7 +250,7 @@ def main():
     logger.debug('Using repo directory: %s' % opts.repo_directory)
 
     if opts.output_directory is None:
-        opts.output_directory = os.path.abspath(os.path.join(opts.repo_directory, 'dist'))
+        opts.output_directory = os.path.abspath(os.path.join(opts.repo_directory, 'dist', 'source'))
         logger.info('No --output-directory option, defaulting to repo/dist directory %s' % opts.output_directory)
     opts.output_directory = os.path.abspath(opts.output_directory)
     logger.debug('Using output directory: %s' % opts.output_directory)
diff --git a/util/error_inject_test.sh b/util/error_inject_test.sh
@@ -7,10 +7,10 @@ set -x
 
 for i in 1 2 3 4; do
 	echo "Heap alloc inject: $i"
-	rm -f duk; rm -rf ./prep
-	python2 tools/configure.py --output-directory ./prep --source-directory ./src-input --config-metadata config --line-directives -DDUK_USE_INJECT_HEAP_ALLOC_ERROR=$i -DDUK_USE_ASSERTIONS
-	gcc -o duk -std=c99 -Wall -g -ggdb -DDUK_CMDLINE_PRINTALERT_SUPPORT -I./prep -Iextras/print-alert prep/duktape.c examples/cmdline/duk_cmdline.c extras/print-alert/duk_print_alert.c -lm
-	valgrind --leak-check=full --error-exitcode=123 ./duk
+	mkdir -p tmp/error-inject && rm -rf tmp/error-inject/duk tmp/error-inject/prep
+	python2 tools/configure.py --output-directory tmp/error-inject/prep --source-directory ./src-input --config-metadata config --line-directives -DDUK_USE_INJECT_HEAP_ALLOC_ERROR=$i -DDUK_USE_ASSERTIONS
+	gcc -o tmp/error-inject/duk -std=c99 -Wall -g -ggdb -DDUK_CMDLINE_PRINTALERT_SUPPORT -Itmp/error-inject/prep -Iextras/print-alert tmp/error-inject/prep/duktape.c examples/cmdline/duk_cmdline.c extras/print-alert/duk_print_alert.c -lm
+	valgrind --leak-check=full --error-exitcode=123 tmp/error-inject/duk
 	EXITCODE=$?
 	echo "Exit code is $EXITCODE"
 	if [ $EXITCODE -eq 1 ]; then echo "OK: 'duk' returned error, but no fatal error";
@@ -20,4 +20,4 @@ for i in 1 2 3 4; do
 	fi
 done
 
-# FIXME: object resize
+# XXX: object resize
diff --git a/website/buildimages.py b/website/buildimages.py
@@ -19,4 +19,3 @@
 		print('')
 		print('%s -> %s' % (image, data_uri))
 		print('')
-
diff --git a/website/buildsite.py b/website/buildsite.py
@@ -910,7 +910,7 @@ def generateDownloadPage(releases_filename):
             continue
         href = tmp[0].select('a')[0]['href']
         hash_elem = tr.select('.hash')[0]
-        hash_elem.string = getFileMd5(os.path.abspath(os.path.join('..', 'duktape-releases', href))) or '???'
+        hash_elem.string = getFileMd5(os.path.abspath(os.path.join('..', 'deps', 'duktape-releases', href))) or '???'
 
     tmp_soup = templ_soup.select('#site-middle')[0]
     tmp_soup.clear()
@@ -1160,14 +1160,14 @@ def main():
         shutil.copyfile(os.path.join('./', i), os.path.join(outdir, os.path.basename(i)))
 
     print 'Copying release binaries'
-    for i in os.listdir(os.path.join('..', 'duktape-releases')):
+    for i in os.listdir(os.path.join('..', 'deps', 'duktape-releases')):
         if re.match(r'^duktape-.*?.tar.xz$', i) is None:
             continue
-        shutil.copyfile(os.path.join('..', 'duktape-releases', i), os.path.join(outdir, i))
+        shutil.copyfile(os.path.join('..', 'deps', 'duktape-releases', i), os.path.join(outdir, i))
 
     print 'Copying dukweb.js files'
-    for i in [ '../dukweb.js',
-               '../dukweb.wasm',
+    for i in [ '../build/dukweb.js',
+               '../build/dukweb.wasm',
                '../deps/jquery-1.11.2.js',
                '../dukweb/dukweb.css',
                '../dukweb/dukweb.html' ]:
