Replaced slice compiler options --ice, --underscore and --dll-export by

global metadata directives (ice-prefix, underscore, cpp:dll-export:SYMBOL and objc:dll-export:SYMBOL)
Added new cs:tie and java:tie metadata

9 files changed, 5 insertions, 9 deletions

diff --git a/java-compat/src/Glacier2/build.gradle b/java-compat/src/Glacier2/build.gradle
index d087e401336..78e1eb60929 100644
--- a/java-compat/src/Glacier2/build.gradle
+++ b/java-compat/src/Glacier2/build.gradle
@@ -16,7 +16,7 @@ project.ext.description = "Firewall traversal for Ice"
 slice {
     java {
         set1 {
-            args = "--ice --tie --checksum Glacier2.SliceChecksums"
+            args = "--tie --checksum Glacier2.SliceChecksums"
             files = fileTree(dir: "${sliceDir}/Glacier2", includes:['*.ice'], excludes:["*F.ice"])
         }
     }
diff --git a/java-compat/src/Ice/build.gradle b/java-compat/src/Ice/build.gradle
index 3edcb8df149..e051ced349c 100644
--- a/java-compat/src/Ice/build.gradle
+++ b/java-compat/src/Ice/build.gradle
@@ -17,7 +17,6 @@ project.ext.description = "Ice is a comprehensive RPC framework that helps you b
 slice {
     java {
         set1 {
-            args = "--ice"
             files = fileTree(dir: "$sliceDir", includes:['Ice/*.ice', 'IceSSL/*.ice'], excludes:['Ice/*F.ice'])
         }
     }
diff --git a/java-compat/src/IceBT/build.gradle b/java-compat/src/IceBT/build.gradle
index 190900f0f07..7f3e8054372 100644
--- a/java-compat/src/IceBT/build.gradle
+++ b/java-compat/src/IceBT/build.gradle
@@ -16,7 +16,6 @@ project.ext.description = "Bluetooth support for Ice"
 slice {
     java {
         set1 {
-            args = "--ice"
             files = fileTree(dir: "$sliceDir/IceBT", includes:['*.ice'], excludes:["*F.ice"])
         }
     }
diff --git a/java-compat/src/IceBox/build.gradle b/java-compat/src/IceBox/build.gradle
index 19aac05e3d3..3cb57d4a0e8 100644
--- a/java-compat/src/IceBox/build.gradle
+++ b/java-compat/src/IceBox/build.gradle
@@ -16,7 +16,7 @@ project.ext.description = "IceBox is an easy-to-use framework for Ice applicatio
 slice {
     java {
         set1 {
-            args = "--ice --tie --checksum IceBox.SliceChecksums"
+            args = "--tie --checksum IceBox.SliceChecksums"
             files = fileTree(dir: "$sliceDir/IceBox", includes:['*.ice'], excludes:["*F.ice"])
         }
     }
diff --git a/java-compat/src/IceDiscovery/build.gradle b/java-compat/src/IceDiscovery/build.gradle
index c64a33f1ccd..4d7d1d8964a 100644
--- a/java-compat/src/IceDiscovery/build.gradle
+++ b/java-compat/src/IceDiscovery/build.gradle
@@ -15,7 +15,6 @@ project.ext.description = "Allow Ice applications to discover objects and object
 
 slice {
     java {
-        args = "--ice"
         files = fileTree(dir: "$sliceDir/IceDiscovery", includes:['*.ice'], excludes:["*F.ice"])
     }
 }
diff --git a/java-compat/src/IceGrid/build.gradle b/java-compat/src/IceGrid/build.gradle
index d2bd4fc5f70..d26656acd41 100644
--- a/java-compat/src/IceGrid/build.gradle
+++ b/java-compat/src/IceGrid/build.gradle
@@ -16,7 +16,7 @@ project.ext.description = "Locate, deploy, and manage Ice servers"
 slice {
     java {
         set1 {
-            args = "--ice --tie --checksum IceGrid.SliceChecksums"
+            args = "--tie --checksum IceGrid.SliceChecksums"
             files = fileTree(dir: "$sliceDir/IceGrid", includes:['*.ice'], excludes:["*F.ice"])
         }
     }
diff --git a/java-compat/src/IceLocatorDiscovery/build.gradle b/java-compat/src/IceLocatorDiscovery/build.gradle
index be398fe5e31..f28d08f1bf6 100644
--- a/java-compat/src/IceLocatorDiscovery/build.gradle
+++ b/java-compat/src/IceLocatorDiscovery/build.gradle
@@ -15,7 +15,6 @@ project.ext.description = "Ice plug-in that enables the discovery of IceGrid and
 
 slice {
     java {
-        args = "--ice"
         files = fileTree(dir: "$sliceDir/IceLocatorDiscovery", includes:['*.ice'], excludes:["*F.ice"])
     }
 }
diff --git a/java-compat/src/IcePatch2/build.gradle b/java-compat/src/IcePatch2/build.gradle
index 31ede53de5a..e8a040d1843 100644
--- a/java-compat/src/IcePatch2/build.gradle
+++ b/java-compat/src/IcePatch2/build.gradle
@@ -16,7 +16,7 @@ project.ext.description = "File distribution and patching for Ice"
 slice {
     java {
         set1 {
-            args = "--ice --tie --checksum IcePatch2.SliceChecksums"
+            args = "--tie --checksum IcePatch2.SliceChecksums"
             files = fileTree(dir: "$sliceDir/IcePatch2", includes:['*.ice'], excludes:["*F.ice"])
         }
     }
diff --git a/java-compat/src/IceStorm/build.gradle b/java-compat/src/IceStorm/build.gradle
index 9ce6d131b0f..546325df8fe 100644
--- a/java-compat/src/IceStorm/build.gradle
+++ b/java-compat/src/IceStorm/build.gradle
@@ -16,7 +16,7 @@ project.ext.description = "Publish-subscribe event distribution service"
 slice {
     java {
         set1 {
-            args = "--ice --tie --checksum IceStorm.SliceChecksums"
+            args = "--tie --checksum IceStorm.SliceChecksums"
             files = fileTree(dir: "$sliceDir/IceStorm", includes:['*.ice'], excludes:["*F.ice"])
         }
     }