diff options
| author | David Williams | 2014-05-18 18:43:11 +0000 |
|---|---|---|
| committer | David Williams | 2014-05-18 18:43:11 +0000 |
| commit | f8c8e92fbeacfddce290a02cb0d5ce5b7cd1d6bd (patch) | |
| tree | ea20b3823609d7c8c621b0392067040ac3c9dd63 /production | |
| parent | 934047c9e1eb4c853d2610ae60e458aaecff6b67 (diff) | |
| download | eclipse.platform.releng.aggregator-f8c8e92fbeacfddce290a02cb0d5ce5b7cd1d6bd.tar.gz eclipse.platform.releng.aggregator-f8c8e92fbeacfddce290a02cb0d5ce5b7cd1d6bd.tar.xz eclipse.platform.releng.aggregator-f8c8e92fbeacfddce290a02cb0d5ce5b7cd1d6bd.zip | |
Bug 409076 - establish standard formatting - indentation
Diffstat (limited to 'production')
98 files changed, 5177 insertions, 5177 deletions
diff --git a/production/build-functions.shsource b/production/build-functions.shsource index aa373eaf8..5bca9365f 100755 --- a/production/build-functions.shsource +++ b/production/build-functions.shsource @@ -3,56 +3,56 @@ # A general purpose utility to check number of arguments match # what was expected. Its purpose is to help bullet-proof these scripts -# when future changes made. +# when future changes made. # Example: (such as in first line of a function) # checkNArgs $# 3 checkNArgs () { - actual=$1 + actual=$1 expected=$2 if [[ -z "$actual" || -z "$expected" ]] - then + then BUILD_FAILED="${buildDirectory}/buildFailed-program-error" printf "\n\tPROGRAM ERROR: number of arguments, $actual, or number expected, $expected, was not provided as arguments.\n\n" >${BUILD_FAILED} - printf " Called from ${FUNCNAME[1]}, called from line number ${BASH_LINENO[1]} in ${BASH_SOURCE[2]}.\n\n" >>${BUILD_FAILED} - return 9 + printf " Called from ${FUNCNAME[1]}, called from line number ${BASH_LINENO[1]} in ${BASH_SOURCE[2]}.\n\n" >>${BUILD_FAILED} + return 9 fi - # possible is used when there are optional arguments, corresponds to "max possible", then "expected" means "min possible" +# possible is used when there are optional arguments, corresponds to "max possible", then "expected" means "min possible" possible=$3 - #echo " DEBUG checkNArgs funcName[1]: ${FUNCNAME[1]}" >> ${TRACE_OUTPUT} - #echo " DEBUG checkNArgs bashSource[2]: ${BASH_SOURCE[2]}" >> ${TRACE_OUTPUT} - #echo " DEBUG checkNArgs bashLineNo[1]: ${BASH_LINENO[1]}" >> ${TRACE_OUTPUT} +#echo " DEBUG checkNArgs funcName[1]: ${FUNCNAME[1]}" >> ${TRACE_OUTPUT} +#echo " DEBUG checkNArgs bashSource[2]: ${BASH_SOURCE[2]}" >> ${TRACE_OUTPUT} +#echo " DEBUG checkNArgs bashLineNo[1]: ${BASH_LINENO[1]}" >> ${TRACE_OUTPUT} if [[ -n "${possible}" ]] - then - # if 3 total arguments, make sure first is between 2 and 3rd args (inclusive) - #echo DEBUG: actual: $actual - #echo DEBUG: min expected: $expected - #echo DEBUG: max possible: $possible - #arg1=$(( $expected <= $actual )) - #arg2=$(( $actual <= $possible )) - #echo "DEBUG: expected <= actual $arg1" - #echo "DEBUG: actual <= possible $arg2" - if (( $expected <= $actual )) && (( $actual <= $possible )) - then - #echo DEBUG: return 0 + then +# if 3 total arguments, make sure first is between 2 and 3rd args (inclusive) +#echo DEBUG: actual: $actual +#echo DEBUG: min expected: $expected +#echo DEBUG: max possible: $possible +#arg1=$(( $expected <= $actual )) +#arg2=$(( $actual <= $possible )) +#echo "DEBUG: expected <= actual $arg1" +#echo "DEBUG: actual <= possible $arg2" + if (( $expected <= $actual )) && (( $actual <= $possible )) + then +#echo DEBUG: return 0 return 0 - else - BUILD_FAILED="${buildDirectory}/buildFailed-program-error" + else + BUILD_FAILED="${buildDirectory}/buildFailed-program-error" printf "\n\tPROGRAM ERROR: number of arguments, $actual, was not betwen expected, $expected, and possible, $possible.\n" >${BUILD_FAILED} - printf " Called from ${FUNCNAME[1]}, called from line number ${BASH_LINENO[1]} in ${BASH_SOURCE[2]}.\n\n" >>${BUILD_FAILED} - #echo DEBUG: return 1 - return 1 - fi + printf " Called from ${FUNCNAME[1]}, called from line number ${BASH_LINENO[1]} in ${BASH_SOURCE[2]}.\n\n" >>${BUILD_FAILED} +#echo DEBUG: return 1 + return 1 + fi elif [[ $actual != $expected ]] then - # depends on buildDirectory being exported - BUILD_FAILED="${buildDirectory}/buildFailed-program-error" - printf "\n\tPROGRAM ERROR: expected $expected arguments but was passed $actual.\n" >${BUILD_FAILED} - printf " Called from ${FUNCNAME[1]}, called from line number ${BASH_LINENO[1]} in ${BASH_SOURCE[2]}.\n\n" >>${BUILD_FAILED} - return 1 +# depends on buildDirectory being exported + BUILD_FAILED="${buildDirectory}/buildFailed-program-error" + printf "\n\tPROGRAM ERROR: expected $expected arguments but was passed $actual.\n" >${BUILD_FAILED} + printf " Called from ${FUNCNAME[1]}, called from line number ${BASH_LINENO[1]} in ${BASH_SOURCE[2]}.\n\n" >>${BUILD_FAILED} + return 1 else - return 0 - fi + return 0 + fi } # general purpose utility for "hard exit" if return code not zero. @@ -60,413 +60,413 @@ checkNArgs () # easily succeeed. # usage: # checkForErrorExit $? "Failed to copy file (for example)" -checkForErrorExit () +checkForErrorExit () { - # arg 1 must be return code, $? - # arg 2 (remaining line) can be message to print before exiting do to non-zero exit code - exitCode=$1 +# arg 1 must be return code, $? +# arg 2 (remaining line) can be message to print before exiting do to non-zero exit code + exitCode=$1 shift message="$*" if [[ -z "${exitCode}" ]] - then + then echo "PROGRAM ERROR: checkForErrorExit called with no arguments" exit 1 - fi - - if [[ -z "${message}" ]] - then - echo "WARNING: checkForErrorExit called without message" - message="(Calling program provided no message)" - fi + fi - # first make sure exit code is well formed - if [[ "${exitCode}" =~ [0] ]] - then - #echo "exitcode was zero" - exitrc=0 - else - if [[ "${exitCode}" =~ ^-?[0-9]+$ ]] - then - #echo "exitcode was indeed a legal, non-zero numeric return code" - exitrc=$exitCode - else - #echo "exitode was not numeric, so will force to 1" - exitrc=1 - fi - fi + if [[ -z "${message}" ]] + then + echo "WARNING: checkForErrorExit called without message" + message="(Calling program provided no message)" + fi - if [[ $exitrc != 0 ]] - then - echo - echo " ERROR. exit code: ${exitrc}" - echo " ERROR. message: ${message}" - echo - exit $exitrc - fi +# first make sure exit code is well formed + if [[ "${exitCode}" =~ [0] ]] + then +#echo "exitcode was zero" + exitrc=0 + else + if [[ "${exitCode}" =~ ^-?[0-9]+$ ]] + then +#echo "exitcode was indeed a legal, non-zero numeric return code" + exitrc=$exitCode + else +#echo "exitode was not numeric, so will force to 1" + exitrc=1 + fi + fi + + if [[ $exitrc != 0 ]] + then + echo + echo " ERROR. exit code: ${exitrc}" + echo " ERROR. message: ${message}" + echo + exit $exitrc + fi } # USAGE: fn-git-clone URL [BRANCH [TARGET_DIR] ] # URL: file:///gitroot/platform/eclipse.platform.releng.aggregator.git -# BRANCH: R4_2_maintenance +# BRANCH: R4_2_maintenance # TARGET_DIR: e.p.releng.aggregator -fn-git-clone () +fn-git-clone () { - URL="$1"; shift - if [ $# -gt 0 ]; then - BRANCH_CMD="-b $1"; shift - fi + URL="$1"; shift if [ $# -gt 0 ]; then - TARGET_DIR="$1"; shift - fi - # We specify --shared so that the - # directory has group write permissions, as well as g+sx, - # which is mostly done for easier "cleanup" of directories, etc., - # by anyone in "eclipse.platform.releng" group, not just e4Build - # owner id itself. - echo git clone --recursive $BRANCH_CMD $URL $TARGET_DIR - git clone --recursive $BRANCH_CMD $URL $TARGET_DIR + BRANCH_CMD="-b $1"; shift + fi + if [ $# -gt 0 ]; then + TARGET_DIR="$1"; shift + fi +# We specify --shared so that the +# directory has group write permissions, as well as g+sx, +# which is mostly done for easier "cleanup" of directories, etc., +# by anyone in "eclipse.platform.releng" group, not just e4Build +# owner id itself. + echo git clone --recursive $BRANCH_CMD $URL $TARGET_DIR + git clone --recursive $BRANCH_CMD $URL $TARGET_DIR } # USAGE: fn-git-checkout BRANCH | TAG -# BRANCH: R4_2_maintenance -fn-git-checkout () +# BRANCH: R4_2_maintenance +fn-git-checkout () { - BRANCH="$1"; shift - # always fetch before checkout, to be sure new - # branches are in local repo (in case we are switching - # to a new branch). + BRANCH="$1"; shift +# always fetch before checkout, to be sure new +# branches are in local repo (in case we are switching +# to a new branch). echo git fetch current repo before checkout git fetch RC=$? if [[ $RC != 0 ]] - then + then echo "[ERROR] RC from git fetch: $RC" else - echo git checkout "$BRANCH" --force + echo git checkout "$BRANCH" --force git checkout "$BRANCH" --force RC=$? if [[ $RC != 0 ]] - then + then echo "[ERROR] RC from git checkout: $RC" - fi - fi - return $RC + fi + fi + return $RC } # USAGE: fn-git-pull -fn-git-pull () +fn-git-pull () { - echo git pull + echo git pull git pull } # USAGE: fn-git-submodule-update -fn-git-submodule-update () +fn-git-submodule-update () { - echo "git submodule init" - git submodule init + echo "git submodule init" + git submodule init echo "git submodule update --recursive" git submodule update --recursive } # USAGE: fn-git-update-submodules -fn-git-update-submodules () +fn-git-update-submodules () { - echo git submodule update --init + echo git submodule update --init git submodule update --init } -# USAGE: fn-git-clean -fn-git-clean () +# USAGE: fn-git-clean +fn-git-clean () { - # See bug 400657 - echo git clean -f -d -x +# See bug 400657 + echo git clean -f -d -x git clean -f -d -x RC=$? if [[ $RC != 0 ]] - then + then echo "[ERROR] RC from git clean: $RC" return $RC else - # after initial clean, we'll also use git stash to clean up any temp commits - # and modified tracked files, which will also call clean under the covers, I believe, - # so may eventually want to do this first? (But, that may not allow the -x type cleanup). - git stash +# after initial clean, we'll also use git stash to clean up any temp commits +# and modified tracked files, which will also call clean under the covers, I believe, +# so may eventually want to do this first? (But, that may not allow the -x type cleanup). + git stash RC=$? if [[ $RC != 0 ]] - then + then echo "[ERROR] RC from git stash: $RC" return $RC else - # we don't really want to save this stash in build directory - git stash clear +# we don't really want to save this stash in build directory + git stash clear RC=$? if [[ $RC != 0 ]] - then + then echo "[ERROR] RC from git stash clear: $RC" return $RC - fi - fi - fi - return 0 + fi + fi + fi + return 0 } # USAGE: fn-git-reset -fn-git-reset () +fn-git-reset () { - echo git reset --hard $@ + echo git reset --hard $@ git reset --hard $@ RC=$? - if [[ $RC != 0 ]] - then + if [[ $RC != 0 ]] + then echo "[ERROR] RC from git reset: $RC" - fi - return $RC + fi + return $RC } # USAGE: fn-git-clean-submodules -fn-git-clean-submodules () +fn-git-clean-submodules () { - # See bug 400657 - echo git submodule foreach git clean -f -d -x +# See bug 400657 + echo git submodule foreach git clean -f -d -x git submodule foreach git clean -f -d -x RC=$? if [[ $RC != 0 ]] - then + then echo "[ERROR] RC from submodule foreach git clean: $RC" return $RC else - # after initial clean, we'll also use git stash to clean up any temp commits - # and modified tracked files, which will also call clean under the covers, I believe, - # so may eventually want to do this first? (But, that may not allow the -x type cleanup). - git submodule foreach git stash +# after initial clean, we'll also use git stash to clean up any temp commits +# and modified tracked files, which will also call clean under the covers, I believe, +# so may eventually want to do this first? (But, that may not allow the -x type cleanup). + git submodule foreach git stash RC=$? if [[ $RC != 0 ]] - then + then echo "[ERROR] RC from git submodule stash: $RC" return $RC else - # we don't really want to save this stash in build directory - git submodule foreach git stash clear +# we don't really want to save this stash in build directory + git submodule foreach git stash clear RC=$? if [[ $RC != 0 ]] - then + then echo "[ERROR] RC from git submodule stash clear: $RC" return $RC - fi - fi - fi - return 0 + fi + fi + fi + return 0 } # USAGE: fn-git-reset-submodules -fn-git-reset-submodules () +fn-git-reset-submodules () { - echo git submodule foreach git reset --hard HEAD + echo git submodule foreach git reset --hard HEAD git submodule foreach git reset --hard HEAD RC=$? - if [[ $RC != 0 ]] - then + if [[ $RC != 0 ]] + then echo "[ERROR] RC from submodule foreach git reset: $RC" - fi - return $RC + fi + return $RC } # USAGE: fn-build-id BUILD_TYPE # BUILD_TYPE: I, M, N, X, Y, P # TODO: depends on RAWDATE being exported/global -fn-build-id () +fn-build-id () { - checkNArgs $# 1 + checkNArgs $# 1 if [[ $? != 0 ]]; then return 1; fi - BUILD_TYPE="$1"; shift - TIMESTAMP=$( date +%Y%m%d-%H%M --date='@'$RAWDATE ) - echo ${BUILD_TYPE}${TIMESTAMP} + BUILD_TYPE="$1"; shift + TIMESTAMP=$( date +%Y%m%d-%H%M --date='@'$RAWDATE ) + echo ${BUILD_TYPE}${TIMESTAMP} } # USAGE: fn-local-repo URL # URL: git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git -fn-local-repo () +fn-local-repo () { - checkNArgs $# 1 + checkNArgs $# 1 if [[ $? != 0 ]]; then return 1; fi - # we assume REPO_AND_ACCESS is exported from calling scripts - URL="$1"; shift - TO_REPLACE='git://git.eclipse.org/gitroot' - if [[ -n "${REPO_AND_ACCESS}" && "${REPO_AND_ACCESS}" != "${TO_REPLACE}" ]] - then - echo $URL | sed "s!${TO_REPLACE}!${REPO_AND_ACCESS}!g" - else - echo $URL - fi +# we assume REPO_AND_ACCESS is exported from calling scripts + URL="$1"; shift + TO_REPLACE='git://git.eclipse.org/gitroot' + if [[ -n "${REPO_AND_ACCESS}" && "${REPO_AND_ACCESS}" != "${TO_REPLACE}" ]] + then + echo $URL | sed "s!${TO_REPLACE}!${REPO_AND_ACCESS}!g" + else + echo $URL + fi } -# USAGE: fn-git-clone-aggregator GIT_CACHE URL BRANCH +# USAGE: fn-git-clone-aggregator GIT_CACHE URL BRANCH # GIT_CACHE: /shared/eclipse/builds/R4_2_maintenance/gitCache # URL: file:///gitroot/platform/eclipse.platform.releng.aggregator.git # BRANCH: R4_2_maintenance -fn-git-clone-aggregator () +fn-git-clone-aggregator () { - checkNArgs $# 3 + checkNArgs $# 3 if [[ $? != 0 ]]; then return 1; fi - GIT_CACHE="$1"; shift - URL="$1"; shift - BRANCH="$1"; shift - if [ ! -e "$GIT_CACHE" ]; then - mkdir -p "$GIT_CACHE" - fi - pushd "$GIT_CACHE" - fn-git-clone "$URL" "$BRANCH" - popd - pushd $(fn-git-dir "$GIT_CACHE" "$URL" ) - fn-git-submodule-update - popd + GIT_CACHE="$1"; shift + URL="$1"; shift + BRANCH="$1"; shift + if [ ! -e "$GIT_CACHE" ]; then + mkdir -p "$GIT_CACHE" + fi + pushd "$GIT_CACHE" + fn-git-clone "$URL" "$BRANCH" + popd + pushd $(fn-git-dir "$GIT_CACHE" "$URL" ) + fn-git-submodule-update + popd } -# USAGE: fn-git-clean-aggregator AGGREGATOR_DIR BRANCH +# USAGE: fn-git-clean-aggregator AGGREGATOR_DIR BRANCH # AGGREGATOR_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator # BRANCH: R4_2_maintenance -fn-git-clean-aggregator () +fn-git-clean-aggregator () { - checkNArgs $# 2 + checkNArgs $# 2 if [[ $? != 0 ]]; then return 1; fi - AGGREGATOR_DIR="$1"; shift - BRANCH="$1"; shift - pushd "$AGGREGATOR_DIR" - fn-complete-status "Repo state status before any cleaning." - fn-git-clean - RC=$? - if [[ $RC == 0 ]] - then - fn-git-clean-submodules + AGGREGATOR_DIR="$1"; shift + BRANCH="$1"; shift + pushd "$AGGREGATOR_DIR" + fn-complete-status "Repo state status before any cleaning." + fn-git-clean RC=$? if [[ $RC == 0 ]] - then - fn-complete-status "Repo state status after cleaning but before reset." - fn-git-reset-submodules + then + fn-git-clean-submodules RC=$? if [[ $RC == 0 ]] - then - fn-complete-status "Repo state status after submodules reset but before checkout." - fn-git-checkout "$BRANCH" + then + fn-complete-status "Repo state status after cleaning but before reset." + fn-git-reset-submodules RC=$? if [[ $RC == 0 ]] - then - fn-complete-status "Repo state status after checkout but final reset." - fn-git-reset origin/$BRANCH + then + fn-complete-status "Repo state status after submodules reset but before checkout." + fn-git-checkout "$BRANCH" RC=$? - fn-complete-status "Repo state status after all cleanup in clean-aggregator." - fi - fi - fi - fi - popd - return $RC + if [[ $RC == 0 ]] + then + fn-complete-status "Repo state status after checkout but final reset." + fn-git-reset origin/$BRANCH + RC=$? + fn-complete-status "Repo state status after all cleanup in clean-aggregator." + fi + fi + fi + fi + popd + return $RC } -# USAGE: fn-git-clean-aggregator AGGREGATOR_DIR BRANCH +# USAGE: fn-git-clean-aggregator AGGREGATOR_DIR BRANCH # AGGREGATOR_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator # BRANCH: R4_2_maintenance -fn-git-clean-aggregator2 () +fn-git-clean-aggregator2 () { - checkNArgs $# 2 + checkNArgs $# 2 if [[ $? != 0 ]]; then return 1; fi - AGGREGATOR_DIR="$1"; shift - BRANCH="$1"; shift - pushd "$AGGREGATOR_DIR" - fn-complete-status "Repo state status before any cleaning." - fn-git-clean - RC=$? - if [[ $RC == 0 ]] - then - fn-git-clean-submodules + AGGREGATOR_DIR="$1"; shift + BRANCH="$1"; shift + pushd "$AGGREGATOR_DIR" + fn-complete-status "Repo state status before any cleaning." + fn-git-clean RC=$? if [[ $RC == 0 ]] - then - fn-complete-status "Repo state status after clean but before checkout." - fn-git-checkout "$BRANCH" + then + fn-git-clean-submodules RC=$? if [[ $RC == 0 ]] - then - fn-complete-status "Repo state status after checkout but before reset." - fn-git-reset origin/$BRANCH + then + fn-complete-status "Repo state status after clean but before checkout." + fn-git-checkout "$BRANCH" RC=$? if [[ $RC == 0 ]] - then - fn-complete-status "Repo state status after reset but before forced update." - fn-git-update-submodules + then + fn-complete-status "Repo state status after checkout but before reset." + fn-git-reset origin/$BRANCH RC=$? - fn-complete-status "Repo state status after all cleanup and init in clean-aggregator." - fi - fi - fi - fi - popd - return $RC + if [[ $RC == 0 ]] + then + fn-complete-status "Repo state status after reset but before forced update." + fn-git-update-submodules + RC=$? + fn-complete-status "Repo state status after all cleanup and init in clean-aggregator." + fi + fi + fi + fi + popd + return $RC } # USAGE: fn-git-cache ROOT BRANCH # ROOT: /shared/eclipse/builds # BRANCH: R4_2_maintenance -fn-git-cache () +fn-git-cache () { - # we (now) leave branch our of git-cache path, or else "topic branches", such as - # 'david_williams/II20130409-0900' complicates directory structure - checkNArgs $# 2 +# we (now) leave branch our of git-cache path, or else "topic branches", such as +# 'david_williams/II20130409-0900' complicates directory structure + checkNArgs $# 2 if [[ $? != 0 ]]; then return 1; fi - ROOT="$1"; shift - BRANCH="$1"; shift - echo $ROOT/gitCache + ROOT="$1"; shift + BRANCH="$1"; shift + echo $ROOT/gitCache } # USAGE: fn-git-dir GIT_CACHE URL # GIT_CACHE: /shared/eclipse/builds/R4_2_maintenance/gitCache # URL: file:///gitroot/platform/eclipse.platform.releng.aggregator.git -fn-git-dir () +fn-git-dir () { - checkNArgs $# 2 + checkNArgs $# 2 if [[ $? != 0 ]]; then return 1; fi - GIT_CACHE="$1"; shift - URL="$1"; shift - echo $GIT_CACHE/$( basename "$URL" .git ) + GIT_CACHE="$1"; shift + URL="$1"; shift + echo $GIT_CACHE/$( basename "$URL" .git ) } # USAGE: fn-build-dir ROOT BUILD_ID STREAM # ROOT: /shared/eclipse/builds # BUILD_ID: M20121119-1900 # STREAM: 4.3.0 -fn-build-dir () +fn-build-dir () { - checkNArgs $# 3 + checkNArgs $# 3 if [[ $? != 0 ]]; then return 1; fi - ROOT="$1"; shift - BUILD_ID="$1"; shift - STREAM="$1"; shift - eclipseStreamMajor=${STREAM:0:1} - dropDirSegment=siteDir/eclipse/downloads/drops - if (( $eclipseStreamMajor > 3 )) - then + ROOT="$1"; shift + BUILD_ID="$1"; shift + STREAM="$1"; shift + eclipseStreamMajor=${STREAM:0:1} + dropDirSegment=siteDir/eclipse/downloads/drops + if (( $eclipseStreamMajor > 3 )) + then dropDirSegment=siteDir/eclipse/downloads/drops4 - fi - echo $ROOT/$dropDirSegment/$BUILD_ID + fi + echo $ROOT/$dropDirSegment/$BUILD_ID } # USAGE: fn-basebuilder-dir ROOT BUILD_ID STREAM # ROOT: /shared/eclipse/builds # BUILD_ID: M20121116-1100 # STREAM: 4.2.2 -fn-basebuilder-dir () +fn-basebuilder-dir () { - checkNArgs $# 3 + checkNArgs $# 3 if [[ $? != 0 ]]; then return 1; fi - ROOT="$1"; shift - BUILD_ID="$1"; shift - STREAM="$1"; shift - buildDirectory=$( fn-build-dir "$ROOT" "$BUILD_ID" "$STREAM" ) - echo $buildDirectory/org.eclipse.releng.basebuilder + ROOT="$1"; shift + BUILD_ID="$1"; shift + STREAM="$1"; shift + buildDirectory=$( fn-build-dir "$ROOT" "$BUILD_ID" "$STREAM" ) + echo $buildDirectory/org.eclipse.releng.basebuilder } @@ -477,77 +477,77 @@ fn-basebuilder-dir () # VERBOSE: true # SIGNING: true # TODO: depends on BUILD_TYPE being exported/global -fn-maven-build-aggregator () +fn-maven-build-aggregator () { - checkNArgs $# 7 + checkNArgs $# 7 if [[ $? != 0 ]]; then return 1; fi - BUILD_ID="$1"; shift - REPO_DIR="$1"; shift - LOCAL_REPO="$1"; shift - DEBUG=$1; shift - QUIET=$1; shift - SIGNING=$1; shift - MAVEN_BREE=$1; shift - - MARGS="-DbuildId=$BUILD_ID" - if $DEBUG; then - MARGS="$MARGS -X" - fi - if $QUIET; then - MARGS="$MARGS -q" - fi - if $SIGNING; then - MARGS="$MARGS -Peclipse-sign" - fi - if [[ -n "${PATCH_BUILD}" ]]; then - MARGS="$MARGS -PpatchBuild" - fi - - MARGS="$MARGS ${MAVEN_BREE}" - - # Here we count on $BUILD_TYPE being exported. TODO: make parameter later? - if [[ -n "$BUILD_TYPE" && "$BUILD_TYPE" == "N" ]] - then - FORCEQUALIFIERARG="-DforceContextQualifier=${BUILD_ID}" - else - # just for safety, make sure unset - FORCEQUALIFIERARG= - fi - - echo "DEBUG: Variables in $0" - echo "DEBUG: BUILD_ID: $BUILD_ID" - echo "DEBUG: REPO_DIR: $REPO_DIR" - echo "DEBUG: LOCAL_REPO: $LOCAL_REPO" - echo "DEBUG: DEBUG: $DEBUG" - echo "DEBUG: QUIET: $QUIET" - echo "" - echo "DEBUG: CBI_JDT_REPO_URL: $CBI_JDT_REPO_URL" - echo "DEBUG: CBI_JDT_VERSION: $CBI_JDT_VERSION" - echo "" - echo "DEBUG: SIGNING: $SIGNING" - echo "DEBUG: MAVEN_BREE: $MAVEN_BREE" - echo "DEBUG: MARGS: $MARGS" - echo "DEBUG: FORCEQUALIFIERARG: $FORCEQUALIFIERARG" - - - - # -fail-at-end gives chance for bundles to compile, even after - # a compile error. Might have to specify --fail-never to see them all? See - # http://www.sonatype.com/books/mvnref-book/reference/running-sect-options.html#running-sect-failure-option - pushd "$REPO_DIR" - #mvn $MARGS --fail-never -V \ - #mvn $MARGS --fail-at-end -V \ - #mvn $MARGS -V \ - mvn $MARGS --fail-at-end -V ${ALT_POM_FILE} \ - clean verify \ - -DskipTests=true \ - -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} ${JAVA_DOC_TOOL} - rc=$? - popd - return $rc + BUILD_ID="$1"; shift + REPO_DIR="$1"; shift + LOCAL_REPO="$1"; shift + DEBUG=$1; shift + QUIET=$1; shift + SIGNING=$1; shift + MAVEN_BREE=$1; shift + + MARGS="-DbuildId=$BUILD_ID" + if $DEBUG; then + MARGS="$MARGS -X" + fi + if $QUIET; then + MARGS="$MARGS -q" + fi + if $SIGNING; then + MARGS="$MARGS -Peclipse-sign" + fi + if [[ -n "${PATCH_BUILD}" ]]; then + MARGS="$MARGS -PpatchBuild" + fi + + MARGS="$MARGS ${MAVEN_BREE}" + +# Here we count on $BUILD_TYPE being exported. TODO: make parameter later? + if [[ -n "$BUILD_TYPE" && "$BUILD_TYPE" == "N" ]] + then + FORCEQUALIFIERARG="-DforceContextQualifier=${BUILD_ID}" + else +# just for safety, make sure unset + FORCEQUALIFIERARG= + fi + + echo "DEBUG: Variables in $0" + echo "DEBUG: BUILD_ID: $BUILD_ID" + echo "DEBUG: REPO_DIR: $REPO_DIR" + echo "DEBUG: LOCAL_REPO: $LOCAL_REPO" + echo "DEBUG: DEBUG: $DEBUG" + echo "DEBUG: QUIET: $QUIET" + echo "" + echo "DEBUG: CBI_JDT_REPO_URL: $CBI_JDT_REPO_URL" + echo "DEBUG: CBI_JDT_VERSION: $CBI_JDT_VERSION" + echo "" + echo "DEBUG: SIGNING: $SIGNING" + echo "DEBUG: MAVEN_BREE: $MAVEN_BREE" + echo "DEBUG: MARGS: $MARGS" + echo "DEBUG: FORCEQUALIFIERARG: $FORCEQUALIFIERARG" + + + +# -fail-at-end gives chance for bundles to compile, even after +# a compile error. Might have to specify --fail-never to see them all? See +# http://www.sonatype.com/books/mvnref-book/reference/running-sect-options.html#running-sect-failure-option + pushd "$REPO_DIR" +#mvn $MARGS --fail-never -V \ +#mvn $MARGS --fail-at-end -V \ +#mvn $MARGS -V \ + mvn $MARGS --fail-at-end -V ${ALT_POM_FILE} \ + clean verify \ + -DskipTests=true \ + -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} ${JAVA_DOC_TOOL} + rc=$? + popd + return $rc } # USAGE: fn-submodule-checkout BUILD_ID REPO_DIR REPOSITORIES_TXT @@ -555,127 +555,127 @@ fn-maven-build-aggregator () # REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator # SCRIPT: /shared/eclipse/builds/scripts/git-submodule-checkout.sh # REPOSITORIES_TXT: /shared/eclipse/builds/streams/repositories.txt -fn-submodule-checkout () +fn-submodule-checkout () { - checkNArgs $# 4 + checkNArgs $# 4 if [[ $? != 0 ]]; then return 1; fi - BUILD_ID="$1"; shift - REPO_DIR="$1"; shift - SCRIPT="$1"; shift - REPOSITORIES_TXT="$1"; shift - pushd "$REPO_DIR" - git submodule foreach "/bin/bash $SCRIPT $REPOSITORIES_TXT \$name" - uninit=$( git submodule | grep "^-" | cut -f2 -d" " | sort -u ) - if [ ! -z "$uninit" ]; then - echo Some modules are not initialized: $uninit - return - fi - conflict=$( git submodule | grep "^U" | cut -f2 -d" " | sort -u ) - if [ ! -z "$conflict" ]; then - echo Some modules have conflicts: $conflict - return - fi - adds=$( git submodule | grep "^+" | cut -f2 -d" " ) - if [ -z "$adds" ]; then - echo No updates for the submodules - return - fi - popd + BUILD_ID="$1"; shift + REPO_DIR="$1"; shift + SCRIPT="$1"; shift + REPOSITORIES_TXT="$1"; shift + pushd "$REPO_DIR" + git submodule foreach "/bin/bash $SCRIPT $REPOSITORIES_TXT \$name" + uninit=$( git submodule | grep "^-" | cut -f2 -d" " | sort -u ) + if [ ! -z "$uninit" ]; then + echo Some modules are not initialized: $uninit + return + fi + conflict=$( git submodule | grep "^U" | cut -f2 -d" " | sort -u ) + if [ ! -z "$conflict" ]; then + echo Some modules have conflicts: $conflict + return + fi + adds=$( git submodule | grep "^+" | cut -f2 -d" " ) + if [ -z "$adds" ]; then + echo No updates for the submodules + return + fi + popd } -# USAGE: fn-add-submodule-updates REPO_DIR +# USAGE: fn-add-submodule-updates REPO_DIR # REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator -fn-add-submodule-updates () +fn-add-submodule-updates () { - checkNArgs $# 1 + checkNArgs $# 1 if [[ $? != 0 ]]; then return 1; fi - REPO_DIR="$1"; shift - pushd "$REPO_DIR" - adds=$( git submodule | grep "^+" | cut -f2 -d" " ) - if [ -z "$adds" ]; then - echo No updates for the submodules - return - fi - echo git add $adds - git add $adds - popd + REPO_DIR="$1"; shift + pushd "$REPO_DIR" + adds=$( git submodule | grep "^+" | cut -f2 -d" " ) + if [ -z "$adds" ]; then + echo No updates for the submodules + return + fi + echo git add $adds + git add $adds + popd } # USAGE: fn-tag-build-inputs BUILD_ID REPO_DIR REPOSITORIES_TXT # BUILD_ID: M20121116-1100 # REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator # REPOSITORIES_TXT: /shared/eclipse/builds/streams/repositories.txt -fn-tag-build-inputs () +fn-tag-build-inputs () { - checkNArgs $# 3 + checkNArgs $# 3 if [[ $? != 0 ]]; then return 1; fi - BUILD_ID="$1"; shift - REPO_DIR="$1"; shift - REPOSITORIES_TXT="$1"; shift - pushd "$REPO_DIR" - git submodule foreach "if grep \"^\${name}:\" $REPOSITORIES_TXT >/dev/null; then git tag $BUILD_ID; $GIT_PUSH --verbose origin $BUILD_ID; else echo Skipping \$name; fi" - git tag $BUILD_ID - $GIT_PUSH --verbose origin $BUILD_ID - popd + BUILD_ID="$1"; shift + REPO_DIR="$1"; shift + REPOSITORIES_TXT="$1"; shift + pushd "$REPO_DIR" + git submodule foreach "if grep \"^\${name}:\" $REPOSITORIES_TXT >/dev/null; then git tag $BUILD_ID; $GIT_PUSH --verbose origin $BUILD_ID; else echo Skipping \$name; fi" + git tag $BUILD_ID + $GIT_PUSH --verbose origin $BUILD_ID + popd } # USAGE: fn-pom-version-updater REPO_DIR LOCAL_REPO DEBUG QUIET # REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator # LOCAL_REPO: /shared/eclipse/builds/R4_2_maintenance/localMavenRepo # TODO: depends on TMP_DIR being exported/global -fn-pom-version-updater () +fn-pom-version-updater () { - checkNArgs $# 4 + checkNArgs $# 4 if [[ $? != 0 ]]; then return 1; fi - REPO_DIR="$1"; shift - LOCAL_REPO="$1"; shift - DEBUG=$1; shift - QUIET=$1; shift - - MARGS="" - if $DEBUG; then - MARGS="$MARGS -X" - fi - if $QUIET; then - MARGS="$MARGS -q" - fi - if [[ -n "${PATCH_BUILD}" ]]; then - MARGS="$MARGS -PpatchBuild" - fi - echo "DEBUG: Variables in $0" - echo "DEBUG: PATCH_BUILD: $PATCH_BUILD" - echo "DEBUG: REPO_DIR: $REPO_DIR" - echo "DEBUG: LOCAL_REPO: $LOCAL_REPO" - echo "DEBUG: DEBUG: $DEBUG" - echo "DEBUG: QUIET: $QUIET" - echo "DEBUG: MARGS: $MARGS" - # fail fast if not set up correctly - rc=$(fn-check-dir-exists TMP_DIR) - checkForErrorExit "$rc" "$rc" - - report=${TMP_DIR}/pom_${BUILD_ID}.txt - pushd "$REPO_DIR" - mvn $MARGS ${ALT_POM_FILE} \ - org.eclipse.tycho:tycho-versions-plugin:0.20.0:update-pom \ - -Dmaven.repo.local=$LOCAL_REPO \ - -DbuildTimestamp="${TIMESTAMP}" -DbuildType="${BUILD_TYPE}" -DbuildId="${BUILD_ID}" - RC=$? - if [[ $RC != 0 ]] - then - echo "ERROR: tycho-versions-plugin:update-pom returned non-zero return code: $RC" >&2 - else - changes=$( git status --short -uno | cut -c4- ) - if [ -z "$changes" ]; then - echo "INFO: No changes in pom versions" >&2 - RC=0 - else - echo "INFO: Changes in pom versions: $changes" >&2 - RC=0 - fi - fi - popd - return $RC + REPO_DIR="$1"; shift + LOCAL_REPO="$1"; shift + DEBUG=$1; shift + QUIET=$1; shift + + MARGS="" + if $DEBUG; then + MARGS="$MARGS -X" + fi + if $QUIET; then + MARGS="$MARGS -q" + fi + if [[ -n "${PATCH_BUILD}" ]]; then + MARGS="$MARGS -PpatchBuild" + fi + echo "DEBUG: Variables in $0" + echo "DEBUG: PATCH_BUILD: $PATCH_BUILD" + echo "DEBUG: REPO_DIR: $REPO_DIR" + echo "DEBUG: LOCAL_REPO: $LOCAL_REPO" + echo "DEBUG: DEBUG: $DEBUG" + echo "DEBUG: QUIET: $QUIET" + echo "DEBUG: MARGS: $MARGS" +# fail fast if not set up correctly + rc=$(fn-check-dir-exists TMP_DIR) + checkForErrorExit "$rc" "$rc" + + report=${TMP_DIR}/pom_${BUILD_ID}.txt + pushd "$REPO_DIR" + mvn $MARGS ${ALT_POM_FILE} \ + org.eclipse.tycho:tycho-versions-plugin:0.20.0:update-pom \ + -Dmaven.repo.local=$LOCAL_REPO \ + -DbuildTimestamp="${TIMESTAMP}" -DbuildType="${BUILD_TYPE}" -DbuildId="${BUILD_ID}" + RC=$? + if [[ $RC != 0 ]] + then + echo "ERROR: tycho-versions-plugin:update-pom returned non-zero return code: $RC" >&2 + else + changes=$( git status --short -uno | cut -c4- ) + if [ -z "$changes" ]; then + echo "INFO: No changes in pom versions" >&2 + RC=0 + else + echo "INFO: Changes in pom versions: $changes" >&2 + RC=0 + fi + fi + popd + return $RC } # USAGE: fn-pom-version-update-with-commit BUILD_ID REPO_DIR LOCAL_REPO @@ -684,83 +684,83 @@ fn-pom-version-updater () # LOCAL_REPO: /shared/eclipse/builds/R4_2_maintenance/localMavenRepo # VERBOSE: true # SIGNING: true -fn-pom-version-update-with-commit () +fn-pom-version-update-with-commit () { - checkNArgs $# 3 + checkNArgs $# 3 if [[ $? != 0 ]]; then return 1; fi - BUILD_ID="$1"; shift - REPO_DIR="$1"; shift - LOCAL_REPO="$1"; shift - - # fail fast if not set up correctly - rc=$(fn-check-dir-exists TMP_DIR) - checkForErrorExit "$rc" "$rc" - - report=${TMP_DIR}/pom_${BUILD_ID}.txt - MARGS="-DbuildId=$BUILD_ID" - if [[ -n "${PATCH_BUILD}" ]]; then - MARGS="$MARGS -PpatchBuild" - fi - pushd "$REPO_DIR" - mvn $MARGS ${ALT_POM_FILE} \ - org.eclipse.tycho:tycho-versions-plugin:0.20.0:update-pom \ - -Dmaven.repo.local=$LOCAL_REPO \ - -DbuildTimestamp="${TIMESTAMP}" -DbuildType="${BUILD_TYPE}" -DbuildId="${BUILD_ID}" - changes=$( git status --short -uno | cut -c4- ) - if [ -z "$changes" ]; then - echo No changes in pom versions - return - fi - repos=$( git status --short -uno | cut -c4- | grep -v pom.xml ) - for CURRENT_REPO in $repos; do - pushd "$CURRENT_REPO" - pom_only=$( git status --short -uno | grep -v pom.xml | wc -l ) - if [[ pom_only == 0 ]]; then - git add $( git status --short -uno | cut -c4- ) - git commit -m "Update pom versions for build $BUILD_ID" - echo $GIT_PUSH origin HEAD - else - echo Unable to update poms for $CURRENT_REPO - fi - popd - done - echo git add $changes - git add $changes - popd + BUILD_ID="$1"; shift + REPO_DIR="$1"; shift + LOCAL_REPO="$1"; shift + +# fail fast if not set up correctly + rc=$(fn-check-dir-exists TMP_DIR) + checkForErrorExit "$rc" "$rc" + + report=${TMP_DIR}/pom_${BUILD_ID}.txt + MARGS="-DbuildId=$BUILD_ID" + if [[ -n "${PATCH_BUILD}" ]]; then + MARGS="$MARGS -PpatchBuild" + fi + pushd "$REPO_DIR" + mvn $MARGS ${ALT_POM_FILE} \ + org.eclipse.tycho:tycho-versions-plugin:0.20.0:update-pom \ + -Dmaven.repo.local=$LOCAL_REPO \ + -DbuildTimestamp="${TIMESTAMP}" -DbuildType="${BUILD_TYPE}" -DbuildId="${BUILD_ID}" + changes=$( git status --short -uno | cut -c4- ) + if [ -z "$changes" ]; then + echo No changes in pom versions + return + fi + repos=$( git status --short -uno | cut -c4- | grep -v pom.xml ) + for CURRENT_REPO in $repos; do + pushd "$CURRENT_REPO" + pom_only=$( git status --short -uno | grep -v pom.xml | wc -l ) + if [[ pom_only == 0 ]]; then + git add $( git status --short -uno | cut -c4- ) + git commit -m "Update pom versions for build $BUILD_ID" + echo $GIT_PUSH origin HEAD + else + echo Unable to update poms for $CURRENT_REPO + fi + popd + done + echo git add $changes + git add $changes + popd } # USAGE: fn-gather-repo BUILD_ID REPO_DIR BUILD_DIR # BUILD_ID: I20121116-0700 # REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator # BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747 -fn-gather-repo () +fn-gather-repo () { - checkNArgs $# 3 + checkNArgs $# 3 if [[ $? != 0 ]]; then return 1; fi - BUILD_ID="$1"; shift - REPO_DIR="$1"; shift - BUILD_DIR="$1"; shift - if [[ -n "${PATCH_BUILD}" ]] - then - ORIG_PATH=eclipse.platform.releng.tychoeclipsebuilder/${PATCH_BUILD}/eclipse.releng.repository.${PATCH_BUILD}/target/site - TARGET_PATH=eclipse.platform.releng.tychoeclipsebuilder/${PATCH_BUILD}/eclipse.releng.repository.${PATCH_BUILD}/target/repository - ORIG_DIR_REPOSITORY=$REPO_DIR/${ORIG_PATH} - REPO_DIR_REPOSITORY=$REPO_DIR/${TARGET_PATH} - mv ${ORIG_DIR_REPOSITORY} ${REPO_DIR_REPOSITORY} + BUILD_ID="$1"; shift + REPO_DIR="$1"; shift + BUILD_DIR="$1"; shift + if [[ -n "${PATCH_BUILD}" ]] + then + ORIG_PATH=eclipse.platform.releng.tychoeclipsebuilder/${PATCH_BUILD}/eclipse.releng.repository.${PATCH_BUILD}/target/site + TARGET_PATH=eclipse.platform.releng.tychoeclipsebuilder/${PATCH_BUILD}/eclipse.releng.repository.${PATCH_BUILD}/target/repository + ORIG_DIR_REPOSITORY=$REPO_DIR/${ORIG_PATH} + REPO_DIR_REPOSITORY=$REPO_DIR/${TARGET_PATH} + mv ${ORIG_DIR_REPOSITORY} ${REPO_DIR_REPOSITORY} - else - TARGET_PATH=eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository - REPO_DIR_REPOSITORY=$REPO_DIR/$TAGET_PATH - fi - if [[ -d "$REPO_DIR_REPOSITORY" ]] - then - pushd "$REPO_DIR" - cp -r ${TARGET_PATH} $BUILD_DIR - popd - else - echo " ERROR: $REPO_DIR_REPOSITORY did not exist in fn-gather-repo" - fi + else + TARGET_PATH=eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository + REPO_DIR_REPOSITORY=$REPO_DIR/$TAGET_PATH + fi + if [[ -d "$REPO_DIR_REPOSITORY" ]] + then + pushd "$REPO_DIR" + cp -r ${TARGET_PATH} $BUILD_DIR + popd + else + echo " ERROR: $REPO_DIR_REPOSITORY did not exist in fn-gather-repo" + fi } @@ -769,131 +769,131 @@ fn-gather-repo () # BUILD_ID: I20121116-0700 # REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator # BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747 -fn-gather-sdk () +fn-gather-sdk () { - checkNArgs $# 3 + checkNArgs $# 3 if [[ $? != 0 ]]; then return 1; fi - BUILD_ID="$1"; shift - REPO_DIR="$1"; shift - BUILD_DIR="$1"; shift - TARGET_PRODUCTS="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/sdk/target/products - if [[ -d "$TARGET_PRODUCTS" ]] - then - pushd "$TARGET_PRODUCTS" - cp org.eclipse.sdk.ide-aix.gtk.ppc64.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-aix-gtk-ppc64.zip - cp org.eclipse.sdk.ide-aix.gtk.ppc.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-aix-gtk-ppc.zip - cp org.eclipse.sdk.ide-hpux.gtk.ia64.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-hpux-gtk-ia64.zip - cp org.eclipse.sdk.ide-linux.gtk.ppc.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-linux-gtk-ppc.tar.gz - cp org.eclipse.sdk.ide-linux.gtk.ppc64.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-linux-gtk-ppc64.tar.gz - cp org.eclipse.sdk.ide-linux.gtk.s390.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-linux-gtk-s390.tar.gz - cp org.eclipse.sdk.ide-linux.gtk.s390x.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-linux-gtk-s390x.tar.gz - cp org.eclipse.sdk.ide-linux.gtk.x86_64.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-linux-gtk-x86_64.tar.gz - cp org.eclipse.sdk.ide-linux.gtk.x86.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-linux-gtk.tar.gz - #cp org.eclipse.sdk.ide-macosx.cocoa.x86_64.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz - tar cfz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz -C org.eclipse.sdk.ide/macosx/cocoa/x86_64 eclipse - #cp org.eclipse.sdk.ide-macosx.cocoa.x86.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-macosx-cocoa.tar.gz - tar cfz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-macosx-cocoa.tar.gz -C org.eclipse.sdk.ide/macosx/cocoa/x86 eclipse - cp org.eclipse.sdk.ide-solaris.gtk.sparc.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-solaris-gtk.zip - cp org.eclipse.sdk.ide-solaris.gtk.x86.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-solaris-gtk-x86.zip - cp org.eclipse.sdk.ide-win32.win32.x86_64.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-win32-x86_64.zip - cp org.eclipse.sdk.ide-win32.win32.x86.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-win32.zip - popd - else - echo " ERROR: $TARGET_PRODUCTS did not exist in fn-gather-sdks" - fi + BUILD_ID="$1"; shift + REPO_DIR="$1"; shift + BUILD_DIR="$1"; shift + TARGET_PRODUCTS="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/sdk/target/products + if [[ -d "$TARGET_PRODUCTS" ]] + then + pushd "$TARGET_PRODUCTS" + cp org.eclipse.sdk.ide-aix.gtk.ppc64.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-aix-gtk-ppc64.zip + cp org.eclipse.sdk.ide-aix.gtk.ppc.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-aix-gtk-ppc.zip + cp org.eclipse.sdk.ide-hpux.gtk.ia64.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-hpux-gtk-ia64.zip + cp org.eclipse.sdk.ide-linux.gtk.ppc.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-linux-gtk-ppc.tar.gz + cp org.eclipse.sdk.ide-linux.gtk.ppc64.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-linux-gtk-ppc64.tar.gz + cp org.eclipse.sdk.ide-linux.gtk.s390.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-linux-gtk-s390.tar.gz + cp org.eclipse.sdk.ide-linux.gtk.s390x.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-linux-gtk-s390x.tar.gz + cp org.eclipse.sdk.ide-linux.gtk.x86_64.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-linux-gtk-x86_64.tar.gz + cp org.eclipse.sdk.ide-linux.gtk.x86.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-linux-gtk.tar.gz +#cp org.eclipse.sdk.ide-macosx.cocoa.x86_64.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz + tar cfz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz -C org.eclipse.sdk.ide/macosx/cocoa/x86_64 eclipse +#cp org.eclipse.sdk.ide-macosx.cocoa.x86.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-macosx-cocoa.tar.gz + tar cfz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-macosx-cocoa.tar.gz -C org.eclipse.sdk.ide/macosx/cocoa/x86 eclipse + cp org.eclipse.sdk.ide-solaris.gtk.sparc.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-solaris-gtk.zip + cp org.eclipse.sdk.ide-solaris.gtk.x86.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-solaris-gtk-x86.zip + cp org.eclipse.sdk.ide-win32.win32.x86_64.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-win32-x86_64.zip + cp org.eclipse.sdk.ide-win32.win32.x86.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-win32.zip + popd + else + echo " ERROR: $TARGET_PRODUCTS did not exist in fn-gather-sdks" + fi } # USAGE: fn-gather-platform BUILD_ID REPO_DIR BUILD_DIR # BUILD_ID: I20121116-0700 # REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator # BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747 -fn-gather-platform () +fn-gather-platform () { - checkNArgs $# 3 + checkNArgs $# 3 if [[ $? != 0 ]]; then return 1; fi - BUILD_ID="$1"; shift - REPO_DIR="$1"; shift - BUILD_DIR="$1"; shift - TARGET_PRODUCTS="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/platform/target/products - if [[ -d "$TARGET_PRODUCTS" ]] - then - pushd "$TARGET_PRODUCTS" - cp org.eclipse.platform.ide-aix.gtk.ppc64.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-aix-gtk-ppc64.zip - cp org.eclipse.platform.ide-aix.gtk.ppc.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-aix-gtk-ppc.zip - cp org.eclipse.platform.ide-hpux.gtk.ia64.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-hpux-gtk-ia64.zip - cp org.eclipse.platform.ide-linux.gtk.ppc.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk-ppc.tar.gz - cp org.eclipse.platform.ide-linux.gtk.ppc64.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk-ppc64.tar.gz - cp org.eclipse.platform.ide-linux.gtk.s390.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk-s390.tar.gz - cp org.eclipse.platform.ide-linux.gtk.s390x.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk-s390x.tar.gz - cp org.eclipse.platform.ide-linux.gtk.x86_64.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk-x86_64.tar.gz - cp org.eclipse.platform.ide-linux.gtk.x86.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk.tar.gz - #cp org.eclipse.platform.ide-macosx.cocoa.x86_64.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz - tar cfz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz -C org.eclipse.platform.ide/macosx/cocoa/x86_64 eclipse - #cp org.eclipse.platform.ide-macosx.cocoa.x86.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-macosx-cocoa.tar.gz - tar cfz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-macosx-cocoa.tar.gz -C org.eclipse.platform.ide/macosx/cocoa/x86 eclipse - cp org.eclipse.platform.ide-solaris.gtk.sparc.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-solaris-gtk.zip - cp org.eclipse.platform.ide-solaris.gtk.x86.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-solaris-gtk-x86.zip - cp org.eclipse.platform.ide-win32.win32.x86_64.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-win32-x86_64.zip - cp org.eclipse.platform.ide-win32.win32.x86.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-win32.zip - popd - else - echo " ERROR: $TARGET_PRODUCTS did not exist in fn-gather-platform" - fi + BUILD_ID="$1"; shift + REPO_DIR="$1"; shift + BUILD_DIR="$1"; shift + TARGET_PRODUCTS="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/platform/target/products + if [[ -d "$TARGET_PRODUCTS" ]] + then + pushd "$TARGET_PRODUCTS" + cp org.eclipse.platform.ide-aix.gtk.ppc64.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-aix-gtk-ppc64.zip + cp org.eclipse.platform.ide-aix.gtk.ppc.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-aix-gtk-ppc.zip + cp org.eclipse.platform.ide-hpux.gtk.ia64.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-hpux-gtk-ia64.zip + cp org.eclipse.platform.ide-linux.gtk.ppc.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk-ppc.tar.gz + cp org.eclipse.platform.ide-linux.gtk.ppc64.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk-ppc64.tar.gz + cp org.eclipse.platform.ide-linux.gtk.s390.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk-s390.tar.gz + cp org.eclipse.platform.ide-linux.gtk.s390x.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk-s390x.tar.gz + cp org.eclipse.platform.ide-linux.gtk.x86_64.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk-x86_64.tar.gz + cp org.eclipse.platform.ide-linux.gtk.x86.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk.tar.gz +#cp org.eclipse.platform.ide-macosx.cocoa.x86_64.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz + tar cfz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz -C org.eclipse.platform.ide/macosx/cocoa/x86_64 eclipse +#cp org.eclipse.platform.ide-macosx.cocoa.x86.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-macosx-cocoa.tar.gz + tar cfz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-macosx-cocoa.tar.gz -C org.eclipse.platform.ide/macosx/cocoa/x86 eclipse + cp org.eclipse.platform.ide-solaris.gtk.sparc.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-solaris-gtk.zip + cp org.eclipse.platform.ide-solaris.gtk.x86.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-solaris-gtk-x86.zip + cp org.eclipse.platform.ide-win32.win32.x86_64.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-win32-x86_64.zip + cp org.eclipse.platform.ide-win32.win32.x86.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-win32.zip + popd + else + echo " ERROR: $TARGET_PRODUCTS did not exist in fn-gather-platform" + fi } # USAGE: fn-gather-swt-zips BUILD_ID REPO_DIR BUILD_DIR # BUILD_ID: I20121116-0700 # REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator # BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747 -fn-gather-swt-zips () +fn-gather-swt-zips () { - checkNArgs $# 3 + checkNArgs $# 3 if [[ $? != 0 ]]; then return 1; fi - BUILD_ID="$1"; shift - REPO_DIR="$1"; shift - BUILD_DIR="$1"; shift - # TODO: this directory sanity check does not accomplish much, since "binaries/bundles" always - # exists. Results in "not found" msg. Doubt there's any simple solution. - SWT_BUNDLES_DIR="$REPO_DIR"/eclipse.platform.swt.binaries/bundles - if [[ -d "$SWT_BUNDLES_DIR" ]] - then - pushd "$SWT_BUNDLES_DIR" - cp */target/*.zip "$BUILD_DIR" - popd - else - echo " ERROR: $SWT_BUNDLES_DIR did not exist in fn-gather-swt-zips" - fi -} + BUILD_ID="$1"; shift + REPO_DIR="$1"; shift + BUILD_DIR="$1"; shift +# TODO: this directory sanity check does not accomplish much, since "binaries/bundles" always +# exists. Results in "not found" msg. Doubt there's any simple solution. + SWT_BUNDLES_DIR="$REPO_DIR"/eclipse.platform.swt.binaries/bundles + if [[ -d "$SWT_BUNDLES_DIR" ]] + then + pushd "$SWT_BUNDLES_DIR" + cp */target/*.zip "$BUILD_DIR" + popd + else + echo " ERROR: $SWT_BUNDLES_DIR did not exist in fn-gather-swt-zips" + fi + } # USAGE: fn-gather-test-zips BUILD_ID REPO_DIR BUILD_DIR # BUILD_ID: I20121116-0700 # REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator # BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747 -fn-gather-test-zips () +fn-gather-test-zips () { - checkNArgs $# 3 - if [[ $? != 0 ]]; then return 1; fi - BUILD_ID="$1"; shift - REPO_DIR="$1"; shift - BUILD_DIR="$1"; shift - TEST_ZIP_DIR="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/target - if [[ -d "$TEST_ZIP_DIR" ]] - then - pushd "$TEST_ZIP_DIR" - cp eclipse-junit-tests-bundle.zip "$BUILD_DIR"/eclipse-Automated-Tests-${BUILD_ID}.zip - TEST_FRAMEWORK_DIR=$TEST_ZIP_DIR/eclipse-test-framework - if [[ -d "$TEST_FRAMEWORK_DIR" ]] - then - pushd "$TEST_FRAMEWORK_DIR" - zip -r "$BUILD_DIR"/eclipse-test-framework-${BUILD_ID}.zip * - popd - else - echo " ERROR: $TEST_FRAMEWORK_DIR did not exist in fn-gather-test-zips." - fi - popd - else - echo " ERROR: $TEST_ZIP_DIR did not exist in fn-gather-test-zips." - fi +checkNArgs $# 3 +if [[ $? != 0 ]]; then return 1; fi +BUILD_ID="$1"; shift +REPO_DIR="$1"; shift +BUILD_DIR="$1"; shift +TEST_ZIP_DIR="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/target +if [[ -d "$TEST_ZIP_DIR" ]] +then +pushd "$TEST_ZIP_DIR" +cp eclipse-junit-tests-bundle.zip "$BUILD_DIR"/eclipse-Automated-Tests-${BUILD_ID}.zip +TEST_FRAMEWORK_DIR=$TEST_ZIP_DIR/eclipse-test-framework +if [[ -d "$TEST_FRAMEWORK_DIR" ]] +then +pushd "$TEST_FRAMEWORK_DIR" +zip -r "$BUILD_DIR"/eclipse-test-framework-${BUILD_ID}.zip * +popd +else +echo " ERROR: $TEST_FRAMEWORK_DIR did not exist in fn-gather-test-zips." +fi +popd +else +echo " ERROR: $TEST_ZIP_DIR did not exist in fn-gather-test-zips." +fi } @@ -901,25 +901,25 @@ fn-gather-test-zips () # BUILD_ID: I20121116-0700 # REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator # BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747 -fn-gather-ecj-jars () +fn-gather-ecj-jars () { - checkNArgs $# 3 - if [[ $? != 0 ]]; then return 1; fi - BUILD_ID="$1"; shift - REPO_DIR="$1"; shift - BUILD_DIR="$1"; shift - ECJ_JAR_DIR="$REPO_DIR"/eclipse.jdt.core/org.eclipse.jdt.core/target - if [[ -d "$ECJ_JAR_DIR" ]] - then - pushd "$ECJ_JAR_DIR" - # The blob wildcard ('*') is to match "any version number", e.g. 3.9.0, 3.9.1, etc. - cp org.eclipse.jdt.core-*-SNAPSHOT-batch-compiler.jar "$BUILD_DIR"/ecj-${BUILD_ID}.jar - cp org.eclipse.jdt.core-*-SNAPSHOT-batch-compiler-src.jar "$BUILD_DIR"/ecjsrc-${BUILD_ID}.jar - popd - else - echo " ERROR: $ECJ_JAR_DIR did not exist in fn-gather-ecj-jars." - #TODO eventually, fail the build here? If they don't exist, something must be pretty wrong? - fi +checkNArgs $# 3 +if [[ $? != 0 ]]; then return 1; fi +BUILD_ID="$1"; shift +REPO_DIR="$1"; shift +BUILD_DIR="$1"; shift +ECJ_JAR_DIR="$REPO_DIR"/eclipse.jdt.core/org.eclipse.jdt.core/target +if [[ -d "$ECJ_JAR_DIR" ]] +then +pushd "$ECJ_JAR_DIR" +# The blob wildcard ('*') is to match "any version number", e.g. 3.9.0, 3.9.1, etc. +cp org.eclipse.jdt.core-*-SNAPSHOT-batch-compiler.jar "$BUILD_DIR"/ecj-${BUILD_ID}.jar +cp org.eclipse.jdt.core-*-SNAPSHOT-batch-compiler-src.jar "$BUILD_DIR"/ecjsrc-${BUILD_ID}.jar +popd +else +echo " ERROR: $ECJ_JAR_DIR did not exist in fn-gather-ecj-jars." +#TODO eventually, fail the build here? If they don't exist, something must be pretty wrong? +fi } @@ -929,20 +929,20 @@ fn-gather-ecj-jars () # ANT_SCRIPT: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator # BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747 # BASEBUILDER_LAUNCHER: /shared/eclipse/builds/R4_2_maintenance/org.eclipse.releng.basebuilder_R3_7/plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar -fn-slice-repos () +fn-slice-repos () { - checkNArgs $# 4 + checkNArgs $# 4 if [[ $? != 0 ]]; then return 1; fi - BUILD_ID="$1"; shift - REPO_DIR="$1"; shift - BUILD_DIR="$1"; shift - BASEBUILDER_LAUNCHER="$1"; shift - ANT_SCRIPT="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/repos/buildAll.xml - REPO_DIR_DIR="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository - if [[ -d "$REPO_DIR_DIR" ]] - then - pushd "$REPO_DIR" - java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \ + BUILD_ID="$1"; shift + REPO_DIR="$1"; shift + BUILD_DIR="$1"; shift + BASEBUILDER_LAUNCHER="$1"; shift + ANT_SCRIPT="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/repos/buildAll.xml + REPO_DIR_DIR="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository + if [[ -d "$REPO_DIR_DIR" ]] + then + pushd "$REPO_DIR" + java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \ -data ${BUILD_DIR}/workspace-buildrepos \ -application org.eclipse.ant.core.antRunner \ -buildfile "$ANT_SCRIPT" \ @@ -954,18 +954,18 @@ fn-slice-repos () -DbuildLabel="$BUILD_ID" \ -Djava.io.tmpdir=$TMP_DIR \ -DbuildDirectory="$BUILD_DIR" - RC=$? - popd - if [[ $RC != 0 ]] - then - BUILD_FAILED="${buildDirectory}/buildFailed-slice-repo-error" - echo " ERROR: Java antrunner call with $ANT_SCRIPT returned non-zero return code, $RC, in fn-slice-repo" >>${BUILD_FAILED} - return $RC - fi - else - BUILD_FAILED="${buildDirectory}/buildFailed-slice-repo-error" - echo " ERROR: $REPO_DIR_DIR did not exist in fn-slice-repo. Probably due to an earlier error?" >>${BUILD_FAILED} - return 1 + RC=$? + popd + if [[ $RC != 0 ]] + then + BUILD_FAILED="${buildDirectory}/buildFailed-slice-repo-error" + echo " ERROR: Java antrunner call with $ANT_SCRIPT returned non-zero return code, $RC, in fn-slice-repo" >>${BUILD_FAILED} + return $RC + fi + else + BUILD_FAILED="${buildDirectory}/buildFailed-slice-repo-error" + echo " ERROR: $REPO_DIR_DIR did not exist in fn-slice-repo. Probably due to an earlier error?" >>${BUILD_FAILED} + return 1 fi } @@ -974,68 +974,68 @@ fn-slice-repos () # BUILD_ID: I20121116-0700 # REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator # BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747 -fn-gather-repo-zips () +fn-gather-repo-zips () { - checkNArgs $# 3 + checkNArgs $# 3 if [[ $? != 0 ]]; then return 1; fi - BUILD_ID="$1"; shift - REPO_DIR="$1"; shift - BUILD_DIR="$1"; shift - if [[ -d "$REPO_DIR" ]] - then - pushd "$REPO_DIR"/eclipse.platform.repository/target/repos - for r in org.eclipse.*; do - pushd $r - zip -r "$BUILD_DIR"/${r}-${BUILD_ID}.zip * - popd - done - popd - else - echo " ERROR: $REPO_DIR did not exist in fn-gather-repo-zips" - fi + BUILD_ID="$1"; shift + REPO_DIR="$1"; shift + BUILD_DIR="$1"; shift + if [[ -d "$REPO_DIR" ]] + then + pushd "$REPO_DIR"/eclipse.platform.repository/target/repos + for r in org.eclipse.*; do + pushd $r + zip -r "$BUILD_DIR"/${r}-${BUILD_ID}.zip * + popd + done + popd + else + echo " ERROR: $REPO_DIR did not exist in fn-gather-repo-zips" + fi } # USAGE: fn-gather-compile-logs BUILD_ID REPO_DIR BUILD_DIR # BUILD_ID: I20121116-0700 # REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator # BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747 -fn-gather-compile-logs () +fn-gather-compile-logs () { - checkNArgs $# 3 + checkNArgs $# 3 if [[ $? != 0 ]]; then return 1; fi - BUILD_ID="$1"; shift - REPO_DIR="$1"; shift - BUILD_DIR="$1"; shift - if [[ -d "$REPO_DIR" ]] - then - mkdir -p "$BUILD_DIR"/compilelogs/plugins - pushd "$REPO_DIR" - for dot in $( find * -name "@dot.xml" ); do - targetDir=$( dirname "$dot" ) - echo "Processing $dot in $targetDir" - if [ ! -r "$targetDir"/MANIFEST.MF ]; then - echo "**Failed to process $dot in $targetDir. Likely compile error. Will try source MANIFEST.MF in directory containing target." - targetDir=$( dirname "${targetDir}" ) - if [ ! -r "$targetDir"/META-INF/MANIFEST.MF ] - then - echo "**Failed to process $dot in $targetDir." + BUILD_ID="$1"; shift + REPO_DIR="$1"; shift + BUILD_DIR="$1"; shift + if [[ -d "$REPO_DIR" ]] + then + mkdir -p "$BUILD_DIR"/compilelogs/plugins + pushd "$REPO_DIR" + for dot in $( find * -name "@dot.xml" ); do + targetDir=$( dirname "$dot" ) + echo "Processing $dot in $targetDir" + if [ ! -r "$targetDir"/MANIFEST.MF ]; then + echo "**Failed to process $dot in $targetDir. Likely compile error. Will try source MANIFEST.MF in directory containing target." + targetDir=$( dirname "${targetDir}" ) + if [ ! -r "$targetDir"/META-INF/MANIFEST.MF ] + then + echo "**Failed to process $dot in $targetDir." + else + BUNDLE_ID=$( grep Bundle-SymbolicName "$targetDir"/META-INF/MANIFEST.MF | cut -f2 -d" " | cut -f1 -d\; | tr -d '\f\r\n\t' ) + BUNDLE_VERSION=$( grep Bundle-Version "$targetDir"/META-INF/MANIFEST.MF | cut -f2 -d" " | tr -d '\f\r\n\t' ) + mkdir "$BUILD_DIR"/compilelogs/plugins/${BUNDLE_ID}_${BUNDLE_VERSION} + cp "$dot" "$BUILD_DIR"/compilelogs/plugins/${BUNDLE_ID}_${BUNDLE_VERSION} + fi else - BUNDLE_ID=$( grep Bundle-SymbolicName "$targetDir"/META-INF/MANIFEST.MF | cut -f2 -d" " | cut -f1 -d\; | tr -d '\f\r\n\t' ) - BUNDLE_VERSION=$( grep Bundle-Version "$targetDir"/META-INF/MANIFEST.MF | cut -f2 -d" " | tr -d '\f\r\n\t' ) + BUNDLE_ID=$( grep Bundle-SymbolicName "$targetDir"/MANIFEST.MF | cut -f2 -d" " | cut -f1 -d\; | tr -d '\f\r\n\t' ) + BUNDLE_VERSION=$( grep Bundle-Version "$targetDir"/MANIFEST.MF | cut -f2 -d" " | tr -d '\f\r\n\t' ) mkdir "$BUILD_DIR"/compilelogs/plugins/${BUNDLE_ID}_${BUNDLE_VERSION} - cp "$dot" "$BUILD_DIR"/compilelogs/plugins/${BUNDLE_ID}_${BUNDLE_VERSION} - fi - else - BUNDLE_ID=$( grep Bundle-SymbolicName "$targetDir"/MANIFEST.MF | cut -f2 -d" " | cut -f1 -d\; | tr -d '\f\r\n\t' ) - BUNDLE_VERSION=$( grep Bundle-Version "$targetDir"/MANIFEST.MF | cut -f2 -d" " | tr -d '\f\r\n\t' ) - mkdir "$BUILD_DIR"/compilelogs/plugins/${BUNDLE_ID}_${BUNDLE_VERSION} - cp "$dot" "$BUILD_DIR"/compilelogs/plugins/${BUNDLE_ID}_${BUNDLE_VERSION} + cp "$dot" "$BUILD_DIR"/compilelogs/plugins/${BUNDLE_ID}_${BUNDLE_VERSION} + fi + done + popd + else + echo " ERROR: $REPO_DIR did not exist in fn-gather-compile-logs" fi - done - popd - else - echo " ERROR: $REPO_DIR did not exist in fn-gather-compile-logs" - fi } @@ -1046,22 +1046,22 @@ fn-gather-compile-logs () # STREAM: 4.2.2 # BUILD_TYPE: M, I, N, X, Y, P # BUILD_PRETTY_DATE: Thu Nov 20 17:47:35 EST 2012 -fn-gather-main-index () +fn-gather-main-index () { - checkNArgs $# 6 + checkNArgs $# 6 if [[ $? != 0 ]]; then return 1; fi - BUILD_ID="$1"; shift - REPO_DIR="$1"; shift - BUILD_DIR="$1"; shift - STREAM="$1"; shift - BUILD_TYPE="$1"; shift - BUILD_PRETTY_DATE="$1"; shift - pushd "$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/eclipse/templateFiles + BUILD_ID="$1"; shift + REPO_DIR="$1"; shift + BUILD_DIR="$1"; shift + STREAM="$1"; shift + BUILD_TYPE="$1"; shift + BUILD_PRETTY_DATE="$1"; shift + pushd "$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/eclipse/templateFiles - # Simplified by creating PHP variables in buildproperties.php - cp "index.php.template${PATCH_BUILD}" "$BUILD_DIR"/index.php +# Simplified by creating PHP variables in buildproperties.php + cp "index.php.template${PATCH_BUILD}" "$BUILD_DIR"/index.php - popd + popd } # USAGE: fn-parse-compile-logs BUILD_ID ANT_SCRIPT BUILD_DIR BASEBUILDER_LAUNCHER @@ -1069,17 +1069,17 @@ fn-gather-main-index () # ANT_SCRIPT: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator # BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747 # BASEBUILDER_LAUNCHER: /shared/eclipse/builds/R4_2_maintenance/org.eclipse.releng.basebuilder_R3_7/plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar -fn-parse-compile-logs () +fn-parse-compile-logs () { - checkNArgs $# 4 + checkNArgs $# 4 if [[ $? != 0 ]]; then return 1; fi - BUILD_ID="$1"; shift - ANT_SCRIPT="$1"; shift - BUILD_DIR="$1"; shift - BASEBUILDER_LAUNCHER="$1"; shift - EBuilderDir="${BUILD_DIR}/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder" - pushd "$BUILD_DIR" - java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \ + BUILD_ID="$1"; shift + ANT_SCRIPT="$1"; shift + BUILD_DIR="$1"; shift + BASEBUILDER_LAUNCHER="$1"; shift + EBuilderDir="${BUILD_DIR}/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder" + pushd "$BUILD_DIR" + java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \ -data ${BUILD_DIR}/workspace-verifyCompile \ -application org.eclipse.ant.core.antRunner \ -buildfile "$ANT_SCRIPT" \ @@ -1090,7 +1090,7 @@ fn-parse-compile-logs () -DbuildLabel="$BUILD_ID" \ -Djava.io.tmpdir=$TMP_DIR \ verifyCompile - popd + popd } # USAGE: fn-summarize-comparator-logs BUILD_ID ANT_SCRIPT BUILD_DIR BASEBUILDER_LAUNCHER @@ -1099,17 +1099,17 @@ fn-parse-compile-logs () # BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747 # BASEBUILDER_LAUNCHER: /shared/eclipse/builds/R4_2_maintenance/org.eclipse.releng.basebuilder_R3_7/plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar # TODO: I think this could be pure ant task -fn-summarize-comparator-logs () +fn-summarize-comparator-logs () { - checkNArgs $# 4 + checkNArgs $# 4 if [[ $? != 0 ]]; then return 1; fi - BUILD_ID="$1"; shift - ANT_SCRIPT="$1"; shift - BUILD_DIR="$1"; shift - BASEBUILDER_LAUNCHER="$1"; shift - EBuilderDir="${BUILD_DIR}/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder" - pushd "$BUILD_DIR" - java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \ + BUILD_ID="$1"; shift + ANT_SCRIPT="$1"; shift + BUILD_DIR="$1"; shift + BASEBUILDER_LAUNCHER="$1"; shift + EBuilderDir="${BUILD_DIR}/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder" + pushd "$BUILD_DIR" + java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \ -data ${BUILD_DIR}/workspace-comparatorLogs \ -application org.eclipse.ant.core.antRunner \ -buildfile "$ANT_SCRIPT" \ @@ -1120,7 +1120,7 @@ fn-summarize-comparator-logs () -DbuildLabel="$BUILD_ID" \ -Djava.io.tmpdir=$TMP_DIR \ compare - popd + popd } # USAGE: fn-summarize-apitooling BUILD_ID ANT_SCRIPT BUILD_DIR BASEBUILDER_LAUNCHER # BUILD_ID: I20121116-0700 @@ -1128,31 +1128,31 @@ fn-summarize-comparator-logs () # BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747 # BASEBUILDER_LAUNCHER: /shared/eclipse/builds/R4_2_maintenance/org.eclipse.releng.basebuilder_R3_7/plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar # TODO: could avoid some of the hard coding of "previous version" and URL -fn-summarize-apitooling () +fn-summarize-apitooling () { - checkNArgs $# 4 + checkNArgs $# 4 if [[ $? != 0 ]]; then return 1; fi - BUILD_ID="$1"; shift - ANT_SCRIPT="$1"; shift - BUILD_DIR="$1"; shift - BASEBUILDER_LAUNCHER="$1"; shift - EBuilderDir=$BUILD_DIR/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder - pushd "$BUILD_DIR" - # Make sure FREEZE_PARAMS is defined, but empty space, if not using freeze reports. - FREEZE_PARAMS=" " - # When no "freeze" in effect for a release comment these out. Uncomment after M6, changing to appropriate versions. - FREEZE_PARAMS="-DfreezeBaseURL=http://download.eclipse.org/eclipse/downloads/drops4/S-4.4M6-201403061200/eclipse-SDK-4.4M6-win32.zip \ - -DfreezeName=Eclipse-SDK-4.4M6 \ - -DfreezeFilename=eclipse-SDK-4.4M6-win32.zip " - # this API_PREV_REF_LABEL variable should be changed any time the version used - # by previousBaseURL changes. Its purpose is just to localize changes to this one - # place, and not have to make further, hard-coded changes to testResults.php.template. - # Similar for freeze label. - API_PREV_REF_LABEL=4.3.2 - fn-write-property API_PREV_REF_LABEL - API_FREEZE_REF_LABEL=4.4M6 - fn-write-property API_FREEZE_REF_LABEL - java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \ + BUILD_ID="$1"; shift + ANT_SCRIPT="$1"; shift + BUILD_DIR="$1"; shift + BASEBUILDER_LAUNCHER="$1"; shift + EBuilderDir=$BUILD_DIR/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder + pushd "$BUILD_DIR" +# Make sure FREEZE_PARAMS is defined, but empty space, if not using freeze reports. + FREEZE_PARAMS=" " +# When no "freeze" in effect for a release comment these out. Uncomment after M6, changing to appropriate versions. + FREEZE_PARAMS="-DfreezeBaseURL=http://download.eclipse.org/eclipse/downloads/drops4/S-4.4M6-201403061200/eclipse-SDK-4.4M6-win32.zip \ + -DfreezeName=Eclipse-SDK-4.4M6 \ + -DfreezeFilename=eclipse-SDK-4.4M6-win32.zip " +# this API_PREV_REF_LABEL variable should be changed any time the version used +# by previousBaseURL changes. Its purpose is just to localize changes to this one +# place, and not have to make further, hard-coded changes to testResults.php.template. +# Similar for freeze label. + API_PREV_REF_LABEL=4.3.2 + fn-write-property API_PREV_REF_LABEL + API_FREEZE_REF_LABEL=4.4M6 + fn-write-property API_FREEZE_REF_LABEL + java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \ -data ${BUILD_DIR}/workspace-comparatorLogs \ -application org.eclipse.ant.core.antRunner \ -buildfile "$ANT_SCRIPT" \ @@ -1168,7 +1168,7 @@ fn-summarize-apitooling () -Djava.io.tmpdir=$TMP_DIR \ ${FREEZE_PARAMS} \ apiToolsReports - popd + popd } # USAGE: fn-publish-eclipse BUILD_TYPE BUILD_STREAM BUILD_ID REPO_DIR BUILD_DIR BASEBUILDER_LAUNCHER @@ -1178,19 +1178,19 @@ fn-summarize-apitooling () # REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator # BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747 # BASEBUILDER_LAUNCHER: /shared/eclipse/builds/R4_2_maintenance/org.eclipse.releng.basebuilder_R3_7/plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar -fn-publish-eclipse () +fn-publish-eclipse () { - checkNArgs $# 6 + checkNArgs $# 6 if [[ $? != 0 ]]; then return 1; fi - BUILD_TYPE="$1"; shift - BUILD_STREAM="$1"; shift - BUILD_ID="$1"; shift - AGGR_DIR="$1"; shift - BUILD_DIR="$1"; shift - BASEBUILDER_LAUNCHER="$1"; shift - EBuilderDir="$BUILD_DIR"/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder - pushd "$BUILD_DIR" - java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \ + BUILD_TYPE="$1"; shift + BUILD_STREAM="$1"; shift + BUILD_ID="$1"; shift + AGGR_DIR="$1"; shift + BUILD_DIR="$1"; shift + BASEBUILDER_LAUNCHER="$1"; shift + EBuilderDir="$BUILD_DIR"/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder + pushd "$BUILD_DIR" + java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \ -data ${BUILD_DIR}/workspace-publish \ -application org.eclipse.ant.core.antRunner \ -v \ @@ -1210,207 +1210,207 @@ fn-publish-eclipse () -DbuildDirectory=$(dirname "$BUILD_DIR") \ -Djava.io.tmpdir=$TMP_DIR \ publish - # hide experimental builds, for now - if [[ $BUILD_ID =~ [PXY] ]] - then - touch buildHidden - fi - popd +# hide experimental builds, for now + if [[ $BUILD_ID =~ [PXY] ]] + then + touch buildHidden + fi + popd } # USAGE: fn-checkout-basebuilder BUILDER_DIR # BUILDER_DIR: /shared/eclipse/builds/R4_2_maintenance/org.eclipse.releng.basebuilder_R3_7 -fn-checkout-basebuilder () +fn-checkout-basebuilder () { - checkNArgs $# 1 + checkNArgs $# 1 if [[ $? != 0 ]]; then return 1; fi - BUILDER_DIR="$1"; shift - if [ -e "$BUILDER_DIR" ]; then - echo "A basic builder directory already existed, so not re-fetched." - echo " Directory found at $BUILDER_DIR." - return 0 - fi - echo "A basic builder did not exist, so will fetch platform and tools." - DROP_DIR=$( dirname "$BUILDER_DIR" ) - # Are these as expected? TODO: change comments. - echo "Drop directory: $DROP_DIR" - echo "BUILDER_DIR: $BUILDER_DIR" - EBuilderDir=$DROP_DIR/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder - if [[ ! -d "${EBuilderDir}" ]] - then - echo "EBuilderDir did not exist, so will fetch that first" - ${SCRIPT_PATH}/getEBuilderForDropDir.sh $DROP_DIR $EBUILDER_HASH - else - echo "EBuilderDir already existed, so no need to fetch that" - fi - ant -f $EBuilderDir/eclipse/getBaseBuilderAndTools.xml -DWORKSPACE=$DROP_DIR + BUILDER_DIR="$1"; shift + if [ -e "$BUILDER_DIR" ]; then + echo "A basic builder directory already existed, so not re-fetched." + echo " Directory found at $BUILDER_DIR." + return 0 + fi + echo "A basic builder did not exist, so will fetch platform and tools." + DROP_DIR=$( dirname "$BUILDER_DIR" ) +# Are these as expected? TODO: change comments. + echo "Drop directory: $DROP_DIR" + echo "BUILDER_DIR: $BUILDER_DIR" + EBuilderDir=$DROP_DIR/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder + if [[ ! -d "${EBuilderDir}" ]] + then + echo "EBuilderDir did not exist, so will fetch that first" + ${SCRIPT_PATH}/getEBuilderForDropDir.sh $DROP_DIR $EBUILDER_HASH + else + echo "EBuilderDir already existed, so no need to fetch that" + fi + ant -f $EBuilderDir/eclipse/getBaseBuilderAndTools.xml -DWORKSPACE=$DROP_DIR } # USAGE: fn-basebuilder-launcher BUILDER_DIR # BUILDER_DIR: /shared/eclipse/builds/R4_2_maintenance/org.eclipse.releng.basebuilder_R3_7 -fn-basebuilder-launcher () +fn-basebuilder-launcher () { - checkNArgs $# 1 + checkNArgs $# 1 if [[ $? != 0 ]]; then return 1; fi - BUILDER_DIR="$1"; shift - find "$BUILDER_DIR" -name "org.eclipse.equinox.launcher_*.jar" | tail -1 + BUILDER_DIR="$1"; shift + find "$BUILDER_DIR" -name "org.eclipse.equinox.launcher_*.jar" | tail -1 } # USAGE: fn-pom-version-report BUILD_ID REPO_DIR BUILD_DIR LOCAL_REPO # BUILD_ID: I20121116-0700 # REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator # BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747 -fn-pom-version-report () +fn-pom-version-report () { - checkNArgs $# 3 + checkNArgs $# 3 if [[ $? != 0 ]]; then return 1; fi - BUILD_ID="$1"; shift - REPO_DIR="$1"; shift - BUILD_DIR="$1"; shift - pushd "$REPO_DIR" - mkdir -p "$BUILD_DIR"/pom_updates - git submodule foreach "if (git status -s -uno | grep pom.xml >/dev/null ); then git diff >$BUILD_DIR/pom_updates/\$name.diff; fi " - pushd "$BUILD_DIR"/pom_updates - nDiffs=$( ls -1 $BUILD_DIR/pom_updates/*.diff | wc -l ) - # don't create index.html if no diffs to display, as our PHP DL page knows - # not to display link if index.html is not present. - if (( $nDiffs > 0 )) - then - POM_UPDATES="" - echo "<html>" >index.html - echo "<head>" >>index.html - echo "<title>POM version report for $BUILD_ID</title>" >>index.html - echo "</head>" >>index.html - echo "<body>" >>index.html - echo "<h1>POM version report for $BUILD_ID</h1>" >>index.html - echo "<p>These repositories need patches to bring their pom.xml files up to the correct version.</p>" >>index.html - echo "<ul>" >>index.html - - for f in *.diff; do - FNAME=$( basename $f .diff ) - echo "<li><a href=\"$f\">$FNAME</a></li>" >> index.html - POM_UPDATES="${POM_UPDATES}<li><a href='$f'>$FNAME</a></li>" - done - echo "</ul>" >> index.html - echo "</html>" >> index.html - # we write to property files, for later use in email message - fn-write-property POM_UPDATES - fi - popd - popd + BUILD_ID="$1"; shift + REPO_DIR="$1"; shift + BUILD_DIR="$1"; shift + pushd "$REPO_DIR" + mkdir -p "$BUILD_DIR"/pom_updates + git submodule foreach "if (git status -s -uno | grep pom.xml >/dev/null ); then git diff >$BUILD_DIR/pom_updates/\$name.diff; fi " + pushd "$BUILD_DIR"/pom_updates + nDiffs=$( ls -1 $BUILD_DIR/pom_updates/*.diff | wc -l ) +# don't create index.html if no diffs to display, as our PHP DL page knows +# not to display link if index.html is not present. +if (( $nDiffs > 0 )) +then +POM_UPDATES="" +echo "<html>" >index.html +echo "<head>" >>index.html +echo "<title>POM version report for $BUILD_ID</title>" >>index.html +echo "</head>" >>index.html +echo "<body>" >>index.html +echo "<h1>POM version report for $BUILD_ID</h1>" >>index.html +echo "<p>These repositories need patches to bring their pom.xml files up to the correct version.</p>" >>index.html +echo "<ul>" >>index.html + +for f in *.diff; do +FNAME=$( basename $f .diff ) +echo "<li><a href=\"$f\">$FNAME</a></li>" >> index.html +POM_UPDATES="${POM_UPDATES}<li><a href='$f'>$FNAME</a></li>" +done +echo "</ul>" >> index.html +echo "</html>" >> index.html +# we write to property files, for later use in email message +fn-write-property POM_UPDATES +fi +popd +popd } # USAGE: fn-check-dir-exists DIR_VAR_NAME # DIR_VAR_NAME: JAVA_HOME (not, $JAVA_HOME, for better error messages) -# callers should check for non-zero returned value, which itself is suitable for message, +# callers should check for non-zero returned value, which itself is suitable for message, # but must be quoted. Such as # rc=${fn-check-dir-exists JAVA_HOME) # checkForErrorExit "$rc" "$rc" -fn-check-dir-exists () +fn-check-dir-exists () { - checkNArgs $# 1 - if [[ $? != 0 ]]; then return 1; fi - DIR_VAR_NAME=$1 - if [[ -z "${!DIR_VAR_NAME}" ]] - then - echo "DIR_VAR_NAME, ${DIR_VAR_NAME}, must be defined before running this script." - else - if [[ ! -d "${!DIR_VAR_NAME}" ]] - then - echo "The directory DIR_VAR_NAME, ${DIR_VAR_NAME} (\"${!DIR_VAR_NAME}\"), must exist before running this script." - else - echo 0 - fi - fi +checkNArgs $# 1 +if [[ $? != 0 ]]; then return 1; fi +DIR_VAR_NAME=$1 +if [[ -z "${!DIR_VAR_NAME}" ]] +then +echo "DIR_VAR_NAME, ${DIR_VAR_NAME}, must be defined before running this script." +else +if [[ ! -d "${!DIR_VAR_NAME}" ]] +then +echo "The directory DIR_VAR_NAME, ${DIR_VAR_NAME} (\"${!DIR_VAR_NAME}\"), must exist before running this script." +else +echo 0 +fi +fi } # USAGE: fn-write-property VAR_NAME # VAR_NAME: Variable name to write as "variable=value" form -# This script assumes the following variables have been defined and are pointing -# to an appropriate file (see master-build.sh): +# This script assumes the following variables have been defined and are pointing +# to an appropriate file (see master-build.sh): # BUILD_ENV_FILE=${buildDirectory}/buildproperties.shsource # BUILD_ENV_FILE_PHP=${buildDirectory}/buildproperties.php # BUILD_ENV_FILE_PROP=${buildDirectory}/buildproperties.properties -# Note we always append to file, assuming if doesn't exist yet and will be -# created, and for each build, it won't exist, so will be written fresh for -# each build. +# Note we always append to file, assuming if doesn't exist yet and will be +# created, and for each build, it won't exist, so will be written fresh for +# each build. -# TODO: Could add some sanity checking of if variable name appropriate -# for various language (e.g. I forget all the rules, but bash variables +# TODO: Could add some sanity checking of if variable name appropriate +# for various language (e.g. I forget all the rules, but bash variables # can not start with numerial, PHP variables (or is it Ant) can't have hyphens -# (or is it underscore :), etc. But may need to add some mangling, or warning? -# Similarly, not sure at the moment of what to +# (or is it underscore :), etc. But may need to add some mangling, or warning? +# Similarly, not sure at the moment of what to # write if value is null/empty. For now will leave empty string, but some might need blank? -# Or literally nothing? Also, unsure of effects of full quoting or if always needed? +# Or literally nothing? Also, unsure of effects of full quoting or if always needed? -fn-write-property () +fn-write-property () { - checkNArgs $# 1 + checkNArgs $# 1 if [[ $? != 0 ]]; then return 1; fi - VAR_NAME=$1 - if [[ -z "${VAR_NAME}" ]] - then - echo "VAR_NAME must be passed to this script, $0." - return 1 - fi + VAR_NAME=$1 + if [[ -z "${VAR_NAME}" ]] + then + echo "VAR_NAME must be passed to this script, $0." + return 1 + fi - # bash scripts (export may be overkill ... but, just in case needed) - echo "export ${VAR_NAME}=\"${!VAR_NAME}\"" >> $BUILD_ENV_FILE - # PHP, suitable for direct "include" - echo "\$${VAR_NAME} = \"${!VAR_NAME}\";" >> $BUILD_ENV_FILE_PHP - # standard properties file - echo "${VAR_NAME} = \"${!VAR_NAME}\"" >> $BUILD_ENV_FILE_PROP +# bash scripts (export may be overkill ... but, just in case needed) + echo "export ${VAR_NAME}=\"${!VAR_NAME}\"" >> $BUILD_ENV_FILE +# PHP, suitable for direct "include" + echo "\$${VAR_NAME} = \"${!VAR_NAME}\";" >> $BUILD_ENV_FILE_PHP +# standard properties file + echo "${VAR_NAME} = \"${!VAR_NAME}\"" >> $BUILD_ENV_FILE_PROP } # USAGE: fn-write-property-init -# Must be called (exactly) once before writing properties. -fn-write-property-init () +# Must be called (exactly) once before writing properties. +fn-write-property-init () { - checkNArgs $# 0 + checkNArgs $# 0 if [[ $? != 0 ]]; then return 1; fi - # nothing really required for bash shsource, but we'll put in some niceties - echo "#!/usr/bin/env bash" > $BUILD_ENV_FILE - echo "# properties written for $BUILD_ID" >> $BUILD_ENV_FILE - # PHP, suitable for direct "include": needs to start and end with <?php ... ?> - echo "<?php " > $BUILD_ENV_FILE_PHP - echo "// properties written for $BUILD_ID " >> $BUILD_ENV_FILE_PHP - # standard properties file: nothing special required - echo "! properties written for $BUILD_ID" > $BUILD_ENV_FILE_PROP +# nothing really required for bash shsource, but we'll put in some niceties + echo "#!/usr/bin/env bash" > $BUILD_ENV_FILE + echo "# properties written for $BUILD_ID" >> $BUILD_ENV_FILE +# PHP, suitable for direct "include": needs to start and end with <?php ... ?> + echo "<?php " > $BUILD_ENV_FILE_PHP + echo "// properties written for $BUILD_ID " >> $BUILD_ENV_FILE_PHP +# standard properties file: nothing special required + echo "! properties written for $BUILD_ID" > $BUILD_ENV_FILE_PROP } # USAGE: fn-write-property-close -# Must be called (exactly) once when completely finished writing properties. -fn-write-property-close () +# Must be called (exactly) once when completely finished writing properties. +fn-write-property-close () { - checkNArgs $# 0 + checkNArgs $# 0 if [[ $? != 0 ]]; then return 1; fi - # nothing really required for bash shsource, but we'll put in some niceties - echo "# finished properties for $BUILD_ID" >> $BUILD_ENV_FILE - # PHP, suitable for direct "include": needs to start and end with <?php ... ?> - # Note: technically may not need closing ?> for an 'include' ? - echo "// finished properties for $BUILD_ID " >> $BUILD_ENV_FILE_PHP - echo "?>" >> $BUILD_ENV_FILE_PHP - # standard properties file: nothing special required - echo "! finshed properties for $BUILD_ID" >> $BUILD_ENV_FILE_PROP +# nothing really required for bash shsource, but we'll put in some niceties + echo "# finished properties for $BUILD_ID" >> $BUILD_ENV_FILE +# PHP, suitable for direct "include": needs to start and end with <?php ... ?> +# Note: technically may not need closing ?> for an 'include' ? + echo "// finished properties for $BUILD_ID " >> $BUILD_ENV_FILE_PHP + echo "?>" >> $BUILD_ENV_FILE_PHP +# standard properties file: nothing special required + echo "! finshed properties for $BUILD_ID" >> $BUILD_ENV_FILE_PROP } # USAGE: fn-complete-status "message" -# Assumed called while in aggregator directory, so get's its git status, -# then iterates through each submodule for status. -# This is/was intend to debug why "cleanup" does not always clean up/reset everything, +# Assumed called while in aggregator directory, so get's its git status, +# then iterates through each submodule for status. +# This is/was intend to debug why "cleanup" does not always clean up/reset everything, # so if too verbose, can remove in future. -# Message is a quoted string that can be printed out before each status, for -# improved logging. -fn-complete-status () +# Message is a quoted string that can be printed out before each status, for +# improved logging. +fn-complete-status () { - checkNArgs $# 1 + checkNArgs $# 1 if [[ $? != 0 ]]; then return 1; fi - MESSAGE=$1 - printf "\n\t%s\n\n" "${MESSAGE}" - git status - git submodule foreach git status + MESSAGE=$1 + printf "\n\t%s\n\n" "${MESSAGE}" + git status + git submodule foreach git status } diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource index 2f49c326f..38eded1e7 100644 --- a/production/build_eclipse_org.shsource +++ b/production/build_eclipse_org.shsource @@ -2,7 +2,7 @@ # default definitions for this branch -# this buildeclipse.shsource file is to ease local builds to override some variables. +# this buildeclipse.shsource file is to ease local builds to override some variables. # It should not be used for production builds. source buildeclipse.shsource 2>/dev/null export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds} @@ -23,11 +23,11 @@ export PATCH_BUILD=${PATCH_BUILD:-""} # which is default behavior if [[ -n ${PATCH_BUILD} ]] then - export ALT_POM_FILE="-f eclipse.platform.releng.tychoeclipsebuilder/${PATCH_BUILD}/pom.xml" - echo "DEBUG: ALT_POM_FILE: $ALT_POM_FILE" -else - export ALT_POM_FILE="" - echo "DEBUG: ALT_POM_FILE: None. Using normal default." +export ALT_POM_FILE="-f eclipse.platform.releng.tychoeclipsebuilder/${PATCH_BUILD}/pom.xml" +echo "DEBUG: ALT_POM_FILE: $ALT_POM_FILE" +else +export ALT_POM_FILE="" +echo "DEBUG: ALT_POM_FILE: None. Using normal default." fi @@ -35,8 +35,8 @@ eclipseStreamMajor=${STREAM:0:1} export BUILD_ROOT=${BUILD_ROOT:-${BUILD_HOME}/${eclipseStreamMajor}${BUILD_TYPE}} -# Any invocation of Java, Ant, Maven, etc., should use this as default TMP direcotory, -# instead of the default /tmp by using +# Any invocation of Java, Ant, Maven, etc., should use this as default TMP direcotory, +# instead of the default /tmp by using # -Djava.io.tmpdir=${TMP_DIR} export TMP_DIR=${TMP_DIR:-${BUILD_ROOT}/tmp} # Just in case it doesn't exist yet (it must exist first, or Java will fail) @@ -44,14 +44,14 @@ mkdir -p ${TMP_DIR} # these could be machine specific export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0-latest} -# required for when ant is used. Unclear how maven's "antrun" finds its version of Ant, -# built in? Or system path? +# required for when ant is used. Unclear how maven's "antrun" finds its version of Ant, +# built in? Or system path? # But, without the ANT_OPTS, we do get messages about "to get repeatable builds, to ignore sysclasspath" export ANT_HOME=${ANT_HOME:-/shared/common/apache-ant-1.9.2} export ANT_OPTS=${ANT_OPTS:-"-Dbuild.sysclasspath=ignore -Dincludeantruntime=false"} # -# remember, MaxPermSize is specific to "Oracle VMs". It has to be removed (or over ridden) -# for other VMs or the VM might fail to start due to unrecognized -XX option. +# remember, MaxPermSize is specific to "Oracle VMs". It has to be removed (or over ridden) +# for other VMs or the VM might fail to start due to unrecognized -XX option. export MAVEN_OPTS=${MAVEN_OPTS:--Xmx2560m -XX:MaxPermSize=256M -Djava.io.tmpdir=${TMP_DIR} -Dtycho.localArtifacts=ignore -Declipse.p2.mirrors=false} export MAVEN_PATH=${MAVEN_PATH:-/shared/common/apache-maven-3.1.1/bin} @@ -60,13 +60,13 @@ export PATH=$JAVA_HOME/bin:$MAVEN_PATH:$ANT_HOME/bin:$PATH # if not defined "externally", we use default for eclipse.org if [[ -z "${REPO_AND_ACCESS}" ]] then - # unless we are on 'build' machine - if [[ "build" == "$(hostname)" ]] - then - export REPO_AND_ACCESS=file:///gitroot - else - export REPO_AND_ACCESS=git://git.eclipse.org/gitroot - fi +# unless we are on 'build' machine +if [[ "build" == "$(hostname)" ]] +then +export REPO_AND_ACCESS=file:///gitroot +else +export REPO_AND_ACCESS=git://git.eclipse.org/gitroot +fi fi AGGREGATOR_REPO=${REPO_AND_ACCESS}/platform/eclipse.platform.releng.aggregator.git @@ -88,15 +88,15 @@ MAVEN_BREE=-Pbree-libs # local, non build.eclipse.org builds (or, test builds) may need to override, and turn off signing. # otherwwise, we always sign if I or M builds, but not N builds -# +# if [[ $BUILD_TYPE =~ [IMXYP] ]] then - SIGNING=${SIGNING:-true} +SIGNING=${SIGNING:-true} else - SIGNING=${SIGNING:-false} +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 +# 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=/shared/common/jdk1.8.0_x64-latest/bin/javadoc" diff --git a/production/doc_options_process.sh b/production/doc_options_process.sh index cd0f9d0a6..2431b5b68 100644 --- a/production/doc_options_process.sh +++ b/production/doc_options_process.sh @@ -2,319 +2,319 @@ # convertOptions () { -CONVERT=' -;../org.eclipse.ant.core/src -;../org.eclipse.compare.core/src -;../org.eclipse.compare/compare -;../org.eclipse.core.commands/src -;../org.eclipse.core.contenttype/src -;../org.eclipse.core.databinding.beans/src -;../org.eclipse.core.databinding.observable/src -;../org.eclipse.core.databinding.property/src -;../org.eclipse.core.databinding/src -;../org.eclipse.core.expressions/src -;../org.eclipse.core.filebuffers/src -;../org.eclipse.core.filesystem/src -;../org.eclipse.core.jobs/src -;../org.eclipse.core.net/src -;../org.eclipse.core.resources/src -;../org.eclipse.core.runtime.compatibility/src-model -;../org.eclipse.core.runtime.compatibility/src-runtime -;../org.eclipse.core.runtime/src -;../org.eclipse.core.variables/src -;../org.eclipse.debug.core/core -;../org.eclipse.debug.ui/ui -;../org.eclipse.equinox.app/src -;../org.eclipse.e4.core.commands/src -;../org.eclipse.e4.core.contexts/src -;../org.eclipse.e4.core.di/src -;../org.eclipse.e4.core.services/src -;../org.eclipse.e4.ui.bindings/src -;../org.eclipse.e4.ui.css.core/src -;../org.eclipse.e4.ui.css.swt/src -;../org.eclipse.e4.ui.css.swt.theme/src -;../org.eclipse.e4.ui.di/src -;../org.eclipse.e4.ui.model.workbench/src -;../org.eclipse.e4.ui.services/src -;../org.eclipse.e4.ui.widgets/src -;../org.eclipse.e4.ui.workbench.renderers.swt/src -;../org.eclipse.e4.ui.workbench.swt/src -;../org.eclipse.e4.ui.workbench/src -;../org.eclipse.e4.ui.workbench3/src -;../org.eclipse.equinox.bidi/src -;../org.eclipse.equinox.ds/src -;../org.eclipse.equinox.common/src -;../org.eclipse.equinox.frameworkadmin/src -;../org.eclipse.equinox.http.jetty_*/src -;../org.eclipse.equinox.http.registry/src -;../org.eclipse.equinox.http.servlet/src -;../org.eclipse.equinox.jsp.jasper.registry/src -;../org.eclipse.equinox.jsp.jasper/src -;../org.eclipse.equinox.preferences/src -;../org.eclipse.equinox.p2.core/src -;../org.eclipse.equinox.p2.director/src -;../org.eclipse.equinox.p2.engine/src -;../org.eclipse.equinox.p2.metadata/src -;../org.eclipse.equinox.p2.metadata.repository/src -;../org.eclipse.equinox.p2.operations/src -;../org.eclipse.equinox.p2.ql/src -;../org.eclipse.equinox.p2.repository/src -;../org.eclipse.equinox.p2.touchpoint.eclipse/src -;../org.eclipse.equinox.p2.ui/src -;../org.eclipse.equinox.registry/src -;../org.eclipse.equinox.security/src -;../org.eclipse.help.base/src -;../org.eclipse.help.base/src_demo -;../org.eclipse.help.ui/src -;../org.eclipse.help.webapp/src -;../org.eclipse.help/src -;../org.eclipse.jface.databinding/src -;../org.eclipse.jface.text/projection -;../org.eclipse.jface.text/src -;../org.eclipse.jface/src -;../org.eclipse.jsch.core/src -;../org.eclipse.jsch.ui/src -;../org.eclipse.ltk.core.refactoring/src -;../org.eclipse.ltk.ui.refactoring/src -;../org.eclipse.osgi/core/adaptor -;../org.eclipse.osgi/core/framework -;../org.eclipse.osgi/eclipseAdaptor/src -;../org.eclipse.osgi/security/src -;../org.eclipse.osgi/supplement/src -;../org.eclipse.pde/src -;../org.eclipse.platform/src -;../org.eclipse.search/new search -;../org.eclipse.search/search -;../org.eclipse.swt/Eclipse SWT Accessibility/common/ -;../org.eclipse.swt/Eclipse SWT Accessibility/win32/ -;../org.eclipse.swt/Eclipse SWT AWT/common/ -;../org.eclipse.swt/Eclipse SWT AWT/win32/ -;../org.eclipse.swt/Eclipse SWT Browser/common/ -;../org.eclipse.swt/Eclipse SWT Browser/win32/ -;../org.eclipse.swt/Eclipse SWT Custom Widgets/common/ -;../org.eclipse.swt/Eclipse SWT Drag and Drop/common/ -;../org.eclipse.swt/Eclipse SWT Drag and Drop/win32/ -;../org.eclipse.swt/Eclipse SWT OLE Win32/win32/ -;../org.eclipse.swt/Eclipse SWT OpenGL/common -;../org.eclipse.swt/Eclipse SWT OpenGL/emulated -;../org.eclipse.swt/Eclipse SWT OpenGL/glx -;../org.eclipse.swt/Eclipse SWT OpenGL/win32 -;../org.eclipse.swt/Eclipse SWT PI/common/ -;../org.eclipse.swt/Eclipse SWT PI/common_j2se/ -;../org.eclipse.swt/Eclipse SWT PI/win32/ -;../org.eclipse.swt/Eclipse SWT Printing/common/ -;../org.eclipse.swt/Eclipse SWT Printing/win32/ -;../org.eclipse.swt/Eclipse SWT Program/common/ -;../org.eclipse.swt/Eclipse SWT Program/win32/ -;../org.eclipse.swt/Eclipse SWT/common/ -;../org.eclipse.swt/Eclipse SWT/common_j2se/ -;../org.eclipse.swt/Eclipse SWT/win32/ -;../org.eclipse.team.core/src -;../org.eclipse.team.ui/src -;../org.eclipse.text/projection -;../org.eclipse.text/src -;../org.eclipse.ui.cheatsheets/src -;../org.eclipse.ui.console/src -;../org.eclipse.ui.editors/src -;../org.eclipse.ui.forms/src -;../org.eclipse.ui.ide/extensions -;../org.eclipse.ui.ide/src -;../org.eclipse.ui.intro.universal/src -;../org.eclipse.ui.intro/src -;../org.eclipse.ui.navigator.resources/src -;../org.eclipse.ui.navigator/src -;../org.eclipse.ui.views.properties.tabbed/src -;../org.eclipse.ui.views/src -;../org.eclipse.ui.workbench.texteditor/src -;../org.eclipse.ui.workbench/Eclipse UI -;../org.eclipse.ui.workbench/Eclipse UI Editor Support -;../org.eclipse.ui/src -;../org.eclipse.update.configurator/src -' + CONVERT=' + ;../org.eclipse.ant.core/src + ;../org.eclipse.compare.core/src + ;../org.eclipse.compare/compare + ;../org.eclipse.core.commands/src + ;../org.eclipse.core.contenttype/src + ;../org.eclipse.core.databinding.beans/src + ;../org.eclipse.core.databinding.observable/src + ;../org.eclipse.core.databinding.property/src + ;../org.eclipse.core.databinding/src + ;../org.eclipse.core.expressions/src + ;../org.eclipse.core.filebuffers/src + ;../org.eclipse.core.filesystem/src + ;../org.eclipse.core.jobs/src + ;../org.eclipse.core.net/src + ;../org.eclipse.core.resources/src + ;../org.eclipse.core.runtime.compatibility/src-model + ;../org.eclipse.core.runtime.compatibility/src-runtime + ;../org.eclipse.core.runtime/src + ;../org.eclipse.core.variables/src + ;../org.eclipse.debug.core/core + ;../org.eclipse.debug.ui/ui + ;../org.eclipse.equinox.app/src + ;../org.eclipse.e4.core.commands/src + ;../org.eclipse.e4.core.contexts/src + ;../org.eclipse.e4.core.di/src + ;../org.eclipse.e4.core.services/src + ;../org.eclipse.e4.ui.bindings/src + ;../org.eclipse.e4.ui.css.core/src + ;../org.eclipse.e4.ui.css.swt/src + ;../org.eclipse.e4.ui.css.swt.theme/src + ;../org.eclipse.e4.ui.di/src + ;../org.eclipse.e4.ui.model.workbench/src + ;../org.eclipse.e4.ui.services/src + ;../org.eclipse.e4.ui.widgets/src + ;../org.eclipse.e4.ui.workbench.renderers.swt/src + ;../org.eclipse.e4.ui.workbench.swt/src + ;../org.eclipse.e4.ui.workbench/src + ;../org.eclipse.e4.ui.workbench3/src + ;../org.eclipse.equinox.bidi/src + ;../org.eclipse.equinox.ds/src + ;../org.eclipse.equinox.common/src + ;../org.eclipse.equinox.frameworkadmin/src + ;../org.eclipse.equinox.http.jetty_*/src + ;../org.eclipse.equinox.http.registry/src + ;../org.eclipse.equinox.http.servlet/src + ;../org.eclipse.equinox.jsp.jasper.registry/src + ;../org.eclipse.equinox.jsp.jasper/src + ;../org.eclipse.equinox.preferences/src + ;../org.eclipse.equinox.p2.core/src + ;../org.eclipse.equinox.p2.director/src + ;../org.eclipse.equinox.p2.engine/src + ;../org.eclipse.equinox.p2.metadata/src + ;../org.eclipse.equinox.p2.metadata.repository/src + ;../org.eclipse.equinox.p2.operations/src + ;../org.eclipse.equinox.p2.ql/src + ;../org.eclipse.equinox.p2.repository/src + ;../org.eclipse.equinox.p2.touchpoint.eclipse/src + ;../org.eclipse.equinox.p2.ui/src + ;../org.eclipse.equinox.registry/src + ;../org.eclipse.equinox.security/src + ;../org.eclipse.help.base/src + ;../org.eclipse.help.base/src_demo + ;../org.eclipse.help.ui/src + ;../org.eclipse.help.webapp/src + ;../org.eclipse.help/src + ;../org.eclipse.jface.databinding/src + ;../org.eclipse.jface.text/projection + ;../org.eclipse.jface.text/src + ;../org.eclipse.jface/src + ;../org.eclipse.jsch.core/src + ;../org.eclipse.jsch.ui/src + ;../org.eclipse.ltk.core.refactoring/src + ;../org.eclipse.ltk.ui.refactoring/src + ;../org.eclipse.osgi/core/adaptor + ;../org.eclipse.osgi/core/framework + ;../org.eclipse.osgi/eclipseAdaptor/src + ;../org.eclipse.osgi/security/src + ;../org.eclipse.osgi/supplement/src + ;../org.eclipse.pde/src + ;../org.eclipse.platform/src + ;../org.eclipse.search/new search + ;../org.eclipse.search/search + ;../org.eclipse.swt/Eclipse SWT Accessibility/common/ + ;../org.eclipse.swt/Eclipse SWT Accessibility/win32/ + ;../org.eclipse.swt/Eclipse SWT AWT/common/ + ;../org.eclipse.swt/Eclipse SWT AWT/win32/ + ;../org.eclipse.swt/Eclipse SWT Browser/common/ + ;../org.eclipse.swt/Eclipse SWT Browser/win32/ + ;../org.eclipse.swt/Eclipse SWT Custom Widgets/common/ + ;../org.eclipse.swt/Eclipse SWT Drag and Drop/common/ + ;../org.eclipse.swt/Eclipse SWT Drag and Drop/win32/ + ;../org.eclipse.swt/Eclipse SWT OLE Win32/win32/ + ;../org.eclipse.swt/Eclipse SWT OpenGL/common + ;../org.eclipse.swt/Eclipse SWT OpenGL/emulated + ;../org.eclipse.swt/Eclipse SWT OpenGL/glx + ;../org.eclipse.swt/Eclipse SWT OpenGL/win32 + ;../org.eclipse.swt/Eclipse SWT PI/common/ + ;../org.eclipse.swt/Eclipse SWT PI/common_j2se/ + ;../org.eclipse.swt/Eclipse SWT PI/win32/ + ;../org.eclipse.swt/Eclipse SWT Printing/common/ + ;../org.eclipse.swt/Eclipse SWT Printing/win32/ + ;../org.eclipse.swt/Eclipse SWT Program/common/ + ;../org.eclipse.swt/Eclipse SWT Program/win32/ + ;../org.eclipse.swt/Eclipse SWT/common/ + ;../org.eclipse.swt/Eclipse SWT/common_j2se/ + ;../org.eclipse.swt/Eclipse SWT/win32/ + ;../org.eclipse.team.core/src + ;../org.eclipse.team.ui/src + ;../org.eclipse.text/projection + ;../org.eclipse.text/src + ;../org.eclipse.ui.cheatsheets/src + ;../org.eclipse.ui.console/src + ;../org.eclipse.ui.editors/src + ;../org.eclipse.ui.forms/src + ;../org.eclipse.ui.ide/extensions + ;../org.eclipse.ui.ide/src + ;../org.eclipse.ui.intro.universal/src + ;../org.eclipse.ui.intro/src + ;../org.eclipse.ui.navigator.resources/src + ;../org.eclipse.ui.navigator/src + ;../org.eclipse.ui.views.properties.tabbed/src + ;../org.eclipse.ui.views/src + ;../org.eclipse.ui.workbench.texteditor/src + ;../org.eclipse.ui.workbench/Eclipse UI + ;../org.eclipse.ui.workbench/Eclipse UI Editor Support + ;../org.eclipse.ui/src + ;../org.eclipse.update.configurator/src + ' -for DPATH in $CONVERT; do - NPATH=${DPATH:1} - PLUGIN=$( echo $NPATH | cut -f2 -d/ ) - PLUGIN_DIR=$( grep "${PLUGIN}\$" dirs.txt | head -1 ) - PLUGIN_BASE=$( echo $PLUGIN_DIR | sed "s/\/${PLUGIN}\$//g" | sed 's!/!.!g' ) - echo ${DPATH} | sed "s/\.\./@${PLUGIN_BASE}@/g" -done + for DPATH in $CONVERT; do + NPATH=${DPATH:1} + PLUGIN=$( echo $NPATH | cut -f2 -d/ ) + PLUGIN_DIR=$( grep "${PLUGIN}\$" dirs.txt | head -1 ) + PLUGIN_BASE=$( echo $PLUGIN_DIR | sed "s/\/${PLUGIN}\$//g" | sed 's!/!.!g' ) + echo ${DPATH} | sed "s/\.\./@${PLUGIN_BASE}@/g" + done } convertSchema () { -while read line; do - NPATH="$line" - PLUGIN=$( echo $NPATH | cut -f2 -d/ ) - PLUGIN_DIR=$( grep "${PLUGIN}\$" dirs.txt | head -1 ) - PLUGIN_BASE=$( echo $PLUGIN_DIR | sed "s/\/${PLUGIN}\$//g" | sed 's!/!.!g' ) - echo ${NPATH} | sed "s/\.\./\${${PLUGIN_BASE}\}/g" -done <<EOF - <pde.convertSchemaToHTML manifest="../org.eclipse.ant.core/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.ant.ui/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.compare/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.core.contenttype/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.core.expressions/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.core.filebuffers/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.core.filesystem/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.core.resources/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.core.runtime/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.core.variables/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.debug.core/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.debug.ui/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.e4.ui.workbench/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.equinox.preferences/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.equinox.app/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.equinox.bidi/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.equinox.http.registry/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.equinox.registry/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.equinox.security/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.help/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.help.base/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.help.ui/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.help.webapp/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.ltk.core.refactoring/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.ltk.ui.refactoring/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.search/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.team.core/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.team.ui/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.ui/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.ui.browser/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.ui.cheatsheets/plugin.xml" destination="${dest}" /> - <!--copy extra files linked to by generated extension point doc--> - <copy file="../org.eclipse.ui.cheatsheets/schema/cheatSheetContentFileSpec.html" todir="${dest}"/> - <copy file="../org.eclipse.ui.cheatsheets/schema/cheatSheetContentFileSpec.exsd" todir="${dest}"/> - <copy file="../org.eclipse.ui.cheatsheets/schema/compositeContentFile.html" todir="${dest}"/> - <copy file="../org.eclipse.ui.cheatsheets/schema/compositeContentFile.exsd" todir="${dest}"/> - - <pde.convertSchemaToHTML manifest="../org.eclipse.ui.console/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.ui.editors/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.ui.externaltools/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.ui.ide/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.ui.intro/plugin.xml" destination="${dest}" /> - <!--copy extra HTML file linked to by generated extension point doc--> - <copy file="../org.eclipse.ui.intro/schema/introContentFileSpec.html" todir="${dest}"/> - <pde.convertSchemaToHTML manifest="../org.eclipse.ui.navigator/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.ui.views.properties.tabbed/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.ui.workbench.texteditor/plugin.xml" destination="${dest}" /> + while read line; do + NPATH="$line" + PLUGIN=$( echo $NPATH | cut -f2 -d/ ) + PLUGIN_DIR=$( grep "${PLUGIN}\$" dirs.txt | head -1 ) + PLUGIN_BASE=$( echo $PLUGIN_DIR | sed "s/\/${PLUGIN}\$//g" | sed 's!/!.!g' ) + echo ${NPATH} | sed "s/\.\./\${${PLUGIN_BASE}\}/g" + done <<EOF + <pde.convertSchemaToHTML manifest="../org.eclipse.ant.core/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.ant.ui/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.compare/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.core.contenttype/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.core.expressions/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.core.filebuffers/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.core.filesystem/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.core.resources/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.core.runtime/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.core.variables/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.debug.core/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.debug.ui/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.e4.ui.workbench/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.equinox.preferences/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.equinox.app/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.equinox.bidi/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.equinox.http.registry/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.equinox.registry/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.equinox.security/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.help/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.help.base/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.help.ui/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.help.webapp/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.ltk.core.refactoring/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.ltk.ui.refactoring/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.search/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.team.core/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.team.ui/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.ui/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.ui.browser/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.ui.cheatsheets/plugin.xml" destination="${dest}" /> + <!--copy extra files linked to by generated extension point doc--> + <copy file="../org.eclipse.ui.cheatsheets/schema/cheatSheetContentFileSpec.html" todir="${dest}"/> + <copy file="../org.eclipse.ui.cheatsheets/schema/cheatSheetContentFileSpec.exsd" todir="${dest}"/> + <copy file="../org.eclipse.ui.cheatsheets/schema/compositeContentFile.html" todir="${dest}"/> + <copy file="../org.eclipse.ui.cheatsheets/schema/compositeContentFile.exsd" todir="${dest}"/> + + <pde.convertSchemaToHTML manifest="../org.eclipse.ui.console/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.ui.editors/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.ui.externaltools/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.ui.ide/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.ui.intro/plugin.xml" destination="${dest}" /> + <!--copy extra HTML file linked to by generated extension point doc--> + <copy file="../org.eclipse.ui.intro/schema/introContentFileSpec.html" todir="${dest}"/> + <pde.convertSchemaToHTML manifest="../org.eclipse.ui.navigator/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.ui.views.properties.tabbed/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.ui.workbench.texteditor/plugin.xml" destination="${dest}" /> EOF } convertDot () { -while read line; do - NPATH="$line" - PLUGIN=$( echo $NPATH | cut -f2 -d/ ) - PLUGIN_DIR=$( grep "${PLUGIN}\$" dirs.txt | head -1 ) - PLUGIN_BASE=$( echo $PLUGIN_DIR | sed "s/\/${PLUGIN}\$//g" | sed 's!/!.!g' ) - echo ${NPATH} | sed "s/\.\./@${PLUGIN_BASE}@/g" -done <<EOF -;../org.eclipse.equinox.p2.director/@dot -;../org.eclipse.equinox.p2.garbagecollector/@dot -;../org.eclipse.equinox.p2.metadata.repository/@dot -;../org.eclipse.equinox.p2.publisher/@dot -;../org.eclipse.equinox.simpleconfigurator/@dot -;../org.eclipse.equinox.supplement/@dot -;../org.eclipse.help.appserver/@dot -;../org.eclipse.osgi.services/@dot -;../org.eclipse.osgi/@dot + while read line; do + NPATH="$line" + PLUGIN=$( echo $NPATH | cut -f2 -d/ ) + PLUGIN_DIR=$( grep "${PLUGIN}\$" dirs.txt | head -1 ) + PLUGIN_BASE=$( echo $PLUGIN_DIR | sed "s/\/${PLUGIN}\$//g" | sed 's!/!.!g' ) + echo ${NPATH} | sed "s/\.\./@${PLUGIN_BASE}@/g" + done <<EOF + ;../org.eclipse.equinox.p2.director/@dot + ;../org.eclipse.equinox.p2.garbagecollector/@dot + ;../org.eclipse.equinox.p2.metadata.repository/@dot + ;../org.eclipse.equinox.p2.publisher/@dot + ;../org.eclipse.equinox.simpleconfigurator/@dot + ;../org.eclipse.equinox.supplement/@dot + ;../org.eclipse.help.appserver/@dot + ;../org.eclipse.osgi.services/@dot + ;../org.eclipse.osgi/@dot EOF } convertJdtOptions () { -while read line; do - NPATH="$line" - PLUGIN=$( echo $NPATH | cut -f2 -d/ ) - PLUGIN_DIR=$( grep "${PLUGIN}\$" dirs.txt | head -1 ) - PLUGIN_BASE=$( echo $PLUGIN_DIR | sed "s/\/${PLUGIN}\$//g" | sed 's!/!.!g' ) - echo ${NPATH} | sed "s/\.\./@${PLUGIN_BASE}@/g" -done <<EOF -../org.eclipse.jdt.annotation/src -;../org.eclipse.ant.launching/src -;../org.eclipse.ant.ui/Ant Editor -;../org.eclipse.ant.ui/Ant Tools Support -;../org.eclipse.jdt.apt.core/src -;../org.eclipse.jdt.core/antadapter -;../org.eclipse.jdt.core/batch -;../org.eclipse.jdt.core/codeassist -;../org.eclipse.jdt.core/compiler -;../org.eclipse.jdt.core/dom -;../org.eclipse.jdt.core/eval -;../org.eclipse.jdt.core/formatter -;../org.eclipse.jdt.core/model -;../org.eclipse.jdt.core/search -;../org.eclipse.jdt.core.manipulation/common -;../org.eclipse.jdt.core.manipulation/refactoring -;../org.eclipse.jdt.debug/eval -;../org.eclipse.jdt.debug/jdi -;../org.eclipse.jdt.debug/model -;../org.eclipse.jdt.debug.ui/ui -;../org.eclipse.jdt.junit/src -;../org.eclipse.jdt.junit.core/src -;../org.eclipse.jdt.junit.runtime/src -;../org.eclipse.jdt.launching/launching -;../org.eclipse.jdt.ui/core extension -;../org.eclipse.jdt.ui/core refactoring -;../org.eclipse.jdt.ui/internal compatibility -;../org.eclipse.jdt.ui/ui -;../org.eclipse.jdt.ui/ui refactoring + while read line; do + NPATH="$line" + PLUGIN=$( echo $NPATH | cut -f2 -d/ ) + PLUGIN_DIR=$( grep "${PLUGIN}\$" dirs.txt | head -1 ) + PLUGIN_BASE=$( echo $PLUGIN_DIR | sed "s/\/${PLUGIN}\$//g" | sed 's!/!.!g' ) + echo ${NPATH} | sed "s/\.\./@${PLUGIN_BASE}@/g" + done <<EOF + ../org.eclipse.jdt.annotation/src + ;../org.eclipse.ant.launching/src + ;../org.eclipse.ant.ui/Ant Editor + ;../org.eclipse.ant.ui/Ant Tools Support + ;../org.eclipse.jdt.apt.core/src + ;../org.eclipse.jdt.core/antadapter + ;../org.eclipse.jdt.core/batch + ;../org.eclipse.jdt.core/codeassist + ;../org.eclipse.jdt.core/compiler + ;../org.eclipse.jdt.core/dom + ;../org.eclipse.jdt.core/eval + ;../org.eclipse.jdt.core/formatter + ;../org.eclipse.jdt.core/model + ;../org.eclipse.jdt.core/search + ;../org.eclipse.jdt.core.manipulation/common + ;../org.eclipse.jdt.core.manipulation/refactoring + ;../org.eclipse.jdt.debug/eval + ;../org.eclipse.jdt.debug/jdi + ;../org.eclipse.jdt.debug/model + ;../org.eclipse.jdt.debug.ui/ui + ;../org.eclipse.jdt.junit/src + ;../org.eclipse.jdt.junit.core/src + ;../org.eclipse.jdt.junit.runtime/src + ;../org.eclipse.jdt.launching/launching + ;../org.eclipse.jdt.ui/core extension + ;../org.eclipse.jdt.ui/core refactoring + ;../org.eclipse.jdt.ui/internal compatibility + ;../org.eclipse.jdt.ui/ui + ;../org.eclipse.jdt.ui/ui refactoring EOF } convertJdtSchema () { -while read line; do - NPATH="$line" - PLUGIN=$( echo $NPATH | cut -f2 -d/ ) - PLUGIN_DIR=$( grep "${PLUGIN}\$" dirs.txt | head -1 ) - PLUGIN_BASE=$( echo $PLUGIN_DIR | sed "s/\/${PLUGIN}\$//g" | sed 's!/!.!g' ) - echo ${NPATH} | sed "s/\.\./\${${PLUGIN_BASE}\}/g" -done <<EOF - <pde.convertSchemaToHTML manifest="../org.eclipse.jdt.apt.core/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.jdt.core/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.jdt.core.manipulation/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.jdt.debug/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.jdt.debug.ui/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.jdt.junit/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.jdt.junit.core/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.jdt.launching/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.jdt.ui/plugin.xml" destination="${dest}" /> + while read line; do + NPATH="$line" + PLUGIN=$( echo $NPATH | cut -f2 -d/ ) + PLUGIN_DIR=$( grep "${PLUGIN}\$" dirs.txt | head -1 ) + PLUGIN_BASE=$( echo $PLUGIN_DIR | sed "s/\/${PLUGIN}\$//g" | sed 's!/!.!g' ) + echo ${NPATH} | sed "s/\.\./\${${PLUGIN_BASE}\}/g" + done <<EOF + <pde.convertSchemaToHTML manifest="../org.eclipse.jdt.apt.core/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.jdt.core/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.jdt.core.manipulation/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.jdt.debug/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.jdt.debug.ui/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.jdt.junit/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.jdt.junit.core/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.jdt.launching/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.jdt.ui/plugin.xml" destination="${dest}" /> EOF } convertPDESchema () { -while read line; do - NPATH="$line" - PLUGIN=$( echo $NPATH | cut -f2 -d/ ) - PLUGIN_DIR=$( grep "${PLUGIN}\$" dirs.txt | head -1 ) - PLUGIN_BASE=$( echo $PLUGIN_DIR | sed "s/\/${PLUGIN}\$//g" | sed 's!/!.!g' ) - echo ${NPATH} | sed "s/\.\./\${${PLUGIN_BASE}\}/g" -done <<EOF - <pde.convertSchemaToHTML manifest="../org.eclipse.pde.core/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.pde.build/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.pde.ui/plugin.xml" destination="${dest}" /> - <pde.convertSchemaToHTML manifest="../org.eclipse.pde.launching/plugin.xml" destination="${dest}" /> + while read line; do + NPATH="$line" + PLUGIN=$( echo $NPATH | cut -f2 -d/ ) + PLUGIN_DIR=$( grep "${PLUGIN}\$" dirs.txt | head -1 ) + PLUGIN_BASE=$( echo $PLUGIN_DIR | sed "s/\/${PLUGIN}\$//g" | sed 's!/!.!g' ) + echo ${NPATH} | sed "s/\.\./\${${PLUGIN_BASE}\}/g" + done <<EOF + <pde.convertSchemaToHTML manifest="../org.eclipse.pde.core/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.pde.build/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.pde.ui/plugin.xml" destination="${dest}" /> + <pde.convertSchemaToHTML manifest="../org.eclipse.pde.launching/plugin.xml" destination="${dest}" /> EOF } convertPDEOptions () { -while read line; do - NPATH="$line" - PLUGIN=$( echo $NPATH | cut -f2 -d/ ) - PLUGIN_DIR=$( grep "${PLUGIN}\$" dirs.txt | head -1 ) - PLUGIN_BASE=$( echo $PLUGIN_DIR | sed "s/\/${PLUGIN}\$//g" | sed 's!/!.!g' ) - echo ${NPATH} | sed "s/\.\./@${PLUGIN_BASE}@/g" -done <<EOF -../org.eclipse.pde.core/src -;../org.eclipse.pde.ui/src -;../org.eclipse.pde.build/src -;../org.eclipse.pde.launching/src + while read line; do + NPATH="$line" + PLUGIN=$( echo $NPATH | cut -f2 -d/ ) + PLUGIN_DIR=$( grep "${PLUGIN}\$" dirs.txt | head -1 ) + PLUGIN_BASE=$( echo $PLUGIN_DIR | sed "s/\/${PLUGIN}\$//g" | sed 's!/!.!g' ) + echo ${NPATH} | sed "s/\.\./@${PLUGIN_BASE}@/g" + done <<EOF + ../org.eclipse.pde.core/src + ;../org.eclipse.pde.ui/src + ;../org.eclipse.pde.build/src + ;../org.eclipse.pde.launching/src EOF } diff --git a/production/downloadsites/eclipse/banner.html b/production/downloadsites/eclipse/banner.html index e0b922cca..b754f7f48 100755 --- a/production/downloadsites/eclipse/banner.html +++ b/production/downloadsites/eclipse/banner.html @@ -1,54 +1,54 @@ <!doctype html public "-//w3c//dtd html 4.0 transitional//en"> <html> -<head> -<title>Eclipse Banner</title> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> -<style type="text/css"> -.input { - background: "#ffffcc"; - color: "#000000"; - font-weight: normal; -} + <head> + <title>Eclipse Banner</title> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <style type="text/css"> + .input { + background: "#ffffcc"; + color: "#000000"; + font-weight: normal; + } -a.nav:link { - text-decoration: none; - color: "#000000"; -} + a.nav:link { + text-decoration: none; + color: "#000000"; + } -a.nav:visited { - text-decoration: none; - color: "#000000"; -} + a.nav:visited { + text-decoration: none; + color: "#000000"; + } -a.nav:hover { - text-decoration: underline; - color: "#000000"; -} -</style> -</head> -<body text="#ffffcc" bgcolor="#ffffff" link="#0000ee" vlink="#551a8b" + a.nav:hover { + text-decoration: underline; + color: "#000000"; + } + </style> + </head> + <body text="#ffffcc" bgcolor="#ffffff" link="#0000ee" vlink="#551a8b" alink="#ff0000"> <table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%"> - <tr> - <td WIDTH="100%"> - <table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" - BGCOLOR="#006699"> - <tr> - <td BGCOLOR="#000000" width="116"><a - href="http://www.eclipse.org" target="_top"><img - src="images/EclipseBannerPic.jpg" - width="115" height="50" border="0"></a></td> - <td WIDTH="637"><img - SRC="images/gradient.jpg" BORDER=0 height=50 - width=282></td> - <td WIDTH="250"><img - src="images/eclipse-org-simple-small.GIF" - width="250" height="48"></td> - </tr> - </table> - </td> - </tr> + <tr> + <td WIDTH="100%"> + <table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" + BGCOLOR="#006699"> + <tr> + <td BGCOLOR="#000000" width="116"><a + href="http://www.eclipse.org" target="_top"><img + src="images/EclipseBannerPic.jpg" + width="115" height="50" border="0"></a></td> + <td WIDTH="637"><img + SRC="images/gradient.jpg" BORDER=0 height=50 + width=282></td> + <td WIDTH="250"><img + src="images/eclipse-org-simple-small.GIF" + width="250" height="48"></td> + </tr> + </table> + </td> + </tr> </table> -</body> + </body> </html> diff --git a/production/downloadsites/eclipse/default_style.css b/production/downloadsites/eclipse/default_style.css index 20f5be812..9932b6927 100755 --- a/production/downloadsites/eclipse/default_style.css +++ b/production/downloadsites/eclipse/default_style.css @@ -1,70 +1,70 @@ p,table,td,th { - font-family: arial, helvetica, geneva; - font-size: 10pt + font-family: arial, helvetica, geneva; + font-size: 10pt } pre { - font-family: "Courier New", Courier, mono; - font-size: 10pt + font-family: "Courier New", Courier, mono; + font-size: 10pt } h2 { - font-family: arial, helvetica, geneva; - font-size: 18pt; - font-weight: bold; - line-height: 14px + font-family: arial, helvetica, geneva; + font-size: 18pt; + font-weight: bold; + line-height: 14px } code { - font-family: "Courier New", Courier, mono; - font-size: 10pt + font-family: "Courier New", Courier, mono; + font-size: 10pt } sup { - font-family: arial, helvetica, geneva; - font-size: 10px + font-family: arial, helvetica, geneva; + font-size: 10px } h3 { - font-family: arial, helvetica, geneva; - font-size: 14pt; - font-weight: bold + font-family: arial, helvetica, geneva; + font-size: 14pt; + font-weight: bold } li { - font-family: arial, helvetica, geneva; - font-size: 10pt + font-family: arial, helvetica, geneva; + font-size: 10pt } h1 { - font-family: arial, helvetica, geneva; - font-size: 28px; - font-weight: bold + font-family: arial, helvetica, geneva; + font-size: 28px; + font-weight: bold } body { - font-family: arial, helvetica, geneva; - font-size: 10pt; - clip: rect(); - margin-top: 5mm; - margin-left: 3mm + font-family: arial, helvetica, geneva; + font-size: 10pt; + clip: rect(); + margin-top: 5mm; + margin-left: 3mm } .indextop { - font-size: x-large;; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-weight: bold + font-size: x-large;; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-weight: bold } .indexsub { - font-size: xx-small;; - font-family: Arial, Helvetica, sans-serif; - color: #8080FF + font-size: xx-small;; + font-family: Arial, Helvetica, sans-serif; + color: #8080FF } .container_php,.container_default { - padding: 0 20px + padding: 0 20px } .container_html { - padding: 0 20px + padding: 0 20px } diff --git a/production/downloadsites/eclipse/downloads/ToolTip.css b/production/downloadsites/eclipse/downloads/ToolTip.css index a2c84cfbf..f424c2671 100644 --- a/production/downloadsites/eclipse/downloads/ToolTip.css +++ b/production/downloadsites/eclipse/downloads/ToolTip.css @@ -1,35 +1,35 @@ .hidden_tooltip { - display: none; + display: none; } span.visible_tooltip { - display: block; - position: absolute; - top: 10px; - left: 21px; - width: 300px; - font-size: 9px;; - padding-left: 5px; - padding-right: 5px; - border: 1px solid black; - background-color: #FFFFCC; - text-decoration: none; - color: #000000; - z-index: 10; + display: block; + position: absolute; + top: 10px; + left: 21px; + width: 300px; + font-size: 9px;; + padding-left: 5px; + padding-right: 5px; + border: 1px solid black; + background-color: #FFFFCC; + text-decoration: none; + color: #000000; + z-index: 10; } a { - text-decoration: none; + text-decoration: none; } span {z-index =100; - + } img,table { - z-index: 1; + z-index: 1; } .tooltipSource { - position: relative; -}
\ No newline at end of file + position: relative; +} diff --git a/production/downloadsites/eclipse/downloads/build_types.html b/production/downloadsites/eclipse/downloads/build_types.html index 88ef6d923..15a140bdd 100644 --- a/production/downloadsites/eclipse/downloads/build_types.html +++ b/production/downloadsites/eclipse/downloads/build_types.html @@ -1,133 +1,133 @@ <!doctype html public "-//w3c//dtd html 4.0 transitional//en"> <html> -<head> -<title>Build Types</title> -<link rel="stylesheet" href="../default_style.css"> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> -<meta name="keywords" content="Eclipse Build Types"> -<meta name="description" content="Eclipse Project Build Types"> -<meta name="author" content="David Williams"> -</head> -<body text="#000000" bgcolor="#ffffff" link="#0000ee" vlink="#551a8b" + <head> + <title>Build Types</title> + <link rel="stylesheet" href="../default_style.css"> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <meta name="keywords" content="Eclipse Build Types"> + <meta name="description" content="Eclipse Project Build Types"> + <meta name="author" content="David Williams"> + </head> + <body text="#000000" bgcolor="#ffffff" link="#0000ee" vlink="#551a8b" alink="#ff0000"> <table border=0 cellspacing=5 cellpadding=2 width="100%"> - <tr> - <td align=left valign=top colspan="2" bgcolor="#0080c0"><b><font - face="Arial,Helvetica" color="#ffffff">Eclipse - Project Build Types</font></b></td> - </tr> - <tr> - <td align=right valign=top><img - src="../images/Adarrow.gif" border=0 height=16 width=16></td> - <td> - <p> - <b><font face="arial,helvetica,geneva" size="-1">Releases</font></b> - <br> <font size="-1" - face="arial,helvetica,geneva"> </font>Releases - are builds that have been declared major releases by - the development team - for example "R1.0". - Releases are the right builds for people who want to - be on a stable, tested release, and don't need the - latest greatest features and improvements. Release - builds always have an "R" at the beginning - of the name i.e. R1.0, R2.0 etc. Non-release <font - size="-1" face="arial,helvetica,geneva"> - builds are named according to the date of the - build - for example 20011027 is the build from - Oct 27, 2001.</font><br> - </p> - </td> - </tr> - <tr> - <td align=right valign=top><img - src="../images/Adarrow.gif" border=0 height=16 width=16></td> - <td><b><font face="arial,helvetica,geneva" - size="-1">Stable Builds</font></b> <br> <font - size="-1" face="arial,helvetica,geneva"> Stable - builds are integration builds that have been found - to be stable enough for most people to use. They are - promoted from integration build to stable build by - the architecture team after they have been used for - a few days and deemed reasonably stable. The latest - stable build is the right build for people who want - to stay up to date with what is going on in the - latest development stream, and don't mind putting up - with a few problems n in order to get the latest - greatest features and bug fixes. The latest stable - build is the one the development team likes people - to be using, because of the valuable and timely - feedback. </font></td> - </tr> - <tr> - <td align=right valign=top><img - src="../images/Adarrow.gif" border=0 height=16 width=16></td> - <td> - <p> - <b><font face="arial,helvetica,geneva" size="-1">Integration - Builds</font></b> <br> <font size="-1" - face="arial,helvetica,geneva"> - Periodically, component teams version off their - work in what they believe is a stable, - consistent state, and they update the build - configuration to indicate that the next - integration build should take this version of - the component. Integration builds are built from - these stable component versions that have been - specified by each component team as the best - version available. Integration builds may be - promoted to stable builds after a few days of - testing. Integration builds are built whenever - new stable component versions are released into - the build.</font> - </p> - </td> - </tr> - <TR> - <TD ALIGN=right VALIGN=top><IMG - SRC="../images/Adarrow.gif" BORDER=0 HEIGHT=16 WIDTH=16></TD> - <TD><B><FONT FACE="arial,helvetica,geneva" - SIZE="-1">Nightly Builds</FONT></B><BR> <FONT - SIZE="-1" FACE="arial,helvetica,geneva"> Nightly - builds are produced every night from whatever has - been released into the master branch of the Git - repository. They are completely untested and will - almost always have major problems. Many will not - work at all. These drops are normally only useful to - developers actually working on the Eclipse Project. - Because nightly builds are produced in a different - way from integration builds, bundles from nightly - builds should not be mixed with bundles from other - types of builds. </FONT></TD> - </TR> - <TR> - <TD ALIGN=right VALIGN=top><IMG - SRC="../images/Adarrow.gif" BORDER=0 HEIGHT=16 WIDTH=16></TD> - <TD><B><FONT FACE="arial,helvetica,geneva" - SIZE="-1">Maintenance Builds</FONT></B><BR> <FONT - SIZE="-1" FACE="arial,helvetica,geneva"> - Maintenance builds are produced periodically to - incorporate fixes into an existing release. They are - typically built from tagged plug-in and feature - pojects in a maintenance branch of the Git - repository (i.e. R3_7_maintenance). Maintenance - builds are promoted to a minor or service release - (i.e. R3.7 or R3.7.1) after development teams have - deemed one to be stable following one or more - test-fix pass cycles. </FONT></TD> - </TR> - <TR> - <TD ALIGN=right VALIGN=top><IMG - SRC="../images/Adarrow.gif" BORDER=0 HEIGHT=16 WIDTH=16></TD> - <TD><B><FONT FACE="arial,helvetica,geneva" - SIZE="-1">Patch Builds</FONT></B><BR> <FONT - SIZE="-1" FACE="arial,helvetica,geneva"> - Patch builds are produced rarely, but occasionally, to - incorporate important fixes into an existing release, or perhaps - even new features. They are intended to apply to only one specific - release with the fixes or features being included in the next release. - </FONT></TD> - </TR> - </table> + <tr> + <td align=left valign=top colspan="2" bgcolor="#0080c0"><b><font + face="Arial,Helvetica" color="#ffffff">Eclipse + Project Build Types</font></b></td> + </tr> + <tr> + <td align=right valign=top><img + src="../images/Adarrow.gif" border=0 height=16 width=16></td> + <td> + <p> + <b><font face="arial,helvetica,geneva" size="-1">Releases</font></b> + <br> <font size="-1" + face="arial,helvetica,geneva"> </font>Releases + are builds that have been declared major releases by + the development team - for example "R1.0". + Releases are the right builds for people who want to + be on a stable, tested release, and don't need the + latest greatest features and improvements. Release + builds always have an "R" at the beginning + of the name i.e. R1.0, R2.0 etc. Non-release <font + size="-1" face="arial,helvetica,geneva"> + builds are named according to the date of the + build - for example 20011027 is the build from + Oct 27, 2001.</font><br> + </p> + </td> + </tr> + <tr> + <td align=right valign=top><img + src="../images/Adarrow.gif" border=0 height=16 width=16></td> + <td><b><font face="arial,helvetica,geneva" + size="-1">Stable Builds</font></b> <br> <font + size="-1" face="arial,helvetica,geneva"> Stable + builds are integration builds that have been found + to be stable enough for most people to use. They are + promoted from integration build to stable build by + the architecture team after they have been used for + a few days and deemed reasonably stable. The latest + stable build is the right build for people who want + to stay up to date with what is going on in the + latest development stream, and don't mind putting up + with a few problems n in order to get the latest + greatest features and bug fixes. The latest stable + build is the one the development team likes people + to be using, because of the valuable and timely + feedback. </font></td> + </tr> + <tr> + <td align=right valign=top><img + src="../images/Adarrow.gif" border=0 height=16 width=16></td> + <td> + <p> + <b><font face="arial,helvetica,geneva" size="-1">Integration + Builds</font></b> <br> <font size="-1" + face="arial,helvetica,geneva"> + Periodically, component teams version off their + work in what they believe is a stable, + consistent state, and they update the build + configuration to indicate that the next + integration build should take this version of + the component. Integration builds are built from + these stable component versions that have been + specified by each component team as the best + version available. Integration builds may be + promoted to stable builds after a few days of + testing. Integration builds are built whenever + new stable component versions are released into + the build.</font> + </p> + </td> + </tr> + <TR> + <TD ALIGN=right VALIGN=top><IMG + SRC="../images/Adarrow.gif" BORDER=0 HEIGHT=16 WIDTH=16></TD> + <TD><B><FONT FACE="arial,helvetica,geneva" + SIZE="-1">Nightly Builds</FONT></B><BR> <FONT + SIZE="-1" FACE="arial,helvetica,geneva"> Nightly + builds are produced every night from whatever has + been released into the master branch of the Git + repository. They are completely untested and will + almost always have major problems. Many will not + work at all. These drops are normally only useful to + developers actually working on the Eclipse Project. + Because nightly builds are produced in a different + way from integration builds, bundles from nightly + builds should not be mixed with bundles from other + types of builds. </FONT></TD> + </TR> + <TR> + <TD ALIGN=right VALIGN=top><IMG + SRC="../images/Adarrow.gif" BORDER=0 HEIGHT=16 WIDTH=16></TD> + <TD><B><FONT FACE="arial,helvetica,geneva" + SIZE="-1">Maintenance Builds</FONT></B><BR> <FONT + SIZE="-1" FACE="arial,helvetica,geneva"> + Maintenance builds are produced periodically to + incorporate fixes into an existing release. They are + typically built from tagged plug-in and feature + pojects in a maintenance branch of the Git + repository (i.e. R3_7_maintenance). Maintenance + builds are promoted to a minor or service release + (i.e. R3.7 or R3.7.1) after development teams have + deemed one to be stable following one or more + test-fix pass cycles. </FONT></TD> + </TR> + <TR> + <TD ALIGN=right VALIGN=top><IMG + SRC="../images/Adarrow.gif" BORDER=0 HEIGHT=16 WIDTH=16></TD> + <TD><B><FONT FACE="arial,helvetica,geneva" + SIZE="-1">Patch Builds</FONT></B><BR> <FONT + SIZE="-1" FACE="arial,helvetica,geneva"> + Patch builds are produced rarely, but occasionally, to + incorporate important fixes into an existing release, or perhaps + even new features. They are intended to apply to only one specific + release with the fixes or features being included in the next release. + </FONT></TD> + </TR> + </table> <h3> </h3> -</body> + </body> </html> diff --git a/production/downloadsites/eclipse/downloads/createIndex3x.php b/production/downloadsites/eclipse/downloads/createIndex3x.php index 37d88acc4..1c38fce89 100644 --- a/production/downloadsites/eclipse/downloads/createIndex3x.php +++ b/production/downloadsites/eclipse/downloads/createIndex3x.php @@ -1,4 +1,4 @@ -<?php +<?php # Begin: page-specific settings. Change these. $pageTitle = "Eclipse Project Downloads"; $pageKeywords = ""; @@ -19,31 +19,31 @@ ob_start(); switch($layout){ case 'html': - #If this file is not on download.eclipse.org print the legacy headers.?> + #If this file is not on download.eclipse.org print the legacy headers.?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <link rel="stylesheet" href="../default_style.css" /> <title><?php echo $pageTitle;?></title> -<!-- -note, for Nova (default) secion below, this 'refresh' -header is hadded 'by hand' after nova version is created ... +<!-- +note, for Nova (default) secion below, this 'refresh' +header is hadded 'by hand' after nova version is created ... since it generates its own 'header section' --> <meta http-equiv="refresh" content="10; URL=index.html"> </head> <body><?php - break; + break; default: - #Otherwise use the default layout (content printed inside the nova theme). - require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); - require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); - require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); - $App = new App(); - $Nav = new Nav(); - $Menu = new Menu(); - break; + #Otherwise use the default layout (content printed inside the nova theme). + require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); + require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); + require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); + $App = new App(); + $Nav = new Nav(); + $Menu = new Menu(); + break; }?> <div class="container_<?php echo $layout;?>"> <table border="0" cellspacing="5" cellpadding="2" width="100%" > @@ -61,42 +61,42 @@ default: <table border="0" cellspacing="5" cellpadding="2" width="100%" > <tr> -<td align="left" valign="top" colspan="2" bgcolor="#0080C0"><font color="#FFFFFF" face="Arial,Helvetica">3.8.x +<td align="left" valign="top" colspan="2" bgcolor="#0080C0"><font color="#FFFFFF" face="Arial,Helvetica">3.8.x Downloads</font></td></tr> <!-- The Eclipse Projects --> <tr> <td> <p>The build that used to be here has been moved to -<a href="http://archive.eclipse.org/eclipse/downloads/">archived builds</a>. +<a href="http://archive.eclipse.org/eclipse/downloads/">archived builds</a>. Specifically, for the last 3.8.x build see the <a href="http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/">3.8.2 build</a> there.</p> -<p>You should be re-directed within 10 seconds to the page for -<a href="http://download.eclipse.org/eclipse/downloads/">the most recent Eclipse builds</a>. If not, +<p>You should be re-directed within 10 seconds to the page for +<a href="http://download.eclipse.org/eclipse/downloads/">the most recent Eclipse builds</a>. If not, simply click on the link. Please update your bookmarks.</p> <p>This page -has been left in place for now, in case some have it bookmarked, but soon this +has been left in place for now, in case some have it bookmarked, but soon this page itself will be removed (so update your bookmarks, as well as your build scripts, if needed).</p> </td></tr> </table> -<?php +<?php - echo '</div>'; + echo '</div>'; $html = ob_get_clean(); switch($layout){ case 'html': - #echo the computed content with the body and html closing tag. This is for the old layout. - echo $html; - echo '</body>'; - echo '</html>'; - break; + #echo the computed content with the body and html closing tag. This is for the old layout. + echo $html; + echo '</body>'; + echo '</html>'; + break; default: - #For the default view we use $App->generatePage to generate the page inside nova. - $App->AddExtraHtmlHeader('<link rel="stylesheet" href="../default_style.css" />'); - $App->Promotion = FALSE; - $App->generatePage('Nova', $Menu, NULL , $pageAuthor, $pageKeywords, $pageTitle, $html); - break; + #For the default view we use $App->generatePage to generate the page inside nova. + $App->AddExtraHtmlHeader('<link rel="stylesheet" href="../default_style.css" />'); + $App->Promotion = FALSE; + $App->generatePage('Nova', $Menu, NULL , $pageAuthor, $pageKeywords, $pageTitle, $html); + break; } diff --git a/production/downloadsites/eclipse/downloads/createIndex4x.php b/production/downloadsites/eclipse/downloads/createIndex4x.php index b4262c79a..89a8769e8 100644 --- a/production/downloadsites/eclipse/downloads/createIndex4x.php +++ b/production/downloadsites/eclipse/downloads/createIndex4x.php @@ -17,7 +17,7 @@ ob_start(); switch($layout){ case 'html': - #If this file is not on download.eclipse.org print the legacy headers. + #If this file is not on download.eclipse.org print the legacy headers. ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> @@ -44,16 +44,16 @@ td { <body> <?php - break; + break; default: - #Otherwise use the default layout (content printed inside the nova theme). - require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); - require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); - require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); - $App = new App(); - $Nav = new Nav(); - $Menu = new Menu(); - break; + #Otherwise use the default layout (content printed inside the nova theme). + require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); + require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); + require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); + $App = new App(); + $Nav = new Nav(); + $Menu = new Menu(); + break; }?> <div class="container_<?php echo $layout;?>"> <table width="100%" style="border-spacing:2px;"> @@ -123,186 +123,186 @@ Downloads</font> <?php - function startsWithDropPrefix($dirName, $dropPrefix) - { - - $result = false; - // sanity check "setup" is as we expect - if (isset($dropPrefix) && is_array($dropPrefix)) { - // sanity check input - if (isset($dirName) && strlen($dirName) > 0) { - $firstChar = substr($dirName, 0, 1); - //echo "first char: ".$firstChar; - foreach($dropPrefix as $type) { - if ($firstChar == "$type") { - $result = true; - break; - } - } - } - } - else { - echo "dropPrefix not defined as expected\n"; + function startsWithDropPrefix($dirName, $dropPrefix) + { + + $result = false; + // sanity check "setup" is as we expect + if (isset($dropPrefix) && is_array($dropPrefix)) { + // sanity check input + if (isset($dirName) && strlen($dirName) > 0) { + $firstChar = substr($dirName, 0, 1); + //echo "first char: ".$firstChar; + foreach($dropPrefix as $type) { + if ($firstChar == "$type") { + $result = true; + break; + } } - return $result; + } + } + else { + echo "dropPrefix not defined as expected\n"; } + return $result; + } function runTestBoxes($buildName, $testResultsDirName) { - // hard code for now the tests ran on one box (or, zero, if no testResultsDirName yet) - // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378706 - //if ($testResultsDirName === "" ) { - // return 0; - //} else { - // return 1; - //} - global $subdirDrops; - $testBoxes=array("linux", "macosx", "win32"); - $length=count($testBoxes); - $boxes=0; - if (file_exists("$subdirDrops/$buildName/buildproperties.php")) { - // be sure any previous are reset - unset ($BUILD_FAILED); - include "$subdirDrops/$buildName/buildproperties.php"; - if (isset ($BUILD_FAILED) && strlen($BUILD_FAILED) > 0) { - $boxes=-1; - unset ($BUILD_FAILED); - } + // hard code for now the tests ran on one box (or, zero, if no testResultsDirName yet) + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378706 + //if ($testResultsDirName === "" ) { + // return 0; + //} else { + // return 1; + //} + global $subdirDrops; + $testBoxes=array("linux", "macosx", "win32"); + $length=count($testBoxes); + $boxes=0; + if (file_exists("$subdirDrops/$buildName/buildproperties.php")) { + // be sure any previous are reset + unset ($BUILD_FAILED); + include "$subdirDrops/$buildName/buildproperties.php"; + if (isset ($BUILD_FAILED) && strlen($BUILD_FAILED) > 0) { + $boxes=-1; + unset ($BUILD_FAILED); } - if ($boxes != -1) { - - // TEMP? appears "old style" builds had directories named "results", but now "testresults" - // and we want to look in $testResultsDirName/consolelogs - if (file_exists("$subdirDrops/$buildName/$testResultsDirName/consolelogs")) { - $buildDir = dir("$subdirDrops/$buildName/$testResultsDirName/consolelogs"); - while ($file = $buildDir->read()) { - for ($i = 0 ; $i < $length ; $i++) { - if (strncmp($file, $testBoxes[$i], count($testBoxes[$i])) == 0) { - $boxes++; - break; - } - } - } + } + if ($boxes != -1) { + + // TEMP? appears "old style" builds had directories named "results", but now "testresults" + // and we want to look in $testResultsDirName/consolelogs + if (file_exists("$subdirDrops/$buildName/$testResultsDirName/consolelogs")) { + $buildDir = dir("$subdirDrops/$buildName/$testResultsDirName/consolelogs"); + while ($file = $buildDir->read()) { + for ($i = 0 ; $i < $length ; $i++) { + if (strncmp($file, $testBoxes[$i], count($testBoxes[$i])) == 0) { + $boxes++; + break; + } } + } } - //echo "boxes: $boxes"; - return $boxes; + } + //echo "boxes: $boxes"; + return $boxes; } function printBuildColumns($fileName, $parts) { - global $subdirDrops; - // no file name, write empty column - if ($fileName == "") { - echo "<td align=\"left\" width=\"25%\"> </td>\n"; - return; - } - // get build name, date and time - $dropDir="$subdirDrops/$fileName"; - if (count($parts)==3) { - $buildName=$parts[1]; - $buildDay=intval(substr($parts[2], 0, 8)); - $buildTime=intval(substr($parts[2], 8, 4)); - $buildType=$parts[0]; - } - if (count($parts)==2) { - $buildName=$fileName; - $buildDay=intval(substr($buildName, 1, 8)); - $buildTime=intval(substr($buildName, 10, 2))*60+intval(substr($buildName, 12, 2)); - $buildType=substr($buildName, 0, 1); - } - // compute minutes elapsed since build started - $day=intval(date("Ymd")); - $time=intval(date("H"))*60+intval(date("i")); - $diff=($day-$buildDay)*24*60+$time-$buildTime; - // Add icons - echo "<td align=\"left\" width=\"25%\">\n"; - // hard code for now the build is done - // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378706 - // but later, changed ... - // compute build done based on "buildPending" file, but if not - // present, assume build is done - // https://bugs.eclipse.org/bugs/show_bug.cgi?id=382196 - $build_done=true; - if (file_exists("$dropDir/buildPending")) { - $build_done=false; + global $subdirDrops; + // no file name, write empty column + if ($fileName == "") { + echo "<td align=\"left\" width=\"25%\"> </td>\n"; + return; + } + // get build name, date and time + $dropDir="$subdirDrops/$fileName"; + if (count($parts)==3) { + $buildName=$parts[1]; + $buildDay=intval(substr($parts[2], 0, 8)); + $buildTime=intval(substr($parts[2], 8, 4)); + $buildType=$parts[0]; + } + if (count($parts)==2) { + $buildName=$fileName; + $buildDay=intval(substr($buildName, 1, 8)); + $buildTime=intval(substr($buildName, 10, 2))*60+intval(substr($buildName, 12, 2)); + $buildType=substr($buildName, 0, 1); + } + // compute minutes elapsed since build started + $day=intval(date("Ymd")); + $time=intval(date("H"))*60+intval(date("i")); + $diff=($day-$buildDay)*24*60+$time-$buildTime; + // Add icons + echo "<td align=\"left\" width=\"25%\">\n"; + // hard code for now the build is done + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378706 + // but later, changed ... + // compute build done based on "buildPending" file, but if not + // present, assume build is done + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=382196 + $build_done=true; + if (file_exists("$dropDir/buildPending")) { + $build_done=false; + } + if ($build_done) { + // test results location changed. 'testresults' is new standard + // but we check for 'results' for older stuff. + // https://bugs.eclipse.org/bugs/show_bug.cgi?id=379408 + $testResultsDirName=""; + if (file_exists("$dropDir/testresults")) { + $testResultsDirName="testresults"; + } else { + if (file_exists("$dropDir/results")) { + $testResultsDirName="results"; + } } - if ($build_done) { - // test results location changed. 'testresults' is new standard - // but we check for 'results' for older stuff. - // https://bugs.eclipse.org/bugs/show_bug.cgi?id=379408 - $testResultsDirName=""; - if (file_exists("$dropDir/testresults")) { - $testResultsDirName="testresults"; - } else { - if (file_exists("$dropDir/results")) { - $testResultsDirName="results"; - } - } - $boxes=runTestBoxes($fileName, $testResultsDirName); - // boses == -1 is code that "bulid failed" and no tests are expected. - if ($boxes == -1) { - $buildimage="build_failed.gif"; - $buildalt="Build failed"; - } else { - $buildimage="build_done.gif"; - $buildalt="Build is available"; - } - echo "<a href=\"$dropDir/\"><img style=\"border:0px\" src=\"../images/$buildimage\" title=\"$buildalt\" alt=\"$buildalt\" /></a>\n"; - - // hard code here, for now, but make come from property file, later - $expectedTestBoxes=3; + $boxes=runTestBoxes($fileName, $testResultsDirName); + // boses == -1 is code that "bulid failed" and no tests are expected. + if ($boxes == -1) { + $buildimage="build_failed.gif"; + $buildalt="Build failed"; + } else { + $buildimage="build_done.gif"; + $buildalt="Build is available"; + } + echo "<a href=\"$dropDir/\"><img style=\"border:0px\" src=\"../images/$buildimage\" title=\"$buildalt\" alt=\"$buildalt\" /></a>\n"; - // We skip the main "tests" part for patch builds, since don't expect any (for now). - if ($buildType !== "P") { + // hard code here, for now, but make come from property file, later + $expectedTestBoxes=3; - // always put in links, since someone may want to look at logs, even if not tests results, per se - // don't forget to end link, after images decided. - $boxesTitle=""; - if ($boxes > -1) { - $boxesTitle=$boxes." of ".$expectedTestBoxes." test platforms finished."; - } - if ($testResultsDirName === "results") { - echo "<a href=\"$dropDir/results/testResults.html\" title=\"$boxesTitle\" style=\"text-decoration: none\">"; - } else { - echo "<a href=\"$dropDir/testResults.php\" title=\"$boxesTitle\" style=\"text-decoration: none\">"; - } + // We skip the main "tests" part for patch builds, since don't expect any (for now). + if ($buildType !== "P") { - if ($boxes == -1) { - $testimage="caution.gif"; - $testalt="Integration tests did not run due to failed build"; - } elseif ($boxes == 0 && $diff > 720) { - // assume if no results at all, after 12 hours, assume they didn't run for unknown reasosn - $testimage="caution.gif"; - $testalt="Integration tests did not run, due to unknown reasons."; - } elseif ($boxes > 0 && $boxes < $expectedTestBoxes) { - if ($diff > 1440) { - $testimage="junit.gif"; - $testalt="Tests results are available but did not finish on all machines"; - } else { - $testimage="runtests.gif"; - $testalt="Integration tests are running ..."; - } - } elseif ($boxes == $expectedTestBoxes) { - $testimage="junit.gif"; - $testalt="Tests results are available"; - } else { - $testimage="runtests.gif"; - $testalt="Integration tests are running ..."; - } - echo "<img style=\"border:0px\" src=\"../images/$testimage\" title=\"$testalt\" alt=\"$testalt\" />"; - if ($boxes > -1) { - echo " (".$boxes." of ".$expectedTestBoxes." platforms)"; - } - echo "</a>\n"; + // always put in links, since someone may want to look at logs, even if not tests results, per se + // don't forget to end link, after images decided. + $boxesTitle=""; + if ($boxes > -1) { + $boxesTitle=$boxes." of ".$expectedTestBoxes." test platforms finished."; + } + if ($testResultsDirName === "results") { + echo "<a href=\"$dropDir/results/testResults.html\" title=\"$boxesTitle\" style=\"text-decoration: none\">"; } else { echo "<a href=\"$dropDir/testResults.php\" title=\"$boxesTitle\" style=\"text-decoration: none\">"; - $testimage="results.gif"; - $testalt="Logs from build"; - echo "<img style=\"border:0px\" src=\"../images/$testimage\" title=\"$testalt\" alt=\"$testalt\" />"; - echo " (No automated tests)"; - echo "</a>\n"; } + + if ($boxes == -1) { + $testimage="caution.gif"; + $testalt="Integration tests did not run due to failed build"; + } elseif ($boxes == 0 && $diff > 720) { + // assume if no results at all, after 12 hours, assume they didn't run for unknown reasosn + $testimage="caution.gif"; + $testalt="Integration tests did not run, due to unknown reasons."; + } elseif ($boxes > 0 && $boxes < $expectedTestBoxes) { + if ($diff > 1440) { + $testimage="junit.gif"; + $testalt="Tests results are available but did not finish on all machines"; + } else { + $testimage="runtests.gif"; + $testalt="Integration tests are running ..."; + } + } elseif ($boxes == $expectedTestBoxes) { + $testimage="junit.gif"; + $testalt="Tests results are available"; + } else { + $testimage="runtests.gif"; + $testalt="Integration tests are running ..."; + } + echo "<img style=\"border:0px\" src=\"../images/$testimage\" title=\"$testalt\" alt=\"$testalt\" />"; + if ($boxes > -1) { + echo " (".$boxes." of ".$expectedTestBoxes." platforms)"; + } + echo "</a>\n"; + } else { + echo "<a href=\"$dropDir/testResults.php\" title=\"$boxesTitle\" style=\"text-decoration: none\">"; + $testimage="results.gif"; + $testalt="Logs from build"; + echo "<img style=\"border:0px\" src=\"../images/$testimage\" title=\"$testalt\" alt=\"$testalt\" />"; + echo " (No automated tests)"; + echo "</a>\n"; } - echo "</td>\n"; - return $buildName; + } + echo "</td>\n"; + return $buildName; } ?> <?php @@ -347,70 +347,70 @@ function printBuildColumns($fileName, $parts) { $aDirectory = dir($subdirDrops); while ($anEntry = $aDirectory->read()) { - // Short cut because we know aDirectory only contains other directories. - - if ($anEntry != "." && $anEntry!=".." && $anEntry!="TIME" && startsWithDropPrefix($anEntry,$dropPrefix)) { - $parts = explode("-", $anEntry); - // echo "<p>an entry: $anEntry\n"; - // do not count hidden directories in computation - // allows non-hidden ones to still show up as "most recent" else will be blank. - if (!file_exists($subdirDrops."/".$anEntry."/buildHidden")) { - if (count($parts) == 3) { - - //$buckets[$parts[0]][] = $anEntry; - - $timePart = $parts[2]; - $year = substr($timePart, 0, 4); - $month = substr($timePart, 4, 2); - $day = substr($timePart, 6, 2); - $hour = substr($timePart,8,2); - $minute = substr($timePart,10,2); - // special logic adds 1 second if build id contains "RC" ... this was - // added for the M build case, where there is an M build and and RC version that - // have same time stamp. One second should not effect desplayed values. - $isRC = strpos($anEntry, "RC"); - if ($isRC === false) { - $timeStamp = mktime($hour, $minute, 0, $month, $day, $year); - } else { - $timeStamp = mktime($hour, $minute, 1, $month, $day, $year); - } - $buckets[$parts[0]][$timeStamp] = $anEntry; - $timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp); - // latestTimeStamp will not be defined, first time through - if (!isset($latestTimeStamp) || !array_key_exists($parts[0],$latestTimeStamp) || $timeStamp > $latestTimeStamp[$parts[0]]) { - $latestTimeStamp[$parts[0]] = $timeStamp; - $latestFile[$parts[0]] = $anEntry; - } - } - - if (count($parts) == 2) { - - $buildType=substr($parts[0],0,1); - //$buckets[$buildType][] = $anEntry; - $datePart = substr($parts[0],1); - $timePart = $parts[1]; - $year = substr($datePart, 0, 4); - $month = substr($datePart, 4, 2); - $day = substr($datePart, 6, 2); - $hour = substr($timePart,0,2); - $minute = substr($timePart,2,2); - $isRC = strpos($anEntry, "RC"); - if ($isRC === false) { - $timeStamp = mktime($hour, $minute, 0, $month, $day, $year); - } else { - $timeStamp = mktime($hour, $minute, 1, $month, $day, $year); - } - $buckets[$buildType[0]][$timeStamp] = $anEntry; - - $timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp); - - if (!isset($latestTimeStamp) || !array_key_exists($buildType,$latestTimeStamp) || $timeStamp > $latestTimeStamp[$buildType]) { - $latestTimeStamp[$buildType] = $timeStamp; - $latestFile[$buildType] = $anEntry; - } - } + // Short cut because we know aDirectory only contains other directories. + + if ($anEntry != "." && $anEntry!=".." && $anEntry!="TIME" && startsWithDropPrefix($anEntry,$dropPrefix)) { + $parts = explode("-", $anEntry); + // echo "<p>an entry: $anEntry\n"; + // do not count hidden directories in computation + // allows non-hidden ones to still show up as "most recent" else will be blank. + if (!file_exists($subdirDrops."/".$anEntry."/buildHidden")) { + if (count($parts) == 3) { + + //$buckets[$parts[0]][] = $anEntry; + + $timePart = $parts[2]; + $year = substr($timePart, 0, 4); + $month = substr($timePart, 4, 2); + $day = substr($timePart, 6, 2); + $hour = substr($timePart,8,2); + $minute = substr($timePart,10,2); + // special logic adds 1 second if build id contains "RC" ... this was + // added for the M build case, where there is an M build and and RC version that + // have same time stamp. One second should not effect desplayed values. + $isRC = strpos($anEntry, "RC"); + if ($isRC === false) { + $timeStamp = mktime($hour, $minute, 0, $month, $day, $year); + } else { + $timeStamp = mktime($hour, $minute, 1, $month, $day, $year); + } + $buckets[$parts[0]][$timeStamp] = $anEntry; + $timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp); + // latestTimeStamp will not be defined, first time through + if (!isset($latestTimeStamp) || !array_key_exists($parts[0],$latestTimeStamp) || $timeStamp > $latestTimeStamp[$parts[0]]) { + $latestTimeStamp[$parts[0]] = $timeStamp; + $latestFile[$parts[0]] = $anEntry; + } + } + + if (count($parts) == 2) { + + $buildType=substr($parts[0],0,1); + //$buckets[$buildType][] = $anEntry; + $datePart = substr($parts[0],1); + $timePart = $parts[1]; + $year = substr($datePart, 0, 4); + $month = substr($datePart, 4, 2); + $day = substr($datePart, 6, 2); + $hour = substr($timePart,0,2); + $minute = substr($timePart,2,2); + $isRC = strpos($anEntry, "RC"); + if ($isRC === false) { + $timeStamp = mktime($hour, $minute, 0, $month, $day, $year); + } else { + $timeStamp = mktime($hour, $minute, 1, $month, $day, $year); + } + $buckets[$buildType[0]][$timeStamp] = $anEntry; + + $timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp); + + if (!isset($latestTimeStamp) || !array_key_exists($buildType,$latestTimeStamp) || $timeStamp > $latestTimeStamp[$buildType]) { + $latestTimeStamp[$buildType] = $timeStamp; + $latestFile[$buildType] = $anEntry; } + } } + } } ?> @@ -431,43 +431,43 @@ while ($anEntry = $aDirectory->read()) { <?php foreach($dropType as $value) { - $prefix=$typeToPrefix[$value]; - // if empty bucket, do not print this row - if (array_key_exists($prefix,$buckets)) { + $prefix=$typeToPrefix[$value]; + // if empty bucket, do not print this row + if (array_key_exists($prefix,$buckets)) { - if (array_key_exists($prefix,$latestFile)) { - $fileName = $latestFile[$prefix]; - } - $parts = explode("-", $fileName); + if (array_key_exists($prefix,$latestFile)) { + $fileName = $latestFile[$prefix]; + } + $parts = explode("-", $fileName); - // Uncomment the line below if we need click through licenses. - // echo "<td><a href=license.php?license=$subdirDrops/$fileName>$parts[1]</a></td>\n"; + // Uncomment the line below if we need click through licenses. + // echo "<td><a href=license.php?license=$subdirDrops/$fileName>$parts[1]</a></td>\n"; - // Comment the line below if we need click through licenses. + // Comment the line below if we need click through licenses. - $buildName=$fileName; - if (count($parts)==3) { - $buildName=$parts[1]; - } - if (!file_exists($subdirDrops."/".$fileName."/buildHidden")) { - echo "<tr>\n"; - // echo "<td align=\"left\" width=\"20%\">$value</td>\n"; - if ($fileName == "") { - echo "<td align=\"left\" width=\"15%\"> </td>\n"; - } else { - // Note: '$value' basically comes from dlconfig4.php and serves two purposes: - // 1) the "tool tip" when hovering over the "Latest" build. - // 2) the "title bar" of remaining sections. - // In other words dlconfig4.php would have to be expanded if we ever wanted - // "tool tip" and "section title" to be (slightly) different from each other. - echo "<td align=\"left\" width=\"15%\"><a href=\"$subdirDrops/$fileName/\" title=\"$value\">$buildName</a></td>\n"; - } - $buildName = printBuildColumns($fileName, $parts); - echo "<td align=\"left\" width=\"40%\">$timeStamps[$fileName]</td>\n"; - echo "</tr>\n"; - } + $buildName=$fileName; + if (count($parts)==3) { + $buildName=$parts[1]; } + if (!file_exists($subdirDrops."/".$fileName."/buildHidden")) { + echo "<tr>\n"; + // echo "<td align=\"left\" width=\"20%\">$value</td>\n"; + if ($fileName == "") { + echo "<td align=\"left\" width=\"15%\"> </td>\n"; + } else { + // Note: '$value' basically comes from dlconfig4.php and serves two purposes: + // 1) the "tool tip" when hovering over the "Latest" build. + // 2) the "title bar" of remaining sections. + // In other words dlconfig4.php would have to be expanded if we ever wanted + // "tool tip" and "section title" to be (slightly) different from each other. + echo "<td align=\"left\" width=\"15%\"><a href=\"$subdirDrops/$fileName/\" title=\"$value\">$buildName</a></td>\n"; + } + $buildName = printBuildColumns($fileName, $parts); + echo "<td align=\"left\" width=\"40%\">$timeStamps[$fileName]</td>\n"; + echo "</tr>\n"; + } + } } ?> </td> @@ -479,67 +479,67 @@ foreach($dropType as $value) { <?php foreach($dropType as $value) { - $prefix=$typeToPrefix[$value]; - // skip whole section, if bucket is empty - if (array_key_exists($prefix,$buckets)) { - - echo "<table width=\"100%\">\n"; - // header, colored row - echo "<tr bgcolor=\"#999999\">\n"; - // name attribute can have no spaces, so we tranlate them to underscores - // (could effect targeted links) - $valueName=strtr($value,' ','_'); - echo "<td align=\"left\" width=\"100%\"><a name=\"$valueName\">\n"; - echo "<font color=\"#FFFFFF\" face=\"Arial,Helvetica\">$value\n"; - echo "</font></a></td>\n"; - echo "</tr>\n"; - echo "</table>"; - - // echo "<tr>\n"; - // echo "<td>\n"; - //echo "<br/>\n"; - echo "<table width=\"100%\">\n"; - echo "<tr>\n"; - - // first cell blank, for alignment with top block - //echo "<th align=\"left\" width=\"20%\"></th>"; - echo "<th align=\"left\" width=\"15%\">Build Name</th>\n"; - echo "<th align=\"left\" width=\"25%\">Build Status</th>\n"; - echo "<th align=\"left\" width=\"40%\">Build Date</th>\n"; - - echo "</tr>\n"; - $aBucket = $buckets[$prefix]; - if (isset($aBucket)) { - krsort($aBucket); - foreach($aBucket as $innerValue) { - - if (!file_exists($subdirDrops."/".$innerValue."/buildHidden")) { - - $parts = explode("-", $innerValue); - - echo "<tr>\n"; - //echo "<td align=\"left\" width=\"20%\"> </td>\n"; - // Uncomment the line below if we need click through licenses. - // echo "<td><a href=\"license.php?license=$subdirDrops/$innerValue\">$parts[1]</a></td>\n"; - - // Comment the line below if we need click through licenses. - $buildName=$innerValue; - if (count ($parts)==3) { - echo "<td align=\"left\" width=\"15%\"><a href=\"$subdirDrops/$innerValue/\">$parts[1]</a></td>\n"; - } else if (count ($parts)==2) { - echo "<td align=\"left\" width=\"15%\"><a href=\"$subdirDrops/$innerValue/\">$innerValue</a></td>\n"; - } else { - echo "<td align=\"left\" width=\"15%\">Unexpected numberof parts?</td>\n"; - } - - $buildName = printBuildColumns($innerValue, $parts); - echo "<td align=\"left\" width=\"40%\">$timeStamps[$innerValue]</td>\n"; - echo "</tr>\n"; - } - } + $prefix=$typeToPrefix[$value]; + // skip whole section, if bucket is empty + if (array_key_exists($prefix,$buckets)) { + + echo "<table width=\"100%\">\n"; + // header, colored row + echo "<tr bgcolor=\"#999999\">\n"; + // name attribute can have no spaces, so we tranlate them to underscores + // (could effect targeted links) + $valueName=strtr($value,' ','_'); + echo "<td align=\"left\" width=\"100%\"><a name=\"$valueName\">\n"; + echo "<font color=\"#FFFFFF\" face=\"Arial,Helvetica\">$value\n"; + echo "</font></a></td>\n"; + echo "</tr>\n"; + echo "</table>"; + + // echo "<tr>\n"; + // echo "<td>\n"; + //echo "<br/>\n"; + echo "<table width=\"100%\">\n"; + echo "<tr>\n"; + + // first cell blank, for alignment with top block + //echo "<th align=\"left\" width=\"20%\"></th>"; + echo "<th align=\"left\" width=\"15%\">Build Name</th>\n"; + echo "<th align=\"left\" width=\"25%\">Build Status</th>\n"; + echo "<th align=\"left\" width=\"40%\">Build Date</th>\n"; + + echo "</tr>\n"; + $aBucket = $buckets[$prefix]; + if (isset($aBucket)) { + krsort($aBucket); + foreach($aBucket as $innerValue) { + + if (!file_exists($subdirDrops."/".$innerValue."/buildHidden")) { + + $parts = explode("-", $innerValue); + + echo "<tr>\n"; + //echo "<td align=\"left\" width=\"20%\"> </td>\n"; + // Uncomment the line below if we need click through licenses. + // echo "<td><a href=\"license.php?license=$subdirDrops/$innerValue\">$parts[1]</a></td>\n"; + + // Comment the line below if we need click through licenses. + $buildName=$innerValue; + if (count ($parts)==3) { + echo "<td align=\"left\" width=\"15%\"><a href=\"$subdirDrops/$innerValue/\">$parts[1]</a></td>\n"; + } else if (count ($parts)==2) { + echo "<td align=\"left\" width=\"15%\"><a href=\"$subdirDrops/$innerValue/\">$innerValue</a></td>\n"; + } else { + echo "<td align=\"left\" width=\"15%\">Unexpected numberof parts?</td>\n"; + } + + $buildName = printBuildColumns($innerValue, $parts); + echo "<td align=\"left\" width=\"40%\">$timeStamps[$innerValue]</td>\n"; + echo "</tr>\n"; } - echo "</table>\n"; + } } + echo "</table>\n"; + } } echo "<hr>"; echo "<p style=\"text-align:center;font-style:italic;\">All downloads are provided under the terms and conditions of the <a href=\"http://www.eclipse.org/legal/epl/notice.php\" target=\"_top\">Eclipse Foundation Software User Agreement</a> unless otherwise specified.</p>"; @@ -549,16 +549,16 @@ $html = ob_get_clean(); switch($layout){ case 'html': - #echo the computed content with the body and html closing tag. This is for the old layout. - echo $html; - echo '</body>'; - echo '</html>'; - break; + #echo the computed content with the body and html closing tag. This is for the old layout. + echo $html; + echo '</body>'; + echo '</html>'; + break; default: - #For the default view we use $App->generatePage to generate the page inside nova. - $App->AddExtraHtmlHeader('<link rel="stylesheet" href="../default_style.css" />'); - $App->Promotion = FALSE; - $App->generatePage('Nova', $Menu, NULL , $pageAuthor, $pageKeywords, $pageTitle, $html); - break; + #For the default view we use $App->generatePage to generate the page inside nova. + $App->AddExtraHtmlHeader('<link rel="stylesheet" href="../default_style.css" />'); + $App->Promotion = FALSE; + $App->generatePage('Nova', $Menu, NULL , $pageAuthor, $pageKeywords, $pageTitle, $html); + break; } diff --git a/production/downloadsites/eclipse/downloads/displayPerformance.php b/production/downloadsites/eclipse/downloads/displayPerformance.php index 35ec71e51..dc538e6e7 100644 --- a/production/downloadsites/eclipse/downloads/displayPerformance.php +++ b/production/downloadsites/eclipse/downloads/displayPerformance.php @@ -2,23 +2,23 @@ <body> <?php - echo "<h2>Scenarios: $QUERY_STRING*</h2>"; +echo "<h2>Scenarios: $QUERY_STRING*</h2>"; - $packageprefix=$QUERY_STRING; +$packageprefix=$QUERY_STRING; - $aDirectory=dir("scenarios"); - $index = 0; +$aDirectory=dir("scenarios"); +$index = 0; - while ($anEntry = $aDirectory->read()) { - if ($anEntry != "." && $anEntry != "..") { - if (strstr($anEntry,$packageprefix)){ - $line = "<a href=\"scenarios/$anEntry\">$anEntry</a><br>"; - echo "$line"; - } - } - } +while ($anEntry = $aDirectory->read()) { + if ($anEntry != "." && $anEntry != "..") { + if (strstr($anEntry,$packageprefix)){ + $line = "<a href=\"scenarios/$anEntry\">$anEntry</a><br>"; + echo "$line"; + } + } +} - aDirectory.closedir(); +aDirectory.closedir(); ?> </body> diff --git a/production/downloadsites/eclipse/downloads/displayScenarios.php b/production/downloadsites/eclipse/downloads/displayScenarios.php index 4fc0447d0..a04639da6 100644 --- a/production/downloadsites/eclipse/downloads/displayScenarios.php +++ b/production/downloadsites/eclipse/downloads/displayScenarios.php @@ -2,39 +2,39 @@ <body> <?php - $parts=explode("&","$QUERY_STRING"); - $buildType=trim($parts[0]); - $packageprefix=trim($parts[1]); - - $aDirectory=dir("$buildType-scenarios"); - $index = 0; - - while ($anEntry = $aDirectory->read()) { - - if ($anEntry != "." && $anEntry != "..") { - if (strstr($anEntry,$packageprefix) && strstr($anEntry,".html")){ - $scenarioname=substr($anEntry,0,-5); - $scenarios[$index]=$scenarioname; - $index++; - - } - } - } - - $scenarioCount=count($scenarios); - if ($scenarioCount==0){ - echo "Results being generated."; - } - else{ - sort($scenarios); - echo "<h2>$packageprefix* ($scenarioCount scenarios)</h2>"; - - for ($counter=0;$counter<count($scenarios);$counter++){ - $line = "<a href=\"$buildType-scenarios/$scenarios[$counter].html\">$scenarios[$counter]</a><br>"; - echo "$line"; - } - } - aDirectory.closedir(); +$parts=explode("&","$QUERY_STRING"); +$buildType=trim($parts[0]); +$packageprefix=trim($parts[1]); + +$aDirectory=dir("$buildType-scenarios"); +$index = 0; + +while ($anEntry = $aDirectory->read()) { + + if ($anEntry != "." && $anEntry != "..") { + if (strstr($anEntry,$packageprefix) && strstr($anEntry,".html")){ + $scenarioname=substr($anEntry,0,-5); + $scenarios[$index]=$scenarioname; + $index++; + + } + } +} + +$scenarioCount=count($scenarios); +if ($scenarioCount==0){ + echo "Results being generated."; +} +else{ + sort($scenarios); + echo "<h2>$packageprefix* ($scenarioCount scenarios)</h2>"; + + for ($counter=0;$counter<count($scenarios);$counter++){ + $line = "<a href=\"$buildType-scenarios/$scenarios[$counter].html\">$scenarios[$counter]</a><br>"; + echo "$line"; + } +} +aDirectory.closedir(); ?> </body> diff --git a/production/downloadsites/eclipse/downloads/displayScenarios2.php b/production/downloadsites/eclipse/downloads/displayScenarios2.php index 1a8d211ac..c6875c654 100644 --- a/production/downloadsites/eclipse/downloads/displayScenarios2.php +++ b/production/downloadsites/eclipse/downloads/displayScenarios2.php @@ -2,39 +2,39 @@ <body> <?php - $parts=explode("&","$QUERY_STRING"); - $config=trim($parts[0]); - $packageprefix=trim($parts[1]); - - $aDirectory=dir("performance/$config"); - $index = 0; - - while ($anEntry = $aDirectory->read()) { - - if ($anEntry != "." && $anEntry != "..") { - if (strstr($anEntry,$packageprefix) && strstr($anEntry,".html")){ - $scenarioname=substr($anEntry,0,-5); - $scenarios[$index]=$scenarioname; - $index++; - - } - } - } - - $scenarioCount=count($scenarios); - if ($scenarioCount==0){ - echo "Results being generated."; - } - else{ - sort($scenarios); - echo "<h2>$packageprefix* ($scenarioCount scenarios)</h2>"; - - for ($counter=0;$counter<count($scenarios);$counter++){ - $line = "<a href=\"performance/$config/$scenarios[$counter].html\">$scenarios[$counter]</a><br>"; - echo "$line"; - } - } - aDirectory.closedir(); +$parts=explode("&","$QUERY_STRING"); +$config=trim($parts[0]); +$packageprefix=trim($parts[1]); + +$aDirectory=dir("performance/$config"); +$index = 0; + +while ($anEntry = $aDirectory->read()) { + + if ($anEntry != "." && $anEntry != "..") { + if (strstr($anEntry,$packageprefix) && strstr($anEntry,".html")){ + $scenarioname=substr($anEntry,0,-5); + $scenarios[$index]=$scenarioname; + $index++; + + } + } +} + +$scenarioCount=count($scenarios); +if ($scenarioCount==0){ + echo "Results being generated."; +} +else{ + sort($scenarios); + echo "<h2>$packageprefix* ($scenarioCount scenarios)</h2>"; + + for ($counter=0;$counter<count($scenarios);$counter++){ + $line = "<a href=\"performance/$config/$scenarios[$counter].html\">$scenarios[$counter]</a><br>"; + echo "$line"; + } +} +aDirectory.closedir(); ?> </body> diff --git a/production/downloadsites/eclipse/downloads/dlconfig3.php b/production/downloadsites/eclipse/downloads/dlconfig3.php index f13265ccd..97bccc30b 100644 --- a/production/downloadsites/eclipse/downloads/dlconfig3.php +++ b/production/downloadsites/eclipse/downloads/dlconfig3.php @@ -13,7 +13,7 @@ $dropType[]="3.8 Maintenance Build"; $dropType[]="3.8 Nightly Build"; // the "prefix" array and dropType array must be of same size, defined in right order for ($i = 0; $i < count($dropType); $i++) { - $typeToPrefix[$dropType[$i]] = $dropPrefix[$i]; + $typeToPrefix[$dropType[$i]] = $dropPrefix[$i]; } ?> diff --git a/production/downloadsites/eclipse/downloads/dlconfig4.php b/production/downloadsites/eclipse/downloads/dlconfig4.php index 7e7ea2d7f..3244d333a 100644 --- a/production/downloadsites/eclipse/downloads/dlconfig4.php +++ b/production/downloadsites/eclipse/downloads/dlconfig4.php @@ -15,7 +15,7 @@ $dropType[]="4.4 Nightly Build"; $dropType[]="Patch Builds"; // the "prefix" array and dropType array must be of same size, defined in right order for ($i = 0; $i < count($dropType); $i++) { - $typeToPrefix[$dropType[$i]] = $dropPrefix[$i]; + $typeToPrefix[$dropType[$i]] = $dropPrefix[$i]; } ?> diff --git a/production/downloadsites/eclipse/downloads/performance.php b/production/downloadsites/eclipse/downloads/performance.php index 2cdf10b8d..bf25f547d 100644 --- a/production/downloadsites/eclipse/downloads/performance.php +++ b/production/downloadsites/eclipse/downloads/performance.php @@ -19,25 +19,25 @@ Console output logs <?php echo "$buildName"; ?> </FONT></B></TD></TR></TABLE><P> Detailed performance data grouped by scenario prefix</FONT></B></TD></TR></TABLE> <?php - $aDirectory = dir("I-scenarios"); - $index=0; +$aDirectory = dir("I-scenarios"); +$index=0; - while ($aScenario = $aDirectory->read()) { - if ($aScenario!= "." && $aScenario!= "..") { - $parts=explode(".test","$aScenario"); - $packageprefixes[$index]=$parts[0]; - $index++; - } - } - aDirectory.closedir(); +while ($aScenario = $aDirectory->read()) { + if ($aScenario!= "." && $aScenario!= "..") { + $parts=explode(".test","$aScenario"); + $packageprefixes[$index]=$parts[0]; + $index++; + } +} +aDirectory.closedir(); - $result=array_unique($packageprefixes); +$result=array_unique($packageprefixes); - sort($result); +sort($result); - for ($counter=0;$counter<count($result);$counter++){ - echo "<A HREF=\"displayScenarios.php?I&$result[$counter]\">$result[$counter]*</A><br>"; - } +for ($counter=0;$counter<count($result);$counter++){ + echo "<A HREF=\"displayScenarios.php?I&$result[$counter]\">$result[$counter]*</A><br>"; +} ?> diff --git a/production/downloadsites/eclipse/home_nav.html b/production/downloadsites/eclipse/home_nav.html index c090eda6e..2a26a5931 100755 --- a/production/downloadsites/eclipse/home_nav.html +++ b/production/downloadsites/eclipse/home_nav.html @@ -1,81 +1,81 @@ <!doctype html public "-//w3c//dtd html 4.0 transitional//en"> <html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> -<title>Eclipse Home Navigator</title> -<base target="main"> -<link rel="stylesheet" href="nav_style.css" type="text/css"> -</head> -<body text="#000000" bgcolor="#6699CC" link="#FFFFCC" vlink="#551A8B" + <head> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <title>Eclipse Home Navigator</title> + <base target="main"> + <link rel="stylesheet" href="nav_style.css" type="text/css"> + </head> + <body text="#000000" bgcolor="#6699CC" link="#FFFFCC" vlink="#551A8B" alink="#FF0000"> <table BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%" - BGCOLOR="#90C8FF"> - <tr> - <td VALIGN="middle" HEIGHT="21" BGCOLOR="#0080C0"> - <a href="http://www.eclipse.org/community/index.html" - target="_top" class="navhead"> eclipse corner </a> - </td> - </tr> - <tr VALIGN="middle"> - <td HEIGHT="21"> <a - href="http://www.eclipse.org/community/index.html" - class="nav" target="_top">projects</a></td> - </tr> - <tr> - <td BGCOLOR="#CFFFFF"><img SRC="images/c.gif" height=1 - width=1></td> - </tr> - <tr VALIGN="middle"> - <td HEIGHT="21"> <a href="downloads/index.html" - class="nav" target="_top">downloads</a></td> - </tr> - <tr> - <td BGCOLOR="#CFFFFF"><img SRC="images/c.gif" height=1 - width=1></td> - </tr> - <tr VALIGN="middle"> - <td HEIGHT="21"> <a - href="http://www.eclipse.org/articles/index.html" - class="nav" target="_top">articles</a></td> - </tr> - <tr> - <td BGCOLOR="#CFFFFF"><img SRC="images/c.gif" height=1 - width=1></td> - </tr> - <tr VALIGN="middle"> - <td HEIGHT="21"> <a - href="http://www.eclipse.org/newsgroups/index.html" - class="nav" target="_top">newsgroups</a></td> - </tr> - <tr> - <td BGCOLOR="#CFFFFF"><img SRC="images/c.gif" height=1 - width=1></td> - </tr> - <tr VALIGN="middle"> - <td VALIGN="middle" HEIGHT="21"> <a - href="http://www.eclipse.org/mail/index.html" - class="nav" target="_parent">mailing lists</a></td> - </tr> - <tr> - <td BGCOLOR="#CFFFFF"><img SRC="images/c.gif" height=1 - width=1></td> - </tr> - <tr VALIGN="middle"> - <td HEIGHT="21"> <a - href="http://www.eclipse.org/search.html" class="nav">search</a></td> - </tr> - <tr> - <td BGCOLOR="#CFFFFF"><img SRC="images/c.gif" height=1 - width=1></td> - </tr> - <tr VALIGN="middle"> - <td HEIGHT="21"> <a - href="http://dev.eclipse.org/bugs/" class="nav">bugs</a></td> - </tr> - <tr> - <td BGCOLOR="#CFFFFF"><img SRC="images/c.gif" height=1 - width=1></td> - </tr> + BGCOLOR="#90C8FF"> + <tr> + <td VALIGN="middle" HEIGHT="21" BGCOLOR="#0080C0"> + <a href="http://www.eclipse.org/community/index.html" + target="_top" class="navhead"> eclipse corner </a> + </td> + </tr> + <tr VALIGN="middle"> + <td HEIGHT="21"> <a + href="http://www.eclipse.org/community/index.html" + class="nav" target="_top">projects</a></td> + </tr> + <tr> + <td BGCOLOR="#CFFFFF"><img SRC="images/c.gif" height=1 + width=1></td> + </tr> + <tr VALIGN="middle"> + <td HEIGHT="21"> <a href="downloads/index.html" + class="nav" target="_top">downloads</a></td> + </tr> + <tr> + <td BGCOLOR="#CFFFFF"><img SRC="images/c.gif" height=1 + width=1></td> + </tr> + <tr VALIGN="middle"> + <td HEIGHT="21"> <a + href="http://www.eclipse.org/articles/index.html" + class="nav" target="_top">articles</a></td> + </tr> + <tr> + <td BGCOLOR="#CFFFFF"><img SRC="images/c.gif" height=1 + width=1></td> + </tr> + <tr VALIGN="middle"> + <td HEIGHT="21"> <a + href="http://www.eclipse.org/newsgroups/index.html" + class="nav" target="_top">newsgroups</a></td> + </tr> + <tr> + <td BGCOLOR="#CFFFFF"><img SRC="images/c.gif" height=1 + width=1></td> + </tr> + <tr VALIGN="middle"> + <td VALIGN="middle" HEIGHT="21"> <a + href="http://www.eclipse.org/mail/index.html" + class="nav" target="_parent">mailing lists</a></td> + </tr> + <tr> + <td BGCOLOR="#CFFFFF"><img SRC="images/c.gif" height=1 + width=1></td> + </tr> + <tr VALIGN="middle"> + <td HEIGHT="21"> <a + href="http://www.eclipse.org/search.html" class="nav">search</a></td> + </tr> + <tr> + <td BGCOLOR="#CFFFFF"><img SRC="images/c.gif" height=1 + width=1></td> + </tr> + <tr VALIGN="middle"> + <td HEIGHT="21"> <a + href="http://dev.eclipse.org/bugs/" class="nav">bugs</a></td> + </tr> + <tr> + <td BGCOLOR="#CFFFFF"><img SRC="images/c.gif" height=1 + width=1></td> + </tr> </table> -</body> + </body> </html> diff --git a/production/downloadsites/eclipse/index.php b/production/downloadsites/eclipse/index.php index 8c16a3b29..215268732 100644 --- a/production/downloadsites/eclipse/index.php +++ b/production/downloadsites/eclipse/index.php @@ -1,5 +1,5 @@ <?php - header( 'Location: index.html' ) ; +header( 'Location: index.html' ) ; ?> diff --git a/production/downloadsites/eclipse/nav_style.css b/production/downloadsites/eclipse/nav_style.css index 0d26057de..7ef43b2cb 100755 --- a/production/downloadsites/eclipse/nav_style.css +++ b/production/downloadsites/eclipse/nav_style.css @@ -1,84 +1,84 @@ p,table,td,th { - font-family: arial, helvetica, geneva; - font-size: 10pt + font-family: arial, helvetica, geneva; + font-size: 10pt } pre { - font-family: "Courier New", Courier, mono; - font-size: 10pt + font-family: "Courier New", Courier, mono; + font-size: 10pt } h2 { - font-family: arial, helvetica, geneva; - font-size: 18pt; - font-weight: bold; - line-height: 14px + font-family: arial, helvetica, geneva; + font-size: 18pt; + font-weight: bold; + line-height: 14px } code { - font-family: "Courier New", Courier, mono; - font-size: 10pt + font-family: "Courier New", Courier, mono; + font-size: 10pt } sup { - font-family: arial, helvetica, geneva; - font-size: 10px + font-family: arial, helvetica, geneva; + font-size: 10px } h3 { - font-family: arial, helvetica, geneva; - font-size: 14pt; - font-weight: bold + font-family: arial, helvetica, geneva; + font-size: 14pt; + font-weight: bold } li { - font-family: arial, helvetica, geneva; - font-size: 10pt + font-family: arial, helvetica, geneva; + font-size: 10pt } h1 { - font-family: arial, helvetica, geneva; - font-size: 28px; - font-weight: bold + font-family: arial, helvetica, geneva; + font-size: 28px; + font-weight: bold } body { - font-family: arial, helvetica, geneva; - font-size: 10pt; - clip: rect() + font-family: arial, helvetica, geneva; + font-size: 10pt; + clip: rect() } .navhead { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: xx-small; - color: #FFFFFF; - font-weight: bold; - text-decoration: underline + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: xx-small; + color: #FFFFFF; + font-weight: bold; + text-decoration: underline } a.nav:link { - text-decoration: none; - color: #000000; + text-decoration: none; + color: #000000; } a.nav:visited { - text-decoration: none; - color: #000000; + text-decoration: none; + color: #000000; } a.nav:hover { - text-decoration: underline; - color: #000000; + text-decoration: underline; + color: #000000; } a.navhead:link { - text-decoration: none; + text-decoration: none; } a.navhead:visited { - text-decoration: none; + text-decoration: none; } a.navhead:hover { - text-decoration: underline; -}
\ No newline at end of file + text-decoration: underline; +} diff --git a/production/downloadsites/equinox/_projectCommon.php b/production/downloadsites/equinox/_projectCommon.php index c7073856a..40d2e3dfd 100755 --- a/production/downloadsites/equinox/_projectCommon.php +++ b/production/downloadsites/equinox/_projectCommon.php @@ -6,83 +6,83 @@ // ini_set('display_errors', 1); ini_set('error_reporting', E_ALL); - $Nav->setLinkList( array() ); - $Nav->addNavSeparator("Work Areas", ""); - $Nav->addCustomNav("Bundles", "http://eclipse.org/equinox/bundles", "_self", 1); - $Nav->addCustomNav("Framework", "http://eclipse.org/equinox/framework", "_self", 1); - $Nav->addCustomNav("Incubator", "http://eclipse.org/equinox/incubator", "_self", 1); - $Nav->addCustomNav("p2", "http://eclipse.org/equinox/p2", "_self", 1); - $Nav->addCustomNav("Security", "http://eclipse.org/equinox/security", "_self", 1); - $Nav->addCustomNav("Server", "http://eclipse.org/equinox/server", "_self", 1); - - if (file_exists("component-links.php")) - include "component-links.php"; - else - if (file_exists("../component-links.php")) - include "../component-links.php"; - - $Nav->addNavSeparator("Related", ""); - $Nav->addCustomNav("RT", "http://eclipse.org/rt", "_self", 1); - $Nav->addCustomNav("Eclipse", "http://eclipse.org/eclipse", "_self", 1); - $Nav->addCustomNav("PDE", "http://eclipse.org/pde", "_self", 1); - $Nav->addCustomNav("RAP", "http://eclipse.org/rap", "_self", 1); - $Nav->addCustomNav("ECF", "http://eclipse.org/ecf", "_self", 1); - $Nav->addCustomNav("Development", "http://eclipse.org/eclipse/development", "_self", 1); +$Nav->setLinkList( array() ); +$Nav->addNavSeparator("Work Areas", ""); +$Nav->addCustomNav("Bundles", "http://eclipse.org/equinox/bundles", "_self", 1); +$Nav->addCustomNav("Framework", "http://eclipse.org/equinox/framework", "_self", 1); +$Nav->addCustomNav("Incubator", "http://eclipse.org/equinox/incubator", "_self", 1); +$Nav->addCustomNav("p2", "http://eclipse.org/equinox/p2", "_self", 1); +$Nav->addCustomNav("Security", "http://eclipse.org/equinox/security", "_self", 1); +$Nav->addCustomNav("Server", "http://eclipse.org/equinox/server", "_self", 1); - $Menu->setMenuItemList( array() ); - $Menu->addMenuItem( "Home", "http://eclipse.org/equinox/", "_self" ); - $Menu->addMenuItem( "Get Started", "http://eclipse.org/equinox/documents/quickstart.php", "_self" ); - $Menu->addMenuItem( "Downloads", "http://download.eclipse.org/equinox", "_self" ); - $Menu->addMenuItem( "Documents", "http://eclipse.org/equinox/documents/", "_self" ); - $Menu->addMenuItem( "Resources", "http://eclipse.org/equinox/resources.php", "_self" ); - $Menu->addMenuItem( "FAQ", "http://eclipse.org/equinox/faq.php/", "_self" ); - $Menu->addMenuItem( "Wiki", "http://wiki.eclipse.org/Equinox", "_self" ); +if (file_exists("component-links.php")) + include "component-links.php"; +else + if (file_exists("../component-links.php")) + include "../component-links.php"; - $App->AddExtraHtmlHeader( '<link rel="stylesheet" type="text/css" href="http://eclipse.org/equinox/equinox.css"/>' ); - $App->AddExtraHtmlHeader( '<link rel="stylesheet" type="text/css" href="http://eclipse.org/equinox/rap-layout-fixes.css"/>' ); - $App->AddExtraHtmlHeader( '<!--[if lt IE 8]><link rel="stylesheet" type="text/css" href="http://eclipse.org/equinox/rap-layout-fixes-ie.css"/><![endif]-->' ); - $App->AddExtraHtmlHeader( '<link rel="shortcut icon" href="http://eclipse.org/rt/images/favicon.ico" />'); - $App->AddExtraHtmlHeader( '<link rel="stylesheet" type="text/css" href="http://eclipse.org/equinox/rap-posts.css"/>' ); - $App->AddExtraHtmlHeader( '<script type="text/javascript" src="http://code.jquery.com/jquery-1.4.2.min.js"></script>' ); - $App->AddExtraHtmlHeader( '<script type="text/javascript" src="http://eclipse.org/equinox/jquery.zrssfeed.min.js"></script>' ); +$Nav->addNavSeparator("Related", ""); +$Nav->addCustomNav("RT", "http://eclipse.org/rt", "_self", 1); +$Nav->addCustomNav("Eclipse", "http://eclipse.org/eclipse", "_self", 1); +$Nav->addCustomNav("PDE", "http://eclipse.org/pde", "_self", 1); +$Nav->addCustomNav("RAP", "http://eclipse.org/rap", "_self", 1); +$Nav->addCustomNav("ECF", "http://eclipse.org/ecf", "_self", 1); +$Nav->addCustomNav("Development", "http://eclipse.org/eclipse/development", "_self", 1); + +$Menu->setMenuItemList( array() ); +$Menu->addMenuItem( "Home", "http://eclipse.org/equinox/", "_self" ); +$Menu->addMenuItem( "Get Started", "http://eclipse.org/equinox/documents/quickstart.php", "_self" ); +$Menu->addMenuItem( "Downloads", "http://download.eclipse.org/equinox", "_self" ); +$Menu->addMenuItem( "Documents", "http://eclipse.org/equinox/documents/", "_self" ); +$Menu->addMenuItem( "Resources", "http://eclipse.org/equinox/resources.php", "_self" ); +$Menu->addMenuItem( "FAQ", "http://eclipse.org/equinox/faq.php/", "_self" ); +$Menu->addMenuItem( "Wiki", "http://wiki.eclipse.org/Equinox", "_self" ); + +$App->AddExtraHtmlHeader( '<link rel="stylesheet" type="text/css" href="http://eclipse.org/equinox/equinox.css"/>' ); +$App->AddExtraHtmlHeader( '<link rel="stylesheet" type="text/css" href="http://eclipse.org/equinox/rap-layout-fixes.css"/>' ); +$App->AddExtraHtmlHeader( '<!--[if lt IE 8]><link rel="stylesheet" type="text/css" href="http://eclipse.org/equinox/rap-layout-fixes-ie.css"/><![endif]-->' ); +$App->AddExtraHtmlHeader( '<link rel="shortcut icon" href="http://eclipse.org/rt/images/favicon.ico" />'); +$App->AddExtraHtmlHeader( '<link rel="stylesheet" type="text/css" href="http://eclipse.org/equinox/rap-posts.css"/>' ); +$App->AddExtraHtmlHeader( '<script type="text/javascript" src="http://code.jquery.com/jquery-1.4.2.min.js"></script>' ); +$App->AddExtraHtmlHeader( '<script type="text/javascript" src="http://eclipse.org/equinox/jquery.zrssfeed.min.js"></script>' ); // $App->Promotion = TRUE; # set true to enable current eclipse.org site-wide promo - function createRapNavigation() { - $html = <<<EOHTML +function createRapNavigation() { + $html = <<<EOHTML <div id="rap-small-header"> <a href="http://eclipse.org/equinox/"><div id="rap-small-logo"></div></a> </div> <script type="text/javascript"> // logo var logo = $( '#logo:first-child' ); - var newLogo = '<div id="logo"><a href="http://eclipse.org">' + var newLogo = '<div id="logo"><a href="http://eclipse.org">' + logo.html() + '</a></div>'; logo.replaceWith( newLogo ); </script> EOHTML; - - return $html; - } - function generateRapPage( $App, $Menu, $Nav, $author, $keywords, $title, $html ) - { - $theme = "Nova"; - $pageHtml = createRapNavigation() . $html; - $pageHtml .= file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/equinox/right-links.html"); - $App->generatePage( $theme, $Menu, $Nav, $author, $keywords, $title, $pageHtml ); - } + return $html; +} + +function generateRapPage( $App, $Menu, $Nav, $author, $keywords, $title, $html ) +{ + $theme = "Nova"; + $pageHtml = createRapNavigation() . $html; + $pageHtml .= file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/equinox/right-links.html"); + $App->generatePage( $theme, $Menu, $Nav, $author, $keywords, $title, $pageHtml ); +} + +function xslt( $xmlFile, $xslFile ) { + $xslDoc = new DOMDocument(); + $xslDoc->load( $xslFile ); + $xmlDoc = new DOMDocument(); + $xmlDoc->load( $xmlFile ); + $proc = new XSLTProcessor(); + $proc->importStylesheet( $xslDoc ); + return $proc->transformToXML( $xmlDoc ); +} - function xslt( $xmlFile, $xslFile ) { - $xslDoc = new DOMDocument(); - $xslDoc->load( $xslFile ); - $xmlDoc = new DOMDocument(); - $xmlDoc->load( $xmlFile ); - $proc = new XSLTProcessor(); - $proc->importStylesheet( $xslDoc ); - return $proc->transformToXML( $xmlDoc ); - } - -?>
\ No newline at end of file +?> diff --git a/production/downloadsites/equinox/build.php b/production/downloadsites/equinox/build.php index f4dc80254..208cd0b58 100644 --- a/production/downloadsites/equinox/build.php +++ b/production/downloadsites/equinox/build.php @@ -1,25 +1,25 @@ <?php function generateDropSize($zipfile) { - $filesize = getDropSize($zipfile); - return "<td>$filesize</td>"; + $filesize = getDropSize($zipfile); + return "<td>$filesize</td>"; } function getDropSize($zipfile) { - $filesize = "N/A"; - $filesizebytes = filesize($zipfile); - if($filesizebytes > 0) { - if($filesizebytes < 1048576) - $filesize = round($filesizebytes / 1024, 0) . "K"; - else if ($filesizebytes >= 1048576 && $filesizebytes < 10485760) - $filesize = round($filesizebytes / 1048576, 1) . "M"; - else - $filesize = round($filesizebytes / 1048576, 0) . "M"; - } - return($filesize); + $filesize = "N/A"; + $filesizebytes = filesize($zipfile); + if($filesizebytes > 0) { + if($filesizebytes < 1048576) + $filesize = round($filesizebytes / 1024, 0) . "K"; + else if ($filesizebytes >= 1048576 && $filesizebytes < 10485760) + $filesize = round($filesizebytes / 1048576, 1) . "M"; + else + $filesize = round($filesizebytes / 1048576, 0) . "M"; + } + return($filesize); } function generateChecksumLinks($zipfile, $buildlabel) { - return "<td><a href=\"http://download.eclipse.org/equinox/drops/$buildlabel/checksum/$zipfile.md5\"><img src=\"/equinox/images/md5.png\" alt=\"md5\"/></a><a href=\"http://download.eclipse.org/equinox/drops/$buildlabel/checksum/$zipfile.sha1\"><img src=\"/equinox/images/sha1.png\" alt=\"sha1\"/></a></td>"; + return "<td><a href=\"http://download.eclipse.org/equinox/drops/$buildlabel/checksum/$zipfile.md5\"><img src=\"/equinox/images/md5.png\" alt=\"md5\"/></a><a href=\"http://download.eclipse.org/equinox/drops/$buildlabel/checksum/$zipfile.sha1\"><img src=\"/equinox/images/sha1.png\" alt=\"sha1\"/></a></td>"; } ?> diff --git a/production/downloadsites/equinox/build_types.html b/production/downloadsites/equinox/build_types.html index 444ceed44..ad311102d 100644 --- a/production/downloadsites/equinox/build_types.html +++ b/production/downloadsites/equinox/build_types.html @@ -1,118 +1,118 @@ <!doctype html public "-//w3c//dtd html 4.0 transitional//en"> <html> -<head> -<title>Eclipse Corner</title> -<link rel="stylesheet" href="../default_style.css"> -<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> -</head> -<body text="#000000" bgcolor="#ffffff" link="#0000ee" vlink="#551a8b" + <head> + <title>Eclipse Corner</title> + <link rel="stylesheet" href="../default_style.css"> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + </head> + <body text="#000000" bgcolor="#ffffff" link="#0000ee" vlink="#551a8b" alink="#ff0000"> <table border=0 cellspacing=5 cellpadding=2 width="100%"> - <tr> - <td align=left valign=top colspan="2" bgcolor="#0080c0"><b><font - face="Arial,Helvetica" color="#ffffff">Eclipse - Project Build Types</font></b></td> - </tr> - <tr> - <td align=right valign=top><img - src="../images/Adarrow.gif" border=0 height=16 width=16></td> - <td> - <p> - <b><font face="arial,helvetica,geneva" size="-1">Releases</font></b> - <br> <font size="-1" - face="arial,helvetica,geneva"> </font>Releases - are builds that have been declared major releases by - the development team - for example "R1.0". - Releases are the right builds for people who want to - be on a stable, tested release, and don't need the - latest greatest features and improvements. Release - builds always have an "R" at the beginning - of the name i.e. R1.0, R2.0 etc. Non-release <font - size="-1" face="arial,helvetica,geneva"> - builds are named according to the date of the - build - for example 20011027 is the build from - Oct 27, 2001.</font><br> - </p> - </td> - </tr> - <tr> - <td align=right valign=top><img - src="../images/Adarrow.gif" border=0 height=16 width=16></td> - <td><b><font face="arial,helvetica,geneva" - size="-1">Stable Builds</font></b> <br> <font - size="-1" face="arial,helvetica,geneva"> Stable - builds are integration builds that have been found - to be stable enough for most people to use. They are - promoted from integration build to stable build by - the architecture team after they have been used for - a few days and deemed reasonably stable. The latest - stable build is the right build for people who want - to stay up to date with what is going on in the - latest development stream, and don't mind putting up - with a few problems n in order to get the latest - greatest features and bug fixes. The latest stable - build is the one the development team likes people - to be using, because of the valuable and timely - feedback. </font></td> - </tr> - <tr> - <td align=right valign=top><img - src="../images/Adarrow.gif" border=0 height=16 width=16></td> - <td> - <p> - <b><font face="arial,helvetica,geneva" size="-1">Integration - Builds</font></b> <br> <font size="-1" - face="arial,helvetica,geneva"> - Periodically, component teams version off their - work in what they believe is a stable, - consistent state, and they update the build - configuration to indicate that the next - integration build should take this version of - the component. Integration builds are built from - these stable component versions that have been - specified by each component team as the best - version available. Integration builds may be - promoted to stable builds after a few days of - testing. Integration builds are built whenever - new stable component versions are released into - the build.</font> - </p> - </td> - </tr> - <TR> - <TD ALIGN=right VALIGN=top><IMG - SRC="../images/Adarrow.gif" BORDER=0 HEIGHT=16 WIDTH=16></TD> - <TD><B><FONT FACE="arial,helvetica,geneva" - SIZE="-1">Nightly Builds</FONT></B><BR> <FONT - SIZE="-1" FACE="arial,helvetica,geneva"> Nightly - builds are produced every night from whatever has - been released into the master branch of the Git - repository. They are completely untested and will - almost always have major problems. Many will not - work at all. These drops are normally only useful to - developers actually working on the Eclipse Project. - Because nightly builds are produced in a different - way from integration builds, bundles from nightly - builds should not be mixed with bundles from other - types of builds. </FONT></TD> - </TR> - <TR> - <TD ALIGN=right VALIGN=top><IMG - SRC="../images/Adarrow.gif" BORDER=0 HEIGHT=16 WIDTH=16></TD> - <TD><B><FONT FACE="arial,helvetica,geneva" - SIZE="-1">Maintenance Builds</FONT></B><BR> <FONT - SIZE="-1" FACE="arial,helvetica,geneva"> - Maintenance builds are produced periodically to - incorporate fixes into an existing release. They are - typically built from tagged plug-in and feature - pojects in a maintenance branch of the Git - repository (i.e. R3_7_maintenance). Maintenance - builds are promoted to a minor or service release - (i.e. R3.7 or R3.7.1) after development teams have - deemed one to be stable following one or more - test-fix pass cycles. </FONT></TD> - </TR> + <tr> + <td align=left valign=top colspan="2" bgcolor="#0080c0"><b><font + face="Arial,Helvetica" color="#ffffff">Eclipse + Project Build Types</font></b></td> + </tr> + <tr> + <td align=right valign=top><img + src="../images/Adarrow.gif" border=0 height=16 width=16></td> + <td> + <p> + <b><font face="arial,helvetica,geneva" size="-1">Releases</font></b> + <br> <font size="-1" + face="arial,helvetica,geneva"> </font>Releases + are builds that have been declared major releases by + the development team - for example "R1.0". + Releases are the right builds for people who want to + be on a stable, tested release, and don't need the + latest greatest features and improvements. Release + builds always have an "R" at the beginning + of the name i.e. R1.0, R2.0 etc. Non-release <font + size="-1" face="arial,helvetica,geneva"> + builds are named according to the date of the + build - for example 20011027 is the build from + Oct 27, 2001.</font><br> + </p> + </td> + </tr> + <tr> + <td align=right valign=top><img + src="../images/Adarrow.gif" border=0 height=16 width=16></td> + <td><b><font face="arial,helvetica,geneva" + size="-1">Stable Builds</font></b> <br> <font + size="-1" face="arial,helvetica,geneva"> Stable + builds are integration builds that have been found + to be stable enough for most people to use. They are + promoted from integration build to stable build by + the architecture team after they have been used for + a few days and deemed reasonably stable. The latest + stable build is the right build for people who want + to stay up to date with what is going on in the + latest development stream, and don't mind putting up + with a few problems n in order to get the latest + greatest features and bug fixes. The latest stable + build is the one the development team likes people + to be using, because of the valuable and timely + feedback. </font></td> + </tr> + <tr> + <td align=right valign=top><img + src="../images/Adarrow.gif" border=0 height=16 width=16></td> + <td> + <p> + <b><font face="arial,helvetica,geneva" size="-1">Integration + Builds</font></b> <br> <font size="-1" + face="arial,helvetica,geneva"> + Periodically, component teams version off their + work in what they believe is a stable, + consistent state, and they update the build + configuration to indicate that the next + integration build should take this version of + the component. Integration builds are built from + these stable component versions that have been + specified by each component team as the best + version available. Integration builds may be + promoted to stable builds after a few days of + testing. Integration builds are built whenever + new stable component versions are released into + the build.</font> + </p> + </td> + </tr> + <TR> + <TD ALIGN=right VALIGN=top><IMG + SRC="../images/Adarrow.gif" BORDER=0 HEIGHT=16 WIDTH=16></TD> + <TD><B><FONT FACE="arial,helvetica,geneva" + SIZE="-1">Nightly Builds</FONT></B><BR> <FONT + SIZE="-1" FACE="arial,helvetica,geneva"> Nightly + builds are produced every night from whatever has + been released into the master branch of the Git + repository. They are completely untested and will + almost always have major problems. Many will not + work at all. These drops are normally only useful to + developers actually working on the Eclipse Project. + Because nightly builds are produced in a different + way from integration builds, bundles from nightly + builds should not be mixed with bundles from other + types of builds. </FONT></TD> + </TR> + <TR> + <TD ALIGN=right VALIGN=top><IMG + SRC="../images/Adarrow.gif" BORDER=0 HEIGHT=16 WIDTH=16></TD> + <TD><B><FONT FACE="arial,helvetica,geneva" + SIZE="-1">Maintenance Builds</FONT></B><BR> <FONT + SIZE="-1" FACE="arial,helvetica,geneva"> + Maintenance builds are produced periodically to + incorporate fixes into an existing release. They are + typically built from tagged plug-in and feature + pojects in a maintenance branch of the Git + repository (i.e. R3_7_maintenance). Maintenance + builds are promoted to a minor or service release + (i.e. R3.7 or R3.7.1) after development teams have + deemed one to be stable following one or more + test-fix pass cycles. </FONT></TD> + </TR> </table> <h3> </h3> -</body> + </body> </html> diff --git a/production/downloadsites/equinox/downloads.php b/production/downloadsites/equinox/downloads.php index 4cd78430d..2b1a4154e 100644 --- a/production/downloadsites/equinox/downloads.php +++ b/production/downloadsites/equinox/downloads.php @@ -1,175 +1,175 @@ <?php require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); $App = new App(); $Nav = new Nav(); $Menu = new Menu(); include($App->getProjectCommon()); # All on the same line to unclutter the user's desktop' - # Begin: page-specific settings. Change these. - $pageTitle = "Equinox Downloads"; - $pageKeywords = "equinox, osgi, framework, runtime, download"; - $pageAuthor = "Equinox committers"; - - $contents = substr(file_get_contents('dlconfig-new.txt'),0,-1); - $contents = str_replace("\n", "", $contents); - - #split the content file by & and fill the arrays - $elements = explode("&",$contents); - $t = 0; - $p = 0; - for ($c = 0; $c < count($elements)-1; $c++) { - $tString = "dropType"; - $pString = "dropPrefix"; - if (strstr($elements[$c],$tString)) { - $temp = preg_split("/=/",$elements[$c]); - $dropType[$t] = $temp[1]; - $t++; - } - if (strstr($elements[$c],$pString)) { - $temp = preg_split("/=/",$elements[$c]); - $dropPrefix[$p] = $temp[1]; - $p++; - } - } - - for ($i = 0; $i < count($dropType); $i++) { - $typeToPrefix[$dropType[$i]] = $dropPrefix[$i]; - } - - $aDirectory = dir("drops"); - while ($anEntry = $aDirectory->read()) { - - // Short cut because we know aDirectory only contains other directories. - - if ($anEntry != "." && $anEntry!=".." && $anEntry!="TIME") { - $parts = explode("-", $anEntry); - if (count($parts) == 3) { - $buckets[$parts[0]][] = $anEntry; - $timePart = $parts[2]; - $year = substr($timePart, 0, 4); - $month = substr($timePart, 4, 2); - $day = substr($timePart, 6, 2); - $hour = substr($timePart,8,2); - $minute = substr($timePart,10,2); - $timeStamp = mktime($hour, $minute, 0, $month, $day, $year); - $timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp); - if ($timeStamp > $latestTimeStamp[$parts[0]]) { - $latestTimeStamp[$parts[0]] = $timeStamp; - $latestFile[$parts[0]] = $anEntry; - } - } - - if (count($parts) == 2) { - $buildType=substr($parts[0],0,1); - $buckets[$buildType][] = $anEntry; - $datePart = substr($parts[0],1); - $timePart = $parts[1]; - $year = substr($datePart, 0, 4); - $month = substr($datePart, 4, 2); - $day = substr($datePart, 6, 2); - $hour = substr($timePart,0,2); - $minute = substr($timePart,2,2); - $timeStamp = mktime($hour, $minute, 0, $month, $day, $year); - $timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp); - if ($timeStamp > $latestTimeStamp[$buildType]) { - $latestTimeStamp[$buildType] = $timeStamp; - $latestFile[$buildType] = $anEntry; - } - } - } - } - - $html = <<<EOHTML +# Begin: page-specific settings. Change these. +$pageTitle = "Equinox Downloads"; +$pageKeywords = "equinox, osgi, framework, runtime, download"; +$pageAuthor = "Equinox committers"; + +$contents = substr(file_get_contents('dlconfig-new.txt'),0,-1); +$contents = str_replace("\n", "", $contents); + +#split the content file by & and fill the arrays +$elements = explode("&",$contents); +$t = 0; +$p = 0; +for ($c = 0; $c < count($elements)-1; $c++) { + $tString = "dropType"; + $pString = "dropPrefix"; + if (strstr($elements[$c],$tString)) { + $temp = preg_split("/=/",$elements[$c]); + $dropType[$t] = $temp[1]; + $t++; + } + if (strstr($elements[$c],$pString)) { + $temp = preg_split("/=/",$elements[$c]); + $dropPrefix[$p] = $temp[1]; + $p++; + } +} + +for ($i = 0; $i < count($dropType); $i++) { + $typeToPrefix[$dropType[$i]] = $dropPrefix[$i]; +} + +$aDirectory = dir("drops"); +while ($anEntry = $aDirectory->read()) { + + // Short cut because we know aDirectory only contains other directories. + + if ($anEntry != "." && $anEntry!=".." && $anEntry!="TIME") { + $parts = explode("-", $anEntry); + if (count($parts) == 3) { + $buckets[$parts[0]][] = $anEntry; + $timePart = $parts[2]; + $year = substr($timePart, 0, 4); + $month = substr($timePart, 4, 2); + $day = substr($timePart, 6, 2); + $hour = substr($timePart,8,2); + $minute = substr($timePart,10,2); + $timeStamp = mktime($hour, $minute, 0, $month, $day, $year); + $timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp); + if ($timeStamp > $latestTimeStamp[$parts[0]]) { + $latestTimeStamp[$parts[0]] = $timeStamp; + $latestFile[$parts[0]] = $anEntry; + } + } + + if (count($parts) == 2) { + $buildType=substr($parts[0],0,1); + $buckets[$buildType][] = $anEntry; + $datePart = substr($parts[0],1); + $timePart = $parts[1]; + $year = substr($datePart, 0, 4); + $month = substr($datePart, 4, 2); + $day = substr($datePart, 6, 2); + $hour = substr($timePart,0,2); + $minute = substr($timePart,2,2); + $timeStamp = mktime($hour, $minute, 0, $month, $day, $year); + $timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp); + if ($timeStamp > $latestTimeStamp[$buildType]) { + $latestTimeStamp[$buildType] = $timeStamp; + $latestFile[$buildType] = $anEntry; + } + } + } +} + +$html = <<<EOHTML <div id="midcolumn"> - <h3>$pageTitle</h3> - <p>For access to archived builds, look <a href="http://archive.eclipse.org/equinox/">here</a>.</p> + <h3>$pageTitle</h3> + <p>For access to archived builds, look <a href="http://archive.eclipse.org/equinox/">here</a>.</p> - <div class="homeitem3col"> - <h3>Latest Builds</h3> - <table width="100%" CELLSPACING=0 CELLPADDING=3> + <div class="homeitem3col"> + <h3>Latest Builds</h3> + <table width="100%" CELLSPACING=0 CELLPADDING=3> EOHTML; - foreach($dropType as $value) { - $prefix=$typeToPrefix[$value]; - $fileName = $latestFile[$prefix]; - $parts = explode("-", $fileName); - - // Uncomment the line below if we need click through licenses. - // echo "<td><a href=license.php?license=drops/$fileName>$parts[1]</a></td>"; - - // Comment the line below if we need click through licenses. - if (count($parts)==3) - $html .= <<<EOHTML - <tr> - <td width="30%"><a href="drops/$fileName/index.php">$parts[1]</a></td> +foreach($dropType as $value) { + $prefix=$typeToPrefix[$value]; + $fileName = $latestFile[$prefix]; + $parts = explode("-", $fileName); + + // Uncomment the line below if we need click through licenses. + // echo "<td><a href=license.php?license=drops/$fileName>$parts[1]</a></td>"; + + // Comment the line below if we need click through licenses. + if (count($parts)==3) + $html .= <<<EOHTML + <tr> + <td width="30%"><a href="drops/$fileName/index.php">$parts[1]</a></td> EOHTML; - if (count($parts)==2) - $html .= <<<EOHTML - <tr> - <td width="30%"><a href="drops/$fileName/index.php">$fileName</a></td> + if (count($parts)==2) + $html .= <<<EOHTML + <tr> + <td width="30%"><a href="drops/$fileName/index.php">$fileName</a></td> EOHTML; - $html .= <<<EOHTML - <td>$value</td> - <td>$timeStamps[$fileName]</td> - </tr> + $html .= <<<EOHTML + <td>$value</td> + <td>$timeStamps[$fileName]</td> + </tr> EOHTML; - } +} - $html .= <<<EOHTML - </table> +$html .= <<<EOHTML + </table> EOHTML; - - foreach($dropType as $value) { - $prefix=$typeToPrefix[$value]; - $html .= <<<EOHTML +foreach($dropType as $value) { + $prefix=$typeToPrefix[$value]; - <h3>$value Builds</h3> - <table width="100%" CELLSPACING=0 CELLPADDING=3> + $html .= <<<EOHTML + + <h3>$value Builds</h3> + <table width="100%" CELLSPACING=0 CELLPADDING=3> EOHTML; - $aBucket = $buckets[$prefix]; - if (isset($aBucket)) { - rsort($aBucket); - foreach($aBucket as $innerValue) { - $parts = explode("-", $innerValue); - $html .= <<<EOHTML - <tr> + $aBucket = $buckets[$prefix]; + if (isset($aBucket)) { + rsort($aBucket); + foreach($aBucket as $innerValue) { + $parts = explode("-", $innerValue); + $html .= <<<EOHTML + <tr> EOHTML; - // Uncomment the line below if we need click through licenses. - // echo "<td><a href=\"license.php?license=drops/$innerValue\">$parts[1]</a></td>"; - - // Comment the line below if we need click through licenses. - if (count ($parts)==3) - $html .= <<<EOHTML - <td width="30%"><a href="drops/$innerValue/index.php">$parts[1]</a></td> + // Uncomment the line below if we need click through licenses. + // echo "<td><a href=\"license.php?license=drops/$innerValue\">$parts[1]</a></td>"; + + // Comment the line below if we need click through licenses. + if (count ($parts)==3) + $html .= <<<EOHTML + <td width="30%"><a href="drops/$innerValue/index.php">$parts[1]</a></td> EOHTML; - if (count ($parts)==2) - $html .= <<<EOHTML - <td width="30%"><a href="drops/$innerValue/index.php">$innerValue</a></td> + if (count ($parts)==2) + $html .= <<<EOHTML + <td width="30%"><a href="drops/$innerValue/index.php">$innerValue</a></td> EOHTML; - $html .= <<<EOHTML - <td>$timeStamps[$innerValue]</td> - </tr> + $html .= <<<EOHTML + <td>$timeStamps[$innerValue]</td> + </tr> EOHTML; - } - } - $html .= <<<EOHTML - </table> + } + } + $html .= <<<EOHTML + </table> EOHTML; - } - $html .= <<<EOHTML - </div> +} +$html .= <<<EOHTML + </div> </div> EOHTML; - generateRapPage( $App, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html ); +generateRapPage( $App, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html ); ?> diff --git a/production/downloadsites/equinox/equinox.css b/production/downloadsites/equinox/equinox.css index 29eed3df8..d73e9e0a8 100644 --- a/production/downloadsites/equinox/equinox.css +++ b/production/downloadsites/equinox/equinox.css @@ -1,40 +1,40 @@ p.bar { - margin-left: 0; - margin-right: 0; - padding-top: 1px; - padding-bottom: 1px; - padding-left: 5px; - padding-right: 1px; - color: #FFFFFF; - background-color: #0080C0; - font-weight: bold; + margin-left: 0; + margin-right: 0; + padding-top: 1px; + padding-bottom: 1px; + padding-left: 5px; + padding-right: 1px; + color: #FFFFFF; + background-color: #0080C0; + font-weight: bold; } p.subbar { - margin-left: 0; - margin-right: 0; - padding-top: 1px; - padding-bottom: 1px; - padding-left: 5px; - padding-right: 1px; - color: #FFFFFF; - background-color: #808080; - font-weight: bold; + margin-left: 0; + margin-right: 0; + padding-top: 1px; + padding-bottom: 1px; + padding-left: 5px; + padding-right: 1px; + color: #FFFFFF; + background-color: #808080; + font-weight: bold; } #main-title { - margin-bottom: 5px; - margin-left: 0; - margin-right: 0; - padding-top: 17px; - padding-bottom: 1px; - padding-left: 25px; - padding-right: 100px; - background-color: #cc6600; - border-bottom: 2px #666633 solid; - color: #f0f0e1; - font-weight: bold; - font-size: 1.2em; - letter-spacing: 5px; - text-align: left; -}
\ No newline at end of file + margin-bottom: 5px; + margin-left: 0; + margin-right: 0; + padding-top: 17px; + padding-bottom: 1px; + padding-left: 25px; + padding-right: 100px; + background-color: #cc6600; + border-bottom: 2px #666633 solid; + color: #f0f0e1; + font-weight: bold; + font-size: 1.2em; + letter-spacing: 5px; + text-align: left; +} diff --git a/production/downloadsites/equinox/index-sites.php b/production/downloadsites/equinox/index-sites.php index dd8836da4..3fe228bd8 100644 --- a/production/downloadsites/equinox/index-sites.php +++ b/production/downloadsites/equinox/index-sites.php @@ -4,185 +4,185 @@ <body> <?php - $serverName = $HTTP_SERVER_VARS["SERVER_NAME"]; - - if (strstr($serverName, ".oti.com")) { - $warning = '<br><font color="#FF0000" size="+2">Internal OTI Mirror. Live external site is <a href="http://download.eclipse.org/downloads" target="_top">here</a>. </font>'; - $serverName = $HTTP_SERVER_VARS["SERVER_NAME"]; - } else { - $warning = ''; - } +$serverName = $HTTP_SERVER_VARS["SERVER_NAME"]; + +if (strstr($serverName, ".oti.com")) { + $warning = '<br><font color="#FF0000" size="+2">Internal OTI Mirror. Live external site is <a href="http://download.eclipse.org/downloads" target="_top">here</a>. </font>'; + $serverName = $HTTP_SERVER_VARS["SERVER_NAME"]; +} else { + $warning = ''; +} ?> <table border=0 cellspacing=5 cellpadding=2 width="100%" > - <tr> - <td align=left width="72%"> <font class=indextop> eclipse project<br>downloads</font> + <tr> + <td align=left width="72%"> <font class=indextop> eclipse project<br>downloads</font> <br> <font class=indexsub> latest downloads from the eclipse project</font><br> - <?php echo $warning; ?> + <?php echo $warning; ?> </td> <td width="28%"><img src="../images/Idea.jpg" height=86 width=120></td> </tr> </table> <table border=0 cellspacing=5 cellpadding=2 width="100%" > - <tr> - <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Latest + <tr> + <td align=LEFT valign=TOP colspan="2" bgcolor="#0080C0"><b><font color="#FFFFFF" face="Arial,Helvetica">Latest Downloads</font></b></td> </tr> <!-- The Eclipse Projects --> - <tr> - <td> - <p>On this page you can find the latest <a href="build_types.html">builds</a> - produced by the <a href="http://www.eclipse.org/eclipse/index.html" target="_top">Eclipse - Project</a>. To get started run the program and and go through the user - and developer documentation provided in the online help system. If you - have problems downloading the drops, contact the <font size="-1" face="arial,helvetica,geneva"><a href="mailto:webmaster@eclipse.org">webmaster</a></font>. - If you have problems installing or getting the workbench to run, <a href="http://www.eclipse.org/eclipse/faq/eclipse-faq.html" target="_top">check - out the Eclipse Project FAQ,</a> or try posting a question to the <a href="http://www.eclipse.org/newsgroups/index.html" target="_top">newsgroup</a>. - All downloads are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/notice.html">Eclipse.org + <tr> + <td> + <p>On this page you can find the latest <a href="build_types.html">builds</a> + produced by the <a href="http://www.eclipse.org/eclipse/index.html" target="_top">Eclipse + Project</a>. To get started run the program and and go through the user + and developer documentation provided in the online help system. If you + have problems downloading the drops, contact the <font size="-1" face="arial,helvetica,geneva"><a href="mailto:webmaster@eclipse.org">webmaster</a></font>. + If you have problems installing or getting the workbench to run, <a href="http://www.eclipse.org/eclipse/faq/eclipse-faq.html" target="_top">check + out the Eclipse Project FAQ,</a> or try posting a question to the <a href="http://www.eclipse.org/newsgroups/index.html" target="_top">newsgroup</a>. + All downloads are provided under the terms and conditions of the <a href="http://www.eclipse.org/legal/notice.html">Eclipse.org Software User Agreement</a> unless otherwise specified. </p> - <p>Looking for<b> Tools PMC</b> downloads page then look <a href="http://www.eclipse.org/tools/downloads.html">here</a>. + <p>Looking for<b> Tools PMC</b> downloads page then look <a href="http://www.eclipse.org/tools/downloads.html">here</a>. Looking for the<b> Technology PMC</b> downloads page then look <a href="http://www.eclipse.org/technology/downloads.html">here</a>.</p> - <p>Looking for the build schedule or build stats then look <a href="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/platform-releng-home/main.html">here</a>. + <p>Looking for the build schedule or build stats then look <a href="http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/platform-releng-home/main.html">here</a>. For information about different kinds of builds look <a href="build_types.html">here</a>.</p> </td> </tr> </table> - <?php - - $fileHandle = fopen("dlconfig.txt", "r"); - while (!feof($fileHandle)) { - - $aLine = fgets($fileHandle, 4096); - parse_str($aLine); - - - } - fclose($fileHandle); - - for ($i = 0; $i < count($dropType); $i++) { - $typeToPrefix[$dropType[$i]] = $dropPrefix[$i]; - } - - $aDirectory = dir("drops"); - while ($anEntry = $aDirectory->read()) { - - // Short cut because we know aDirectory only contains other directories. - if ($anEntry != "." && $anEntry!="..") { - $aDropDirectory = dir("drops/".$anEntry); - $fileCount = 0; - while ($aDropEntry = $aDropDirectory->read()) { - if (stristr($aDropEntry, ".zip")) { - // Count the files in the directory - $fileCount = $fileCount + 1; - } - } - $aDropDirectory.closedir(); - // Read the count file - $countFile = "drops/".$anEntry."/files.count"; - $indexFile = "drops/".$anEntry."/index.php"; - if (file_exists($countFile) && file_exists($indexFile)) { - $anArray = file($countFile); - - // If a match - process the directory - if ($anArray[0] == $fileCount) { - $parts = explode("-", $anEntry); - if (count($parts) == 3) { - - $buckets[$parts[0]][] = $anEntry; - - $timePart = $parts[2]; - $year = substr($timePart, 0, 4); - $month = substr($timePart, 4, 2); - $day = substr($timePart, 6, 2); - $hour = substr($timePart,8,2); - $minute = substr($timePart,10,2); - $timeStamp = mktime($hour, $minute, 0, $month, $day, $year); - - $timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp); - - if ($timeStamp > $latestTimeStamp[$parts[0]]) { - $latestTimeStamp[$parts[0]] = $timeStamp; - $latestFile[$parts[0]] = $anEntry; - } - } - } - } - } - } - // $aDirectory.closedir(); - ?> - +<?php + +$fileHandle = fopen("dlconfig.txt", "r"); +while (!feof($fileHandle)) { + + $aLine = fgets($fileHandle, 4096); + parse_str($aLine); + + +} +fclose($fileHandle); + +for ($i = 0; $i < count($dropType); $i++) { + $typeToPrefix[$dropType[$i]] = $dropPrefix[$i]; +} + +$aDirectory = dir("drops"); +while ($anEntry = $aDirectory->read()) { + + // Short cut because we know aDirectory only contains other directories. + if ($anEntry != "." && $anEntry!="..") { + $aDropDirectory = dir("drops/".$anEntry); + $fileCount = 0; + while ($aDropEntry = $aDropDirectory->read()) { + if (stristr($aDropEntry, ".zip")) { + // Count the files in the directory + $fileCount = $fileCount + 1; + } + } + $aDropDirectory.closedir(); + // Read the count file + $countFile = "drops/".$anEntry."/files.count"; + $indexFile = "drops/".$anEntry."/index.php"; + if (file_exists($countFile) && file_exists($indexFile)) { + $anArray = file($countFile); + + // If a match - process the directory + if ($anArray[0] == $fileCount) { + $parts = explode("-", $anEntry); + if (count($parts) == 3) { + + $buckets[$parts[0]][] = $anEntry; + + $timePart = $parts[2]; + $year = substr($timePart, 0, 4); + $month = substr($timePart, 4, 2); + $day = substr($timePart, 6, 2); + $hour = substr($timePart,8,2); + $minute = substr($timePart,10,2); + $timeStamp = mktime($hour, $minute, 0, $month, $day, $year); + + $timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp); + + if ($timeStamp > $latestTimeStamp[$parts[0]]) { + $latestTimeStamp[$parts[0]] = $timeStamp; + $latestFile[$parts[0]] = $anEntry; + } + } + } + } + } +} +// $aDirectory.closedir(); +?> + <table width="100%" cellspacing=0 cellpadding=3 align=center> <td align=left> <TABLE width="100%" CELLSPACING=0 CELLPADDING=3> <tr> - <td width=\"30%\"><b>Build Type</b></td> - <td><b>Build Name</b></td> - <td><b>Build Date</b></td> + <td width=\"30%\"><b>Build Type</b></td> + <td><b>Build Name</b></td> + <td><b>Build Date</b></td> </tr> <?php - foreach($dropType as $value) { - $prefix=$typeToPrefix[$value]; - $fileName = $latestFile[$prefix]; - echo "<tr> - <td width=\"30%\">$value</td>"; - - $parts = explode("-", $fileName); - - // Uncomment the line below if we need click through licenses. - // echo "<td><a href=license.php?license=drops/$fileName>$parts[1]</a></td>"; - - // Comment the line below if we need click through licenses. - echo "<td><a href=\"drops/$fileName/index.php\">$parts[1]</a></td>"; - - echo "<td>$timeStamps[$fileName]</td>"; - echo "</tr>"; - } +foreach($dropType as $value) { + $prefix=$typeToPrefix[$value]; + $fileName = $latestFile[$prefix]; + echo "<tr> + <td width=\"30%\">$value</td>"; + + $parts = explode("-", $fileName); + + // Uncomment the line below if we need click through licenses. + // echo "<td><a href=license.php?license=drops/$fileName>$parts[1]</a></td>"; + + // Comment the line below if we need click through licenses. + echo "<td><a href=\"drops/$fileName/index.php\">$parts[1]</a></td>"; + + echo "<td>$timeStamps[$fileName]</td>"; + echo "</tr>"; +} ?> </table> </table> <?php - foreach($dropType as $value) { - $prefix=$typeToPrefix[$value]; - echo " - <table width=\"100%\" cellspacing=0 cellpadding=3 align=center> - <tr bgcolor=\"#999999\"> - <td align=left width=\"30%\"><b><a name=\"$value\"><font color=\"#FFFFFF\" face=\"Arial,Helvetica\">$value"; - echo "s</font></b></a></td> - </TR> - <TR> - <td align=left> - <TABLE width=\"100%\" CELLSPACING=0 CELLPADDING=3> - <tr> - <td width=\"30%\"><b>Build Name</b></td> - <td><b>Build Date</b></td> - </tr>"; - - $aBucket = $buckets[$prefix]; - if (isset($aBucket)) { - rsort($aBucket); - foreach($aBucket as $innerValue) { - $parts = explode("-", $innerValue); - echo "<tr>"; - - // Uncomment the line below if we need click through licenses. - // echo "<td><a href=\"license.php?license=drops/$innerValue\">$parts[1]</a></td>"; - - // Comment the line below if we need click through licenses. - echo "<td><a href=\"drops/$innerValue/index.php\">$parts[1]</a></td>"; - - echo "<td>$timeStamps[$innerValue]</td> - </tr>"; - } - } - echo "</table></table> "; - } +foreach($dropType as $value) { + $prefix=$typeToPrefix[$value]; + echo " + <table width=\"100%\" cellspacing=0 cellpadding=3 align=center> + <tr bgcolor=\"#999999\"> + <td align=left width=\"30%\"><b><a name=\"$value\"><font color=\"#FFFFFF\" face=\"Arial,Helvetica\">$value"; + echo "s</font></b></a></td> + </TR> + <TR> + <td align=left> + <TABLE width=\"100%\" CELLSPACING=0 CELLPADDING=3> + <tr> + <td width=\"30%\"><b>Build Name</b></td> + <td><b>Build Date</b></td> + </tr>"; + + $aBucket = $buckets[$prefix]; + if (isset($aBucket)) { + rsort($aBucket); + foreach($aBucket as $innerValue) { + $parts = explode("-", $innerValue); + echo "<tr>"; + + // Uncomment the line below if we need click through licenses. + // echo "<td><a href=\"license.php?license=drops/$innerValue\">$parts[1]</a></td>"; + + // Comment the line below if we need click through licenses. + echo "<td><a href=\"drops/$innerValue/index.php\">$parts[1]</a></td>"; + + echo "<td>$timeStamps[$innerValue]</td> + </tr>"; + } + } + echo "</table></table> "; +} ?> diff --git a/production/downloadsites/equinox/index.php b/production/downloadsites/equinox/index.php index 6d5da3df7..d300437d5 100644 --- a/production/downloadsites/equinox/index.php +++ b/production/downloadsites/equinox/index.php @@ -1,5 +1,5 @@ <?php require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); $App = new App(); $Nav = new Nav(); $Menu = new Menu(); include($App->getProjectCommon()); # All on the same line to unclutter the user's desktop' -# Begin: page-specific settings. Change these. +# Begin: page-specific settings. Change these. $pageTitle = "Equinox Downloads"; $pageKeywords = "equinox, osgi, framework, runtime, download"; $pageAuthor = "Equinox committers"; @@ -9,86 +9,86 @@ $contents = str_replace("\n", "", $contents); #split the content file by & and fill the arrays $elements = explode("&",$contents); -$t = 0; +$t = 0; $p = 0; for ($c = 0; $c < count($elements)-1; $c++) { - $tString = "dropType"; - $pString = "dropPrefix"; - if (strstr($elements[$c],$tString)) { - $temp = preg_split("/=/",$elements[$c]); - $dropType[$t] = $temp[1]; - $t++; - } - if (strstr($elements[$c],$pString)) { - $temp = preg_split("/=/",$elements[$c]); - $dropPrefix[$p] = $temp[1]; - $p++; - } + $tString = "dropType"; + $pString = "dropPrefix"; + if (strstr($elements[$c],$tString)) { + $temp = preg_split("/=/",$elements[$c]); + $dropType[$t] = $temp[1]; + $t++; + } + if (strstr($elements[$c],$pString)) { + $temp = preg_split("/=/",$elements[$c]); + $dropPrefix[$p] = $temp[1]; + $p++; + } } for ($i = 0; $i < count($dropType); $i++) { - $typeToPrefix[$dropType[$i]] = $dropPrefix[$i]; + $typeToPrefix[$dropType[$i]] = $dropPrefix[$i]; } $aDirectory = dir("drops"); while ($anEntry = $aDirectory->read()) { - // Short cut because we know aDirectory only contains other directories. - - if ($anEntry != "." && $anEntry!=".." && $anEntry!="TIME") { - $parts = explode("-", $anEntry); - if (count($parts) == 3) { - - //$buckets[$parts[0]][] = $anEntry; - - $timePart = $parts[2]; - $year = substr($timePart, 0, 4); - $month = substr($timePart, 4, 2); - $day = substr($timePart, 6, 2); - $hour = substr($timePart,8,2); - $minute = substr($timePart,10,2); - // special logic adds 1 second if build id contains "RC" ... this was - // added for the M build case, where there is an M build and and RC version that - // have same time stamp. One second should not effect desplayed values. - $isRC = strpos($anEntry, "RC"); - if ($isRC === false) { - $timeStamp = mktime($hour, $minute, 0, $month, $day, $year); - } else { - $timeStamp = mktime($hour, $minute, 1, $month, $day, $year); - } - $buckets[$parts[0]][$timeStamp] = $anEntry; - $timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp); - if ($timeStamp > $latestTimeStamp[$parts[0]]) { - $latestTimeStamp[$parts[0]] = $timeStamp; - $latestFile[$parts[0]] = $anEntry; - } - } - - if (count($parts) == 2) { - $buildType=substr($parts[0],0,1); - //$buckets[$buildType][] = $anEntry; - $datePart = substr($parts[0],1); - $timePart = $parts[1]; - $year = substr($datePart, 0, 4); - $month = substr($datePart, 4, 2); - $day = substr($datePart, 6, 2); - $hour = substr($timePart,0,2); - $minute = substr($timePart,2,2); - $isRC = strpos($anEntry, "RC"); - if ($isRC === false) { - $timeStamp = mktime($hour, $minute, 0, $month, $day, $year); - } else { - $timeStamp = mktime($hour, $minute, 1, $month, $day, $year); - } - $buckets[$buildType[0]][$timeStamp] = $anEntry; - - $timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp); - if ($timeStamp > $latestTimeStamp[$buildType]) { - $latestTimeStamp[$buildType] = $timeStamp; - $latestFile[$buildType] = $anEntry; - } - } + // Short cut because we know aDirectory only contains other directories. + + if ($anEntry != "." && $anEntry!=".." && $anEntry!="TIME") { + $parts = explode("-", $anEntry); + if (count($parts) == 3) { + + //$buckets[$parts[0]][] = $anEntry; + + $timePart = $parts[2]; + $year = substr($timePart, 0, 4); + $month = substr($timePart, 4, 2); + $day = substr($timePart, 6, 2); + $hour = substr($timePart,8,2); + $minute = substr($timePart,10,2); + // special logic adds 1 second if build id contains "RC" ... this was + // added for the M build case, where there is an M build and and RC version that + // have same time stamp. One second should not effect desplayed values. + $isRC = strpos($anEntry, "RC"); + if ($isRC === false) { + $timeStamp = mktime($hour, $minute, 0, $month, $day, $year); + } else { + $timeStamp = mktime($hour, $minute, 1, $month, $day, $year); + } + $buckets[$parts[0]][$timeStamp] = $anEntry; + $timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp); + if ($timeStamp > $latestTimeStamp[$parts[0]]) { + $latestTimeStamp[$parts[0]] = $timeStamp; + $latestFile[$parts[0]] = $anEntry; + } + } + + if (count($parts) == 2) { + $buildType=substr($parts[0],0,1); + //$buckets[$buildType][] = $anEntry; + $datePart = substr($parts[0],1); + $timePart = $parts[1]; + $year = substr($datePart, 0, 4); + $month = substr($datePart, 4, 2); + $day = substr($datePart, 6, 2); + $hour = substr($timePart,0,2); + $minute = substr($timePart,2,2); + $isRC = strpos($anEntry, "RC"); + if ($isRC === false) { + $timeStamp = mktime($hour, $minute, 0, $month, $day, $year); + } else { + $timeStamp = mktime($hour, $minute, 1, $month, $day, $year); + } + $buckets[$buildType[0]][$timeStamp] = $anEntry; + + $timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp); + if ($timeStamp > $latestTimeStamp[$buildType]) { + $latestTimeStamp[$buildType] = $timeStamp; + $latestFile[$buildType] = $anEntry; + } } + } } $html = <<<EOHTML @@ -98,33 +98,33 @@ $html = <<<EOHTML <div class="homeitem3col"> <h3>Latest Builds</h3> - <table width="100%" CELLSPACING=0 CELLPADDING=3> + <table width="100%" CELLSPACING=0 CELLPADDING=3> EOHTML; foreach($dropType as $value) { - $prefix=$typeToPrefix[$value]; - $fileName = $latestFile[$prefix]; - $parts = explode("-", $fileName); + $prefix=$typeToPrefix[$value]; + $fileName = $latestFile[$prefix]; + $parts = explode("-", $fileName); - // Uncomment the line below if we need click through licenses. - // echo "<td><a href=license.php?license=drops/$fileName>$parts[1]</a></td>"; + // Uncomment the line below if we need click through licenses. + // echo "<td><a href=license.php?license=drops/$fileName>$parts[1]</a></td>"; - // Comment the line below if we need click through licenses. - if (count($parts)==3) - $html .= <<<EOHTML + // Comment the line below if we need click through licenses. + if (count($parts)==3) + $html .= <<<EOHTML <tr> <td width="30%"><a href="drops/$fileName/index.php">$parts[1]</a></td> EOHTML; - if (count($parts)==2) - $html .= <<<EOHTML + if (count($parts)==2) + $html .= <<<EOHTML <tr> <td width="30%"><a href="drops/$fileName/index.php">$fileName</a></td> EOHTML; - $html .= <<<EOHTML + $html .= <<<EOHTML <td>$value</td> <td>$timeStamps[$fileName]</td> </tr> @@ -138,47 +138,47 @@ $html .= <<<EOHTML EOHTML; foreach($dropType as $value) { - $prefix=$typeToPrefix[$value]; + $prefix=$typeToPrefix[$value]; - $html .= <<<EOHTML + $html .= <<<EOHTML <h3>$value Builds</h3> <table width="100%" CELLSPACING=0 CELLPADDING=3> EOHTML; - $aBucket = $buckets[$prefix]; - if (isset($aBucket)) { - krsort($aBucket); - foreach($aBucket as $innerValue) { - $parts = explode("-", $innerValue); - $html .= <<<EOHTML + $aBucket = $buckets[$prefix]; + if (isset($aBucket)) { + krsort($aBucket); + foreach($aBucket as $innerValue) { + $parts = explode("-", $innerValue); + $html .= <<<EOHTML <tr> EOHTML; - // Uncomment the line below if we need click through licenses. - // echo "<td><a href=\"license.php?license=drops/$innerValue\">$parts[1]</a></td>"; + // Uncomment the line below if we need click through licenses. + // echo "<td><a href=\"license.php?license=drops/$innerValue\">$parts[1]</a></td>"; - // Comment the line below if we need click through licenses. - if (count ($parts)==3) - $html .= <<<EOHTML + // Comment the line below if we need click through licenses. + if (count ($parts)==3) + $html .= <<<EOHTML <td width="30%"><a href="drops/$innerValue/index.php">$parts[1]</a></td> EOHTML; - if (count ($parts)==2) - $html .= <<<EOHTML + if (count ($parts)==2) + $html .= <<<EOHTML <td width="30%"><a href="drops/$innerValue/index.php">$innerValue</a></td> EOHTML; - $html .= <<<EOHTML + $html .= <<<EOHTML <td>$timeStamps[$innerValue]</td> </tr> EOHTML; - } } - $html .= <<<EOHTML + } + $html .= <<<EOHTML </table> EOHTML; diff --git a/production/downloadsites/equinox/right-links.html b/production/downloadsites/equinox/right-links.html index d3995c915..9bf0c2dc7 100755 --- a/production/downloadsites/equinox/right-links.html +++ b/production/downloadsites/equinox/right-links.html @@ -1,33 +1,33 @@ <div id="rightcolumn"> - <div class="sideitem"> - <h6>Buy The Book</h6> - <p> - <a href="http://equinoxosgi.org"> <img - src="http://eclipse.org/equinox/images/osgi-and-equinox-cover.png" - style="position: relative; left: 33px; top: 2pt;" /></a> - </p> - </div> + <div class="sideitem"> + <h6>Buy The Book</h6> + <p> + <a href="http://equinoxosgi.org"> <img + src="http://eclipse.org/equinox/images/osgi-and-equinox-cover.png" + style="position: relative; left: 33px; top: 2pt;" /></a> + </p> + </div> - <div class="sideitem"> - <h6> - Equinox News <a - href="http://pipes.yahoo.com/pipes/pipe.run?_id=29fa792a21689d660776bb62478167c9%26_render=rss" - class="rssIcon"><img - src="http://eclipse.org/rt/images/feed.png" alt="feed" /></a> - </h6> - <div id="rssFeed"></div> - <script type="text/javascript"> - $( document ).ready( function () { - $( '#rssFeed' ).rssfeed( 'http%3A%2F%2Fpipes.yahoo.com%2Fpipes%2Fpipe.run%3F_id%3D29fa792a21689d660776bb62478167c9%26_render%3Drss', - { limit: 5, header : false, titletag : "h5", date : true, content : false } ); - } ); - </script> + <div class="sideitem"> + <h6> + Equinox News <a + href="http://pipes.yahoo.com/pipes/pipe.run?_id=29fa792a21689d660776bb62478167c9%26_render=rss" + class="rssIcon"><img + src="http://eclipse.org/rt/images/feed.png" alt="feed" /></a> + </h6> + <div id="rssFeed"></div> + <script type="text/javascript"> + $( document ).ready( function () { + $( '#rssFeed' ).rssfeed( 'http%3A%2F%2Fpipes.yahoo.com%2Fpipes%2Fpipe.run%3F_id%3D29fa792a21689d660776bb62478167c9%26_render%3Drss', + { limit: 5, header : false, titletag : "h5", date : true, content : false } ); + } ); +</script> </div> <div style="position: relative; margin-bottom: 10px;"> - <a href="http://eclipse.org/eclipsert/"><img alt="EclipseRT" - src="http://eclipse.org/equinox/images/EclipseRT.png" - style="position: relative; left: 55px; top: 0pt;" /></a> + <a href="http://eclipse.org/eclipsert/"><img alt="EclipseRT" + src="http://eclipse.org/equinox/images/EclipseRT.png" + style="position: relative; left: 55px; top: 0pt;" /></a> </div> -</div> + </div> diff --git a/production/gather-parts.sh b/production/gather-parts.sh index 93d5becf7..0713b8ae4 100644 --- a/production/gather-parts.sh +++ b/production/gather-parts.sh @@ -2,14 +2,14 @@ # if [ $# -ne 1 ]; then - echo USAGE: $0 env_file - exit 1 + echo USAGE: $0 env_file + exit 1 fi if [ ! -r "$1" ]; then - echo "$1" cannot be read - echo USAGE: $0 env_file - exit 1 + echo "$1" cannot be read + echo USAGE: $0 env_file + exit 1 fi SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)} @@ -25,15 +25,15 @@ gitCache=$( fn-git-cache "$BUILD_ROOT" "$BRANCH" ) aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" ) if [ -z "$BUILD_ID" ]; then - BUILD_ID=$(fn-build-id "$BUILD_TYPE" ) + BUILD_ID=$(fn-build-id "$BUILD_TYPE" ) fi buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM") basebuilderDir=$( fn-basebuilder-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" ) -# copy "mvn.properties" created/saved by parent pom to buildDirectory, +# copy "mvn.properties" created/saved by parent pom to buildDirectory, # so can more easily be used by other scripts, reports, php page? -# Note: likely need to "fixup" some variables to be usable by PHP. +# Note: likely need to "fixup" some variables to be usable by PHP. cp "${aggDir}/eclipse-platform-parent/target/resources/mavenproperties.properties" "${buildDirectory}/mavenproperties.properties" $SCRIPT_PATH/getEBuilderForDropDir.sh $buildDirectory $EBUILDER_HASH @@ -49,15 +49,15 @@ fn-gather-swt-zips "$BUILD_ID" "$aggDir" "$buildDirectory" fn-gather-test-zips "$BUILD_ID" "$aggDir" "$buildDirectory" fn-gather-ecj-jars "$BUILD_ID" "$aggDir" "$buildDirectory" -# Note, we check for error here, because of all these functions this is one +# Note, we check for error here, because of all these functions this is one # that I've seen occur once. fn-slice-repos "$BUILD_ID" "$aggDir" "$buildDirectory" "$launcherJar" RC=$? if [[ $RC != 0 ]] then - BUILD_FAILED_OUTPUT="${buildDirectory}/buildFailed-gather-parts" - echo " ERROR: a function from gather-parts.sh returned non-zero return code, $RC" >>${BUILD_FAILED_OUTPUT} - exit $RC + BUILD_FAILED_OUTPUT="${buildDirectory}/buildFailed-gather-parts" + echo " ERROR: a function from gather-parts.sh returned non-zero return code, $RC" >>${BUILD_FAILED_OUTPUT} + exit $RC fi exit 0 diff --git a/production/get-aggregator.sh b/production/get-aggregator.sh index b54791577..f1d372531 100644 --- a/production/get-aggregator.sh +++ b/production/get-aggregator.sh @@ -2,14 +2,14 @@ # if [ $# -ne 1 ]; then - echo USAGE: $0 env_file - exit 1 + echo USAGE: $0 env_file + exit 1 fi if [ ! -r "$1" ]; then - echo "$1" cannot be read - echo USAGE: $0 env_file - exit 1 + echo "$1" cannot be read + echo USAGE: $0 env_file + exit 1 fi SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)} @@ -27,37 +27,37 @@ aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" ) if [[ -r "$aggDir" ]] then - fn-git-clean-aggregator2 "$aggDir" "${BRANCH}" + fn-git-clean-aggregator2 "$aggDir" "${BRANCH}" + RC=$? + if [[ $RC == 0 ]] + then + pushd "$aggDir" + fn-git-pull RC=$? if [[ $RC == 0 ]] then - pushd "$aggDir" - fn-git-pull - RC=$? - if [[ $RC == 0 ]] - then - fn-git-submodule-update - RC=$? - popd - fi + fn-git-submodule-update + RC=$? + popd fi + fi else - fn-git-clone-aggregator "$gitCache" \ - $(fn-local-repo "$AGGREGATOR_REPO") "${BRANCH}" - RC=$? + fn-git-clone-aggregator "$gitCache" \ + $(fn-local-repo "$AGGREGATOR_REPO") "${BRANCH}" + RC=$? fi buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" ) if [[ $RC != 0 ]] then - # create as "indicator file" ... gets filled in more once there is a log to grep - touch "${buildDirectory}/buildFailed-get-aggregator" - echo "ERROR: get-aggregator returned non-zero return code: $RC" - echo " assuming 'master' for EBUILDER_HASH (for later use), since could not reliably get aggregator." - EBUILDER_HASH=master - fn-write-property EBUILDER_HASH - exit $RC + # create as "indicator file" ... gets filled in more once there is a log to grep + touch "${buildDirectory}/buildFailed-get-aggregator" + echo "ERROR: get-aggregator returned non-zero return code: $RC" + echo " assuming 'master' for EBUILDER_HASH (for later use), since could not reliably get aggregator." + EBUILDER_HASH=master + fn-write-property EBUILDER_HASH + exit $RC fi @@ -67,10 +67,10 @@ EBUILDER_HASH=$( git show-ref --hash --verify refs/remotes/origin/${BRANCH} ) checkForErrorExit $? "git show-ref --hash failed for refs/remotes/origin/${BRANCH}. Not valid ref?" # remember, literal name as argument ... its defrefernced in function fn-write-property EBUILDER_HASH -# write to "relengdirectory.txt", as a double check on build input" -# In particular, this "early one" is the "starting point". -# By the time we do a build and commit submodules, there would -# be a different one that is tagged with buildId. I'm thinking it is the latter that would be needed +# write to "relengdirectory.txt", as a double check on build input" +# In particular, this "early one" is the "starting point". +# By the time we do a build and commit submodules, there would +# be a different one that is tagged with buildId. I'm thinking it is the latter that would be needed # to "reproduce a build" but this early one may be important to debug what went wrong with a build. buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" ) diff --git a/production/getEBuilderForDropDir.sh b/production/getEBuilderForDropDir.sh index 2e216dbc1..ad8ac9b7d 100755 --- a/production/getEBuilderForDropDir.sh +++ b/production/getEBuilderForDropDir.sh @@ -8,64 +8,64 @@ EBUILDER_HASH=$2 if [[ -z "${BUILD_DIR}" ]] then - echo "BUILD_DIR not supplied, will assume current directory, for testing." - BUILD_DIR=${PWD} + echo "BUILD_DIR not supplied, will assume current directory, for testing." + BUILD_DIR=${PWD} else - # normally will exist by now, but if not, we'll create it. - if [[ ! -d "${BUILD_DIR}" ]] - then - echo "WARNING: BUILD_DIR did not exist, so created it: $BUILD_DIR." - mkdir -p $BUILD_DIR - fi + # normally will exist by now, but if not, we'll create it. + if [[ ! -d "${BUILD_DIR}" ]] + then + echo "WARNING: BUILD_DIR did not exist, so created it: $BUILD_DIR." + mkdir -p $BUILD_DIR + fi fi if [[ -z "${EBUILDER_HASH}" ]] -then - echo "EBUILDER HASH, BRANCH, or TAG was not supplied, assuming 'master'" - EBUILDER_HASH=master +then + echo "EBUILDER HASH, BRANCH, or TAG was not supplied, assuming 'master'" + EBUILDER_HASH=master fi EBUILDER=eclipse.platform.releng.aggregator RC=0 -# don't clone, if already exists. +# don't clone, if already exists. if [[ ! -d ${BUILD_DIR}/${EBUILDER} ]] then - # Not sure 'REPO_AND_ACCESS' is defined in all possible scenerios, so we'll provide a default. - # It is in main scenerios, but not sure about things like "re-running unit tests at a later time". - # If directory doesn't exist yet, create it first, so we can assign proper access - # permissions for later "clean up" routines. - mkdir -p "${BUILD_DIR}/${EBUILDER}" - chmod -c g+ws "${BUILD_DIR}/${EBUILDER}" - git clone ${REPO_AND_ACCESS:-git://git.eclipse.org/gitroot}/platform/${EBUILDER} ${BUILD_DIR}/${EBUILDER} - RC=$? - if [[ $RC != 0 ]] - then - echo "[ERROR] Cloning EBUILDER returned non zero return code: $RC" - exit $RC - fi -else - echo "INFO: ebuilder directory found to exist. Not re-cloneing." - echo "INFO: Found: ${BUILD_DIR}/${EBUILDER}" - echo "INFO: But fetching to make sure up to date," - echo "INFO: before checking out specific HASH (which may make it detached)." - pushd ${BUILD_DIR}/${EBUILDER} - git fetch - RC=$? - if [[ $RC != 0 ]] - then - echo "[ERROR] Fetch EBUILDER returned non zero return code: $RC" - exit $RC - fi - git checkout $EBUILDER_HASH - RC=$? - if [[ $RC != 0 ]] - then - echo "[ERROR] Checking out EBUILDER for $EBUILDER_HASH returned non zero return code: $RC" - exit $RC - fi - popd -fi + # Not sure 'REPO_AND_ACCESS' is defined in all possible scenerios, so we'll provide a default. + # It is in main scenerios, but not sure about things like "re-running unit tests at a later time". + # If directory doesn't exist yet, create it first, so we can assign proper access + # permissions for later "clean up" routines. + mkdir -p "${BUILD_DIR}/${EBUILDER}" + chmod -c g+ws "${BUILD_DIR}/${EBUILDER}" + git clone ${REPO_AND_ACCESS:-git://git.eclipse.org/gitroot}/platform/${EBUILDER} ${BUILD_DIR}/${EBUILDER} + RC=$? + if [[ $RC != 0 ]] + then + echo "[ERROR] Cloning EBUILDER returned non zero return code: $RC" + exit $RC + fi +else + echo "INFO: ebuilder directory found to exist. Not re-cloneing." + echo "INFO: Found: ${BUILD_DIR}/${EBUILDER}" + echo "INFO: But fetching to make sure up to date," + echo "INFO: before checking out specific HASH (which may make it detached)." + pushd ${BUILD_DIR}/${EBUILDER} + git fetch + RC=$? + if [[ $RC != 0 ]] + then + echo "[ERROR] Fetch EBUILDER returned non zero return code: $RC" + exit $RC + fi + git checkout $EBUILDER_HASH + RC=$? + if [[ $RC != 0 ]] + then + echo "[ERROR] Checking out EBUILDER for $EBUILDER_HASH returned non zero return code: $RC" + exit $RC + fi + popd +fi exit $RC diff --git a/production/git-submodule-checkout.sh b/production/git-submodule-checkout.sh index 9950bd6a2..359e2ef99 100644 --- a/production/git-submodule-checkout.sh +++ b/production/git-submodule-checkout.sh @@ -2,8 +2,8 @@ # # TODO: this script is called with repoScript=$( echo $SCRIPT_PATH/git-submodule-checkout.sh ) -# so any echo messages and exit codes are being "eaten" by the eval clause. -# But, not sure it needs to be evaled for repoScript? +# so any echo messages and exit codes are being "eaten" by the eval clause. +# But, not sure it needs to be evaled for repoScript? # If needed, will need to write to "buildFailed_ type of file, then check for that file # after its called. But, for now, will write to TRACE_OUTPUT @@ -12,59 +12,59 @@ name="$1"; shift VAL=$( grep "^${name}:" "$REPOSITORIES_TXT" | cut -f2 -d" ") -# Here we count on $BUILD_TYPE being exported. TODO: make parameter later? -if [[ -n "$BUILD_TYPE" && "$BUILD_TYPE" == "N" ]] +# Here we count on $BUILD_TYPE being exported. TODO: make parameter later? +if [[ -n "$BUILD_TYPE" && "$BUILD_TYPE" == "N" ]] then - if [[ "master" != $VAL ]] - then - echo "INFO: Branch forced to 'master', instead of '$VAL', since doing N-Build" >> ${TRACE_OUTPUT} - VAL="master" - fi + if [[ "master" != $VAL ]] + then + echo "INFO: Branch forced to 'master', instead of '$VAL', since doing N-Build" >> ${TRACE_OUTPUT} + VAL="master" + fi fi if [ -z "$VAL" ]; then - echo "WARNING: No tag or branch specified for $name in repositories.txt" >> ${TRACE_OUTPUT} - echo " Has a submodule been added? Perhaps just commented out?" >> ${TRACE_OUTPUT} - echo " Will use what ever was last added to aggregator" >> ${TRACE_OUTPUT} - # is this ever an error? - exit + echo "WARNING: No tag or branch specified for $name in repositories.txt" >> ${TRACE_OUTPUT} + echo " Has a submodule been added? Perhaps just commented out?" >> ${TRACE_OUTPUT} + echo " Will use what ever was last added to aggregator" >> ${TRACE_OUTPUT} + # is this ever an error? + exit fi -# always fetch before checkout, to be sure new +# always fetch before checkout, to be sure new # branches are in local repo (in case we are switching # to a new branch or tag). git fetch RC=$? if [[ $RC != 0 ]] -then - echo "ERROR: Return code of $RC during fetch of $name repository" >> ${TRACE_OUTPUT} - exit $RC +then + echo "ERROR: Return code of $RC during fetch of $name repository" >> ${TRACE_OUTPUT} + exit $RC fi if [ -z "$(git tag -l $VAL)" ]; then - echo Updating branch $VAL - git checkout $VAL - RC=$? - if [[ $RC != 0 ]] - then - echo "ERROR: Return code of $RC during checkout of $VAL for repository $name" >> ${TRACE_OUTPUT} - exit $RC - fi - git pull - RC=$? - if [[ $RC != 0 ]] - then - echo "ERROR: Return code of $RC during pull for repository $name" >> ${TRACE_OUTPUT} - exit $RC - fi + echo Updating branch $VAL + git checkout $VAL + RC=$? + if [[ $RC != 0 ]] + then + echo "ERROR: Return code of $RC during checkout of $VAL for repository $name" >> ${TRACE_OUTPUT} + exit $RC + fi + git pull + RC=$? + if [[ $RC != 0 ]] + then + echo "ERROR: Return code of $RC during pull for repository $name" >> ${TRACE_OUTPUT} + exit $RC + fi else - echo Updating to tag $VAL - git checkout $VAL - RC=$? - if [[ $RC != 0 ]] - then - echo "ERROR: Return code of $RC during checkout of $VAL for repository $name" >> ${TRACE_OUTPUT} - exit $RC - fi + echo Updating to tag $VAL + git checkout $VAL + RC=$? + if [[ $RC != 0 ]] + then + echo "ERROR: Return code of $RC during checkout of $VAL for repository $name" >> ${TRACE_OUTPUT} + exit $RC + fi fi diff --git a/production/master-build.sh b/production/master-build.sh index 851fc138e..be2f0e4f0 100644 --- a/production/master-build.sh +++ b/production/master-build.sh @@ -3,48 +3,48 @@ RAWDATE=$( date +%s ) if [ $# -ne 1 ]; then - echo USAGE: $0 env_file - exit 1 + echo USAGE: $0 env_file + exit 1 fi INITIAL_ENV_FILE=$1 if [ ! -r "$INITIAL_ENV_FILE" ]; then - echo "$INITIAL_ENV_FILE" cannot be read - echo USAGE: $0 env_file - exit 1 + echo "$INITIAL_ENV_FILE" cannot be read + echo USAGE: $0 env_file + exit 1 fi export BUILD_TIME_PATCHES=${BUILD_TIME_PATCHES:-false} -# force "test build" if doing patch build (since, it really is for tests) -# and this simply makes sure a human does not forget the "-t" and end up -# trying to push some patched build (and promoting to downloads). +# force "test build" if doing patch build (since, it really is for tests) +# and this simply makes sure a human does not forget the "-t" and end up +# trying to push some patched build (and promoting to downloads). if [[ "${BUILD_TIME_PATCHES}" == "true" ]] then - testbuildonly=true + testbuildonly=true fi # remember, local "test builds" that use this script must change -# or override 'GIT_PUSH' to simply echo, not actually push. Only +# or override 'GIT_PUSH' to simply echo, not actually push. Only # e4Build should 'push' these tags. #GIT_PUSH='echo git push' if [[ "${testbuildonly}" == "true" ]] then - GIT_PUSH='echo no git push since testbuildonly' + GIT_PUSH='echo no git push since testbuildonly' fi if [[ "${BUILD_TIME_PATCHES}" == "true" ]] then - GIT_PUSH='echo no git push since testbuildonly AND patched build' + GIT_PUSH='echo no git push since testbuildonly AND patched build' fi if [[ "${BUILD_TYPE}" == "N" ]] then - GIT_PUSH='echo no git push done since Nightly' + GIT_PUSH='echo no git push done since Nightly' fi if [[ "${BUILD_TYPE}" =~ [XY] ]] then - GIT_PUSH='echo no git push done since Experimental build' + GIT_PUSH='echo no git push done since Experimental build' fi GIT_PUSH=${GIT_PUSH:-'git push'} @@ -57,8 +57,8 @@ source "${SCRIPT_PATH}/build-functions.shsource" source "${INITIAL_ENV_FILE}" -# BUILD_KIND allows fine tuning of how promoted, tested, download site name, etc. -# CBI is only primary production build value. In future may use special values for +# BUILD_KIND allows fine tuning of how promoted, tested, download site name, etc. +# CBI is only primary production build value. In future may use special values for # special cases, such as TEST, JAVA8, etc. export BUILD_KIND=${BUILD_KIND:-CBI} @@ -68,31 +68,31 @@ buildrc=0 # derived values -# correct values for cbi-jdt-repo.url and cbi-jdt-version are -# codified in the parent pom. These variables give an easy way -# to test "experimental versions" in production build. +# correct values for cbi-jdt-repo.url and cbi-jdt-version are +# codified in the parent pom. These variables give an easy way +# to test "experimental versions" in production build. if [[ -n $CBI_JDT_REPO_URL ]] then - export CBI_JDT_REPO_URL_ARG="-Dcbi-jdt-repo.url=$CBI_JDT_REPO_URL" + export CBI_JDT_REPO_URL_ARG="-Dcbi-jdt-repo.url=$CBI_JDT_REPO_URL" fi if [[ -n $CBI_JDT_VERSION ]] then - export CBI_JDT_VERSION_ARG="-Dcbi-jdt-version=$CBI_JDT_VERSION" + export CBI_JDT_VERSION_ARG="-Dcbi-jdt-version=$CBI_JDT_VERSION" fi BUILD_ID=$(fn-build-id "$BUILD_TYPE" ) export buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" ) if [[ -z "${buildDirectory}" ]] then - echo "PROGRAM ERROR: buildDirectory returned from fn-build-dir was empty" - exit 1 -else - # this should be when we first create buildDirectory - echo "Making buildDirectory: ${buildDirectory}" - mkdir -p "${buildDirectory}" - # it appears GID bit is not always set correctly, so we'll do so explicitly - chmod -c g+s "${buildDirectory}" + echo "PROGRAM ERROR: buildDirectory returned from fn-build-dir was empty" + exit 1 +else + # this should be when we first create buildDirectory + echo "Making buildDirectory: ${buildDirectory}" + mkdir -p "${buildDirectory}" + # it appears GID bit is not always set correctly, so we'll do so explicitly + chmod -c g+s "${buildDirectory}" fi export logsDirectory="${buildDirectory}/buildlogs" mkdir -p "${logsDirectory}" @@ -105,14 +105,14 @@ BUILD_PRETTY_DATE=$( date --date='@'$RAWDATE ) TIMESTAMP=$( date +%Y%m%d-%H%M --date='@'$RAWDATE ) # TRACE_OUTPUT is not normally used. But, it comes in handy for debugging -# when output from some functions can not be written to stdout or stderr +# when output from some functions can not be written to stdout or stderr # (due to the nature of the function ... it's "output" being its returned value). -# When needed for local debugging, usually more convenient to provide -# a value relative to PWD in startup scripts. +# When needed for local debugging, usually more convenient to provide +# a value relative to PWD in startup scripts. export TRACE_OUTPUT=${TRACE_OUTPUT:-$buildDirectory/buildlogs/trace_output.txt} echo $BUILD_PRETTY_DATE > ${TRACE_OUTPUT} -# These files have variable/value pairs for this build, suitable for use in +# These files have variable/value pairs for this build, suitable for use in # shell scripts, PHP files, or as Ant (or Java) properties export BUILD_ENV_FILE=${buildDirectory}/buildproperties.shsource export BUILD_ENV_FILE_PHP=${buildDirectory}/buildproperties.php @@ -122,42 +122,42 @@ gitCache=$( fn-git-cache "$BUILD_ROOT" "$BRANCH" ) aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" ) export LOCAL_REPO="${BUILD_ROOT}"/localMavenRepo -# In production builds, we normally specify CLEAN_LOCAL, -# and remove any existing LOCAL_REPO, and re-fetch. -# But CLEAN_LOCAL can be overridden for remote builds, quick test builds, -# etc. +# In production builds, we normally specify CLEAN_LOCAL, +# and remove any existing LOCAL_REPO, and re-fetch. +# But CLEAN_LOCAL can be overridden for remote builds, quick test builds, +# etc. export CLEAN_LOCAL=${CLEAN_LOCAL:-true} -# We "remove" by moving to backup, in case there's ever any reason to -# compare "what's changed". +# We "remove" by moving to backup, in case there's ever any reason to +# compare "what's changed". if [[ -d ${LOCAL_REPO} && "${CLEAN_LOCAL}" == "true" ]] then - # remove existing backup, if it exists - rm -fr ${LOCAL_REPO}.bak 2>/dev/null - mv ${LOCAL_REPO} ${LOCAL_REPO}.bak + # remove existing backup, if it exists + rm -fr ${LOCAL_REPO}.bak 2>/dev/null + mv ${LOCAL_REPO} ${LOCAL_REPO}.bak fi export STREAMS_PATH="${aggDir}/streams" BUILD_TYPE_NAME="Integration" if [ "$BUILD_TYPE" = M ]; then - BUILD_TYPE_NAME="Maintenance" + BUILD_TYPE_NAME="Maintenance" elif [ "$BUILD_TYPE" = N ]; then - BUILD_TYPE_NAME="Nightly (HEAD)" + BUILD_TYPE_NAME="Nightly (HEAD)" elif [ "$BUILD_TYPE" = X ]; then - BUILD_TYPE_NAME="Experimental Branch" + BUILD_TYPE_NAME="Experimental Branch" elif [ "$BUILD_TYPE" = Y ]; then - BUILD_TYPE_NAME="Experimental Branch" + BUILD_TYPE_NAME="Experimental Branch" elif [ "$BUILD_TYPE" = P ]; then - BUILD_TYPE_NAME="Patch" + BUILD_TYPE_NAME="Patch" elif [ "$BUILD_TYPE" = S ]; then - BUILD_TYPE_NAME="Stable (Milestone)" + BUILD_TYPE_NAME="Stable (Milestone)" fi -# we need this value for later, post build processing, so want it saved to variables file. -# We can either compute here, +# we need this value for later, post build processing, so want it saved to variables file. +# We can either compute here, # or just make sure it matches that is in parent pom for various streams (e.g. 4.3 vs 4.4) -# and build types, (e.g. M vs. I). For N builds, we still use "I". -# 5/31013. We no longer do the post build comparator, but leaving it, just -# in case we want an occasionally double check ... but, should never be routine. +# and build types, (e.g. M vs. I). For N builds, we still use "I". +# 5/31013. We no longer do the post build comparator, but leaving it, just +# in case we want an occasionally double check ... but, should never be routine. #comparatorRepository=http://download.eclipse.org/eclipse/updates/4.4-I-builds comparatorRepository=NOT_CURRENTLY_USED @@ -167,9 +167,9 @@ POM_VERSION_UPDATE_BUILD_LOG="${logsDirectory}/mb050_pom-version-updater_output. RUN_MAVEN_BUILD_LOG="${logsDirectory}/mb060_run-maven-build_output.txt" GATHER_PARTS_BUILD_LOG="${logsDirectory}/mb070_gather-parts_output.txt" -# These variables, from original env file, are re-written to BUILD_ENV_FILE, -# with values for this build (some of them computed) partially for documentation, and -# partially so this build can be re-ran or re-started using it, instead of +# These variables, from original env file, are re-written to BUILD_ENV_FILE, +# with values for this build (some of them computed) partially for documentation, and +# partially so this build can be re-ran or re-started using it, instead of # original env file, which would compute different values (in some cases). # The function also writes into appropriate PHP files and Properties files. # Init once, here at beginning, but don't close until much later since other functions @@ -211,7 +211,7 @@ fn-write-property JAVA_DOC_TOOL # any value of interest/usefulness can be added to BUILD_ENV_FILE if [[ "${testbuildonly}" == "true" ]] then - fn-write-property testbuildonly + fn-write-property testbuildonly fi fn-write-property BUILD_ENV_FILE fn-write-property BUILD_ENV_FILE_PHP @@ -231,150 +231,150 @@ $SCRIPT_PATH/get-aggregator.sh $BUILD_ENV_FILE 2>&1 | tee ${GET_AGGREGATOR_BUILD # if file exists, then get-aggregator failed if [[ -f "${buildDirectory}/buildFailed-get-aggregator" ]] then - buildrc=1 - # Git sometimes fails (returns non-zero error codes) for "warnings". - # In most cases, but not all, these would be considered errors. - /bin/grep "^warning: \|\[ERROR\]" "${GET_AGGREGATOR_BUILD_LOG}" >> "${buildDirectory}/buildFailed-get-aggregator" - BUILD_FAILED="${GET_AGGREGATOR_BUILD_LOG}" - fn-write-property BUILD_FAILED + buildrc=1 + # Git sometimes fails (returns non-zero error codes) for "warnings". + # In most cases, but not all, these would be considered errors. + /bin/grep "^warning: \|\[ERROR\]" "${GET_AGGREGATOR_BUILD_LOG}" >> "${buildDirectory}/buildFailed-get-aggregator" + BUILD_FAILED="${GET_AGGREGATOR_BUILD_LOG}" + fn-write-property BUILD_FAILED else - # if get-aggregator failed, there is no reason to try and update input or run build - $SCRIPT_PATH/update-build-input.sh $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/mb020_update-build-input_output.txt - checkForErrorExit $? "Error occurred while updating build input" - - if $BUILD_TIME_PATCHES ; then - # temp patches for bugs - # apply the pre-created patch from tempPatches - # patches created, typically, by navigating to repoToPath, then - # git diff --no-prefix > ../eclipse.platform.releng.aggregator/production/tempPatches/<patchFileName> - # (then commit and push change to "tempPatches" directory, with normal ID, not with build id) - - repoToPatch=eclipse.jdt.core - patchFile=jdtComparatorFix.patch - echo "INFO: apply patch file, $patchFile, in repo $repoToPatch" - patch -p0 --backup -d $aggDir/$repoToPatch -i $aggDir/production/tempPatches/$patchFile - #checkForErrorExit $? "Error occurred applying patch" - - # Note: to "simulate" qualifier increases, when needed, - # the fix/patch must be "committed" (to build repo, not pushed to origin). - # This requires more effort to "reset" ... say to HEAD~1, or re-clone the repo, - # or else the 'checkout/pull' in next run will not succeed. - echo "INFO: commit to build machine repository (no push): $repoToPatch" - pushd $aggDir/$repoToPatch/ - git commit --all -m "temp patch for testing" - #checkForErrorExit $? "Error occurred committing patch" - popd - - # Note: to "simulate" qualifier increases, when needed, - # the fix/patch must be "committed" (to build repo, not pushed to origin). - # This requires more effort to "reset" ... say to HEAD~1, or re-clone the repo, - # or else the 'checkout/pull' in next run will not succeed. - #pushd $aggDir/$repoToPatch - #git commit --all -m "temp patch for testing" - #checkForErrorExit $? "Error occurred committing patch" - #popd - - #repoToPatch=rt.equinox.p2 - #patchFile=p2SourceFix.patch - #echo "INFO: apply patch file, $patchFile, in repo $repoToPatch" - - #patch -p0 --backup -d $aggDir/$repoToPatch -i $aggDir/production/tempPatches/$patchFile - #checkForErrorExit $? "Error occurred applying patch" - - - fi - - # We always make tag commits, if build successful or not, but don't push - # back to origin if doing N builds or test builds. - pushd "$aggDir" - git commit -m "Build input for build $BUILD_ID" - echo "RC from commit with $BUILD_ID: $?" - # exits with 1 here ... with warning, if commit already exists? - #checkForErrorExit $? "Error occurred during commit of build_id" - - # GIT_PUSH just echos, for N builds and test builds - $GIT_PUSH origin HEAD - #checkForErrorExit $? "Error occurred during push of build_id commit" + # if get-aggregator failed, there is no reason to try and update input or run build + $SCRIPT_PATH/update-build-input.sh $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/mb020_update-build-input_output.txt + checkForErrorExit $? "Error occurred while updating build input" + + if $BUILD_TIME_PATCHES ; then + # temp patches for bugs + # apply the pre-created patch from tempPatches + # patches created, typically, by navigating to repoToPath, then + # git diff --no-prefix > ../eclipse.platform.releng.aggregator/production/tempPatches/<patchFileName> + # (then commit and push change to "tempPatches" directory, with normal ID, not with build id) + + repoToPatch=eclipse.jdt.core + patchFile=jdtComparatorFix.patch + echo "INFO: apply patch file, $patchFile, in repo $repoToPatch" + patch -p0 --backup -d $aggDir/$repoToPatch -i $aggDir/production/tempPatches/$patchFile + #checkForErrorExit $? "Error occurred applying patch" + + # Note: to "simulate" qualifier increases, when needed, + # the fix/patch must be "committed" (to build repo, not pushed to origin). + # This requires more effort to "reset" ... say to HEAD~1, or re-clone the repo, + # or else the 'checkout/pull' in next run will not succeed. + echo "INFO: commit to build machine repository (no push): $repoToPatch" + pushd $aggDir/$repoToPatch/ + git commit --all -m "temp patch for testing" + #checkForErrorExit $? "Error occurred committing patch" popd - $SCRIPT_PATH/tag-build-input.sh $BUILD_ENV_FILE 2>&1 | tee $TAG_BUILD_INPUT_LOG - checkForErrorExit $? "Error occurred during tag of build input" - - # At this point, everything should be checked out, updated, and tagged - # (tagged unless N build or test build) - # So is a good point to capture listing of build input to directory.txt file. - # TODO: hard to find good/easy git commands that work for any repo, - # to query actual branches/commits/tags on remote, in a reliable way? - pushd "$aggDir" - # = = = = directtory.txt section - echo "# Build ${BUILD_ID}, ${BUILD_PRETTY_DATE}" > ${buildDirectory}/directory.txt - - echo "# " >> ${buildDirectory}/directory.txt - echo "# This is simply a listing of repositories.txt. Remember that for N-builds, " >> ${buildDirectory}/directory.txt - echo "# 'master' is always used, and N-builds are not tagged." >> ${buildDirectory}/directory.txt - echo "# I and M builds are tagged with buildId: ${BUILD_ID} " >> ${buildDirectory}/directory.txt - echo "# (when repository is a branch, which it typcally is)." >> ${buildDirectory}/directory.txt - echo "# " >> ${buildDirectory}/directory.txt - - if [[ $BUILD_TYPE =~ [IMXYP] ]] - then - AGGRCOMMIT=$( git rev-parse HEAD ) - echo "eclipse.platform.releng.aggregator TAGGED: ${BUILD_ID}" >> ${buildDirectory}/directory.txt - echo " http://git.eclipse.org/c/platform/eclipse.platform.releng.aggregator.git/commit/?id=${AGGRCOMMIT}" >> ${buildDirectory}/directory.txt - fi - - echo "# " >> ${buildDirectory}/directory.txt - echo "# .../streams/repositories${PATCH_BUILD}.txt" >> ${buildDirectory}/directory.txt - echo "# " >> ${buildDirectory}/directory.txt - cat $STREAMS_PATH/repositories${PATCH_BUILD}.txt >> ${buildDirectory}/directory.txt - echo "# " >> ${buildDirectory}/directory.txt - - - # = = = = relengirectory.txt section - echo "# " >> ${logsDirectory}/relengdirectory.txt - echo "# Build Input: " >> ${logsDirectory}/relengdirectory.txt - $SCRIPT_PATH/git-doclog >> ${logsDirectory}/relengdirectory.txt - git submodule foreach --quiet $SCRIPT_PATH/git-doclog >> ${logsDirectory}/relengdirectory.txt - echo "# " >> ${logsDirectory}/relengdirectory.txt - popd - - - $SCRIPT_PATH/pom-version-updater.sh $BUILD_ENV_FILE 2>&1 | tee ${POM_VERSION_UPDATE_BUILD_LOG} - # if file exists, pom update failed - if [[ -f "${buildDirectory}/buildFailed-pom-version-updater" ]] + # Note: to "simulate" qualifier increases, when needed, + # the fix/patch must be "committed" (to build repo, not pushed to origin). + # This requires more effort to "reset" ... say to HEAD~1, or re-clone the repo, + # or else the 'checkout/pull' in next run will not succeed. + #pushd $aggDir/$repoToPatch + #git commit --all -m "temp patch for testing" + #checkForErrorExit $? "Error occurred committing patch" + #popd + + #repoToPatch=rt.equinox.p2 + #patchFile=p2SourceFix.patch + #echo "INFO: apply patch file, $patchFile, in repo $repoToPatch" + + #patch -p0 --backup -d $aggDir/$repoToPatch -i $aggDir/production/tempPatches/$patchFile + #checkForErrorExit $? "Error occurred applying patch" + + + fi + + # We always make tag commits, if build successful or not, but don't push + # back to origin if doing N builds or test builds. + pushd "$aggDir" + git commit -m "Build input for build $BUILD_ID" + echo "RC from commit with $BUILD_ID: $?" + # exits with 1 here ... with warning, if commit already exists? + #checkForErrorExit $? "Error occurred during commit of build_id" + + # GIT_PUSH just echos, for N builds and test builds + $GIT_PUSH origin HEAD + #checkForErrorExit $? "Error occurred during push of build_id commit" + popd + + $SCRIPT_PATH/tag-build-input.sh $BUILD_ENV_FILE 2>&1 | tee $TAG_BUILD_INPUT_LOG + checkForErrorExit $? "Error occurred during tag of build input" + + # At this point, everything should be checked out, updated, and tagged + # (tagged unless N build or test build) + # So is a good point to capture listing of build input to directory.txt file. + # TODO: hard to find good/easy git commands that work for any repo, + # to query actual branches/commits/tags on remote, in a reliable way? + pushd "$aggDir" + # = = = = directtory.txt section + echo "# Build ${BUILD_ID}, ${BUILD_PRETTY_DATE}" > ${buildDirectory}/directory.txt + + echo "# " >> ${buildDirectory}/directory.txt + echo "# This is simply a listing of repositories.txt. Remember that for N-builds, " >> ${buildDirectory}/directory.txt + echo "# 'master' is always used, and N-builds are not tagged." >> ${buildDirectory}/directory.txt + echo "# I and M builds are tagged with buildId: ${BUILD_ID} " >> ${buildDirectory}/directory.txt + echo "# (when repository is a branch, which it typcally is)." >> ${buildDirectory}/directory.txt + echo "# " >> ${buildDirectory}/directory.txt + + if [[ $BUILD_TYPE =~ [IMXYP] ]] + then + AGGRCOMMIT=$( git rev-parse HEAD ) + echo "eclipse.platform.releng.aggregator TAGGED: ${BUILD_ID}" >> ${buildDirectory}/directory.txt + echo " http://git.eclipse.org/c/platform/eclipse.platform.releng.aggregator.git/commit/?id=${AGGRCOMMIT}" >> ${buildDirectory}/directory.txt + fi + + echo "# " >> ${buildDirectory}/directory.txt + echo "# .../streams/repositories${PATCH_BUILD}.txt" >> ${buildDirectory}/directory.txt + echo "# " >> ${buildDirectory}/directory.txt + cat $STREAMS_PATH/repositories${PATCH_BUILD}.txt >> ${buildDirectory}/directory.txt + echo "# " >> ${buildDirectory}/directory.txt + + + # = = = = relengirectory.txt section + echo "# " >> ${logsDirectory}/relengdirectory.txt + echo "# Build Input: " >> ${logsDirectory}/relengdirectory.txt + $SCRIPT_PATH/git-doclog >> ${logsDirectory}/relengdirectory.txt + git submodule foreach --quiet $SCRIPT_PATH/git-doclog >> ${logsDirectory}/relengdirectory.txt + echo "# " >> ${logsDirectory}/relengdirectory.txt + popd + + + $SCRIPT_PATH/pom-version-updater.sh $BUILD_ENV_FILE 2>&1 | tee ${POM_VERSION_UPDATE_BUILD_LOG} + # if file exists, pom update failed + if [[ -f "${buildDirectory}/buildFailed-pom-version-updater" ]] + then + buildrc=1 + /bin/grep "\[ERROR\]" "${POM_VERSION_UPDATE_BUILD_LOG}" >> "${buildDirectory}/buildFailed-pom-version-updater" + echo "BUILD FAILED. See ${POM_VERSION_UPDATE_BUILD_LOG}." + BUILD_FAILED=${POM_VERSION_UPDATE_BUILD_LOG} + fn-write-property BUILD_FAILED + else + # if updater failed, something fairly large is wrong, so no need to compile + $SCRIPT_PATH/run-maven-build.sh $BUILD_ENV_FILE 2>&1 | tee ${RUN_MAVEN_BUILD_LOG} + # if file exists, then run maven build failed. + if [[ -f "${buildDirectory}/buildFailed-run-maven-build" ]] then + buildrc=1 + /bin/grep "\[ERROR\]" "${RUN_MAVEN_BUILD_LOG}" >> "${buildDirectory}/buildFailed-run-maven-build" + BUILD_FAILED=${RUN_MAVEN_BUILD_LOG} + fn-write-property BUILD_FAILED + # TODO: eventually put in more logic to "track" the failure, so + # proper actions and emails can be sent. For example, we'd still want to + # publish what we have, but not start the tests. + echo "BUILD FAILED. See ${RUN_MAVEN_BUILD_LOG}." + else + # if build run maven build failed, no need to gather parts + $SCRIPT_PATH/gather-parts.sh $BUILD_ENV_FILE 2>&1 | tee ${GATHER_PARTS_BUILD_LOG} + if [[ -f "${buildDirectory}/buildFailed-gather-parts" ]] + then buildrc=1 - /bin/grep "\[ERROR\]" "${POM_VERSION_UPDATE_BUILD_LOG}" >> "${buildDirectory}/buildFailed-pom-version-updater" - echo "BUILD FAILED. See ${POM_VERSION_UPDATE_BUILD_LOG}." - BUILD_FAILED=${POM_VERSION_UPDATE_BUILD_LOG} + /bin/grep -i "ERROR" "${GATHER_PARTS_BUILD_LOG}" >> "${buildDirectory}/buildFailed-gather-parts" + BUILD_FAILED=${GATHER_PARTS_BUILD_LOG} fn-write-property BUILD_FAILED - else - # if updater failed, something fairly large is wrong, so no need to compile - $SCRIPT_PATH/run-maven-build.sh $BUILD_ENV_FILE 2>&1 | tee ${RUN_MAVEN_BUILD_LOG} - # if file exists, then run maven build failed. - if [[ -f "${buildDirectory}/buildFailed-run-maven-build" ]] - then - buildrc=1 - /bin/grep "\[ERROR\]" "${RUN_MAVEN_BUILD_LOG}" >> "${buildDirectory}/buildFailed-run-maven-build" - BUILD_FAILED=${RUN_MAVEN_BUILD_LOG} - fn-write-property BUILD_FAILED - # TODO: eventually put in more logic to "track" the failure, so - # proper actions and emails can be sent. For example, we'd still want to - # publish what we have, but not start the tests. - echo "BUILD FAILED. See ${RUN_MAVEN_BUILD_LOG}." - else - # if build run maven build failed, no need to gather parts - $SCRIPT_PATH/gather-parts.sh $BUILD_ENV_FILE 2>&1 | tee ${GATHER_PARTS_BUILD_LOG} - if [[ -f "${buildDirectory}/buildFailed-gather-parts" ]] - then - buildrc=1 - /bin/grep -i "ERROR" "${GATHER_PARTS_BUILD_LOG}" >> "${buildDirectory}/buildFailed-gather-parts" - BUILD_FAILED=${GATHER_PARTS_BUILD_LOG} - fn-write-property BUILD_FAILED - echo "BUILD FAILED. See ${GATHER_PARTS_BUILD_LOG}." - fi - fi + echo "BUILD FAILED. See ${GATHER_PARTS_BUILD_LOG}." + fi fi + fi fi $SCRIPT_PATH/publish-eclipse.sh $BUILD_ENV_FILE >$logsDirectory/mb080_publish-eclipse_output.txt @@ -382,30 +382,30 @@ checkForErrorExit $? "Error occurred during publish-eclipse" # We don't publish repo if there was a build failure, it likely doesn't exist. -if [[ -z "${BUILD_FAILED}" ]] +if [[ -z "${BUILD_FAILED}" ]] then - $SCRIPT_PATH/publish-repo.sh $BUILD_ENV_FILE >$logsDirectory/mb083_publish-repo_output.txt - checkForErrorExit $? "Error occurred during publish-repo" + $SCRIPT_PATH/publish-repo.sh $BUILD_ENV_FILE >$logsDirectory/mb083_publish-repo_output.txt + checkForErrorExit $? "Error occurred during publish-repo" else - echo "No repo published, since BUILD_FAILED" -fi + echo "No repo published, since BUILD_FAILED" +fi #For now, only "publish equinox and promote" if N, I or M build, skip if P, X, or Y -# TODO: probably never need to promote equinox, for patch build? -# TODO: Unclear how/when to send mailing list notification for patch builds. +# TODO: probably never need to promote equinox, for patch build? +# TODO: Unclear how/when to send mailing list notification for patch builds. -if [[ $BUILD_TYPE =~ [NIM] ]] +if [[ $BUILD_TYPE =~ [NIM] ]] then - # We don't promote equinox if there was a build failure, and we should not even try to - # create the site locally, because it depends heavily on having a valid repository to - # work from. - if [[ -z "${BUILD_FAILED}" ]] - then - $SCRIPT_PATH/publish-equinox.sh $BUILD_ENV_FILE >$logsDirectory/mb085_publish-equinox_output.txt - checkForErrorExit $? "Error occurred during publish-equinox" - fi + # We don't promote equinox if there was a build failure, and we should not even try to + # create the site locally, because it depends heavily on having a valid repository to + # work from. + if [[ -z "${BUILD_FAILED}" ]] + then + $SCRIPT_PATH/publish-equinox.sh $BUILD_ENV_FILE >$logsDirectory/mb085_publish-equinox_output.txt + checkForErrorExit $? "Error occurred during publish-equinox" + fi fi # if all ended well, put "promotion scripts" in known locations @@ -414,7 +414,7 @@ checkForErrorExit $? "Error occurred during promote-build" fn-write-property-close -# dump ALL environment variables in case its helpful in documenting or +# dump ALL environment variables in case its helpful in documenting or # debugging build results or differences between runs, especially on different machines env 1>$logsDirectory/mb100_all-env-variables_output.txt diff --git a/production/parse-logs.sh b/production/parse-logs.sh index 61f437475..13b6bda40 100644 --- a/production/parse-logs.sh +++ b/production/parse-logs.sh @@ -2,14 +2,14 @@ # if [ $# -ne 1 ]; then - echo USAGE: $0 env_file - exit 1 + echo USAGE: $0 env_file + exit 1 fi if [ ! -r "$1" ]; then - echo "$1" cannot be read - echo USAGE: $0 env_file - exit 1 + echo "$1" cannot be read + echo USAGE: $0 env_file + exit 1 fi SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)} @@ -26,7 +26,7 @@ gitCache=$( fn-git-cache "$BUILD_ROOT" "$BRANCH" ) aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" ) if [ -z "$BUILD_ID" ]; then - BUILD_ID=$(fn-build-id "$BUILD_TYPE" ) + BUILD_ID=$(fn-build-id "$BUILD_TYPE" ) fi buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "${STREAM}" ) @@ -41,5 +41,5 @@ launcherJar=$( fn-basebuilder-launcher "$basebuilderDir" ) EBuilderDir="$buildDirectory"/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder fn-parse-compile-logs "$BUILD_ID" \ - "${EBuilderDir}/eclipse/buildScripts/eclipse_convert.xml" \ - "$buildDirectory" "$launcherJar" + "${EBuilderDir}/eclipse/buildScripts/eclipse_convert.xml" \ + "$buildDirectory" "$launcherJar" diff --git a/production/parse-opts.sh b/production/parse-opts.sh index 220bff0f5..81447f981 100644 --- a/production/parse-opts.sh +++ b/production/parse-opts.sh @@ -7,15 +7,15 @@ set -- $( getopt -l buildArea:,stream:,branch: -o "" -- "$@" ) while [ $# -gt 0 ]; do - case "$1" in - "--buildArea") - buildArea="$2"; shift;; - "--stream") - stream="$2"; shift;; - "--branch") - branch="$2"; shift;; - esac - shift + case "$1" in + "--buildArea") + buildArea="$2"; shift;; + "--stream") + stream="$2"; shift;; + "--branch") + branch="$2"; shift;; + esac + shift done buildArea_branch=$buildArea/$branch @@ -23,6 +23,6 @@ gitCache=$buildArea_branch/gitCache if [ -r $gitCache/eclipse.platform.releng.aggregator ]; then - pushd $gitCache/eclipse.platform.releng.aggregator + pushd $gitCache/eclipse.platform.releng.aggregator else fi diff --git a/production/pom-version-updater.sh b/production/pom-version-updater.sh index 9d7d248bb..3b2b690c4 100755 --- a/production/pom-version-updater.sh +++ b/production/pom-version-updater.sh @@ -2,14 +2,14 @@ # if [ $# -ne 1 ]; then - echo USAGE: $0 env_file - exit 1 + echo USAGE: $0 env_file + exit 1 fi if [ ! -r "$1" ]; then - echo "$1" cannot be read - echo USAGE: $0 env_file - exit 1 + echo "$1" cannot be read + echo USAGE: $0 env_file + exit 1 fi SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)} @@ -27,18 +27,18 @@ aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" ) buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" ) if [ -z "$BUILD_ID" ]; then - BUILD_ID=$(fn-build-id "$BUILD_TYPE" ) + BUILD_ID=$(fn-build-id "$BUILD_TYPE" ) fi fn-pom-version-updater "$aggDir" "$LOCAL_REPO" $MVN_DEBUG $MVN_QUIET RC=$? if [[ $RC != 0 ]] then - buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" ) - # create as "indicator file" ... gets filled in more once there is a log to grep - touch "${buildDirectory}/buildFailed-pom-version-updater" - echo "ERROR: fn-pom-version-updator returned non-zero return code: $RC" - exit $RC1 + buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" ) + # create as "indicator file" ... gets filled in more once there is a log to grep + touch "${buildDirectory}/buildFailed-pom-version-updater" + echo "ERROR: fn-pom-version-updator returned non-zero return code: $RC" + exit $RC1 fi -fn-pom-version-report "$BUILD_ID" "$aggDir" "$buildDirectory" +fn-pom-version-report "$BUILD_ID" "$aggDir" "$buildDirectory" diff --git a/production/promote-build.sh b/production/promote-build.sh index 9cfaf0018..d02a5b384 100755 --- a/production/promote-build.sh +++ b/production/promote-build.sh @@ -1,39 +1,39 @@ #!/usr/bin/env bash -# Utility to trigger the promotion of build. This utility just creates -# a file to be executed by cron job. The actual promotion is done by files +# Utility to trigger the promotion of build. This utility just creates +# a file to be executed by cron job. The actual promotion is done by files # in sdk directory of build machine. This "cron job approach" is required since -# a different user id must promote things to "downloads". The promotion scripts +# a different user id must promote things to "downloads". The promotion scripts # also trigger the unit tests on Hudson. -function usage () +function usage () { - printf "\n\n\t%s\n" "promote-build.sh (BUILD_KIND) if none specified, CBI assumed" + printf "\n\n\t%s\n" "promote-build.sh (BUILD_KIND) if none specified, CBI assumed" } BUILD_KIND=$1 if [[ -z "$BUILD_KIND" ]] then - BUILD_KIND=CBI + BUILD_KIND=CBI fi case $BUILD_KIND in - 'CBI' ) - echo "Promote Build from CBI" - # always assume true, for now, until debugged - # testbuildonly=true; + 'CBI' ) + echo "Promote Build from CBI" + # always assume true, for now, until debugged + # testbuildonly=true; - ;; - *) echo "ERROR: Invalid or missing argument to $(basename $0)"; - usage; - exit 1; - ;; + ;; + *) echo "ERROR: Invalid or missing argument to $(basename $0)"; + usage; + exit 1; + ;; esac if [[ -z ${SCRIPT_PATH} ]] then - SCRIPT_PATH=${PWD} + SCRIPT_PATH=${PWD} fi source $SCRIPT_PATH/build-functions.shsource @@ -56,21 +56,21 @@ mkdir -p "${promoteScriptLocationEclipse}" if [[ -z ${STREAM} || -z ${BUILD_ID} ]] then - echo "ERROR: This script requires STREAM and BUILD_ID" - exit 1 + echo "ERROR: This script requires STREAM and BUILD_ID" + exit 1 fi scriptName=promote-${STREAM}-${BUILD_ID}.sh if [[ "${testbuildonly}" == "true" ]] then - # allows the "test" creation of promotion script, but, not have it "seen" be cron job - scriptName=TEST-$scriptName + # allows the "test" creation of promotion script, but, not have it "seen" be cron job + scriptName=TEST-$scriptName fi -# if EBUILDER_HASH is not defined, assume master, so order of following parameters are maintained. -if [[ -z "${EBUILDER_HASH}" ]] +# if EBUILDER_HASH is not defined, assume master, so order of following parameters are maintained. +if [[ -z "${EBUILDER_HASH}" ]] then - EBUILDER_HASH=master + EBUILDER_HASH=master fi # Here is content of promtion script: @@ -78,54 +78,54 @@ ptimestamp=$( date +%Y%m%d%H%M ) echo "#!/usr/bin/env bash" > ${promoteScriptLocationEclipse}/${scriptName} echo "# promotion script created at $ptimestamp" >> ${promoteScriptLocationEclipse}/${scriptName} # TODO: changed "syncDropLocation" to handle a third parameter (BUILD_KIND) -# And now a fourth ... eBuilder HASHTAG,so won't always have to assume master, and +# And now a fourth ... eBuilder HASHTAG,so won't always have to assume master, and # so the tests can get their own copy. # and now a fifth, so we can 'source' all relevent variables ... in particular, we want -# to see if BUILD_FAILED is defined. +# to see if BUILD_FAILED is defined. echo "$workLocation/syncDropLocation.sh $STREAM $BUILD_ID $BUILD_KIND $EBUILDER_HASH $BUILD_ENV_FILE" >> ${promoteScriptLocationEclipse}/${scriptName} # we restrict "others" rights for a bit more security or safety from accidents chmod -v ug=rwx,o-rwx ${promoteScriptLocationEclipse}/${scriptName} -# we do not promote equinox, if BUILD_FAILED since no need. -if [[ -z "${BUILD_FAILED}" ]] +# we do not promote equinox, if BUILD_FAILED since no need. +if [[ -z "${BUILD_FAILED}" ]] then - # The 'workLocation' provides a handy central place to have the - # promote script, and log results. ASSUMING this works for all - # types of builds, etc (which is the goal for the sdk promotions). - workLocationEquinox=/shared/eclipse/equinox/promotion + # The 'workLocation' provides a handy central place to have the + # promote script, and log results. ASSUMING this works for all + # types of builds, etc (which is the goal for the sdk promotions). + workLocationEquinox=/shared/eclipse/equinox/promotion - # the cron job must know about and use this same - # location to look for its promotions scripts. (i.e. tight coupling) - promoteScriptLocationEquinox=${workLocationEquinox}/queue + # the cron job must know about and use this same + # location to look for its promotions scripts. (i.e. tight coupling) + promoteScriptLocationEquinox=${workLocationEquinox}/queue - # Directory should normally exist -- best to create with committer's ID before hand, - # but in case not. - mkdir -p "${promoteScriptLocationEquinox}" + # Directory should normally exist -- best to create with committer's ID before hand, + # but in case not. + mkdir -p "${promoteScriptLocationEquinox}" - equinoxPostingDirectory="$BUILD_ROOT/siteDir/equinox/drops" - eqFromDir=${equinoxPostingDirectory}/${buildId} - eqToDir="/home/data/httpd/download.eclipse.org/equinox/drops/" + equinoxPostingDirectory="$BUILD_ROOT/siteDir/equinox/drops" + eqFromDir=${equinoxPostingDirectory}/${buildId} + eqToDir="/home/data/httpd/download.eclipse.org/equinox/drops/" - # Note: for proper mirroring at Eclipse, we probably do not want/need to - # maintain "times" on build machine, but let them take times at time of copying. - # If it turns out to be important to maintain times (such as ran more than once, - # to pick up a "more" output, such as test results, then add -t to rsync - # Similarly, if download server is set up right, it will end up with the - # correct permissions, but if not, we may need to set some permissions first, - # then use -p on rsync + # Note: for proper mirroring at Eclipse, we probably do not want/need to + # maintain "times" on build machine, but let them take times at time of copying. + # If it turns out to be important to maintain times (such as ran more than once, + # to pick up a "more" output, such as test results, then add -t to rsync + # Similarly, if download server is set up right, it will end up with the + # correct permissions, but if not, we may need to set some permissions first, + # then use -p on rsync - # Here is content of promtion script (note, use same ptimestamp created above): - echo "#!/usr/bin/env bash" > ${promoteScriptLocationEquinox}/${scriptName} - echo "# promotion script created at $ptimestamp" > ${promoteScriptLocationEquinox}/${scriptName} - echo "rsync --times --omit-dir-times --recursive \"${eqFromDir}\" \"${eqToDir}\"" >> ${promoteScriptLocationEquinox}/${scriptName} + # Here is content of promtion script (note, use same ptimestamp created above): + echo "#!/usr/bin/env bash" > ${promoteScriptLocationEquinox}/${scriptName} + echo "# promotion script created at $ptimestamp" > ${promoteScriptLocationEquinox}/${scriptName} + echo "rsync --times --omit-dir-times --recursive \"${eqFromDir}\" \"${eqToDir}\"" >> ${promoteScriptLocationEquinox}/${scriptName} - # we restrict "others" rights for a bit more security or safety from accidents - chmod -v ug=rwx,o-rwx ${promoteScriptLocationEquinox}/${scriptName} + # we restrict "others" rights for a bit more security or safety from accidents + chmod -v ug=rwx,o-rwx ${promoteScriptLocationEquinox}/${scriptName} else - echo "Did not create promote script for equinox since BUILD_FAILED" + echo "Did not create promote script for equinox since BUILD_FAILED" fi echo "normal exit from promote phase of $(basename $0)" diff --git a/production/publish-eclipse.sh b/production/publish-eclipse.sh index 9bfec08d2..5847b8c83 100644 --- a/production/publish-eclipse.sh +++ b/production/publish-eclipse.sh @@ -2,14 +2,14 @@ # if [ $# -ne 1 ]; then - echo USAGE: $0 env_file - exit 1 + echo USAGE: $0 env_file + exit 1 fi if [ ! -r "$1" ]; then - echo "$1" cannot be read - echo USAGE: $0 env_file - exit 1 + echo "$1" cannot be read + echo USAGE: $0 env_file + exit 1 fi SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)} @@ -25,7 +25,7 @@ gitCache=$( fn-git-cache "$BUILD_ROOT" "$BRANCH" ) aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" ) if [ -z "$BUILD_ID" ]; then - BUILD_ID=$(fn-build-id "$BUILD_TYPE" ) + BUILD_ID=$(fn-build-id "$BUILD_TYPE" ) fi buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" ) @@ -41,15 +41,15 @@ EBuilderDir="$buildDirectory"/eclipse.platform.releng.aggregator/eclipse.platfor fn-gather-compile-logs "$BUILD_ID" "$aggDir" "$buildDirectory" fn-parse-compile-logs "$BUILD_ID" \ - "${EBuilderDir}/eclipse/helper.xml" \ - "$buildDirectory" "$launcherJar" + "${EBuilderDir}/eclipse/helper.xml" \ + "$buildDirectory" "$launcherJar" fn-summarize-comparator-logs "$BUILD_ID" \ - "${EBuilderDir}/eclipse/buildScripts/eclipse_compare.xml" \ - "$buildDirectory" "$launcherJar" + "${EBuilderDir}/eclipse/buildScripts/eclipse_compare.xml" \ + "$buildDirectory" "$launcherJar" fn-summarize-apitooling "$BUILD_ID" \ - "${EBuilderDir}/eclipse/buildScripts/api-tools-builder.xml" \ - "$buildDirectory" "$launcherJar" + "${EBuilderDir}/eclipse/buildScripts/api-tools-builder.xml" \ + "$buildDirectory" "$launcherJar" fn-publish-eclipse "$BUILD_TYPE" "$STREAM" "$BUILD_ID" "$aggDir" "$buildDirectory" "$launcherJar" diff --git a/production/publish-equinox.sh b/production/publish-equinox.sh index b9d1dd966..532925858 100644 --- a/production/publish-equinox.sh +++ b/production/publish-equinox.sh @@ -7,14 +7,14 @@ source buildeclipse.shsource 2>/dev/null export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds} if [ $# -ne 1 ]; then - echo USAGE: $0 env_file - exit 1 + echo USAGE: $0 env_file + exit 1 fi if [ ! -r "$1" ]; then - echo "$1" cannot be read - echo USAGE: $0 env_file - exit 1 + echo "$1" cannot be read + echo USAGE: $0 env_file + exit 1 fi SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)} @@ -29,17 +29,17 @@ source "$1" # STREAM: 4.3.0 fn-eq-build-dir () { - ROOT="$1"; shift - BUILD_ID="$1"; shift - STREAM="$1"; shift - eclipseStreamMajor=${STREAM:0:1} - buildType=${BUILD_ID:0:1} - dropDirSegment=${eclipseStreamMajor}${buildType}/siteDir/equinox/drops3 - if (( $eclipseStreamMajor > 3 )) - then - dropDirSegment=${eclipseStreamMajor}${buildType}/siteDir/equinox/drops - fi - echo $ROOT/$dropDirSegment/$BUILD_ID + ROOT="$1"; shift + BUILD_ID="$1"; shift + STREAM="$1"; shift + eclipseStreamMajor=${STREAM:0:1} + buildType=${BUILD_ID:0:1} + dropDirSegment=${eclipseStreamMajor}${buildType}/siteDir/equinox/drops3 + if (( $eclipseStreamMajor > 3 )) + then + dropDirSegment=${eclipseStreamMajor}${buildType}/siteDir/equinox/drops + fi + echo $ROOT/$dropDirSegment/$BUILD_ID } # USAGE: fn-eq-gather-starterkit BUILD_ID REPO_DIR BUILD_DIR @@ -48,58 +48,58 @@ fn-eq-build-dir () # BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747 fn-eq-gather-starterkit () { - if [[ $# != 3 ]] - then - echo "PROGRAM ERROR: this function, fn-eq-gather-starterkit, requires 3 arguments" - return 1 - fi - BUILD_ID="$1"; shift - REPO_DIR="$1"; shift - DROP_DIR="$1"; shift - TARGET_PRODUCTS="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/target/products - echo "Starting fn-eq-gather-starterkit" - echo "BUILD_ID: $BUILD_ID" - echo "REPO_DIR: $REPO_DIR" - echo "DROP_DIR: $DROP_DIR" - if [[ ! -d $DROP_DIR ]] - then - echo "Making DROP_DIR at $DROP_DIR" - mkdir -p $DROP_DIR - fi - if [[ -d "$TARGET_PRODUCTS" ]] - then - pushd "$TARGET_PRODUCTS" - - #cp -v org.eclipse.rt.osgistarterkit.product-aix.gtk.ppc64.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-aix-gtk-ppc64.zip - #cp -v org.eclipse.rt.osgistarterkit.product-aix.gtk.ppc.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-aix-gtk-ppc.zip - #cp -v org.eclipse.rt.osgistarterkit.product-hpux.gtk.ia64.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-hpux-gtk-ia64.zip - #cp -v org.eclipse.rt.osgistarterkit.product-linux.gtk.ppc64.tar.gz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-ppc64.tar.gz - #cp -v org.eclipse.rt.osgistarterkit.product-linux.gtk.ppc.tar.gz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-ppc.tar.gz - #cp -v org.eclipse.rt.osgistarterkit.product-linux.gtk.s390.tar.gz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-s390.tar.gz - #cp -v org.eclipse.rt.osgistarterkit.product-linux.gtk.s390x.tar.gz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-s390x.tar.gz - - cp -v org.eclipse.rt.osgistarterkit.product-linux.gtk.x86_64.tar.gz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-x86_64.tar.gz - cp -v org.eclipse.rt.osgistarterkit.product-linux.gtk.x86.tar.gz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-x86.tar.gz - - #cp -v org.eclipse.rt.osgistarterkit.product-macosx.cocoa.x86_64.tar.gz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz - tar cfz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz -C org.eclipse.rt.osgistarterkit.product/macosx/cocoa/x86_64 rt - #cp -v org.eclipse.rt.osgistarterkit.product-macosx.cocoa.x86.tar.gz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-macosx-cocoa-x86.tar.gz - # no longer an x86 version. Bug 420725 - #tar cfz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-macosx-cocoa-x86.tar.gz -C org.eclipse.rt.osgistarterkit.product/macosx/cocoa/x86 rt - - #cp -v org.eclipse.rt.osgistarterkit.product-solaris.gtk.sparc.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-solaris-gtk-sparc.zip - #cp -v org.eclipse.rt.osgistarterkit.product-solaris.gtk.x86.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-solaris-gtk-x86.zip - - cp -v org.eclipse.rt.osgistarterkit.product-win32.win32.x86_64.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86_64.zip - cp -v org.eclipse.rt.osgistarterkit.product-win32.win32.x86.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86.zip - - popd - else - echo " ERROR: $TARGET_PRODUCTS did not exist in fn-eq-gather-starterkit" - return 1 - fi - echo "Ending fn-eq-gather-starterkit" - return 0 + if [[ $# != 3 ]] + then + echo "PROGRAM ERROR: this function, fn-eq-gather-starterkit, requires 3 arguments" + return 1 + fi + BUILD_ID="$1"; shift + REPO_DIR="$1"; shift + DROP_DIR="$1"; shift + TARGET_PRODUCTS="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/target/products + echo "Starting fn-eq-gather-starterkit" + echo "BUILD_ID: $BUILD_ID" + echo "REPO_DIR: $REPO_DIR" + echo "DROP_DIR: $DROP_DIR" + if [[ ! -d $DROP_DIR ]] + then + echo "Making DROP_DIR at $DROP_DIR" + mkdir -p $DROP_DIR + fi + if [[ -d "$TARGET_PRODUCTS" ]] + then + pushd "$TARGET_PRODUCTS" + + #cp -v org.eclipse.rt.osgistarterkit.product-aix.gtk.ppc64.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-aix-gtk-ppc64.zip + #cp -v org.eclipse.rt.osgistarterkit.product-aix.gtk.ppc.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-aix-gtk-ppc.zip + #cp -v org.eclipse.rt.osgistarterkit.product-hpux.gtk.ia64.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-hpux-gtk-ia64.zip + #cp -v org.eclipse.rt.osgistarterkit.product-linux.gtk.ppc64.tar.gz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-ppc64.tar.gz + #cp -v org.eclipse.rt.osgistarterkit.product-linux.gtk.ppc.tar.gz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-ppc.tar.gz + #cp -v org.eclipse.rt.osgistarterkit.product-linux.gtk.s390.tar.gz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-s390.tar.gz + #cp -v org.eclipse.rt.osgistarterkit.product-linux.gtk.s390x.tar.gz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-s390x.tar.gz + + cp -v org.eclipse.rt.osgistarterkit.product-linux.gtk.x86_64.tar.gz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-x86_64.tar.gz + cp -v org.eclipse.rt.osgistarterkit.product-linux.gtk.x86.tar.gz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-x86.tar.gz + + #cp -v org.eclipse.rt.osgistarterkit.product-macosx.cocoa.x86_64.tar.gz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz + tar cfz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz -C org.eclipse.rt.osgistarterkit.product/macosx/cocoa/x86_64 rt + #cp -v org.eclipse.rt.osgistarterkit.product-macosx.cocoa.x86.tar.gz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-macosx-cocoa-x86.tar.gz + # no longer an x86 version. Bug 420725 + #tar cfz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-macosx-cocoa-x86.tar.gz -C org.eclipse.rt.osgistarterkit.product/macosx/cocoa/x86 rt + + #cp -v org.eclipse.rt.osgistarterkit.product-solaris.gtk.sparc.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-solaris-gtk-sparc.zip + #cp -v org.eclipse.rt.osgistarterkit.product-solaris.gtk.x86.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-solaris-gtk-x86.zip + + cp -v org.eclipse.rt.osgistarterkit.product-win32.win32.x86_64.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86_64.zip + cp -v org.eclipse.rt.osgistarterkit.product-win32.win32.x86.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86.zip + + popd + else + echo " ERROR: $TARGET_PRODUCTS did not exist in fn-eq-gather-starterkit" + return 1 + fi + echo "Ending fn-eq-gather-starterkit" + return 0 } @@ -113,63 +113,63 @@ fn-eq-gather-starterkit () # BASEBUILDER_LAUNCHER: /shared/eclipse/builds/R4_2_maintenance/org.eclipse.releng.basebuilder_R3_7/plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar fn-publish-equinox () { - BUILD_TYPE="$1"; shift - BUILD_STREAM="$1"; shift - BUILD_ID="$1"; shift - REPO_DIR="$1"; shift - BUILD_DIR="$1"; shift - BASEBUILDER_LAUNCHER="$1"; shift - BUILD_MACHINE_ROOT=${BUILD_HOME} - BUILD_MACHINE_DROP_DIR=$(fn-eq-build-dir "$BUILD_MACHINE_ROOT" "$BUILD_ID" "$BUILD_STREAM") - BUILD_MACHINE_DROP_DIR_PARENT=$(dirname $BUILD_MACHINE_DROP_DIR) - EBuilderDir="$BUILD_DIR"/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder - fn-eq-gather-starterkit $BUILD_ID $REPO_DIR $BUILD_MACHINE_DROP_DIR - - TARGET_PRODUCTS="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/target - if [[ -d "$TARGET_PRODUCTS" ]] + BUILD_TYPE="$1"; shift + BUILD_STREAM="$1"; shift + BUILD_ID="$1"; shift + REPO_DIR="$1"; shift + BUILD_DIR="$1"; shift + BASEBUILDER_LAUNCHER="$1"; shift + BUILD_MACHINE_ROOT=${BUILD_HOME} + BUILD_MACHINE_DROP_DIR=$(fn-eq-build-dir "$BUILD_MACHINE_ROOT" "$BUILD_ID" "$BUILD_STREAM") + BUILD_MACHINE_DROP_DIR_PARENT=$(dirname $BUILD_MACHINE_DROP_DIR) + EBuilderDir="$BUILD_DIR"/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder + fn-eq-gather-starterkit $BUILD_ID $REPO_DIR $BUILD_MACHINE_DROP_DIR + + TARGET_PRODUCTS="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/target + if [[ -d "$TARGET_PRODUCTS" ]] + then + pushd "$TARGET_PRODUCTS" + # The glob '*' here, is to match (and hence remove) "version number" in built version, such as 3.10.0, 4.4.0, etc. + # And leave only BUILD_ID. + cp -v equinox-sdk-*-SNAPSHOT.zip "${BUILD_MACHINE_DROP_DIR}/equinox-SDK-${BUILD_ID}.zip" + RC=$? + if [[ $RC != 0 ]] then - pushd "$TARGET_PRODUCTS" - # The glob '*' here, is to match (and hence remove) "version number" in built version, such as 3.10.0, 4.4.0, etc. - # And leave only BUILD_ID. - cp -v equinox-sdk-*-SNAPSHOT.zip "${BUILD_MACHINE_DROP_DIR}/equinox-SDK-${BUILD_ID}.zip" - RC=$? - if [[ $RC != 0 ]] - then - TODO: change 'cp' above to rsync .. it gives better error messages and logging? - echo "ERROR: cp command could not copy equinox-sdk-*-SNAPSHOT.zip. RC: $RC" - fi - # following used to be done in "build-configs", based on "master-equinox" feature, - # but that has now "gone away". - pushd "${BUILD_MACHINE_DROP_DIR}" - unzip -j equinox-SDK-${BUILD_ID}.zip plugins/*.jar -x plugins/*jmx* plugins/*.source_* - popd - else - echo " ERROR: $TARGET_PRODUCTS did not exist in fn-gather-sdks" + TODO: change 'cp' above to rsync .. it gives better error messages and logging? + echo "ERROR: cp command could not copy equinox-sdk-*-SNAPSHOT.zip. RC: $RC" fi + # following used to be done in "build-configs", based on "master-equinox" feature, + # but that has now "gone away". + pushd "${BUILD_MACHINE_DROP_DIR}" + unzip -j equinox-SDK-${BUILD_ID}.zip plugins/*.jar -x plugins/*jmx* plugins/*.source_* popd - - pushd "$BUILD_DIR" - java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \ - -data ${BUILD_DIR}/workspace-publishEquinox \ - -application org.eclipse.ant.core.antRunner \ - -v \ - -buildfile "$EBuilderDir"/equinox/helper.xml \ - -Dequinox.build.configs="$EBuilderDir"/equinox/buildConfigs \ - -DbuildId="$BUILD_ID" \ - -DbuildRepo="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository \ - -DpostingDirectory=$BUILD_DIR \ - -DequinoxPostingDirectory=$BUILD_MACHINE_DROP_DIR_PARENT \ - -DeqpublishingContent="$EBuilderDir"/equinox/publishingFiles \ - -DdropTemplateFileName="$EBuilderDir/eclipse/publishingFiles/templateFiles/index.php.template${PATCH_BUILD}" \ - -DbuildLabel="$BUILD_ID" \ - -DEBuilderDir="$EBuilderDir" \ - -DeclipseStream=$BUILD_STREAM \ - -DbuildType="$BUILD_TYPE" \ - -Dbase.builder=$(dirname $(dirname "$BASEBUILDER_LAUNCHER" ) ) \ - -DbuildDirectory=$BUILD_MACHINE_DROP_DIR_PARENT \ - -Djava.io.tmpdir=$TMP_DIR \ - publish - popd + else + echo " ERROR: $TARGET_PRODUCTS did not exist in fn-gather-sdks" + fi + popd + + pushd "$BUILD_DIR" + java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \ + -data ${BUILD_DIR}/workspace-publishEquinox \ + -application org.eclipse.ant.core.antRunner \ + -v \ + -buildfile "$EBuilderDir"/equinox/helper.xml \ + -Dequinox.build.configs="$EBuilderDir"/equinox/buildConfigs \ + -DbuildId="$BUILD_ID" \ + -DbuildRepo="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository \ + -DpostingDirectory=$BUILD_DIR \ + -DequinoxPostingDirectory=$BUILD_MACHINE_DROP_DIR_PARENT \ + -DeqpublishingContent="$EBuilderDir"/equinox/publishingFiles \ + -DdropTemplateFileName="$EBuilderDir/eclipse/publishingFiles/templateFiles/index.php.template${PATCH_BUILD}" \ + -DbuildLabel="$BUILD_ID" \ + -DEBuilderDir="$EBuilderDir" \ + -DeclipseStream=$BUILD_STREAM \ + -DbuildType="$BUILD_TYPE" \ + -Dbase.builder=$(dirname $(dirname "$BASEBUILDER_LAUNCHER" ) ) \ + -DbuildDirectory=$BUILD_MACHINE_DROP_DIR_PARENT \ + -Djava.io.tmpdir=$TMP_DIR \ + publish + popd } cd $BUILD_ROOT @@ -179,7 +179,7 @@ gitCache=$( fn-git-cache "$BUILD_ROOT" "$BRANCH" ) aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" ) if [ -z "$BUILD_ID" ]; then - BUILD_ID=$(fn-build-id "$BUILD_TYPE" ) + BUILD_ID=$(fn-build-id "$BUILD_TYPE" ) fi buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" ) @@ -195,6 +195,6 @@ fn-publish-equinox "$BUILD_TYPE" "$STREAM" "$BUILD_ID" "$aggDir" "$buildDirector RC=$? if [[ $RC != 0 ]] then - echo "ERROR: Somethign went wrong publishing Equinox. RC: $RC" - exit $RC + echo "ERROR: Somethign went wrong publishing Equinox. RC: $RC" + exit $RC fi diff --git a/production/publish-repo.sh b/production/publish-repo.sh index bb0e8a7c5..58f109338 100644 --- a/production/publish-repo.sh +++ b/production/publish-repo.sh @@ -2,14 +2,14 @@ # if [ $# -ne 1 ]; then - echo USAGE: $0 env_file - exit 1 + echo USAGE: $0 env_file + exit 1 fi if [ ! -r "$1" ]; then - echo "$1" cannot be read - echo USAGE: $0 env_file - exit 1 + echo "$1" cannot be read + echo USAGE: $0 env_file + exit 1 fi SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)} @@ -23,7 +23,7 @@ gitCache=$( fn-git-cache "$BUILD_ROOT" "$BRANCH" ) aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" ) if [ -z "$BUILD_ID" ]; then - BUILD_ID=$(fn-build-id "$BUILD_TYPE" ) + BUILD_ID=$(fn-build-id "$BUILD_TYPE" ) fi buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" ) @@ -40,77 +40,77 @@ EBuilderDir="${buildDirectory}/eclipse.platform.releng.aggregator/eclipse.platfo # compute update site parent directory on build server function updateSiteParent() { - checkNArgs $# 3 - ROOT="$1"; shift - BUILD_ID="$1"; shift - STREAM="$1"; shift - - buildType=${BUILD_ID:0:1} - - - # contrary to intuition (and previous behavior, bash 3.1) do NOT use quotes around right side of expression. - if [[ "${STREAM}" =~ ^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)$ ]] - then - eclipseStreamMajor=${BASH_REMATCH[1]} - eclipseStreamMinor=${BASH_REMATCH[2]} - eclipseStreamService=${BASH_REMATCH[3]} - else - echo "STREAM, $STREAM, must contain major, minor, and service versions, such as 4.3.0" >${TRACE_OUTPUT} - return 1 - fi - - siteDir=${ROOT}/siteDir - updatesSuffix="builds" - siteDirParent=$siteDir/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-${updatesSuffix} - mkdir -p ${siteDirParent} - RC=$? - if [[ $RC != 0 ]] - then - echo "ERROR: could not create update site parent on build machine. RC: $RC" >${TRACE_OUTPUT} - echo " obtained error trying to create ${updateSiteParent}" >${TRACE_OUTPUT} - return 1 - fi - - echo $siteDirParent + checkNArgs $# 3 + ROOT="$1"; shift + BUILD_ID="$1"; shift + STREAM="$1"; shift + + buildType=${BUILD_ID:0:1} + + + # contrary to intuition (and previous behavior, bash 3.1) do NOT use quotes around right side of expression. + if [[ "${STREAM}" =~ ^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)$ ]] + then + eclipseStreamMajor=${BASH_REMATCH[1]} + eclipseStreamMinor=${BASH_REMATCH[2]} + eclipseStreamService=${BASH_REMATCH[3]} + else + echo "STREAM, $STREAM, must contain major, minor, and service versions, such as 4.3.0" >${TRACE_OUTPUT} + return 1 + fi + + siteDir=${ROOT}/siteDir + updatesSuffix="builds" + siteDirParent=$siteDir/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-${updatesSuffix} + mkdir -p ${siteDirParent} + RC=$? + if [[ $RC != 0 ]] + then + echo "ERROR: could not create update site parent on build machine. RC: $RC" >${TRACE_OUTPUT} + echo " obtained error trying to create ${updateSiteParent}" >${TRACE_OUTPUT} + return 1 + fi + + echo $siteDirParent } # compute update site on build server function updateSiteOnBuildMachine() { - checkNArgs $# 3 - ROOT="$1"; shift - BUILD_ID="$1"; shift - STREAM="$1"; shift - - buildType=${BUILD_ID:0:1} - - - # contrary to intuition (and previous behavior, bash 3.1) do NOT use quotes around right side of expression. - if [[ "${STREAM}" =~ ^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)$ ]] - then - eclipseStreamMajor=${BASH_REMATCH[1]} - eclipseStreamMinor=${BASH_REMATCH[2]} - eclipseStreamService=${BASH_REMATCH[3]} - else - echo "STREAM, $STREAM, must contain major, minor, and service versions, such as 4.3.0" >${TRACE_OUTPUT} - return 1 - fi - - siteDir=${ROOT}/siteDir - updatesSuffix="builds" - siteDirParentOnBuildMachine=$( updateSiteParent "$BUILD_ROOT" "$BUILD_ID" "$STREAM" ) - siteDirOnBuildMachine=${siteDirParentOnBuildMachine}/${BUILD_ID} - mkdir -p ${siteDirOnBuildMachine} - RC=$? - if [[ $RC != 0 ]] - then - echo "ERROR: could not create update site on build machine. RC: $RC" >${TRACE_OUTPUT} - echo " obtained error trying to create ${siteDirOnBuildMachine}" >${TRACE_OUTPUT} - return 1 - fi - - echo $siteDirOnBuildMachine + checkNArgs $# 3 + ROOT="$1"; shift + BUILD_ID="$1"; shift + STREAM="$1"; shift + + buildType=${BUILD_ID:0:1} + + + # contrary to intuition (and previous behavior, bash 3.1) do NOT use quotes around right side of expression. + if [[ "${STREAM}" =~ ^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)$ ]] + then + eclipseStreamMajor=${BASH_REMATCH[1]} + eclipseStreamMinor=${BASH_REMATCH[2]} + eclipseStreamService=${BASH_REMATCH[3]} + else + echo "STREAM, $STREAM, must contain major, minor, and service versions, such as 4.3.0" >${TRACE_OUTPUT} + return 1 + fi + + siteDir=${ROOT}/siteDir + updatesSuffix="builds" + siteDirParentOnBuildMachine=$( updateSiteParent "$BUILD_ROOT" "$BUILD_ID" "$STREAM" ) + siteDirOnBuildMachine=${siteDirParentOnBuildMachine}/${BUILD_ID} + mkdir -p ${siteDirOnBuildMachine} + RC=$? + if [[ $RC != 0 ]] + then + echo "ERROR: could not create update site on build machine. RC: $RC" >${TRACE_OUTPUT} + echo " obtained error trying to create ${siteDirOnBuildMachine}" >${TRACE_OUTPUT} + return 1 + fi + + echo $siteDirOnBuildMachine } siteDirOnBuildMachine=$( updateSiteOnBuildMachine "$BUILD_ROOT" "$BUILD_ID" "$STREAM" ) @@ -118,47 +118,47 @@ echo "siteDirOnBuildMachine: ${siteDirOnBuildMachine}" repositoryDir=${buildDirectory}/repository echo "repositoryDir: ${repositoryDir}" -# leave both old and new methods for now, so true (1) ==> old straight copy. +# leave both old and new methods for now, so true (1) ==> old straight copy. # change to false (0) to test new method. -if (( 1 )) +if (( 1 )) then - DO_NOT_MIRROR_IN_ASSEMBLY="-DdoNotMirror=true" - # for now, straight copy from what was produced to local build machine directory. - # This is partially done so that - # rest of scripts stay common - # but eventually, we might put in some mirror/comparator/remove tasks here. - - # NOTE: we are using the "safe copy" we put in drop directory on build machine. - - # make posiitive ${repositoryDir} is not empty, or we are basically copying - # all of root! (and, if repositoryDir is empty if we had a failed build! - # and should not be calling this method, anyway.) - if [[ -n "${repositoryDir}" && -d "${repositoryDir}" && -n "${siteDirOnBuildMachine}" && -d "${siteDirOnBuildMachine}" ]] + DO_NOT_MIRROR_IN_ASSEMBLY="-DdoNotMirror=true" + # for now, straight copy from what was produced to local build machine directory. + # This is partially done so that + # rest of scripts stay common + # but eventually, we might put in some mirror/comparator/remove tasks here. + + # NOTE: we are using the "safe copy" we put in drop directory on build machine. + + # make posiitive ${repositoryDir} is not empty, or we are basically copying + # all of root! (and, if repositoryDir is empty if we had a failed build! + # and should not be calling this method, anyway.) + if [[ -n "${repositoryDir}" && -d "${repositoryDir}" && -n "${siteDirOnBuildMachine}" && -d "${siteDirOnBuildMachine}" ]] + then + rsync --times --omit-dir-times --recursive "${repositoryDir}/" "${siteDirOnBuildMachine}/" + RC=$? + if [[ $RC != 0 ]] then - rsync --times --omit-dir-times --recursive "${repositoryDir}/" "${siteDirOnBuildMachine}/" - RC=$? - if [[ $RC != 0 ]] - then - echo "ERROR: rsync of repo returned error. RC: $RC" - echo " obtained while copying" - echo " from ${repositoryDir}" - echo " to ${siteDirOnBuildMachine}" - exit $RC - fi - - else - echo "ERROR: Some directory didn't exist for update site copy." - echo " repositoryDir: ${repositoryDir}" - echo " siteDirOnBuildMachine: ${siteDirOnBuildMachine}" - exit $RC - fi + echo "ERROR: rsync of repo returned error. RC: $RC" + echo " obtained while copying" + echo " from ${repositoryDir}" + echo " to ${siteDirOnBuildMachine}" + exit $RC + fi + + else + echo "ERROR: Some directory didn't exist for update site copy." + echo " repositoryDir: ${repositoryDir}" + echo " siteDirOnBuildMachine: ${siteDirOnBuildMachine}" + exit $RC + fi fi #TODO: the "logic" needs some TLC -# In master, we should not need DO_PATH or DO_REMOVE. -# See patch streams for when/why that might change for patches. -# But we will be sure defined empty by default, since used later in some calls. +# In master, we should not need DO_PATH or DO_REMOVE. +# See patch streams for when/why that might change for patches. +# But we will be sure defined empty by default, since used later in some calls. DO_PACK="" DO_REMOVE="" @@ -171,96 +171,96 @@ DO_REMOVE="" #fi java -Djava.io.tmpdir=$TMP_DIR -jar "$launcherJar" \ - -data ${buildDirectory}/workspace-processArtifacts \ - -application org.eclipse.ant.core.antRunner \ - -v \ - -buildfile "${EBuilderDir}/eclipse/buildScripts/process-artifacts.xml" \ - -DrepositoryDir=${repositoryDir} ${DO_REMOVE} ${DO_PACK} \ - -Dbuildlogs=$logsDirectory/comparatorlogs \ - -DsiteDirOnBuildMachine=$siteDirOnBuildMachine \ - -DcomparatorRepository=$comparatorRepository \ - -Djava.io.tmpdir=$TMP_DIR ${DO_NOT_MIRROR_IN_ASSEMBLY} - -RC=$? + -data ${buildDirectory}/workspace-processArtifacts \ + -application org.eclipse.ant.core.antRunner \ + -v \ + -buildfile "${EBuilderDir}/eclipse/buildScripts/process-artifacts.xml" \ + -DrepositoryDir=${repositoryDir} ${DO_REMOVE} ${DO_PACK} \ + -Dbuildlogs=$logsDirectory/comparatorlogs \ + -DsiteDirOnBuildMachine=$siteDirOnBuildMachine \ + -DcomparatorRepository=$comparatorRepository \ + -Djava.io.tmpdir=$TMP_DIR ${DO_NOT_MIRROR_IN_ASSEMBLY} + +RC=$? if [[ $RC != 0 ]] -then - echo "ERROR: java invocation to process-artifacts did not return normally: $RC" - exit $RC +then + echo "ERROR: java invocation to process-artifacts did not return normally: $RC" + exit $RC fi # copy "human readable" (user friendly) HTML file -# TODO: isn't used at the moment, since "404" allows "directory access", -# so someday, we'll create improved user friendly PHP file that allows same. +# TODO: isn't used at the moment, since "404" allows "directory access", +# so someday, we'll create improved user friendly PHP file that allows same. buildType=${BUILD_ID:0:1} rsync --times --omit-dir-times --recursive "${EBuilderDir}/eclipse/publishingFiles/staticRepoSiteFiles/${buildType}builds/simple/" "${siteDirOnBuildMachine}/" -RC=$? +RC=$? if [[ $RC != 0 ]] -then - echo "ERROR: rsync of repo returned error. RC: $RC" - echo " obtained while copying" - echo " from ${EBuilderDir}/eclipse/publishingFiles/staticRepoSiteFiles/${buildType}builds/simple/" - echo " to ${siteDirOnBuildMachine}" - exit $RC +then + echo "ERROR: rsync of repo returned error. RC: $RC" + echo " obtained while copying" + echo " from ${EBuilderDir}/eclipse/publishingFiles/staticRepoSiteFiles/${buildType}builds/simple/" + echo " to ${siteDirOnBuildMachine}" + exit $RC fi -# If doing a "patch build", a "site.xml" is created, -# so a) we'll remove that that, to avoid confusion, and +# If doing a "patch build", a "site.xml" is created, +# so a) we'll remove that that, to avoid confusion, and # b) we must call "process-artifacts again, so this version -# has packgz files. (i.e. Tycho isn't doing it for us). +# has packgz files. (i.e. Tycho isn't doing it for us). if [[ -n "${PATCH_BUILD}" ]] then - # no longer needed, will remove - rm "${siteDirOnBuildMachine}/site.xml" - RC=$? - if [[ $RC != 0 ]] - then - echo "ERROR: did not remove 'site.xml' as expected. RC: $RC" - #exit $RC - fi - - # before we created pack.gz files, we'll create zip file, of archive for - # DL page ... and those zip files best without pack.gz files, since they - # are not used if using local zip archive, so are "wasted" there. - pushd ${siteDirOnBuildMachine} - zip -r ${buildDirectory}/java8patch-${BUILD_ID}-repository.zip . - popd - -# if [[ -n "${PATCH_BUILD}" ]] -# then -# # nothing to remove for patch builds, for now, and we -# # do not want to remove the category we put there intentionally. -# DO_REMOVE="-DdoNotRemove=true" -# # https://bugs.eclipse.org/bugs/show_bug.cgi?id=427873 -# # uses 'false' for now. -# DO_PACK="-DdoPack=false" -# fi -# -# java -Djava.io.tmpdir=$TMP_DIR -jar "$launcherJar" \ -# -data ${buildDirectory}/workspace-processArtifacts2 \ -# -application org.eclipse.ant.core.antRunner \ -# -v \ -# -buildfile "${EBuilderDir}/eclipse/buildScripts/process-artifacts.xml" \ -# -DrepositoryDir=${repositoryDir} ${DO_REMOVE} ${DO_PACK} \ -# -Dbuildlogs=$logsDirectory/comparatorlogs \ -# -DsiteDirOnBuildMachine=$siteDirOnBuildMachine \ -# -DcomparatorRepository=$comparatorRepository \ -# -Djava.io.tmpdir=$TMP_DIR ${DO_NOT_MIRROR_IN_ASSEMBLY} -# -# RC=$? -# if [[ $RC != 0 ]] -# then -# echo "ERROR: java invocation to process-artifacts did not return normally: $RC" -# #exit $RC -# fi - -# Make composite directly on build machine, for patches only -# repodir is absolute path to composite repository, -# complocation is the (relative) child repository (usually direcotry named 'buildId') -# site parent is "one up" from siteDirOnBuildMachine. -siteDirParentOnBuildMachine=$( updateSiteParent "$BUILD_ROOT" "$BUILD_ID" "$STREAM" ) -java -Djava.io.tmpdir=$TMP_DIR -jar "$launcherJar" \ + # no longer needed, will remove + rm "${siteDirOnBuildMachine}/site.xml" + RC=$? + if [[ $RC != 0 ]] + then + echo "ERROR: did not remove 'site.xml' as expected. RC: $RC" + #exit $RC + fi + + # before we created pack.gz files, we'll create zip file, of archive for + # DL page ... and those zip files best without pack.gz files, since they + # are not used if using local zip archive, so are "wasted" there. + pushd ${siteDirOnBuildMachine} + zip -r ${buildDirectory}/java8patch-${BUILD_ID}-repository.zip . + popd + + # if [[ -n "${PATCH_BUILD}" ]] + # then + # # nothing to remove for patch builds, for now, and we + # # do not want to remove the category we put there intentionally. + # DO_REMOVE="-DdoNotRemove=true" + # # https://bugs.eclipse.org/bugs/show_bug.cgi?id=427873 + # # uses 'false' for now. + # DO_PACK="-DdoPack=false" + # fi + # + # java -Djava.io.tmpdir=$TMP_DIR -jar "$launcherJar" \ + # -data ${buildDirectory}/workspace-processArtifacts2 \ + # -application org.eclipse.ant.core.antRunner \ + # -v \ + # -buildfile "${EBuilderDir}/eclipse/buildScripts/process-artifacts.xml" \ + # -DrepositoryDir=${repositoryDir} ${DO_REMOVE} ${DO_PACK} \ + # -Dbuildlogs=$logsDirectory/comparatorlogs \ + # -DsiteDirOnBuildMachine=$siteDirOnBuildMachine \ + # -DcomparatorRepository=$comparatorRepository \ + # -Djava.io.tmpdir=$TMP_DIR ${DO_NOT_MIRROR_IN_ASSEMBLY} + # + # RC=$? + # if [[ $RC != 0 ]] + # then + # echo "ERROR: java invocation to process-artifacts did not return normally: $RC" + # #exit $RC + # fi + + # Make composite directly on build machine, for patches only + # repodir is absolute path to composite repository, + # complocation is the (relative) child repository (usually direcotry named 'buildId') + # site parent is "one up" from siteDirOnBuildMachine. + siteDirParentOnBuildMachine=$( updateSiteParent "$BUILD_ROOT" "$BUILD_ID" "$STREAM" ) + java -Djava.io.tmpdir=$TMP_DIR -jar "$launcherJar" \ -data ${buildDirectory}/workspace-makeComposite \ -application org.eclipse.ant.core.antRunner \ -v \ @@ -268,12 +268,12 @@ java -Djava.io.tmpdir=$TMP_DIR -jar "$launcherJar" \ -Drepodir=${siteDirParentOnBuildMachine} \ -Dcomplocation=${BUILD_ID} -RC=$? -if [[ $RC != 0 ]] -then + RC=$? + if [[ $RC != 0 ]] + then echo "ERROR: java invocation to process-artifacts did not return normally: $RC" #exit $RC -fi + fi fi diff --git a/production/run-maven-build.sh b/production/run-maven-build.sh index 9a331bbc1..2a5bfb55c 100644 --- a/production/run-maven-build.sh +++ b/production/run-maven-build.sh @@ -2,14 +2,14 @@ # if [ $# -ne 1 ]; then - echo USAGE: $0 env_file - exit 1 + echo USAGE: $0 env_file + exit 1 fi if [ ! -r "$1" ]; then - echo "$1" cannot be read - echo USAGE: $0 env_file - exit 1 + echo "$1" cannot be read + echo USAGE: $0 env_file + exit 1 fi SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)} @@ -26,7 +26,7 @@ gitCache=$( fn-git-cache "$BUILD_ROOT" "$BRANCH" ) aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" ) if [ -z "$BUILD_ID" ]; then - BUILD_ID=$(fn-build-id "$BUILD_TYPE" ) + BUILD_ID=$(fn-build-id "$BUILD_TYPE" ) fi fn-maven-build-aggregator "$BUILD_ID" "$aggDir" "$LOCAL_REPO" $MVN_DEBUG $MVN_QUIET $SIGNING $MAVEN_BREE @@ -34,23 +34,23 @@ exitCode=$? # first make sure exit code is well formed if [[ -z "${exitCode}" ]] -then - echo "exitcode was empty" - exitrc=0 +then + echo "exitcode was empty" + exitrc=0 elif [[ "${exitCode}" =~ [0] ]] then - echo "exitcode was zero" - exitrc=0 -elif [[ "${exitCode}" =~ ^-?[0-9]+$ ]] + echo "exitcode was zero" + exitrc=0 +elif [[ "${exitCode}" =~ ^-?[0-9]+$ ]] then - echo "exitcode was a legal, non-zero numeric return code" - exitrc=$exitCode - buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" ) - # create as "indicator file" ... gets filled in more once there is a log to grep - touch "${buildDirectory}/buildFailed-run-maven-build" + echo "exitcode was a legal, non-zero numeric return code" + exitrc=$exitCode + buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" ) + # create as "indicator file" ... gets filled in more once there is a log to grep + touch "${buildDirectory}/buildFailed-run-maven-build" else - echo "exitode was not numeric, so will force to 1" - exitrc=1 + echo "exitode was not numeric, so will force to 1" + exitrc=1 fi echo "$( basename $0) exiting with exitrc: $exitrc" diff --git a/production/sdk/checkForErrorExit.sh b/production/sdk/checkForErrorExit.sh index 27245609a..efc56b4c9 100755 --- a/production/sdk/checkForErrorExit.sh +++ b/production/sdk/checkForErrorExit.sh @@ -1,25 +1,25 @@ function checkForErrorExit () { - # arg 1 must be return code, $? - # arg 2 (remaining line) can be message to print before exiting due to non-zero exit code - exitCode=$1 - shift - message="$*" - if [ -z "${exitCode}" ] - then - echo "PROGRAM ERROR: checkForErrorExit called with no arguments" - exit 1 - fi - if [ -z "${message}" ] - then - echo "WARNING: checkForErrorExit called without message" - message="(Calling program provided no message)" - fi - if [ "${exitCode}" -ne "0" ] - then - echo - echo " ERROR. exit code: ${exitCode} ${message}" - echo - exit "${exitCode}" - fi + # arg 1 must be return code, $? + # arg 2 (remaining line) can be message to print before exiting due to non-zero exit code + exitCode=$1 + shift + message="$*" + if [ -z "${exitCode}" ] + then + echo "PROGRAM ERROR: checkForErrorExit called with no arguments" + exit 1 + fi + if [ -z "${message}" ] + then + echo "WARNING: checkForErrorExit called without message" + message="(Calling program provided no message)" + fi + if [ "${exitCode}" -ne "0" ] + then + echo + echo " ERROR. exit code: ${exitCode} ${message}" + echo + exit "${exitCode}" + fi } diff --git a/production/sdk/cleaners/dailyClean.sh b/production/sdk/cleaners/dailyClean.sh index 8fdb456a2..b1ac11887 100755 --- a/production/sdk/cleaners/dailyClean.sh +++ b/production/sdk/cleaners/dailyClean.sh @@ -10,36 +10,36 @@ nOldBuilds=$( echo -e "${allOldBuilds}" | wc -l ) echo -e "nOldBuilds: $nbuildsOldBuilds" if (( ${nOldBuilds} > 4 )) then - # Make sure we leave at least 4 on DL server, no matter how old - # TODO: how to avoid 'ls' (see http://mywiki.wooledge.org/ParsingLs) - newest=$( ls -1 -t -d ${cDir}/${buildType} | head -4) - #DEBUG echo -e "\n\tnewest: \n${newest}"; - reNotToDelete=$(printf '%s\n' "${newest[@]}" | paste -sd '|') - echo "DEBUG: reNotToDelete: ${reNotToDelete}" - for buildname in ${allOldBuilds}; do - if [[ $buildname =~ $reNotToDelete ]] - then - echo -e "Not removed (since one of 4 newest, even though old): \n$buildname" - else - rm -fr $buildname - RC=$? - if [[ $RC = 0 ]] - then - echo -e "Removed: $buildname" - else - echo -e "\n\tAn Error occured removeding $buildname. RC: $RC" - fi - fi - done + # Make sure we leave at least 4 on DL server, no matter how old + # TODO: how to avoid 'ls' (see http://mywiki.wooledge.org/ParsingLs) + newest=$( ls -1 -t -d ${cDir}/${buildType} | head -4) + #DEBUG echo -e "\n\tnewest: \n${newest}"; + reNotToDelete=$(printf '%s\n' "${newest[@]}" | paste -sd '|') + echo "DEBUG: reNotToDelete: ${reNotToDelete}" + for buildname in ${allOldBuilds}; do + if [[ $buildname =~ $reNotToDelete ]] + then + echo -e "Not removed (since one of 4 newest, even though old): \n$buildname" + else + rm -fr $buildname + RC=$? + if [[ $RC = 0 ]] + then + echo -e "Removed: $buildname" + else + echo -e "\n\tAn Error occured removeding $buildname. RC: $RC" + fi + fi + done - nbuilds=$( find ${cDir} -maxdepth 1 -name ${buildType} | wc -l ) - echo "Number of builds after cleaning: $nbuilds" + nbuilds=$( find ${cDir} -maxdepth 1 -name ${buildType} | wc -l ) + echo "Number of builds after cleaning: $nbuilds" - source /shared/eclipse/sdk/updateIndexFilesFunction.shsource - updateIndex + source /shared/eclipse/sdk/updateIndexFilesFunction.shsource + updateIndex else - echo "Nothing cleaned, not more than 4 days" + echo "Nothing cleaned, not more than 4 days" fi # shared (build machine) diff --git a/production/sdk/cleaners/weeklyClean.sh b/production/sdk/cleaners/weeklyClean.sh index 28f01036c..2b7a49fba 100755 --- a/production/sdk/cleaners/weeklyClean.sh +++ b/production/sdk/cleaners/weeklyClean.sh @@ -4,7 +4,7 @@ find /home/data/httpd/download.eclipse.org/eclipse/downloads/drops4 -maxdepth 1 -ctime +30 -name "M*" -ls -exec rm -fr '{}' \; source /shared/eclipse/sdk/updateIndexFilesFunction.shsource -updateIndex +updateIndex # shared (build machine) @@ -16,7 +16,7 @@ find /shared/eclipse/builds/4I/siteDir/equinox/drops -maxdepth 1 -ctime +2 -name find /shared/eclipse/builds/4I/siteDir/updates/4.4-I-builds -maxdepth 1 -ctime +2 -name "I*" -ls -exec rm -fr '{}' \; -# don't really need these yet, until after Kepler +# don't really need these yet, until after Kepler find /shared/eclipse/builds/4M/siteDir/eclipse/downloads/drops4 -maxdepth 1 -ctime +2 -name "M*" -ls -exec rm -fr '{}' \; find /shared/eclipse/builds/4M/siteDir/equinox/drops -maxdepth 1 -ctime +2 -name "M*" -ls -exec rm -fr '{}' \; find /shared/eclipse/builds/4M/siteDir/updates/4.3-M-builds -maxdepth 1 -ctime +2 -name "M*" -ls -exec rm -fr '{}' \; diff --git a/production/sdk/collect.sh b/production/sdk/collect.sh index 784cc0eac..42f8be8f2 100755 --- a/production/sdk/collect.sh +++ b/production/sdk/collect.sh @@ -10,11 +10,11 @@ # Start with minimal path for consistency across machines # plus, cron jobs do not inherit an environment -# care is needed not have anything in ${HOME}/bin that would effect the build -# unintentionally, but is required to make use of "source buildeclipse.shsource" on -# local machines. -# Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it -# to false) for a test I-build on a remote machine. +# care is needed not have anything in ${HOME}/bin that would effect the build +# unintentionally, but is required to make use of "source buildeclipse.shsource" on +# local machines. +# Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it +# to false) for a test I-build on a remote machine. export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin # unset common variables (some defined for e4Build) which we don't want (or, set ourselves) unset JAVA_HOME @@ -31,7 +31,7 @@ oldumask=`umask` umask 0002 echo "umask explicitly set to 0002, old value was $oldumask" -# this buildeclipse.shsource file is to ease local builds to override some variables. +# this buildeclipse.shsource file is to ease local builds to override some variables. # It should not be used for production builds. source buildeclipse.shsource 2>/dev/null export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds} @@ -60,10 +60,10 @@ echo "EBUILDER_HASH: $EBUILDER_HASH" ${ANT_HOME}/bin/ant -version # -lib /shared/common/apache-ant-1.9.2/lib/ \ -${ANT_HOME}/bin/ant -f /shared/eclipse/sdk/collectTestResults.xml \ - -Djob=${job} \ - -DbuildNumber=${buildNumber} \ - -DbuildId=${buildId} \ - -DeclipseStream=${eclipseStream} \ - -DBUILD_KIND=${BUILD_KIND} \ - -DEBUILDER_HASH=${EBUILDER_HASH} + ${ANT_HOME}/bin/ant -f /shared/eclipse/sdk/collectTestResults.xml \ + -Djob=${job} \ + -DbuildNumber=${buildNumber} \ + -DbuildId=${buildId} \ + -DeclipseStream=${eclipseStream} \ + -DBUILD_KIND=${BUILD_KIND} \ + -DEBUILDER_HASH=${EBUILDER_HASH} diff --git a/production/sdk/promoteStableRelease/promoteImpl/addRepoProperties.sh b/production/sdk/promoteStableRelease/promoteImpl/addRepoProperties.sh index 92a0954fc..6777974dd 100755 --- a/production/sdk/promoteStableRelease/promoteImpl/addRepoProperties.sh +++ b/production/sdk/promoteStableRelease/promoteImpl/addRepoProperties.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Utility to add "stats" to repos. For documentation, see +# Utility to add "stats" to repos. For documentation, see # https://wiki.eclipse.org/WTP/Releng/Tools/addRepoProperties @@ -29,25 +29,25 @@ echo "STATS_TAG_SUFFIX: ${STATS_TAG_SUFFIX}" if [[ -z "${REPO}" ]] then - echo "ERROR: this script requires a repository to add properties to." - exit 1 + echo "ERROR: this script requires a repository to add properties to." + exit 1 fi if [[ -z "${REPO_TYPE}" || -z "${BUILD_ID}" ]] -then - echo "WARNING: no mirror URL specified."; - MIRRORURL="" +then + echo "WARNING: no mirror URL specified."; + MIRRORURL="" else - MIRRORURL=/eclipse/updates/${REPO_TYPE}/${BUILD_ID} + MIRRORURL=/eclipse/updates/${REPO_TYPE}/${BUILD_ID} fi -if [[ ! -z "${MIRRORURL}" ]] -then - # remember, the '&' should NOT be XML escaped here ... the p2 api (or underlying xml) will escape it. - MIRRORURL_ARG="http://www.eclipse.org/downloads/download.php?format=xml&file=${MIRRORURL}" +if [[ ! -z "${MIRRORURL}" ]] +then + # remember, the '&' should NOT be XML escaped here ... the p2 api (or underlying xml) will escape it. + MIRRORURL_ARG="http://www.eclipse.org/downloads/download.php?format=xml&file=${MIRRORURL}" else - MIRRORURL_ARG="" + MIRRORURL_ARG="" fi # TODO: control with variable! @@ -64,14 +64,14 @@ CON_REPO_NAME_ARG=-Dp2MetadataRepositoryName=\"${CON_REPO_NAME}\" if [[ -n "${STATS_TAG_FEATURE_LIST}" ]] then - STATS_TAG_FEATURE_LIST_ARG="-DstatsTrackedArtifacts=\"${STATS_TAG_FEATURE_LIST}\"" - # no sense setting these others, if features not set - # TODO: more error checking could be done, to warn, such if features list set, but other values not - STATS_TAG_VERSIONINDICATOR_ARG="-Dp2StatsURI=\"http://download.eclipse.org/stats${MIRRORURL}\"" - if [[ -n ${STATS_TAG_SUFFIX} ]] - then - STATS_TAG_SUFFIX_ARG="-DstatsArtifactsSuffix=\"${STATS_TAG_SUFFIX}\"" - fi + STATS_TAG_FEATURE_LIST_ARG="-DstatsTrackedArtifacts=\"${STATS_TAG_FEATURE_LIST}\"" + # no sense setting these others, if features not set + # TODO: more error checking could be done, to warn, such if features list set, but other values not + STATS_TAG_VERSIONINDICATOR_ARG="-Dp2StatsURI=\"http://download.eclipse.org/stats${MIRRORURL}\"" + if [[ -n ${STATS_TAG_SUFFIX} ]] + then + STATS_TAG_SUFFIX_ARG="-DstatsArtifactsSuffix=\"${STATS_TAG_SUFFIX}\"" + fi fi echo "dev: ${BASH_SOURCE}" @@ -92,33 +92,33 @@ echo "STATS_TAG_VERSIONINDICATOR_ARG: ${STATS_TAG_VERSIONINDICATOR_ARG}" echo "STATS_TAG_SUFFIX_ARG: ${STATS_TAG_SUFFIX_ARG}" if [[ -x ${JAVA_CMD} ]] -then - echo - $JAVA_CMD -version - echo - - findEclipseExe $BUILD_ID - RC=$? - if [[ $RC != 0 ]] +then + echo + $JAVA_CMD -version + echo + + findEclipseExe $BUILD_ID + RC=$? + if [[ $RC != 0 ]] + then + echo "non zero return code returned from findEclipse: $RC" + else + if [[ -x ${ECLIPSE_EXE} ]] then - echo "non zero return code returned from findEclipse: $RC" - else - if [[ -x ${ECLIPSE_EXE} ]] - then - echo "found eclipse executable, will execute:" - echo "${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -consolelog -debug -data ${devworkspace} -application ${APP_NAME} -vm ${JAVA_EXEC_DIR} -vmargs ${MIRRORS_URL_ARG} ${ART_REPO_ARG} ${CON_REPO_ARG} ${ART_REPO_NAME_ARG} ${CON_REPO_NAME_ARG} ${STATS_TAG_FEATURE_LIST_ARG} ${STATS_TAG_VERSIONINDICATOR_ARG} ${STATS_TAG_SUFFIX_ARG}" - # we may need to 'clean' here, since using an installation that has been moved? - #${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -consolelog -debug -data ${devworkspace} -application ${APP_NAME} -vm ${JAVA_EXEC_DIR} -vmargs ${MIRRORS_URL_ARG} ${ART_REPO_ARG} ${CON_REPO_ARG} ${ART_REPO_NAME_ARG} ${CON_REPO_NAME_ARG} ${STATS_TAG_FEATURE_LIST_ARG} ${STATS_TAG_VERSIONINDICATOR_ARG} ${STATS_TAG_SUFFIX_ARG} - ${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -consolelog -debug -data ${devworkspace} -application ${APP_NAME} -vm ${JAVA_EXEC_DIR} -vmargs ${MIRRORS_URL_ARG} -Dp2ArtifactRepositoryName="${ART_REPO_NAME}" -Dp2MetadataRepositoryName="${CON_REPO_NAME}" ${ART_REPO_ARG} ${CON_REPO_ARG} - RC=$? - else - printf "\n\tERROR: %s\n\n" "The Eclipse commmand, ${ECLIPSE_EXE}, was not executable or not specified" - RC=1 - fi + echo "found eclipse executable, will execute:" + echo "${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -consolelog -debug -data ${devworkspace} -application ${APP_NAME} -vm ${JAVA_EXEC_DIR} -vmargs ${MIRRORS_URL_ARG} ${ART_REPO_ARG} ${CON_REPO_ARG} ${ART_REPO_NAME_ARG} ${CON_REPO_NAME_ARG} ${STATS_TAG_FEATURE_LIST_ARG} ${STATS_TAG_VERSIONINDICATOR_ARG} ${STATS_TAG_SUFFIX_ARG}" + # we may need to 'clean' here, since using an installation that has been moved? + #${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -consolelog -debug -data ${devworkspace} -application ${APP_NAME} -vm ${JAVA_EXEC_DIR} -vmargs ${MIRRORS_URL_ARG} ${ART_REPO_ARG} ${CON_REPO_ARG} ${ART_REPO_NAME_ARG} ${CON_REPO_NAME_ARG} ${STATS_TAG_FEATURE_LIST_ARG} ${STATS_TAG_VERSIONINDICATOR_ARG} ${STATS_TAG_SUFFIX_ARG} + ${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -consolelog -debug -data ${devworkspace} -application ${APP_NAME} -vm ${JAVA_EXEC_DIR} -vmargs ${MIRRORS_URL_ARG} -Dp2ArtifactRepositoryName="${ART_REPO_NAME}" -Dp2MetadataRepositoryName="${CON_REPO_NAME}" ${ART_REPO_ARG} ${CON_REPO_ARG} + RC=$? + else + printf "\n\tERROR: %s\n\n" "The Eclipse commmand, ${ECLIPSE_EXE}, was not executable or not specified" + RC=1 fi + fi else - printf "\n\tERROR: %s\n\n" "The Java commmand, ${JAVA_CMD}, was not executable or not specified" - RC=1 + printf "\n\tERROR: %s\n\n" "The Java commmand, ${JAVA_CMD}, was not executable or not specified" + RC=1 fi echo "RC: $RC" exit $RC diff --git a/production/sdk/promoteStableRelease/promoteImpl/addRepoPropertiesStandalone.sh b/production/sdk/promoteStableRelease/promoteImpl/addRepoPropertiesStandalone.sh index 058383d2a..815bb58fc 100755 --- a/production/sdk/promoteStableRelease/promoteImpl/addRepoPropertiesStandalone.sh +++ b/production/sdk/promoteStableRelease/promoteImpl/addRepoPropertiesStandalone.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash -# Utility to add "stats" to repos. For documentation, see +# Utility to add "stats" to repos. For documentation, see # https://wiki.eclipse.org/WTP/Releng/Tools/addRepoProperties -# This "standalone" version is to add the stats property "after the fact". -# It is not used in the automated "promoteRepos". +# This "standalone" version is to add the stats property "after the fact". +# It is not used in the automated "promoteRepos". export BUILD_ROOT=${BUILD_ROOT:-/shared/eclipse/builds/4P} @@ -16,11 +16,11 @@ printf "\n\tDEBUG: %s\n" "BUILD_ROOT: ${BUILD_ROOT}" "P20140317-1600" \ "org.eclipse.jdt.java8patch" \ "_1.0.0.v20140317-1956" - + #./addRepoProperties.sh\ -# "/data/httpd/download.eclipse.org/eclipse/updates/4.3-P-builds/P20140311-1530"\ -# "4.3-P-builds"\ -# "P20140220-1424"\ -# "org.eclipse.jdt.java8patch"\ -# "_1.0.0.v20140220-1916" + # "/data/httpd/download.eclipse.org/eclipse/updates/4.3-P-builds/P20140311-1530"\ + # "4.3-P-builds"\ + # "P20140220-1424"\ + # "org.eclipse.jdt.java8patch"\ + # "_1.0.0.v20140220-1916" diff --git a/production/sdk/promoteStableRelease/promoteImpl/promoteDropSite.sh b/production/sdk/promoteStableRelease/promoteImpl/promoteDropSite.sh index 34afa9a1f..2445c2b7e 100755 --- a/production/sdk/promoteStableRelease/promoteImpl/promoteDropSite.sh +++ b/production/sdk/promoteStableRelease/promoteImpl/promoteDropSite.sh @@ -6,17 +6,17 @@ HIDE_SITE=$3 function usage () { - printf "\n\tUsage: %s DROP_ID DL_LABEL HIDE_SITE" $(basename $0) >&2 - printf "\n\t\t%s\t%s" "DROP_ID " "such as I20121031-2000." >&2 - printf "\n\t\t%s\t%s" "DL_LABEL " "such as 4.4M3." >&2 - printf "\n\t\t%s\t%s" "HIDE_SITE " "true or false." >&2 + printf "\n\tUsage: %s DROP_ID DL_LABEL HIDE_SITE" $(basename $0) >&2 + printf "\n\t\t%s\t%s" "DROP_ID " "such as I20121031-2000." >&2 + printf "\n\t\t%s\t%s" "DL_LABEL " "such as 4.4M3." >&2 + printf "\n\t\t%s\t%s" "HIDE_SITE " "true or false." >&2 } if [[ -z "${DROP_ID}" || -z "${DL_LABEL}" || -z "${HIDE_SITE}" ]] then - printf "\n\n\t%s\n\n" "ERROR: arguments missing in call to $( basename $0 )" >&2 - usage - exit 1 + printf "\n\n\t%s\n\n" "ERROR: arguments missing in call to $( basename $0 )" >&2 + usage + exit 1 fi DL_DROP_ID=${DL_TYPE}-${DL_LABEL}-${BUILD_TIMESTAMP} @@ -30,7 +30,7 @@ printf "\n\t%s\n\t%s to \n\t%s\n" "Making backup copy of original ..." "$DROP_ID rsync -ra ${DROP_ID}/ ${DROP_ID}ORIG printf "\n\t%s\n" "Doing rename of original." -# TODO: if ${DL_DROP_ID} already exists, we should remove it, +# TODO: if ${DL_DROP_ID} already exists, we should remove it, # since basically means we are "re-running" the script after # running it once. ./renameBuild.sh ${DROP_ID} ${DL_DROP_ID} ${DL_LABEL} @@ -40,20 +40,20 @@ mv ${DROP_ID}ORIG ${DROP_ID} rm renameBuild.sh -# keep hidden, initially, both to confirm all is correct, -# and in theory could wait a bit to get a mirror or two -# (in some cases). +# keep hidden, initially, both to confirm all is correct, +# and in theory could wait a bit to get a mirror or two +# (in some cases). if [[ "${HIDE_SITE}" == "true" ]] then - touch ${DL_DROP_ID}/buildHidden - if [[ $? != 0 ]] - then - echo "touch failed. Exiting." - exit 1 - fi - echo "Remember to remove 'buildHidden' file, and re-run updateIndexes.sh since HIDE_SITE was ${HIDE_SITE}." >> "${CL_SITE}/checklist.txt" + touch ${DL_DROP_ID}/buildHidden + if [[ $? != 0 ]] + then + echo "touch failed. Exiting." + exit 1 + fi + echo "Remember to remove 'buildHidden' file, and re-run updateIndexes.sh since HIDE_SITE was ${HIDE_SITE}." >> "${CL_SITE}/checklist.txt" else - echo "HIDE_SITE value was ${HIDE_SITE}" + echo "HIDE_SITE value was ${HIDE_SITE}" fi printf "\n\t%s\n" "rsync to downloads." @@ -62,14 +62,14 @@ rsync --recursive --prune-empty-dirs --exclude="*apitoolingreference/*" --exclud rccode=$? if [ $rccode -eq 0 ] then - if [[ "${HIDE_SITE}" != "true" ]] - then - printf "\n\t%s\n" "Update main overall download index page so it shows new build." - source /shared/eclipse/sdk/updateIndexFilesFunction.shsource - updateIndex - fi + if [[ "${HIDE_SITE}" != "true" ]] + then + printf "\n\t%s\n" "Update main overall download index page so it shows new build." + source /shared/eclipse/sdk/updateIndexFilesFunction.shsource + updateIndex + fi else - printf "\n\n\t%s\n\n" "ERROR: rsync failed. rccode: $rccode" >&2 - exit $rccode + printf "\n\n\t%s\n\n" "ERROR: rsync failed. rccode: $rccode" >&2 + exit $rccode fi diff --git a/production/sdk/promoteStableRelease/promoteImpl/promoteDropSiteEq.sh b/production/sdk/promoteStableRelease/promoteImpl/promoteDropSiteEq.sh index 78c99d385..9b10c5594 100755 --- a/production/sdk/promoteStableRelease/promoteImpl/promoteDropSiteEq.sh +++ b/production/sdk/promoteStableRelease/promoteImpl/promoteDropSiteEq.sh @@ -6,17 +6,17 @@ HIDE_SITE=$3 function usage () { - printf "\n\tUsage: %s DROP_ID DL_LABEL HIDE_SITE" $(basename $0) >&2 - printf "\n\t\t%s\t%s" "DROP_ID " "such as I20121031-2000." >&2 - printf "\n\t\t%s\t%s" "DL_LABEL " "such as LunaM3." >&2 - printf "\n\t\t%s\t%s" "HIDE_SITE " "true or false." >&2 + printf "\n\tUsage: %s DROP_ID DL_LABEL HIDE_SITE" $(basename $0) >&2 + printf "\n\t\t%s\t%s" "DROP_ID " "such as I20121031-2000." >&2 + printf "\n\t\t%s\t%s" "DL_LABEL " "such as LunaM3." >&2 + printf "\n\t\t%s\t%s" "HIDE_SITE " "true or false." >&2 } if [[ -z "${DROP_ID}" || -z "${DL_LABEL}" || -z "${HIDE_SITE}" ]] then - printf "\n\n\t%s\n\n" "ERROR: arguments missing in call to $( basename $0 )" >&2 - usage - exit 1 + printf "\n\n\t%s\n\n" "ERROR: arguments missing in call to $( basename $0 )" >&2 + usage + exit 1 fi DL_DROP_ID=${DL_TYPE}-${DL_LABEL}-${BUILD_TIMESTAMP} @@ -30,7 +30,7 @@ printf "\n\t%s\n\t%s to \n\t%s\n" "Making backup copy of original ..." "$DROP_ID rsync -ra ${DROP_ID}/ ${DROP_ID}ORIG printf "\n\t%s\n" "Doing rename of original." -# TODO: if ${DL_DROP_ID} already exists, we should remove it, +# TODO: if ${DL_DROP_ID} already exists, we should remove it, # since basically means we are "re-running" the script after # running it once. ./renameBuild.sh ${DROP_ID} ${DL_DROP_ID} ${DL_LABEL} @@ -43,13 +43,13 @@ rm renameBuild.sh PROMOTE_PREFIX="promote" if [[ "${HIDE_SITE}" == "true" ]] then - PROMOTE_PREFIX="manual" - echo "Remember to change Equinox promote script name from 'manual-' to 'promote-' when time to promote." >> "${CL_SITE}/checklist.txt" -fi + PROMOTE_PREFIX="manual" + echo "Remember to change Equinox promote script name from 'manual-' to 'promote-' when time to promote." >> "${CL_SITE}/checklist.txt" +fi printf "\n\t%s\n" "Creating promote script." echo "rsync -r ${BUILDMACHINE_BASE_EQ}/${DL_DROP_ID} /home/data/httpd/download.eclipse.org/equinox/drops/" \ - > /shared/eclipse/equinox/promotion/queue/${PROMOTE_PREFIX}-${DL_LABEL}.sh + > /shared/eclipse/equinox/promotion/queue/${PROMOTE_PREFIX}-${DL_LABEL}.sh printf "\n\t%s\n" "Make sure promote script is 'executable'." chmod +x /shared/eclipse/equinox/promotion/queue/${PROMOTE_PREFIX}-${DL_LABEL}.sh diff --git a/production/sdk/promoteStableRelease/promoteImpl/promoteRepo.sh b/production/sdk/promoteStableRelease/promoteImpl/promoteRepo.sh index c3c1a533b..0ec72cce2 100755 --- a/production/sdk/promoteStableRelease/promoteImpl/promoteRepo.sh +++ b/production/sdk/promoteStableRelease/promoteImpl/promoteRepo.sh @@ -7,18 +7,18 @@ HIDE_SITE=$4 function usage () { - printf "\n\tUsage: %s DROP_ID DL_LABEL REPO_SITE_SEGMENT HIDE_SITE" $(basename $0) >&2 - printf "\n\t\t%s\t%s" "DROP_ID " "such as I20121031-2000." >&2 - printf "\n\t\t%s\t%s" "DL_LABEL " "such as 4.4M3." >&2 - printf "\n\t\t%s\t%s" "REPO_SITE_SEGMENT " "such as 4.4milestones, 4.4, etc." >&2 - printf "\n\t\t%s\t%s" "HIDE_SITE " "true or false." >&2 + printf "\n\tUsage: %s DROP_ID DL_LABEL REPO_SITE_SEGMENT HIDE_SITE" $(basename $0) >&2 + printf "\n\t\t%s\t%s" "DROP_ID " "such as I20121031-2000." >&2 + printf "\n\t\t%s\t%s" "DL_LABEL " "such as 4.4M3." >&2 + printf "\n\t\t%s\t%s" "REPO_SITE_SEGMENT " "such as 4.4milestones, 4.4, etc." >&2 + printf "\n\t\t%s\t%s" "HIDE_SITE " "true or false." >&2 } if [[ -z "${DROP_ID}" || -z "${DL_LABEL}" || -z "${REPO_SITE_SEGMENT}" || -z "${HIDE_SITE}" ]] then - printf "\n\n\t%s\n\n" "ERROR: arguments missing in call to $( basename $0 )." >&2 - usage - exit 1 + printf "\n\n\t%s\n\n" "ERROR: arguments missing in call to $( basename $0 )." >&2 + usage + exit 1 fi @@ -39,10 +39,10 @@ findEclipseExe ${DL_SITE_ID} RC=$? if [[ $RC == 0 ]] then -${PROMOTE_IMPL}/addRepoProperties.sh ${BUILDMACHINE_SITE} ${REPO_SITE_SEGMENT} ${DL_SITE_ID} + ${PROMOTE_IMPL}/addRepoProperties.sh ${BUILDMACHINE_SITE} ${REPO_SITE_SEGMENT} ${DL_SITE_ID} else - echo "ERROR: could not run add repo properties. Add manually." -fi + echo "ERROR: could not run add repo properties. Add manually." +fi printf "\n\t%s\n" "rsync build machine repo site, to downloads repo site." # remember, need trailing slash since going from existing directories @@ -51,13 +51,13 @@ rsync -r "${BUILDMACHINE_SITE}/" "${DLMACHINE_SITE}" if [[ "${HIDE_SITE}" != "true" ]] then - ${PROMOTE_IMPL}/runAntRunner.sh ${PROMOTE_IMPL}/addToComposite.xml addToComposite -Drepodir=${DLMACHINE_BASE_SITE} -Dcomplocation=${DL_SITE_ID} + ${PROMOTE_IMPL}/runAntRunner.sh ${PROMOTE_IMPL}/addToComposite.xml addToComposite -Drepodir=${DLMACHINE_BASE_SITE} -Dcomplocation=${DL_SITE_ID} else - echo "#!/usr/bin/env bash" > deferedCompositeAdd.sh - echo "export JAVA_CMD=$JAVA_CMD" >> deferedCompositeAdd.sh - echo "export JAVA_EXEC_DIR=${JAVA_EXEC_DIR}" >> deferedCompositeAdd.sh - echo "export ECLIPSE_EXE=${ECLIPSE_EXE}" >> deferedCompositeAdd.sh - echo "${PROMOTE_IMPL}/runAntRunner.sh ${PROMOTE_IMPL}/addToComposite.xml addToComposite -Drepodir=${DLMACHINE_BASE_SITE} -Dcomplocation=${DL_SITE_ID}" >> deferedCompositeAdd.sh - chmod +x deferedCompositeAdd.sh - echo "Remember to add to composite, deferedCompositeAdd.sh, since HIDE_SITE was ${HIDE_SITE}" >> "${CL_SITE}/checklist.txt" + echo "#!/usr/bin/env bash" > deferedCompositeAdd.sh + echo "export JAVA_CMD=$JAVA_CMD" >> deferedCompositeAdd.sh + echo "export JAVA_EXEC_DIR=${JAVA_EXEC_DIR}" >> deferedCompositeAdd.sh + echo "export ECLIPSE_EXE=${ECLIPSE_EXE}" >> deferedCompositeAdd.sh + echo "${PROMOTE_IMPL}/runAntRunner.sh ${PROMOTE_IMPL}/addToComposite.xml addToComposite -Drepodir=${DLMACHINE_BASE_SITE} -Dcomplocation=${DL_SITE_ID}" >> deferedCompositeAdd.sh + chmod +x deferedCompositeAdd.sh + echo "Remember to add to composite, deferedCompositeAdd.sh, since HIDE_SITE was ${HIDE_SITE}" >> "${CL_SITE}/checklist.txt" fi diff --git a/production/sdk/promoteStableRelease/promoteImpl/promoteUtilities.shsource b/production/sdk/promoteStableRelease/promoteImpl/promoteUtilities.shsource index 2d10c19ff..b24387823 100644 --- a/production/sdk/promoteStableRelease/promoteImpl/promoteUtilities.shsource +++ b/production/sdk/promoteStableRelease/promoteImpl/promoteUtilities.shsource @@ -7,43 +7,43 @@ export JAVA_CMD=${JAVA_EXEC_DIR}/java function findEclipseExe () { - BUILD_ID=$1 + BUILD_ID=$1 if [[ -z "${BUILD_ID}" ]] - then + then echo "ERROR: this script, $BASH_SOURCE, requires BUILD_ID" 2>>${TRACE_LOG} - return 1 + return 1 fi BUILD_ROOT=${BUILD_ROOT:-/shared/eclipse/builds/4I} - basebuilderParent=${BUILD_ROOT}/siteDir/eclipse/downloads/drops4/${BUILD_ID} - if [[ ! -d "${basebuilderParent}" ]] + basebuilderParent=${BUILD_ROOT}/siteDir/eclipse/downloads/drops4/${BUILD_ID} + if [[ ! -d "${basebuilderParent}" ]] then - echo "ERROR: The directory did not exist. Must name existing directory where basebuilder is, or will be installed." 2>>${TRACE_LOG} - echo " basebuilderParent: ${basebuilderParent}" 2>>${TRACE_LOG} - return 1 + echo "ERROR: The directory did not exist. Must name existing directory where basebuilder is, or will be installed." 2>>${TRACE_LOG} + echo " basebuilderParent: ${basebuilderParent}" 2>>${TRACE_LOG} + return 1 fi - # TODO: we could check basebuilder here and if not, install it? - # but not required for immediate use case of using to composite repos. +# TODO: we could check basebuilder here and if not, install it? +# but not required for immediate use case of using to composite repos. baseBuilderDir=${basebuilderParent}/org.eclipse.releng.basebuilder if [[ ! -d "${baseBuilderDir}" ]] - then + then echo "ERROR: The directory did not exist." 2>>${TRACE_LOG} - echo " baseBuilderDir: ${baseBuilderDir}" 2>>${TRACE_LOG} - return 1 + echo " baseBuilderDir: ${baseBuilderDir}" 2>>${TRACE_LOG} + return 1 fi export ECLIPSE_EXE=$baseBuilderDir/eclipse - echo "DEBUG: ECLIPSE_EXE: ${ECLIPSE_EXE}" 2>>${TRACE_LOG} - - if [[ -n ${ECLIPSE_EXE} && -x ${ECLIPSE_EXE} ]] - then - echo "Found Eclipse executable: ${ECLIPSE_EXE}" 2>>${TRACE_LOG} - else - echo "ERROR: ECLIPSE_EXE is not defined to an executable eclipse" 2>>${TRACE_LOG} - return 1 + echo "DEBUG: ECLIPSE_EXE: ${ECLIPSE_EXE}" 2>>${TRACE_LOG} + + if [[ -n ${ECLIPSE_EXE} && -x ${ECLIPSE_EXE} ]] + then + echo "Found Eclipse executable: ${ECLIPSE_EXE}" 2>>${TRACE_LOG} + else + echo "ERROR: ECLIPSE_EXE is not defined to an executable eclipse" 2>>${TRACE_LOG} + return 1 fi return 0 diff --git a/production/sdk/promoteStableRelease/promoteImpl/runAntRunner.sh b/production/sdk/promoteStableRelease/promoteImpl/runAntRunner.sh index a7db3308c..a7687c9bc 100755 --- a/production/sdk/promoteStableRelease/promoteImpl/runAntRunner.sh +++ b/production/sdk/promoteStableRelease/promoteImpl/runAntRunner.sh @@ -1,19 +1,19 @@ #!/usr/bin/env bash -# Utility to invoke eclipse antrunner, from the "base builder", which should already be +# Utility to invoke eclipse antrunner, from the "base builder", which should already be # installed on the build machine, where the build is. # # we assume promoteUtilities.shsource has already been sourced, and exported the required variables. -# TODO: eventually could do more error checking to be sure. +# TODO: eventually could do more error checking to be sure. -# to create composite, we expect "addToComposite.xml" to be passed in. +# to create composite, we expect "addToComposite.xml" to be passed in. BUILDFILE=$1 if [ -e $BUILDFILE ] then - BUILDFILESTR=" -file $BUILDFILE" - shift + BUILDFILESTR=" -file $BUILDFILE" + shift else - BUILDFILESTR=" -file build.xml" + BUILDFILESTR=" -file build.xml" fi # use special $@ to keep all (remaining) arguments quoted (instead of one big string) @@ -23,8 +23,8 @@ echo echo " BUILDFILESTR: $BUILDFILESTR" if [ -n "${extraArgs}" ] then - echo " extraArgs: ${extraArgs}" - echo " as it is right now, target name must be first \"extraArg\" if specifying one." + echo " extraArgs: ${extraArgs}" + echo " as it is right now, target name must be first \"extraArg\" if specifying one." fi echo @@ -37,7 +37,7 @@ echo " buildId: ${buildId}" echo " dev script: $BASH_SCRIPT" echo " devworkspace: $devworkspace" echo " devArgs (-vmargs): $devArgs" -echo " BUILDFILESTR: $BUILDFILESTR" +echo " BUILDFILESTR: $BUILDFILESTR" echo " extraArgs: ${extraArgs}" echo @@ -45,7 +45,7 @@ echo $JAVA_CMD -version echo -${ECLIPSE_EXE} -nosplash -consolelog -debug -data ${devworkspace} -vm ${JAVA_EXEC_DIR} -application ${APP_NAME} $BUILDFILESTR ${extraArgs} +${ECLIPSE_EXE} -nosplash -consolelog -debug -data ${devworkspace} -vm ${JAVA_EXEC_DIR} -application ${APP_NAME} $BUILDFILESTR ${extraArgs} RC=$? exit $RC diff --git a/production/sdk/promoteStableRelease/promoteImpl/tagPromotedBuilds.sh b/production/sdk/promoteStableRelease/promoteImpl/tagPromotedBuilds.sh index c228d8111..482f8baeb 100644 --- a/production/sdk/promoteStableRelease/promoteImpl/tagPromotedBuilds.sh +++ b/production/sdk/promoteStableRelease/promoteImpl/tagPromotedBuilds.sh @@ -1,10 +1,10 @@ #!/usr/bin/env bash -# TODO: might want to add if [[ "${HIDE_SITE}" != "true" ]] logic as we do for +# TODO: might want to add if [[ "${HIDE_SITE}" != "true" ]] logic as we do for # deferedCompositeAdd script echo "#!/usr/bin/env bash" > deferedTag.sh -echo "# navigate to gitcache aggregator" >> deferedTag.sh +echo "# navigate to gitcache aggregator" >> deferedTag.sh echo "pushd ${BUILD_ROOT}/${AGGR_LOCATION}" >> deferedTag.sh echo "" >> deferedTag.sh echo "# DROP_ID == BUILD_ID, which should already exist as tag (for all I and M builds)" >> deferedTag.sh diff --git a/production/sdk/promoteStableRelease/promoteKepler/promoteSites.sh b/production/sdk/promoteStableRelease/promoteKepler/promoteSites.sh index ccd85f324..dc95019d8 100755 --- a/production/sdk/promoteStableRelease/promoteKepler/promoteSites.sh +++ b/production/sdk/promoteStableRelease/promoteKepler/promoteSites.sh @@ -23,13 +23,13 @@ echo "CL_SITE: ${CL_SITE}" export DL_TYPE=R #export DL_TYPE=M -# variables used on tagging aggregator for milestones (and RCs?) -# Could probably compute this tag ... but for now easier to type it in each time. +# variables used on tagging aggregator for milestones (and RCs?) +# Could probably compute this tag ... but for now easier to type it in each time. export NEW_TAG=M4_3_2 # For now, we'll just use handy Equinox label for tag annotation, but could elaborate in future export NEW_ANNOTATION="${DL_LABEL_EQ}" # later combined with BUILD_ROOT, so we get the correct clone -# should very seldom need to change, if ever. +# should very seldom need to change, if ever. export AGGR_LOCATION="gitCache/eclipse.platform.releng.aggregator" @@ -71,22 +71,22 @@ printf "\t%s\n" "Equinox specific downloads:" >> "${CL_SITE}/checklist.txt" printf "\t%s\n\n" "http://download.eclipse.org/equinox/drops/${EQUINOX_DL_DROP_DIR_SEGMENT}/" >> "${CL_SITE}/checklist.txt" -# we do Equinox first, since it has to wait in que until +# we do Equinox first, since it has to wait in que until # cronjob promotes it ${PROMOTE_IMPL}/promoteDropSiteEq.sh ${DROP_ID} ${DL_LABEL_EQ} ${HIDE_SITE} rccode=$? if [[ $rccode != 0 ]] then - printf "\n\n\t%s\n\n" "ERROR: promoteDropSiteEq.sh failed. Subsequent promotion cancelled." - exit $rccode + printf "\n\n\t%s\n\n" "ERROR: promoteDropSiteEq.sh failed. Subsequent promotion cancelled." + exit $rccode fi ${PROMOTE_IMPL}/promoteDropSite.sh ${DROP_ID} ${DL_LABEL} ${HIDE_SITE} rccode=$? if [[ $rccode != 0 ]] then - printf "\n\n\t%s\n\n" "ERROR: promoteDropSite.sh failed. Subsequent promotion cancelled." - exit $rccode + printf "\n\n\t%s\n\n" "ERROR: promoteDropSite.sh failed. Subsequent promotion cancelled." + exit $rccode fi @@ -94,20 +94,20 @@ ${PROMOTE_IMPL}/promoteRepo.sh ${DROP_ID} ${DL_LABEL} ${REPO_SITE_SEGMENT} ${HID rccode=$? if [[ $rccode != 0 ]] then - printf "\n\n\t%s\n\n" "ERROR: promoteRepo.sh failed." - exit $rccode + printf "\n\n\t%s\n\n" "ERROR: promoteRepo.sh failed." + exit $rccode fi # If all goes well, we create the "tag script", but don't actually run it -# until we make the site visible, after doing sanity checking, etc. +# until we make the site visible, after doing sanity checking, etc. # Note, this script relies on a number of exported variables ${PROMOTE_IMPL}/tagPromotedBuilds.sh rccode=$? if [[ $rccode != 0 ]] then - printf "\n\n\t%s\n\n" "ERROR: tagPromotedBuilds.sh failed." - exit $rccode + printf "\n\n\t%s\n\n" "ERROR: tagPromotedBuilds.sh failed." + exit $rccode fi exit 0 diff --git a/production/sdk/promoteStableRelease/promoteLuna/promoteSites.sh b/production/sdk/promoteStableRelease/promoteLuna/promoteSites.sh index 05b0360c3..842c43371 100755 --- a/production/sdk/promoteStableRelease/promoteLuna/promoteSites.sh +++ b/production/sdk/promoteStableRelease/promoteLuna/promoteSites.sh @@ -20,13 +20,13 @@ export DL_TYPE=S #export DL_TYPE=R #export DL_TYPE=M -# variables used on tagging aggregator for milestones (and RCs?) -# Could probably compute this tag ... but for now easier to type it in each time. +# variables used on tagging aggregator for milestones (and RCs?) +# Could probably compute this tag ... but for now easier to type it in each time. export NEW_TAG=S4_4_0_RC1 # For now, we'll just use handy Equinox label for tag annotation, but could elaborate in future export NEW_ANNOTATION="${DL_LABEL_EQ}" # later combined with BUILD_ROOT, so we get the correct clone -# should very seldom need to change, if ever. +# should very seldom need to change, if ever. export AGGR_LOCATION="gitCache/eclipse.platform.releng.aggregator" export TRACE_LOG=${PWD}/traceLog.txt @@ -69,22 +69,22 @@ printf "\t%s\n" "Equinox specific downloads:" >> "${CL_SITE}/checklist.txt" printf "\t%s\n\n" "http://download.eclipse.org/equinox/drops/${EQUINOX_DL_DROP_DIR_SEGMENT}/" >> "${CL_SITE}/checklist.txt" -# we do Equinox first, since it has to wait in que until +# we do Equinox first, since it has to wait in que until # cronjob promotes it ${PROMOTE_IMPL}/promoteDropSiteEq.sh ${DROP_ID} ${DL_LABEL_EQ} ${HIDE_SITE} rccode=$? if [[ $rccode != 0 ]] then - printf "\n\n\t%s\n\n" "ERROR: promoteDropSiteEq.sh failed. Subsequent promotion cancelled." - exit $rccode + printf "\n\n\t%s\n\n" "ERROR: promoteDropSiteEq.sh failed. Subsequent promotion cancelled." + exit $rccode fi ${PROMOTE_IMPL}/promoteDropSite.sh ${DROP_ID} ${DL_LABEL} ${HIDE_SITE} rccode=$? if [[ $rccode != 0 ]] then - printf "\n\n\t%s\n\n" "ERROR: promoteDropSite.sh failed. Subsequent promotion cancelled." - exit $rccode + printf "\n\n\t%s\n\n" "ERROR: promoteDropSite.sh failed. Subsequent promotion cancelled." + exit $rccode fi @@ -92,19 +92,19 @@ ${PROMOTE_IMPL}/promoteRepo.sh ${DROP_ID} ${DL_LABEL} ${REPO_SITE_SEGMENT} ${HID rccode=$? if [[ $rccode != 0 ]] then - printf "\n\n\t%s\n\n" "ERROR: promoteRepo.sh failed." - exit $rccode + printf "\n\n\t%s\n\n" "ERROR: promoteRepo.sh failed." + exit $rccode fi # If all goes well, we create the "tag script", but don't actually run it -# until we make the site visible, after doing sanity checking, etc. +# until we make the site visible, after doing sanity checking, etc. # Note, this script relies on a number of exported variables ${PROMOTE_IMPL}/tagPromotedBuilds.sh rccode=$? if [[ $rccode != 0 ]] then - printf "\n\n\t%s\n\n" "ERROR: tagPromotedBuilds.sh failed." - exit $rccode + printf "\n\n\t%s\n\n" "ERROR: tagPromotedBuilds.sh failed." + exit $rccode fi exit 0 diff --git a/production/sdk/promotion/equinoxPromotionCronJob.sh b/production/sdk/promotion/equinoxPromotionCronJob.sh index 4cedc9f73..9c54d0ed0 100755 --- a/production/sdk/promotion/equinoxPromotionCronJob.sh +++ b/production/sdk/promotion/equinoxPromotionCronJob.sh @@ -28,15 +28,15 @@ allfiles=$( find $promoteScriptLocation -name "promote*.sh" | sort ) for promotefile in $allfiles do -# having an echo here will cause cron job to send mail for EACH job, even if all is fine. -# so use only for testing. -#echo $promotefile + # having an echo here will cause cron job to send mail for EACH job, even if all is fine. + # so use only for testing. + #echo $promotefile -if [[ -z "$promotefile" ]] -then - # would be an odd error, but nothing to do (Remember, can not have an empty if/then/else clause! Syntax error. - echo "WARNING: unexpectedly found promotefile variable to be null or empty." -else + if [[ -z "$promotefile" ]] + then + # would be an odd error, but nothing to do (Remember, can not have an empty if/then/else clause! Syntax error. + echo "WARNING: unexpectedly found promotefile variable to be null or empty." + else # found a file, make sure it is executable # I've discovered, just testing, that even if $promotefile is a # directory, and executable, and fits the pattern, it is attempted to be @@ -45,39 +45,39 @@ else if [[ -x $promotefile && -f $promotefile ]] then - # if found a file to execute, temporarily change its name to "RUNNING-$promotefile - # so a subsequent cron job won't find it (if it does not finish by the time of the next cron job). - runningpromotefile=$promoteScriptLocation/RUNNING_$(basename $promotefile) - mv $promotefile $runningpromotefile - # notice these logs are concatenated on purpose, to give some "history", but - # that means has to be "manually" removed every now and then. - # improve as desired. - /bin/bash $runningpromotefile 1>>$workLocation/promotion-out.txt 2>>$workLocation/promotion-err.txt - # to test cron job, without doing anything, comment out above line, and uncomment folloiwng line. - # then try various types of files file names, etc. - # echo "DEBUG: normally would execute file here: $promotefile" 1>>$workLocation/promotion-out.txt 2>>$workLocation/promotion-err.txt - rccode=$? - if [[ $rccode != 0 ]] - then - echo "ERROR: promotion returned an error: $rccode" - echo " promotefile: $promotefile" - mv $runningpromotefile $promoteScriptLocation/ERROR_$(basename $promotefile) - # probably would not have to exit here, could continue looping since renamed problematic - # file , but since something unexpected happened, best to pause to give some opportunity - # to examine the issue and make sure not something harmful. - exit 1 - else - # all is ok, we'll move the file to "RAN-" in case needed for later inspection, - # if things go wrong. Perhaps eventually just remove them? - mv $runningpromotefile $promoteScriptLocation/RAN_$(basename $promotefile) - fi - else - echo "ERROR: promotion file found, but was not executable?" - echo " promotefile: $promotefile" - # We could likely do some rename-and-proceed thing here, but should - # be so rare and unexpected something is likely very wrong? So, we'll just exit. + # if found a file to execute, temporarily change its name to "RUNNING-$promotefile + # so a subsequent cron job won't find it (if it does not finish by the time of the next cron job). + runningpromotefile=$promoteScriptLocation/RUNNING_$(basename $promotefile) + mv $promotefile $runningpromotefile + # notice these logs are concatenated on purpose, to give some "history", but + # that means has to be "manually" removed every now and then. + # improve as desired. + /bin/bash $runningpromotefile 1>>$workLocation/promotion-out.txt 2>>$workLocation/promotion-err.txt + # to test cron job, without doing anything, comment out above line, and uncomment folloiwng line. + # then try various types of files file names, etc. + # echo "DEBUG: normally would execute file here: $promotefile" 1>>$workLocation/promotion-out.txt 2>>$workLocation/promotion-err.txt + rccode=$? + if [[ $rccode != 0 ]] + then + echo "ERROR: promotion returned an error: $rccode" + echo " promotefile: $promotefile" + mv $runningpromotefile $promoteScriptLocation/ERROR_$(basename $promotefile) + # probably would not have to exit here, could continue looping since renamed problematic + # file , but since something unexpected happened, best to pause to give some opportunity + # to examine the issue and make sure not something harmful. exit 1 + else + # all is ok, we'll move the file to "RAN-" in case needed for later inspection, + # if things go wrong. Perhaps eventually just remove them? + mv $runningpromotefile $promoteScriptLocation/RAN_$(basename $promotefile) + fi + else + echo "ERROR: promotion file found, but was not executable?" + echo " promotefile: $promotefile" + # We could likely do some rename-and-proceed thing here, but should + # be so rare and unexpected something is likely very wrong? So, we'll just exit. + exit 1 fi -fi + fi done diff --git a/production/sdk/promotion/getEBuilder.sh b/production/sdk/promotion/getEBuilder.sh index 49461a11a..8ca4fb78c 100755 --- a/production/sdk/promotion/getEBuilder.sh +++ b/production/sdk/promotion/getEBuilder.sh @@ -9,83 +9,83 @@ WORKSPACE=$3 if [[ -z "${WORKSPACE}" ]] then - echo "WORKSPACE not supplied, will assume current directory" - WORKSPACE=${PWD} + echo "WORKSPACE not supplied, will assume current directory" + WORKSPACE=${PWD} else - if [[ ! -d "${WORKSPACE}" ]] - then - echo "ERROR: WORKSPACE did not exist." - exit 1 - fi + if [[ ! -d "${WORKSPACE}" ]] + then + echo "ERROR: WORKSPACE did not exist." + exit 1 + fi fi if [[ -z "${EBUILDER_HASH}" ]] -then - echo "EBUILDER HASH, BRANCH, or TAG was not supplied, assuming 'master'" - EBUILDER_HASH=master +then + echo "EBUILDER HASH, BRANCH, or TAG was not supplied, assuming 'master'" + EBUILDER_HASH=master fi if [[ -z "${BUILD_KIND}" ]] then - echo "BUILD_KIND not supplied, assuming CBI" - BUILD_KIND=CBI + echo "BUILD_KIND not supplied, assuming CBI" + BUILD_KIND=CBI fi if [[ "${BUILD_KIND}" == "CBI" ]] -then - EBUILDER=eclipse.platform.releng.aggregator - TARGETNAME=eclipse.platform.releng.aggregator - ESCRIPT_LOC=${EBUILDER}/production/testScripts -elif [[ "$BUILD_KIND" == "PDE" ]] then - EBUILDER=eclipse.platform.releng.eclipsebuilder - TARGETNAME=org.eclipse.releng.eclipsebuilder - ESCRIPT_LOC=${TARGETNAME} -else - echo "ERROR: Unexpected value of BUILD_KIND: ${BUILD_KIND}" - exit 1 + EBUILDER=eclipse.platform.releng.aggregator + TARGETNAME=eclipse.platform.releng.aggregator + ESCRIPT_LOC=${EBUILDER}/production/testScripts +elif [[ "$BUILD_KIND" == "PDE" ]] +then + EBUILDER=eclipse.platform.releng.eclipsebuilder + TARGETNAME=org.eclipse.releng.eclipsebuilder + ESCRIPT_LOC=${TARGETNAME} +else + echo "ERROR: Unexpected value of BUILD_KIND: ${BUILD_KIND}" + exit 1 fi -# don't re-fetch, if already exists. -# TODO: May need to provide a "force" parameter to use when testing? +# don't re-fetch, if already exists. +# TODO: May need to provide a "force" parameter to use when testing? if [[ ! -d ${WORKSPACE}/${TARGETNAME} ]] then - # remove just in case left from previous failed run - # if they exist - if [[ -f ebuilder.zip ]] - then - rm ebuilder.zip - fi - if [[ -d tempebuilder ]] - then - rm -fr tempebuilder - fi - wget -O ebuilder.zip --no-verbose http://git.eclipse.org/c/platform/${EBUILDER}.git/snapshot/${EBUILDER}-${EBUILDER_HASH}.zip 2>&1 - unzip -q ebuilder.zip -d tempebuilder - mkdir -p ${WORKSPACE}/${TARGETNAME} - rsync --recursive "tempebuilder/${EBUILDER}-${EBUILDER_HASH}/" "${WORKSPACE}/${TARGETNAME}/" - rccode=$? - if [[ $rccode != 0 ]] - then - echo "ERROR: rsync did not complete normally.rccode: $rccode" - exit $rccode - fi -else - echo "INFO: ebuilder directory found to exist. Not re-fetching." - echo "INFO: ${WORKSPACE}/${TARGETNAME}" -fi + # remove just in case left from previous failed run + # if they exist + if [[ -f ebuilder.zip ]] + then + rm ebuilder.zip + fi + if [[ -d tempebuilder ]] + then + rm -fr tempebuilder + fi + wget -O ebuilder.zip --no-verbose http://git.eclipse.org/c/platform/${EBUILDER}.git/snapshot/${EBUILDER}-${EBUILDER_HASH}.zip 2>&1 + unzip -q ebuilder.zip -d tempebuilder + mkdir -p ${WORKSPACE}/${TARGETNAME} + rsync --recursive "tempebuilder/${EBUILDER}-${EBUILDER_HASH}/" "${WORKSPACE}/${TARGETNAME}/" + rccode=$? + if [[ $rccode != 0 ]] + then + echo "ERROR: rsync did not complete normally.rccode: $rccode" + exit $rccode + fi +else + echo "INFO: ebuilder directory found to exist. Not re-fetching." + echo "INFO: ${WORKSPACE}/${TARGETNAME}" +fi # copy to well-known location so subsequent steps do not need to know which ebuilder they came from #cp ${WORKSPACE}/${ESCRIPT_LOC}/getBaseBuilder.xml ${WORKSPACE} #cp ${WORKSPACE}/${ESCRIPT_LOC}/runTests2.xml ${WORKSPACE} # remove on clean exit, if they exist if [[ -f ebuilder.zip ]] -then - rm ebuilder.zip -fi +then + rm ebuilder.zip +fi if [[ -d tempebuilder ]] then - rm -fr tempebuilder + rm -fr tempebuilder fi exit 0 diff --git a/production/sdk/promotion/runAntRunner.sh b/production/sdk/promotion/runAntRunner.sh index 9d681c264..0c7d0ea9c 100755 --- a/production/sdk/promotion/runAntRunner.sh +++ b/production/sdk/promotion/runAntRunner.sh @@ -1,33 +1,33 @@ #!/usr/bin/env bash -# Utility to invoke eclipse antrunner, from the "base builder", which should already be +# Utility to invoke eclipse antrunner, from the "base builder", which should already be # installed on the build machine, where the build is. # # the build file, if not build.xml, must be second argument # that can be followed be target or other arguments -# this buildeclipse.shsource file is to ease local builds to override some variables. +# this buildeclipse.shsource file is to ease local builds to override some variables. # It should not be used for production builds. source buildeclipse.shsource 2>/dev/null export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds} -# If used for other things, where a build doesn't exist, +# If used for other things, where a build doesn't exist, # could/should likely use something like 'temp' or some other "cache" directory. buildId=$1 if [[ -z "${buildId}" ]] then - echo "This script requires previous (local) build Id as input." - echo " For example, $( basename $0 ) I20130306-0033" - exit 1 + echo "This script requires previous (local) build Id as input." + echo " For example, $( basename $0 ) I20130306-0033" + exit 1 fi shift eclipseStream=$1 if [[ -z "${eclipseStream}" ]] then - echo "This script requires eclipseStream as input." - echo " For example, $( basename $0 ) I20130306-0033 4.3.0" - exit 1 + echo "This script requires eclipseStream as input." + echo " For example, $( basename $0 ) I20130306-0033 4.3.0" + exit 1 fi shift @@ -39,34 +39,34 @@ export BUILD_ROOT=${BUILD_ROOT:-${BUILD_HOME}/${eclipseStreamMajor}${buildType}} dropSegment=drops if (( ${eclipseStreamMajor} > 3 )) then - dropSegment=drops${eclipseStreamMajor} + dropSegment=drops${eclipseStreamMajor} fi basebuilderParent=${BUILD_ROOT}/siteDir/eclipse/downloads/${dropSegment}/${buildId} if [[ ! -d "${basebuilderParent}" ]] then - echo "ERROR: The directory did not exist. Must name existing directory where basebuilder is, or will be installed." - echo " basebuilderParent: ${basebuilderParent}" - exit 1 + echo "ERROR: The directory did not exist. Must name existing directory where basebuilder is, or will be installed." + echo " basebuilderParent: ${basebuilderParent}" + exit 1 fi -# TODO: we could check basebuilder here and if not, install it? +# TODO: we could check basebuilder here and if not, install it? # but not required for immediate use case of using to composite repos. baseBuilderDir=${basebuilderParent}/org.eclipse.releng.basebuilder if [[ ! -d "${baseBuilderDir}" ]] then - echo "ERROR: The directory did not exist." - echo " baseBuilderDir: ${baseBuilderDir}" - exit 1 + echo "ERROR: The directory did not exist." + echo " baseBuilderDir: ${baseBuilderDir}" + exit 1 fi launcherJar=$( find $baseBuilderDir/ -name "org.eclipse.equinox.launcher_*.jar" | sort | head -1 ) if [[ -z "${launcherJar}" || ! -f "${launcherJar}" ]] then - echo "ERROR: The launcher did not exist." - echo " launcherJar: ${launcherJar}" - exit 1 + echo "ERROR: The launcher did not exist." + echo " launcherJar: ${launcherJar}" + exit 1 fi if [[ -z "${JAVA_HOME}" ]] @@ -75,19 +75,19 @@ then fi if [[ ! -d "${JAVA_HOME}" ]] then - echo "ERROR: JAVA_HOME did not exist." - echo " JAVA_HOME: ${JAVA_HOME}" - exit 1 + echo "ERROR: JAVA_HOME did not exist." + echo " JAVA_HOME: ${JAVA_HOME}" + exit 1 fi javaCMD=${JAVA_HOME}/bin/java BUILDFILE=$1 if [ -e $BUILDFILE ] then - BUILDFILESTR=" -file $BUILDFILE" - shift + BUILDFILESTR=" -file $BUILDFILE" + shift else - BUILDFILESTR=" -file build.xml" + BUILDFILESTR=" -file build.xml" fi # use special $@ to keep all (remaining) arguments quoted (instead of one big string) @@ -97,8 +97,8 @@ echo echo " BUILDFILESTR: $BUILDFILESTR" if [ -n "${extraArgs}" ] then - echo " extraArgs: ${extraArgs}" - echo " as it is right now, target name must be first \"extraArg\" if specifying one." + echo " extraArgs: ${extraArgs}" + echo " as it is right now, target name must be first \"extraArg\" if specifying one." fi echo @@ -117,7 +117,7 @@ echo " dev script: $0" echo " devworkspace: $devworkspace" echo " devArgs (-vmargs): $devArgs" echo " javaCMD: $javaCMD" -echo " BUILDFILESTR: $BUILDFILESTR" +echo " BUILDFILESTR: $BUILDFILESTR" echo " extraArgs: ${extraArgs}" echo diff --git a/production/sdk/promotion/sdkPromotionCronJob.sh b/production/sdk/promotion/sdkPromotionCronJob.sh index e42204dac..6aeb03262 100755 --- a/production/sdk/promotion/sdkPromotionCronJob.sh +++ b/production/sdk/promotion/sdkPromotionCronJob.sh @@ -15,11 +15,11 @@ # Start with minimal path for consistency across machines # plus, cron jobs do not inherit an environment -# care is needed not have anything in ${HOME}/bin that would effect the build -# unintentionally, but is required to make use of "source buildeclipse.shsource" on -# local machines. -# Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it -# to false) for a test I-build on a remote machine. +# care is needed not have anything in ${HOME}/bin that would effect the build +# unintentionally, but is required to make use of "source buildeclipse.shsource" on +# local machines. +# Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it +# to false) for a test I-build on a remote machine. export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin # unset common variables (some defined for e4Build) which we don't want (or, set ourselves) unset JAVA_HOME @@ -34,10 +34,10 @@ unset JRE_HOME # we create. oldumask=`umask` umask 0002 -# Remember, don't echo except when testing, or mail will be sent each time it runs. +# Remember, don't echo except when testing, or mail will be sent each time it runs. #echo "umask explicitly set to 0002, old value was $oldumask" -# this buildeclipse.shsource file is to ease local builds to override some variables. +# this buildeclipse.shsource file is to ease local builds to override some variables. # It should not be used for production builds. source buildeclipse.shsource 2>/dev/null @@ -62,56 +62,56 @@ allfiles=$( find $promoteScriptLocation -name "promote*.sh" | sort ) for promotefile in $allfiles do - # having an echo here will cause cron job to send mail for EACH job, even if all is fine. - # so use only for testing. - #echo $promotefile - - if [[ -z "$promotefile" ]] + # having an echo here will cause cron job to send mail for EACH job, even if all is fine. + # so use only for testing. + #echo $promotefile + + if [[ -z "$promotefile" ]] + then + # would be an odd error, but nothing to do (Remember, can not have an empty if/then/else clause! Syntax error. + echo "WARNING: unexpectedly found promotefile variable to be null or empty." + else + # found a file, make sure it is executable + # I've discovered, just testing, that even if $promotefile is a + # directory, and executable, and fits the pattern, it is attempted to be + # processed. It was just a test case, nearly impossible to occur in reality, + # but best to test it is a file, for safety. + if [[ -x $promotefile && -f $promotefile ]] then - # would be an odd error, but nothing to do (Remember, can not have an empty if/then/else clause! Syntax error. - echo "WARNING: unexpectedly found promotefile variable to be null or empty." + + # if found a file to execute, temporarily change its name to "RUNNING-$promotefile + # so a subsequent cron job won't find it (if it does not finish by the time of the next cron job). + runningpromotefile=$promoteScriptLocation/RUNNING_$(basename $promotefile) + mv $promotefile $runningpromotefile + # notice these logs are concatenated on purpose, to give some "history", but + # that means has to be "manually" removed every now and then. + # improve as desired. + /bin/bash $runningpromotefile 1>>$workLocation/promotion-out.txt 2>>$workLocation/promotion-err.txt + # to test cron job, without doing anything, comment out above line, and uncomment folloiwng line. + # then try various types of files file names, etc. + # echo "DEBUG: normally would execute file here: $promotefile" 1>>$workLocation/promotion-out.txt 2>>$workLocation/promotion-err.txt + rccode=$? + if [[ $rccode != 0 ]] + then + echo "ERROR: promotion returned an error: $rccode" + echo " promotefile: $promotefile" + mv $runningpromotefile $promoteScriptLocation/ERROR_$(basename $promotefile) + # probably would not have to exit here, could continue looping since renamed problematic + # file , but since something unexpected happened, best to pause to give some opportunity + # to examine the issue and make sure not something harmful. + exit 1 + else + # all is ok, we'll move the file to "RAN-" in case needed for later inspection, + # if things go wrong. Perhaps eventually just remove them? + mv $runningpromotefile $promoteScriptLocation/RAN_$(basename $promotefile) + fi else - # found a file, make sure it is executable - # I've discovered, just testing, that even if $promotefile is a - # directory, and executable, and fits the pattern, it is attempted to be - # processed. It was just a test case, nearly impossible to occur in reality, - # but best to test it is a file, for safety. - if [[ -x $promotefile && -f $promotefile ]] - then - - # if found a file to execute, temporarily change its name to "RUNNING-$promotefile - # so a subsequent cron job won't find it (if it does not finish by the time of the next cron job). - runningpromotefile=$promoteScriptLocation/RUNNING_$(basename $promotefile) - mv $promotefile $runningpromotefile - # notice these logs are concatenated on purpose, to give some "history", but - # that means has to be "manually" removed every now and then. - # improve as desired. - /bin/bash $runningpromotefile 1>>$workLocation/promotion-out.txt 2>>$workLocation/promotion-err.txt - # to test cron job, without doing anything, comment out above line, and uncomment folloiwng line. - # then try various types of files file names, etc. - # echo "DEBUG: normally would execute file here: $promotefile" 1>>$workLocation/promotion-out.txt 2>>$workLocation/promotion-err.txt - rccode=$? - if [[ $rccode != 0 ]] - then - echo "ERROR: promotion returned an error: $rccode" - echo " promotefile: $promotefile" - mv $runningpromotefile $promoteScriptLocation/ERROR_$(basename $promotefile) - # probably would not have to exit here, could continue looping since renamed problematic - # file , but since something unexpected happened, best to pause to give some opportunity - # to examine the issue and make sure not something harmful. - exit 1 - else - # all is ok, we'll move the file to "RAN-" in case needed for later inspection, - # if things go wrong. Perhaps eventually just remove them? - mv $runningpromotefile $promoteScriptLocation/RAN_$(basename $promotefile) - fi - else - echo "ERROR: promotion file found, but was not executable?" - echo " promotefile: $promotefile" - # We could likely do some rename-and-proceed thing here, but should - # be so rare and unexpected something is likely very wrong? So, we'll just exit. - exit 1 - fi + echo "ERROR: promotion file found, but was not executable?" + echo " promotefile: $promotefile" + # We could likely do some rename-and-proceed thing here, but should + # be so rare and unexpected something is likely very wrong? So, we'll just exit. + exit 1 fi + fi done diff --git a/production/sdk/promotion/startTests.sh b/production/sdk/promotion/startTests.sh index 5be042ec2..f5fea3058 100755 --- a/production/sdk/promotion/startTests.sh +++ b/production/sdk/promotion/startTests.sh @@ -8,12 +8,12 @@ export ANT_HOME=/shared/common/apache-ant-1.9.2 function usage () { - printf "\t\t%s\n" "usage: " - printf "\t\t%s\n" "$( basename $0 ) eclipseStream buildId" - printf "\t\t\t%s\n" "where " - printf "\t\t\t%s\n" "eclipseStream == 4.3.0, 3.8.2, etc. " - printf "\t\t\t%s\n" "buildId == M20120705-1200, IM20121005-0800, etc. " - printf "\t\t\t\t%s\n" "or, provide those parameters in buildParams.shshource on search path" + printf "\t\t%s\n" "usage: " + printf "\t\t%s\n" "$( basename $0 ) eclipseStream buildId" + printf "\t\t\t%s\n" "where " + printf "\t\t\t%s\n" "eclipseStream == 4.3.0, 3.8.2, etc. " + printf "\t\t\t%s\n" "buildId == M20120705-1200, IM20121005-0800, etc. " + printf "\t\t\t\t%s\n" "or, provide those parameters in buildParams.shshource on search path" } # This file, buildParams.shsource, normally does not exist on build system, @@ -33,42 +33,42 @@ EBUILDER_HASH=${EBUILDER_HASH:-${4}} if [[ -z ${eclipseStream} || -z ${buildId} ]] then - printf "\n\t%s\n" "ERROR: missing required parameters." - usage - exit 1 + printf "\n\t%s\n" "ERROR: missing required parameters." + usage + exit 1 fi if [[ -z "${BUILD_KIND}" ]] then - BUILD_KIND=CBI + BUILD_KIND=CBI fi if [[ -z "${EBUILDER_HASH}" ]] then - EBUILDER_HASH=master + EBUILDER_HASH=master fi # contrary to intuition (and previous behavior, bash 3.1) do NOT use quotes around right side of expression. if [[ "${eclipseStream}" =~ ^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)$ ]] then - eclipseStreamMajor=${BASH_REMATCH[1]} - eclipseStreamMinor=${BASH_REMATCH[2]} - eclipseStreamService=${BASH_REMATCH[3]} + eclipseStreamMajor=${BASH_REMATCH[1]} + eclipseStreamMinor=${BASH_REMATCH[2]} + eclipseStreamService=${BASH_REMATCH[3]} else - printf "\n\t%s\n" "ERROR: eclipseStream, $eclipseStream, must contain major, minor, and service versions." - usage - exit 1 + printf "\n\t%s\n" "ERROR: eclipseStream, $eclipseStream, must contain major, minor, and service versions." + usage + exit 1 fi if [[ "${buildId}" =~ ([MNIXYP]+)([[:digit:]]*)\-([[:digit:]]*) ]] then - # old, simpler way, if we don't do regex and input checkinging - #buildType=${buildId:0:1} - buildType=${BASH_REMATCH[1]} + # old, simpler way, if we don't do regex and input checkinging + #buildType=${buildId:0:1} + buildType=${BASH_REMATCH[1]} else - printf "\n\t%s\n" "ERROR: buildId, $buildId, did not match expected pattern." - usage - exit 1 + printf "\n\t%s\n" "ERROR: buildId, $buildId, did not match expected pattern." + usage + exit 1 fi source buildeclipse.shsource 2>/dev/null @@ -98,15 +98,15 @@ siteDir=${buildRoot}/siteDir postingDirectory=${siteDir}/eclipse/downloads/drops if (( "${eclipseStreamMajor}" > 3 )) then - postingDirectory=${siteDir}/eclipse/downloads/drops${eclipseStreamMajor} + postingDirectory=${siteDir}/eclipse/downloads/drops${eclipseStreamMajor} fi HUDSON_TOKEN=windows2012tests ant \ - -DbuildDirectory=${buildDirectory} \ - -DpostingDirectory=${postingDirectory} \ - -DbuildId=${buildId} \ - -DeclipseStream=${eclipseStream} \ - -DBUILD_KIND=${BUILD_KIND} \ - -DEBUILDER_HASH=${EBUILDER_HASH} \ - -f ${builderDir}/invokeTestsJSON.xml + -DbuildDirectory=${buildDirectory} \ + -DpostingDirectory=${postingDirectory} \ + -DbuildId=${buildId} \ + -DeclipseStream=${eclipseStream} \ + -DBUILD_KIND=${BUILD_KIND} \ + -DEBUILDER_HASH=${EBUILDER_HASH} \ + -f ${builderDir}/invokeTestsJSON.xml diff --git a/production/sdk/promotion/syncDropLocation.sh b/production/sdk/promotion/syncDropLocation.sh index 0e750c3e8..9fb751516 100755 --- a/production/sdk/promotion/syncDropLocation.sh +++ b/production/sdk/promotion/syncDropLocation.sh @@ -4,293 +4,293 @@ SCRIPTDIR=$( dirname $0 ) echo "SCRIPTDIR: ${SCRIPTDIR}" source ${SCRIPTDIR}/syncUpdateUtils.shsource -# this buildeclipse.shsource file is to ease local builds to override some variables. +# this buildeclipse.shsource file is to ease local builds to override some variables. # It should not be used for production builds. source buildeclipse.shsource 2>/dev/null function sendPromoteMail () { - SITE_HOST=${SITE_HOST:-download.eclipse.org} - - echo " Starting sendPromoteMail" - eclipseStream=$1 - if [[ -z "${eclipseStream}" ]] - then - printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argument, for this function $(basename $0)" - return 1; - fi - echo " eclipseStream: ${eclipseStream}" - - buildId=$2 - if [[ -z "${buildId}" ]] - then - printf "\n\n\t%s\n\n" "ERROR: Must provide buildId as second argument, for this function $(basename $0)" - return 1; - fi - echo " buildId: ${buildId}" - - BUILD_KIND=$3 - if [[ -z "${BUILD_KIND}" ]] - then - printf "\n\n\t%s\n\n" "ERROR: Must provide BUILD_KIND as third argumnet, for this function $(basename $0)" - return 1; - fi - echo " BUILD_KIND: ${BUILD_KIND}" - - # optional? Or blank? - BUILD_FAILED=$4 - - - eclipseStreamMajor=${eclipseStream:0:1} - buildType=${buildId:0:1} - echo " buildType: ${buildType}" - - # ideally, the user executing this mail will have this special file in their home directory, - # that can specify a custom 'from' variable, but still you must use your "real" ID that is subscribed - # to the wtp-dev mailing list - # set from="\"Your Friendly WTP Builder\" <real-subscribed-id@real.address>" - # correction ... doesn't work. Seems the subscription system set's the "from" name, so doesn't work when - # sent to mail list (just other email addresses) - # espeically handy if send from one id (e.g. "david_williams) - # only good with 'mail', not 'sendmail' - #export MAILRC=~/.e4Buildmailrc - - # common part of URL and file path - # varies by build stream - # examples of end result: - # http://download.eclipse.org/eclipse/downloads/drops4/N20120415-2015/ - # /home/data/httpd/download.eclipse.org/eclipse/downloads/drops4/N20120415-2015 - - - mainPath=$( dlToPath "$eclipseStream" "$buildId" "$BUILD_KIND" ) - echo " mainPath: $mainPath" - if [[ "$mainPath" == 1 ]] - then - printf "\n\n\t%s\n\n" "ERROR: mainPath could not be computed." - return 1 - fi - - downloadURL=http://${SITE_HOST}/${mainPath}/${buildId}/ - - if [[ -n "${BUILD_FAILED}" ]] - then - EXTRA_SUBJECT_STRING=" - BUILD FAILED" - else - EXTRA_SUBJECT_STRING="" - fi - - if [[ -n "${POM_UPDATES}" ]] - then - EXTRA_SUBJECT_STRING="${EXTRA_SUBJECT_STRING} - POM UPDATES REQUIRED" - fi - - if [[ "${BUILD_KIND}" == "CBI" ]] - then - # 4.3.0 Build: I20120411-2034 - SUBJECT="${eclipseStream} ${buildType}-Build: ${buildId} $EXTRA_SUBJECT_STRING" - else - # 4.3.0 Build: I20120411-2034 - SUBJECT="${BUILD_KIND} based ${eclipseStream} ${buildType}-Build: ${buildId} $EXTRA_SUBJECT_STRING" - fi - - # override in buildeclipse.shsource if doing local tests - TO=${TO:-"platform-releng-dev@eclipse.org"} - - # for initial testing, only to me -- change as desired after initial testing. - if [[ "${buildId}" =~ [PYX] ]] - then - TO="david_williams@us.ibm.com" - fi - - FROM=${FROM:-"e4Builder@eclipse.org"} - - # make sure reply to goes back to the list - # I'm not positive this is required for mailing list? - # does anything "from" list, automatically get reply-to: list? - #REPLYTO="platform-releng-dev@eclipse.org" - #we could? to "fix up" TODIR since it's in file form, not URL - # URLTODIR=${TODIR##*${DOWNLOAD_ROOT}} - - message1="" - - #TODO: later can use sed, form a proper list - if [[ -n "${POM_UPDATES}" ]] - then - message1="$message1 <p>POM Update Required: ${downloadURL}/pom_updates/</p>\n" - fi - - message1="$message1 <p>Eclipse downloads: ${downloadURL}</p>\n" - - - # Do not include repo, if build failed - if [[ -z "${BUILD_FAILED}" ]] - then - message1="$message1 <p>Software site repository: http://${SITE_HOST}/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds</p>\n" - fi - - # Do not include Equinox, if build failed, or if patch or experimental build - if [[ -z "${BUILD_FAILED}" && ! "${buildId}" =~ [PYX] ]] - then - message1="$message1 <p>Equinox downloads: http://${SITE_HOST}/equinox/drops/${buildId}</p>\n" - fi - - if [[ "${BUILD_KIND}" == "CBI" && "${buildId}" =~ [NMI] ]] - then - ( - echo "To: ${TO}" - echo "From: ${FROM}" - echo "MIME-Version: 1.0" - echo "Content-Type: text/html; charset=utf-8" - echo "Subject: ${SUBJECT}" - echo "<html><body>" - echo -e "${message1}" - echo "</body></html>" - ) | /usr/lib/sendmail -t - elif [[ "${BUILD_KIND}" == "CBI" && "${buildId}" =~ [PYX] ]] - then - ( - echo "To: ${TO}" - echo "From: ${FROM}" - echo "MIME-Version: 1.0" - echo "Content-Type: text/html; charset=utf-8" - echo "Subject: Experimental: ${SUBJECT}" - echo "<html><body>" - echo -e "${message1}" - echo "</body></html>" - ) | /usr/lib/sendmail -t - fi - echo "mail sent for $eclipseStream $buildType-build $buildId" - return 0 + SITE_HOST=${SITE_HOST:-download.eclipse.org} + + echo " Starting sendPromoteMail" + eclipseStream=$1 + if [[ -z "${eclipseStream}" ]] + then + printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argument, for this function $(basename $0)" + return 1; + fi + echo " eclipseStream: ${eclipseStream}" + + buildId=$2 + if [[ -z "${buildId}" ]] + then + printf "\n\n\t%s\n\n" "ERROR: Must provide buildId as second argument, for this function $(basename $0)" + return 1; + fi + echo " buildId: ${buildId}" + + BUILD_KIND=$3 + if [[ -z "${BUILD_KIND}" ]] + then + printf "\n\n\t%s\n\n" "ERROR: Must provide BUILD_KIND as third argumnet, for this function $(basename $0)" + return 1; + fi + echo " BUILD_KIND: ${BUILD_KIND}" + + # optional? Or blank? + BUILD_FAILED=$4 + + + eclipseStreamMajor=${eclipseStream:0:1} + buildType=${buildId:0:1} + echo " buildType: ${buildType}" + + # ideally, the user executing this mail will have this special file in their home directory, + # that can specify a custom 'from' variable, but still you must use your "real" ID that is subscribed + # to the wtp-dev mailing list + # set from="\"Your Friendly WTP Builder\" <real-subscribed-id@real.address>" + # correction ... doesn't work. Seems the subscription system set's the "from" name, so doesn't work when + # sent to mail list (just other email addresses) + # espeically handy if send from one id (e.g. "david_williams) + # only good with 'mail', not 'sendmail' + #export MAILRC=~/.e4Buildmailrc + + # common part of URL and file path + # varies by build stream + # examples of end result: + # http://download.eclipse.org/eclipse/downloads/drops4/N20120415-2015/ + # /home/data/httpd/download.eclipse.org/eclipse/downloads/drops4/N20120415-2015 + + + mainPath=$( dlToPath "$eclipseStream" "$buildId" "$BUILD_KIND" ) + echo " mainPath: $mainPath" + if [[ "$mainPath" == 1 ]] + then + printf "\n\n\t%s\n\n" "ERROR: mainPath could not be computed." + return 1 + fi + + downloadURL=http://${SITE_HOST}/${mainPath}/${buildId}/ + + if [[ -n "${BUILD_FAILED}" ]] + then + EXTRA_SUBJECT_STRING=" - BUILD FAILED" + else + EXTRA_SUBJECT_STRING="" + fi + + if [[ -n "${POM_UPDATES}" ]] + then + EXTRA_SUBJECT_STRING="${EXTRA_SUBJECT_STRING} - POM UPDATES REQUIRED" + fi + + if [[ "${BUILD_KIND}" == "CBI" ]] + then + # 4.3.0 Build: I20120411-2034 + SUBJECT="${eclipseStream} ${buildType}-Build: ${buildId} $EXTRA_SUBJECT_STRING" + else + # 4.3.0 Build: I20120411-2034 + SUBJECT="${BUILD_KIND} based ${eclipseStream} ${buildType}-Build: ${buildId} $EXTRA_SUBJECT_STRING" + fi + + # override in buildeclipse.shsource if doing local tests + TO=${TO:-"platform-releng-dev@eclipse.org"} + + # for initial testing, only to me -- change as desired after initial testing. + if [[ "${buildId}" =~ [PYX] ]] + then + TO="david_williams@us.ibm.com" + fi + + FROM=${FROM:-"e4Builder@eclipse.org"} + + # make sure reply to goes back to the list + # I'm not positive this is required for mailing list? + # does anything "from" list, automatically get reply-to: list? + #REPLYTO="platform-releng-dev@eclipse.org" + #we could? to "fix up" TODIR since it's in file form, not URL + # URLTODIR=${TODIR##*${DOWNLOAD_ROOT}} + + message1="" + + #TODO: later can use sed, form a proper list + if [[ -n "${POM_UPDATES}" ]] + then + message1="$message1 <p>POM Update Required: ${downloadURL}/pom_updates/</p>\n" + fi + + message1="$message1 <p>Eclipse downloads: ${downloadURL}</p>\n" + + + # Do not include repo, if build failed + if [[ -z "${BUILD_FAILED}" ]] + then + message1="$message1 <p>Software site repository: http://${SITE_HOST}/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds</p>\n" + fi + + # Do not include Equinox, if build failed, or if patch or experimental build + if [[ -z "${BUILD_FAILED}" && ! "${buildId}" =~ [PYX] ]] + then + message1="$message1 <p>Equinox downloads: http://${SITE_HOST}/equinox/drops/${buildId}</p>\n" + fi + + if [[ "${BUILD_KIND}" == "CBI" && "${buildId}" =~ [NMI] ]] + then + ( + echo "To: ${TO}" + echo "From: ${FROM}" + echo "MIME-Version: 1.0" + echo "Content-Type: text/html; charset=utf-8" + echo "Subject: ${SUBJECT}" + echo "<html><body>" + echo -e "${message1}" + echo "</body></html>" + ) | /usr/lib/sendmail -t + elif [[ "${BUILD_KIND}" == "CBI" && "${buildId}" =~ [PYX] ]] + then + ( + echo "To: ${TO}" + echo "From: ${FROM}" + echo "MIME-Version: 1.0" + echo "Content-Type: text/html; charset=utf-8" + echo "Subject: Experimental: ${SUBJECT}" + echo "<html><body>" + echo -e "${message1}" + echo "</body></html>" + ) | /usr/lib/sendmail -t + fi + echo "mail sent for $eclipseStream $buildType-build $buildId" + return 0 } # start tests function function startTests() { - echo "startTests()" - eclipseStreamMajor=$1 - buildType=$2 - eclipseStream=$3 - buildId=$4 - BUILD_KIND=$5 - EBUILDER_HASH=$6 - if [[ -z "${EBUILDER_HASH}" ]] - then - printf "\n\n\t%s\n\n" "ERROR: Must provide builder (or aggregator) hash as fourth argumnet, for this function $(basename $0)" - return 1; - fi - - echo "eclipseStreamMajor: $eclipseStreamMajor" - echo "buildType: $buildType" - echo "eclipseStream: $eclipseStream" - echo "buildId: $buildId" - echo "BUILD_KIND: $BUILD_KIND" - echo "EBUILDER_HASH: $EBUILDER_HASH" - if [[ "${BUILD_KIND}" == 'CBI' ]] - then - BUILD_ROOT=${BUILD_HOME}/${eclipseStreamMajor}${buildType} - eclipsebuilder=eclipse.platform.releng.aggregator/production/testScripts - dlFromPath=$( dlFromPath $eclipseStream $buildId $BUILD_KIND ) - echo "DEBUG CBI dlFromPath: $dlFromPath" - buildDropDir=${BUILD_ROOT}/siteDir/$dlFromPath/${buildId} - echo "DEBGUG CBI buildDropDir: $buildDropDir" - builderDropDir=${buildDropDir}/${eclipsebuilder} - echo "DEBUG: CBI builderDropDir: ${builderDropDir}" - elif [[ "${BUILD_KIND}" == 'PDE' ]] - then - BUILD_ROOT=/shared/eclipse/eclipse${eclipseStreamMajor}${buildType} - buildDir=${BUILD_ROOT}/build - supportDir=${buildDir}/supportDir - eclipsebuilder=org.eclipse.releng.eclipsebuilder - builderDir=${supportDir}/$eclipsebuilder - # assumed in fixed location, for now, for PDE builds - builderDropDir=/shared/eclipse/sdk/promotion - echo "DEBUG: PDE builderDropDir for PDE: ${builderDropDir}" - dlFromPath=$( dlFromPath $eclipseStream $buildId $BUILD_KIND ) - echo "DEBUG: PDE dlFromPath: $dlFromPath" - buildDropDir=${BUILD_ROOT}/siteDir/$dlFromPath/${buildId} - echo "DEBUG: PDE builderDropDir: ${builderDropDir}" - else - echo "ERROR. Unrecognized value of BUILD_KIND: $BUILD_KIND" - fi - - # finally, execute - ${builderDropDir}/startTests.sh ${eclipseStream} ${buildId} ${BUILD_KIND} ${EBUILDER_HASH} + echo "startTests()" + eclipseStreamMajor=$1 + buildType=$2 + eclipseStream=$3 + buildId=$4 + BUILD_KIND=$5 + EBUILDER_HASH=$6 + if [[ -z "${EBUILDER_HASH}" ]] + then + printf "\n\n\t%s\n\n" "ERROR: Must provide builder (or aggregator) hash as fourth argumnet, for this function $(basename $0)" + return 1; + fi + + echo "eclipseStreamMajor: $eclipseStreamMajor" + echo "buildType: $buildType" + echo "eclipseStream: $eclipseStream" + echo "buildId: $buildId" + echo "BUILD_KIND: $BUILD_KIND" + echo "EBUILDER_HASH: $EBUILDER_HASH" + if [[ "${BUILD_KIND}" == 'CBI' ]] + then + BUILD_ROOT=${BUILD_HOME}/${eclipseStreamMajor}${buildType} + eclipsebuilder=eclipse.platform.releng.aggregator/production/testScripts + dlFromPath=$( dlFromPath $eclipseStream $buildId $BUILD_KIND ) + echo "DEBUG CBI dlFromPath: $dlFromPath" + buildDropDir=${BUILD_ROOT}/siteDir/$dlFromPath/${buildId} + echo "DEBGUG CBI buildDropDir: $buildDropDir" + builderDropDir=${buildDropDir}/${eclipsebuilder} + echo "DEBUG: CBI builderDropDir: ${builderDropDir}" + elif [[ "${BUILD_KIND}" == 'PDE' ]] + then + BUILD_ROOT=/shared/eclipse/eclipse${eclipseStreamMajor}${buildType} + buildDir=${BUILD_ROOT}/build + supportDir=${buildDir}/supportDir + eclipsebuilder=org.eclipse.releng.eclipsebuilder + builderDir=${supportDir}/$eclipsebuilder + # assumed in fixed location, for now, for PDE builds + builderDropDir=/shared/eclipse/sdk/promotion + echo "DEBUG: PDE builderDropDir for PDE: ${builderDropDir}" + dlFromPath=$( dlFromPath $eclipseStream $buildId $BUILD_KIND ) + echo "DEBUG: PDE dlFromPath: $dlFromPath" + buildDropDir=${BUILD_ROOT}/siteDir/$dlFromPath/${buildId} + echo "DEBUG: PDE builderDropDir: ${builderDropDir}" + else + echo "ERROR. Unrecognized value of BUILD_KIND: $BUILD_KIND" + fi + + # finally, execute + ${builderDropDir}/startTests.sh ${eclipseStream} ${buildId} ${BUILD_KIND} ${EBUILDER_HASH} } -# this funtion currently syncs local repo on build machine, and adds +# this funtion currently syncs local repo on build machine, and adds # it to composite, on download server. function syncRepoSite () { - eclipseStream=$1 - if [[ -z "${eclipseStream}" ]] - then - printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argumnet, for this function $(basename $0)" >&2 - return 1; - fi - - - buildType=$2 - if [[ -z "${buildType}" ]] - then - printf "\n\n\t%s\n\n" "ERROR: Must provide buildType as second argumnet, for this function $(basename $0)" >&2 - return 1; - fi - - BUILD_KIND=$3 - if [[ -z "${BUILD_KIND}" ]] - then - printf "\n\n\t%s\n\n" "ERROR: Must provide BUILD_KIND as third argumnet, for this function $(basename $0)" >&2 - return 1; - fi - - # contrary to intuition (and previous behavior, bash 3.1) do NOT use quotes around right side of expression. - if [[ "${eclipseStream}" =~ ^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)$ ]] - then - eclipseStreamMajor=${BASH_REMATCH[1]} - eclipseStreamMinor=${BASH_REMATCH[2]} - eclipseStreamService=${BASH_REMATCH[3]} - else - echo "eclipseStream, $eclipseStream, must contain major, minor, and service versions, such as 4.2.0" >&2 - return 1 - fi - - fromDir=$(updateSiteOnBuildDir "$eclipseStream" "$buildId" "$BUILD_KIND") - toDir=$(updateSiteOnDL "$eclipseStream" "$buildId" "$BUILD_KIND") - #toDir="/home/data/httpd/download.eclipse.org/eclipse/updates/4.3-builds" - - if [[ -n "${fromDir}" && -d "${fromDir}" && -n "${toDir}" && -d "${toDir}" ]] - then - rsync --times --omit-dir-times --recursive "${fromDir}" "${toDir}" - RC=$? - else - RC=9 - fi - - if [[ $RC != 0 ]] - then - echo "ERROR: rsync failed. RC: $RC" >&2 - echo " In syncRepoSite" >&2 - echo "fromDir: $fromDir" >&2 - echo "toDir: $toDir" >&2 - return $RC - fi - # update composite! - # add ${buildId} to {toDir} - - # runAntRunner requires basebuilder to be installed at drop site, so we'll check here if it exists yet, - # and if not, fetch it. - - dropFromBuildDir=$( dropFromBuildDir "$eclipseStream" "$buildId" "$BUILD_KIND" ) - EBuilderDir=$dropFromBuildDir/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder - - # assume ant is on the path - ant -f $EBuilderDir/eclipse/getBaseBuilderAndTools.xml -DWORKSPACE=$dropFromBuildDir - - ${SCRIPTDIR}/runAntRunner.sh ${buildId} ${eclipseStream} ${SCRIPTDIR}/addToComposite.xml addToComposite -Drepodir=${toDir} -Dcomplocation=${buildId} + eclipseStream=$1 + if [[ -z "${eclipseStream}" ]] + then + printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argumnet, for this function $(basename $0)" >&2 + return 1; + fi + + + buildType=$2 + if [[ -z "${buildType}" ]] + then + printf "\n\n\t%s\n\n" "ERROR: Must provide buildType as second argumnet, for this function $(basename $0)" >&2 + return 1; + fi + + BUILD_KIND=$3 + if [[ -z "${BUILD_KIND}" ]] + then + printf "\n\n\t%s\n\n" "ERROR: Must provide BUILD_KIND as third argumnet, for this function $(basename $0)" >&2 + return 1; + fi + + # contrary to intuition (and previous behavior, bash 3.1) do NOT use quotes around right side of expression. + if [[ "${eclipseStream}" =~ ^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)$ ]] + then + eclipseStreamMajor=${BASH_REMATCH[1]} + eclipseStreamMinor=${BASH_REMATCH[2]} + eclipseStreamService=${BASH_REMATCH[3]} + else + echo "eclipseStream, $eclipseStream, must contain major, minor, and service versions, such as 4.2.0" >&2 + return 1 + fi + + fromDir=$(updateSiteOnBuildDir "$eclipseStream" "$buildId" "$BUILD_KIND") + toDir=$(updateSiteOnDL "$eclipseStream" "$buildId" "$BUILD_KIND") + #toDir="/home/data/httpd/download.eclipse.org/eclipse/updates/4.3-builds" + + if [[ -n "${fromDir}" && -d "${fromDir}" && -n "${toDir}" && -d "${toDir}" ]] + then + rsync --times --omit-dir-times --recursive "${fromDir}" "${toDir}" RC=$? + else + RC=9 + fi + + if [[ $RC != 0 ]] + then + echo "ERROR: rsync failed. RC: $RC" >&2 + echo " In syncRepoSite" >&2 + echo "fromDir: $fromDir" >&2 + echo "toDir: $toDir" >&2 return $RC + fi + # update composite! + # add ${buildId} to {toDir} + + # runAntRunner requires basebuilder to be installed at drop site, so we'll check here if it exists yet, + # and if not, fetch it. + + dropFromBuildDir=$( dropFromBuildDir "$eclipseStream" "$buildId" "$BUILD_KIND" ) + EBuilderDir=$dropFromBuildDir/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder + + # assume ant is on the path + ant -f $EBuilderDir/eclipse/getBaseBuilderAndTools.xml -DWORKSPACE=$dropFromBuildDir + + ${SCRIPTDIR}/runAntRunner.sh ${buildId} ${eclipseStream} ${SCRIPTDIR}/addToComposite.xml addToComposite -Drepodir=${toDir} -Dcomplocation=${buildId} + RC=$? + return $RC } @@ -305,16 +305,16 @@ function syncRepoSite () if (( $# < 4 )) then - # usage: - scriptname=$(basename $0) - printf "\n\t%s\n" "This script, $scriptname requires four arguments, in order: " - printf "\t\t%s\t%s\n" "eclipseStream" "(e.g. 4.2.2 or 3.8.2) " - printf "\t\t%s\t%s\n" "buildId" "(e.g. N20120415-2015) " - printf "\t\t%s\t%s\n" "BUILD_KIND" "(e.g. PDE or special cased value) " - printf "\t\t%s\t%s\n" "EBUILDER_HASH" "(SHA1 HASH for eclipe builder used) " - printf "\t%s\n" "for example," - printf "\t%s\n\n" "./$scriptname 4.2 N N20120415-2015 CBI master" - exit 1 + # usage: + scriptname=$(basename $0) + printf "\n\t%s\n" "This script, $scriptname requires four arguments, in order: " + printf "\t\t%s\t%s\n" "eclipseStream" "(e.g. 4.2.2 or 3.8.2) " + printf "\t\t%s\t%s\n" "buildId" "(e.g. N20120415-2015) " + printf "\t\t%s\t%s\n" "BUILD_KIND" "(e.g. PDE or special cased value) " + printf "\t\t%s\t%s\n" "EBUILDER_HASH" "(SHA1 HASH for eclipe builder used) " + printf "\t%s\n" "for example," + printf "\t%s\n\n" "./$scriptname 4.2 N N20120415-2015 CBI master" + exit 1 fi echo "Starting $0" @@ -323,40 +323,40 @@ echo "Starting $0" eclipseStream=$1 if [[ -z "${eclipseStream}" ]] then - printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argumnet, for this function $(basename $0)" - exit 1 + printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argumnet, for this function $(basename $0)" + exit 1 fi echo "eclipseStream: $eclipseStream" buildId=$2 if [[ -z "${buildId}" ]] then - printf "\n\n\t%s\n\n" "ERROR: Must provide buildId as second argumnet, for this function $(basename $0)" - exit 1 + printf "\n\n\t%s\n\n" "ERROR: Must provide buildId as second argumnet, for this function $(basename $0)" + exit 1 fi echo "buildId: $buildId" BUILD_KIND=$3 if [[ -z "${BUILD_KIND}" ]] then - printf "\n\n\t%s\n\n" "ERROR: Must provide BUILD_KIND as third argumnet, for this function $(basename $0)" - exit 1 + printf "\n\n\t%s\n\n" "ERROR: Must provide BUILD_KIND as third argumnet, for this function $(basename $0)" + exit 1 fi echo "BUILD_KIND: $BUILD_KIND" -#TODO: asssume master for now, if unspecified. But should tighten up to through error as scripts get finished. +#TODO: asssume master for now, if unspecified. But should tighten up to through error as scripts get finished. EBUILDER_HASH=$4 if [[ -z "${EBUILDER_HASH}" ]] then - printf "\n\n\t%s\n\n" "WARNING: Must provide builder (or aggregator) hash as fourth argumnet, for this function, $0" - #printf "\n\n\t%s\n\n" "ERROR: Must provide builder (or aggregator) hash as fourth argumnet, for this function, $0" - #exit 1; + printf "\n\n\t%s\n\n" "WARNING: Must provide builder (or aggregator) hash as fourth argumnet, for this function, $0" + #printf "\n\n\t%s\n\n" "ERROR: Must provide builder (or aggregator) hash as fourth argumnet, for this function, $0" + #exit 1; fi echo "EBUILDER_HASH: $EBUILDER_HASH" -# we get all build variables here. Currently need it to check if BUILD_FAILED is defined. +# we get all build variables here. Currently need it to check if BUILD_FAILED is defined. # if BUILD FAILED, we still "publish", but dont' update bad repo nor start tests -BUILD_ENV_FILE=$5 +BUILD_ENV_FILE=$5 source $BUILD_ENV_FILE eclipseStreamMajor=${eclipseStream:0:1} @@ -366,12 +366,12 @@ echo "buildType: $buildType" # contrary to intuition (and previous behavior, bash 3.1) do NOT use quotes around right side of expression. if [[ "${eclipseStream}" =~ ^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)$ ]] then - eclipseStreamMajor=${BASH_REMATCH[1]} - eclipseStreamMinor=${BASH_REMATCH[2]} - eclipseStreamService=${BASH_REMATCH[3]} + eclipseStreamMajor=${BASH_REMATCH[1]} + eclipseStreamMinor=${BASH_REMATCH[2]} + eclipseStreamService=${BASH_REMATCH[3]} else - echo "eclipseStream, $eclipseStream, must contain major, minor, and service versions, such as 4.2.0" - exit 1 + echo "eclipseStream, $eclipseStream, must contain major, minor, and service versions, such as 4.2.0" + exit 1 fi echo "eclipseStream: $eclipseStream" @@ -382,15 +382,15 @@ echo "BUILD_KIND: $BUILD_KIND" echo "buildType: $buildType" echo "BUILD_ENV_FILE: $BUILD_ENV_FILE" -# = = = = = = = = = +# = = = = = = = = = # compute dirctiory on build machine dropFromBuildDir=$( dropFromBuildDir "$eclipseStream" "$buildId" "$BUILD_KIND" ) echo "dropFromBuildDir: $dropFromBuildDir" if [[ ! -d "${dropFromBuildDir}" ]] -then - echo "ERROR: the expected dropFromBuildDir (drop directory) did not exist" - echo " drop directory: ${dropFromBuildDir}" - exit 1 +then + echo "ERROR: the expected dropFromBuildDir (drop directory) did not exist" + echo " drop directory: ${dropFromBuildDir}" + exit 1 fi SCRIPTDIR=$( dirname $0 ) echo "SCRIPTDIR: ${SCRIPTDIR}" @@ -398,16 +398,16 @@ ${SCRIPTDIR}/getEBuilder.sh "${BUILD_KIND}" "${EBUILDER_HASH}" "${dropFromBuildD # if build failed, don't promote repo if [[ -z "$BUILD_FAILED" ]] -then - syncRepoSite "$eclipseStream" "$buildType" "$BUILD_KIND" - rccode=$? - if [[ $rccode != 0 ]] - then - printf "\n\n\t%s\n\n" "ERROR: something went wrong putting repo on download site. Rest of promoting build halted." - exit 1 - fi -else - echo "Repository site not updated since BUILD FAILED" +then + syncRepoSite "$eclipseStream" "$buildType" "$BUILD_KIND" + rccode=$? + if [[ $rccode != 0 ]] + then + printf "\n\n\t%s\n\n" "ERROR: something went wrong putting repo on download site. Rest of promoting build halted." + exit 1 + fi +else + echo "Repository site not updated since BUILD FAILED" fi # We still update drop location, even if failed, just to get the logs up there on downloads @@ -415,23 +415,23 @@ syncDropLocation "$eclipseStream" "$buildId" "$BUILD_KIND" "${EBUILDER_HASH}" rccode=$? if [[ $rccode != 0 ]] then - printf "\n\n\t%s\n\n" "ERROR occurred during promotion to download server, so halted promotion and did not send mail." - exit 1 + printf "\n\n\t%s\n\n" "ERROR occurred during promotion to download server, so halted promotion and did not send mail." + exit 1 fi # if build failed, don't run tests ... they'll fail right away if [[ -z "$BUILD_FAILED" ]] -then - # if update to downloads succeeded, start the unit tests on Hudson - startTests $eclipseStreamMajor $buildType $eclipseStream $buildId $BUILD_KIND ${EBUILDER_HASH} +then + # if update to downloads succeeded, start the unit tests on Hudson + startTests $eclipseStreamMajor $buildType $eclipseStream $buildId $BUILD_KIND ${EBUILDER_HASH} fi sendPromoteMail "$eclipseStream" "$buildId" "$BUILD_KIND" "$BUILD_FAILED" rccode=$? if [[ $rccode != 0 ]] then - printf "\n\n\t%s\n\n" "ERROR occurred during sending final mail to list" - exit 1 + printf "\n\n\t%s\n\n" "ERROR occurred during sending final mail to list" + exit 1 fi exit 0 diff --git a/production/sdk/promotion/syncUpdateUtils.shsource b/production/sdk/promotion/syncUpdateUtils.shsource index d107ee709..6d99c3503 100644 --- a/production/sdk/promotion/syncUpdateUtils.shsource +++ b/production/sdk/promotion/syncUpdateUtils.shsource @@ -1,391 +1,391 @@ #!/usr/bin/env bash -# this buildeclipse.shsource file is to ease local builds to override some variables. +# this buildeclipse.shsource file is to ease local builds to override some variables. # It should not be used for production builds. source buildeclipse.shsource 2>/dev/null export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds} function dropOnDLServer() { - eclipseStream=$1 + eclipseStream=$1 if [[ -z "${eclipseStream}" ]] - then + then printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argumnet, for this function $(basename $0)" >&2 return 1; - fi + fi buildId=$2 if [[ -z "${buildId}" ]] - then + then printf "\n\n\t%s\n\n" "ERROR: Must provide buildType as second argumnet, for this function $(basename $0)" >&2 return 1; - fi + fi BUILD_KIND=$3 if [[ -z "${BUILD_KIND}" ]] - then + then printf "\n\n\t%s\n\n" "ERROR: Must provide BUILD_KIND as third argumnet, for this function $(basename $0)" >&2 return 1; - fi + fi pathToDL=$( dlToPath "$eclipseStream" "$buildId" "$BUILD_KIND" ) if [[ "$pathToDL" == 1 ]] - then + then printf "\n\n\t%s\n\n" "ERROR: pathToDL could not be computed." >&2 return 1 - fi - toDir="/home/data/httpd/download.eclipse.org/${pathToDL}" - echo $toDir + fi + toDir="/home/data/httpd/download.eclipse.org/${pathToDL}" + echo $toDir } function updateSiteOnDL() { - eclipseStream=$1 + eclipseStream=$1 if [[ -z "${eclipseStream}" ]] - then + then printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argumnet, for this function $(basename $0)" >&2 return 1; - fi + fi buildId=$2 if [[ -z "${buildId}" ]] - then + then printf "\n\n\t%s\n\n" "ERROR: Must provide buildType as second argumnet, for this function $(basename $0)" >&2 return 1; - fi + fi BUILD_KIND=$3 if [[ -z "${BUILD_KIND}" ]] - then + then printf "\n\n\t%s\n\n" "ERROR: Must provide BUILD_KIND as third argumnet, for this function $(basename $0)" >&2 return 1; - fi + fi - # contrary to intuition (and previous behavior, bash 3.1) do NOT use quotes around right side of expression. +# contrary to intuition (and previous behavior, bash 3.1) do NOT use quotes around right side of expression. if [[ "${eclipseStream}" =~ ([[:digit:]]*)\.([[:digit:]]*)\.([[:digit:]]*) ]] - then + then eclipseStreamMajor=${BASH_REMATCH[1]} - eclipseStreamMinor=${BASH_REMATCH[2]} - eclipseStreamService=${BASH_REMATCH[3]} + eclipseStreamMinor=${BASH_REMATCH[2]} + eclipseStreamService=${BASH_REMATCH[3]} else - echo "ERROR: eclipseStream, $eclipseStream, must contain major, minor, and service versions, such as 4.2.0" >&2 + echo "ERROR: eclipseStream, $eclipseStream, must contain major, minor, and service versions, such as 4.2.0" >&2 exit 1 - fi - buildType=${buildId:0:1} + fi + buildType=${buildId:0:1} - toSiteDir="/home/data/httpd/download.eclipse.org/eclipse/updates" + toSiteDir="/home/data/httpd/download.eclipse.org/eclipse/updates" if [[ "${BUILD_KIND}" == 'CBI' ]] - then + then updatesSuffix="builds" - elif [[ "${BUILD_KIND}" == 'PDE' ]] - then + elif [[ "${BUILD_KIND}" == 'PDE' ]] + then updatesSuffix="buildspdebased" else - echo "ERROR: Unexpected value of BUILD_KIND, $BUILD_KIND" >&2 - fi + echo "ERROR: Unexpected value of BUILD_KIND, $BUILD_KIND" >&2 + fi - toMainUpdateDir=$toSiteDir/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-${updatesSuffix}/ - # We'll check for existence, and create if doesn't exist ... as long as it is "under" our - # toSiteDir, it is likely an intentional new one, rather than an error. - if [[ ! -d "${toMainUpdateDir}" ]] + toMainUpdateDir=$toSiteDir/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-${updatesSuffix}/ +# We'll check for existence, and create if doesn't exist ... as long as it is "under" our +# toSiteDir, it is likely an intentional new one, rather than an error. + if [[ ! -d "${toMainUpdateDir}" ]] then - if [[ -d "${toSiteDir}" ]] + if [[ -d "${toSiteDir}" ]] then - # create - mkdir -p "${toMainUpdateDir}" - RC=$? - if [[ $RC != 0 ]] +# create + mkdir -p "${toMainUpdateDir}" + RC=$? + if [[ $RC != 0 ]] then - echo "ERROR: could not create main update site: ${toMainUpdateDir}" >&2 - # "return" empty string, as indication of error" - toMainUpdateDir="" - fi - else + echo "ERROR: could not create main update site: ${toMainUpdateDir}" >&2 +# "return" empty string, as indication of error" + toMainUpdateDir="" + fi + else echo "PROGRAM ERROR: main update site root did not exist: ${toSiteDir}" >&2 - # "return" empty string, as indication of error" - toMainUpdateDir="" - fi - fi - echo $toMainUpdateDir +# "return" empty string, as indication of error" + toMainUpdateDir="" + fi + fi + echo $toMainUpdateDir } # compute update site on build server function updateSiteOnBuildDir() { - eclipseStream=$1 + eclipseStream=$1 if [[ -z "${eclipseStream}" ]] - then + then printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argumnet, for this function $(basename $0)" >&2 return 1; - fi + fi buildId=$2 if [[ -z "${buildId}" ]] - then + then printf "\n\n\t%s\n\n" "ERROR: Must provide buildType as second argumnet, for this function $(basename $0)" >&2 return 1; - fi + fi BUILD_KIND=$3 if [[ -z "${BUILD_KIND}" ]] - then + then printf "\n\n\t%s\n\n" "ERROR: Must provide BUILD_KIND as third argumnet, for this function $(basename $0)" >&2 return 1; - fi + fi - # contrary to intuition (and previous behavior, bash 3.1) do NOT use quotes around right side of expression. +# contrary to intuition (and previous behavior, bash 3.1) do NOT use quotes around right side of expression. if [[ "${eclipseStream}" =~ ([[:digit:]]*)\.([[:digit:]]*)\.([[:digit:]]*) ]] - then + then eclipseStreamMajor=${BASH_REMATCH[1]} - eclipseStreamMinor=${BASH_REMATCH[2]} - eclipseStreamService=${BASH_REMATCH[3]} + eclipseStreamMinor=${BASH_REMATCH[2]} + eclipseStreamService=${BASH_REMATCH[3]} else - echo "eclipseStream, $eclipseStream, must contain major, minor, and service versions, such as 4.2.0" >&2 + echo "eclipseStream, $eclipseStream, must contain major, minor, and service versions, such as 4.2.0" >&2 return 1 - fi - buildType=${buildId:0:1} + fi + buildType=${buildId:0:1} - if [[ "${BUILD_KIND}" == 'CBI' ]] - then - buildRoot=${BUILD_HOME}/${eclipseStreamMajor}${buildType} - elif [[ "${BUILD_KIND}" == 'PDE' ]] + if [[ "${BUILD_KIND}" == 'CBI' ]] then - buildRoot=/shared/eclipse/eclipse${eclipseStreamMajor}${buildType} - else - echo "ERROR: Unexpected value of BUILD_KIND, $BUILD_KIND" >&2 - return 1 - fi + buildRoot=${BUILD_HOME}/${eclipseStreamMajor}${buildType} + elif [[ "${BUILD_KIND}" == 'PDE' ]] + then + buildRoot=/shared/eclipse/eclipse${eclipseStreamMajor}${buildType} + else + echo "ERROR: Unexpected value of BUILD_KIND, $BUILD_KIND" >&2 + return 1 + fi - if [[ "${BUILD_KIND}" == 'CBI' ]] - then - siteDir=${buildRoot}/siteDir - updatesSuffix="builds" - fromDir=$siteDir/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-${updatesSuffix}/${buildId} + if [[ "${BUILD_KIND}" == 'CBI' ]] + then + siteDir=${buildRoot}/siteDir + updatesSuffix="builds" + fromDir=$siteDir/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-${updatesSuffix}/${buildId} - elif [[ "${BUILD_KIND}" == 'PDE' ]] + elif [[ "${BUILD_KIND}" == 'PDE' ]] then - siteDir=${buildRoot}/siteDir - updatesSuffix="buildspdebased" - fromDir=$siteDir/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-${updatesSuffix}/${buildId} - else + siteDir=${buildRoot}/siteDir + updatesSuffix="buildspdebased" + fromDir=$siteDir/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-${updatesSuffix}/${buildId} + else echo "ERROR: Unexpected value of BUILD_KIND, $BUILD_KIND" >&2 - return 1 - fi + return 1 + fi - echo $fromDir + echo $fromDir } # compute main part of download server drop directory function dropFromBuildDir () { - eclipseStream=$1 + eclipseStream=$1 buildId=$2 BUILD_KIND=$3 pathFromDL=$( dlFromPath "$eclipseStream" "$buildId" "$BUILD_KIND" ) if [[ "$pathFromDL" == 1 ]] - then + then printf "\n\n\t%s\n\n" "ERROR: pathToDL could not be computed." >&2 return 1 - fi + fi - eclipseStreamMajor=${eclipseStream:0:1} - buildType=${buildId:0:1} + eclipseStreamMajor=${eclipseStream:0:1} + buildType=${buildId:0:1} - if [[ "${BUILD_KIND}" == 'CBI' ]] - then - buildRoot=${BUILD_HOME}/${eclipseStreamMajor}${buildType} - elif [[ "${BUILD_KIND}" == 'PDE' ]] + if [[ "${BUILD_KIND}" == 'CBI' ]] then - buildRoot=/shared/eclipse/eclipse${eclipseStreamMajor}${buildType} - else - echo "ERROR: BUILD_KIND value not recognized, $BUILD_KIND" >&2 - return 1 - fi + buildRoot=${BUILD_HOME}/${eclipseStreamMajor}${buildType} + elif [[ "${BUILD_KIND}" == 'PDE' ]] + then + buildRoot=/shared/eclipse/eclipse${eclipseStreamMajor}${buildType} + else + echo "ERROR: BUILD_KIND value not recognized, $BUILD_KIND" >&2 + return 1 + fi - siteDir=${buildRoot}/siteDir + siteDir=${buildRoot}/siteDir - fromDir=${siteDir}/${pathFromDL}/${buildId} + fromDir=${siteDir}/${pathFromDL}/${buildId} - echo "$fromDir" + echo "$fromDir" } # compute main (middle part) of download site function dlToPath() { - eclipseStream=$1 + eclipseStream=$1 if [[ -z "${eclipseStream}" ]] - then + then printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argumnet, for this function $(basename $0)" >&2 return 1; - fi + fi buildId=$2 if [[ -z "${buildId}" ]] - then + then printf "\n\n\t%s\n\n" "ERROR: Must provide buildId as second argumnet, for this function $(basename $0)" >&2 return 1; - fi + fi BUILD_KIND=$3 if [[ -z "${BUILD_KIND}" ]] - then + then printf "\n\n\t%s\n\n" "ERROR: Must provide BUILD_KIND as third argumnet, for this function $(basename $0)" >&2 return 1; - fi + fi eclipseStreamMajor=${eclipseStream:0:1} - buildType=${buildId:0:1} + buildType=${buildId:0:1} - # CBI is "normal" case. In future might have special cases. - if [[ "${BUILD_KIND}" == 'CBI' ]] - then - dropsuffix="" - else - dropsuffix="pdebased" - fi - - pathToDL=eclipse/downloads/drops - if (( $eclipseStreamMajor > 3 )) +# CBI is "normal" case. In future might have special cases. + if [[ "${BUILD_KIND}" == 'CBI' ]] then - pathToDL=$pathToDL$eclipseStreamMajor - fi + dropsuffix="" + else + dropsuffix="pdebased" + fi + + pathToDL=eclipse/downloads/drops + if (( $eclipseStreamMajor > 3 )) + then + pathToDL=$pathToDL$eclipseStreamMajor + fi - pathToDL=$pathToDL$dropsuffix - #echo "pathToDL: $pathToDL" - echo $pathToDL + pathToDL=$pathToDL$dropsuffix +#echo "pathToDL: $pathToDL" + echo $pathToDL } # compute main (left part) of download site. # because we want "from" on build machine to stay the same, only change "to" part, to be "pdebased" function dlFromPath() { - eclipseStream=$1 + eclipseStream=$1 if [[ -z "${eclipseStream}" ]] - then + then printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argumnet, for this function $(basename $0)" >&2 return 1; - fi + fi buildId=$2 if [[ -z "${buildId}" ]] - then + then printf "\n\n\t%s\n\n" "ERROR: Must provide buildId as second argumnet, for this function $(basename $0)" >&2 return 1; - fi + fi BUILD_KIND=$3 if [[ -z "${BUILD_KIND}" ]] - then + then printf "\n\n\t%s\n\n" "ERROR: Must provide BUILD_KIND as third argumnet, for this function $(basename $0)" >&2 return 1; - fi + fi eclipseStreamMajor=${eclipseStream:0:1} - buildType=${buildId:0:1} + buildType=${buildId:0:1} - pathFromDL=eclipse/downloads/drops + pathFromDL=eclipse/downloads/drops if (( $eclipseStreamMajor > 3 )) - then + then pathFromDL=$pathFromDL$eclipseStreamMajor - fi + fi - echo $pathFromDL + echo $pathFromDL } function syncDropLocation () { - echo "start syncDropLocation" + echo "start syncDropLocation" eclipseStream=$1 if [[ -z "${eclipseStream}" ]] - then + then printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argumnet, for this function $(basename $0)" >&2 return 1; - fi + fi echo "eclipseStream: $eclipseStream" buildId=$2 if [[ -z "${buildId}" ]] - then + then printf "\n\n\t%s\n\n" "ERROR: Must provide buildId as second argumnet, for this function $(basename $0)" >&2 return 1; - fi + fi echo "buildId: $buildId" BUILD_KIND=$3 if [[ -z "${BUILD_KIND}" ]] - then + then printf "\n\n\t%s\n\n" "ERROR: Must provide BUILD_KIND as third argumnet, for this function $(basename $0)" >&2 return 1; - fi + fi echo "BUILD_KIND: $BUILD_KIND" EBUILDER_HASH=$4 if [[ -z "${EBUILDER_HASH}" ]] - then + then printf "\n\n\t%s\n\n" "ERROR: Must provide builder (or aggregator) hash as fourth argumnet, for this function $(basename $0)" >&2 return 1; - fi + fi echo "EBUILDER_HASH: $EBUILDER_HASH" eclipseStreamMajor=${eclipseStream:0:1} - buildType=${buildId:0:1} + buildType=${buildId:0:1} - fromDir=$( dropFromBuildDir $eclipseStream $buildId $BUILD_KIND ) + fromDir=$( dropFromBuildDir $eclipseStream $buildId $BUILD_KIND ) if [[ ! -d "${fromDir}" ]] - then + then echo "ERROR: fromDir is not a directory? fromDir: ${fromDir}" return 1 - fi - - - toDir=$( dropOnDLServer $eclipseStream $buildId $BUILD_KIND ) - if [[ ! -d "${toDir}" ]] - then - echo "ERROR: toDir is not a directory? toDir: ${toDir}" - return 1 - fi - - echo " fromDir: ${fromDir}" >&2 - echo " toDir: ${toDir}" >&2 - - # here, for dl site, best not to preserve times, since (if mirrored) - # would be more accurate for mirroring system to have - # actual times (and we are copying only one specific - # sub-sirectory) (But, we do for now, for easier testing) - if [[ -n "${fromDir}" && -d "${fromDir}" && -n "${toDir}" && -d "${toDir}" ]] - then - rsync --recursive --prune-empty-dirs --exclude="*apitoolingreference/*" --exclude="*org.eclipse.releng.basebuilder/*" --exclude="*eclipse.platform.releng.aggregator/*" --exclude="*repository/*" --exclude="*workspace-*/*" "${fromDir}" "${toDir}" - rccode=$? - else - rccode=9 - fi - if [[ $rccode != 0 ]] - then - echo "ERROR: rsync did not complete normally.rccode: $rccode" - return $rccode - else - # Now update main DL page index pages, to show available - source /shared/eclipse/sdk/updateIndexFilesFunction.shsource - updateIndex - fi + fi + toDir=$( dropOnDLServer $eclipseStream $buildId $BUILD_KIND ) + if [[ ! -d "${toDir}" ]] + then + echo "ERROR: toDir is not a directory? toDir: ${toDir}" + return 1 + fi - echo "ending syncDropLocation" + echo " fromDir: ${fromDir}" >&2 + echo " toDir: ${toDir}" >&2 + +# here, for dl site, best not to preserve times, since (if mirrored) +# would be more accurate for mirroring system to have +# actual times (and we are copying only one specific +# sub-sirectory) (But, we do for now, for easier testing) + if [[ -n "${fromDir}" && -d "${fromDir}" && -n "${toDir}" && -d "${toDir}" ]] + then + rsync --recursive --prune-empty-dirs --exclude="*apitoolingreference/*" --exclude="*org.eclipse.releng.basebuilder/*" --exclude="*eclipse.platform.releng.aggregator/*" --exclude="*repository/*" --exclude="*workspace-*/*" "${fromDir}" "${toDir}" + rccode=$? + else + rccode=9 + fi + if [[ $rccode != 0 ]] + then + echo "ERROR: rsync did not complete normally.rccode: $rccode" + return $rccode + else +# Now update main DL page index pages, to show available + source /shared/eclipse/sdk/updateIndexFilesFunction.shsource + updateIndex + fi + + + + echo "ending syncDropLocation" } diff --git a/production/sdk/promotion/testSyncDropLocation.sh b/production/sdk/promotion/testSyncDropLocation.sh index 86635bd97..00d78b4b3 100755 --- a/production/sdk/promotion/testSyncDropLocation.sh +++ b/production/sdk/promotion/testSyncDropLocation.sh @@ -6,20 +6,20 @@ echo "SCRIPTDIR: ${SCRIPTDIR}" source ${SCRIPTDIR}/syncUpdateUtils.shsource dlToPath=$(dlToPath 4.3.0 I20130227-0112 CBI) - echo "TEST CBI: dlToPath: $dlToPath" - +echo "TEST CBI: dlToPath: $dlToPath" + dlFromPath=$(dlFromPath 4.3.0 I20130227-0112 CBI) - echo "TEST CBI: dlFromPath: $dlFromPath" - +echo "TEST CBI: dlFromPath: $dlFromPath" + dropFromBuildDir=$(dropFromBuildDir 4.3.0 I20130227-0112 CBI) - echo "TEST CBI: dropFromBuildDir: $dropFromBuildDir" - - updateSiteOnBuildDir=$(updateSiteOnBuildDir "4.3.0" "I20130227-0112" "CBI") - echo "TEST CBI: updateSiteOnBuildDir: $updateSiteOnBuildDir" - - updateSiteOnDL=$(updateSiteOnDL "4.3.0" "I20130227-0112" "CBI") - echo "TEST CBI: updateSiteOnDL: $updateSiteOnDL" - - dropOnDLServer=$(dropOnDLServer "4.3.0" "I20130227-0112" "CBI") - echo "TEST CBI: dropOnDLServer: $dropOnDLServer" -
\ No newline at end of file +echo "TEST CBI: dropFromBuildDir: $dropFromBuildDir" + +updateSiteOnBuildDir=$(updateSiteOnBuildDir "4.3.0" "I20130227-0112" "CBI") +echo "TEST CBI: updateSiteOnBuildDir: $updateSiteOnBuildDir" + +updateSiteOnDL=$(updateSiteOnDL "4.3.0" "I20130227-0112" "CBI") +echo "TEST CBI: updateSiteOnDL: $updateSiteOnDL" + +dropOnDLServer=$(dropOnDLServer "4.3.0" "I20130227-0112" "CBI") +echo "TEST CBI: dropOnDLServer: $dropOnDLServer" + diff --git a/production/sdk/promotion/updateDropLocation.sh b/production/sdk/promotion/updateDropLocation.sh index 45f4926ed..97b413a79 100755 --- a/production/sdk/promotion/updateDropLocation.sh +++ b/production/sdk/promotion/updateDropLocation.sh @@ -7,106 +7,106 @@ source ${SCRIPTDIR}/syncUpdateUtils.shsource # compute main (left part) of download site function dlpath() { - eclipseStream=$1 - if [[ -z "${eclipseStream}" ]] - then - printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argumnet, for this function $(basename $0)" - return 1; - fi - - - buildId=$2 - if [[ -z "${buildId}" ]] - then - printf "\n\n\t%s\n\n" "ERROR: Must provide buildId as second argumnet, for this function $(basename $0)" - return 1; - fi - - BUILD_KIND=$3 - if [[ -z "${BUILD_KIND}" ]] - then - printf "\n\n\t%s\n\n" "ERROR: Must provide BUILD_KIND as third argumnet, for this function $(basename $0)" - return 1; - fi - - - - eclipseStreamMajor=${eclipseStream:0:1} - buildType=${buildId:0:1} - - # CBI is "normal" one. Other clauses can be added in future for special cases. - if [[ "${BUILD_KIND}" == "CBI" ]] - then - dropsuffix="" - else - dropsuffix="pdebased" - fi - - pathToDL=eclipse/downloads/drops - if (( $eclipseStreamMajor > 3 )) - then - pathToDL=$pathToDL$eclipseStreamMajor - fi - - pathToDL=$pathToDL$dropsuffix - - echo $pathToDL + eclipseStream=$1 + if [[ -z "${eclipseStream}" ]] + then + printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argumnet, for this function $(basename $0)" + return 1; + fi + + + buildId=$2 + if [[ -z "${buildId}" ]] + then + printf "\n\n\t%s\n\n" "ERROR: Must provide buildId as second argumnet, for this function $(basename $0)" + return 1; + fi + + BUILD_KIND=$3 + if [[ -z "${BUILD_KIND}" ]] + then + printf "\n\n\t%s\n\n" "ERROR: Must provide BUILD_KIND as third argumnet, for this function $(basename $0)" + return 1; + fi + + + + eclipseStreamMajor=${eclipseStream:0:1} + buildType=${buildId:0:1} + + # CBI is "normal" one. Other clauses can be added in future for special cases. + if [[ "${BUILD_KIND}" == "CBI" ]] + then + dropsuffix="" + else + dropsuffix="pdebased" + fi + + pathToDL=eclipse/downloads/drops + if (( $eclipseStreamMajor > 3 )) + then + pathToDL=$pathToDL$eclipseStreamMajor + fi + + pathToDL=$pathToDL$dropsuffix + + echo $pathToDL } # update index on build machine with test results function updatePages() { - eclipseStream=$1 - buildId=$2 - BUILD_KIND=$3 - EBUILDER_HASH=$4 - if [[ -z "${EBUILDER_HASH}" ]] - then - printf "\n\n\t%s\n\n" "ERROR: Must provide builder (or aggregator) hash as fourth argumnet, for this function $(basename $0)" - return 1; - fi - - - eclipseStreamMajor=${eclipseStream:0:1} - buildType=${buildId:0:1} - - - echo "eclipseStreamMajor: $eclipseStreamMajor" - echo "buildType: $buildType" - echo "eclipseStream: $eclipseStream" - echo "buildId: $buildId" - echo "BUILD_KIND: $BUILD_KIND" - echo "EBUILDER_HASH: $EBUILDER_HASH" - - # compute dirctiory on build machine - dropFromBuildDir=$( dropFromBuildDir "$eclipseStream" "$buildId" "$BUILD_KIND" ) - echo "dropFromBuildDir: $dropFromBuildDir" - - if [[ "${BUILD_KIND}" == "CBI" ]] - then - eclipsebuilder=eclipse.platform.releng.aggregator - ebuilderDropDir="${dropFromBuildDir}/${eclipsebuilder}/production/testScripts" - elif [[ "${BUILD_KIND}" == "PDE" ]] - then - eclipsebuilder=org.eclipse.releng.eclipsebuilder - ebuilderDropDir="${builderDir}/testScripts" - else - echo "ERROR: Unexpected value of BUILD_KIND, $BUILD_KIND" - fi - echo "DEBUG: ebuilderDropDir: ${ebuilderDropDir}" - - ${ebuilderDropDir}/updateTestResultsPages.sh $eclipseStream $buildId $BUILD_KIND - rccode=$? - if [[ $rccode != 0 ]] - then - printf "\n\n\t%s\n\n" "ERROR occurred while updating test pages." - exit 1 - fi - + eclipseStream=$1 + buildId=$2 + BUILD_KIND=$3 + EBUILDER_HASH=$4 + if [[ -z "${EBUILDER_HASH}" ]] + then + printf "\n\n\t%s\n\n" "ERROR: Must provide builder (or aggregator) hash as fourth argumnet, for this function $(basename $0)" + return 1; + fi + + + eclipseStreamMajor=${eclipseStream:0:1} + buildType=${buildId:0:1} + + + echo "eclipseStreamMajor: $eclipseStreamMajor" + echo "buildType: $buildType" + echo "eclipseStream: $eclipseStream" + echo "buildId: $buildId" + echo "BUILD_KIND: $BUILD_KIND" + echo "EBUILDER_HASH: $EBUILDER_HASH" + + # compute dirctiory on build machine + dropFromBuildDir=$( dropFromBuildDir "$eclipseStream" "$buildId" "$BUILD_KIND" ) + echo "dropFromBuildDir: $dropFromBuildDir" + + if [[ "${BUILD_KIND}" == "CBI" ]] + then + eclipsebuilder=eclipse.platform.releng.aggregator + ebuilderDropDir="${dropFromBuildDir}/${eclipsebuilder}/production/testScripts" + elif [[ "${BUILD_KIND}" == "PDE" ]] + then + eclipsebuilder=org.eclipse.releng.eclipsebuilder + ebuilderDropDir="${builderDir}/testScripts" + else + echo "ERROR: Unexpected value of BUILD_KIND, $BUILD_KIND" + fi + echo "DEBUG: ebuilderDropDir: ${ebuilderDropDir}" + + ${ebuilderDropDir}/updateTestResultsPages.sh $eclipseStream $buildId $BUILD_KIND + rccode=$? + if [[ $rccode != 0 ]] + then + printf "\n\n\t%s\n\n" "ERROR occurred while updating test pages." + exit 1 + fi + } -# this is the single script to call that "does it all" update DL page +# this is the single script to call that "does it all" update DL page # with test results, and updates index.php summaries. # it requires four arguments # eclipseStream (e.g. 4.2 or 3.8) @@ -116,16 +116,16 @@ function updatePages() if [[ $# != 4 ]] then - # usage: - scriptname=$(basename $0) - printf "\n\t%s\n" "This script, $scriptname requires four arguments, in order: " - printf "\t\t%s\t%s\n" "eclipseStream" "(e.g. 4.2.2 or 3.8.2) " - printf "\t\t%s\t%s\n" "buildId" "(e.g. N20120415-2015) " - printf "\t\t%s\t%s\n" "BUILD_KIND" "(e.g. CBI or special case) " - printf "\t\t%s\t%s\n" "EBUILDER_HASH" "(SHA1 HASH for eclipe builder used) " - printf "\t%s\n" "for example," - printf "\t%s\n\n" "./$scriptname 4.2 N N20120415-2015 CBI master" - exit 1 + # usage: + scriptname=$(basename $0) + printf "\n\t%s\n" "This script, $scriptname requires four arguments, in order: " + printf "\t\t%s\t%s\n" "eclipseStream" "(e.g. 4.2.2 or 3.8.2) " + printf "\t\t%s\t%s\n" "buildId" "(e.g. N20120415-2015) " + printf "\t\t%s\t%s\n" "BUILD_KIND" "(e.g. CBI or special case) " + printf "\t\t%s\t%s\n" "EBUILDER_HASH" "(SHA1 HASH for eclipe builder used) " + printf "\t%s\n" "for example," + printf "\t%s\n\n" "./$scriptname 4.2 N N20120415-2015 CBI master" + exit 1 fi echo "Staring $0" @@ -133,32 +133,32 @@ echo "Staring $0" eclipseStream=$1 if [[ -z "${eclipseStream}" ]] then - printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argumnet, for this function $(basename $0)" - exit 1 + printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argumnet, for this function $(basename $0)" + exit 1 fi echo "eclipseStream: $eclipseStream" buildId=$2 if [[ -z "${buildId}" ]] then - printf "\n\n\t%s\n\n" "ERROR: Must provide buildId as second argumnet, for this function $(basename $0)" - exit 1 + printf "\n\n\t%s\n\n" "ERROR: Must provide buildId as second argumnet, for this function $(basename $0)" + exit 1 fi echo "buildId: $buildId" BUILD_KIND=$3 if [[ -z "${BUILD_KIND}" ]] - then - printf "\n\n\t%s\n\n" "ERROR: Must provide BUILD_KIND as third argumnet, for this function $(basename $0)" - exit 1 +then + printf "\n\n\t%s\n\n" "ERROR: Must provide BUILD_KIND as third argumnet, for this function $(basename $0)" + exit 1 fi echo "BUILD_KIND: $BUILD_KIND" EBUILDER_HASH=$4 if [[ -z "${EBUILDER_HASH}" ]] then - printf "\n\n\t%s\n\n" "ERROR: Must provide builder (or aggregator) hash as fourth argumnet, for this function $(basename $0)" - exit 1; + printf "\n\n\t%s\n\n" "ERROR: Must provide builder (or aggregator) hash as fourth argumnet, for this function $(basename $0)" + exit 1; fi echo "EBUILDER_HASH: $EBUILDER_HASH" @@ -166,22 +166,22 @@ eclipseStreamMajor=${eclipseStream:0:1} buildType=${buildId:0:1} echo "buildType: $buildType" -# = = = = = = = = = +# = = = = = = = = = # compute dirctiory on build machine dropFromBuildDir=$( dropFromBuildDir "$eclipseStream" "$buildId" "$BUILD_KIND" ) echo "dropFromBuildDir: $dropFromBuildDir" if [[ "${dropFromBuildDir}" == "1" ]] then - echo "dropDir did not complete normally, returned '1'." - exit 1 + echo "dropDir did not complete normally, returned '1'." + exit 1 fi if [[ ! -d "${dropFromBuildDir}" ]] -then - echo "ERROR: expected toDir (drop directory) did not exist" - echo " drop directory: ${dropFromBuildDir}" - exit 1 +then + echo "ERROR: expected toDir (drop directory) did not exist" + echo " drop directory: ${dropFromBuildDir}" + exit 1 fi SCRIPTDIR=$( dirname $0 ) ${SCRIPTDIR}/getEBuilder.sh "${BUILD_KIND}" "${EBUILDER_HASH}" "${dropFromBuildDir}" @@ -190,16 +190,16 @@ updatePages $eclipseStream $buildId $BUILD_KIND "${EBUILDER_HASH}" rccode=$? if [ $rccode -ne 0 ] then - echo "ERROR occurred during promotion to download serve: rccode: $rccode." - exit $rccode + echo "ERROR occurred during promotion to download serve: rccode: $rccode." + exit $rccode fi syncDropLocation "$eclipseStream" "$buildId" "$BUILD_KIND" "${EBUILDER_HASH}" rccode=$? if [ $rccode -ne 0 ] then - echo "ERROR occurred during promotion to download serve: rccode: $rccode." - exit $rccode + echo "ERROR occurred during promotion to download serve: rccode: $rccode." + exit $rccode fi exit 0 diff --git a/production/sdk/querySystem.sh b/production/sdk/querySystem.sh index 6ded92031..aaba36794 100755 --- a/production/sdk/querySystem.sh +++ b/production/sdk/querySystem.sh @@ -37,14 +37,14 @@ rpm -q glib2 echo echo - echo "Check if any window managers are running (xfwm|twm|metacity|beryl|fluxbox|compiz):" - ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz" | grep -v egrep - echo - echo - # unity|mint|gnome|kde|xfce|ion|wmii|dwm (was original list, but matched too much, - # espeically "ion' I suppose. - echo "Check for popular desktop environments (gnome or kde):" - ps -ef | egrep -i "gnome|kde" | grep -v egrep +echo "Check if any window managers are running (xfwm|twm|metacity|beryl|fluxbox|compiz):" +ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz" | grep -v egrep +echo +echo +# unity|mint|gnome|kde|xfce|ion|wmii|dwm (was original list, but matched too much, +# espeically "ion' I suppose. +echo "Check for popular desktop environments (gnome or kde):" +ps -ef | egrep -i "gnome|kde" | grep -v egrep echo echo " == all env variables == " @@ -52,4 +52,4 @@ printenv echo echo # we always end with "success" even though some commands may "fail" -exit 0
\ No newline at end of file +exit 0 diff --git a/production/sdk/relengUtils/re-master-build.sh b/production/sdk/relengUtils/re-master-build.sh index 74f9d0bfc..bfee2c2db 100755 --- a/production/sdk/relengUtils/re-master-build.sh +++ b/production/sdk/relengUtils/re-master-build.sh @@ -1,28 +1,28 @@ #!/usr/bin/env bash -# for releng local tests only. +# for releng local tests only. # based on master script to drive Eclipse Platform builds -# but for use only after one build succeeds, then "local" modifications made, and -# rebuild desired. +# but for use only after one build succeeds, then "local" modifications made, and +# rebuild desired. # must be called with an existing "env.shsource" file from the previous build. # basically skips the first steps and does not "clean" or re-pull from git. -# this buildeclipse.shsource file is to ease local builds to override some variables. +# this buildeclipse.shsource file is to ease local builds to override some variables. # It should not be used for production builds. -source buildeclipse.shsource +source buildeclipse.shsource RAWDATE=$( date +%s ) if [ $# -ne 1 ]; then - echo USAGE: $0 env_file - exit 1 + echo USAGE: $0 env_file + exit 1 fi INITIAL_ENV_FILE=$1 if [ ! -r "$INITIAL_ENV_FILE" ]; then - echo "$INITIAL_ENV_FILE" cannot be read - echo USAGE: $0 env_file - exit 1 + echo "$INITIAL_ENV_FILE" cannot be read + echo USAGE: $0 env_file + exit 1 fi export SCRIPT_PATH="${BUILD_ROOT}/production" @@ -44,8 +44,8 @@ BUILD_ID=$(fn-build-id "$BUILD_TYPE" ) buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" ) if [[ -z "${buildDirectory}" ]] then - echo "PROGRAM ERROR: buildDirectory returned from fn-build-dir was empty" - exit 1 + echo "PROGRAM ERROR: buildDirectory returned from fn-build-dir was empty" + exit 1 fi logsDirectory="${buildDirectory}/buildlogs" mkdir -p "${logsDirectory}" @@ -58,14 +58,14 @@ BUILD_PRETTY_DATE=$( date --date='@'$RAWDATE ) TIMESTAMP=$( date +%Y%m%d-%H%M --date='@'$RAWDATE ) # TRACE_OUTPUT is not normally used. But, it comes in handy for debugging -# when output from some functions can not be written to stdout or stderr +# when output from some functions can not be written to stdout or stderr # (due to the nature of the function ... it's "output" being its returned value). -# When needed for local debugging, usually more convenient to provide -# a value relative to PWD in startup scripts. +# When needed for local debugging, usually more convenient to provide +# a value relative to PWD in startup scripts. export TRACE_OUTPUT=${TRACE_OUTPUT:-$buildDirectory/buildlogs/trace_output.txt} echo $BUILD_PRETTY_DATE > ${TRACE_OUTPUT} -# These files have variable/value pairs for this build, suitable for use in +# These files have variable/value pairs for this build, suitable for use in # shell scripts, PHP files, or as Ant (or Java) properties export BUILD_ENV_FILE=${buildDirectory}/buildproperties.shsource export BUILD_ENV_FILE_PHP=${buildDirectory}/buildproperties.php @@ -79,11 +79,11 @@ export STREAMS_PATH="${aggDir}/streams" BUILD_TYPE_NAME="Integration" if [ "$BUILD_TYPE" = M ]; then - BUILD_TYPE_NAME="Maintenance" + BUILD_TYPE_NAME="Maintenance" elif [ "$BUILD_TYPE" = N ]; then - BUILD_TYPE_NAME="Nightly (HEAD)" + BUILD_TYPE_NAME="Nightly (HEAD)" elif [ "$BUILD_TYPE" = S ]; then - BUILD_TYPE_NAME="Stable (Milestone)" + BUILD_TYPE_NAME="Stable (Milestone)" fi GET_AGGREGATOR_BUILD_LOG="${logsDirectory}/mb010_get-aggregator_output.txt" @@ -91,9 +91,9 @@ TAG_BUILD_INPUT_LOG="${logsDirectory}/mb030_tag_build_input_output.txt" POM_VERSION_UPDATE_BUILD_LOG="${logsDirectory}/mb050_pom-version-updater_output.txt" RUN_MAVEN_BUILD_LOG="${logsDirectory}/mb060_run-maven-build_output.txt" -# These variables, from original env file, are re-written to BUILD_ENV_FILE, -# with values for this build (some of them computed) partially for documentation, and -# partially so this build can be re-ran or re-started using it, instead of +# These variables, from original env file, are re-written to BUILD_ENV_FILE, +# with values for this build (some of them computed) partially for documentation, and +# partially so this build can be re-ran or re-started using it, instead of # original env file, which would compute different values (in some cases). # The function also writes into appropriate PHP files and Properties files. # Init once, here at beginning, but don't close until much later since other functions @@ -128,7 +128,7 @@ fn-write-property STREAMS_PATH # any value of interest/usefulness can be added to BUILD_ENV_FILE if [[ "${testbuildonly}" == "true" ]] then - fn-write-property testbuildonly + fn-write-property testbuildonly fi fn-write-property BUILD_ENV_FILE fn-write-property BUILD_ENV_FILE_PHP @@ -147,44 +147,44 @@ $SCRIPT_PATH/pom-version-updater.sh $BUILD_ENV_FILE 2>&1 | tee ${POM_VERSION_UPD # if file exists, pom update failed if [[ -f "${buildDirectory}/buildFailed-pom-version-updater" ]] then + buildrc=1 + /bin/grep "\[ERROR\]" "${POM_VERSION_UPDATE_BUILD_LOG}" >> "${buildDirectory}/buildFailed-pom-version-updater" + echo "BUILD FAILED. See ${POM_VERSION_UPDATE_BUILD_LOG}." + BUILD_FAILED=${POM_VERSION_UPDATE_BUILD_LOG} + fn-write-property BUILD_FAILED +else + # if updater failed, something fairly large is wrong, so no need to compile + $SCRIPT_PATH/run-maven-build.sh $BUILD_ENV_FILE 2>&1 | tee ${RUN_MAVEN_BUILD_LOG} + # if file exists, then run maven build failed. + if [[ -f "${buildDirectory}/buildFailed-run-maven-build" ]] + then buildrc=1 - /bin/grep "\[ERROR\]" "${POM_VERSION_UPDATE_BUILD_LOG}" >> "${buildDirectory}/buildFailed-pom-version-updater" - echo "BUILD FAILED. See ${POM_VERSION_UPDATE_BUILD_LOG}." - BUILD_FAILED=${POM_VERSION_UPDATE_BUILD_LOG} + /bin/grep "\[ERROR\]" "${RUN_MAVEN_BUILD_LOG}" >> "${buildDirectory}/buildFailed-run-maven-build" + BUILD_FAILED=${RUN_MAVEN_BUILD_LOG} fn-write-property BUILD_FAILED -else - # if updater failed, something fairly large is wrong, so no need to compile - $SCRIPT_PATH/run-maven-build.sh $BUILD_ENV_FILE 2>&1 | tee ${RUN_MAVEN_BUILD_LOG} - # if file exists, then run maven build failed. - if [[ -f "${buildDirectory}/buildFailed-run-maven-build" ]] - then - buildrc=1 - /bin/grep "\[ERROR\]" "${RUN_MAVEN_BUILD_LOG}" >> "${buildDirectory}/buildFailed-run-maven-build" - BUILD_FAILED=${RUN_MAVEN_BUILD_LOG} - fn-write-property BUILD_FAILED - # TODO: eventually put in more logic to "track" the failure, so - # proper actions and emails can be sent. For example, we'd still want to - # publish what we have, but not start the tests. - echo "BUILD FAILED. See ${RUN_MAVEN_BUILD_LOG}." - else - # if build run maven build failed, no need to gather parts - $SCRIPT_PATH/gather-parts.sh $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/mb070_gather-parts_output.txt - checkForErrorExit $? "Error occurred during gather parts" - fi - -fi + # TODO: eventually put in more logic to "track" the failure, so + # proper actions and emails can be sent. For example, we'd still want to + # publish what we have, but not start the tests. + echo "BUILD FAILED. See ${RUN_MAVEN_BUILD_LOG}." + else + # if build run maven build failed, no need to gather parts + $SCRIPT_PATH/gather-parts.sh $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/mb070_gather-parts_output.txt + checkForErrorExit $? "Error occurred during gather parts" + fi + +fi $SCRIPT_PATH/publish-eclipse.sh $BUILD_ENV_FILE >$logsDirectory/mb080_publish-eclipse_output.txt checkForErrorExit $? "Error occurred during publish-eclipse" -# We don't promote equinox if there was a build failure, and we should not even try to -# create the site locally, because it depends heavily on having a valid repository to -# work from. -if [[ -z "${BUILD_FAILED}" ]] +# We don't promote equinox if there was a build failure, and we should not even try to +# create the site locally, because it depends heavily on having a valid repository to +# work from. +if [[ -z "${BUILD_FAILED}" ]] then $SCRIPT_PATH/publish-equinox.sh $BUILD_ENV_FILE >$logsDirectory/mb085_publish-equinox_output.txt checkForErrorExit $? "Error occurred during publish-equinox" -fi +fi # if all ended well, put "promotion scripts" in known locations $SCRIPT_PATH/promote-build.sh CBI $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/mb090_promote-build_output.txt @@ -192,7 +192,7 @@ checkForErrorExit $? "Error occurred during promote-build" fn-write-property-close -# dump ALL environment variables in case its helpful in documenting or +# dump ALL environment variables in case its helpful in documenting or # debugging build results or differences between runs, especially on different machines env 1>$logsDirectory/mb100_all-env-variables_output.txt diff --git a/production/sdk/relengUtils/re-mb4I.sh b/production/sdk/relengUtils/re-mb4I.sh index 0854992f8..208f273d9 100755 --- a/production/sdk/relengUtils/re-mb4I.sh +++ b/production/sdk/relengUtils/re-mb4I.sh @@ -1,35 +1,35 @@ #!/usr/bin/env bash -# this buildeclipse.shsource file is to ease local builds to override some variables. +# this buildeclipse.shsource file is to ease local builds to override some variables. # It should not be used for production builds. -source buildeclipse.shsource +source buildeclipse.shsource # Simple utility to run as cronjob to run Eclipse Platform builds # Normally resides in $BUILD_HOME function usage() { - printf "\n\tSimple script start a build of a certain stream." >&2 - printf "\n\tUsage: %s [[-h] | [-t]] -b <buildId>" $(basename $0) >&2 - printf "\n\t\t%s\n" "where h==help, t==test build b==buildId" >&2 +printf "\n\tSimple script start a build of a certain stream." >&2 +printf "\n\tUsage: %s [[-h] | [-t]] -b <buildId>" $(basename $0) >&2 +printf "\n\t\t%s\n" "where h==help, t==test build b==buildId" >&2 } # all optional # normally, when ran from crobjob, none should be specified while getopts 'htb:' OPTION do - case $OPTION in - h) usage - exit 1 - ;; - t) export testbuildonly=true - ;; - b) buildId=$OPTARG - ;; - '?') usage - exit 2 - ;; - '*') usage - exit 2 - ;; - esac + case $OPTION in + h) usage + exit 1 + ;; + t) export testbuildonly=true + ;; + b) buildId=$OPTARG + ;; + '?') usage + exit 2 + ;; + '*') usage + exit 2 + ;; + esac done # no other args expected, just good reminder shift $(($OPTIND - 1)) @@ -37,16 +37,16 @@ shift $(($OPTIND - 1)) if [[ -z "${buildId}" ]] then - echo "This script requires previous (local) build Id as input." >&2 - echo " For example, $( basename $0 ) I20130306-0033" >&2 - exit 1 + echo "This script requires previous (local) build Id as input." >&2 + echo " For example, $( basename $0 ) I20130306-0033" >&2 + exit 1 fi SCRIPT_NAME=$0 # since not from a cronjob, we can use "current directory" MB_LOG_DIR=${PWD} -LOG_BASE_NAME=${SCRIPT_NAME##*/} +LOG_BASE_NAME=${SCRIPT_NAME##*/} LOG_OUT_NAME=${MB_LOG_DIR}/${LOG_BASE_NAME%.*}.out.log LOG_ERR_NAME=${MB_LOG_DIR}/${LOG_BASE_NAME%.*}.err.log @@ -54,11 +54,11 @@ echo "Starting $SCRIPT_NAME at $( date +%Y%m%d-%H%M ) " 1>$LOG_OUT_NAME 2>$LOG_E # Start with minimal path for consistency across machines # plus, cron jobs do not inherit an environment -# care is needed not have anything in ${HOME}/bin that would effect the build -# unintentionally, but is required to make use of "source buildeclipse.shsource" on -# local machines. -# Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it -# to false) for a test I-build on a remote machine. +# care is needed not have anything in ${HOME}/bin that would effect the build +# unintentionally, but is required to make use of "source buildeclipse.shsource" on +# local machines. +# Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it +# to false) for a test I-build on a remote machine. export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin # unset common variables (some defined for e4Build) which we don't want (or, set ourselves) unset JAVA_HOME @@ -75,7 +75,7 @@ oldumask=`umask` umask 0002 echo "umask explicitly set to 0002, old value was $oldumask" 1>>$LOG_OUT_NAME 2>>$LOG_ERR_NAME -# this buildeclipse.shsource file is to ease local builds to override some variables. +# this buildeclipse.shsource file is to ease local builds to override some variables. # It should not be used for production builds. source buildeclipse.shsource 2>/dev/null export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds} @@ -105,9 +105,9 @@ export BUILD_ROOT=${BUILD_HOME}/${BUILDSTREAMTYPEDIR} buildParametersInput=${BUILD_ROOT}/siteDir/eclipse/downloads/drops4/${buildId}/buildproperties.shsource if [[ ! -f "${buildParametersInput}" ]] then - echo "ERROR: The build input parameters file did not exist? " - echo " buildParametersInput: ${buildParametersInput}" - exit 1 + echo "ERROR: The build input parameters file did not exist? " + echo " buildParametersInput: ${buildParametersInput}" + exit 1 fi export PRODUCTION_SCRIPTS_DIR=production @@ -129,6 +129,6 @@ ${PWD}/re-master-build.sh ${buildParametersInput} 1>>$LOG_OUT_NAME 2>>$LOG_ERR_N rc=$? if [[ $rc != 0 ]] -then - echo "BUILD FAILED. See run-maven-build-ouptut.txt." >&2 +then + echo "BUILD FAILED. See run-maven-build-ouptut.txt." >&2 fi diff --git a/production/sdk/renameBuild.sh b/production/sdk/renameBuild.sh index 94885c7e7..9bfbee734 100755 --- a/production/sdk/renameBuild.sh +++ b/production/sdk/renameBuild.sh @@ -3,7 +3,7 @@ # Important: it is assumed this script is ran from the directory # that is the parent of the directory to rename -# CAUTION: this is hard coded for going from "I" build to "S" build. +# CAUTION: this is hard coded for going from "I" build to "S" build. # Needs adjustment for "R" build. # its assumed oldname is old name of directory and buildId, such as I20120503-1800 @@ -15,27 +15,27 @@ newlabel=$3 function renamefile () { - # file name is input parameter - if [[ $1 =~ (.*)($oldname)(.*) ]] - then - echo "changing $1 to ${BASH_REMATCH[1]}$newlabel${BASH_REMATCH[3]}" - mv "$1" "${BASH_REMATCH[1]}$newlabel${BASH_REMATCH[3]}" + # file name is input parameter + if [[ $1 =~ (.*)($oldname)(.*) ]] + then + echo "changing $1 to ${BASH_REMATCH[1]}$newlabel${BASH_REMATCH[3]}" + mv "$1" "${BASH_REMATCH[1]}$newlabel${BASH_REMATCH[3]}" - fi + fi } if [[ $# != 3 ]] then - # usage: - scriptname=$(basename $0) - printf "\n\t%s\n" "This script, $scriptname requires three arguments, in order: " - printf "\t\t%s\t%s\n" "oldname" "(e.g. I20120503-1800) " - printf "\t\t%s\t%s\n" "newdirname" "(e.g. S-3.8M7-201205031800) " - printf "\t\t%s\t%s\n" "newlabel" "(e.g. 3.8M7 or 4.2M7 or KeplerM3) " - printf "\t%s\n" "for example," - printf "\t%s\n\n" "./$scriptname I20120503-1800 S-3.8M7-201205031800 3.8M7" - exit 1 + # usage: + scriptname=$(basename $0) + printf "\n\t%s\n" "This script, $scriptname requires three arguments, in order: " + printf "\t\t%s\t%s\n" "oldname" "(e.g. I20120503-1800) " + printf "\t\t%s\t%s\n" "newdirname" "(e.g. S-3.8M7-201205031800) " + printf "\t\t%s\t%s\n" "newlabel" "(e.g. 3.8M7 or 4.2M7 or KeplerM3) " + printf "\t%s\n" "for example," + printf "\t%s\n\n" "./$scriptname I20120503-1800 S-3.8M7-201205031800 3.8M7" + exit 1 fi echo "Renaming build $oldname to $newdirname with $newlabel" @@ -43,10 +43,10 @@ fromString=$oldname toString=$newlabel replaceCommand="s!${fromString}!${toString}!g" -# As far as is known, the "directory name" only comes into play in -# the various "buildproperties.*" files, so that's all we'll replace, for now. +# As far as is known, the "directory name" only comes into play in +# the various "buildproperties.*" files, so that's all we'll replace, for now. # In most files, it's a "relative" location so newdirname should not be needed. -# We assume if "oldName" is surrounded by path separators ('/') it needs whole directory +# We assume if "oldName" is surrounded by path separators ('/') it needs whole directory # name, not just "label". # See https://bugs.eclipse.org/bugs/show_bug.cgi?id=414739 replaceDirCommand="s!/${fromString}/!/${newdirname}/!g" @@ -67,34 +67,34 @@ perl -w -pi -e ${replaceCommand} ${oldname}/checksum/* # Integration --> Release # These are for cases where used in headers, titles, etc. # TODO: final "fall through" case should be based on matching -# new label with digits only, such as "4.3" ... not sure -# if this would work for Equinox "Kepler" or "Kepler Released Build"? -OLD_BUILD_TYPE=${oldname:0:1} +# new label with digits only, such as "4.3" ... not sure +# if this would work for Equinox "Kepler" or "Kepler Released Build"? +OLD_BUILD_TYPE=${oldname:0:1} if [[ $OLD_BUILD_TYPE == "I" ]] then - oldString="Integration Build" + oldString="Integration Build" elif [[ $OLD_BUILD_TYPE == "M" ]] then - oldString="Maintenance Build" + oldString="Maintenance Build" else - oldString="Unexpected OLD_BUILD_TYPE: $OLD_BUILD_TYPE" + oldString="Unexpected OLD_BUILD_TYPE: $OLD_BUILD_TYPE" fi if [[ "${newlabel}" =~ .*RC.* ]] -then - newString="Release Candidate Build" +then + newString="Release Candidate Build" elif [[ "${newlabel}" =~ .*R.* ]] then - newString="Release Build" + newString="Release Build" elif [[ "${newlabel}" =~ .*M.* ]] then - newString="Stable Build" -else - # releases have labels such as 4.4 or 4.3.1 (or KeplerSR1) so former - # won't match any of the above. - # TODO: put in sanity check to match known release patterns - # of digits and periods, else bail. - newString="Release Build" + newString="Stable Build" +else + # releases have labels such as 4.4 or 4.3.1 (or KeplerSR1) so former + # won't match any of the above. + # TODO: put in sanity check to match known release patterns + # of digits and periods, else bail. + newString="Release Build" fi echo -e "\n\tReplacing ${oldString} with ${newString} in ${oldname}/*.php\n" @@ -104,40 +104,40 @@ replaceBuildNameCommand="s!${oldString}!${newString}!g" perl -w -pi -e "${replaceBuildNameCommand}" ${oldname}/*.php # some special cases, for the buildproperties.php file -# Note, we do php only, since that's what we need, and if we did want -# to rebuild, say using buildproperties.shsource, would be best to work -# from original values. Less sure what to do with Ant properties, +# Note, we do php only, since that's what we need, and if we did want +# to rebuild, say using buildproperties.shsource, would be best to work +# from original values. Less sure what to do with Ant properties, # buildproperties.properties ... but, we'll decide when needed. -# TODO: New label doesn't have "R" in it ... just, for example, "4.3". -# for now, we'll "fall through" to "R", if doesn't match anything else, -# but this won't work well if/when we add others, such as X or T for test -# builds. +# TODO: New label doesn't have "R" in it ... just, for example, "4.3". +# for now, we'll "fall through" to "R", if doesn't match anything else, +# but this won't work well if/when we add others, such as X or T for test +# builds. if [[ $OLD_BUILD_TYPE == "I" ]] then - oldString="BUILD_TYPE = \"I\"" + oldString="BUILD_TYPE = \"I\"" elif [[ $OLD_BUILD_TYPE == "M" ]] then - oldString="BUILD_TYPE = \"M\"" + oldString="BUILD_TYPE = \"M\"" else - oldString="Unexpected OLD_BUILD_TYPE: $OLD_BUILD_TYPE" + oldString="Unexpected OLD_BUILD_TYPE: $OLD_BUILD_TYPE" fi if [[ "${newlabel}" =~ .*RC.* && $OLD_BUILD_TYPE == "I" ]] -then - newString="BUILD_TYPE = \"S\"" +then + newString="BUILD_TYPE = \"S\"" elif [[ "${newlabel}" =~ .*RC.* && $OLD_BUILD_TYPE == "M" ]] then - newString="BUILD_TYPE = \"M\"" + newString="BUILD_TYPE = \"M\"" elif [[ "${newlabel}" =~ .*R.* ]] then - newString="BUILD_TYPE = \"R\"" + newString="BUILD_TYPE = \"R\"" elif [[ "${newlabel}" =~ .*M.* ]] then - newString="BUILD_TYPE = \"S\"" -else - # see previous comment on forms of "releases" (4.3.1, 4.2, Kepler, KeplerSR1, etc.) - newString="BUILD_TYPE = \"R\"" + newString="BUILD_TYPE = \"S\"" +else + # see previous comment on forms of "releases" (4.3.1, 4.2, Kepler, KeplerSR1, etc.) + newString="BUILD_TYPE = \"R\"" fi replaceBuildNameCommand="s!${oldString}!${newString}!g" @@ -147,25 +147,25 @@ perl -w -pi -e "${replaceBuildNameCommand}" ${oldname}/buildproperties.php # We only ever promote "I" or "M" builds, so this ends with sanity check. if [[ $OLD_BUILD_TYPE == "I" ]] then - oldString="BUILD_TYPE_NAME = \"Integration\"" + oldString="BUILD_TYPE_NAME = \"Integration\"" elif [[ $OLD_BUILD_TYPE == "M" ]] then - oldString="BUILD_TYPE_NAME = \"Maintenance\"" + oldString="BUILD_TYPE_NAME = \"Maintenance\"" else - oldString="BUILD_TYPE_NAME = \"Unknown OLD_BUILD_TYPE, $OLD_BUILD_TYPE\"" + oldString="BUILD_TYPE_NAME = \"Unknown OLD_BUILD_TYPE, $OLD_BUILD_TYPE\"" fi if [[ "${newlabel}" =~ .*RC.* ]] -then - newString="BUILD_TYPE_NAME = \"Release Candidate\"" +then + newString="BUILD_TYPE_NAME = \"Release Candidate\"" elif [[ "${newlabel}" =~ .*R.* ]] then - newString="BUILD_TYPE_NAME = \"Release\"" + newString="BUILD_TYPE_NAME = \"Release\"" elif [[ "${newlabel}" =~ .*M.* ]] then - newString="BUILD_TYPE_NAME = \"Stable\"" -else - newString="BUILD_TYPE_NAME = \"Release\"" + newString="BUILD_TYPE_NAME = \"Stable\"" +else + newString="BUILD_TYPE_NAME = \"Release\"" fi echo -e "\n\tReplacing ${oldString} with ${newString} in ${oldname}/buildproperties.php\n" @@ -174,8 +174,8 @@ replaceBuildNameCommand="s!${oldString}!${newString}!g" # quotes are critical here, since strings might contain spaces! perl -w -pi -e "${replaceBuildNameCommand}" ${oldname}/buildproperties.php -# One special case for promoted builds, is the "FAILED" icons are -# changed to "OK", since all unit tests accounted for, if not fixed. +# One special case for promoted builds, is the "FAILED" icons are +# changed to "OK", since all unit tests accounted for, if not fixed. oldString="FAIL.gif" newString="OK.gif" replaceBuildNameCommand="s!${oldString}!${newString}!g" @@ -187,11 +187,11 @@ echo -e "\n\n\tMove old directory, $oldname, to new directory, $newdirname.\n\n" # move directory before file renames mv $oldname $newdirname -# We (currently) rename files under current direcotry, and in 'checksums'. -# No need to go deeper (currently) and can be harm, since we do have a copy of -# 'repository' in there (so things things with same name as build directory, such -# as branding bundles? and /repository/binaries get renamed too, if we go too deep. -# Even though we should not need that copy of 'repository' any longer, we might, +# We (currently) rename files under current direcotry, and in 'checksums'. +# No need to go deeper (currently) and can be harm, since we do have a copy of +# 'repository' in there (so things things with same name as build directory, such +# as branding bundles? and /repository/binaries get renamed too, if we go too deep. +# Even though we should not need that copy of 'repository' any longer, we might, # some day? echo -e "\n\n\tRename files in new directory, ./${newdirname}, to new name.\n\n" nFiles=$(find ./${newdirname} -mindepth 1 -maxdepth 2 -name "*${oldname}*" -print | wc -l) @@ -199,5 +199,5 @@ echo -e "\n\t $nFiles files found to rename.\n" for file in $(find ./${newdirname} -mindepth 1 -maxdepth 2 -name "*${oldname}*" -print) do - renamefile $file + renamefile $file done diff --git a/production/sdk/reposcripts/chrepos.sh b/production/sdk/reposcripts/chrepos.sh index 4e894afb7..75ecd0b49 100755 --- a/production/sdk/reposcripts/chrepos.sh +++ b/production/sdk/reposcripts/chrepos.sh @@ -1,14 +1,14 @@ function checkrepo () { - cd $1 - echo $1 + cd $1 + echo $1 - NUNREACHABLE=`git fsck --unreachable | wc -l` - echo "Unreachable: " $NUNREACHABLE - #find objects/?? -type f | wc -l - #find objects/pack -ls | wc -l - git count-objects -v + NUNREACHABLE=`git fsck --unreachable | wc -l` + echo "Unreachable: " $NUNREACHABLE + #find objects/?? -type f | wc -l + #find objects/pack -ls | wc -l + git count-objects -v } PROJECTROOT=/gitroot/platform diff --git a/production/sdk/reposcripts/platformgc.sh b/production/sdk/reposcripts/platformgc.sh index af934bc27..ea50c01e3 100755 --- a/production/sdk/reposcripts/platformgc.sh +++ b/production/sdk/reposcripts/platformgc.sh @@ -1,12 +1,12 @@ function checkrepo () { - cd $1 - echo $1 - #git fsck --unreachable | wc -l - #find objects/?? -type f | wc -l - #find objects/pack -ls | wc -l - git gc + cd $1 + echo $1 + #git fsck --unreachable | wc -l + #find objects/?? -type f | wc -l + #find objects/pack -ls | wc -l + git gc } PROJECTROOT=/gitroot/platform diff --git a/production/sdk/startTests.sh b/production/sdk/startTests.sh index 9fc78c48f..449259543 100755 --- a/production/sdk/startTests.sh +++ b/production/sdk/startTests.sh @@ -9,12 +9,12 @@ export ANT_HOME=/shared/common/apache-ant-1.9.2 function usage () { - printf "\t\t%s\n" "usage: " - printf "\t\t%s\n" "$( basename $0 ) eclipseStream buildId" - printf "\t\t\t%s\n" "where " - printf "\t\t\t%s\n" "eclipseStream == 4.3.0, 3.8.2, etc. " - printf "\t\t\t%s\n" "buildId == M20120705-1200, IM20121005-0800, etc. " - printf "\t\t\t\t%s\n" "or, provide those parameters in buildParams.shshource on search path" + printf "\t\t%s\n" "usage: " + printf "\t\t%s\n" "$( basename $0 ) eclipseStream buildId" + printf "\t\t\t%s\n" "where " + printf "\t\t\t%s\n" "eclipseStream == 4.3.0, 3.8.2, etc. " + printf "\t\t\t%s\n" "buildId == M20120705-1200, IM20121005-0800, etc. " + printf "\t\t\t\t%s\n" "or, provide those parameters in buildParams.shshource on search path" } # This file, buildParams.shsource, normally does not exist on build system, @@ -34,42 +34,42 @@ EBUILDER_HASH=${EBUILDER_HASH:-${4}} if [[ -z ${eclipseStream} || -z ${buildId} ]] then - printf "\n\t%s\n" "ERROR: missing required parameters." - usage - exit 1 + printf "\n\t%s\n" "ERROR: missing required parameters." + usage + exit 1 fi if [[ -z "${BUILD_KIND}" ]] then - BUILD_KIND=CBI + BUILD_KIND=CBI fi if [[ -z "${EBUILDER_HASH}" ]] then - EBUILDER_HASH=master + EBUILDER_HASH=master fi # contrary to intuition (and previous behavior, bash 3.1) do NOT use quotes around right side of expression. if [[ "${eclipseStream}" =~ ^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)$ ]] then - eclipseStreamMajor=${BASH_REMATCH[1]} - eclipseStreamMinor=${BASH_REMATCH[2]} - eclipseStreamService=${BASH_REMATCH[3]} + eclipseStreamMajor=${BASH_REMATCH[1]} + eclipseStreamMinor=${BASH_REMATCH[2]} + eclipseStreamService=${BASH_REMATCH[3]} else - printf "\n\t%s\n" "ERROR: eclipseStream, $eclipseStream, must contain major, minor, and service versions." - usage - exit 1 + printf "\n\t%s\n" "ERROR: eclipseStream, $eclipseStream, must contain major, minor, and service versions." + usage + exit 1 fi if [[ "${buildId}" =~ ([MNIXYP]+)([[:digit:]]*)\-([[:digit:]]*) ]] then - # old, simpler way, if we don't do regex and input checkinging - #buildType=${buildId:0:1} - buildType=${BASH_REMATCH[1]} + # old, simpler way, if we don't do regex and input checkinging + #buildType=${buildId:0:1} + buildType=${BASH_REMATCH[1]} else - printf "\n\t%s\n" "ERROR: buildId, $buildId, did not match expected pattern." - usage - exit 1 + printf "\n\t%s\n" "ERROR: buildId, $buildId, did not match expected pattern." + usage + exit 1 fi source buildeclipse.shsource 2>/dev/null @@ -99,15 +99,15 @@ siteDir=${buildRoot}/siteDir postingDirectory=${siteDir}/eclipse/downloads/drops if (( "${eclipseStreamMajor}" > 3 )) then - postingDirectory=${siteDir}/eclipse/downloads/drops${eclipseStreamMajor} + postingDirectory=${siteDir}/eclipse/downloads/drops${eclipseStreamMajor} fi HUDSON_TOKEN=windows2012tests ant \ - -DbuildDirectory=${buildDirectory} \ - -DpostingDirectory=${postingDirectory} \ - -DbuildId=${buildId} \ - -DeclipseStream=${eclipseStream} \ - -DBUILD_KIND=${BUILD_KIND} \ - -DEBUILDER_HASH=${EBUILDER_HASH} \ - -f ${builderDir}/invokeTestsJSON.xml + -DbuildDirectory=${buildDirectory} \ + -DpostingDirectory=${postingDirectory} \ + -DbuildId=${buildId} \ + -DeclipseStream=${eclipseStream} \ + -DBUILD_KIND=${BUILD_KIND} \ + -DEBUILDER_HASH=${EBUILDER_HASH} \ + -f ${builderDir}/invokeTestsJSON.xml diff --git a/production/sdk/testdataCronJob.sh b/production/sdk/testdataCronJob.sh index 3969a7899..f8286bf44 100755 --- a/production/sdk/testdataCronJob.sh +++ b/production/sdk/testdataCronJob.sh @@ -11,11 +11,11 @@ # Start with minimal path for consistency across machines # plus, cron jobs do not inherit an environment -# care is needed not have anything in ${HOME}/bin that would effect the build -# unintentionally, but is required to make use of "source buildeclipse.shsource" on -# local machines. -# Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it -# to false) for a test I-build on a remote machine. +# care is needed not have anything in ${HOME}/bin that would effect the build +# unintentionally, but is required to make use of "source buildeclipse.shsource" on +# local machines. +# Likely only a "release engineer" would be interested, such as to override "SIGNING" (setting it +# to false) for a test I-build on a remote machine. export PATH=/usr/local/bin:/usr/bin:/bin:${HOME}/bin # unset common variables (some defined for e4Build) which we don't want (or, set ourselves) unset JAVA_HOME @@ -30,7 +30,7 @@ unset JRE_HOME # we create. oldumask=`umask` umask 0002 -# Remember, don't echo except when testing, or mail will be sent each time it runs. +# Remember, don't echo except when testing, or mail will be sent each time it runs. # echo "umask explicitly set to 0002, old value was $oldumask" @@ -50,49 +50,49 @@ allfiles=$( find $testdataLocation -name "testjobdata*.txt" ) for datafile in $allfiles do - # having an echo here will cause cron job to send mail for EACH job, even if all is fine. - # so use only for testing. - #echo $datafile + # having an echo here will cause cron job to send mail for EACH job, even if all is fine. + # so use only for testing. + #echo $datafile - if [[ -z "$datafile" ]] + if [[ -z "$datafile" ]] + then + # would be an odd error, but nothing to do (Remember, can not have an empty if/then/else clause! Syntax error. + echo "WARNING: unexpectedly found datafile variable to be null or empty." + else + # found a file, confirm is file for safety + if [[ -f $datafile ]] then - # would be an odd error, but nothing to do (Remember, can not have an empty if/then/else clause! Syntax error. - echo "WARNING: unexpectedly found datafile variable to be null or empty." - else - # found a file, confirm is file for safety - if [[ -f $datafile ]] - then - # if found a file to execute, temporarily change its name to "RUNNING-$datafile - # so a subsequent cron job won't find it (if it does not finish by the time of the next cron job). - runningdatafile=$testdataLocation/RUNNING_$(basename $datafile) - mv $datafile $runningdatafile - # notice these logs are concatenated on purpose, to give some "history", but - # that means has to be "manually" removed every now and then. - # improve as desired. - /bin/bash /shared/eclipse/sdk/collect.sh < $runningdatafile 1>>$testdataLocation/collection-out.txt 2>>$testdataLocation/collection-err.txt - # to test cron job, without doing anything, comment out above line, and uncomment folloiwng line. - # then try various types of files file names, etc. - # echo "DEBUG: normally would execute file here: $datafile" 1>>$testdataLocation/collection-out.txt 2>>$testdataLocation/datacollect-err.txt - rccode=$? - if [[ $rccode != 0 ]] - then - echo "ERROR: collection returned an error: $rccode" - echo " datafile: $datafile" - mv $runningdatafile $testdataLocation/ERROR_$(basename $datafile) - exit 1 - else - # all is ok, we'll move the file to "RAN-" in case needed for later inspection, - # if things go wrong. Perhaps eventually just remove them? - mv $runningdatafile $testdataLocation/RAN_$(basename $datafile) - # if testing scripts, only, sometimes handy to leave named to catch the next cronjob - #mv $runningdatafile $testdataLocation/$(basename $datafile) - fi - else - echo "ERROR: data file found, but was not an actual file?" - echo " datafile: $datafile" - exit 1 - fi + # if found a file to execute, temporarily change its name to "RUNNING-$datafile + # so a subsequent cron job won't find it (if it does not finish by the time of the next cron job). + runningdatafile=$testdataLocation/RUNNING_$(basename $datafile) + mv $datafile $runningdatafile + # notice these logs are concatenated on purpose, to give some "history", but + # that means has to be "manually" removed every now and then. + # improve as desired. + /bin/bash /shared/eclipse/sdk/collect.sh < $runningdatafile 1>>$testdataLocation/collection-out.txt 2>>$testdataLocation/collection-err.txt + # to test cron job, without doing anything, comment out above line, and uncomment folloiwng line. + # then try various types of files file names, etc. + # echo "DEBUG: normally would execute file here: $datafile" 1>>$testdataLocation/collection-out.txt 2>>$testdataLocation/datacollect-err.txt + rccode=$? + if [[ $rccode != 0 ]] + then + echo "ERROR: collection returned an error: $rccode" + echo " datafile: $datafile" + mv $runningdatafile $testdataLocation/ERROR_$(basename $datafile) + exit 1 + else + # all is ok, we'll move the file to "RAN-" in case needed for later inspection, + # if things go wrong. Perhaps eventually just remove them? + mv $runningdatafile $testdataLocation/RAN_$(basename $datafile) + # if testing scripts, only, sometimes handy to leave named to catch the next cronjob + #mv $runningdatafile $testdataLocation/$(basename $datafile) + fi + else + echo "ERROR: data file found, but was not an actual file?" + echo " datafile: $datafile" + exit 1 fi + fi done diff --git a/production/sdk/testsummaries/runAntRunner.sh b/production/sdk/testsummaries/runAntRunner.sh index 2fa33689e..02d5a3d7b 100755 --- a/production/sdk/testsummaries/runAntRunner.sh +++ b/production/sdk/testsummaries/runAntRunner.sh @@ -10,8 +10,8 @@ BUILD_HOME=${BUILD_HOME:-/shared/eclipse/eclipse3I} if [ ! -d "${BUILD_HOME}" ] then - echo "ERROR: BUILD_HOME was not an existing directory as expected: ${BUILD_HOME}" - exit 1 + echo "ERROR: BUILD_HOME was not an existing directory as expected: ${BUILD_HOME}" + exit 1 fi # For most uses, this directory does not HAVE to literally be @@ -21,8 +21,8 @@ ECLIPSEBUILDER_DIR=${ECLIPSEBUILDER_DIR:-${BUILD_HOME}/build/supportDir/org.ecli if [ ! -d "${ECLIPSEBUILDER_DIR}/scripts" ] then - echo "ERROR: builder scripts was not an existing directory as expected: ${ECLIPSEBUILDER_DIR}/scripts}" - exit 1 + echo "ERROR: builder scripts was not an existing directory as expected: ${ECLIPSEBUILDER_DIR}/scripts}" + exit 1 fi # specify devworkspace and JRE to use to runEclipse @@ -39,12 +39,12 @@ devJRE=$JAVA_HOME/jre/bin/java if [ ! -n ${devJRE} -a -x ${devJRE} ] then - echo "ERROR: could not find (or execute) JRE were expected: ${devJRE}" - exit 1 + echo "ERROR: could not find (or execute) JRE were expected: ${devJRE}" + exit 1 else - # display version, just to be able to log it. - echo "JRE Location and Version: ${devJRE}" - echo $( $devJRE -version ) + # display version, just to be able to log it. + echo "JRE Location and Version: ${devJRE}" + echo $( $devJRE -version ) fi # remember, the eclispe install must match the VM used (e.g. both 64 bit, both 32 bit, etc). @@ -52,8 +52,8 @@ ECLIPSE_EXE=${ECLIPSE_EXE:-/shared/eclipse/eclipse3I/build/supportDir/org.eclips if [ ! -n ${ECLIPSE_EXE} -a -x ${ECLIPSE_EXE} ] then - echo "ERROR: ECLIPSE_EXE is not defined or not executable: ${ECLIPSE_EXE}" - exit 1001 + echo "ERROR: ECLIPSE_EXE is not defined or not executable: ${ECLIPSE_EXE}" + exit 1001 fi @@ -62,17 +62,17 @@ buildId=$1 shift if [[ -z "${buildId}" ]] then -echo "need buildId as first argument" + echo "need buildId as first argument" fi BUILDFILE=$1 shift if [ -e $BUILDFILE ] then - BUILDFILESTR=" -file $BUILDFILE" - shift + BUILDFILESTR=" -file $BUILDFILE" + shift else - BUILDFILESTR=" -file build.xml" + BUILDFILESTR=" -file build.xml" fi # use special $@ to keep all arguments quoted (instead of one big string) @@ -82,8 +82,8 @@ echo echo " BUILDFILESTR: $BUILDFILESTR" if [ -n "${extraArgs}" ] then - echo " extraArgs: ${extraArgs}" - echo " as it is right now, target name must be first \"extraArg\" if specifying one." + echo " extraArgs: ${extraArgs}" + echo " as it is right now, target name must be first \"extraArg\" if specifying one." fi echo @@ -100,10 +100,10 @@ echo if [ -n ${ECLIPSE_EXE} -a -x ${ECLIPSE_EXE} ] then - ${ECLIPSE_EXE} -Dhuson=true --launcher.suppressErrors -nosplash -console -data $devworkspace -application org.eclipse.ant.core.antRunner $BUILDFILESTR ${extraArgs} -vm $devJRE -vmargs $devArgs - RC=$? + ${ECLIPSE_EXE} -Dhuson=true --launcher.suppressErrors -nosplash -console -data $devworkspace -application org.eclipse.ant.core.antRunner $BUILDFILESTR ${extraArgs} -vm $devJRE -vmargs $devArgs + RC=$? else - echo "ERROR: ECLIPSE_EXE is not defined to executable eclipse" - RC=1 + echo "ERROR: ECLIPSE_EXE is not defined to executable eclipse" + RC=1 fi exit $RC diff --git a/production/sdk/testsummaries/standardVariables.shsource b/production/sdk/testsummaries/standardVariables.shsource index 45b5265d7..3d64c6c0f 100644 --- a/production/sdk/testsummaries/standardVariables.shsource +++ b/production/sdk/testsummaries/standardVariables.shsource @@ -8,8 +8,8 @@ BUILD_HOME=${BUILD_HOME:-/shared/eclipse/eclipse3I} if [ ! -d "${BUILD_HOME}" ] then - echo "ERROR: BUILD_HOME was not an existing directory as expected: ${BUILD_HOME}" - exit 1 +echo "ERROR: BUILD_HOME was not an existing directory as expected: ${BUILD_HOME}" +exit 1 fi # For most uses, this directory does not HAVE to literally be @@ -19,8 +19,8 @@ ECLIPSEBUILDER_DIR=${ECLIPSEBUILDER_DIR:-${BUILD_HOME}/build/supportDir/org.ecli if [ ! -d "${ECLIPSEBUILDER_DIR}/scripts" ] then - echo "ERROR: builder scripts was not an existing directory as expected: ${ECLIPSEBUILDER_DIR}/scripts}" - exit 1 +echo "ERROR: builder scripts was not an existing directory as expected: ${ECLIPSEBUILDER_DIR}/scripts}" +exit 1 fi # specify devworkspace and JRE to use to runEclipse @@ -37,19 +37,19 @@ devJRE=$JAVA_HOME/jre/bin/java if [ ! -n ${devJRE} -a -x ${devJRE} ] then - echo "ERROR: could not find (or execute) JRE were expected: ${devJRE}" - exit 1 +echo "ERROR: could not find (or execute) JRE were expected: ${devJRE}" +exit 1 else - # display version, just to be able to log it. - echo "JRE Location and Version: ${devJRE}" - echo $( $devJRE -version ) -fi +# display version, just to be able to log it. +echo "JRE Location and Version: ${devJRE}" +echo $( $devJRE -version ) + fi # remember, the eclispe install must match the VM used (e.g. both 64 bit, both 32 bit, etc). -ECLIPSE_EXE=${ECLIPSE_EXE:-/shared/eclipse/eclipse3I/build/supportDir/org.eclipse.releng.basebuilder/eclipse} + ECLIPSE_EXE=${ECLIPSE_EXE:-/shared/eclipse/eclipse3I/build/supportDir/org.eclipse.releng.basebuilder/eclipse} -if [ ! -n ${ECLIPSE_EXE} -a -x ${ECLIPSE_EXE} ] -then - echo "ERROR: ECLIPSE_EXE is not defined or not executable: ${ECLIPSE_EXE}" - exit 1001 -fi + if [ ! -n ${ECLIPSE_EXE} -a -x ${ECLIPSE_EXE} ] + then + echo "ERROR: ECLIPSE_EXE is not defined or not executable: ${ECLIPSE_EXE}" + exit 1001 + fi diff --git a/production/sdk/updateIndexFilesFunction.shsource b/production/sdk/updateIndexFilesFunction.shsource index 329724345..fdac7b347 100644 --- a/production/sdk/updateIndexFilesFunction.shsource +++ b/production/sdk/updateIndexFilesFunction.shsource @@ -11,54 +11,54 @@ function internalUpdateIndex () { - # this buildeclipse.shsource file is to ease local builds to override some variables. - # It should not be used for production builds. - source buildeclipse.shsource 2>/dev/null +# this buildeclipse.shsource file is to ease local builds to override some variables. +# It should not be used for production builds. + source buildeclipse.shsource 2>/dev/null SITE_HOST=${SITE_HOST:-download.eclipse.org} - #echo "SITE_HOST: $SITE_HOST" +#echo "SITE_HOST: $SITE_HOST" - if [[ $# != 2 ]] + if [[ $# != 2 ]] then - echo "PROGRAM ERROR: this function requires two arguments, in order, " - echo " the php page to use to create the html page, named in second argument)." - echo " Returning 1" - return 1 - fi + echo "PROGRAM ERROR: this function requires two arguments, in order, " + echo " the php page to use to create the html page, named in second argument)." + echo " Returning 1" + return 1 + fi - PHP_PAGE=$1 - HTML_PAGE=$2 + PHP_PAGE=$1 + HTML_PAGE=$2 - TEMP_INDEX_TXT=tempIndex.txt - # remove previous vesrsions, if exists - rm ${TEMP_INDEX_TXT} 2>/dev/null + TEMP_INDEX_TXT=tempIndex.txt +# remove previous vesrsions, if exists + rm ${TEMP_INDEX_TXT} 2>/dev/null - wget --no-verbose -O ${TEMP_INDEX_TXT} http://${SITE_HOST}/eclipse/downloads/${PHP_PAGE} 2>&1 - rccode=$? - if [[ $rccode = 0 ]] - then - rsync ${TEMP_INDEX_TXT} /home/data/httpd/download.eclipse.org/eclipse/downloads/${HTML_PAGE} - rccode=$? - if [[ $rccode = 0 ]] + wget --no-verbose -O ${TEMP_INDEX_TXT} http://${SITE_HOST}/eclipse/downloads/${PHP_PAGE} 2>&1 + rccode=$? + if [[ $rccode = 0 ]] then - echo "INFO: Updated http://${SITE_HOST}/eclipse/downloads/${HTML_PAGE}" - # normal exit. Return out the bottom, to include 'remove' temp file. - # return 0 - else - echo "ERROR: Could not copy ${HTML_PAGE} to downlaods. rccode: $rccode" - return $rccode - fi + rsync ${TEMP_INDEX_TXT} /home/data/httpd/download.eclipse.org/eclipse/downloads/${HTML_PAGE} + rccode=$? + if [[ $rccode = 0 ]] + then + echo "INFO: Updated http://${SITE_HOST}/eclipse/downloads/${HTML_PAGE}" +# normal exit. Return out the bottom, to include 'remove' temp file. +# return 0 else - echo "ERROR: Could not create or pull ${TEMP_INDEX_TXT} from downloads file ${PHP_PAGE}. rccode: $rccode" + echo "ERROR: Could not copy ${HTML_PAGE} to downlaods. rccode: $rccode" return $rccode - fi - # cleanup - rm ${TEMP_INDEX_TXT} - return 0 + fi + else + echo "ERROR: Could not create or pull ${TEMP_INDEX_TXT} from downloads file ${PHP_PAGE}. rccode: $rccode" + return $rccode + fi +# cleanup + rm ${TEMP_INDEX_TXT} + return 0 } function updateIndexMAIN () { - internalUpdateIndex ${x4X_PHP_PAGE_MAIN} ${x4X_HTML_PAGE_MAIN} + internalUpdateIndex ${x4X_PHP_PAGE_MAIN} ${x4X_HTML_PAGE_MAIN} # internalUpdateIndex ${x3X_PHP_PAGE_MAIN} ${x3X_HTML_PAGE_MAIN} } @@ -66,22 +66,22 @@ function updateIndexMAIN () function updateIndex () { - x4X_PHP_PAGE_MAIN="createIndex4x.php" + x4X_PHP_PAGE_MAIN="createIndex4x.php" x4X_HTML_PAGE_MAIN="index.html" x3X_PHP_PAGE_MAIN="createIndex3x.php" x3X_HTML_PAGE_MAIN="eclipse3x.html" - # if no arguments, do all +# if no arguments, do all if [[ $# == 0 ]] - then - # 0 args is normal case (now). Update all main indexpages. + then +# 0 args is normal case (now). Update all main indexpages. updateIndexMAIN - elif (( $# > 0 )) - then - # still do all, but print warning + elif (( $# > 0 )) + then +# still do all, but print warning updateIndexMAIN echo "WARNING: arguments to updateIndex (\"$@\") were ignored. We update all pages each call." - fi + fi -return 0 + return 0 } diff --git a/production/sdk/updateIndexes.sh b/production/sdk/updateIndexes.sh index ff087a052..122146c44 100755 --- a/production/sdk/updateIndexes.sh +++ b/production/sdk/updateIndexes.sh @@ -3,11 +3,11 @@ # Utility to update both 4.x index pages, for all build technologies # for testing, may not be in "production" location -if [[ -f /shared/eclipse/sdk/updateIndexFilesFunction.shsource ]] +if [[ -f /shared/eclipse/sdk/updateIndexFilesFunction.shsource ]] then - source /shared/eclipse/sdk/updateIndexFilesFunction.shsource + source /shared/eclipse/sdk/updateIndexFilesFunction.shsource else - source updateIndexFilesFunction.shsource + source updateIndexFilesFunction.shsource fi updateIndex diff --git a/production/sdk/updaterepo/updateComposite.sh b/production/sdk/updaterepo/updateComposite.sh index 1b3126706..274f54a4a 100755 --- a/production/sdk/updaterepo/updateComposite.sh +++ b/production/sdk/updaterepo/updateComposite.sh @@ -14,12 +14,12 @@ devJRE="${JAVA_HOME}"/bin/java if [ ! -n ${devJRE} -a -x ${devJRE} ] then - echo "ERROR: could not find (or execute) JRE were expected: ${devJRE}" - exit 1 + echo "ERROR: could not find (or execute) JRE were expected: ${devJRE}" + exit 1 else - # display version, just to be able to log it. - echo "JRE Location and Version: ${devJRE}" - echo $( $devJRE -version ) + # display version, just to be able to log it. + echo "JRE Location and Version: ${devJRE}" + echo $( $devJRE -version ) fi @@ -28,43 +28,43 @@ ECLIPSE_EXE=${ECLIPSE_EXE:-/shared/eclipse/sdk/eclipse43RC2/eclipse/eclipse} if [ ! -n ${ECLIPSE_EXE} -a -x ${ECLIPSE_EXE} ] then - echo "ERROR: ECLIPSE_EXE is not defined or not executable: ${ECLIPSE_EXE}" - exit 2 + echo "ERROR: ECLIPSE_EXE is not defined or not executable: ${ECLIPSE_EXE}" + exit 2 fi BUILDFILE=$1 if [[ -z "${BUILDFILE}" ]] then - printf "\n\t%s\t%s\n" "ERROR" "must provide ant file to perform composite update as first argument" - exit 1 + printf "\n\t%s\t%s\n" "ERROR" "must provide ant file to perform composite update as first argument" + exit 1 fi if [[ ! -e "${BUILDFILE}" ]] then - printf "\n\t%s\t%s\n" "ERROR" "BUILDFILE does not exist: ${BUILDFILE}" - exit 1 + printf "\n\t%s\t%s\n" "ERROR" "BUILDFILE does not exist: ${BUILDFILE}" + exit 1 fi BUILDFILESTR="-f ${BUILDFILE}" repodir=$2 if [[ -z "${repodir}" ]] then - printf "\n\t%s\t%s\n" "ERROR" "repodir must be specified as second argument" - exit 1 + printf "\n\t%s\t%s\n" "ERROR" "repodir must be specified as second argument" + exit 1 fi if [[ ! -e "${repodir}" ]] then - printf "\n\t%s\t%s\n" "ERROR" "repodir does not exist: ${repodir}" - exit 1 + printf "\n\t%s\t%s\n" "ERROR" "repodir does not exist: ${repodir}" + exit 1 else - REPODIRSTR="-Drepodir=${repodir}" + REPODIRSTR="-Drepodir=${repodir}" fi complocation=$3 if [[ -z "${complocation}" ]] then - printf "\n\t%s\t%s\n" "WARNING" "complocation not specified. Assumed to be in ant xml file." + printf "\n\t%s\t%s\n" "WARNING" "complocation not specified. Assumed to be in ant xml file." else - COMPLOCATIONSTR="-Dcomplocation=${complocation}" + COMPLOCATIONSTR="-Dcomplocation=${complocation}" fi @@ -76,26 +76,26 @@ ${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -console -data $devworkspac RC=$? if [[ $RC != 0 ]] then - echo "error occured in composite operation RC: $RC" - exit $RC + echo "error occured in composite operation RC: $RC" + exit $RC fi # sanity check existence of directory or else risk removing wrong stuff compdir="${repodir}/${complocation}" if [[ -n {$complocation} && -d ${compdir} ]] then - # comment out/echo for now, since we don't expect to use - # this and echo can serve as a test if working as intended. - # otherwise, we'd remove whole repo! - echo "rm -fr ${compdir}" - RC=$? - if [[ $RC != 0 ]] - then - echo "remove failed: ${compdir}: $RC" - exit $RC - fi + # comment out/echo for now, since we don't expect to use + # this and echo can serve as a test if working as intended. + # otherwise, we'd remove whole repo! + echo "rm -fr ${compdir}" + RC=$? + if [[ $RC != 0 ]] + then + echo "remove failed: ${compdir}: $RC" + exit $RC + fi else - echo "WARNING: expected complocation directory did not exist. Nothing removed. Assumed done in ant xml file or remove manually." + echo "WARNING: expected complocation directory did not exist. Nothing removed. Assumed done in ant xml file or remove manually." fi exit 0 diff --git a/production/sdk/wgetFresh.sh b/production/sdk/wgetFresh.sh index e6ff48de0..8501d231d 100755 --- a/production/sdk/wgetFresh.sh +++ b/production/sdk/wgetFresh.sh @@ -32,14 +32,14 @@ differs=`diff wgetFresh.NEW.sh wgetFresh.sh` if [ -z "${differs}" ] then - # 'new' not different from existing, so remove 'new' one - rm wgetFresh.NEW.sh + # 'new' not different from existing, so remove 'new' one + rm wgetFresh.NEW.sh else - echo " " - echo " wgetFresh.sh has changed. Compare with and consider replacing with wgetFresh.NEW.sh" - echo " " - echo "differences: ${differs}" - echo " " + echo " " + echo " wgetFresh.sh has changed. Compare with and consider replacing with wgetFresh.NEW.sh" + echo " " + echo "differences: ${differs}" + echo " " fi chmod ug+x *.sh diff --git a/production/sdk/wgetFreshSDKdir.sh b/production/sdk/wgetFreshSDKdir.sh index a7da286f9..94528e2dc 100755 --- a/production/sdk/wgetFreshSDKdir.sh +++ b/production/sdk/wgetFreshSDKdir.sh @@ -44,9 +44,9 @@ checkForErrorExit $? "could not unzip master?!" # will need to manually cleanup dated backups occasionally if [[ -d sdkTempSave ]] then - NOWDATE=`date -u +%Y%m%d%H%M` - NEWNAME=sdkTempSave${NOWDATE} - mv sdkTempSave ${NEWNAME} + NOWDATE=`date -u +%Y%m%d%H%M` + NEWNAME=sdkTempSave${NOWDATE} + mv sdkTempSave ${NEWNAME} fi mv sdk sdkTempSave diff --git a/production/tag-build-input.sh b/production/tag-build-input.sh index 2efa6ccb7..34cf26628 100644 --- a/production/tag-build-input.sh +++ b/production/tag-build-input.sh @@ -2,14 +2,14 @@ # if [ $# -ne 1 ]; then - echo USAGE: $0 env_file - exit 1 + echo USAGE: $0 env_file + exit 1 fi if [ ! -r "$1" ]; then - echo "$1" cannot be read - echo USAGE: $0 env_file - exit 1 + echo "$1" cannot be read + echo USAGE: $0 env_file + exit 1 fi SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)} @@ -26,7 +26,7 @@ aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" ) repositories=$( echo $STREAMS_PATH/repositories${PATCH_BUILD}.txt ) if [ -z "$BUILD_ID" ]; then - BUILD_ID=$(fn-build-id "$BUILD_TYPE" ) + BUILD_ID=$(fn-build-id "$BUILD_TYPE" ) fi diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux/equinoxp2tests.properties b/production/testScripts/configuration/sdk.tests/testConfigs/linux/equinoxp2tests.properties index c0b536ee0..30c9b8af4 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/linux/equinoxp2tests.properties +++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux/equinoxp2tests.properties @@ -6,4 +6,4 @@ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx=@exe org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux=@executionDir@/eclipse-platform-@buildId@-linux-gtk-x86_64.tar.gz org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32=@executionDir@\\eclipse-platform-@buildId@-win32.zip org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx=@executionDir@/eclipse-platform-@buildId@-macosx-cocoa.tar.gz -org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.1/R-4.1.2-201202230900
\ No newline at end of file +org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.1/R-4.1.2-201202230900 diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh b/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh index c5ed7b3ac..28a402913 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh +++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux/testAll.sh @@ -34,9 +34,9 @@ echo "buildId in testAll: ${buildId}" if [[ -n "${extdir}" ]] then -./runtests.sh -os linux -ws gtk -arch $eclipseArch -extdirprop "${extdir}" -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/linux.gtk.x86_64_8.0_consolelog.txt + ./runtests.sh -os linux -ws gtk -arch $eclipseArch -extdirprop "${extdir}" -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/linux.gtk.x86_64_8.0_consolelog.txt else -./runtests.sh -os linux -ws gtk -arch $eclipseArch -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/linux.gtk.x86_64_8.0_consolelog.txt + ./runtests.sh -os linux -ws gtk -arch $eclipseArch -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/linux.gtk.x86_64_8.0_consolelog.txt fi diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux/testing.properties b/production/testScripts/configuration/sdk.tests/testConfigs/linux/testing.properties index 8a332d209..3951d22a8 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/linux/testing.properties +++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux/testing.properties @@ -39,4 +39,4 @@ testExecutable=bash testScript=./testAll.sh #arguments to $(testScript) -args=
\ No newline at end of file +args= diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux32/equinoxp2tests.properties b/production/testScripts/configuration/sdk.tests/testConfigs/linux32/equinoxp2tests.properties index f09007165..4455946df 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/linux32/equinoxp2tests.properties +++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux32/equinoxp2tests.properties @@ -6,4 +6,4 @@ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx=@exe org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux=@executionDir@/eclipse-platform-@buildId@-linux-gtk.tar.gz org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32=@executionDir@\\eclipse-platform-@buildId@-win32.zip org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx=@executionDir@/eclipse-platform-@buildId@-macosx-cocoa.tar.gz -org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.1/R-4.1.2-201202230900
\ No newline at end of file +org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.1/R-4.1.2-201202230900 diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux32/testAll.sh b/production/testScripts/configuration/sdk.tests/testConfigs/linux32/testAll.sh index e17129c58..4be35d1c7 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/linux32/testAll.sh +++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux32/testAll.sh @@ -33,9 +33,9 @@ echo "propertyFile in testAll: ${propertyFile}" if [[ -n "${extdir}" ]] then -./runtests.sh -os linux -ws gtk -arch $eclipseArch -extdirprop "${extdir}" -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/linux.gtk.x86_8.0_consolelog.txt + ./runtests.sh -os linux -ws gtk -arch $eclipseArch -extdirprop "${extdir}" -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/linux.gtk.x86_8.0_consolelog.txt else -./runtests.sh -os linux -ws gtk -arch $eclipseArch -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/linux.gtk.x86_8.0_consolelog.txt + ./runtests.sh -os linux -ws gtk -arch $eclipseArch -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/linux.gtk.x86_8.0_consolelog.txt fi diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/linux32/testing.properties b/production/testScripts/configuration/sdk.tests/testConfigs/linux32/testing.properties index ac6c6b9ee..ff17798d8 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/linux32/testing.properties +++ b/production/testScripts/configuration/sdk.tests/testConfigs/linux32/testing.properties @@ -39,4 +39,4 @@ testExecutable=bash testScript=./testAll.sh #arguments to $(testScript) -args=
\ No newline at end of file +args= diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macmini/equinoxp2tests.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macmini/equinoxp2tests.properties index f09007165..4455946df 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/macmini/equinoxp2tests.properties +++ b/production/testScripts/configuration/sdk.tests/testConfigs/macmini/equinoxp2tests.properties @@ -6,4 +6,4 @@ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx=@exe org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux=@executionDir@/eclipse-platform-@buildId@-linux-gtk.tar.gz org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32=@executionDir@\\eclipse-platform-@buildId@-win32.zip org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx=@executionDir@/eclipse-platform-@buildId@-macosx-cocoa.tar.gz -org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.1/R-4.1.2-201202230900
\ No newline at end of file +org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.1/R-4.1.2-201202230900 diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macmini/testAll.sh b/production/testScripts/configuration/sdk.tests/testConfigs/macmini/testAll.sh index 858675d11..ef4fa01f3 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/macmini/testAll.sh +++ b/production/testScripts/configuration/sdk.tests/testConfigs/macmini/testAll.sh @@ -33,7 +33,7 @@ echo "propertyFile in testAll: ${propertyFile}" if [[ -n "${extdir}" ]] then -./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -extdirprop "${extdir}" -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/macosx.cocoa.x86_7.0_consolelog.txt + ./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -extdirprop "${extdir}" -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/macosx.cocoa.x86_7.0_consolelog.txt else -./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/macosx.cocoa.x86_7.0_consolelog.txt + ./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/macosx.cocoa.x86_7.0_consolelog.txt fi diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macmini/testing.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macmini/testing.properties index 4cbdac382..5d68a9aae 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/macmini/testing.properties +++ b/production/testScripts/configuration/sdk.tests/testConfigs/macmini/testing.properties @@ -38,4 +38,4 @@ testExecutable=bash testScript=./testAll.sh #arguments to $(testScript) -args=
\ No newline at end of file +args= diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/equinoxp2tests.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/equinoxp2tests.properties index 12b995df5..d3d6a5770 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/equinoxp2tests.properties +++ b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/equinoxp2tests.properties @@ -6,4 +6,4 @@ org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_ org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux=@executionDir@/eclipse-platform-@buildId@-linux-gtk.tar.gz org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32=@executionDir@\\eclipse-platform-@buildId@-win32.zip org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx=@executionDir@/eclipse-platform-@buildId@-macosx-cocoa-x86_64.tar.gz -org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.1/R-4.1.2-201202230900
\ No newline at end of file +org.eclipse.equinox.p2.tests.last.release.build.repo=http\://download.eclipse.org/eclipse/updates/4.1/R-4.1.2-201202230900 diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh index af2883797..7ad15b1a5 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh +++ b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testAll.sh @@ -34,7 +34,7 @@ cat ${propertyFile} if [[ -n "${extdir}" ]] then -./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -extdirprop "${extdir}" -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/macosx.cocoa.x86_64_7.0_consolelog.txt + ./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -extdirprop "${extdir}" -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/macosx.cocoa.x86_64_7.0_consolelog.txt else -./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/macosx.cocoa.x86_64_7.0_consolelog.txt + ./runtestsmac.sh -os macosx -ws cocoa -arch $eclipseArch -vm "${vmcmd}" -properties ${propertyFile} $* > results/consolelogs/macosx.cocoa.x86_64_7.0_consolelog.txt fi diff --git a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testing.properties b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testing.properties index a9fea10f9..c31447c89 100644 --- a/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testing.properties +++ b/production/testScripts/configuration/sdk.tests/testConfigs/macosx/testing.properties @@ -19,7 +19,7 @@ testFramework=${testDir}/eclipse-Automated-Tests-${buildId}.zip #name of runtime to install and test runtime=eclipse-SDK-${buildId}-macosx-cocoa.tar.gz - + #name of deltaPack to install and test runtimeDeltapack=eclipse-${buildId}-delta-pack.zip @@ -38,4 +38,4 @@ testExecutable=bash testScript=./testAll.sh #arguments to $(testScript) -args=
\ No newline at end of file +args= diff --git a/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh b/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh index 6ad6baa14..45dec3cfb 100644 --- a/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh +++ b/production/testScripts/configuration/sdk.tests/testScripts/runtests.sh @@ -38,27 +38,27 @@ usage="usage: $0 -os <osType> -ws <windowingSystemType> -arch <architecture> [-n # proces command line arguments while [ $# -gt 0 ] do - case "${1}" in - -dir) - dir="${2}"; shift;; - -os) - os="${2}"; shift;; - -ws) - ws="${2}"; shift;; - -arch) - arch="${2}"; shift;; - -noclean) - installmode="noclean";; - -properties) - properties="-propertyfile ${2}";shift;; - -extdirprop) - extdirproperty="-Djava.ext.dirs=${2}";shift;; - -vm) - vmcmd="${2}"; shift;; - *) - tests=$tests\ ${1};; - esac - shift + case "${1}" in + -dir) + dir="${2}"; shift;; + -os) + os="${2}"; shift;; + -ws) + ws="${2}"; shift;; + -arch) + arch="${2}"; shift;; + -noclean) + installmode="noclean";; + -properties) + properties="-propertyfile ${2}";shift;; + -extdirprop) + extdirproperty="-Djava.ext.dirs=${2}";shift;; + -vm) + vmcmd="${2}"; shift;; + *) + tests=$tests\ ${1};; + esac + shift done echo "Specified test targets (if any): ${tests}" @@ -68,20 +68,20 @@ echo "Specified ext dir (if any): ${extdirproperty}" # for *nix systems, os, ws and arch values must be specified if [ "x$os" = "x" ] then - echo >&2 "$usage" - exit 1 + echo >&2 "$usage" + exit 1 fi if [ "x$ws" = "x" ] then - echo >&2 "$usage" - exit 1 + echo >&2 "$usage" + exit 1 fi if [ "x$arch" = "x" ] then - echo >&2 "$usage" - exit 1 + echo >&2 "$usage" + exit 1 fi #necessary when invoking this script through rsh @@ -89,9 +89,9 @@ cd $dir if [ ! -r eclipse ] then - tar -xzf eclipse-SDK-*.tar.gz - # note, the file pattern to match, must not start with */plugins because there is no leading '/' in the zip file, since they are repos. - unzip -qq -o -C eclipse-junit-tests-*.zip plugins/org.eclipse.test* -d eclipse/dropins/ + tar -xzf eclipse-SDK-*.tar.gz + # note, the file pattern to match, must not start with */plugins because there is no leading '/' in the zip file, since they are repos. + unzip -qq -o -C eclipse-junit-tests-*.zip plugins/org.eclipse.test* -d eclipse/dropins/ fi # run tests @@ -112,7 +112,7 @@ echo "Window Manager processes running: $wmpss" echo # in this case, do not "--replace" any existing ones, for this DISPLAY -# added bit bucket for errors, in attempt to keep from filling up Hudson log with "warnings", such as hundreds of +# added bit bucket for errors, in attempt to keep from filling up Hudson log with "warnings", such as hundreds of # [exec] Window manager warning: Buggy client sent a _NET_ACTIVE_WINDOW message with a timestamp of 0 for 0x800059 (Java - Ecl) # [exec] Window manager warning: meta_window_activate called by a pager with a 0 timestamp; the pager needs to be fixed. # @@ -121,25 +121,25 @@ METACITYRC=$? METACITYPID=$! if [[ $METACITYRC == 0 ]] -then +then + # TODO: we may want to kill the one we started, at end of tests? + echo $METACITYPID > epmetacity.pid + echo " metacity (with no --replace) started ok. PID: $METACITYPID" +else + echo " metacity (with no --replace) failed. RC: $METACITYRC" + # This should not interfere with other jobs running on Hudson, the DISPLAY should be "ours". + metacity --display=$DISPLAY --replace --sm-disable & + METACITYRC=$? + METACITYPID=$! + if [[ $METACITYRC == 0 ]] + then # TODO: we may want to kill the one we started, at end of tests? echo $METACITYPID > epmetacity.pid - echo " metacity (with no --replace) started ok. PID: $METACITYPID" -else - echo " metacity (with no --replace) failed. RC: $METACITYRC" - # This should not interfere with other jobs running on Hudson, the DISPLAY should be "ours". - metacity --display=$DISPLAY --replace --sm-disable & - METACITYRC=$? - METACITYPID=$! - if [[ $METACITYRC == 0 ]] - then - # TODO: we may want to kill the one we started, at end of tests? - echo $METACITYPID > epmetacity.pid - echo " metacity (with --replace) started ok. PID: $METACITYPID" - else - echo " metacity (with --replace) failed. RC: $METACITYRC" - echo " giving up. But continuing tests" - fi + echo " metacity (with --replace) started ok. PID: $METACITYPID" + else + echo " metacity (with --replace) failed. RC: $METACITYRC" + echo " giving up. But continuing tests" + fi fi #if [[ -z $wmpss ]] #then @@ -170,7 +170,7 @@ echo "extdirproperty in runtest: ${extdirproperty}" # -Dtimeout=300000 "${ANT_OPTS}" if [[ ! -z "${extdirproperty}" ]] then - $vmcmd "${extdirproperty}" -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger + $vmcmd "${extdirproperty}" -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger else - $vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger + $vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger fi diff --git a/production/testScripts/configuration/sdk.tests/testScripts/runtestsmac.sh b/production/testScripts/configuration/sdk.tests/testScripts/runtestsmac.sh index 119156b6c..37194f525 100644 --- a/production/testScripts/configuration/sdk.tests/testScripts/runtestsmac.sh +++ b/production/testScripts/configuration/sdk.tests/testScripts/runtestsmac.sh @@ -13,8 +13,8 @@ source localTestsProperties.shsource 2>/dev/null #vmcmd=/shared/common/jdk-1.6.x86_64/jre/bin/java if [[ -z "{vmcmd}" ]] then - echo "vmcmd was unexpectly undefined, so using 'java'." - vmcmd=java + echo "vmcmd was unexpectly undefined, so using 'java'." + vmcmd=java fi echo "vmcmd: $vmcmd" @@ -46,27 +46,27 @@ usage="usage: $0 -os <osType> -ws <windowingSystemType> -arch <architecture> [-n # proces command line arguments while [ $# -gt 0 ] do - case "${1}" in - -dir) - dir="${2}"; shift;; - -os) - os="${2}"; shift;; - -ws) - ws="${2}"; shift;; - -arch) - arch="${2}"; shift;; - -noclean) - installmode="noclean";; - -properties) - properties="-propertyfile ${2}";shift;; - -extdirprop) - extdirproperty="-Djava.ext.dirs=${2}";shift;; - -vm) - vmcmd="${2}"; shift;; - *) - tests=$tests\ ${1};; - esac - shift + case "${1}" in + -dir) + dir="${2}"; shift;; + -os) + os="${2}"; shift;; + -ws) + ws="${2}"; shift;; + -arch) + arch="${2}"; shift;; + -noclean) + installmode="noclean";; + -properties) + properties="-propertyfile ${2}";shift;; + -extdirprop) + extdirproperty="-Djava.ext.dirs=${2}";shift;; + -vm) + vmcmd="${2}"; shift;; + *) + tests=$tests\ ${1};; + esac + shift done echo "Specified test targets (if any): ${tests}" @@ -76,20 +76,20 @@ echo "Specified ext dir (if any): ${extdirproperty}" # for *nix systems, os, ws and arch values must be specified if [ "x$os" = "x" ] then - echo >&2 "$usage" - exit 1 + echo >&2 "$usage" + exit 1 fi if [ "x$ws" = "x" ] then - echo >&2 "$usage" - exit 1 + echo >&2 "$usage" + exit 1 fi if [ "x$arch" = "x" ] then - echo >&2 "$usage" - exit 1 + echo >&2 "$usage" + exit 1 fi #necessary when invoking this script through rsh @@ -97,9 +97,9 @@ cd $dir if [[ ! -r eclipse ]] then - tar -xzf eclipse-SDK-*.tar.gz - # note, the file pattern to match, must not start with */plugins because there is no leading '/' in the zip file, since they are repos. - unzip -qq -o -C eclipse-junit-tests-*.zip plugins/org.eclipse.test* -d eclipse/dropins/ + tar -xzf eclipse-SDK-*.tar.gz + # note, the file pattern to match, must not start with */plugins because there is no leading '/' in the zip file, since they are repos. + unzip -qq -o -C eclipse-junit-tests-*.zip plugins/org.eclipse.test* -d eclipse/dropins/ fi @@ -110,17 +110,17 @@ launcher=`ls eclipse/plugins/org.eclipse.equinox.launcher_*.jar` # for slight improvement in security. Bug 387747 # so I have commented out most such probes, so they won't be routine. - #echo "list all environment variables in effect as tests start" - #printenv +#echo "list all environment variables in effect as tests start" +#printenv echo "properties: $properties" # -Dtimeout=300000 "${ANT_OPTS}" - if [[ ! -z "${extdirproperty}" ]] - then - $vmcmd "${extdirproperty}" -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger - else - $vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger - fi +if [[ ! -z "${extdirproperty}" ]] +then + $vmcmd "${extdirproperty}" -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger +else + $vmcmd -Dosgi.os=$os -Dosgi.ws=$ws -Dosgi.arch=$arch -jar $launcher -data workspace -application org.eclipse.ant.core.antRunner -file ${PWD}/test.xml $tests -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $properties -logger org.apache.tools.ant.DefaultLogger +fi diff --git a/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh b/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh index 804883aa1..f827f37b0 100755 --- a/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh +++ b/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh @@ -1,23 +1,23 @@ #!/usr/bin/env bash -# Utility to test the test.xml file. It's intended to allow rapid confirmation +# Utility to test the test.xml file. It's intended to allow rapid confirmation # that the test.xml file ends up "computing" correct values, for various versions -# of java and ant. +# of java and ant. -# In particular, ant cant be invoked with one version of java, but another version -# of java used to actually run the tests. +# In particular, ant cant be invoked with one version of java, but another version +# of java used to actually run the tests. # Currently the file 'testing.properties' must be copied as peer of test.xml ... simply for -# its absence to not cause an error. +# its absence to not cause an error. # Typically, to simulate production builds (tests) on Hudson, a 'vm.properties' tests will -# also be present, where alternative, specific VMs could be specified. (This allows, for example, -# the same Hudson setup to test Java 6, 7, or 8 (no matter what VM the ant task was +# also be present, where alternative, specific VMs could be specified. (This allows, for example, +# the same Hudson setup to test Java 6, 7, or 8 (no matter what VM the ant task was # started with. -# In addition to the console output. which should be captured, with something like +# In addition to the console output. which should be captured, with something like # ./testTextXMLScript.sh | tee testoutput.txt -# some data or set-up files will be created as they normally would if running the real tests. +# some data or set-up files will be created as they normally would if running the real tests. # The can be checked to be sure they are correct, and in correct (relative) locations. # unset some common variables which we don't want (or, set ourselves) @@ -29,15 +29,15 @@ unset JAVA_BINDIR unset JRE_HOME -# Different versions of Ant are specified here in test script, just to confirm -# nothing is specific to any recent version of ant. (Though, some of the machines +# Different versions of Ant are specified here in test script, just to confirm +# nothing is specific to any recent version of ant. (Though, some of the machines # have ant 1.6 set as 'default'!) export ANT_HOME=/shared/common/apache-ant-1.7.1 #export ANT_HOME=/shared/common/apache-ant-1.8.4/ #export ANT_HOME=/shared/common/apache-ant-1.9.2 -# JAVA_HOME is, at least, what runs the ant instance. If no 'jvm' option is specified, -# it also becomes the instance that runs the tests. +# JAVA_HOME is, at least, what runs the ant instance. If no 'jvm' option is specified, +# it also becomes the instance that runs the tests. #export JAVA_HOME=/shared/common/jdk1.5.0-latest #export JAVA_HOME=/shared/common/jdk1.6.0-latest #export JAVA_HOME=/shared/common/jdk1.7.0-latest @@ -47,9 +47,9 @@ export JAVA_HOME=/shared/common/ibm-java-i386-70 export PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:/usr/local/bin:/usr/bin:/bin:${HOME}/bin -# There are a number of test-<something> methods in test xml which, by convention, mean +# There are a number of test-<something> methods in test xml which, by convention, mean # to simply test the test script itself. The test-all target runs all of those tests. -#ant -f test.xml test-all +#ant -f test.xml test-all ant -f test.xml test-all -propertyfile vm.properties diff --git a/production/testScripts/configuration/streamSpecific-build.properties b/production/testScripts/configuration/streamSpecific-build.properties index b45ac9cdd..772dc4b13 100644 --- a/production/testScripts/configuration/streamSpecific-build.properties +++ b/production/testScripts/configuration/streamSpecific-build.properties @@ -4,34 +4,34 @@ # once "releng tests" are restarted or investigated. # But, perhaps it could or should be used more effectively? -# purely title or identifier for display, to help confirm right file -# is being retrived and used. +# purely title or identifier for display, to help confirm right file +# is being retrived and used. streamSpecificPropertiesTitle="Properties for 4.4.0 builds and tests" -# emfRepoURL should NOT be defined in 38 builds, so the +# emfRepoURL should NOT be defined in 38 builds, so the # builder will know to "skip" tasks related to EMF -# Note: this URL needs to be updated everyone milestone/RC when ever there is a +# Note: this URL needs to be updated everyone milestone/RC when ever there is a # new version to pick up. #emfRepoURL=http://download.eclipse.org/modeling/emf/emf/updates/2.8/base/R201206060717 #emfRepoURL=http://download.eclipse.org/modeling/emf/emf/updates/2.9milestones/base/S201212130932 -# TODO: we could likely get rid of this section, +# TODO: we could likely get rid of this section, # now that we have ${eclipseStreamMajor} and ${eclipseStreamMinor} available in main scripts -# (but, we'd still need _this_ file anyway, so can improve these repo location variables later. -p2repoN=http://@localmirror@/eclipse/updates/4.4-N-builds -p2repoI=http://@localmirror@/eclipse/updates/4.4-I-builds -p2repoM=http://@localmirror@/eclipse/updates/4.4-M-builds -p2repoNPath=/eclipse/updates/4.4-N-builds -p2repoIPath=/eclipse/updates/4.4-I-builds -p2repoMPath=/eclipse/updates/4.3-M-builds -p2repopreviousR=http://@localmirror@/eclipse/updates/4.3/R-4.3-201306052000 -p2repoXPath=/eclipse/updates/4.4-X-builds +# (but, we'd still need _this_ file anyway, so can improve these repo location variables later. + p2repoN=http://@localmirror@/eclipse/updates/4.4-N-builds + p2repoI=http://@localmirror@/eclipse/updates/4.4-I-builds + p2repoM=http://@localmirror@/eclipse/updates/4.4-M-builds + p2repoNPath=/eclipse/updates/4.4-N-builds + p2repoIPath=/eclipse/updates/4.4-I-builds + p2repoMPath=/eclipse/updates/4.3-M-builds + p2repopreviousR=http://@localmirror@/eclipse/updates/4.3/R-4.3-201306052000 + p2repoXPath=/eclipse/updates/4.4-X-builds # Note: API tests needs the _base_ of previous release, and also the previous service release # Bug 378587 - update releng tests (data) to go work against previous release # Bug 380033 - temp fix to hard code 'archive.eclipse.org' for now -apiTestsPreviousBaseDLBaseURL=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.1-201106201631 -apiTestsPreviousBaseWin32Filename=eclipse-SDK-4.1-win32.zip -apiTestsPreviousRefererenceBaseDLBaseURL=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.1.2-201202230900 -apiTestsPreviousRefererenceWin32Filename=eclipse-SDK-4.1.2-win32.zip + apiTestsPreviousBaseDLBaseURL=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.1-201106201631 + apiTestsPreviousBaseWin32Filename=eclipse-SDK-4.1-win32.zip + apiTestsPreviousRefererenceBaseDLBaseURL=http://${ARCHIVE_HOST}/eclipse/downloads/drops4/R-4.1.2-201202230900 + apiTestsPreviousRefererenceWin32Filename=eclipse-SDK-4.1.2-win32.zip diff --git a/production/testScripts/hudsonBootstrap/getEBuilder.sh b/production/testScripts/hudsonBootstrap/getEBuilder.sh index 611e212eb..627938fee 100644 --- a/production/testScripts/hudsonBootstrap/getEBuilder.sh +++ b/production/testScripts/hudsonBootstrap/getEBuilder.sh @@ -9,26 +9,26 @@ if [[ -z "${WORKSPACE}" ]] then - echo "WORKSPACE not supplied, will assume current directory" - WORKSPACE=${PWD} + echo "WORKSPACE not supplied, will assume current directory" + WORKSPACE=${PWD} else - if [[ ! -d "${WORKSPACE}" ]] - then - echo "ERROR: WORKSPACE did not exist. Perhaps you meant its parent?" - exit 1 - fi + if [[ ! -d "${WORKSPACE}" ]] + then + echo "ERROR: WORKSPACE did not exist. Perhaps you meant its parent?" + exit 1 + fi fi if [[ -z "${EBUILDER_HASH}" ]] -then - echo "EBUILDER HASH, BRANCH, or TAG was not supplied, assuming 'master'" - EBUILDER_HASH=master +then + echo "EBUILDER HASH, BRANCH, or TAG was not supplied, assuming 'master'" + EBUILDER_HASH=master fi if [[ -z "${BUILD_KIND}" ]] then - echo "BUILD_KIND not supplied, assuming CBI" - BUILD_KIND=CBI + echo "BUILD_KIND not supplied, assuming CBI" + BUILD_KIND=CBI fi # remove just in case left from previous failed run @@ -36,29 +36,29 @@ rm ebuilder.zip 2>/dev/null rm -fr tempebuilder 2>/dev/null if [[ "${BUILD_KIND}" == "CBI" ]] -then - EBUILDER=eclipse.platform.releng.aggregator - TARGETNAME=eclipse.platform.releng.aggregator - ESCRIPT_LOC=${EBUILDER}/production/testScripts -elif [[ "$BUILD_KIND" == "PDE" ]] then - EBUILDER=eclipse.platform.releng.eclipsebuilder - TARGETNAME=org.eclipse.releng.eclipsebuilder - ESCRIPT_LOC=${TARGETNAME} -else - echo "ERROR: Unexpected value of BUILD_KIND: ${BUILD_KIND}" - exit 1 + EBUILDER=eclipse.platform.releng.aggregator + TARGETNAME=eclipse.platform.releng.aggregator + ESCRIPT_LOC=${EBUILDER}/production/testScripts +elif [[ "$BUILD_KIND" == "PDE" ]] +then + EBUILDER=eclipse.platform.releng.eclipsebuilder + TARGETNAME=org.eclipse.releng.eclipsebuilder + ESCRIPT_LOC=${TARGETNAME} +else + echo "ERROR: Unexpected value of BUILD_KIND: ${BUILD_KIND}" + exit 1 fi wget -O ebuilder.zip --no-verbose http://git.eclipse.org/c/platform/${EBUILDER}.git/snapshot/${EBUILDER}-${EBUILDER_HASH}.zip 2>&1 unzip -q ebuilder.zip -d tempebuilder mkdir -p ${WORKSPACE}/$TARGETNAME rsync --recursive "tempebuilder/${EBUILDER}-${EBUILDER_HASH}/" "${WORKSPACE}/${TARGETNAME}/" -rccode=$? +rccode=$? if [[ $rccode != 0 ]] then - echo "ERROR: rsync did not complete normally.rccode: $rccode" - exit $rccode + echo "ERROR: rsync did not complete normally.rccode: $rccode" + exit $rccode fi # copy to well-known location so subsequent steps do not need to know which ebuilder they came from diff --git a/production/testScripts/startTests.sh b/production/testScripts/startTests.sh index b4aaa2e0a..cf48da366 100755 --- a/production/testScripts/startTests.sh +++ b/production/testScripts/startTests.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# this buildeclipse.shsource file is to ease local builds to override some variables. +# this buildeclipse.shsource file is to ease local builds to override some variables. # It should not be used for production builds. source buildeclipse.shsource 2>/dev/null export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds} @@ -14,61 +14,61 @@ export ANT_HOME=/shared/common/apache-ant-1.9.2 function usage () { - printf "\t\t%s\n" "usage: " - printf "\t\t%s\n" "$( basename $0 ) eclipseStream buildId" - printf "\t\t\t%s\n" "where " - printf "\t\t\t%s\n" "eclipseStream == 4.3.0, 3.8.2, etc. " - printf "\t\t\t%s\n" "buildId == M20120705-1200, IM20121005-0800, etc. " - printf "\t\t\t\t%s\n" "or, provide those parameters in buildParams.shshource on search path" + printf "\t\t%s\n" "usage: " + printf "\t\t%s\n" "$( basename $0 ) eclipseStream buildId" + printf "\t\t\t%s\n" "where " + printf "\t\t\t%s\n" "eclipseStream == 4.3.0, 3.8.2, etc. " + printf "\t\t\t%s\n" "buildId == M20120705-1200, IM20121005-0800, etc. " + printf "\t\t\t\t%s\n" "or, provide those parameters in buildParams.shshource on search path" } # compute main (left part) of download site function dlpath() { - eclipseStream=$1 - if [[ -z "${eclipseStream}" ]] - then - printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argumnet, for this function $(basename $0)" - return 1; - fi - - - buildId=$2 - if [[ -z "${buildId}" ]] - then - printf "\n\n\t%s\n\n" "ERROR: Must provide buildId as second argumnet, for this function $(basename $0)" - return 1; - fi - - BUILD_KIND=$3 - if [[ -z "${BUILD_KIND}" ]] - then - printf "\n\n\t%s\n\n" "ERROR: Must provide BUILD_KIND as third argumnet, for this function $(basename $0)" - return 1; - fi - - - - eclipseStreamMajor=${eclipseStream:0:1} - buildType=${buildId:0:1} - - #CBI is "normal" one and can add clauses in future for special cases - if [[ "${BUILD_KIND}" == 'CBI' ]] - then - dropsuffix="" - else - dropsuffix="pdebased" - fi - - pathToDL=eclipse/downloads/drops - if (( $eclipseStreamMajor > 3 )) - then - pathToDL=$pathToDL$eclipseStreamMajor - fi - - pathToDL=$pathToDL$dropsuffix - - echo $pathToDL + eclipseStream=$1 + if [[ -z "${eclipseStream}" ]] + then + printf "\n\n\t%s\n\n" "ERROR: Must provide eclipseStream as first argumnet, for this function $(basename $0)" + return 1; + fi + + + buildId=$2 + if [[ -z "${buildId}" ]] + then + printf "\n\n\t%s\n\n" "ERROR: Must provide buildId as second argumnet, for this function $(basename $0)" + return 1; + fi + + BUILD_KIND=$3 + if [[ -z "${BUILD_KIND}" ]] + then + printf "\n\n\t%s\n\n" "ERROR: Must provide BUILD_KIND as third argumnet, for this function $(basename $0)" + return 1; + fi + + + + eclipseStreamMajor=${eclipseStream:0:1} + buildType=${buildId:0:1} + + #CBI is "normal" one and can add clauses in future for special cases + if [[ "${BUILD_KIND}" == 'CBI' ]] + then + dropsuffix="" + else + dropsuffix="pdebased" + fi + + pathToDL=eclipse/downloads/drops + if (( $eclipseStreamMajor > 3 )) + then + pathToDL=$pathToDL$eclipseStreamMajor + fi + + pathToDL=$pathToDL$dropsuffix + + echo $pathToDL } @@ -89,42 +89,42 @@ EBUILDER_HASH=${EBUILDER_HASH:-${4}} if [[ -z ${eclipseStream} || -z ${buildId} ]] then - printf "\n\t%s\n" "ERROR: missing required parameters." - usage - exit 1 + printf "\n\t%s\n" "ERROR: missing required parameters." + usage + exit 1 fi if [[ -z "${BUILD_KIND}" ]] then - BUILD_KIND=CBI + BUILD_KIND=CBI fi if [[ -z "${EBUILDER_HASH}" ]] then - EBUILDER_HASH=master + EBUILDER_HASH=master fi # contrary to intuition (and previous behavior, bash 3.1) do NOT use quotes around right side of expression. if [[ "${eclipseStream}" =~ ^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)$ ]] then - eclipseStreamMajor=${BASH_REMATCH[1]} - eclipseStreamMinor=${BASH_REMATCH[2]} - eclipseStreamService=${BASH_REMATCH[3]} + eclipseStreamMajor=${BASH_REMATCH[1]} + eclipseStreamMinor=${BASH_REMATCH[2]} + eclipseStreamService=${BASH_REMATCH[3]} else - printf "\n\t%s\n" "ERROR: eclipseStream, $eclipseStream, must contain major, minor, and service versions." - usage - exit 1 + printf "\n\t%s\n" "ERROR: eclipseStream, $eclipseStream, must contain major, minor, and service versions." + usage + exit 1 fi if [[ "${buildId}" =~ ([MNIXYP]+)([[:digit:]]*)\-([[:digit:]]*) ]] then - # old, simpler way, if we don't do regex and input checkinging - #buildType=${buildId:0:1} - buildType=${BASH_REMATCH[1]} + # old, simpler way, if we don't do regex and input checkinging + #buildType=${buildId:0:1} + buildType=${BASH_REMATCH[1]} else - printf "\n\t%s\n" "ERROR: buildId, $buildId, did not match expected pattern." - usage - exit 1 + printf "\n\t%s\n" "ERROR: buildId, $buildId, did not match expected pattern." + usage + exit 1 fi @@ -141,48 +141,48 @@ echo "EBUILDER_HASH: $EBUILDER_HASH" echo "BUILD_HOME: ${BUILD_HOME}" - if [[ "${BUILD_KIND}" == 'CBI' ]] - then - buildRoot=${BUILD_HOME}/${eclipseStreamMajor}${buildType} - eclipsebuilder=eclipse.platform.releng.aggregator/production/testScripts - dlPath=$( dlpath $eclipseStream $buildId $BUILD_KIND ) - echo "DEBUG dlPath: $dlPath" - buildDropDir=${buildRoot}/siteDir/$dlPath/${buildId} - echo "DEBGUG buildDropDir: $buildDropDir" - builderDropDir=${buildDropDir}/${eclipsebuilder} - echo "DEBUG: builderDropDir: ${builderDropDir}" - else - buildRoot=/shared/eclipse/eclipse${eclipseStreamMajor}${buildType} - # we don't really use this file for PDE build tests. - # if we did, we'd need to fix this up. - #buildDir=${buildRoot}/build - #supportDir=${buildDir}/supportDir - #eclipsebuilder=org.eclipse.releng.eclipsebuilder - #builderDir=${supportDir}/$eclipsebuilder - #$buildRoot=/shared/eclipse/eclipse${eclipseStreamMajor}${buildType} - #$buildDir=${buildRoot}/build - #$supportDir=${buildDir}/supportDir - #$eclipsebuilder=org.eclipse.releng.eclipsebuilder - #$builderDir=${supportDir}/$eclipsebuilder - - # should buildDirectory be set at "main" one from actual build? - #$buildDirectory=${supportDir}/src - - # note, to be consistent, I changed json xml file so it adds buildId to postingDirectory - #$siteDir=${buildRoot}/siteDir - #$postingDirectory=${siteDir}/eclipse/downloads/drops - #$if (( "${eclipseStreamMajor}" > 3 )) - #$then - # $postingDirectory=${siteDir}/eclipse/downloads/drops${eclipseStreamMajor} - #$fi - fi +if [[ "${BUILD_KIND}" == 'CBI' ]] +then + buildRoot=${BUILD_HOME}/${eclipseStreamMajor}${buildType} + eclipsebuilder=eclipse.platform.releng.aggregator/production/testScripts + dlPath=$( dlpath $eclipseStream $buildId $BUILD_KIND ) + echo "DEBUG dlPath: $dlPath" + buildDropDir=${buildRoot}/siteDir/$dlPath/${buildId} + echo "DEBGUG buildDropDir: $buildDropDir" + builderDropDir=${buildDropDir}/${eclipsebuilder} + echo "DEBUG: builderDropDir: ${builderDropDir}" +else + buildRoot=/shared/eclipse/eclipse${eclipseStreamMajor}${buildType} + # we don't really use this file for PDE build tests. + # if we did, we'd need to fix this up. + #buildDir=${buildRoot}/build + #supportDir=${buildDir}/supportDir + #eclipsebuilder=org.eclipse.releng.eclipsebuilder + #builderDir=${supportDir}/$eclipsebuilder + #$buildRoot=/shared/eclipse/eclipse${eclipseStreamMajor}${buildType} + #$buildDir=${buildRoot}/build + #$supportDir=${buildDir}/supportDir + #$eclipsebuilder=org.eclipse.releng.eclipsebuilder + #$builderDir=${supportDir}/$eclipsebuilder + + # should buildDirectory be set at "main" one from actual build? + #$buildDirectory=${supportDir}/src + + # note, to be consistent, I changed json xml file so it adds buildId to postingDirectory + #$siteDir=${buildRoot}/siteDir + #$postingDirectory=${siteDir}/eclipse/downloads/drops + #$if (( "${eclipseStreamMajor}" > 3 )) + #$then + # $postingDirectory=${siteDir}/eclipse/downloads/drops${eclipseStreamMajor} + #$fi +fi echo "DEBUG: invoking test scripts on Hudson" HUDSON_TOKEN=windows2012tests ant \ - -DbuildId=${buildId} \ - -DeclipseStream=${eclipseStream} \ - -DBUILD_KIND=${BUILD_KIND} \ - -DEBUILDER_HASH=${EBUILDER_HASH} \ - -f ${builderDropDir}/invokeTestsJSON.xml + -DbuildId=${buildId} \ + -DeclipseStream=${eclipseStream} \ + -DBUILD_KIND=${BUILD_KIND} \ + -DEBUILDER_HASH=${EBUILDER_HASH} \ + -f ${builderDropDir}/invokeTestsJSON.xml diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh index 04a0cdac0..df03165db 100755 --- a/production/testScripts/updateTestResultsPages.sh +++ b/production/testScripts/updateTestResultsPages.sh @@ -6,37 +6,37 @@ if (( $# < 2 )) then - # usage: - scriptname=$(basename $0) - printf "\n\t%s\n" "This script, $scriptname requires three arguments, in order: " - printf "\t\t%s\t%s\n" "eclipseStream" "(e.g. 4.2.0 or 3.8.0) " - printf "\t\t%s\t%s\n" "buildId" "(e.g. N20120415-2015) " - printf "\t\t%s\t%s\n" "BUILD_KIND" "(e.g. CBI or special case) " - printf "\t%s\n" "for example," - printf "\t%s\n\n" "./$scriptname 4.2.0 N20120415-2015 CBI" - exit 1 + # usage: + scriptname=$(basename $0) + printf "\n\t%s\n" "This script, $scriptname requires three arguments, in order: " + printf "\t\t%s\t%s\n" "eclipseStream" "(e.g. 4.2.0 or 3.8.0) " + printf "\t\t%s\t%s\n" "buildId" "(e.g. N20120415-2015) " + printf "\t\t%s\t%s\n" "BUILD_KIND" "(e.g. CBI or special case) " + printf "\t%s\n" "for example," + printf "\t%s\n\n" "./$scriptname 4.2.0 N20120415-2015 CBI" + exit 1 fi eclipseStream=$1 if [ -z "${eclipseStream}" ] then - echo "must provide eclipseStream as first argumnet, for this function $0" - exit 1 + echo "must provide eclipseStream as first argumnet, for this function $0" + exit 1 fi buildId=$2 if [ -z "${buildId}" ] then - echo "must provide buildId as second argumnet, for this function $0" - exit 1 + echo "must provide buildId as second argumnet, for this function $0" + exit 1 fi # For now only used by CBI BUILD_KIND=$3 if [[ -z "${BUILD_KIND}" ]] then - BUILD_KIND=CBI + BUILD_KIND=CBI fi eclipseStreamMajor=${eclipseStream:0:1} @@ -45,23 +45,23 @@ buildType=${buildId:0:1} pathToDL=eclipse/downloads/drops if (( $eclipseStreamMajor > 3 )) then - pathToDL=eclipse/downloads/drops$eclipseStreamMajor + pathToDL=eclipse/downloads/drops$eclipseStreamMajor fi if [[ "$BUILD_KIND" == "PDE" ]] then - pathToDL="${pathToDL}pdebased" -fi + pathToDL="${pathToDL}pdebased" +fi if [[ "$BUILD_KIND" == "CBI" ]] then - buildRoot=${BUILD_HOME}/${eclipseStreamMajor}${buildType} + buildRoot=${BUILD_HOME}/${eclipseStreamMajor}${buildType} elif [[ "$BUILD_KIND" == "PDE" ]] then - buildRoot=/shared/eclipse/eclipse${eclipseStreamMajor}${buildType} + buildRoot=/shared/eclipse/eclipse${eclipseStreamMajor}${buildType} else - echo "ERROR: BUILD_KIND was not recognized." - exit 1 + echo "ERROR: BUILD_KIND was not recognized." + exit 1 fi siteDir=${buildRoot}/siteDir @@ -69,8 +69,8 @@ siteDir=${buildRoot}/siteDir fromDir=${siteDir}/${pathToDL}/${buildId} if [ ! -d "${fromDir}" ] then - echo "ERROR: fromDir is not a directory? fromDir: ${fromDir}" - exit 1 + echo "ERROR: fromDir is not a directory? fromDir: ${fromDir}" + exit 1 fi @@ -83,24 +83,24 @@ devJRE=$JAVA_HOME/jre/bin/java if [[ ! -n ${devJRE} && -x ${devJRE} ]] then - echo "ERROR: could not find (or execute) JRE where expected: ${devJRE}" - exit 1 + echo "ERROR: could not find (or execute) JRE where expected: ${devJRE}" + exit 1 else - # display version, just to be able to log it. - echo "JRE Location and Version: ${devJRE}" - echo $( $devJRE -version ) + # display version, just to be able to log it. + echo "JRE Location and Version: ${devJRE}" + echo $( $devJRE -version ) fi -# We use a seperate basebuilder for each "drop", to make sure it is specific for that drop, +# We use a seperate basebuilder for each "drop", to make sure it is specific for that drop, # and they won't interfere with each other. basebuilderDir=${fromDir}/org.eclipse.releng.basebuilder aggregatorDir=${fromDir}/eclipse.platform.releng.aggregator EBuilderDir=${aggregatorDir}/eclipse.platform.releng.tychoeclipsebuilder -if [[ ! -d "${basebuilderDir}" ]] +if [[ ! -d "${basebuilderDir}" ]] then - # WORKSPACE, here, is the "Hudson-type" of workspace, not eclipse. - ant -f $EBuilderDir/eclipse/getBaseBuilderAndTools.xml -DWORKSPACE=${fromDir} + # WORKSPACE, here, is the "Hudson-type" of workspace, not eclipse. + ant -f $EBuilderDir/eclipse/getBaseBuilderAndTools.xml -DWORKSPACE=${fromDir} fi # remember, the Eclipse install must match the VM used (e.g. both 64 bit, both 32 bit, etc). @@ -110,8 +110,8 @@ chmod -c +x $ECLIPSE_EXE if [ ! -n ${ECLIPSE_EXE} -a -x ${ECLIPSE_EXE} ] then - echo "ERROR: ECLIPSE_EXE is not defined or not executable: ${ECLIPSE_EXE}" - exit 1 + echo "ERROR: ECLIPSE_EXE is not defined or not executable: ${ECLIPSE_EXE}" + exit 1 fi BUILDFILE=${aggregatorDir}/production/testScripts/genTestIndexes.xml @@ -137,10 +137,10 @@ echo if [ -n ${ECLIPSE_EXE} -a -x ${ECLIPSE_EXE} ] then - ${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -console -data $devworkspace -application org.eclipse.ant.core.antRunner $BUILDFILESTR $BUILDTARGET -vm $devJRE -vmargs $devArgs - RC=$? + ${ECLIPSE_EXE} --launcher.suppressErrors -nosplash -console -data $devworkspace -application org.eclipse.ant.core.antRunner $BUILDFILESTR $BUILDTARGET -vm $devJRE -vmargs $devArgs + RC=$? else - echo "ERROR: ECLIPSE_EXE is not defined to executable eclipse" - RC=1 + echo "ERROR: ECLIPSE_EXE is not defined to executable eclipse" + RC=1 fi exit $RC diff --git a/production/update-build-input.sh b/production/update-build-input.sh index 1f43bcca0..95d023e6d 100644 --- a/production/update-build-input.sh +++ b/production/update-build-input.sh @@ -2,14 +2,14 @@ # if [ $# -ne 1 ]; then - echo USAGE: $0 env_file - exit 1 + echo USAGE: $0 env_file + exit 1 fi if [ ! -r "$1" ]; then - echo "$1" cannot be read - echo USAGE: $0 env_file - exit 1 + echo "$1" cannot be read + echo USAGE: $0 env_file + exit 1 fi SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)} @@ -29,7 +29,7 @@ repoScript=$( echo $SCRIPT_PATH/git-submodule-checkout.sh ) if [ -z "$BUILD_ID" ]; then - BUILD_ID=$(fn-build-id "$BUILD_TYPE" ) + BUILD_ID=$(fn-build-id "$BUILD_TYPE" ) fi |