Remove dependency on clm fork in CI; use cpm's PrelinkByteCode

.gitignore

@@ -9,9 +9,8 @@
 *.tcl
 
 *.opt.abc
-*.obc
 *.bc
-*.ubc
+*.pbc
 
 *.graph
 

.gitlab-ci.yml

@@ -10,6 +10,7 @@ stages:
     - ln -s "$PWD/src/abcopt" /opt/clean/lib/exe/abcopt
     - ln -s "$PWD/src/bcgen" /opt/clean/lib/exe/bcgen
     - ln -s "$PWD/src/bclink" /opt/clean/lib/exe/bclink
+    - ln -s "$PWD/src/bcprelink" /opt/clean/lib/exe/bcprelink
     - ln -s "$PWD/src/bcstrip" /opt/clean/lib/exe/bcstrip
     - make -C src
 

Dockerfile

@@ -26,8 +26,3 @@ RUN apt-get install -y -qq --no-install-recommends curl unzip libnspr4 &&\
 	rm -r /tmp/jsshell
 
 RUN	install_clean_nightly.sh base lib-argenv lib-directory lib-dynamics lib-graphcopy lib-platform lib-stdlib
-
-RUN git clone https://gitlab.science.ru.nl/cstaps/clean-tools /tmp/clean-tools &&\
-	make -C /tmp/clean-tools/clm -f Makefile.linux64 &&\
-	mv /tmp/clean-tools/clm/clm /opt/clean/bin &&\
-	cd /tmp && rm -r clean-tools

test/acker.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/arrays.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 		Path:	{Application}*lib*Platform

test/brainfuck.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/cafs.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/chars.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/compress.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 		Path:	{Application}*lib*Platform

test/e.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/fills.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/fsieve.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/functions.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	False
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/hamming.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/iks.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 		Path:	{Application}*lib*Dynamics

test/infprimes.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/invperm.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/long_integers.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 		Path:	{Application}*lib*Platform

test/lqueen.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/match.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/matchlarge.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/mulmat.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/nfib.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/parser.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/pascal.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/prolog.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/reals.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/reverse.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/reverse2.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/reversearray.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/revrec.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/revtwice.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/rfib.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/run_tests.sh

@@ -102,7 +102,7 @@ while true; do
 			WASM=1
 			IP="js --test-wasm-await-tier2 ../src-js/interpret.js"
 			SRCMAKETARGETS="abcopt bcgen bclink bcprelink bcstrip"
-			BC_EXTENSION="ubc"
+			BC_EXTENSION="pbc"
 			shift;;
 
 		-b)
@@ -223,8 +223,6 @@ do
 
 	[ $BENCHMARK -gt 0 ] && mv "$MODULE.icl.nobm" "$MODULE.icl"
 
-	[ $WASM -gt 0 ] && ../src/bcprelink "$MODULE.bc" -o "$MODULE.ubc"
-
 	if [ $BENCHMARK -gt 0 ]; then
 		/usr/bin/time -p $IP $MODULE_RUNFLAGS $RUNFLAGS $MODULE.$BC_EXTENSION 2>bm-tmp >$MODULE.result
 		WALL_TIME="$(grep user bm-tmp | sed 's/user[[:space:]]*//' | head -n 1)"

test/sieve.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/squeen.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/str_arit.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/strings.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	OtherPaths

test/stwice.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/sudoku.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/symsieve.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/tak.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/twice.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/unboxed_arrays.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/war_seq.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile:	

test/weird_types.prj.default

@@ -44,6 +44,8 @@ Global
 		GenerateDLL:	False
 		ExportedNames:	
 		StripByteCode:	True
+		KeepByteCodeSymbols:	True
+		PrelinkByteCode:	True
 	Paths
 		Path:	{Project}
 	Precompile: