diff --git a/clean-classic/linux-x86/build.sh b/clean-classic/linux-x86/build.sh index a0182dce181b1d8a0b2c4ed568d7304560ead773..aaaf8c2316d89502fbc76b3cc607a6fc81bcfea0 100755 --- a/clean-classic/linux-x86/build.sh +++ b/clean-classic/linux-x86/build.sh @@ -9,6 +9,7 @@ export BOOTCOMPILERPATH=$PWD/boot_compiler/bin:$PWD/boot_compiler/lib/exe:$PATH export PATH=$BOOTCOMPILERPATH ./clean-classic/linux-x86/build_htoclean.sh ./clean-classic/linux-x86/build_clc32.sh +./clean-classic/linux-x86/build_clc_itasks32.sh ./clean-classic/linux-x86/build_libraries.sh ./clean-classic/linux-x86/build_linker32.sh ./clean-classic/linux-x86/build_batch_build.sh @@ -24,6 +25,7 @@ mkdir step0 mv stdenv step0/ mv clean-libraries step0/ mv compiler step0/ +mv compiler_itask step0/ mv write_clean_manual step0/ mv htoclean step0/ mv elf_linker step0/ @@ -31,6 +33,7 @@ mv clean-ide step0/ mv clean-platform step0/ ./clean-classic/linux-x86/build_htoclean.sh ./clean-classic/linux-x86/build_clc32.sh +./clean-classic/linux-x86/build_clc_itasks32.sh ./clean-classic/linux-x86/build_libraries.sh ./clean-classic/linux-x86/build_linker32.sh ./clean-classic/linux-x86/build_batch_build.sh diff --git a/clean-classic/linux-x86/build_clc_itasks.sh b/clean-classic/linux-x86/build_clc_itasks.sh index e7c989d759b35a741a0adc9d745177f6f0f65e2d..e3c24b7722624fff16adb14bd87d488531d77484 100755 --- a/clean-classic/linux-x86/build_clc_itasks.sh +++ b/clean-classic/linux-x86/build_clc_itasks.sh @@ -1,19 +1,9 @@ set -e -# ./checkout.sh libraries/ArgEnvUnix -if test ! -d libraries/ArgEnvUnix ; then - ./svn_checkout.sh clean-libraries/trunk/Libraries/ArgEnvUnix libraries/ArgEnvUnix -fi -# ./checkout.sh compiler -./svn_checkout.sh clean-compiler/branches/itask compiler +(cd git/compiler; git checkout origin/itask -- .) +mkdir compiler_itask +mv git/compiler/* compiler_itask/ -cd compiler +cd compiler_itask clm -ABC -nw -ci -I backend -I frontend -I main -I main/Unix -IL ArgEnv backendconvert -cd unix -sed "s/-h 80M -s 4m/-h 512m -s 16m/" make.linux64.sh_ -rm -f make.linux64.sh -mv make.linux64.sh_ make.linux64.sh -chmod +x make.linux64.sh -cd .. unix/make.linux64.sh cd .. - diff --git a/clean-classic/linux-x86/build_clc_itasks32.sh b/clean-classic/linux-x86/build_clc_itasks32.sh index fc6d20c5204fbc2588027307b0dbb22c339d9dae..ae0c5871e9037e5ee3e756f29cac7c29d50108ed 100755 --- a/clean-classic/linux-x86/build_clc_itasks32.sh +++ b/clean-classic/linux-x86/build_clc_itasks32.sh @@ -1,19 +1,9 @@ set -e -# ./checkout.sh libraries/ArgEnvUnix -if test ! -d libraries/ArgEnvUnix ; then - ./svn_checkout.sh clean-libraries/trunk/Libraries/ArgEnvUnix libraries/ArgEnvUnix -fi -# ./checkout.sh compiler -./svn_checkout.sh clean-compiler/branches/itask compiler +(cd git/compiler; git checkout origin/itask -- .) +mkdir compiler_itask +mv git/compiler/* compiler_itask/ -cd compiler +cd compiler_itask clm -ABC -nw -ci -I backend -I frontend -I main -I main/Unix -IL ArgEnv backendconvert -cd unix -sed "s/-h 40M/-h 512m -s 16m/" make.linux.sh_ -rm -f make.linux.sh -mv make.linux.sh_ make.linux.sh -chmod +x make.linux.sh -cd .. unix/make.linux.sh cd .. - diff --git a/clean-classic/linux-x86/build_clean.sh b/clean-classic/linux-x86/build_clean.sh index d576cfb9354650dcb1c25820e2282a85c9b927a3..8decb2dd76a1390a4f626c5350971c6d04043a69 100755 --- a/clean-classic/linux-x86/build_clean.sh +++ b/clean-classic/linux-x86/build_clean.sh @@ -4,7 +4,8 @@ cat < clean/CleanLicenseCondi Clean is distributed under the terms of the simplified BSD license below, except for the Platform and Gast libraries and examples. The files and BSD licenses of these libraries and examples can be found in the directories -data/Platform, data/Gast, examples/Platform Examples and examples/Gast. +data/Platform, data/Gast, examples/PlatformExamples and examples/GastExamples, +after installation also in lib/Platform and lib/Gast. EOF cp clean-classic/linux-x86/txt/Makefile clean @@ -19,6 +20,7 @@ cp clean-ide/cpm/cpm clean/bin mkdir -p clean/exe cp compiler/cocl clean/exe +cp compiler_itask/cocl clean/exe/cocl_itask cp code-generator/cg clean/exe cp elf_linker/linker clean/exe @@ -42,7 +44,7 @@ mkdir -p clean/data/ArgEnv for f in ArgEnvC.c ArgEnv.dcl printenv.icl ArgEnv.icl README ; do cp "clean-libraries/Libraries/ArgEnvUnix/$f" "clean/data/ArgEnv/$f" done -cp "clean-libraries/Libraries/ArgEnvUnix/Makefile_no_pic" "clean/data/ArgEnv/Makefile" +cp "clean-libraries/Libraries/ArgEnvUnix/Makefile_32_no_pic" "clean/data/ArgEnv/Makefile" mkdir -p clean/data/Generics cp clean-libraries/Libraries/GenLib/*.[id]cl clean/data/Generics/ @@ -86,6 +88,9 @@ cp clean-libraries/Libraries/TCPIP/Linux_C/cTCP_121.c "clean/data/TCPIP/Clean Sy cp clean-libraries/Libraries/TCPIP/Linux_C/cTCP_121.h "clean/data/TCPIP/Clean System Files" mkdir -p clean/data/Platform +cp clean-platform/LICENSE clean/data/Platform/LICENSE +cp clean-platform/LICENSE.Clean clean/data/Platform/LICENSE.Clean +cp clean-platform/LICENSE.BSD3 clean/data/Platform/LICENSE.BSD3 cp -r -t clean/data/Platform clean-platform/src/libraries/OS-Independent/* cp -r -t clean/data/Platform clean-platform/src/libraries/OS-Posix/* cp -r -t clean/data/Platform clean-platform/src/libraries/OS-Linux/* diff --git a/clean-classic/linux-x86/build_libraries.sh b/clean-classic/linux-x86/build_libraries.sh index 4298e6eae5a47a394e30bc7ff50d22522b45068f..41e27af3015e1bd097f7f55709621baf211359de 100755 --- a/clean-classic/linux-x86/build_libraries.sh +++ b/clean-classic/linux-x86/build_libraries.sh @@ -16,10 +16,10 @@ mv clean-platform/LICENSE clean-platform/LICENSE.Clean sed -e '1,/License/d' -e 's/LICENSE].LICENCE/LICENCE.Clean](LICENSE.Clean/' -e 's/$/\r/' < clean-platform/README.md > clean-platform/LICENSE cp htoclean/Clean.h "clean-libraries/Libraries/Directory/Clean System Files Unix/Clean.h" -(cd "clean-libraries/Libraries/Directory/Clean System Files Unix"; gcc -fno-pic -c -O cDirectory.c) +(cd "clean-libraries/Libraries/Directory/Clean System Files Unix"; gcc -m32 -fno-pic -c -O cDirectory.c) cp htoclean/Clean.h "clean-libraries/Libraries/TCPIP/Linux_C/Clean.h" -(cd "clean-libraries/Libraries/TCPIP/Linux_C"; gcc -c -O cTCP_121.c) +(cd "clean-libraries/Libraries/TCPIP/Linux_C"; gcc -m32 -c -O cTCP_121.c) (cd "clean-libraries/Libraries/TCPIP"; sed 's/, library "wsock_library"//' ostcp.icl_; rm -f ostcp.icl; mv ostcp.icl_ ostcp.icl) (cd "clean-libraries/Libraries/TCPIP/Linux_C"; sed 's/, library "wsock_library"//' ostcp.icl_; rm -f ostcp.icl; mv ostcp.icl_ ostcp.icl) diff --git a/clean-classic/linux-x86/cleanup.sh b/clean-classic/linux-x86/cleanup.sh index cbb5c9919a97205d24b7f99565ca82c99f46adc3..2c94fb83a61b1ce223da64f0410ce92db486d1df 100755 --- a/clean-classic/linux-x86/cleanup.sh +++ b/clean-classic/linux-x86/cleanup.sh @@ -4,6 +4,7 @@ rm -rf code-generator rm -rf clm rm -rf run-time-system rm -rf compiler +rm -rf compiler_itask rm -rf clean-libraries rm -rf clean-ide rm -rf htoclean diff --git a/clean-classic/linux-x86/setup.sh b/clean-classic/linux-x86/setup.sh index 02a3982241216054557140300c517c836bcdf47d..e3d3a6cb3effad4353c6e572a5de5f2c13ba0a19 100755 --- a/clean-classic/linux-x86/setup.sh +++ b/clean-classic/linux-x86/setup.sh @@ -19,6 +19,7 @@ tar -xzf boot_clean.tgz mv clean boot_compiler cd boot_compiler -sed -e "s/gcc/gcc -fno-pic/" -i data/ArgEnv/Makefile +sed -e "s/gcc/gcc -m32 -fno-pic/" -i data/ArgEnv/Makefile make +./bin/patch_bin ./bin/clm LDARGS -m32 cd .. diff --git a/clean-classic/linux-x86/txt/Makefile b/clean-classic/linux-x86/txt/Makefile index 4de847b3925c73e2aeba19e4541fdd9fdb80554a..58d874923c185c05617123fa86e581e79ec52633 100755 --- a/clean-classic/linux-x86/txt/Makefile +++ b/clean-classic/linux-x86/txt/Makefile @@ -77,7 +77,7 @@ PATCH_BIN = $(CURRENTDIR)/bin/patch_bin # Binaries # BIN_FILES = clm htoclean -EXE_FILES = cocl cg linker +EXE_FILES = cocl cocl_itask cg linker INSTALL_BIN_FILES = $(BIN_FILES:%=$(INSTALL_BIN_DIR)/%) INSTALL_CLM = $(INSTALL_BIN_DIR)/clm @@ -188,7 +188,7 @@ $(INSTALL_LIB_DIR)/Directory: mkdir -p $@/"Clean System Files" install_Directory: $(INSTALL_LIB_DIR)/Directory - ( cd "data/Directory/Clean System Files"; gcc -fno-pic -c -O cDirectory.c -o cDirectory.o ) + ( cd "data/Directory/Clean System Files"; gcc -m32 -fno-pic -c -O cDirectory.c -o cDirectory.o ) cp -R data/Directory/* $(INSTALL_LIB_DIR)/Directory $(INSTALL_LIB_DIR)/MersenneTwister: