Skip to content

Commit 4927201

Browse files
authored
Merge pull request #1444 from lesserwhirls/gradle
Gradle fixes
2 parents 7b22735 + 9990630 commit 4927201

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

docs/src/site/pages/netcdfJava_tutorial/overview/BuildingFromSource.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Next, use the Gradle wrapper to execute the assemble task:
4848

4949
There will be various artifacts within the `<subproject>/build/libs/` subdirectories.
5050
For example, the `cdm-core.jar` file will be in `cdm/core/build/libs/`.
51-
The uber jars, such as `toolsUI.jar` and `netcdfAll.jar`, will be found in `build/libs/`.
51+
The uber jars, such as `toolsUI.jar` and `netcdfAll.jar`, will be found in `build/distributions/`.
5252

5353
## Publishing
5454

gradle/any/protobuf.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,5 @@ jacocoTestReport {
2626
}))
2727
}
2828
}
29+
30+
sourceJar.dependsOn 'generateProto'

gradle/root/fatJars.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def createChecksumsTask = tasks.register('createChecksums') {
144144
group = 'publishing'
145145
description = 'Create .sha1, .sha256, and .md5 checksum files for the fatJars.'
146146
doLast {
147-
String sourceDir = "${rootProject.getBuildDir()}/libs"
147+
String sourceDir = "${rootProject.getBuildDir()}/distributions"
148148
def files = fileTree(dir: "${sourceDir}", include: '**/*.jar')
149149
def algorithms = ["MD5", "SHA-1", "SHA-256"]
150150
algorithms.each { algorithm ->
@@ -177,7 +177,7 @@ def createChecksumsTask = tasks.register('createChecksums') {
177177
}
178178
String checksum = sb.toString()
179179
def ext = algorithm.toLowerCase().replace("-", "")
180-
String outputFilename = "${buildDir}/libs/${jarFile.getName()}.${ext}"
180+
String outputFilename = "${buildDir}/distributions/${jarFile.getName()}.${ext}"
181181
new File(outputFilename).withWriter { writer ->
182182
writer.write checksum
183183
}

0 commit comments

Comments
 (0)