diff options
| -rwxr-xr-x | production/build-functions.shsource | 2 | ||||
| -rw-r--r-- | production/build_eclipse_org.shsource | 5 | ||||
| -rw-r--r-- | production/master-build.sh | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/production/build-functions.shsource b/production/build-functions.shsource index b99f87af2..157b06ebb 100755 --- a/production/build-functions.shsource +++ b/production/build-functions.shsource @@ -544,7 +544,7 @@ fn-maven-build-aggregator () -Dmaven.repo.local=$LOCAL_REPO $CBI_JDT_REPO_URL_ARG $CBI_JDT_VERSION_ARG \ -Dtycho.debug.artifactcomparator \ -DcontinueOnFail=true -Djgit.dirtyWorkingTree=error \ - -DbuildTimestamp="${TIMESTAMP}" -DbuildType="${BUILD_TYPE}" -DbuildId="${BUILD_ID}" $FORCEQUALIFIERARG + -DbuildTimestamp="${TIMESTAMP}" -DbuildType="${BUILD_TYPE}" -DbuildId="${BUILD_ID}" ${FORCEQUALIFIERARG} ${JAVA_DOC_TOOL} rc=$? popd return $rc diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource index 44ab09c22..98153c4e4 100644 --- a/production/build_eclipse_org.shsource +++ b/production/build_eclipse_org.shsource @@ -95,3 +95,8 @@ then else SIGNING=${SIGNING:-false} fi + +# custom, environment specific setting, required to generate java doc correctly for Java 8 additions, +# in our production builds. This is anticipated to be temporary, until we find a better way +# to do it. +export JAVA_DOC_TOOL=-Declipse.javadoc="-Declipse.javadoc=/shared/common/jdk1.8.0_x64-latest/bin/javadoc" diff --git a/production/master-build.sh b/production/master-build.sh index 9d4dab393..f72b6f1bb 100644 --- a/production/master-build.sh +++ b/production/master-build.sh @@ -207,6 +207,7 @@ fn-write-property CBI_JDT_VERSION fn-write-property CBI_JDT_VERSION_ARG fn-write-property PATCH_BUILD fn-write-property ALT_POM_FILE +fn-write-property JAVA_DOC_TOOL # any value of interest/usefulness can be added to BUILD_ENV_FILE if [[ "${testbuildonly}" == "true" ]] then |