Skip to content
This repository has been archived by the owner on Jun 28, 2022. It is now read-only.

Commit

Permalink
Use absolute path in build.gradle (#1315)
Browse files Browse the repository at this point in the history 
Relative paths do not work well in the new api-client-staging structure since it depends on the directory of execution. Switching to use absolute path with `projectDir` solves this problem
  • Loading branch information
@shinfan
shinfan authored Jun 1, 2017
1 parent 1ababd3 commit bb472d3
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 28 deletions.
16 changes: 9 additions & 7 deletions src/main/resources/com/google/api/codegen/metadatagen/java/grpc/build.gradle.snip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

ext {
packageName = '{@metadata.identifier}'
javaDocRoot = projectDir.getAbsolutePath() + '/tmp_gh-pages'
}

sourceSets {
Expand Down Expand Up @@ -106,8 +107,9 @@
}

task checkOutGhPages << {
if (!new File('tmp_gh-pages').exists()) {
if (!new File(javaDocRoot).exists()) {
exec {
workingDir projectDir
commandLine 'git', 'clone', '--branch', 'gh-pages',
'--single-branch', 'git@@github.com:googleapis/googleapis.git', 'tmp_gh-pages'
}
Expand All @@ -118,7 +120,7 @@
dependsOn 'checkOutGhPages'
dependsOn 'javadoc'
doLast {
def newSiteDirPath = "tmp_gh-pages/java/${packageName}/${project.version}/apidocs/"
def newSiteDirPath = javaDocRoot + "/java/${packageName}/${project.version}/apidocs/"
new File(newSiteDirPath).mkdirs()
copy {
from 'build/docs/javadoc'
Expand All @@ -130,17 +132,17 @@
task createApiDocsRedirect {
dependsOn 'copyFilesToGhPages'
doLast {
def outputContent = new File('templates/apidocs_index.html.template').text
def outputContent = new File(projectDir.getAbsolutePath() + '/templates/apidocs_index.html.template').text
outputContent = outputContent.replace('{{siteVersion}}', project.version)
outputContent = outputContent.replace('{{packageName}}', packageName)
new File("tmp_gh-pages/java/${packageName}/apidocs").mkdirs()
new File("tmp_gh-pages/java/${packageName}/apidocs/index.html").write(outputContent)
new File(javaDocRoot + "/java/${packageName}/apidocs").mkdirs()
new File(javaDocRoot + "/java/${packageName}/apidocs/index.html").write(outputContent)
exec {
workingDir 'tmp_gh-pages/'
workingDir javaDocRoot
commandLine 'git', 'add', '.'
}
exec {
workingDir 'tmp_gh-pages/'
workingDir javaDocRoot
commandLine 'git', 'commit', '-m', "Regenerating docs for ${packageName} ${project.version}"
}
println 'New docs have been generated under tmp_gh-pages and have been committed;'
Expand Down
16 changes: 9 additions & 7 deletions src/test/java/com/google/api/codegen/grpcmetadatagen/testdata/java_common_protos.baseline
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ dependencies {

ext {
packageName = 'proto-google-common-protos'
javaDocRoot = projectDir.getAbsolutePath() + '/tmp_gh-pages'
}

sourceSets {
Expand Down Expand Up @@ -312,8 +313,9 @@ if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')
}

task checkOutGhPages << {
if (!new File('tmp_gh-pages').exists()) {
if (!new File(javaDocRoot).exists()) {
exec {
workingDir projectDir
commandLine 'git', 'clone', '--branch', 'gh-pages',
'--single-branch', 'git@github.com:googleapis/googleapis.git', 'tmp_gh-pages'
}
Expand All @@ -324,7 +326,7 @@ task copyFilesToGhPages {
dependsOn 'checkOutGhPages'
dependsOn 'javadoc'
doLast {
def newSiteDirPath = "tmp_gh-pages/java/${packageName}/${project.version}/apidocs/"
def newSiteDirPath = javaDocRoot + "/java/${packageName}/${project.version}/apidocs/"
new File(newSiteDirPath).mkdirs()
copy {
from 'build/docs/javadoc'
Expand All @@ -336,17 +338,17 @@ task copyFilesToGhPages {
task createApiDocsRedirect {
dependsOn 'copyFilesToGhPages'
doLast {
def outputContent = new File('templates/apidocs_index.html.template').text
def outputContent = new File(projectDir.getAbsolutePath() + '/templates/apidocs_index.html.template').text
outputContent = outputContent.replace('{{siteVersion}}', project.version)
outputContent = outputContent.replace('{{packageName}}', packageName)
new File("tmp_gh-pages/java/${packageName}/apidocs").mkdirs()
new File("tmp_gh-pages/java/${packageName}/apidocs/index.html").write(outputContent)
new File(javaDocRoot + "/java/${packageName}/apidocs").mkdirs()
new File(javaDocRoot + "/java/${packageName}/apidocs/index.html").write(outputContent)
exec {
workingDir 'tmp_gh-pages/'
workingDir javaDocRoot
commandLine 'git', 'add', '.'
}
exec {
workingDir 'tmp_gh-pages/'
workingDir javaDocRoot
commandLine 'git', 'commit', '-m', "Regenerating docs for ${packageName} ${project.version}"
}
println 'New docs have been generated under tmp_gh-pages and have been committed;'
Expand Down
16 changes: 9 additions & 7 deletions src/test/java/com/google/api/codegen/grpcmetadatagen/testdata/java_grpc_stubs.baseline
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ dependencies {

ext {
packageName = 'grpc-google-cloud-library-v1'
javaDocRoot = projectDir.getAbsolutePath() + '/tmp_gh-pages'
}

sourceSets {
Expand Down Expand Up @@ -313,8 +314,9 @@ if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')
}

task checkOutGhPages << {
if (!new File('tmp_gh-pages').exists()) {
if (!new File(javaDocRoot).exists()) {
exec {
workingDir projectDir
commandLine 'git', 'clone', '--branch', 'gh-pages',
'--single-branch', 'git@github.com:googleapis/googleapis.git', 'tmp_gh-pages'
}
Expand All @@ -325,7 +327,7 @@ task copyFilesToGhPages {
dependsOn 'checkOutGhPages'
dependsOn 'javadoc'
doLast {
def newSiteDirPath = "tmp_gh-pages/java/${packageName}/${project.version}/apidocs/"
def newSiteDirPath = javaDocRoot + "/java/${packageName}/${project.version}/apidocs/"
new File(newSiteDirPath).mkdirs()
copy {
from 'build/docs/javadoc'
Expand All @@ -337,17 +339,17 @@ task copyFilesToGhPages {
task createApiDocsRedirect {
dependsOn 'copyFilesToGhPages'
doLast {
def outputContent = new File('templates/apidocs_index.html.template').text
def outputContent = new File(projectDir.getAbsolutePath() + '/templates/apidocs_index.html.template').text
outputContent = outputContent.replace('{{siteVersion}}', project.version)
outputContent = outputContent.replace('{{packageName}}', packageName)
new File("tmp_gh-pages/java/${packageName}/apidocs").mkdirs()
new File("tmp_gh-pages/java/${packageName}/apidocs/index.html").write(outputContent)
new File(javaDocRoot + "/java/${packageName}/apidocs").mkdirs()
new File(javaDocRoot + "/java/${packageName}/apidocs/index.html").write(outputContent)
exec {
workingDir 'tmp_gh-pages/'
workingDir javaDocRoot
commandLine 'git', 'add', '.'
}
exec {
workingDir 'tmp_gh-pages/'
workingDir javaDocRoot
commandLine 'git', 'commit', '-m', "Regenerating docs for ${packageName} ${project.version}"
}
println 'New docs have been generated under tmp_gh-pages and have been committed;'
Expand Down
16 changes: 9 additions & 7 deletions src/test/java/com/google/api/codegen/grpcmetadatagen/testdata/java_library.baseline
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ dependencies {

ext {
packageName = 'proto-google-cloud-library-v1'
javaDocRoot = projectDir.getAbsolutePath() + '/tmp_gh-pages'
}

sourceSets {
Expand Down Expand Up @@ -314,8 +315,9 @@ if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')
}

task checkOutGhPages << {
if (!new File('tmp_gh-pages').exists()) {
if (!new File(javaDocRoot).exists()) {
exec {
workingDir projectDir
commandLine 'git', 'clone', '--branch', 'gh-pages',
'--single-branch', 'git@github.com:googleapis/googleapis.git', 'tmp_gh-pages'
}
Expand All @@ -326,7 +328,7 @@ task copyFilesToGhPages {
dependsOn 'checkOutGhPages'
dependsOn 'javadoc'
doLast {
def newSiteDirPath = "tmp_gh-pages/java/${packageName}/${project.version}/apidocs/"
def newSiteDirPath = javaDocRoot + "/java/${packageName}/${project.version}/apidocs/"
new File(newSiteDirPath).mkdirs()
copy {
from 'build/docs/javadoc'
Expand All @@ -338,17 +340,17 @@ task copyFilesToGhPages {
task createApiDocsRedirect {
dependsOn 'copyFilesToGhPages'
doLast {
def outputContent = new File('templates/apidocs_index.html.template').text
def outputContent = new File(projectDir.getAbsolutePath() + '/templates/apidocs_index.html.template').text
outputContent = outputContent.replace('{{siteVersion}}', project.version)
outputContent = outputContent.replace('{{packageName}}', packageName)
new File("tmp_gh-pages/java/${packageName}/apidocs").mkdirs()
new File("tmp_gh-pages/java/${packageName}/apidocs/index.html").write(outputContent)
new File(javaDocRoot + "/java/${packageName}/apidocs").mkdirs()
new File(javaDocRoot + "/java/${packageName}/apidocs/index.html").write(outputContent)
exec {
workingDir 'tmp_gh-pages/'
workingDir javaDocRoot
commandLine 'git', 'add', '.'
}
exec {
workingDir 'tmp_gh-pages/'
workingDir javaDocRoot
commandLine 'git', 'commit', '-m', "Regenerating docs for ${packageName} ${project.version}"
}
println 'New docs have been generated under tmp_gh-pages and have been committed;'
Expand Down

0 comments on commit bb472d3

Please sign in to comment.