From cc8548386e5f1ab16cae747323e4b816b702d61d Mon Sep 17 00:00:00 2001
From: Camil Staps <info@camilstaps.nl>
Date: Tue, 6 Nov 2018 13:11:04 +0100
Subject: [PATCH] Use git version of compiler

---
 .gitignore           |  1 -
 .gitmodules          |  3 +++
 README.md            |  4 ++--
 src/Makefile.linux64 | 12 ++++++------
 src/compiler         |  1 +
 5 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 src/compiler

diff --git a/.gitignore b/.gitignore
index 895d0de..ecd57cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,5 +12,4 @@
 *.pdf
 *.toc
 
-clean-compiler/
 testproperties
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..d3d1ec0
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src/compiler"]
+	path = src/compiler
+	url = https://gitlab.science.ru.nl/clean-compiler-and-rts/compiler
diff --git a/README.md b/README.md
index 7af08ad..fa35f36 100644
--- a/README.md
+++ b/README.md
@@ -9,8 +9,8 @@ The latest documentation can be [downloaded][doc] in PDF format.
 ## Installation
 
 On Linux, the tool can be installed simply by running
-`make -f Makefile.linux64`. This downloads the right version of the Clean
-compiler. On Windows, you are yourself responsible for this, but a project file
+`make -f Makefile.linux64`. This builds the dependencies of the Clean compiler
+as well. On Windows, you are yourself responsible for this, but a project file
 is provided.
 
 [doc]: https://gitlab.science.ru.nl/clean-and-itasks/clean-test-properties/-/jobs/artifacts/master/raw/doc/doc.pdf?job=doc
diff --git a/src/Makefile.linux64 b/src/Makefile.linux64
index 49c26f0..8b27e32 100644
--- a/src/Makefile.linux64
+++ b/src/Makefile.linux64
@@ -5,17 +5,17 @@ BIN:=testproperties
 
 all: $(BIN)
 
-$(BIN): %: %.prj clean-compiler .FORCE
+$(BIN): %: %.prj compiler .FORCE
 	cpm $<
 
 $(addsuffix .prj,$(BIN)): %.prj: %.prj.default
 	cp $^ $@
 
-clean-compiler:
-	svn checkout -r 3056 https://svn.cs.ru.nl/repos/clean-compiler/branches/itask/ clean-compiler
-	$(MAKE) -C clean-compiler/main/Unix
-	$(MAKE) -C clean-compiler/backendC/CleanCompilerSources -f Makefile.linux64
-	ln -s ../../backendC/CleanCompilerSources/backend.a clean-compiler/backend/Clean\ System\ Files/backend_library
+compiler: .FORCE
+	$(MAKE) -C compiler/main/Unix
+	$(MAKE) -C compiler/backendC/CleanCompilerSources -f Makefile.linux64
+	mkdir -p compiler/backend/Clean\ System\ Files
+	ln -fs ../../backendC/CleanCompilerSources/backend.a compiler/backend/Clean\ System\ Files/backend_library
 
 clean:
 	shopt -s globstar; $(RM) -r **/Clean\ System\ Files $(BIN) $(addsuffix .prj,$(BIN))
diff --git a/src/compiler b/src/compiler
new file mode 160000
index 0000000..a07b920
--- /dev/null
+++ b/src/compiler
@@ -0,0 +1 @@
+Subproject commit a07b9204a6c0bc338355df3c9af88dbbf76ea517
-- 
GitLab