From fa29357e40327367f063509ecab98f7df9e6e161 Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Tue, 23 Oct 2018 21:12:40 +0200 Subject: Bring up to date --- Dockerfile | 2 +- compile.c | 20 ++++++++++---------- make_abc.sh | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 116004b..3642810 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM camilstaps/clean:nightly -RUN install_clean.sh bundle-complete 2018-10-20 +RUN install_clean.sh bundle-complete 2018-10-23 COPY . /usr/src/iclean WORKDIR /usr/src/iclean diff --git a/compile.c b/compile.c index 91482a1..d6b564e 100644 --- a/compile.c +++ b/compile.c @@ -69,16 +69,16 @@ int64_t compile(CleanString path, CleanString module) { // Build command: char cmd[512]; snprintf(cmd, 511, "cd \"%s\" && clm -ms -nw " - "-I $CLEAN_HOME/lib/Directory " - "-I $CLEAN_HOME/lib/Dynamics -dynamics " - "-I $CLEAN_HOME/lib/Gast " - "-I $CLEAN_HOME/lib/GraphCopy " - "-I $CLEAN_HOME/lib/Platform " - "-I $CLEAN_HOME/lib/Platform/Deprecated/ArgEnv " - "-I $CLEAN_HOME/lib/Platform/Deprecated/MersenneTwister " - "-I $CLEAN_HOME/lib/Platform/Deprecated/StdLib " - "-I $CLEAN_HOME/lib/Platform/Deprecated/Generics " - "-I $CLEAN_HOME/lib/Local " + "-IL Directory " + "-IL Dynamics -dynamics " + "-IL Gast " + "-IL GraphCopy " + "-IL Platform " + "-IL Platform/Deprecated/ArgEnv " + "-IL Platform/Deprecated/Generics " + "-IL Platform/Deprecated/MersenneTwister " + "-IL Platform/Deprecated/StdLib " + "-IL Local " "-b -nt -h 20M %s -o %s", pathchars, modulechars, modulechars); diff --git a/make_abc.sh b/make_abc.sh index e82de6e..1f7d5fd 100755 --- a/make_abc.sh +++ b/make_abc.sh @@ -1,5 +1,5 @@ #!/bin/bash -libs="ArgEnv Directory Dynamics Gast Generics MersenneTwister StdEnv TCPIP Platform Platform/Deprecated/StdLib" +libs="Directory Dynamics Gast GraphCopy StdEnv TCPIP Platform Platform/Deprecated/ArgEnv Platform/Deprecated/Generics Platform/Deprecated/MersenneTwister Platform/Deprecated/StdLib" shopt -s globstar for lib in $libs do @@ -10,6 +10,6 @@ do if [[ "$mod" == "**/*.icl" ]]; then continue; fi mod="${mod/.icl/}" mod="${mod/\//.}" - clm $(echo "-I /opt/clean/lib/${libs// / -I \/opt\/clean\/lib\/}") -ABC "$mod" + clm $(echo "-IL ${libs// / -IL }") -ABC "$mod" done done -- cgit v1.2.3