diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2018-04-15 13:01:49 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2018-04-15 13:01:49 +0100 |
| commit | a80fbf478a51229d64847aa9a2f836a338b5d3a6 (patch) | |
| tree | 6022a4a442dc10a0d3eb3b4660871492167dc19a | |
| parent | MockPool (diff) | |
| download | icetray-a80fbf478a51229d64847aa9a2f836a338b5d3a6.tar.bz2 icetray-a80fbf478a51229d64847aa9a2f836a338b5d3a6.tar.xz icetray-a80fbf478a51229d64847aa9a2f836a338b5d3a6.zip | |
Ice 3.7icetray-0.2
Remove unrequired allow-ice usage in favour of .ice metadata
| -rw-r--r-- | icetray/icetray/Jamfile.jam | 1 | ||||
| -rw-r--r-- | icetray/icetray/logWriter.ice | 1 | ||||
| -rw-r--r-- | 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 { @@ -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 ; |