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

8 files changed, 5 insertions, 9 deletions

diff --git a/java/src/Glacier2/build.gradle b/java/src/Glacier2/build.gradle
index c8c2a985fcb..e0f263c7531 100644
--- a/java/src/Glacier2/build.gradle
+++ b/java/src/Glacier2/build.gradle
@@ -27,7 +27,7 @@ sourceSets {
 slice {
     java {
         set1 {
-            args = "--ice --checksum com.zeroc.Glacier2.SliceChecksums"
+            args = "--checksum com.zeroc.Glacier2.SliceChecksums"
             files = fileTree(dir: "${sliceDir}/Glacier2", includes:['*.ice'], excludes:["*F.ice"])
         }
     }
diff --git a/java/src/Ice/build.gradle b/java/src/Ice/build.gradle
index 7e687c43682..7b79d8b95cc 100644
--- a/java/src/Ice/build.gradle
+++ b/java/src/Ice/build.gradle
@@ -19,11 +19,9 @@ project.ext.description = "Ice is a comprehensive RPC framework that helps you b
 slice {
     java {
         stream {
-            args = "--ice"
             files = [file("$sliceDir/Ice/BuiltinSequences.ice")]
         }
         nostream {
-            args = "--ice"
             files = fileTree(dir: "$sliceDir", includes:['Ice/*.ice', 'IceSSL/*.ice'],
                 excludes:['Ice/*F.ice', 'Ice/BuiltinSequences.ice'])
         }
diff --git a/java/src/IceBox/build.gradle b/java/src/IceBox/build.gradle
index 7d8bad65ca1..a2b805c8e7a 100644
--- a/java/src/IceBox/build.gradle
+++ b/java/src/IceBox/build.gradle
@@ -18,7 +18,7 @@ project.ext.description = "IceBox is an easy-to-use framework for Ice applicatio
 slice {
     java {
         set1 {
-            args = "--ice --checksum com.zeroc.IceBox.SliceChecksums"
+            args = "--checksum com.zeroc.IceBox.SliceChecksums"
             files = fileTree(dir: "$sliceDir/IceBox", includes:['*.ice'], excludes:["*F.ice"])
         }
     }
diff --git a/java/src/IceDiscovery/build.gradle b/java/src/IceDiscovery/build.gradle
index 75e09daf79a..43dc7279b24 100644
--- a/java/src/IceDiscovery/build.gradle
+++ b/java/src/IceDiscovery/build.gradle
@@ -17,7 +17,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/src/IceGrid/build.gradle b/java/src/IceGrid/build.gradle
index 30ec3c3d50d..02ab4534845 100644
--- a/java/src/IceGrid/build.gradle
+++ b/java/src/IceGrid/build.gradle
@@ -18,7 +18,7 @@ project.ext.description = "Locate, deploy, and manage Ice servers"
 slice {
     java {
         set1 {
-            args = "--ice --checksum com.zeroc.IceGrid.SliceChecksums"
+            args = "--checksum com.zeroc.IceGrid.SliceChecksums"
             files = fileTree(dir: "$sliceDir/IceGrid", includes:['*.ice'], excludes:["*F.ice"])
         }
     }
diff --git a/java/src/IceLocatorDiscovery/build.gradle b/java/src/IceLocatorDiscovery/build.gradle
index 5d567924de1..dc45b8c5715 100644
--- a/java/src/IceLocatorDiscovery/build.gradle
+++ b/java/src/IceLocatorDiscovery/build.gradle
@@ -17,7 +17,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/src/IcePatch2/build.gradle b/java/src/IcePatch2/build.gradle
index 4d30cffa9ae..fc13667fbad 100644
--- a/java/src/IcePatch2/build.gradle
+++ b/java/src/IcePatch2/build.gradle
@@ -18,7 +18,7 @@ project.ext.description = "File distribution and patching for Ice"
 slice {
     java {
         set1 {
-            args = "--ice --checksum com.zeroc.IcePatch2.SliceChecksums"
+            args = "--checksum com.zeroc.IcePatch2.SliceChecksums"
             files = fileTree(dir: "$sliceDir/IcePatch2", includes:['*.ice'], excludes:["*F.ice"])
         }
     }
diff --git a/java/src/IceStorm/build.gradle b/java/src/IceStorm/build.gradle
index 2644a8da018..704dd83b5b3 100644
--- a/java/src/IceStorm/build.gradle
+++ b/java/src/IceStorm/build.gradle
@@ -27,7 +27,7 @@ sourceSets {
 slice {
     java {
         set1 {
-            args = "--ice --checksum com.zeroc.IceStorm.SliceChecksums"
+            args = "--checksum com.zeroc.IceStorm.SliceChecksums"
             files = fileTree(dir: "$sliceDir/IceStorm", includes:['*.ice'], excludes:["*F.ice"])
         }
     }