From 8f8010b9d9e56ed9333f90c609d4397f9ab02ec2 Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Wed, 11 Jul 2018 19:58:29 +0200 Subject: [PATCH] Use newest Platform which includes Clean parsing/pretty-printing modules; index itask compiler instead of classic --- backend/Cloogle | 2 +- backend/Dockerfile | 2 +- backend/Makefile | 1 - libs.json | 7 +------ 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/backend/Cloogle b/backend/Cloogle index 238392d..616ad97 160000 --- a/backend/Cloogle +++ b/backend/Cloogle @@ -1 +1 @@ -Subproject commit 238392d49c0f03f43a08ba7c73a77610a26c74c4 +Subproject commit 616ad97531ad09b602fce865671e1eff2c29bebc diff --git a/backend/Dockerfile b/backend/Dockerfile index 103a703..0dc3265 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -5,7 +5,7 @@ COPY libs.json /usr/src/cloogle/libs.json COPY util/fetch_libs.sh /usr/src/cloogle/fetch_libs.sh WORKDIR /usr/src/cloogle -RUN install_clean.sh bundle-complete 2018-07-05 \ +RUN install_clean.sh bundle-complete 2018-07-12 \ && PACKAGES="patch jq" \ && apt-get update -qq\ && apt-get install -qq $PACKAGES --no-install-recommends\ diff --git a/backend/Makefile b/backend/Makefile index 9b86b5b..2a476a9 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -10,7 +10,6 @@ CLMFLAGS:=-h 250M -nr -nortsopts\ -IL Platform/Deprecated/StdLib\ -I Cloogle\ -I Cloogle/libcloogle\ - -I Cloogle/CleanPrettyPrint\ -I Cloogle/CleanRegex ifeq "$(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 6)" "1" CLMFLAGS+=-l -no-pie diff --git a/libs.json b/libs.json index 9e7c24f..20d74a4 100644 --- a/libs.json +++ b/libs.json @@ -49,7 +49,7 @@ { "name": "clean-compiler", "fetch_url": ["SVN", "https://svn.cs.ru.nl/repos/clean-compiler"], - "path": "trunk", + "path": "branches/itask", "info_url": "https://svn.cs.ru.nl/repos/clean-compiler/", "pattern_app": [["PWildcard"]] }, @@ -108,11 +108,6 @@ "fetch_url": ["Git", "https://github.com/camilstaps/CleanInotify"], "info_url": "https://github.com/camilstaps/CleanInotify" }, - { - "name": "CleanPrettyPrint", - "fetch_url": ["Git", "https://github.com/clean-cloogle/CleanPrettyPrint"], - "info_url": "https://github.com/clean-cloogle/CleanPrettyPrint" - }, { "name": "CleanRegex", "fetch_url": ["Git", "https://github.com/camilstaps/CleanRegex"],