diff options
| author | David Williams | 2013-01-25 00:09:44 +0000 |
|---|---|---|
| committer | David Williams | 2013-01-25 00:09:44 +0000 |
| commit | bb0db52da28d25cfc524330bfe231c5f27dc23b1 (patch) | |
| tree | 4bf6f3100481cf3ffc0fa876052eea05c7ff271b /scripts | |
| parent | 6fa14308e7ece2bfd7d397e9fdc88ceae5cfc9bf (diff) | |
| download | eclipse.platform.releng.aggregator-bb0db52da28d25cfc524330bfe231c5f27dc23b1.tar.gz eclipse.platform.releng.aggregator-bb0db52da28d25cfc524330bfe231c5f27dc23b1.tar.xz eclipse.platform.releng.aggregator-bb0db52da28d25cfc524330bfe231c5f27dc23b1.zip | |
Bug 398756 - [CBI] Carry PPC changes over to CBI scripts (remove patch)
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/master-build.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/master-build.sh b/scripts/master-build.sh index 719d563f5..230964630 100644 --- a/scripts/master-build.sh +++ b/scripts/master-build.sh @@ -88,8 +88,8 @@ checkForErrorExit $? "Error occurred while getting aggregator" $SCRIPT_PATH/update-build-input.sh $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/update-build-input-ouptut.txt checkForErrorExit $? "Error occurred while updating build input" -if [[ $BUILD_ID =~ [IN] ]] -then +#if [[ $BUILD_ID =~ [IN] ]] +#then # temp hack for bug 398141 and others # apply the pre-created patch from tempPatches #echo "INFO: apply temp patch" @@ -97,9 +97,9 @@ then #echo "DEBUG: pwd: $PWD" #patch -p1 --backup -d $aggDir/rt.equinox.bundles/bundles -i $aggDir/scripts/tempPatches/sbep2.patch #patch -p1 --backup -d $aggDir/eclipse.platform.ui/features -i $aggDir/scripts/tempPatches/e4rcpsource.patch -patch -p1 --backup -d $aggDir/rt.equinox.framework/bundles -i $aggDir/scripts/tempPatches/ppc.patch -checkForErrorExit $? "Error occurred applying patch" -fi +#patch -p1 --backup -d $aggDir/rt.equinox.framework/bundles -i $aggDir/scripts/tempPatches/ppc.patch +#checkForErrorExit $? "Error occurred applying patch" +#fi pushd "$aggDir" git commit -m "Build input for build $BUILD_ID" |