diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-03-13 13:35:08 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-03-13 13:35:08 -0230 |
| commit | 8645989349ae9df88124f948fc572791804e11af (patch) | |
| tree | d3556a02f98cd6be02cbd20a4a4e6cdbcecedb5d /java/src | |
| parent | Copy the gradle plugin files to lib directory for easier access (diff) | |
| download | ice-8645989349ae9df88124f948fc572791804e11af.tar.bz2 ice-8645989349ae9df88124f948fc572791804e11af.tar.xz ice-8645989349ae9df88124f948fc572791804e11af.zip | |
Modified the gradle plugin to automatically add the Ice slice dir to the includes
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/Freeze/build.gradle | 1 | ||||
| -rw-r--r-- | java/src/Glacier2/build.gradle | 3 | ||||
| -rw-r--r-- | java/src/Ice/build.gradle | 1 | ||||
| -rw-r--r-- | java/src/IceBox/build.gradle | 1 | ||||
| -rw-r--r-- | java/src/IceDiscovery/build.gradle | 3 | ||||
| -rw-r--r-- | java/src/IceGrid/build.gradle | 1 | ||||
| -rw-r--r-- | java/src/IceLocatorDiscovery/build.gradle | 3 | ||||
| -rw-r--r-- | java/src/IcePatch2/build.gradle | 1 | ||||
| -rw-r--r-- | java/src/IceStorm/build.gradle | 1 |
9 files changed, 3 insertions, 12 deletions
diff --git a/java/src/Freeze/build.gradle b/java/src/Freeze/build.gradle index 0027f531c0e..ca91c1885b5 100644 --- a/java/src/Freeze/build.gradle +++ b/java/src/Freeze/build.gradle @@ -12,7 +12,6 @@ targetCompatibility = iceTargetCompatibility slice { java { - include = ["${sliceDir}"] args = "--ice" files = files(fileTree(dir: "$sliceDir/Freeze", includes:['*.ice'], excludes:["*F.ice"]), file("./src/main/java/Freeze/PingObject.ice")) diff --git a/java/src/Glacier2/build.gradle b/java/src/Glacier2/build.gradle index 0dec9069821..cf94b5ebf9d 100644 --- a/java/src/Glacier2/build.gradle +++ b/java/src/Glacier2/build.gradle @@ -13,7 +13,6 @@ targetCompatibility = iceTargetCompatibility slice { java { set1 { - include = ["${sliceDir}"] args = "--ice --tie --checksum Glacier2.SliceChecksums" files = fileTree(dir: "${sliceDir}/Glacier2", includes:['*.ice'], excludes:["*F.ice"]) } @@ -24,4 +23,4 @@ dependencies { compile project(':ice') } -apply from: "$rootProject.projectDir/gradle/library.gradle"
\ No newline at end of file +apply from: "$rootProject.projectDir/gradle/library.gradle" diff --git a/java/src/Ice/build.gradle b/java/src/Ice/build.gradle index 8df5256127b..37bc4d143be 100644 --- a/java/src/Ice/build.gradle +++ b/java/src/Ice/build.gradle @@ -17,7 +17,6 @@ slice { files = [file("$sliceDir/Ice/BuiltinSequences.ice")] } nostream { - include = ["${sliceDir}"] 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 acd8d2a812c..a1c0d0741cf 100644 --- a/java/src/IceBox/build.gradle +++ b/java/src/IceBox/build.gradle @@ -13,7 +13,6 @@ targetCompatibility = iceTargetCompatibility slice { java { set1 { - include = ["${sliceDir}"] args = "--ice --tie --checksum 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 344098b36f6..63e851d8860 100644 --- a/java/src/IceDiscovery/build.gradle +++ b/java/src/IceDiscovery/build.gradle @@ -12,7 +12,6 @@ targetCompatibility = iceTargetCompatibility slice { java { - include = ["${sliceDir}"] args = "--ice" files = fileTree(dir: "$sliceDir/IceDiscovery", includes:['*.ice'], excludes:["*F.ice"]) } @@ -22,4 +21,4 @@ dependencies { compile project(':ice') } -apply from: "$rootProject.projectDir/gradle/library.gradle"
\ No newline at end of file +apply from: "$rootProject.projectDir/gradle/library.gradle" diff --git a/java/src/IceGrid/build.gradle b/java/src/IceGrid/build.gradle index cfb2dd99525..b22a69a768a 100644 --- a/java/src/IceGrid/build.gradle +++ b/java/src/IceGrid/build.gradle @@ -13,7 +13,6 @@ targetCompatibility = iceTargetCompatibility slice { java { set1 { - include = ["${sliceDir}"] args = "--ice --tie --checksum 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 021611350e4..0d7cae0f5e7 100644 --- a/java/src/IceLocatorDiscovery/build.gradle +++ b/java/src/IceLocatorDiscovery/build.gradle @@ -12,7 +12,6 @@ targetCompatibility = iceTargetCompatibility slice { java { - include = ["${sliceDir}"] args = "--ice" files = fileTree(dir: "$sliceDir/IceLocatorDiscovery", includes:['*.ice'], excludes:["*F.ice"]) } @@ -22,4 +21,4 @@ dependencies { compile project(':ice') } -apply from: "$rootProject.projectDir/gradle/library.gradle"
\ No newline at end of file +apply from: "$rootProject.projectDir/gradle/library.gradle" diff --git a/java/src/IcePatch2/build.gradle b/java/src/IcePatch2/build.gradle index 7b7957a5057..f61dc243904 100644 --- a/java/src/IcePatch2/build.gradle +++ b/java/src/IcePatch2/build.gradle @@ -13,7 +13,6 @@ targetCompatibility = iceTargetCompatibility slice { java { set1 { - include = ["${sliceDir}"] args = "--ice --tie --checksum 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 05f98882e65..8fe928af017 100644 --- a/java/src/IceStorm/build.gradle +++ b/java/src/IceStorm/build.gradle @@ -13,7 +13,6 @@ targetCompatibility = iceTargetCompatibility slice { java { set1 { - include = ["${sliceDir}"] args = "--ice --tie --checksum IceStorm.SliceChecksums" files = fileTree(dir: "$sliceDir/IceStorm", includes:['*.ice'], excludes:["*F.ice"]) } |