Skip to content
GitLab
Commit 1a1daba5 authored by Camil Staps's avatar Camil Staps
Browse files

Merge branch 'move_StdDynamic_and__SystemDynamic_to_StdEnv' into 'master' 

Move std dynamic and  system dynamic to std env

See merge request !74
parents 8248e219 95af58dd
Pipeline #50414 failed with stage
in 3 minutes and 35 seconds
Hide whitespace changes
Inline Side-by-side
clean-base/linux-arm64/build.sh
View file @ 1a1daba5
......@@ -144,7 +144,7 @@ build_stdenv() { # $1:target
for a in StdArray StdBool StdChar StdCharList StdClass StdDebug StdEnum StdEnv \
StdFunc StdFunctions StdList StdMisc StdOrdList StdOverloaded StdOverloadedList \
StdStrictLists StdTuple StdMaybe _SystemArray _SystemEnum _SystemEnumStrict \
_SystemStrictLists _SystemStrictMaybes StdGeneric;
_SystemStrictLists _SystemStrictMaybes StdGeneric _SystemDynamic StdDynamic;
do cp src/stdenv-master/$a.[di]cl $1/lib/StdEnv ;
done
......@@ -189,10 +189,6 @@ build_dynamics() { #$1:target
mkdir -p "$1/lib/Dynamics/Clean System Files"
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdCleanTypes.dcl $1/lib/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdCleanTypes.icl $1/lib/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdDynamic.dcl $1/lib/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdDynamicNoLinker.icl $1/lib/Dynamics/StdDynamic.icl
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/implementation/_SystemDynamic.dcl $1/lib/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/implementation/_SystemDynamic.icl $1/lib/Dynamics/
}
build_generics() { #$1:target
......
clean-base/linux-x64/build.sh
View file @ 1a1daba5
......@@ -119,7 +119,7 @@ build_stdenv() { # $1:target
for a in StdArray StdBool StdChar StdCharList StdClass StdDebug StdEnum StdEnv \
StdFunc StdFunctions StdList StdMisc StdOrdList StdOverloaded StdOverloadedList \
StdStrictLists StdTuple StdMaybe _SystemArray _SystemEnum _SystemEnumStrict \
_SystemStrictLists _SystemStrictMaybes StdGeneric;
_SystemStrictLists _SystemStrictMaybes StdGeneric _SystemDynamic StdDynamic;
do cp src/stdenv-master/$a.[di]cl $1/lib/StdEnv ;
done
......@@ -166,16 +166,14 @@ build_dynamics() { #$1:target
mkdir -p "$1/lib/Dynamics/Clean System Files"
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdCleanTypes.dcl $1/lib/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdCleanTypes.icl $1/lib/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdDynamic.dcl $1/lib/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdDynamicNoLinker.icl $1/lib/Dynamics/StdDynamic.icl
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/implementation/_SystemDynamic.dcl $1/lib/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/implementation/_SystemDynamic.icl $1/lib/Dynamics/
}
build_generics() { #$1:target
#Copy generics library
mkdir -p $1/lib/Generics
cp src/clean-libraries-master/Libraries/GenLib/*.[id]cl $1/lib/Generics/
}
build_directory() {
mkdir -p build/Directory
cp -r src/clean-libraries-master/Libraries/Directory/* build/Directory/
......
clean-base/linux-x86/build.sh
View file @ 1a1daba5
......@@ -110,9 +110,9 @@ build_stdenv() { # $1:target
cp src/stdenv-master/_system.dcl $1/lib/StdEnv/
for a in StdArray StdBool StdChar StdCharList StdClass StdDebug StdEnum StdEnv \
StdFile StdFunc StdFunctions StdInt StdList StdMisc StdOrdList StdOverloaded \
StdOverloadedList StdReal StdStrictLists StdString StdTuple StdMaybe \
_SystemArray _SystemEnum _SystemEnumStrict _SystemStrictLists _SystemStrictMaybes StdGeneric;
StdFile StdFunc StdFunctions StdInt StdList StdMisc StdOrdList StdOverloaded StdOverloadedList \
StdReal StdStrictLists StdString StdTuple StdMaybe _SystemArray _SystemEnum _SystemEnumStrict \
_SystemStrictLists _SystemStrictMaybes StdGeneric _SystemDynamic StdDynamic;
do cp src/stdenv-master/$a.[di]cl $1/lib/StdEnv ;
done
......@@ -152,10 +152,6 @@ build_dynamics() { #$1:target
mkdir -p "$1/lib/Dynamics/Clean System Files"
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdCleanTypes.dcl $1/lib/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdCleanTypes.icl $1/lib/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdDynamic.dcl $1/lib/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdDynamicNoLinker.icl $1/lib/Dynamics/StdDynamic.icl
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/implementation/_SystemDynamic.dcl $1/lib/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/implementation/_SystemDynamic.icl $1/lib/Dynamics/
}
build_directory() {
......
clean-base/macos-x64/build.sh
View file @ 1a1daba5
......@@ -116,6 +116,7 @@ build_compiler_master() { # $1:target
mkdir -p $1/lib/exe
cp build/compiler-master/cocl $1/lib/exe/cocl
}
build_docs () { #$1:target
cp src/clean-ide-master/CleanLicenseConditions.txt $1/CleanLicenseConditions.txt
cp $PACKAGE/$OS-$ARCH/txt/README $1/README.md
......@@ -130,7 +131,7 @@ build_stdenv() { # $1:target
for a in StdArray StdBool StdChar StdCharList StdClass StdDebug StdEnum StdEnv \
StdFunc StdFunctions StdList StdMisc StdOrdList StdOverloaded StdOverloadedList \
StdStrictLists StdTuple StdMaybe _SystemArray _SystemEnum _SystemEnumStrict \
_SystemStrictLists _SystemStrictMaybes StdGeneric;
_SystemStrictLists _SystemStrictMaybes StdGeneric _SystemDynamic StdDynamic;
do cp src/stdenv-master/$a.[di]cl $1/lib/StdEnv ;
done
......@@ -177,16 +178,14 @@ build_dynamics() { #$1:target
mkdir -p "$1/lib/Dynamics/Clean System Files"
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdCleanTypes.dcl $1/lib/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdCleanTypes.icl $1/lib/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdDynamic.dcl $1/lib/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdDynamicNoLinker.icl $1/lib/Dynamics/StdDynamic.icl
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/implementation/_SystemDynamic.dcl $1/lib/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/implementation/_SystemDynamic.icl $1/lib/Dynamics/
}
build_generics() { #$1:target
#Copy generics library
mkdir -p $1/lib/Generics
cp src/clean-libraries-master/Libraries/GenLib/*.[id]cl $1/lib/Generics/
}
build_directory() {
mkdir -p build/Directory
cp -r src/clean-libraries-master/Libraries/Directory/* build/Directory/
......
clean-base/windows-x64/build.sh
View file @ 1a1daba5
......@@ -274,7 +274,7 @@ build_stdenv() { # $1:target $2: clean system
StdInt StdFile StdReal StdString \
StdFunc StdFunctions StdList StdMisc StdOrdList StdOverloaded StdOverloadedList \
StdStrictLists StdTuple StdMaybe _SystemArray _SystemEnum _SystemEnumStrict \
_SystemStrictLists _SystemStrictMaybes StdGeneric;
_SystemStrictLists _SystemStrictMaybes StdGeneric _SystemDynamic StdDynamic;
do cp src/stdenv-master/$a.[di]cl $1/Libraries/StdEnv/ ;
done
......@@ -319,16 +319,14 @@ build_dynamics() { #$1:target
mkdir -p "$1/Libraries/Dynamics/Clean System Files"
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdCleanTypes.dcl $1/Libraries/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdCleanTypes.icl $1/Libraries/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdDynamic.dcl $1/Libraries/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdDynamicNoLinker.icl $1/Libraries/Dynamics/StdDynamic.icl
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/implementation/_SystemDynamic.dcl $1/Libraries/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/implementation/_SystemDynamic.icl $1/Libraries/Dynamics/
}
build_generics() { #$1:target
#Copy generics library
mkdir -p $1/Libraries/Generics
cp src/clean-libraries-master/Libraries/GenLib/*.[id]cl $1/Libraries/Generics/
}
build_directory() { #$1:target
mkdir -p build/Directory
cp -r src/clean-libraries-master/Libraries/Directory/* build/Directory/
......@@ -342,11 +340,13 @@ build_directory() { #$1:target
cp build/Directory/*.[id]cl $1/Libraries/Directory/
cp build/Directory/Clean\ System\ Files\ Windows/* $1/Libraries/Directory/Clean\ System\ Files/
}
build_stdlib() { #$1:target
#Copy generics library
mkdir -p $1/Libraries/StdLib
cp src/clean-libraries-master/Libraries/StdLib/*.[id]cl $1/Libraries/StdLib/
}
build_objectio() { #$1:target
mkdir -p build/ioobjects
cp -r "src/clean-libraries-master/Libraries/ObjectIO/ObjectIO/OS Windows/Windows_C_12" "build/objectio"
......
clean-base/windows-x86/build.sh
View file @ 1a1daba5
......@@ -248,7 +248,7 @@ build_stdenv() { # $1:target $2: clean system
StdInt StdFile StdReal StdString \
StdFunc StdFunctions StdList StdMisc StdOrdList StdOverloaded StdOverloadedList \
StdStrictLists StdTuple StdMaybe _SystemArray _SystemEnum _SystemEnumStrict \
_SystemStrictLists _SystemStrictMaybes StdGeneric;
_SystemStrictLists _SystemStrictMaybes StdGeneric _SystemDynamic StdDynamic;
do cp src/stdenv-master/$a.[di]cl $1/Libraries/StdEnv/ ;
done
......@@ -282,16 +282,14 @@ build_dynamics() { #$1:target
mkdir -p "$1/Libraries/Dynamics/Clean System Files"
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdCleanTypes.dcl $1/Libraries/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdCleanTypes.icl $1/Libraries/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdDynamic.dcl $1/Libraries/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/extension/StdDynamicNoLinker.icl $1/Libraries/Dynamics/StdDynamic.icl
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/implementation/_SystemDynamic.dcl $1/Libraries/Dynamics/
cp src/clean-dynamic-system-trunk/dynamics/StdDynamicEnv/implementation/_SystemDynamic.icl $1/Libraries/Dynamics/
}
build_generics() { #$1:target
#Copy generics library
mkdir -p $1/Libraries/Generics
cp src/clean-libraries-master/Libraries/GenLib/*.[id]cl $1/Libraries/Generics/
}
build_directory() { #$1:target
mkdir -p build/Directory
cp -r src/clean-libraries-master/Libraries/Directory/* build/Directory/
......@@ -305,11 +303,13 @@ build_directory() { #$1:target
cp build/Directory/*.[id]cl $1/Libraries/Directory/
cp build/Directory/Clean\ System\ Files\ Windows/* $1/Libraries/Directory/Clean\ System\ Files/
}
build_stdlib() { #$1:target
#Copy generics library
mkdir -p $1/Libraries/StdLib
cp src/clean-libraries-master/Libraries/StdLib/*.[id]cl $1/Libraries/StdLib/
}
build_objectio() { #$1:target
mkdir -p build/ioobjects
cp -r "src/clean-libraries-master/Libraries/ObjectIO/ObjectIO/OS Windows/Windows_C_12" "build/objectio"
......
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