From a4fc0a03862965abada6e1b70fc43ed857fd22c8 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 22 Aug 2020 16:59:17 +0100
Subject: Build against external slicer-parser library

---
 .gitmodules                         |  4 ----
 ice                                 |  1 -
 icespider/compile/Jamfile.jam       |  5 ++---
 icespider/compile/slice/Jamroot.jam | 28 ----------------------------
 4 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 ice
 delete mode 100644 icespider/compile/slice/Jamroot.jam

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e0e648c..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,4 +0,0 @@
-[submodule "ice"]
-	path = ice
-	url = https://github.com/zeroc-ice/ice
-	branch = 3.7
diff --git a/ice b/ice
deleted file mode 160000
index 827fb61..0000000
--- a/ice
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 827fb617431b61f1fe811139f7b7f33beb45dbf0
diff --git a/icespider/compile/Jamfile.jam b/icespider/compile/Jamfile.jam
index 96a8d37..f1c0d6f 100644
--- a/icespider/compile/Jamfile.jam
+++ b/icespider/compile/Jamfile.jam
@@ -3,7 +3,7 @@ lib slicer : : : : <include>/usr/include/slicer <include>/usr/include/adhocutil
 lib slicer-json ;
 lib boost_program_options ;
 lib stdc++fs ;
-lib mcpp ;
+lib slice-parser ;
 
 obj routes : routes.ice : <use>../common//icespider-common <toolset>tidy:<checker>none ;
 lib icespider-compile :
@@ -16,13 +16,12 @@ lib icespider-compile :
 	<library>adhocutil
 	<library>slicer-json
 	<library>stdc++fs
-	<library>slice//Slice
+	<library>slice-parser
 	<library>../common//icespider-common
 	<implicit-dependency>../common//icespider-common
 	<implicit-dependency>routes
 	<library>..//Ice
 	<library>..//pthread
-	<library>mcpp
 	: :
 	<library>stdc++fs
 	<library>../common//icespider-common
diff --git a/icespider/compile/slice/Jamroot.jam b/icespider/compile/slice/Jamroot.jam
deleted file mode 100644
index 612cdf0..0000000
--- a/icespider/compile/slice/Jamroot.jam
+++ /dev/null
@@ -1,28 +0,0 @@
-path-constant ice : ../../../ice ;
-
-project ice :
-  requirements
-		<cxxstd>11
-		<warnings>off
-		<include>$(ice)/cpp/src
-		<toolset>tidy:<checker>none
-		<coverage>off
-	;
-
-obj Parser : $(ice)/cpp/src/Slice/Parser.cpp ;
-obj Grammar : $(ice)/cpp/src/Slice/Grammar.cpp ;
-obj Preprocessor : $(ice)/cpp/src/Slice/Preprocessor.cpp ;
-obj CPlusPlusUtil : $(ice)/cpp/src/Slice/CPlusPlusUtil.cpp ;
-obj SliceUtil : $(ice)/cpp/src/Slice/SliceUtil.cpp ;
-obj FileTracker : $(ice)/cpp/src/Slice/FileTracker.cpp ;
-obj Scanner : $(ice)/cpp/src/Slice/Scanner.cpp ;
-
-alias Slice :
-	Parser Grammar Preprocessor
-	CPlusPlusUtil SliceUtil FileTracker
-	Scanner
-	: : :
-	<include>$(ice)/cpp/src
-	<include>$(ice)/cpp/include
-	;
-
-- 
cgit v1.2.3