diff options
| author | David Williams | 2013-03-11 21:48:12 +0000 |
|---|---|---|
| committer | David Williams | 2013-03-11 21:48:12 +0000 |
| commit | 7c47c7d90bd94ecf698305bc4fbced81cd968011 (patch) | |
| tree | cb8c9df50db5b3a5ca8d2b9e319fd86acc984f35 | |
| parent | 4a9359815d19049ba039fadf20add923084b16f2 (diff) | |
| download | eclipse.platform.releng.aggregator-7c47c7d90bd94ecf698305bc4fbced81cd968011.tar.gz eclipse.platform.releng.aggregator-7c47c7d90bd94ecf698305bc4fbced81cd968011.tar.xz eclipse.platform.releng.aggregator-7c47c7d90bd94ecf698305bc4fbced81cd968011.zip | |
Bug 385154 - [CBI] JDT core needs a way to produce ecj jar during tycho
builds
| -rwxr-xr-x | production/build-functions.sh | 26 | ||||
| -rw-r--r-- | production/gather-parts.sh | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/production/build-functions.sh b/production/build-functions.sh index 312f9aae1..3e81938cd 100755 --- a/production/build-functions.sh +++ b/production/build-functions.sh @@ -609,6 +609,32 @@ fn-gather-test-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-ecj-jars () +{ + 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" + # TODO: How to avoid hard coding '3.9.0'? Is blob wildcard ('*') safe enouch? + cp org.eclipse.jdt.core-3.9.0-SNAPSHOT-batch-compiler.jar "$BUILD_DIR"/ecj-${BUILD_ID}.jar + cp org.eclipse.jdt.core-3.9.0-SNAPSHOT-sources.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 +} + + + # USAGE: fn-slice-repos BUILD_ID REPO_DIR BUILD_DIR BASEBUILDER_LAUNCHER # BUILD_ID: I20121116-0700 # ANT_SCRIPT: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator diff --git a/production/gather-parts.sh b/production/gather-parts.sh index 39d108793..20d3bd466 100644 --- a/production/gather-parts.sh +++ b/production/gather-parts.sh @@ -47,6 +47,7 @@ fn-gather-sdk "$BUILD_ID" "$aggDir" "$buildDirectory" fn-gather-platform "$BUILD_ID" "$aggDir" "$buildDirectory" fn-gather-swt-zips "$BUILD_ID" "$aggDir" "$buildDirectory" fn-gather-test-zips "$BUILD_ID" "$aggDir" "$buildDirectory" +fn-gather-ecj-jars "$BUILD_ID" "$aggDir" "$buildDirectory" fn-slice-repos "$BUILD_ID" "$aggDir" "$buildDirectory" "$launcherJar" #fn-gather-repo-zips "$BUILD_ID" "$aggDir" "$buildDirectory" |