From a80fbf478a51229d64847aa9a2f836a338b5d3a6 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sun, 15 Apr 2018 13:01:49 +0100
Subject: Ice 3.7

Remove unrequired allow-ice usage in favour of .ice metadata
---
 icetray/icetray/Jamfile.jam   |  1 -
 icetray/icetray/logWriter.ice |  1 +
 slice.jam                     | 12 ++++--------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/icetray/icetray/Jamfile.jam b/icetray/icetray/Jamfile.jam
index 1887b20..51e5d69 100644
--- a/icetray/icetray/Jamfile.jam
+++ b/icetray/icetray/Jamfile.jam
@@ -16,7 +16,6 @@ lib icetray :
 	<library>..//boost_thread
 	<library>../..//glibmm
 	<library>boost_program_options
-	<allow-ice>yes
 	<slicer>yes
 	: :
 	<include>.
diff --git a/icetray/icetray/logWriter.ice b/icetray/icetray/logWriter.ice
index e55179b..0b2c062 100644
--- a/icetray/icetray/logWriter.ice
+++ b/icetray/icetray/logWriter.ice
@@ -1,6 +1,7 @@
 #ifndef ICETRAY_LOGWRITER
 #define ICETRAY_LOGWRITER
 
+[["ice-prefix"]]
 module IceTray {
 	module Logging {
 		enum LogLevel {
diff --git a/slice.jam b/slice.jam
index 434e562..d261c50 100644
--- a/slice.jam
+++ b/slice.jam
@@ -8,7 +8,6 @@ import toolset ;
 type.register SLICE : ice ;
 
 feature slicer : no yes pure ;
-feature allow-ice : no yes ;
 feature ice-visibility : public hidden ;
 
 class slice-scanner : common-scanner
@@ -29,27 +28,24 @@ generators.register-standard slice.slicer.pure : SLICE : CPP(slicer-%) : <slicer
 
 toolset.flags slice.slice2cpp INCLUDES <include> ;
 toolset.flags slice.slice2cpp DLLEXPORT <ice-visibility>public : --dll-export JAM_DLL_PUBLIC ;
-toolset.flags slice.slice2cpp ALLOWICE <allow-ice>yes : --ice ;
 toolset.flags slice.slicer INCLUDES <include> ;
 toolset.flags slice.slicer DLLEXPORT <ice-visibility>public : --dll-export JAM_DLL_PUBLIC ;
-toolset.flags slice.slicer ALLOWICE <allow-ice>yes : --ice ;
 toolset.flags slice.slicer.pure INCLUDES <include> ;
-toolset.flags slice.slicer.pure ALLOWICE <allow-ice>yes : --ice ;
 
 actions slice.slice2cpp
 {
-  slice2cpp -I"$(INCLUDES)" --checksum --output-dir $(1[1]:D) $(2) $(DLLEXPORT) $(ALLOWICE[1])
+  slice2cpp -I"$(INCLUDES)" --checksum --output-dir $(1[1]:D) $(2) $(DLLEXPORT)
 }
 
 actions slice.slicer
 {
-  slice2cpp -I"$(INCLUDES)" --checksum --output-dir $(1[1]:D) $(2) $(DLLEXPORT) $(ALLOWICE[1])
-	slicer -I"$(INCLUDES)" $(2) $(1[2]) $(ALLOWICE[1])
+  slice2cpp -I"$(INCLUDES)" --checksum --output-dir $(1[1]:D) $(2) $(DLLEXPORT)
+	slicer -I"$(INCLUDES)" $(2) $(1[2])
 }
 
 actions slice.slicer.pure
 {
-	slicer -I"$(INCLUDES)" $(2) $(1[1]) $(ALLOWICE[1])
+	slicer -I"$(INCLUDES)" $(2) $(1[1])
 }
 
 IMPORT $(__name__) : slice.slice2cpp : : slice.slice2cpp ;
-- 
cgit v1.2.3