From 83cbc3ba1c62cee51aa1bb2a999163e2b691f2d3 Mon Sep 17 00:00:00 2001 From: John Date: Tue, 14 Dec 2021 16:31:53 +0100 Subject: [PATCH] in clean-classic for linux-x64 add cocl_itask --- clean-classic/linux-x64/build.sh | 3 +++ clean-classic/linux-x64/build_clc_itasks.sh | 18 ++++-------------- clean-classic/linux-x64/build_clean.sh | 1 + clean-classic/linux-x64/cleanup.sh | 1 + clean-classic/linux-x64/txt/Makefile | 2 +- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/clean-classic/linux-x64/build.sh b/clean-classic/linux-x64/build.sh index 5690136..54ebcad 100755 --- a/clean-classic/linux-x64/build.sh +++ b/clean-classic/linux-x64/build.sh @@ -9,6 +9,7 @@ export BOOTCOMPILERPATH=$PWD/boot_compiler/bin:$PWD/boot_compiler/lib/exe:$PATH export PATH=$BOOTCOMPILERPATH ./clean-classic/linux-x64/build_htoclean.sh ./clean-classic/linux-x64/build_clc.sh +./clean-classic/linux-x64/build_clc_itasks.sh ./clean-classic/linux-x64/build_linker.sh ./clean-classic/linux-x64/build_batch_build.sh ./clean-classic/linux-x64/build_libraries.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-x64/build_htoclean.sh ./clean-classic/linux-x64/build_clc.sh +./clean-classic/linux-x64/build_clc_itasks.sh ./clean-classic/linux-x64/build_linker.sh ./clean-classic/linux-x64/build_batch_build.sh ./clean-classic/linux-x64/build_libraries.sh diff --git a/clean-classic/linux-x64/build_clc_itasks.sh b/clean-classic/linux-x64/build_clc_itasks.sh index e7c989d..e3c24b7 100755 --- a/clean-classic/linux-x64/build_clc_itasks.sh +++ b/clean-classic/linux-x64/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-x64/build_clean.sh b/clean-classic/linux-x64/build_clean.sh index e2dd3d3..697ef1b 100755 --- a/clean-classic/linux-x64/build_clean.sh +++ b/clean-classic/linux-x64/build_clean.sh @@ -20,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 diff --git a/clean-classic/linux-x64/cleanup.sh b/clean-classic/linux-x64/cleanup.sh index cbb5c99..2c94fb8 100755 --- a/clean-classic/linux-x64/cleanup.sh +++ b/clean-classic/linux-x64/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-x64/txt/Makefile b/clean-classic/linux-x64/txt/Makefile index 660aec3..8e1c4a8 100755 --- a/clean-classic/linux-x64/txt/Makefile +++ b/clean-classic/linux-x64/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 -- GitLab