diff --git a/clean-classic/linux-arm32/build.sh b/clean-classic/linux-arm32/build.sh index 891aa487e5ee374c23ecf91e7eb20c88e61ff2a1..1ad9b2c683fc3622229c1827b45c8e2954d11d78 100755 --- a/clean-classic/linux-arm32/build.sh +++ b/clean-classic/linux-arm32/build.sh @@ -26,7 +26,6 @@ mv clean-libraries step0/ mv compiler step0/ mv write_clean_manual step0/ mv htoclean step0/ -mv StdDynamicEnv step0/ mv clean-ide step0/ mv clean-platform step0/ ./clean-classic/linux-arm32/build_htoclean.sh diff --git a/clean-classic/linux-arm32/build_clean.sh b/clean-classic/linux-arm32/build_clean.sh index c54c53e90ee289b48e429027c6fedf3c513b9add..0fad53ce7534316a7bd48a3b3fee6406aa4ea486 100755 --- a/clean-classic/linux-arm32/build_clean.sh +++ b/clean-classic/linux-arm32/build_clean.sh @@ -42,6 +42,9 @@ done mkdir -p clean/data/Generics cp clean-libraries/Libraries/GenLib/*.[id]cl clean/data/Generics/ +mkdir -p clean/data/Gast +cp -r -t clean/data/Gast clean-libraries/Libraries/Gast/* + mkdir -p clean/data/StdLib cp clean-libraries/Libraries/StdLib/*.[id]cl clean/data/StdLib/ @@ -77,14 +80,6 @@ cp clean-libraries/Libraries/TCPIP/Linux_C/cTCP_121.o "clean/data/TCPIP/Clean Sy cp clean-libraries/Libraries/TCPIP/Linux_C/cTCP_121.c "clean/data/TCPIP/Clean System Files" cp clean-libraries/Libraries/TCPIP/Linux_C/cTCP_121.h "clean/data/TCPIP/Clean System Files" -mkdir -p "clean/data/Dynamics/Clean System Files" -cp StdDynamicEnv/extension/StdCleanTypes.dcl clean/data/Dynamics -cp StdDynamicEnv/extension/StdCleanTypes.icl clean/data/Dynamics -cp StdDynamicEnv/extension/StdDynamic.dcl clean/data/Dynamics -cp StdDynamicEnv/extension/StdDynamicNoLinker.icl clean/data/Dynamics/StdDynamic.icl -cp StdDynamicEnv/implementation/_SystemDynamic.dcl clean/data/Dynamics -cp StdDynamicEnv/implementation/_SystemDynamic.icl clean/data/Dynamics - mkdir -p clean/data/Platform cp -r -t clean/data/Platform clean-platform/src/libraries/OS-Independent/* cp -r -t clean/data/Platform clean-platform/src/libraries/OS-Posix/* diff --git a/clean-classic/linux-arm32/build_examples.sh b/clean-classic/linux-arm32/build_examples.sh index e34974b1cabbe79e72f75f3fbc3b09b242e633c9..b973e2b9b4ba3f9b1ed4096a6f462b7549dcdeee 100755 --- a/clean-classic/linux-arm32/build_examples.sh +++ b/clean-classic/linux-arm32/build_examples.sh @@ -37,6 +37,21 @@ clm -nt -dynamics type_dependent_functions -o type_dependent_functions EOF chmod +x clean/examples/DynamicsExamples/make.sh +(cd git/gast; git checkout master Tests) +mkdir -p clean/examples/GastExamples +mv git/gast/Tests/*.icl clean/examples/GastExamples +rm -rf git/gast/Tests + +cat > clean/examples/GastExamples/make.sh<< EOF +export PATH=../../bin:\$PATH +clm -nt -b -IL Gast -IL Platform bool -o bool +clm -nt -b -IL Gast -IL Platform char -o char +clm -nt -b -IL Gast -IL Platform int -o int +clm -nt -b -IL Gast -IL Platform tree -o tree +clm -nt -nr -IL Gast -IL Platform with_options -o with_options +EOF +chmod +x clean/examples/GastExamples/make.sh + mkdir -p clean/examples/PlatformExamples/socket mkdir -p clean/examples/PlatformExamples/WebPM/icons cp clean-platform/src/examples/*.* clean/examples/PlatformExamples diff --git a/clean-classic/linux-arm32/build_libraries.sh b/clean-classic/linux-arm32/build_libraries.sh index 524bc63406505679ca66ce198f81637028dfa8be..1a40c76197513e4ed06f8d50c5c6e4d34e59dad4 100755 --- a/clean-classic/linux-arm32/build_libraries.sh +++ b/clean-classic/linux-arm32/build_libraries.sh @@ -1,13 +1,14 @@ set -e -# rsync -r --exclude .svn svn/StdDynamicEnv . -cp -R --preserve=timestamps svn/StdDynamicEnv . - (cd git/clean-libraries; git checkout master \ Libraries/Directory Libraries/TCPIP Libraries/StdLib Libraries/GenLib Libraries/MersenneTwister) mkdir -p clean-libraries/Libraries mv git/clean-libraries/Libraries/* clean-libraries/Libraries/ +(cd git/gast; git checkout master Libraries/Gast.dcl Libraries/Gast.icl Libraries/Gast) +mkdir -p clean-libraries/Libraries +mv git/gast/Libraries clean-libraries/Libraries/Gast/ + (cd git/clean-platform; git checkout master .) mkdir clean-platform mv git/clean-platform/* clean-platform/ diff --git a/clean-classic/linux-arm32/build_stdenv.sh b/clean-classic/linux-arm32/build_stdenv.sh index 417e67b908559929fd35cd8122880abd1e12a425..32bee9de03ab6a30da384f93cdc22d76f6f1d5b2 100755 --- a/clean-classic/linux-arm32/build_stdenv.sh +++ b/clean-classic/linux-arm32/build_stdenv.sh @@ -10,13 +10,13 @@ cp stdenv/_system.dcl clean/StdEnv for a in StdArray StdBool StdChar StdInt StdReal StdString StdFile StdCharList StdClass StdDebug \ StdEnum StdEnv StdFunc StdFunctions StdList StdMisc StdOrdList StdOverloaded \ StdOverloadedList StdStrictLists StdTuple _SystemArray _SystemEnum _SystemEnumStrict \ - _SystemStrictLists StdGeneric StdMaybe _SystemStrictMaybes; + _SystemStrictLists StdGeneric StdMaybe _SystemStrictMaybes _SystemDynamic StdDynamic; do cp stdenv/$a.[di]cl clean/StdEnv ; done -cp clean-classic/linux-arm32/txt/Makefile_stdenv clean/StdEnv/Makefile -cp clean-classic/linux-arm32/txt/make.sh clean/StdEnv/make.sh -cp clean-classic/linux-arm32/txt/install.sh clean/StdEnv/install.sh +cp stdenv/Makefile_no_profile.linux clean/StdEnv/Makefile +cp stdenv/make.sh clean/StdEnv/make.sh +cp stdenv/install_no_profile.sh clean/StdEnv/install.sh mkdir -p clean/StdEnv/Clean\ System\ Files cp "stdenv/Clean System Files/_system.abc" clean/StdEnv/Clean\ System\ Files diff --git a/clean-classic/linux-arm32/cleanup.sh b/clean-classic/linux-arm32/cleanup.sh index 1edb4a07ab2c556e46681f3bbe856f87c3e580de..853c2bce6f743082564b020327f5b972cddcb02f 100755 --- a/clean-classic/linux-arm32/cleanup.sh +++ b/clean-classic/linux-arm32/cleanup.sh @@ -14,5 +14,4 @@ rm -Rf clean0 rm -Rf step0 rm -Rf htoclean -rm -Rf StdDynamicEnv rm -Rf write_clean_manual diff --git a/clean-classic/linux-arm32/get_sources.sh b/clean-classic/linux-arm32/get_sources.sh index f03765cf62141ea62b0be65fa148f539d459ffe9..4fb63c76c092412d631e17e298d155dd279a9146 100755 --- a/clean-classic/linux-arm32/get_sources.sh +++ b/clean-classic/linux-arm32/get_sources.sh @@ -8,12 +8,11 @@ git clone -n --depth=1 https://gitlab.science.ru.nl/clean-compiler-and-rts/stden git clone -n --depth=1 https://gitlab.science.ru.nl/clean-and-itasks/clm.git git clone -n --depth=1 https://gitlab.science.ru.nl/clean-and-itasks/clean-ide.git git clone -n --depth=1 https://gitlab.science.ru.nl/clean-and-itasks/clean-libraries.git +git clone -n --depth=1 https://gitlab.science.ru.nl/clean-and-itasks/gast.git gast git clone -n --depth=1 https://gitlab.science.ru.nl/clean-and-itasks/clean-platform.git cd .. mkdir svn cd svn svn export https://svn.cs.ru.nl/repos/clean-tools/trunk clean-tools -#svn export https://svn.cs.ru.nl/repos/clean-dynamic-system/trunk clean-dynamic-system -svn export https://svn.cs.ru.nl/repos/clean-dynamic-system/trunk/dynamics/StdDynamicEnv StdDynamicEnv svn export https://svn.cs.ru.nl/repos/clean-dynamic-system/trunk/dynamics/Examples/Examples\ No\ Linker DynamicsExamples cd .. diff --git a/clean-classic/linux-arm32/txt/Makefile b/clean-classic/linux-arm32/txt/Makefile index faecf03c83ca856951baaa2db62e86b840f17c60..1bdfe8110873be4a666c6a0c7bfb260a12507fa9 100644 --- a/clean-classic/linux-arm32/txt/Makefile +++ b/clean-classic/linux-arm32/txt/Makefile @@ -56,7 +56,7 @@ GMAKECURRENTDIR = ${shell echo `pwd`} # # Install section # -install: install_bin install_stdenv install_man install_doc install_ArgEnv install_Generics install_StdLib install_Directory install_MersenneTwister install_TCPIP install_Dynamics install_Platform $(PATCHES) +install: install_bin install_stdenv install_man install_doc install_ArgEnv install_Generics install_Gast install_StdLib install_Directory install_MersenneTwister install_TCPIP install_Platform $(PATCHES) $(PATCH_BIN) $(INSTALL_CLM) CLEANLIB $(INSTALL_EXE_DIR) cleanup: cleanup_stdenv @@ -173,6 +173,13 @@ $(INSTALL_LIB_DIR)/Generics : install_Generics : $(INSTALL_LIB_DIR)/Generics cp -r data/Generics/* $(INSTALL_LIB_DIR)/Generics +$(INSTALL_LIB_DIR)/Gast : + mkdir -p $@ + mkdir -p $@/"Clean System Files" + +install_Gast : $(INSTALL_LIB_DIR)/Gast + cp -r data/Gast/* $(INSTALL_LIB_DIR)/Gast + $(INSTALL_LIB_DIR)/StdLib : mkdir -p $@ mkdir -p $@/"Clean System Files" @@ -201,13 +208,6 @@ $(INSTALL_LIB_DIR)/TCPIP: install_TCPIP: $(INSTALL_LIB_DIR)/TCPIP cp -r data/TCPIP/* $(INSTALL_LIB_DIR)/TCPIP -$(INSTALL_LIB_DIR)/Dynamics: - mkdir -p $@ - mkdir -p $@/"Clean System Files" - -install_Dynamics: $(INSTALL_LIB_DIR)/Dynamics - cp -r data/Dynamics/* $(INSTALL_LIB_DIR)/Dynamics - $(INSTALL_LIB_DIR)/Platform: mkdir -p $@ mkdir -p $@/"Clean System Files" diff --git a/clean-classic/linux-arm32/txt/Makefile_stdenv b/clean-classic/linux-arm32/txt/Makefile_stdenv deleted file mode 100644 index a0217d9ca7d810bbca8a13771797258620b0340a..0000000000000000000000000000000000000000 --- a/clean-classic/linux-arm32/txt/Makefile_stdenv +++ /dev/null @@ -1,313 +0,0 @@ -# -# Makefile for the Clean Standard Environment -# -# make (= make stdenv): -# compiles all modules -# -# make install: -# compiles all modules -# copies files to install directory -# -# make cleanup: -# removes all files in this directory that can be recreated -# - -CLEAN_MODULES = \ - StdArray StdCharList StdClass StdDebug StdFunc StdFunctions StdList StdOrdList \ - StdOverloaded StdTuple _SystemEnum StdEnum _SystemArray StdEnv _SystemStrictLists \ - _SystemEnumStrict StdStrictLists StdOverloadedList StdGeneric StdMaybe _SystemStrictMaybes - -SYSTEM_MODULES = \ - StdBool StdChar StdFile StdInt StdMisc StdReal StdString - -ABC_MODULES = \ - _system - -OBJECT_MODULES = \ - _startup _startupTrace - -SYSTEM_OBJECT_MODULES = \ - -CLEAN_MODULES_ABC = $(CLEAN_MODULES:%=Clean\ System\ Files/%.abc) - -SYSTEM_MODULES_ABC = $(SYSTEM_MODULES:%=Clean\ System\ Files/%.abc) - -SYSTEM_MODULES_ICL = $(SYSTEM_MODULES:%=%.icl) - -ABC_MODULES_ABC = $(ABC_MODULES:%=Clean\ System\ Files/%.abc) - -CLEAN_MODULES_O = $(CLEAN_MODULES:%=Clean\ System\ Files/%.o) - -SYSTEM_MODULES_O = $(SYSTEM_MODULES:%=Clean\ System\ Files/%.o) - -ABC_MODULES_O = $(ABC_MODULES:%=Clean\ System\ Files/%.o) - -OBJECT_MODULES_O = $(OBJECT_MODULES:%=Clean\ System\ Files/%.o) - -SYSTEM_OBJECT_MODULES_O = $(SYSTEM_OBJECT_MODULES:%=Clean\ System\ Files/%.o) - -STDENV_FILES = \ - $(CLEAN_MODULES:%=%.icl) \ - $(CLEAN_MODULES:%=%.dcl) \ - $(SYSTEM_MODULES:%=%.dcl) \ - $(SYSTEM_MODULES_ABC) \ - $(CLEAN_MODULES_ABC) \ - $(ABC_MODULES_ABC) \ - wait1 \ - $(SYSTEM_MODULES_O) \ - $(CLEAN_MODULES_O) \ - $(ABC_MODULES_O) \ - $(OBJECT_MODULES_O) \ - $(SYSTEM_OBJECT_MODULES_O) - -wait1: - sleep 1 - -# -# Compile -# - -stdenv: $(STDENV_FILES) - -# -# Install -# -# the order here is important, because the files will be -# installed in the order given below. - -INSTALL_STDENV_FILES = \ - $(CLEAN_MODULES:%=$(INSTALL_STDENV_DIR)/%.icl) \ - $(CLEAN_MODULES:%=$(INSTALL_STDENV_DIR)/%.dcl) \ - $(SYSTEM_MODULES:%=$(INSTALL_STDENV_DIR)/%.dcl) \ - $(ABC_MODULES:%=$(INSTALL_STDENV_DIR)/%.dcl) \ - $(OBJECT_MODULES:%=$(INSTALL_STDENV_DIR)/%.dcl) \ - $(SYSTEM_MODULES:%=$(INSTALL_STDENV_DIR)/Clean\ System\ Files/%.abc) \ - $(CLEAN_MODULES:%=$(INSTALL_STDENV_DIR)/Clean\ System\ Files/%.abc) \ - $(ABC_MODULES:%=$(INSTALL_STDENV_DIR)/Clean\ System\ Files/%.abc) \ - wait2 \ - $(SYSTEM_MODULES:%=$(INSTALL_STDENV_DIR)/Clean\ System\ Files/%.o) \ - $(CLEAN_MODULES:%=$(INSTALL_STDENV_DIR)/Clean\ System\ Files/%.o) \ - $(ABC_MODULES:%=$(INSTALL_STDENV_DIR)/Clean\ System\ Files/%.o) \ - $(OBJECT_MODULES:%=$(INSTALL_STDENV_DIR)/Clean\ System\ Files/%.o) \ - $(SYSTEM_OBJECT_MODULES:%=$(INSTALL_STDENV_DIR)/Clean\ System\ Files/%.o) - -install: stdenv $(INSTALL_STDENV_DIR) $(INSTALL_STDENV_DIR)/Clean\ System\ Files $(INSTALL_STDENV_FILES) - -wait2: - sleep 1 - -$(INSTALL_STDENV_DIR) : - mkdir -p "$@" - -$(INSTALL_STDENV_DIR)/Clean\ System\ Files : - mkdir -p "$@" - -$(INSTALL_STDENV_DIR)/% : % - cp --preserve=timestamps "$<" "$@" - chmod 644 "$@" - -# -# Cleanup -# - -cleanup: - $(RM) $(CLEAN_MODULES_ABC) \ - $(RM) $(CLEAN_MODULES_O) \ - $(RM) $(SYSTEM_MODULES_O) \ - $(RM) $(ABC_MODULES_O) - -# -# Commands -# - -CLM = clm -P . -CLMFLAGS = - -.SUFFIXES: .abc .dcl .icl .o - -.icl.abc: - $(CLM) $(CLMFLAGS) -ABC $* - -.icl.o: - $(CLM) $(CLMFLAGS) -O `basename "$*" .icl` - -.abc.o: - $(CLM) $(CLMFLAGS) -O `basename "$*" .icl` - - -Clean\ System\ Files/StdArray.o : StdArray.icl StdArray.dcl - $(CLM) -O StdArray - -Clean\ System\ Files/StdArray.abc : StdArray.icl StdArray.dcl - $(CLM) -ABC StdArray - -Clean\ System\ Files/StdCharList.o : StdCharList.icl StdCharList.dcl - $(CLM) -O StdCharList - -Clean\ System\ Files/StdCharList.abc : StdCharList.icl StdCharList.dcl - $(CLM) -ABC StdCharList - -Clean\ System\ Files/StdClass.o : StdClass.icl StdClass.dcl - $(CLM) -O StdClass - -Clean\ System\ Files/StdClass.abc : StdClass.icl StdClass.dcl - $(CLM) -ABC StdClass - -Clean\ System\ Files/StdDebug.o : StdDebug.icl StdDebug.dcl - $(CLM) -O StdDebug - -Clean\ System\ Files/StdDebug.abc : StdDebug.icl StdDebug.dcl - $(CLM) -ABC StdDebug - -Clean\ System\ Files/StdEnum.o : StdEnum.icl StdEnum.dcl - $(CLM) -O StdEnum - -Clean\ System\ Files/StdEnum.abc : StdEnum.icl StdEnum.dcl - $(CLM) -ABC StdEnum - -Clean\ System\ Files/StdEnv.o : StdEnv.icl StdEnv.dcl - $(CLM) -O StdEnv - -Clean\ System\ Files/StdEnv.abc : StdEnv.icl StdEnv.dcl - $(CLM) -ABC StdEnv - -Clean\ System\ Files/StdFunc.o : StdFunc.icl StdFunc.dcl - $(CLM) -O StdFunc - -Clean\ System\ Files/StdFunc.abc : StdFunc.icl StdFunc.dcl - $(CLM) -ABC StdFunc - -Clean\ System\ Files/StdFunctions.o : StdFunctions.icl StdFunctions.dcl - $(CLM) -O StdFunctions - -Clean\ System\ Files/StdFunctions.abc : StdFunctions.icl StdFunctions.dcl - $(CLM) -ABC StdFunctions - -Clean\ System\ Files/StdMaybe.o : StdMaybe.icl StdMaybe.dcl - $(CLM) -O StdMaybe - -Clean\ System\ Files/StdMaybe.abc : StdMaybe.icl StdMaybe.dcl - $(CLM) -ABC StdMaybe - -Clean\ System\ Files/StdList.o : StdList.icl StdList.dcl - $(CLM) -O StdList - -Clean\ System\ Files/StdList.abc : StdList.icl StdList.dcl - $(CLM) -ABC StdList - -Clean\ System\ Files/StdOrdList.o : StdOrdList.icl StdOrdList.dcl - $(CLM) -O StdOrdList - -Clean\ System\ Files/StdOrdList.abc : StdOrdList.icl StdOrdList.dcl - $(CLM) -ABC StdOrdList - -Clean\ System\ Files/StdOverloaded.o : StdOverloaded.icl StdOverloaded.dcl - $(CLM) -O StdOverloaded - -Clean\ System\ Files/StdOverloaded.abc : StdOverloaded.icl StdOverloaded.dcl - $(CLM) -ABC StdOverloaded - -Clean\ System\ Files/StdTuple.o : StdTuple.icl StdTuple.dcl - $(CLM) -O StdTuple - -Clean\ System\ Files/StdTuple.abc : StdTuple.icl StdTuple.dcl - $(CLM) -ABC StdTuple - -Clean\ System\ Files/_SystemEnum.o : _SystemEnum.icl _SystemEnum.dcl - $(CLM) -O _SystemEnum - -Clean\ System\ Files/_SystemEnum.abc : _SystemEnum.icl _SystemEnum.dcl - $(CLM) -ABC _SystemEnum - -Clean\ System\ Files/StdBool.o : StdBool.dcl Clean\ System\ Files/StdBool.abc - $(CLM) -O StdBool - -Clean\ System\ Files/StdBool.abc : StdBool.icl StdBool.dcl - $(CLM) -pt -ABC StdBool - -Clean\ System\ Files/StdChar.o : StdChar.dcl Clean\ System\ Files/StdChar.abc - $(CLM) -O StdChar - -Clean\ System\ Files/StdChar.abc : StdChar.icl StdChar.dcl - $(CLM) -pt -ABC StdChar - -Clean\ System\ Files/StdFile.o : StdFile.dcl Clean\ System\ Files/StdFile.abc - $(CLM) -O StdFile - -Clean\ System\ Files/StdFile.abc : StdFile.icl StdFile.dcl - $(CLM) -pt -ABC StdFile - -Clean\ System\ Files/StdInt.o : StdInt.dcl Clean\ System\ Files/StdInt.abc - $(CLM) -O StdInt - -Clean\ System\ Files/StdInt.abc : StdInt.icl StdInt.dcl - $(CLM) -pt -ABC StdInt - -Clean\ System\ Files/StdMisc.o : StdMisc.dcl Clean\ System\ Files/StdMisc.abc - $(CLM) -O StdMisc - -Clean\ System\ Files/StdMisc.abc : StdMisc.icl StdMisc.dcl - $(CLM) -pt -ABC StdMisc - -Clean\ System\ Files/StdReal.o : StdReal.dcl Clean\ System\ Files/StdReal.abc - $(CLM) -O StdReal - -Clean\ System\ Files/StdReal.abc : StdReal.icl StdReal.dcl - $(CLM) -pt -ABC StdReal - -Clean\ System\ Files/StdString.o : StdString.dcl Clean\ System\ Files/StdString.abc - $(CLM) -O StdString - -Clean\ System\ Files/StdString.abc : StdString.icl StdString.dcl - $(CLM) -pt -ABC StdString - -Clean\ System\ Files/_SystemArray.o : _SystemArray.dcl Clean\ System\ Files/_SystemArray.abc - $(CLM) -O _SystemArray - -Clean\ System\ Files/_SystemArray.abc : _SystemArray.icl _SystemArray.dcl - $(CLM) -ABC _SystemArray - -Clean\ System\ Files/_SystemStrictLists.o : _SystemStrictLists.dcl Clean\ System\ Files/_SystemStrictLists.abc - $(CLM) -O _SystemStrictLists - -Clean\ System\ Files/_SystemStrictLists.abc : _SystemStrictLists.icl _SystemStrictLists.dcl - $(CLM) -ABC _SystemStrictLists - -Clean\ System\ Files/_SystemEnumStrict.o : _SystemEnumStrict.dcl Clean\ System\ Files/_SystemEnumStrict.abc - $(CLM) -O _SystemEnumStrict - -Clean\ System\ Files/_SystemEnumStrict.abc : _SystemEnumStrict.icl _SystemEnumStrict.dcl - $(CLM) -ABC _SystemEnumStrict - -Clean\ System\ Files/StdStrictLists.o : StdStrictLists.dcl Clean\ System\ Files/StdStrictLists.abc - $(CLM) -O StdStrictLists - -Clean\ System\ Files/StdStrictLists.abc : StdStrictLists.icl StdStrictLists.dcl - $(CLM) -ABC StdStrictLists - -Clean\ System\ Files/StdOverloadedList.o : StdOverloadedList.dcl Clean\ System\ Files/StdOverloadedList.abc - $(CLM) -O StdOverloadedList - -Clean\ System\ Files/StdOverloadedList.abc : StdOverloadedList.icl StdOverloadedList.dcl - $(CLM) -ABC StdOverloadedList - -Clean\ System\ Files/StdGeneric.abc : StdGeneric.icl StdGeneric.dcl - $(CLM) -ABC StdGeneric - -Clean\ System\ Files/StdGeneric.o : StdGeneric.dcl Clean\ System\ Files/StdGeneric.abc - $(CLM) -O StdGeneric - -Clean\ System\ Files/_SystemStrictMaybes.o : _SystemStrictMaybes.dcl Clean\ System\ Files/_SystemStrictMaybes.abc - $(CLM) -O _SystemStrictMaybes - -Clean\ System\ Files/_system.o : Clean\ System\ Files/_system.abc - $(CLM) -O _system - -# compile system modules twice, to make sure all inlining is done -system_abc: $(SYSTEM_MODULES_ABC) system_abc_touch - -system_abc_touch: - touch $(SYSTEM_MODULES_ICL) - $(MAKE) system_abc_again - -system_abc_again: $(SYSTEM_MODULES_ABC) diff --git a/clean-classic/linux-arm32/txt/install.sh b/clean-classic/linux-arm32/txt/install.sh deleted file mode 100755 index 31a44f8df83883915ad2ad61badb8254ceb95569..0000000000000000000000000000000000000000 --- a/clean-classic/linux-arm32/txt/install.sh +++ /dev/null @@ -1,44 +0,0 @@ - -set -e - -./make.sh - -CALL_CP="cp --preserve=timestamps" -CALL_CHMOD="chmod 644" - -CLEAN_MODULES="StdArray StdCharList StdClass StdDebug StdFunc StdFunctions StdList StdOrdList \ - StdOverloaded StdTuple _SystemEnum StdEnum _SystemArray StdEnv _SystemStrictLists \ - _SystemEnumStrict StdStrictLists StdOverloadedList StdGeneric StdMaybe _SystemStrictMaybes" - -SYSTEM_MODULES="StdBool StdChar StdFile StdInt StdMisc StdReal StdString" - -ABC_MODULES="_system" - -OBJECT_MODULES="_startup _startupTrace" - -mkdir -p $INSTALL_STDENV_DIR - -mkdir -p $INSTALL_STDENV_DIR/"Clean System Files" - -for M in $CLEAN_MODULES $SYSTEM_MODULES; do - $CALL_CP $M.icl $INSTALL_STDENV_DIR/$M.icl - $CALL_CHMOD $INSTALL_STDENV_DIR/$M.icl -done - -for M in $CLEAN_MODULES $SYSTEM_MODULES $ABC_MODULES $OBJECT_MODULES; do - $CALL_CP $M.dcl $INSTALL_STDENV_DIR/$M.dcl - $CALL_CHMOD $INSTALL_STDENV_DIR/$M.dcl -done - -for M in $SYSTEM_MODULES $CLEAN_MODULES $ABC_MODULES; do - $CALL_CP "Clean System Files"/$M.abc $INSTALL_STDENV_DIR/"Clean System Files"/$M.abc - $CALL_CHMOD $INSTALL_STDENV_DIR/"Clean System Files"/$M.abc -done - -sleep 1 - -for M in $SYSTEM_MODULES $CLEAN_MODULES $ABC_MODULES $OBJECT_MODULES; do - $CALL_CP "Clean System Files"/$M.o $INSTALL_STDENV_DIR/"Clean System Files"/$M.o - $CALL_CHMOD $INSTALL_STDENV_DIR/"Clean System Files"/$M.o -done - diff --git a/clean-classic/linux-arm64/build_examples.sh b/clean-classic/linux-arm64/build_examples.sh index 878005b0351d0c6d8fc1532f28f24937509513dd..b973e2b9b4ba3f9b1ed4096a6f462b7549dcdeee 100755 --- a/clean-classic/linux-arm64/build_examples.sh +++ b/clean-classic/linux-arm64/build_examples.sh @@ -48,7 +48,7 @@ clm -nt -b -IL Gast -IL Platform bool -o bool clm -nt -b -IL Gast -IL Platform char -o char clm -nt -b -IL Gast -IL Platform int -o int clm -nt -b -IL Gast -IL Platform tree -o tree -clm -nt -b -IL Gast -IL Platform with_options -o with_options +clm -nt -nr -IL Gast -IL Platform with_options -o with_options EOF chmod +x clean/examples/GastExamples/make.sh diff --git a/clean-classic/linux-thumb/build.sh b/clean-classic/linux-thumb/build.sh index f8ec327b6ba0857a3ff1f695e3dc5f0aa1f63b6f..389af3a2192f1ab1de4f85f9c050898c010728f0 100755 --- a/clean-classic/linux-thumb/build.sh +++ b/clean-classic/linux-thumb/build.sh @@ -26,7 +26,6 @@ mv clean-libraries step0/ mv compiler step0/ mv write_clean_manual step0/ mv htoclean step0/ -mv StdDynamicEnv step0/ mv clean-ide step0/ mv clean-platform step0/ ./clean-classic/linux-thumb/build_htoclean.sh diff --git a/clean-classic/linux-thumb/build_clean.sh b/clean-classic/linux-thumb/build_clean.sh index 03c25f491a2f2316c89f4c32c339fb0aba01c3dc..d0b1da8a0e8cab7dd9c0e08d155cc161badbd33e 100755 --- a/clean-classic/linux-thumb/build_clean.sh +++ b/clean-classic/linux-thumb/build_clean.sh @@ -42,6 +42,9 @@ done mkdir -p clean/data/Generics cp clean-libraries/Libraries/GenLib/*.[id]cl clean/data/Generics/ +mkdir -p clean/data/Gast +cp -r -t clean/data/Gast clean-libraries/Libraries/Gast/* + mkdir -p clean/data/StdLib cp clean-libraries/Libraries/StdLib/*.[id]cl clean/data/StdLib/ @@ -77,14 +80,6 @@ cp clean-libraries/Libraries/TCPIP/Linux_C/cTCP_121.o "clean/data/TCPIP/Clean Sy cp clean-libraries/Libraries/TCPIP/Linux_C/cTCP_121.c "clean/data/TCPIP/Clean System Files" cp clean-libraries/Libraries/TCPIP/Linux_C/cTCP_121.h "clean/data/TCPIP/Clean System Files" -mkdir -p "clean/data/Dynamics/Clean System Files" -cp StdDynamicEnv/extension/StdCleanTypes.dcl clean/data/Dynamics -cp StdDynamicEnv/extension/StdCleanTypes.icl clean/data/Dynamics -cp StdDynamicEnv/extension/StdDynamic.dcl clean/data/Dynamics -cp StdDynamicEnv/extension/StdDynamicNoLinker.icl clean/data/Dynamics/StdDynamic.icl -cp StdDynamicEnv/implementation/_SystemDynamic.dcl clean/data/Dynamics -cp StdDynamicEnv/implementation/_SystemDynamic.icl clean/data/Dynamics - mkdir -p clean/data/Platform cp -r -t clean/data/Platform clean-platform/src/libraries/OS-Independent/* cp -r -t clean/data/Platform clean-platform/src/libraries/OS-Posix/* diff --git a/clean-classic/linux-thumb/build_examples.sh b/clean-classic/linux-thumb/build_examples.sh index e34974b1cabbe79e72f75f3fbc3b09b242e633c9..b973e2b9b4ba3f9b1ed4096a6f462b7549dcdeee 100755 --- a/clean-classic/linux-thumb/build_examples.sh +++ b/clean-classic/linux-thumb/build_examples.sh @@ -37,6 +37,21 @@ clm -nt -dynamics type_dependent_functions -o type_dependent_functions EOF chmod +x clean/examples/DynamicsExamples/make.sh +(cd git/gast; git checkout master Tests) +mkdir -p clean/examples/GastExamples +mv git/gast/Tests/*.icl clean/examples/GastExamples +rm -rf git/gast/Tests + +cat > clean/examples/GastExamples/make.sh<< EOF +export PATH=../../bin:\$PATH +clm -nt -b -IL Gast -IL Platform bool -o bool +clm -nt -b -IL Gast -IL Platform char -o char +clm -nt -b -IL Gast -IL Platform int -o int +clm -nt -b -IL Gast -IL Platform tree -o tree +clm -nt -nr -IL Gast -IL Platform with_options -o with_options +EOF +chmod +x clean/examples/GastExamples/make.sh + mkdir -p clean/examples/PlatformExamples/socket mkdir -p clean/examples/PlatformExamples/WebPM/icons cp clean-platform/src/examples/*.* clean/examples/PlatformExamples diff --git a/clean-classic/linux-thumb/build_libraries.sh b/clean-classic/linux-thumb/build_libraries.sh index 524bc63406505679ca66ce198f81637028dfa8be..1a40c76197513e4ed06f8d50c5c6e4d34e59dad4 100755 --- a/clean-classic/linux-thumb/build_libraries.sh +++ b/clean-classic/linux-thumb/build_libraries.sh @@ -1,13 +1,14 @@ set -e -# rsync -r --exclude .svn svn/StdDynamicEnv . -cp -R --preserve=timestamps svn/StdDynamicEnv . - (cd git/clean-libraries; git checkout master \ Libraries/Directory Libraries/TCPIP Libraries/StdLib Libraries/GenLib Libraries/MersenneTwister) mkdir -p clean-libraries/Libraries mv git/clean-libraries/Libraries/* clean-libraries/Libraries/ +(cd git/gast; git checkout master Libraries/Gast.dcl Libraries/Gast.icl Libraries/Gast) +mkdir -p clean-libraries/Libraries +mv git/gast/Libraries clean-libraries/Libraries/Gast/ + (cd git/clean-platform; git checkout master .) mkdir clean-platform mv git/clean-platform/* clean-platform/ diff --git a/clean-classic/linux-thumb/build_stdenv.sh b/clean-classic/linux-thumb/build_stdenv.sh index 6026c8140bc565c0c69227677f0aba263266b53a..32bee9de03ab6a30da384f93cdc22d76f6f1d5b2 100755 --- a/clean-classic/linux-thumb/build_stdenv.sh +++ b/clean-classic/linux-thumb/build_stdenv.sh @@ -10,13 +10,13 @@ cp stdenv/_system.dcl clean/StdEnv for a in StdArray StdBool StdChar StdInt StdReal StdString StdFile StdCharList StdClass StdDebug \ StdEnum StdEnv StdFunc StdFunctions StdList StdMisc StdOrdList StdOverloaded \ StdOverloadedList StdStrictLists StdTuple _SystemArray _SystemEnum _SystemEnumStrict \ - _SystemStrictLists StdGeneric StdMaybe _SystemStrictMaybes; + _SystemStrictLists StdGeneric StdMaybe _SystemStrictMaybes _SystemDynamic StdDynamic; do cp stdenv/$a.[di]cl clean/StdEnv ; done -cp clean-classic/linux-thumb/txt/Makefile_stdenv clean/StdEnv/Makefile -cp clean-classic/linux-thumb/txt/make.sh clean/StdEnv/make.sh -cp clean-classic/linux-thumb/txt/install.sh clean/StdEnv/install.sh +cp stdenv/Makefile_no_profile.linux clean/StdEnv/Makefile +cp stdenv/make.sh clean/StdEnv/make.sh +cp stdenv/install_no_profile.sh clean/StdEnv/install.sh mkdir -p clean/StdEnv/Clean\ System\ Files cp "stdenv/Clean System Files/_system.abc" clean/StdEnv/Clean\ System\ Files @@ -27,11 +27,11 @@ clean/exe/cg clean/StdEnv/Clean\ System\ Files/_system echo first compile of system modules for a in StdChar; # compile twice for inlining -do clean/exe/cocl -ou -P clean/StdEnv $a ; +do clean/exe/cocl -pt -pm -ou -P clean/StdEnv $a ; done echo second compile of system modules for a in StdMisc StdBool StdInt StdChar StdFile StdReal StdString; -do clean/exe/cocl -ou -P clean/StdEnv $a ; +do clean/exe/cocl -pt -pm -ou -P clean/StdEnv $a ; done diff --git a/clean-classic/linux-thumb/cleanup.sh b/clean-classic/linux-thumb/cleanup.sh index 1edb4a07ab2c556e46681f3bbe856f87c3e580de..853c2bce6f743082564b020327f5b972cddcb02f 100755 --- a/clean-classic/linux-thumb/cleanup.sh +++ b/clean-classic/linux-thumb/cleanup.sh @@ -14,5 +14,4 @@ rm -Rf clean0 rm -Rf step0 rm -Rf htoclean -rm -Rf StdDynamicEnv rm -Rf write_clean_manual diff --git a/clean-classic/linux-thumb/get_sources.sh b/clean-classic/linux-thumb/get_sources.sh index f03765cf62141ea62b0be65fa148f539d459ffe9..4fb63c76c092412d631e17e298d155dd279a9146 100755 --- a/clean-classic/linux-thumb/get_sources.sh +++ b/clean-classic/linux-thumb/get_sources.sh @@ -8,12 +8,11 @@ git clone -n --depth=1 https://gitlab.science.ru.nl/clean-compiler-and-rts/stden git clone -n --depth=1 https://gitlab.science.ru.nl/clean-and-itasks/clm.git git clone -n --depth=1 https://gitlab.science.ru.nl/clean-and-itasks/clean-ide.git git clone -n --depth=1 https://gitlab.science.ru.nl/clean-and-itasks/clean-libraries.git +git clone -n --depth=1 https://gitlab.science.ru.nl/clean-and-itasks/gast.git gast git clone -n --depth=1 https://gitlab.science.ru.nl/clean-and-itasks/clean-platform.git cd .. mkdir svn cd svn svn export https://svn.cs.ru.nl/repos/clean-tools/trunk clean-tools -#svn export https://svn.cs.ru.nl/repos/clean-dynamic-system/trunk clean-dynamic-system -svn export https://svn.cs.ru.nl/repos/clean-dynamic-system/trunk/dynamics/StdDynamicEnv StdDynamicEnv svn export https://svn.cs.ru.nl/repos/clean-dynamic-system/trunk/dynamics/Examples/Examples\ No\ Linker DynamicsExamples cd .. diff --git a/clean-classic/linux-thumb/txt/Makefile b/clean-classic/linux-thumb/txt/Makefile index faecf03c83ca856951baaa2db62e86b840f17c60..1bdfe8110873be4a666c6a0c7bfb260a12507fa9 100644 --- a/clean-classic/linux-thumb/txt/Makefile +++ b/clean-classic/linux-thumb/txt/Makefile @@ -56,7 +56,7 @@ GMAKECURRENTDIR = ${shell echo `pwd`} # # Install section # -install: install_bin install_stdenv install_man install_doc install_ArgEnv install_Generics install_StdLib install_Directory install_MersenneTwister install_TCPIP install_Dynamics install_Platform $(PATCHES) +install: install_bin install_stdenv install_man install_doc install_ArgEnv install_Generics install_Gast install_StdLib install_Directory install_MersenneTwister install_TCPIP install_Platform $(PATCHES) $(PATCH_BIN) $(INSTALL_CLM) CLEANLIB $(INSTALL_EXE_DIR) cleanup: cleanup_stdenv @@ -173,6 +173,13 @@ $(INSTALL_LIB_DIR)/Generics : install_Generics : $(INSTALL_LIB_DIR)/Generics cp -r data/Generics/* $(INSTALL_LIB_DIR)/Generics +$(INSTALL_LIB_DIR)/Gast : + mkdir -p $@ + mkdir -p $@/"Clean System Files" + +install_Gast : $(INSTALL_LIB_DIR)/Gast + cp -r data/Gast/* $(INSTALL_LIB_DIR)/Gast + $(INSTALL_LIB_DIR)/StdLib : mkdir -p $@ mkdir -p $@/"Clean System Files" @@ -201,13 +208,6 @@ $(INSTALL_LIB_DIR)/TCPIP: install_TCPIP: $(INSTALL_LIB_DIR)/TCPIP cp -r data/TCPIP/* $(INSTALL_LIB_DIR)/TCPIP -$(INSTALL_LIB_DIR)/Dynamics: - mkdir -p $@ - mkdir -p $@/"Clean System Files" - -install_Dynamics: $(INSTALL_LIB_DIR)/Dynamics - cp -r data/Dynamics/* $(INSTALL_LIB_DIR)/Dynamics - $(INSTALL_LIB_DIR)/Platform: mkdir -p $@ mkdir -p $@/"Clean System Files" diff --git a/clean-classic/linux-thumb/txt/Makefile_stdenv b/clean-classic/linux-thumb/txt/Makefile_stdenv deleted file mode 100644 index 1fb7634f9dd8871a7db6dddbc3a8b46a1ee7f5c6..0000000000000000000000000000000000000000 --- a/clean-classic/linux-thumb/txt/Makefile_stdenv +++ /dev/null @@ -1,313 +0,0 @@ -# -# Makefile for the Clean Standard Environment -# -# make (= make stdenv): -# compiles all modules -# -# make install: -# compiles all modules -# copies files to install directory -# -# make cleanup: -# removes all files in this directory that can be recreated -# - -CLEAN_MODULES = \ - StdArray StdCharList StdClass StdDebug StdFunc StdFunctions StdList StdOrdList \ - StdOverloaded StdTuple _SystemEnum StdEnum _SystemArray StdEnv _SystemStrictLists \ - _SystemEnumStrict StdStrictLists StdOverloadedList StdGeneric StdMaybe _SystemStrictMaybes - -SYSTEM_MODULES = \ - StdBool StdChar StdFile StdInt StdMisc StdReal StdString - -ABC_MODULES = \ - _system - -OBJECT_MODULES = \ - _startup _startupTrace - -SYSTEM_OBJECT_MODULES = \ - -CLEAN_MODULES_ABC = $(CLEAN_MODULES:%=Clean\ System\ Files/%.abc) - -SYSTEM_MODULES_ABC = $(SYSTEM_MODULES:%=Clean\ System\ Files/%.abc) - -SYSTEM_MODULES_ICL = $(SYSTEM_MODULES:%=%.icl) - -ABC_MODULES_ABC = $(ABC_MODULES:%=Clean\ System\ Files/%.abc) - -CLEAN_MODULES_O = $(CLEAN_MODULES:%=Clean\ System\ Files/%.o) - -SYSTEM_MODULES_O = $(SYSTEM_MODULES:%=Clean\ System\ Files/%.o) - -ABC_MODULES_O = $(ABC_MODULES:%=Clean\ System\ Files/%.o) - -OBJECT_MODULES_O = $(OBJECT_MODULES:%=Clean\ System\ Files/%.o) - -SYSTEM_OBJECT_MODULES_O = $(SYSTEM_OBJECT_MODULES:%=Clean\ System\ Files/%.o) - -STDENV_FILES = \ - $(CLEAN_MODULES:%=%.icl) \ - $(CLEAN_MODULES:%=%.dcl) \ - $(SYSTEM_MODULES:%=%.dcl) \ - $(SYSTEM_MODULES_ABC) \ - $(CLEAN_MODULES_ABC) \ - $(ABC_MODULES_ABC) \ - wait1 \ - $(SYSTEM_MODULES_O) \ - $(CLEAN_MODULES_O) \ - $(ABC_MODULES_O) \ - $(OBJECT_MODULES_O) \ - $(SYSTEM_OBJECT_MODULES_O) - -wait1: - sleep 1 - -# -# Compile -# - -stdenv: $(STDENV_FILES) - -# -# Install -# -# the order here is important, because the files will be -# installed in the order given below. - -INSTALL_STDENV_FILES = \ - $(CLEAN_MODULES:%=$(INSTALL_STDENV_DIR)/%.icl) \ - $(CLEAN_MODULES:%=$(INSTALL_STDENV_DIR)/%.dcl) \ - $(SYSTEM_MODULES:%=$(INSTALL_STDENV_DIR)/%.dcl) \ - $(ABC_MODULES:%=$(INSTALL_STDENV_DIR)/%.dcl) \ - $(OBJECT_MODULES:%=$(INSTALL_STDENV_DIR)/%.dcl) \ - $(SYSTEM_MODULES:%=$(INSTALL_STDENV_DIR)/Clean\ System\ Files/%.abc) \ - $(CLEAN_MODULES:%=$(INSTALL_STDENV_DIR)/Clean\ System\ Files/%.abc) \ - $(ABC_MODULES:%=$(INSTALL_STDENV_DIR)/Clean\ System\ Files/%.abc) \ - wait2 \ - $(SYSTEM_MODULES:%=$(INSTALL_STDENV_DIR)/Clean\ System\ Files/%.o) \ - $(CLEAN_MODULES:%=$(INSTALL_STDENV_DIR)/Clean\ System\ Files/%.o) \ - $(ABC_MODULES:%=$(INSTALL_STDENV_DIR)/Clean\ System\ Files/%.o) \ - $(OBJECT_MODULES:%=$(INSTALL_STDENV_DIR)/Clean\ System\ Files/%.o) \ - $(SYSTEM_OBJECT_MODULES:%=$(INSTALL_STDENV_DIR)/Clean\ System\ Files/%.o) - -install: stdenv $(INSTALL_STDENV_DIR) $(INSTALL_STDENV_DIR)/Clean\ System\ Files $(INSTALL_STDENV_FILES) - -wait2: - sleep 1 - -$(INSTALL_STDENV_DIR) : - mkdir -p "$@" - -$(INSTALL_STDENV_DIR)/Clean\ System\ Files : - mkdir -p "$@" - -$(INSTALL_STDENV_DIR)/% : % - cp --preserve=timestamps "$<" "$@" - chmod 644 "$@" - -# -# Cleanup -# - -cleanup: - $(RM) $(CLEAN_MODULES_ABC) \ - $(RM) $(CLEAN_MODULES_O) \ - $(RM) $(SYSTEM_MODULES_O) \ - $(RM) $(ABC_MODULES_O) - -# -# Commands -# - -CLM = clm -P . -CLMFLAGS = - -.SUFFIXES: .abc .dcl .icl .o - -.icl.abc: - $(CLM) $(CLMFLAGS) -ABC $* - -.icl.o: - $(CLM) $(CLMFLAGS) -O `basename "$*" .icl` - -.abc.o: - $(CLM) $(CLMFLAGS) -O `basename "$*" .icl` - - -Clean\ System\ Files/StdArray.o : StdArray.icl StdArray.dcl - $(CLM) -O StdArray - -Clean\ System\ Files/StdArray.abc : StdArray.icl StdArray.dcl - $(CLM) -ABC StdArray - -Clean\ System\ Files/StdCharList.o : StdCharList.icl StdCharList.dcl - $(CLM) -O StdCharList - -Clean\ System\ Files/StdCharList.abc : StdCharList.icl StdCharList.dcl - $(CLM) -ABC StdCharList - -Clean\ System\ Files/StdClass.o : StdClass.icl StdClass.dcl - $(CLM) -O StdClass - -Clean\ System\ Files/StdClass.abc : StdClass.icl StdClass.dcl - $(CLM) -ABC StdClass - -Clean\ System\ Files/StdDebug.o : StdDebug.icl StdDebug.dcl - $(CLM) -O StdDebug - -Clean\ System\ Files/StdDebug.abc : StdDebug.icl StdDebug.dcl - $(CLM) -ABC StdDebug - -Clean\ System\ Files/StdEnum.o : StdEnum.icl StdEnum.dcl - $(CLM) -O StdEnum - -Clean\ System\ Files/StdEnum.abc : StdEnum.icl StdEnum.dcl - $(CLM) -ABC StdEnum - -Clean\ System\ Files/StdEnv.o : StdEnv.icl StdEnv.dcl - $(CLM) -O StdEnv - -Clean\ System\ Files/StdEnv.abc : StdEnv.icl StdEnv.dcl - $(CLM) -ABC StdEnv - -Clean\ System\ Files/StdFunc.o : StdFunc.icl StdFunc.dcl - $(CLM) -O StdFunc - -Clean\ System\ Files/StdFunc.abc : StdFunc.icl StdFunc.dcl - $(CLM) -ABC StdFunc - -Clean\ System\ Files/StdFunctions.o : StdFunctions.icl StdFunctions.dcl - $(CLM) -O StdFunctions - -Clean\ System\ Files/StdFunctions.abc : StdFunctions.icl StdFunctions.dcl - $(CLM) -ABC StdFunctions - -Clean\ System\ Files/StdMaybe.o : StdMaybe.icl StdMaybe.dcl - $(CLM) -O StdMaybe - -Clean\ System\ Files/StdMaybe.abc : StdMaybe.icl StdMaybe.dcl - $(CLM) -ABC StdMaybe - -Clean\ System\ Files/StdList.o : StdList.icl StdList.dcl - $(CLM) -O StdList - -Clean\ System\ Files/StdList.abc : StdList.icl StdList.dcl - $(CLM) -ABC StdList - -Clean\ System\ Files/StdOrdList.o : StdOrdList.icl StdOrdList.dcl - $(CLM) -O StdOrdList - -Clean\ System\ Files/StdOrdList.abc : StdOrdList.icl StdOrdList.dcl - $(CLM) -ABC StdOrdList - -Clean\ System\ Files/StdOverloaded.o : StdOverloaded.icl StdOverloaded.dcl - $(CLM) -O StdOverloaded - -Clean\ System\ Files/StdOverloaded.abc : StdOverloaded.icl StdOverloaded.dcl - $(CLM) -ABC StdOverloaded - -Clean\ System\ Files/StdTuple.o : StdTuple.icl StdTuple.dcl - $(CLM) -O StdTuple - -Clean\ System\ Files/StdTuple.abc : StdTuple.icl StdTuple.dcl - $(CLM) -ABC StdTuple - -Clean\ System\ Files/_SystemEnum.o : _SystemEnum.icl _SystemEnum.dcl - $(CLM) -O _SystemEnum - -Clean\ System\ Files/_SystemEnum.abc : _SystemEnum.icl _SystemEnum.dcl - $(CLM) -ABC _SystemEnum - -Clean\ System\ Files/StdBool.o : StdBool.dcl Clean\ System\ Files/StdBool.abc - $(CLM) -O StdBool - -Clean\ System\ Files/StdBool.abc : StdBool.icl StdBool.dcl - $(CLM) -ABC StdBool - -Clean\ System\ Files/StdChar.o : StdChar.dcl Clean\ System\ Files/StdChar.abc - $(CLM) -O StdChar - -Clean\ System\ Files/StdChar.abc : StdChar.icl StdChar.dcl - $(CLM) -ABC StdChar - -Clean\ System\ Files/StdFile.o : StdFile.dcl Clean\ System\ Files/StdFile.abc - $(CLM) -O StdFile - -Clean\ System\ Files/StdFile.abc : StdFile.icl StdFile.dcl - $(CLM) -ABC StdFile - -Clean\ System\ Files/StdInt.o : StdInt.dcl Clean\ System\ Files/StdInt.abc - $(CLM) -O StdInt - -Clean\ System\ Files/StdInt.abc : StdInt.icl StdInt.dcl - $(CLM) -ABC StdInt - -Clean\ System\ Files/StdMisc.o : StdMisc.dcl Clean\ System\ Files/StdMisc.abc - $(CLM) -O StdMisc - -Clean\ System\ Files/StdMisc.abc : StdMisc.icl StdMisc.dcl - $(CLM) -ABC StdMisc - -Clean\ System\ Files/StdReal.o : StdReal.dcl Clean\ System\ Files/StdReal.abc - $(CLM) -O StdReal - -Clean\ System\ Files/StdReal.abc : StdReal.icl StdReal.dcl - $(CLM) -ABC StdReal - -Clean\ System\ Files/StdString.o : StdString.dcl Clean\ System\ Files/StdString.abc - $(CLM) -O StdString - -Clean\ System\ Files/StdString.abc : StdString.icl StdString.dcl - $(CLM) ABC StdString - -Clean\ System\ Files/_SystemArray.o : _SystemArray.dcl Clean\ System\ Files/_SystemArray.abc - $(CLM) -O _SystemArray - -Clean\ System\ Files/_SystemArray.abc : _SystemArray.icl _SystemArray.dcl - $(CLM) -ABC _SystemArray - -Clean\ System\ Files/_SystemStrictLists.o : _SystemStrictLists.dcl Clean\ System\ Files/_SystemStrictLists.abc - $(CLM) -O _SystemStrictLists - -Clean\ System\ Files/_SystemStrictLists.abc : _SystemStrictLists.icl _SystemStrictLists.dcl - $(CLM) -ABC _SystemStrictLists - -Clean\ System\ Files/_SystemEnumStrict.o : _SystemEnumStrict.dcl Clean\ System\ Files/_SystemEnumStrict.abc - $(CLM) -O _SystemEnumStrict - -Clean\ System\ Files/_SystemEnumStrict.abc : _SystemEnumStrict.icl _SystemEnumStrict.dcl - $(CLM) -ABC _SystemEnumStrict - -Clean\ System\ Files/StdStrictLists.o : StdStrictLists.dcl Clean\ System\ Files/StdStrictLists.abc - $(CLM) -O StdStrictLists - -Clean\ System\ Files/StdStrictLists.abc : StdStrictLists.icl StdStrictLists.dcl - $(CLM) -ABC StdStrictLists - -Clean\ System\ Files/StdOverloadedList.o : StdOverloadedList.dcl Clean\ System\ Files/StdOverloadedList.abc - $(CLM) -O StdOverloadedList - -Clean\ System\ Files/StdOverloadedList.abc : StdOverloadedList.icl StdOverloadedList.dcl - $(CLM) -ABC StdOverloadedList - -Clean\ System\ Files/StdGeneric.abc : StdGeneric.icl StdGeneric.dcl - $(CLM) -ABC StdGeneric - -Clean\ System\ Files/StdGeneric.o : StdGeneric.dcl Clean\ System\ Files/StdGeneric.abc - $(CLM) -O StdGeneric - -Clean\ System\ Files/_SystemStrictMaybes.o : _SystemStrictMaybes.dcl Clean\ System\ Files/_SystemStrictMaybes.abc - $(CLM) -O _SystemStrictMaybes - -Clean\ System\ Files/_system.o : Clean\ System\ Files/_system.abc - $(CLM) -O _system - -# compile system modules twice, to make sure all inlining is done -system_abc: $(SYSTEM_MODULES_ABC) system_abc_touch - -system_abc_touch: - touch $(SYSTEM_MODULES_ICL) - $(MAKE) system_abc_again - -system_abc_again: $(SYSTEM_MODULES_ABC) diff --git a/clean-classic/linux-thumb/txt/install.sh b/clean-classic/linux-thumb/txt/install.sh deleted file mode 100755 index 31a44f8df83883915ad2ad61badb8254ceb95569..0000000000000000000000000000000000000000 --- a/clean-classic/linux-thumb/txt/install.sh +++ /dev/null @@ -1,44 +0,0 @@ - -set -e - -./make.sh - -CALL_CP="cp --preserve=timestamps" -CALL_CHMOD="chmod 644" - -CLEAN_MODULES="StdArray StdCharList StdClass StdDebug StdFunc StdFunctions StdList StdOrdList \ - StdOverloaded StdTuple _SystemEnum StdEnum _SystemArray StdEnv _SystemStrictLists \ - _SystemEnumStrict StdStrictLists StdOverloadedList StdGeneric StdMaybe _SystemStrictMaybes" - -SYSTEM_MODULES="StdBool StdChar StdFile StdInt StdMisc StdReal StdString" - -ABC_MODULES="_system" - -OBJECT_MODULES="_startup _startupTrace" - -mkdir -p $INSTALL_STDENV_DIR - -mkdir -p $INSTALL_STDENV_DIR/"Clean System Files" - -for M in $CLEAN_MODULES $SYSTEM_MODULES; do - $CALL_CP $M.icl $INSTALL_STDENV_DIR/$M.icl - $CALL_CHMOD $INSTALL_STDENV_DIR/$M.icl -done - -for M in $CLEAN_MODULES $SYSTEM_MODULES $ABC_MODULES $OBJECT_MODULES; do - $CALL_CP $M.dcl $INSTALL_STDENV_DIR/$M.dcl - $CALL_CHMOD $INSTALL_STDENV_DIR/$M.dcl -done - -for M in $SYSTEM_MODULES $CLEAN_MODULES $ABC_MODULES; do - $CALL_CP "Clean System Files"/$M.abc $INSTALL_STDENV_DIR/"Clean System Files"/$M.abc - $CALL_CHMOD $INSTALL_STDENV_DIR/"Clean System Files"/$M.abc -done - -sleep 1 - -for M in $SYSTEM_MODULES $CLEAN_MODULES $ABC_MODULES $OBJECT_MODULES; do - $CALL_CP "Clean System Files"/$M.o $INSTALL_STDENV_DIR/"Clean System Files"/$M.o - $CALL_CHMOD $INSTALL_STDENV_DIR/"Clean System Files"/$M.o -done - diff --git a/clean-classic/linux-x64/build_examples.sh b/clean-classic/linux-x64/build_examples.sh index 878005b0351d0c6d8fc1532f28f24937509513dd..b973e2b9b4ba3f9b1ed4096a6f462b7549dcdeee 100755 --- a/clean-classic/linux-x64/build_examples.sh +++ b/clean-classic/linux-x64/build_examples.sh @@ -48,7 +48,7 @@ clm -nt -b -IL Gast -IL Platform bool -o bool clm -nt -b -IL Gast -IL Platform char -o char clm -nt -b -IL Gast -IL Platform int -o int clm -nt -b -IL Gast -IL Platform tree -o tree -clm -nt -b -IL Gast -IL Platform with_options -o with_options +clm -nt -nr -IL Gast -IL Platform with_options -o with_options EOF chmod +x clean/examples/GastExamples/make.sh diff --git a/clean-classic/linux-x86/build_examples.sh b/clean-classic/linux-x86/build_examples.sh index 878005b0351d0c6d8fc1532f28f24937509513dd..b973e2b9b4ba3f9b1ed4096a6f462b7549dcdeee 100755 --- a/clean-classic/linux-x86/build_examples.sh +++ b/clean-classic/linux-x86/build_examples.sh @@ -48,7 +48,7 @@ clm -nt -b -IL Gast -IL Platform bool -o bool clm -nt -b -IL Gast -IL Platform char -o char clm -nt -b -IL Gast -IL Platform int -o int clm -nt -b -IL Gast -IL Platform tree -o tree -clm -nt -b -IL Gast -IL Platform with_options -o with_options +clm -nt -nr -IL Gast -IL Platform with_options -o with_options EOF chmod +x clean/examples/GastExamples/make.sh diff --git a/clean-classic/macos-x64/build_examples.sh b/clean-classic/macos-x64/build_examples.sh index 878005b0351d0c6d8fc1532f28f24937509513dd..b973e2b9b4ba3f9b1ed4096a6f462b7549dcdeee 100755 --- a/clean-classic/macos-x64/build_examples.sh +++ b/clean-classic/macos-x64/build_examples.sh @@ -48,7 +48,7 @@ clm -nt -b -IL Gast -IL Platform bool -o bool clm -nt -b -IL Gast -IL Platform char -o char clm -nt -b -IL Gast -IL Platform int -o int clm -nt -b -IL Gast -IL Platform tree -o tree -clm -nt -b -IL Gast -IL Platform with_options -o with_options +clm -nt -nr -IL Gast -IL Platform with_options -o with_options EOF chmod +x clean/examples/GastExamples/make.sh diff --git a/clean-classic/windows-x64/build.sh b/clean-classic/windows-x64/build.sh index 2be1cccc3fb9c32e3940ca85af25c94bc43e86e8..b4b3fbbf4d8460767cf01f27704d5f1988b8dc08 100644 --- a/clean-classic/windows-x64/build.sh +++ b/clean-classic/windows-x64/build.sh @@ -372,7 +372,8 @@ cvscleansystem () mv "$1/clean-libraries-git/Libraries/GenLib" "$1/libraries/GenLib" # svn_get "$1" clean-libraries/trunk/Examples/GenLib CleanExamples/Generics mv "$1/clean-libraries-git/Examples/GenLib" "$1/CleanExamples/Generics" - svn_get "$1" gast libraries/Gast +# svn_get "$1" gast libraries/Gast + git_get "$1" clean-and-itasks/gast.git libraries/Gast # svn_get "$1" clean-examples/trunk CleanExamples/Small\ Examples # svn_get "$1" clean-libraries/trunk/Examples/Small\ Examples CleanExamples/Small\ Examples mv "$1/clean-libraries-git/Examples/Small Examples" "$1/CleanExamples/Small Examples" @@ -484,7 +485,7 @@ xremove () # NONCLEAN_COMPONENTS="runtimesystem backend idersrc ioobjects codegen stdenvobj" -NONCLEAN_COMPONENTS="runtimesystem codegen backend ioobjects tcpip idersrc platform" +NONCLEAN_COMPONENTS="runtimesystem codegen backend ioobjects tcpip idersrc gast platform" runtimesystem_build () # $1: cvs dir @@ -625,6 +626,24 @@ tcpip_dist () cp "$1"/tcpip/cCrossCallTCP_121.obj "$2/Libraries/TCPIP/ObjectIO/Clean System Files/cCrossCallTCP_121.obj" } +gast_build () + # $1: cvs dir + # $2: build dir +{ + : +} + +gast_dist () + # $1: non-Clean build dir + # $2: dist dir +{ + (cd "$2/Examples/Gast"; $2/cpm.exe project char.prj create; $2/cpm.exe project char.prj target Gast; $2/cpm.exe project char.prj set -b) + (cd "$2/Examples/Gast"; $2/cpm.exe project bool.prj create; $2/cpm.exe project bool.prj target Gast; $2/cpm.exe project bool.prj set -b) + (cd "$2/Examples/Gast"; $2/cpm.exe project int.prj create; $2/cpm.exe project int.prj target Gast; $2/cpm.exe project int.prj set -b) + (cd "$2/Examples/Gast"; $2/cpm.exe project tree.prj create; $2/cpm.exe project tree.prj target Gast; $2/cpm.exe project tree.prj set -b) + (cd "$2/Examples/Gast"; $2/cpm.exe project with_options.prj create; $2/cpm.exe project with_options.prj target Gast; $2/cpm.exe project with_options.prj set -nr) +} + platform_build () # $1: cvs dir # $2: build dir @@ -1053,7 +1072,12 @@ distduplicate () xduplicate "$1/libraries/$distduplicate_library" "$2/Libraries/$distduplicate_library" done xduplicate "$1/libraries/ArgEnvWindows" "$2/Libraries/ArgEnv" - xduplicate "$1/libraries/Gast" "$2/Libraries/Gast" + + xmakedir "$2/Libraries/Gast" + xduplicate "$1/libraries/Gast/Libraries/Gast.icl" "$2/Libraries/Gast/Gast.icl" + xduplicate "$1/libraries/Gast/Libraries/Gast.dcl" "$2/Libraries/Gast/Gast.dcl" + xduplicate "$1/libraries/Gast/Libraries/Gast" "$2/Libraries/Gast/Gast" + xmove "$2/Libraries/Directory/Clean System Files Windows" \ "$2/Libraries/Directory/Clean System Files" # xmove "$2/Libraries/ExtendedArith/ExtendedArith/Clean System Files Windows" \ @@ -1099,9 +1123,6 @@ distduplicate () "$2/LibrariesObjectIO/OS Windows/Clean System Files"/*.obj; do xremove "$distduplicate_ioobj" done - xremove "$2/Libraries/Gast/trunk" - xremove "$2/Libraries/Gast/branches" - xremove "$2/Libraries/Gast/tags" # Examples xduplicate "$1"/CleanExamples/Generics "$2"/Examples/Generics @@ -1130,11 +1151,12 @@ distduplicate () xmove "$2/Libraries/Parsers/ParsersTestware.prj" "$2/Examples/Parsers/ParsersTestware.prj" xmove "$2/Libraries/Parsers/MetarDemo" "$2/Examples/Parsers/MetarDemo" - xmove "$2/Libraries/Gast/examples" "$2/Examples/Gast" - xremove "$2/Examples/Gast/testFixed.icl" - xremove "$2/Examples/Gast/testFixed.prj" - xremove "$2/Examples/Gast/fixed.icl" - xremove "$2/Examples/Gast/fixed.dcl" + xmakedir "$2/Examples/Gast" + xduplicate2 "$1/libraries/Gast/Tests/char.icl" "$2/Examples/Gast" + xduplicate2 "$1/libraries/Gast/Tests/bool.icl" "$2/Examples/Gast" + xduplicate2 "$1/libraries/Gast/Tests/int.icl" "$2/Examples/Gast" + xduplicate2 "$1/libraries/Gast/Tests/tree.icl" "$2/Examples/Gast" + xduplicate2 "$1/libraries/Gast/Tests/with_options.icl" "$2/Examples/Gast" xduplicate "$1/libraries/Platform/src/examples" "$2/Examples/Platform Examples" find "$2/Examples/Platform Examples" -name .gitignore -delete diff --git a/clean-classic/windows-x86/build.sh b/clean-classic/windows-x86/build.sh index ee62eb5706e06e8bb65363655f3329ed18166178..cb42bb432f3c5772cf6d407add403524ff29529f 100644 --- a/clean-classic/windows-x86/build.sh +++ b/clean-classic/windows-x86/build.sh @@ -407,7 +407,8 @@ cvscleansystem () done # svn_get "$1" clean-libraries/trunk/Libraries/ArgEnvWindows libraries/ArgEnvWindows mv "$1/clean-libraries-git/Libraries/ArgEnvWindows" "$1/libraries/ArgEnvWindows" - svn_get "$1" gast libraries/Gast +# svn_get "$1" gast libraries/Gast + git_get "$1" clean-and-itasks/gast.git libraries/Gast # svn_get "$1" clean-code-generator/trunk CodeGenerator git_get "$1" clean-compiler-and-rts/code-generator.git CodeGenerator # svn_get "$1" clean-run-time-system/trunk RuntimeSystem @@ -538,7 +539,7 @@ xremove () NONCLEAN_COMPONENTS="runtimesystem backend dynamicchannel dynamicgraphconversion - idersrc ioobjects tcpip codegen stdenvobj platform" + idersrc ioobjects tcpip codegen stdenvobj gast platform" runtimesystem_build () # $1: cvs dir @@ -743,6 +744,24 @@ tcpip_dist () cp "$1"/tcpip/cCrossCallTCP_121.o "$2/Libraries/TCPIP/ObjectIO/Clean System Files/cCrossCallTCP_121.o" } +gast_build () + # $1: cvs dir + # $2: build dir +{ + : +} + +gast_dist () + # $1: non-Clean build dir + # $2: dist dir +{ + (cd "$2/Examples/Gast"; $2/cpm.exe project char.prj create; $2/cpm.exe project char.prj target Gast; $2/cpm.exe project char.prj set -b) + (cd "$2/Examples/Gast"; $2/cpm.exe project bool.prj create; $2/cpm.exe project bool.prj target Gast; $2/cpm.exe project bool.prj set -b) + (cd "$2/Examples/Gast"; $2/cpm.exe project int.prj create; $2/cpm.exe project int.prj target Gast; $2/cpm.exe project int.prj set -b) + (cd "$2/Examples/Gast"; $2/cpm.exe project tree.prj create; $2/cpm.exe project tree.prj target Gast; $2/cpm.exe project tree.prj set -b) + (cd "$2/Examples/Gast"; $2/cpm.exe project with_options.prj create; $2/cpm.exe project with_options.prj target Gast; $2/cpm.exe project with_options.prj set -nr) +} + platform_build () # $1: cvs dir # $2: build dir @@ -1179,7 +1198,10 @@ distduplicate () done xduplicate "$1/libraries/StdEnv" "$2/Libraries/StdEnv" xduplicate "$1/libraries/ArgEnvWindows" "$2/Libraries/ArgEnv" - xduplicate "$1/libraries/Gast" "$2/Libraries/Gast" + xmakedir "$2/Libraries/Gast" + xduplicate "$1/libraries/Gast/Libraries/Gast.icl" "$2/Libraries/Gast/Gast.icl" + xduplicate "$1/libraries/Gast/Libraries/Gast.dcl" "$2/Libraries/Gast/Gast.dcl" + xduplicate "$1/libraries/Gast/Libraries/Gast" "$2/Libraries/Gast/Gast" xmove "$2/Libraries/Directory/Clean System Files Windows" \ "$2/Libraries/Directory/Clean System Files" # xmove "$2/Libraries/ExtendedArith/ExtendedArith/Clean System Files Windows" \ @@ -1234,9 +1256,6 @@ distduplicate () "$2/LibrariesObjectIO/OS Windows/Clean System Files"/*.obj; do xremove "$distduplicate_ioobj" done - xremove "$2/Libraries/Gast/trunk" - xremove "$2/Libraries/Gast/branches" - xremove "$2/Libraries/Gast/tags" # Examples xduplicate "$1"/CleanExamples/Generics "$2"/Examples/Generics @@ -1263,11 +1282,12 @@ distduplicate () xmove "$2/Libraries/Parsers/ParsersTestware.prj" "$2/Examples/Parsers/ParsersTestware.prj" xmove "$2/Libraries/Parsers/MetarDemo" "$2/Examples/Parsers/MetarDemo" - xmove "$2/Libraries/Gast/examples" "$2/Examples/Gast" - xremove "$2/Examples/Gast/testFixed.icl" - xremove "$2/Examples/Gast/testFixed.prj" - xremove "$2/Examples/Gast/fixed.icl" - xremove "$2/Examples/Gast/fixed.dcl" + xmakedir "$2/Examples/Gast" + xduplicate2 "$1/libraries/Gast/Tests/char.icl" "$2/Examples/Gast" + xduplicate2 "$1/libraries/Gast/Tests/bool.icl" "$2/Examples/Gast" + xduplicate2 "$1/libraries/Gast/Tests/int.icl" "$2/Examples/Gast" + xduplicate2 "$1/libraries/Gast/Tests/tree.icl" "$2/Examples/Gast" + xduplicate2 "$1/libraries/Gast/Tests/with_options.icl" "$2/Examples/Gast" xduplicate "$1/libraries/Platform/src/examples" "$2/Examples/Platform Examples" find "$2/Examples/Platform Examples" -name .gitignore -delete