From: Mart Lubbers <mart@martlubbers.net>
Date: Mon, 3 Apr 2017 08:25:59 +0000 (+0200)
Subject: Merge branch 'master' of gitlab.science.ru.nl:mlubbers/mTask
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=88ecd686ff62986cde139abb65ab52b9e93d3035;hp=ffa2d86b82f26ed05ed524d3027c679420d13553;p=mTask.git

Merge branch 'master' of gitlab.science.ru.nl:mlubbers/mTask
---

diff --git a/Makefile b/Makefile
index 1afaa77..0978187 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ endif
 CLMLIBS:=\
 	-I $(CLEAN_HOME)/lib/Platform\
 	-I $(CLEAN_HOME)/lib/Platform/Deprecated/StdLib\
-	-I $(CLEAN_HOME)/lib/iTasks\
+	-I ~/projects/iTasks-SDK/Libraries\
 	-I $(CLEAN_HOME)/lib/GraphCopy\
 	-I $(CLEAN_HOME)/lib/Sapl\
 	-I $(CLEAN_HOME)/lib/StdEnv\
diff --git a/install_clean.sh b/install_clean.sh
index f5da1d9..2a42593 100755
--- a/install_clean.sh
+++ b/install_clean.sh
@@ -17,11 +17,9 @@ mkdir -p "$TARGET"
 echo "Downloading and installing clean nightly" >&2
 curl -sSL ftp://ftp.cs.ru.nl/pub/Clean/builds/linux-x64/clean-bundle-complete-linux-x64-latest.tgz \
 	| tar --gunzip --strip-components=1 --extract --directory="$TARGET"
-
-echo "Apply patches" >&2
-curl -sSL https://gitlab.science.ru.nl/mlubbers/iTasks-SDK/raw/95-addbackgroundtask/Libraries/iTasks/_Framework/TaskServer.dcl\
-	> "$TARGET"/lib/iTasks/iTasks/_Framework/TaskServer.dcl
-curl -sSL https://gitlab.science.ru.nl/mlubbers/iTasks-SDK/raw/95-addbackgroundtask/Libraries/iTasks/_Framework/TaskServer.icl\
-	> "$TARGET"/lib/iTasks/iTasks/_Framework/TaskServer.icl
+curl -sSL https://gitlab.science.ru.nl/clean-and-itasks/iTasks-SDK/raw/master/Libraries/iTasks/_Framework/TaskServer.dcl \
+	> $TARGET/lib/iTasks/iTasks/_Framework/TaskServer.dcl
+curl -sSL https://gitlab.science.ru.nl/clean-and-itasks/iTasks-SDK/raw/master/Libraries/iTasks/_Framework/TaskServer.icl \
+	> $TARGET/lib/iTasks/iTasks/_Framework/TaskServer.icl
 
 echo "export CLEAN_HOME=$TARGET; export PATH=$TARGET/bin:\$PATH;"