Commit 0cbeefe9 authored by John van Groningen's avatar John van Groningen
Browse files

in clean-classic for macos-x64 add _SystemDynamic and StdDynamic to StdEnv,...

in clean-classic for macos-x64 add _SystemDynamic and StdDynamic to StdEnv, remove Dynamics directory, use gast repository
parent 26006755
Pipeline #50047 failed with stage
in 6 minutes and 10 seconds
......@@ -25,7 +25,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/macos-x64/build_htoclean.sh
......
......@@ -24,10 +24,10 @@ cp write_clean_manual/CleanLanguageReport?*.html clean/doc/CleanLanguageReportHt
cp htoclean/Clean.h clean/doc
cp htoclean/CallingCFromClean.html clean/doc
mkdir -p clean/doc/Examples
cp -r htoclean/Examples/*.[ch] clean/doc/Examples
cp -r htoclean/Examples/*.[id]cl clean/doc/Examples
cp -r htoclean/Examples/*.prj clean/doc/Examples
cp -r htoclean/Examples/*.bat clean/doc/Examples
cp htoclean/Examples/*.[ch] clean/doc/Examples
cp htoclean/Examples/*.[id]cl clean/doc/Examples
cp htoclean/Examples/*.prj clean/doc/Examples
cp htoclean/Examples/*.bat clean/doc/Examples
mkdir -p clean/man/man1
cp clm/clm.1 clean/man/man1
......@@ -41,7 +41,7 @@ mkdir -p clean/data/Generics
cp clean-libraries/Libraries/GenLib/*.[id]cl clean/data/Generics/
mkdir -p clean/data/Gast
cp clean-libraries/Libraries/Gast/*.[id]cl 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/
......@@ -78,14 +78,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 clean-platform/src/libraries/OS-Independent/* clean/data/Platform
cp -r clean-platform/src/libraries/OS-Posix/* clean/data/Platform
......
cp -R -p 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/
......@@ -20,4 +22,3 @@ cp htoclean/Clean.h "clean-libraries/Libraries/TCPIP/Linux_C/Clean.h"
(cd clean-platform/src/cdeps; make)
cp -R clean-classic/macos-x64/Gast clean-libraries/Libraries
......@@ -10,9 +10,9 @@ cp stdenv/_startup.dcl clean/StdEnv/_startupTrace.dcl
cp stdenv/_startup.dcl clean/StdEnv/_startupProfile.dcl
cp stdenv/_system.dcl clean/StdEnv
for a in StdArray StdBool StdChar StdCharList StdClass StdDebug StdEnum StdEnv \
StdFunc StdFunctions StdList StdMisc StdOrdList StdOverloaded StdOverloadedList \
StdStrictLists StdTuple _SystemArray _SystemEnum _SystemEnumStrict \
StdGeneric StdMaybe;
StdFunc StdFunctions StdList StdMisc StdOrdList StdOverloaded StdOverloadedList \
StdStrictLists StdTuple _SystemArray _SystemEnum _SystemEnumStrict \
StdGeneric StdMaybe _SystemDynamic StdDynamic;
do cp stdenv/$a.[di]cl clean/StdEnv ;
done
......
......@@ -10,7 +10,6 @@ rm -rf htoclean
rm -rf elf_linker
rm -rf stdenv
rm -rf write_clean_manual
rm -rf StdDynamicEnv
rm -rf clean-platform
rm -rf CleanExamples
rm -rf sapldynamics
......
......@@ -9,11 +9,11 @@ cd git
../clean-classic/macos-x64/git_clone_no_checkout_depth_1.sh clean-and-itasks/clm.git clm
../clean-classic/macos-x64/git_clone_no_checkout_depth_1.sh clean-and-itasks/clean-ide.git clean-ide
../clean-classic/macos-x64/git_clone_no_checkout_depth_1.sh clean-and-itasks/clean-libraries.git clean-libraries
../clean-classic/macos-x64/git_clone_no_checkout_depth_1.sh clean-and-itasks/gast.git gast
../clean-classic/macos-x64/git_clone_no_checkout_depth_1.sh clean-and-itasks/clean-platform.git clean-platform
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/dynamics/StdDynamicEnv StdDynamicEnv
cd ..
......@@ -56,7 +56,7 @@ GMAKECURRENTDIR = ${shell echo `pwd`}
#
# Install section
#
install: install_bin install_stdenv install_man install_doc install_ArgEnv install_Generics install_Gast 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)
io: install
......@@ -204,13 +204,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"
......
......@@ -8,7 +8,8 @@ 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"
_SystemEnumStrict StdStrictLists StdOverloadedList StdGeneric StdMaybe _SystemStrictMaybes \
_SystemDynamic StdDynamic"
SYSTEM_MODULES="StdBool StdChar StdFile StdInt StdMisc StdReal StdString"
......
......@@ -6,6 +6,8 @@ CLEAN_MODULES="StdArray StdCharList StdClass StdDebug StdFunc StdFunctions StdLi
StdOverloaded StdTuple _SystemEnum StdEnum _SystemArray StdEnv _SystemStrictLists \
_SystemEnumStrict StdStrictLists StdOverloadedList StdGeneric StdMaybe _SystemStrictMaybes"
CLEAN_DYNAMIC_MODULES="_SystemDynamic StdDynamic"
SYSTEM_MODULES="StdBool StdChar StdFile StdInt StdMisc StdReal StdString"
ABC_MODULES="_system"
......@@ -24,12 +26,20 @@ for M in $SYSTEM_MODULES ; do
$CALL_CLM_PT -ABC $M
done
for M in $CLEAN_DYNAMIC_MODULES; do
$CALL_CLM -dynamics -ABC $M
done
for M in $CLEAN_MODULES $ABC_MODULES; do
$CALL_CLM -ABC $M
done
sleep 1
for M in $CLEAN_DYNAMIC_MODULES; do
$CALL_CLM -dynamics -O $M
done
for M in $SYSTEM_MODULES $CLEAN_MODULES $ABC_MODULES; do
$CALL_CLM -O $M
done
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment