X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=clean%2F.local%2Fbin%2Finstall_clean.sh;h=59d5e9f4cf719dfcc690f59e6b487f8aba83c732;hb=37a88a14fd119cb8ef43b2f421c268aef436e5f4;hp=0bcd7f3e31405218783561704117a49584d0d15d;hpb=3204decf4f5e3c96c02055af97a83a3f19f4d49d;p=dotfiles.git

diff --git a/clean/.local/bin/install_clean.sh b/clean/.local/bin/install_clean.sh
index 0bcd7f3..59d5e9f 100755
--- a/clean/.local/bin/install_clean.sh
+++ b/clean/.local/bin/install_clean.sh
@@ -3,19 +3,20 @@ set -e
 
 DISTRO="https://ftp.cs.ru.nl/Clean/builds/linux-x64/clean-bundle-complete-linux-x64-latest.tgz"
 TAGS="https://gitlab.science.ru.nl/cloogle/cloogle-tags/-/jobs/artifacts/master/raw/cloogletags?job=build"
-CLM="https://gitlab.science.ru.nl/mlubbers/clm/builds/artifacts/master/raw/clm?job=compile"
-CLM1="https://gitlab.science.ru.nl/mlubbers/clm/builds/artifacts/master/raw/clm.1?job=compile"
+CLMMAN="https://gitlab.science.ru.nl/clean-and-itasks/clm/raw/master/clm.1"
+CP2CG="https://gitlab.science.ru.nl/clean-and-itasks/cleanprof2callgrind/-/jobs/artifacts/master/raw/cleanprof2callgrind?job=test"
 CLEAN_HOME="${CLEAN_HOME:-/opt/clean}"
 
 echo "Cleaning up the old distro"
 rm -rf "$CLEAN_HOME"/*
 echo "Downloading clean"
 curl -sSL "$DISTRO" | tar -C "$CLEAN_HOME" --strip-components=1 -xz
-echo "Replacing clm"
-curl -sSLo "$CLEAN_HOME/bin/clm" "$CLM"
 echo "Installing manpages"
 mkdir -p ~/.local/man/man1
-curl -sSLo ~/.local/man/man1/clm.1 "$CLM1"
+curl -sSLo ~/.local/man/man1/clm.1 "$CLMMAN"
+echo "Downloading cleanprof2callgrind"
+curl -sSLo "$CLEAN_HOME/bin/cleanprof2callgrind" "$CP2CG"
+chmod +x "$CLEAN_HOME"/bin/cleanprof2callgrind
 echo "Downloading cloogletags"
 curl -sSLo "$CLEAN_HOME"/bin/cloogletags "$TAGS"
 chmod +x "$CLEAN_HOME"/bin/cloogletags
@@ -75,53 +76,51 @@ patch /opt/clean/lib/StdEnv/StdGeneric.icl <<EOPATCH
 EOPATCH
 
 echo "Adding the iTasks-git environment"
-patch /opt/clean/etc/IDEEnvs <<EOPATCH
---- IDEEnvs	2018-12-17 11:58:48.876039159 +0100
-+++ IDEEnvs	2018-12-17 12:00:52.384066455 +0100
-@@ -35,13 +35,44 @@
- 			Path:	{Application}/lib/StdEnv
- 			Path:	{Application}/lib/Dynamics
- 			Path:	{Application}/lib/TCPIP
-+			Path:	{Application}/lib/Gast
- 			Path:	{Application}/lib/Platform
- 			Path:	{Application}/lib/Platform/Deprecated/Generics
-+			Path:	{Application}/lib/Platform/Deprecated/ArgEnv
-+			Path:	{Application}/lib/Platform/Deprecated/MersenneTwister
+patch  /opt/clean/etc/IDEEnvs <<EOPATCH
+--- 	2019-07-24 02:47:02.000000000 +0200
++++ IDEEnvs	2019-07-24 08:22:52.713808372 +0200
+@@ -45,7 +45,42 @@
  			Path:	{Application}/lib/Platform/Deprecated/StdLib
- 			Path:	{Application}/lib/Sapl
+ 			Path:	{Application}/lib/ABCInterpreter
  			Path:	{Application}/lib/GraphCopy
- 			Path:	{Application}/lib/iTasks
--		EnvironmentCompiler:	lib/exe/cocl::-dynamics -sapl
-+		EnvironmentCompiler:	lib/exe/cocl:-h 500m -s 20m:-dynamics -sapl
-+		EnvironmentCodeGen:	lib/exe/cg
-+		EnvironmentLinker:	lib/exe/linker|lib/exe/sapl-collector-linker|lib/exe/itasks-web-collector
-+		EnvironmentDynLink:	lib/exe/linker
-+		EnvironmentVersion:	920
-+		EnvironmentRedirect:	False
-+		EnvironmentCompileMethod:	Pers
-+		EnvironmentProcessor:	I386
-+		Environment64BitProcessor:	True
-+	Environment
-+		EnvironmentName:	iTasks-git
-+		EnvironmentPaths
-+			Path:	{Application}/lib/StdEnv
-+			Path:	{Application}/lib/Dynamics
-+			Path:	{Application}/lib/TCPIP
-+			Path:	{Application}/lib/Sapl
-+			Path:	{Application}/lib/GraphCopy
-+			Path:	{Application}/lib/Gast
-+			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/Platform-x86
-+			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Posix
-+			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Linux
-+			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Linux-64
-+			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Independent
-+			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Independent/Deprecated/Generics
-+			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Independent/Deprecated/StdLib
-+			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Independent/Deprecated/ArgEnv
-+			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Independent/Deprecated/MersenneTwister
-+			Path:	/home/mrl/projects/clean/iTasks-SDK/Libraries
-+		EnvironmentCompiler:	lib/exe/cocl:-h 500m -s 20m:-dynamics -sapl
+-			Path:	{Application}/lib/iTasks
++  			Path:	{Application}/lib/iTasks
++ 			Path:	{Application}/lib/Gast
++ 		EnvironmentCompiler:	lib/exe/cocl::-dynamics
++ 		EnvironmentCodeGen:	lib/exe/cg
++ 		EnvironmentLinker:	lib/exe/linker|lib/exe/itasks-web-collector
++ 		EnvironmentDynLink:	lib/exe/linker
++ 		EnvironmentABCOptimise:	lib/exe/abcopt
++ 		EnvironmentByteCodeGen:	lib/exe/bcgen
++ 		EnvironmentByteCodeLink:	lib/exe/bclink
++ 		EnvironmentByteCodeStrip:	lib/exe/bcstrip
++ 		EnvironmentByteCodePrelink:	lib/exe/bcprelink
++ 		EnvironmentVersion:	920
++ 		EnvironmentRedirect:	False
++ 		EnvironmentCompileMethod:	Pers
++ 		EnvironmentProcessor:	I386
++ 		Environment64BitProcessor:	True
++ 	Environment
++ 		EnvironmentName:	iTasks-git
++ 		EnvironmentPaths
++ 			Path:	{Application}/lib/StdEnv
++ 			Path:	{Application}/lib/Dynamics
++ 			Path:	{Application}/lib/TCPIP
++ 			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/Platform-x86
++ 			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Posix
++ 			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Linux
++ 			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Linux-64
++ 			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Independent
++ 			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Independent/Deprecated/Generics
++ 			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Independent/Deprecated/StdLib
++ 			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Independent/Deprecated/ArgEnv
++ 			Path:	/home/mrl/projects/clean/clean-platform/src/libraries/OS-Independent/Deprecated/MersenneTwister
++ 			Path:	{Application}/lib/ABCInterpreter
++ 			Path:	{Application}/lib/GraphCopy
++ 			Path:	/home/mrl/projects/clean/iTasks-SDK/Libraries
++ 			Path:	{Application}/lib/iTasks
++ 			Path:	{Application}/lib/Gast
+ 		EnvironmentCompiler:	lib/exe/cocl::-dynamics
  		EnvironmentCodeGen:	lib/exe/cg
- 		EnvironmentLinker:	lib/exe/linker|lib/exe/sapl-collector-linker|lib/exe/itasks-web-collector
- 		EnvironmentDynLink:	lib/exe/linker
+ 		EnvironmentLinker:	lib/exe/linker|lib/exe/itasks-web-collector
 EOPATCH