Use metadata to specify includes

13 files changed, 39 insertions, 53 deletions

diff --git a/cppe/test/IceE/custom/AllTests.cpp b/cppe/test/IceE/custom/AllTests.cpp
index 42c40554377..139482c6ed9 100644
--- a/cppe/test/IceE/custom/AllTests.cpp
+++ b/cppe/test/IceE/custom/AllTests.cpp
@@ -10,9 +10,6 @@
 #include <IceE/IceE.h>
 #include <IceE/Locator.h>
 #include <TestCommon.h>
-#include <deque>
-#include <list>
-#include <MyByteSeq.h>
 #include <Test.h>
 
 using namespace std;
diff --git a/cppe/test/IceE/custom/Client.cpp b/cppe/test/IceE/custom/Client.cpp
index ade286de97e..8a23fe48b2c 100644
--- a/cppe/test/IceE/custom/Client.cpp
+++ b/cppe/test/IceE/custom/Client.cpp
@@ -10,9 +10,6 @@
 #include <IceE/IceE.h>
 #include <TestCommon.h>
 #include <TestApplication.h>
-#include <deque>
-#include <list>
-#include <MyByteSeq.h>
 #include <Test.h>
 
 using namespace std;
diff --git a/cppe/test/IceE/custom/Collocated.cpp b/cppe/test/IceE/custom/Collocated.cpp
index fe4600e2697..e572ef4a654 100644
--- a/cppe/test/IceE/custom/Collocated.cpp
+++ b/cppe/test/IceE/custom/Collocated.cpp
@@ -10,9 +10,6 @@
 #include <IceE/IceE.h>
 #include <TestCommon.h>
 #include <TestApplication.h>
-#include <deque>
-#include <list>
-#include <MyByteSeq.h>
 #include <TestI.h>
 
 using namespace std;
diff --git a/cppe/test/IceE/custom/Makefile b/cppe/test/IceE/custom/Makefile
index cd1257469ae..3ad0f5f249a 100644
--- a/cppe/test/IceE/custom/Makefile
+++ b/cppe/test/IceE/custom/Makefile
@@ -40,7 +40,7 @@ SLICE_SRCS	= Test.ice
 include $(top_srcdir)/config/Make.rules
 
 CPPFLAGS	 := -I. -I../../include $(CPPFLAGS)
-SLICE2CPPEFLAGS  := --add-header MyByteSeq.h --add-header deque --add-header list $(SLICE2CPPFLAGS)
+SLICE2CPPEFLAGS  := $(SLICE2CPPFLAGS)
 
 $(CLIENT): $(COBJS)
 	rm -f $@
diff --git a/cppe/test/IceE/custom/Server.cpp b/cppe/test/IceE/custom/Server.cpp
index fc91abeb952..dc1b3d1a0f3 100644
--- a/cppe/test/IceE/custom/Server.cpp
+++ b/cppe/test/IceE/custom/Server.cpp
@@ -10,9 +10,6 @@
 #include <IceE/IceE.h>
 #include <TestCommon.h>
 #include <TestApplication.h>
-#include <deque>
-#include <list>
-#include <MyByteSeq.h>
 #include <TestI.h>
 
 using namespace std;
diff --git a/cppe/test/IceE/custom/Test.ice b/cppe/test/IceE/custom/Test.ice
index e66480f1617..06b2bd4fbe0 100644
--- a/cppe/test/IceE/custom/Test.ice
+++ b/cppe/test/IceE/custom/Test.ice
@@ -10,6 +10,8 @@
 #ifndef TEST_ICE
 #define TEST_ICE
 
+[["cpp:include:deque", "cpp:include:list", "cpp:include:MyByteSeq.h"]]
+
 module Test
 {
 
diff --git a/cppe/test/IceE/custom/TestI.cpp b/cppe/test/IceE/custom/TestI.cpp
index de249e40a64..c3ade5a3c46 100644
--- a/cppe/test/IceE/custom/TestI.cpp
+++ b/cppe/test/IceE/custom/TestI.cpp
@@ -7,10 +7,6 @@
 //
 // **********************************************************************
 
-#include <IceE/IceE.h>
-#include <deque>
-#include <list>
-#include <MyByteSeq.h>
 #include <TestI.h>
 #include <TestCommon.h>
 
diff --git a/cppe/test/IceE/custom/customC.dsp b/cppe/test/IceE/custom/customC.dsp
index 8be21420772..b27bf2ac53d 100755
--- a/cppe/test/IceE/custom/customC.dsp
+++ b/cppe/test/IceE/custom/customC.dsp
@@ -189,7 +189,7 @@ SOURCE=.\Test.ice
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -204,7 +204,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -219,7 +219,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -234,7 +234,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/cppe/test/IceE/custom/customC.vcp b/cppe/test/IceE/custom/customC.vcp
index 073ecd0c21e..38123bc34fa 100755
--- a/cppe/test/IceE/custom/customC.vcp
+++ b/cppe/test/IceE/custom/customC.vcp
@@ -2583,7 +2583,7 @@ SOURCE=.\Test.ice
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2598,7 +2598,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2613,7 +2613,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2628,7 +2628,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2643,7 +2643,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2658,7 +2658,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2673,7 +2673,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2688,7 +2688,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/cppe/test/IceE/custom/customCOL.dsp b/cppe/test/IceE/custom/customCOL.dsp
index 1dc941de93c..8ccc1f4d6d2 100755
--- a/cppe/test/IceE/custom/customCOL.dsp
+++ b/cppe/test/IceE/custom/customCOL.dsp
@@ -197,7 +197,7 @@ SOURCE=.\Test.ice
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -212,7 +212,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -227,7 +227,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -242,7 +242,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/cppe/test/IceE/custom/customCOL.vcp b/cppe/test/IceE/custom/customCOL.vcp
index 4021b3c549c..6fbbc4e2b9a 100755
--- a/cppe/test/IceE/custom/customCOL.vcp
+++ b/cppe/test/IceE/custom/customCOL.vcp
@@ -3665,7 +3665,7 @@ SOURCE=.\Test.ice
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3680,7 +3680,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3695,7 +3695,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3710,7 +3710,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3725,7 +3725,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3740,7 +3740,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3755,7 +3755,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -3770,7 +3770,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/cppe/test/IceE/custom/customS.dsp b/cppe/test/IceE/custom/customS.dsp
index b5552642749..ed62b1a510a 100755
--- a/cppe/test/IceE/custom/customS.dsp
+++ b/cppe/test/IceE/custom/customS.dsp
@@ -193,7 +193,7 @@ SOURCE=.\Test.ice
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -208,7 +208,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -223,7 +223,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -238,7 +238,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

diff --git a/cppe/test/IceE/custom/customS.vcp b/cppe/test/IceE/custom/customS.vcp
index 59dc336bb12..4152142b342 100755
--- a/cppe/test/IceE/custom/customS.vcp
+++ b/cppe/test/IceE/custom/customS.vcp
@@ -2525,7 +2525,7 @@ SOURCE=.\Test.ice
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2540,7 +2540,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2555,7 +2555,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2570,7 +2570,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2585,7 +2585,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2600,7 +2600,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2615,7 +2615,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)

@@ -2630,7 +2630,7 @@ BuildCmds= \
 InputPath=.\Test.ice

 

 BuildCmds= \

-	slice2cppe.exe -I. -I../../../slice --add-header MyByteSeq.h --add-header deque --add-header list Test.ice

+	slice2cppe.exe -I. Test.ice

 

 "Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

    $(BuildCmds)