Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2013-01-29 11:10:51 -0500
committerDavid Williams2013-01-29 11:10:51 -0500
commit448edab6e1bc4a33539ee772f712f84a021381e0 (patch)
tree8c2c027090884b65521b431e2ab3e3bd38c1222c
parent104776ae8c52d44aa39cc83afe97d143dc8e978b (diff)
downloadeclipse.platform.releng.aggregator-448edab6e1bc4a33539ee772f712f84a021381e0.tar.gz
eclipse.platform.releng.aggregator-448edab6e1bc4a33539ee772f712f84a021381e0.tar.xz
eclipse.platform.releng.aggregator-448edab6e1bc4a33539ee772f712f84a021381e0.zip
Bug 399180 - [CBI] restructure aggregator and output directories
-rw-r--r--devutils/description.txt3
-rw-r--r--devutils/submodule_pull_r42x.sh (renamed from scripts/submodule_pull_r42x.sh)0
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template8
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/platform.php.template7
-rwxr-xr-x[-rw-r--r--]production/build-functions.sh (renamed from scripts/build-functions.sh)27
-rw-r--r--production/build_eclipse_org.env (renamed from scripts/build_eclipse_org.env)17
-rw-r--r--production/description.txt6
-rw-r--r--production/doc_options_dirs.txt (renamed from scripts/doc_options_dirs.txt)58
-rw-r--r--production/doc_options_process.sh (renamed from scripts/doc_options_process.sh)0
-rw-r--r--production/gather-parts.sh (renamed from scripts/gather-parts.sh)6
-rw-r--r--production/get-aggregator.sh (renamed from scripts/get-aggregator.sh)2
-rw-r--r--production/git-submodule-checkout.sh (renamed from scripts/git-submodule-checkout.sh)0
-rw-r--r--production/install-parent.sh (renamed from scripts/install-parent.sh)2
-rw-r--r--production/master-build.sh (renamed from scripts/master-build.sh)22
-rw-r--r--production/parse-logs.sh (renamed from scripts/parse-logs.sh)6
-rw-r--r--production/parse-opts.sh (renamed from scripts/parse-opts.sh)2
-rw-r--r--production/pom-version-updater.sh (renamed from scripts/pom-version-updater.sh)4
-rw-r--r--production/promote-build.sh123
-rw-r--r--production/publish-eclipse.sh (renamed from scripts/publish-eclipse.sh)9
-rw-r--r--production/run-maven-build.sh (renamed from scripts/run-maven-build.sh)2
-rw-r--r--production/tag-build-input.sh (renamed from scripts/tag-build-input.sh)4
-rw-r--r--production/update-build-input.sh (renamed from scripts/update-build-input.sh)4
-rw-r--r--streams/description.txt2
-rw-r--r--streams/repositories.txt (renamed from scripts/repositories.txt)0
-rw-r--r--tempPatches/description.txt5
-rw-r--r--tempPatches/e4rcpsource.patch20
-rw-r--r--tempPatches/ppc.patch21
-rw-r--r--tempPatches/sbep2.patch28
28 files changed, 300 insertions, 88 deletions
diff --git a/devutils/description.txt b/devutils/description.txt
new file mode 100644
index 00000000..671d440a
--- /dev/null
+++ b/devutils/description.txt
@@ -0,0 +1,3 @@
+Files in this directory are not required for normal maven/tycho builds.
+
+They can be handy, though for release enginneers or others that are developing the build itself. \ No newline at end of file
diff --git a/scripts/submodule_pull_r42x.sh b/devutils/submodule_pull_r42x.sh
index abdd3d19..abdd3d19 100644
--- a/scripts/submodule_pull_r42x.sh
+++ b/devutils/submodule_pull_r42x.sh
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template
index 5623188a..5e4a8cc3 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template
@@ -466,14 +466,6 @@ unnecessary duplication (see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi
</div></td></tr>
<tr><td><div class="homeitem3col">
-<h3><a name="JARPROCESSOR"> Jar Processor &nbsp;<a href="details.php#JARPROCESSOR"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3>
-<table border=0 cellspacing=2 cellpadding=0 width="99%" bordercolor="#999999" >
-<tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"><b>Status</b></div></td><td width="36%"><b>Platform</b></td><?php column($servername); ?>
-</tr> %jarprocessor% </table>
-</div></td></tr>
-
-
-<tr><td><div class="homeitem3col">
<h3><a name="PDERuntime"> PDE Runtime Binary&nbsp;<a href="details.php#PDERuntime"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3>
<table border=0 cellspacing=2 cellpadding=0 width="99%" bordercolor="#999999" >
<tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"><b>Status</b></div></td><td width="36%"><b>Platform</b></td><?php column($servername); ?>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/platform.php.template b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/platform.php.template
index 181f80d7..2d388417 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/platform.php.template
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/platform.php.template
@@ -390,13 +390,6 @@ unnecessary duplication (see <a href="https://bugs.eclipse.org/bugs/show_bug.cgi
</div></td></tr>
<tr><td><div class="homeitem3col">
-<h3><a name="JARPROCESSOR"> Jar Processor &nbsp;<a href="details.php#JARPROCESSOR"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3>
-<table border=0 cellspacing=2 cellpadding=0 width="99%" bordercolor="#999999" >
-<tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"><b>Status</b></div></td><td width="36%"><b>Platform</b></td><?php column($_SERVER["SERVER_NAME"]); ?>
-</tr> %jarprocessor% </table>
-</div></td></tr>
-
-<tr><td><div class="homeitem3col">
<h3><a name="PDERuntime"> PDE Runtime Binary&nbsp;<a href="details.php#PDERuntime"><img src="../../../eclipse.org-common/stylesheets/more.gif" title="More..." alt="[More]"></a></h3>
<table border=0 cellspacing=2 cellpadding=0 width="99%" bordercolor="#999999" >
<tr> <td align=RIGHT valign=TOP width="5%"> <div align="left"><b>Status</b></div></td><td width="36%"><b>Platform</b></td><?php column($_SERVER["SERVER_NAME"]); ?>
diff --git a/scripts/build-functions.sh b/production/build-functions.sh
index 14c9423b..1d8a5b26 100644..100755
--- a/scripts/build-functions.sh
+++ b/production/build-functions.sh
@@ -218,16 +218,25 @@ fn-git-dir ()
echo $GIT_CACHE/$( basename "$URL" .git )
}
-# USAGE: fn-build-dir ROOT BRANCH BUILD_ID
+# USAGE: fn-build-dir ROOT BRANCH BUILD_ID STREAM
# ROOT: /shared/eclipse/builds
# BRANCH: R4_2_maintenance
# BUILD_ID: M20121119-1900
+# STREAM: 4.3.0
+# TODO: no longer need branch
fn-build-dir ()
{
ROOT="$1"; shift
BRANCH="$1"; shift
BUILD_ID="$1"; shift
- echo $ROOT/$BRANCH/dirs/$BUILD_ID
+ STREAM="$1"; shift
+ eclipseStreamMajor=${STREAM:0:1}
+ dropDirSegment=siteDir/eclipse/downloads/dropscbibased
+ if [[ $eclipseStreamMajor > 3 ]]
+ then
+ dropDirSegment=siteDir/eclipse/downloads/drops4cbibased
+ fi
+ echo $ROOT/$dropDirSegment/$BUILD_ID
}
# USAGE: fn-basebuilder-dir ROOT BRANCH BASEBUILDER_TAG
@@ -239,7 +248,7 @@ fn-basebuilder-dir ()
ROOT="$1"; shift
BRANCH="$1"; shift
BASEBUILDER_TAG="$1"; shift
- echo $ROOT/$BRANCH/org.eclipse.releng.basebuilder_$BASEBUILDER_TAG
+ echo $ROOT/org.eclipse.releng.basebuilder_$BASEBUILDER_TAG
}
@@ -330,7 +339,7 @@ fn-maven-build-aggregator ()
# BUILD_ID: M20121116-1100
# 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/scripts/repositories.txt
+# REPOSITORIES_TXT: /shared/eclipse/builds/streams/repositories.txt
fn-submodule-checkout ()
{
BUILD_ID="$1"; shift
@@ -376,7 +385,7 @@ fn-add-submodule-updates ()
# USAGE: fn-submodule-checkout 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/scripts/repositories.txt
+# REPOSITORIES_TXT: /shared/eclipse/builds/streams/repositories.txt
fn-tag-build-inputs ()
{
BUILD_ID="$1"; shift
@@ -525,7 +534,7 @@ fn-gather-sdk ()
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_32.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-hpux-gtk-ia64_32.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
@@ -559,7 +568,7 @@ fn-gather-platform ()
pushd "$TARGET_PRODUCTS"
cp org.eclipse.rcp.sdk.id-aix.gtk.ppc64.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-aix-gtk-ppc64.zip
cp org.eclipse.rcp.sdk.id-aix.gtk.ppc.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-aix-gtk-ppc.zip
- cp org.eclipse.rcp.sdk.id-hpux.gtk.ia64_32.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-hpux-gtk-ia64_32.zip
+ cp org.eclipse.rcp.sdk.id-hpux.gtk.ia64.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-hpux-gtk-ia64.zip
cp org.eclipse.rcp.sdk.id-linux.gtk.ppc.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk-ppc.tar.gz
cp org.eclipse.rcp.sdk.id-linux.gtk.ppc64.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk-ppc64.tar.gz
cp org.eclipse.rcp.sdk.id-linux.gtk.s390.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk-s390.tar.gz
@@ -652,7 +661,7 @@ fn-slice-repos ()
-DbuildId="$BUILD_ID" \
-DbuildRepo="$REPO_DIR_DIR" \
-DpostingDirectory=$(dirname "$BUILD_DIR") \
- -DequinoxPostingDirectory=$(dirname "$BUILD_DIR") \
+ -DequinoxPostingDirectory="$BUILD_ROOT/siteDir/equinox/drops" \
-DbuildLabel="$BUILD_ID" \
-DbuildDirectory="$BUILD_DIR"
popd
@@ -801,7 +810,7 @@ fn-publish-eclipse ()
-DbuildId="$BUILD_ID" \
-DbuildRepo="$REPO_DIR"/eclipse.platform.repository/target/repository \
-DpostingDirectory=$(dirname "$BUILD_DIR") \
- -DequinoxPostingDirectory=$(dirname "$BUILD_DIR") \
+ -DequinoxPostingDirectory="$BUILD_ROOT/siteDir/equinox/drops" \
-DpublishingContent="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles \
-DbuildLabel="$BUILD_ID" \
-Dhudson=true \
diff --git a/scripts/build_eclipse_org.env b/production/build_eclipse_org.env
index 2d0273f1..3008f8fb 100644
--- a/scripts/build_eclipse_org.env
+++ b/production/build_eclipse_org.env
@@ -1,22 +1,33 @@
# default definitions for this branch
-# note, we "override" this, for now, for Eclipse Platform cronjob builds
-export BUILD_ROOT=${BUILD_ROOT:-/shared/eclipse/builds}
export BRANCH=${BRANCH:-R4_2_maintenance}
export STREAM=${STREAM:-4.2.2}
export BUILD_TYPE=${BUILD_TYPE:-M}
+BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
+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
# -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)
+mkdir -p ${TMP_DIR}
# these could be machine specific
export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0_11}
+# 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.8.4}
+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.
-export MAVEN_OPTS=${MAVEN_OPTS:--Xmx2048m -XX:MaxPermSize=256M -Djava.io.tmpdir=${TMP_DIR}}
+export MAVEN_OPTS=${MAVEN_OPTS:--Xmx2048m -XX:MaxPermSize=256M -Djava.io.tmpdir=${TMP_DIR} -Dtycho.localArtifacts=ignore}
export MAVEN_PATH=${MAVEN_PATH:-/shared/common/apache-maven-3.0.4/bin}
export PATH=$JAVA_HOME/bin:$MAVEN_PATH:$ANT_HOME/bin:$PATH
diff --git a/production/description.txt b/production/description.txt
new file mode 100644
index 00000000..197291e0
--- /dev/null
+++ b/production/description.txt
@@ -0,0 +1,6 @@
+The scripts in this directory are intented for production builds on build.eclipse.org.
+
+None of them should be required for normal "maven builds".
+
+Most of them would not work well for local builds or "casual use" as they
+will tag repos, commit changes, and similar.
diff --git a/scripts/doc_options_dirs.txt b/production/doc_options_dirs.txt
index 43045881..5ad5a3af 100644
--- a/scripts/doc_options_dirs.txt
+++ b/production/doc_options_dirs.txt
@@ -2268,10 +2268,10 @@ eclipse.platform.resources
eclipse.platform.resources/bundles
eclipse.platform.resources/bundles/org.eclipse.core.filesystem
eclipse.platform.resources/bundles/org.eclipse.core.filesystem/fragments
-eclipse.platform.resources/bundles/org.eclipse.core.filesystem.hpux.ia64_32
-eclipse.platform.resources/bundles/org.eclipse.core.filesystem.hpux.ia64_32/META-INF
-eclipse.platform.resources/bundles/org.eclipse.core.filesystem.hpux.ia64_32/os
-eclipse.platform.resources/bundles/org.eclipse.core.filesystem.hpux.ia64_32/target
+eclipse.platform.resources/bundles/org.eclipse.core.filesystem.hpux.ia64
+eclipse.platform.resources/bundles/org.eclipse.core.filesystem.hpux.ia64/META-INF
+eclipse.platform.resources/bundles/org.eclipse.core.filesystem.hpux.ia64/os
+eclipse.platform.resources/bundles/org.eclipse.core.filesystem.hpux.ia64/target
eclipse.platform.resources/bundles/org.eclipse.core.filesystem.hpux.PA_RISC
eclipse.platform.resources/bundles/org.eclipse.core.filesystem.hpux.PA_RISC/META-INF
eclipse.platform.resources/bundles/org.eclipse.core.filesystem.hpux.PA_RISC/os
@@ -2651,14 +2651,14 @@ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.aix.ppc/src
eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.aix.ppc/target
eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.aix.ppc/temp.folder
eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.hpux.ia64
-eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.hpux.ia64_32
-eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.hpux.ia64_32/about_files
-eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.hpux.ia64_32/@dot
-eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.hpux.ia64_32/META-INF
-eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.hpux.ia64_32/org
-eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.hpux.ia64_32/src
-eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.hpux.ia64_32/target
-eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.hpux.ia64_32/temp.folder
+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.hpux.ia64
+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.hpux.ia64/about_files
+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.hpux.ia64/@dot
+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.hpux.ia64/META-INF
+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.hpux.ia64/org
+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.hpux.ia64/src
+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.hpux.ia64/target
+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.hpux.ia64/temp.folder
eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.hpux.ia64/about_files
eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.hpux.ia64/@dot
eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.hpux.ia64/META-INF
@@ -2746,14 +2746,14 @@ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.aix.ppc/org
eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.aix.ppc/src
eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.aix.ppc/target
eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.aix.ppc/temp.folder
-eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.hpux.ia64_32
-eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.hpux.ia64_32/about_files
-eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.hpux.ia64_32/@dot
-eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.hpux.ia64_32/META-INF
-eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.hpux.ia64_32/org
-eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.hpux.ia64_32/src
-eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.hpux.ia64_32/target
-eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.hpux.ia64_32/temp.folder
+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.hpux.ia64
+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.hpux.ia64/about_files
+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.hpux.ia64/@dot
+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.hpux.ia64/META-INF
+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.hpux.ia64/org
+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.hpux.ia64/src
+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.hpux.ia64/target
+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.hpux.ia64/temp.folder
eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.hpux.PA_RISC
eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.hpux.PA_RISC/about_files
eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.hpux.PA_RISC/@dot
@@ -4346,7 +4346,7 @@ rt.equinox.binaries/org.eclipse.equinox.launcher.cocoa.macosx
rt.equinox.binaries/org.eclipse.equinox.launcher.cocoa.macosx.x86_64
rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.aix.ppc
rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.aix.ppc64
-rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.hpux.ia64_32
+rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.hpux.ia64
rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.linux.ppc
rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.linux.ppc64
rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.linux.s390
@@ -4356,7 +4356,7 @@ rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.linux.x86_64
rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.solaris.sparc
rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.solaris.x86
rt.equinox.binaries/org.eclipse.equinox.launcher.motif.aix.ppc
-rt.equinox.binaries/org.eclipse.equinox.launcher.motif.hpux.ia64_32
+rt.equinox.binaries/org.eclipse.equinox.launcher.motif.hpux.ia64
rt.equinox.binaries/org.eclipse.equinox.launcher.motif.hpux.PA_RISC
rt.equinox.binaries/org.eclipse.equinox.launcher.motif.linux.x86
rt.equinox.binaries/org.eclipse.equinox.launcher.motif.solaris.sparc
@@ -4862,10 +4862,10 @@ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/target
rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/META-INF
rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/.settings
rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/target
-rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32
-rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/META-INF
-rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/.settings
-rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/target
+rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64
+rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/META-INF
+rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/.settings
+rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/target
rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc
rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64
rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/META-INF
@@ -4898,9 +4898,9 @@ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.motif.aix.ppc
rt.equinox.framework/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/META-INF
rt.equinox.framework/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/.settings
rt.equinox.framework/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/target
-rt.equinox.framework/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32
-rt.equinox.framework/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/META-INF
-rt.equinox.framework/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64_32/target
+rt.equinox.framework/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64
+rt.equinox.framework/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64/META-INF
+rt.equinox.framework/bundles/org.eclipse.equinox.launcher.motif.hpux.ia64/target
rt.equinox.framework/bundles/org.eclipse.equinox.launcher.motif.hpux.PA_RISC
rt.equinox.framework/bundles/org.eclipse.equinox.launcher.motif.linux.x86
rt.equinox.framework/bundles/org.eclipse.equinox.launcher.motif.linux.x86/META-INF
diff --git a/scripts/doc_options_process.sh b/production/doc_options_process.sh
index 2ad15cdb..2ad15cdb 100644
--- a/scripts/doc_options_process.sh
+++ b/production/doc_options_process.sh
diff --git a/scripts/gather-parts.sh b/production/gather-parts.sh
index 79488a16..a148242e 100644
--- a/scripts/gather-parts.sh
+++ b/production/gather-parts.sh
@@ -13,7 +13,7 @@ if [ ! -r "$1" ]; then
fi
pushd $( dirname $0 ) >/dev/null
-SCRIPT_PATH=$(pwd)
+SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
popd >/dev/null
. $SCRIPT_PATH/build-functions.sh
@@ -26,14 +26,14 @@ cd $BUILD_ROOT
# derived values
gitCache=$( fn-git-cache "$BUILD_ROOT" "$BRANCH" )
aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
-repositories=$( echo $SCRIPT_PATH/repositories.txt )
+repositories=$( echo $STREAMS_PATH/repositories.txt )
if [ -z "$BUILD_ID" ]; then
BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
fi
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" )
+buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" "$STREAM")
basebuilderDir=$( fn-basebuilder-dir "$BUILD_ROOT" "$BRANCH" "$BASEBUILDER_TAG" )
fn-checkout-basebuilder "$basebuilderDir" "$BASEBUILDER_TAG"
diff --git a/scripts/get-aggregator.sh b/production/get-aggregator.sh
index b8a48cb8..73883484 100644
--- a/scripts/get-aggregator.sh
+++ b/production/get-aggregator.sh
@@ -13,7 +13,7 @@ if [ ! -r "$1" ]; then
fi
pushd $( dirname $0 ) >/dev/null
-SCRIPT_PATH=$(pwd)
+SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
popd >/dev/null
. $SCRIPT_PATH/build-functions.sh
diff --git a/scripts/git-submodule-checkout.sh b/production/git-submodule-checkout.sh
index 3a31189d..3a31189d 100644
--- a/scripts/git-submodule-checkout.sh
+++ b/production/git-submodule-checkout.sh
diff --git a/scripts/install-parent.sh b/production/install-parent.sh
index e7c32b99..fc2e81ff 100644
--- a/scripts/install-parent.sh
+++ b/production/install-parent.sh
@@ -13,7 +13,7 @@ if [ ! -r "$1" ]; then
fi
pushd $( dirname $0 ) >/dev/null
-SCRIPT_PATH=$(pwd)
+SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
popd >/dev/null
. $SCRIPT_PATH/build-functions.sh
diff --git a/scripts/master-build.sh b/production/master-build.sh
index 23096463..357a3934 100644
--- a/scripts/master-build.sh
+++ b/production/master-build.sh
@@ -15,7 +15,8 @@ if [ ! -r "$INITIAL_ENV_FILE" ]; then
exit 1
fi
-SCRIPT_PATH="${BUILD_ROOT}/scripts"
+export SCRIPT_PATH="${BUILD_ROOT}/production"
+
source "${SCRIPT_PATH}/build-functions.sh"
@@ -28,7 +29,7 @@ cd $BUILD_ROOT
BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" )
+buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" "$STREAM" )
logsDirectory="${buildDirectory}/buildlogs"
mkdir -p "${logsDirectory}"
checkForErrorExit $? "Could not create buildlogs directory"
@@ -41,8 +42,7 @@ gitCache=$( fn-git-cache "$BUILD_ROOT" "$BRANCH" )
aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
export LOCAL_REPO="${BUILD_ROOT}"/localMavenRepo
-# Just in case it doesn't exist yet
-mkdir -p ${TMP_DIR}
+export STREAMS_PATH="${aggDir}/streams"
# 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
@@ -73,6 +73,8 @@ echo "export MAVEN_BREE=\"${MAVEN_BREE}\"" >>$BUILD_ENV_FILE
echo "export GIT_PUSH=\"${GIT_PUSH}\"" >>$BUILD_ENV_FILE
echo "export LOCAL_REPO=\"${LOCAL_REPO}\"" >>$BUILD_ENV_FILE
echo "export INITIAL_ENV_FILE=\"${INITIAL_ENV_FILE}\"" >>$BUILD_ENV_FILE
+echo "export SCRIPT_PATH=\"${SCRIPT_PATH}\"" >>$BUILD_ENV_FILE
+echo "export STREAMS_PATH=\"${STREAMS_PATH}\"" >>$BUILD_ENV_FILE
# any value of interest/usefulness can be added to BUILD_ENV_FILE
echo "export BUILD_ENV_FILE=\"${BUILD_ENV_FILE}\"" >>$BUILD_ENV_FILE
echo "export BUILD_ID=\"${BUILD_ID}\"" >>$BUILD_ENV_FILE
@@ -95,9 +97,9 @@ checkForErrorExit $? "Error occurred while updating build input"
#echo "INFO: apply temp patch"
#echo "DEBUG: aggDir: $aggDir"
#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
+#patch -p1 --backup -d $aggDir/rt.equinox.bundles/bundles -i $aggDir/tempPatches/sbep2.patch
+#patch -p1 --backup -d $aggDir/eclipse.platform.ui/features -i $aggDir/tempPatches/e4rcpsource.patch
+#patch -p1 --backup -d $aggDir/rt.equinox.framework/bundles -i $aggDir/tempPatches/ppc.patch
#checkForErrorExit $? "Error occurred applying patch"
#fi
@@ -128,11 +130,11 @@ $SCRIPT_PATH/gather-parts.sh $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/gather-pa
checkForErrorExit $? "Error occurred during gather parts"
$SCRIPT_PATH/parse-logs.sh $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/parse-logs-ouptut.txt
-$checkForErrorExit $? "Error occurred during parse-logs"
+checkForErrorExit $? "Error occurred during parse-logs"
$SCRIPT_PATH/publish-eclipse.sh $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/publish-eclipse-ouptut.txt
checkForErrorExit $? "Error occurred during publish-eclipse"
# if all ended well, put "promotion scripts" in known locations
-#$SCRIPT_PATH/promote-build.sh $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/promote-build-ouptut.txt
-#checkForErrorExit $? "Error occurred during promote-build"
+$SCRIPT_PATH/promote-build.sh CBI $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/promote-build-ouptut.txt
+checkForErrorExit $? "Error occurred during promote-build"
diff --git a/scripts/parse-logs.sh b/production/parse-logs.sh
index 1c2fb714..ce300058 100644
--- a/scripts/parse-logs.sh
+++ b/production/parse-logs.sh
@@ -13,7 +13,7 @@ if [ ! -r "$1" ]; then
fi
pushd $( dirname $0 ) >/dev/null
-SCRIPT_PATH=$(pwd)
+SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
popd >/dev/null
. $SCRIPT_PATH/build-functions.sh
@@ -26,14 +26,14 @@ cd $BUILD_ROOT
# derived values
gitCache=$( fn-git-cache "$BUILD_ROOT" "$BRANCH" )
aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
-repositories=$( echo $SCRIPT_PATH/repositories.txt )
+repositories=$( echo $STREAMS_PATH/repositories.txt )
if [ -z "$BUILD_ID" ]; then
BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
fi
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" )
+buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" "${STREAM}" )
basebuilderDir=$( fn-basebuilder-dir "$BUILD_ROOT" "$BRANCH" "$BASEBUILDER_TAG" )
fn-checkout-basebuilder "$basebuilderDir" "$BASEBUILDER_TAG"
diff --git a/scripts/parse-opts.sh b/production/parse-opts.sh
index 2d6469f4..f369c4bd 100644
--- a/scripts/parse-opts.sh
+++ b/production/parse-opts.sh
@@ -2,7 +2,7 @@
#
pushd $( dirname $0 ) >/dev/null
-SCRIPT_PATH=$(pwd)
+SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
popd >/dev/null
set -- $( getopt -l buildArea:,stream:,branch: -o "" -- "$@" )
diff --git a/scripts/pom-version-updater.sh b/production/pom-version-updater.sh
index bd7a71ac..5f599baf 100644
--- a/scripts/pom-version-updater.sh
+++ b/production/pom-version-updater.sh
@@ -13,7 +13,7 @@ if [ ! -r "$1" ]; then
fi
pushd $( dirname $0 ) >/dev/null
-SCRIPT_PATH=$(pwd)
+SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
popd >/dev/null
. $SCRIPT_PATH/build-functions.sh
@@ -26,7 +26,7 @@ cd $BUILD_ROOT
# derived values
gitCache=$( fn-git-cache "$BUILD_ROOT" "$BRANCH" )
aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" )
+buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" "$STREAM" )
if [ -z "$BUILD_ID" ]; then
BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
diff --git a/production/promote-build.sh b/production/promote-build.sh
new file mode 100644
index 00000000..5506b025
--- /dev/null
+++ b/production/promote-build.sh
@@ -0,0 +1,123 @@
+#!/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
+# 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
+# also trigger the unit tests on Hudson.
+
+function usage ()
+{
+ printf "\n\n\t%s\n" "promote-build.sh (PDE|CBI) if none specified, PDE assumed"
+}
+
+BUILD_TECH=$1
+if [[ -z "$BUILD_TECH" ]]
+ then
+ BUILD_TECH=PDE
+ fi
+
+case $BUILD_TECH in
+
+ 'PDE' )
+ echo "promote PDE build"
+ ;;
+
+ 'CBI' )
+ echo "promote CBI build"
+ # always assume true, for now, until debugged
+ testbuildonly=true;
+ ;;
+ *) echo "ERROR: Invalid argument to $(basename $0)";
+ usage;
+ exit 1
+ ;;
+esac
+
+
+source $SCRIPT_PATH/build-functions.sh
+
+source "$2"
+
+
+# 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).
+workLocation=/shared/eclipse/sdk/promotion
+
+# the cron job must know about and use this same
+# location to look for its promotions scripts. (i.e. implicite tight coupling)
+promoteScriptLocationEclipse=$workLocation/queue
+
+# directory should normally exist -- best to create first, with committer's ID --
+# but in case not
+mkdir -p "${promoteScriptLocationEclipse}"
+env > env.txt
+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
+fi
+# Here is content of promtion script:
+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 (CBI or PDE)
+echo "$workLocation/syncDropLocation.sh $STREAM $BUILD_ID $BUILD_TECH" >> ${promoteScriptLocationEclipse}/${scriptName}
+
+# we restrict "others" rights for a bit more security or safety from accidents
+chmod -v ug=rwx,o-rwx ${promoteScriptLocationEclipse}/${scriptName}
+
+# no need to promote anything for 3.x builds
+# (equinox portion should be the same, so we will
+# create for equinox for for only 4.x primary builds)
+if [[ $STREAM > 4 ]]
+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 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 --
+ # but in case not
+ mkdir -p "${promoteScriptLocationEquinox}"
+
+ equinoxPostingDirectory="$BUILD_ROOT/siteDir/equinox/drops"
+ eqFromDir=${equinoxPostingDirectory}/${buildId}
+ if [[ "$BUILD_TECH" == 'PDE' ]]
+ then
+ eqToDir="/home/data/httpd/download.eclipse.org/equinox/drops/"
+ else
+ # TODO temp location, for now
+ eqToDir="/shared/eclipse/temp/download.eclipse.org/equinox/drops/"
+ #eqToDir="/home/data/httpd/download.eclipse.org/equinox/dropscbibased/"
+ fi
+
+ # 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 --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}
+else
+ echo "Did not create promote script for equinox since $eclipseStream less than 4"
+fi
+
+
+echo "normal exit from build phase of $(basename $0)"
+
+exit 0
diff --git a/scripts/publish-eclipse.sh b/production/publish-eclipse.sh
index 0bc5cbd1..b02ddbcf 100644
--- a/scripts/publish-eclipse.sh
+++ b/production/publish-eclipse.sh
@@ -13,7 +13,7 @@ if [ ! -r "$1" ]; then
fi
pushd $( dirname $0 ) >/dev/null
-SCRIPT_PATH=$(pwd)
+SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
popd >/dev/null
. $SCRIPT_PATH/build-functions.sh
@@ -26,14 +26,14 @@ cd $BUILD_ROOT
# derived values
gitCache=$( fn-git-cache "$BUILD_ROOT" "$BRANCH" )
aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
-repositories=$( echo $SCRIPT_PATH/repositories.txt )
+repositories=$( echo $STREAMS_PATH/repositories.txt )
if [ -z "$BUILD_ID" ]; then
BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
fi
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" )
+buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BRANCH" "$BUILD_ID" "$STREAM" )
basebuilderDir=$( fn-basebuilder-dir "$BUILD_ROOT" "$BRANCH" "$BASEBUILDER_TAG" )
fn-checkout-basebuilder "$basebuilderDir" "$BASEBUILDER_TAG"
@@ -45,7 +45,4 @@ fn-parse-compile-logs "$BUILD_ID" \
"$aggDir"/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml \
"$buildDirectory" "$launcherJar"
-# TODO Not sure this file is needed?
-touch "$buildDirectory"/directory.txt
-
fn-publish-eclipse "$BUILD_TYPE" "$STREAM" "$BUILD_ID" "$aggDir" "$buildDirectory" "$launcherJar"
diff --git a/scripts/run-maven-build.sh b/production/run-maven-build.sh
index 66303f44..e2b68753 100644
--- a/scripts/run-maven-build.sh
+++ b/production/run-maven-build.sh
@@ -13,7 +13,7 @@ if [ ! -r "$1" ]; then
fi
pushd $( dirname $0 ) >/dev/null
-SCRIPT_PATH=$(pwd)
+SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
popd >/dev/null
. $SCRIPT_PATH/build-functions.sh
diff --git a/scripts/tag-build-input.sh b/production/tag-build-input.sh
index d7b301b2..b109e978 100644
--- a/scripts/tag-build-input.sh
+++ b/production/tag-build-input.sh
@@ -13,7 +13,7 @@ if [ ! -r "$1" ]; then
fi
pushd $( dirname $0 ) >/dev/null
-SCRIPT_PATH=$(pwd)
+SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
popd >/dev/null
. $SCRIPT_PATH/build-functions.sh
@@ -26,7 +26,7 @@ cd $BUILD_ROOT
# derived values
gitCache=$( fn-git-cache "$BUILD_ROOT" "$BRANCH" )
aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
-repositories=$( echo $SCRIPT_PATH/repositories.txt )
+repositories=$( echo $STREAMS_PATH/repositories.txt )
diff --git a/scripts/update-build-input.sh b/production/update-build-input.sh
index df6be781..a7452119 100644
--- a/scripts/update-build-input.sh
+++ b/production/update-build-input.sh
@@ -13,7 +13,7 @@ if [ ! -r "$1" ]; then
fi
pushd $( dirname $0 ) >/dev/null
-SCRIPT_PATH=$(pwd)
+SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
popd >/dev/null
. $SCRIPT_PATH/build-functions.sh
@@ -26,7 +26,7 @@ cd $BUILD_ROOT
# derived values
gitCache=$( fn-git-cache "$BUILD_ROOT" "$BRANCH" )
aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
-repositories=$( echo $SCRIPT_PATH/repositories.txt )
+repositories=$( echo $STREAMS_PATH/repositories.txt )
repoScript=$( echo $SCRIPT_PATH/git-submodule-checkout.sh )
diff --git a/streams/description.txt b/streams/description.txt
new file mode 100644
index 00000000..92bad581
--- /dev/null
+++ b/streams/description.txt
@@ -0,0 +1,2 @@
+The files in this directories are stream specific and used in conjunction with
+the production scripts. \ No newline at end of file
diff --git a/scripts/repositories.txt b/streams/repositories.txt
index 48ef9784..48ef9784 100644
--- a/scripts/repositories.txt
+++ b/streams/repositories.txt
diff --git a/tempPatches/description.txt b/tempPatches/description.txt
new file mode 100644
index 00000000..bd2d855d
--- /dev/null
+++ b/tempPatches/description.txt
@@ -0,0 +1,5 @@
+Temporay folder and files that are (sometimes) used by the master-build.sh
+script to apply patches during a production batch builds. This is useful to make use of
+a patch to experiment or before committers have a chance to commit a patch.
+
+These are expected to be removed eventually, and would not be used for production builds.
diff --git a/tempPatches/e4rcpsource.patch b/tempPatches/e4rcpsource.patch
new file mode 100644
index 00000000..04b85a56
--- /dev/null
+++ b/tempPatches/e4rcpsource.patch
@@ -0,0 +1,20 @@
+diff --git features/org.eclipse.e4.rcp/pom.xml features/org.eclipse.e4.rcp/pom.xml
+index 530393c..f7aee1e 100644
+--- features/org.eclipse.e4.rcp/pom.xml
++++ features/org.eclipse.e4.rcp/pom.xml
+@@ -52,6 +52,7 @@
+ <plugin id="org.eclipse.equinox.launcher.cocoa.macosx" />
+ <plugin id="org.eclipse.equinox.launcher.cocoa.macosx" />
+ <plugin id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64" />
++ <plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc" />
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc64" />
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86" />
+ <plugin id="org.eclipse.equinox.launcher.gtk.linux.s390x" />
+@@ -66,6 +67,7 @@
+ <plugin id="org.eclipse.swt.gtk.linux.s390" />
+ <plugin id="org.eclipse.swt.gtk.solaris.sparc" />
+ <plugin id="org.eclipse.swt.gtk.solaris.x86" />
++ <plugin id="org.eclipse.swt.gtk.linux.ppc" />
+ <plugin id="org.eclipse.swt.gtk.linux.ppc64" />
+ <plugin id="org.eclipse.swt.cocoa.macosx" />
+ <plugin id="org.eclipse.swt.cocoa.macosx" />
diff --git a/tempPatches/ppc.patch b/tempPatches/ppc.patch
new file mode 100644
index 00000000..abe00158
--- /dev/null
+++ b/tempPatches/ppc.patch
@@ -0,0 +1,21 @@
+diff --git bundles/org.eclipse.equinox.executable/feature.xml bundles/org.eclipse.equinox.executable/feature.xml
+index 068ae1a..85b33f9 100644
+--- bundles/org.eclipse.equinox.executable/feature.xml
++++ bundles/org.eclipse.equinox.executable/feature.xml
+@@ -72,6 +72,16 @@
+ fragment="true"/>
+
+ <plugin
++ id="org.eclipse.equinox.launcher.gtk.linux.ppc"
++ os="linux"
++ ws="gtk"
++ arch="ppc"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"/>
++
++ <plugin
+ id="org.eclipse.equinox.launcher.gtk.linux.ppc64"
+ os="linux"
+ ws="gtk"
diff --git a/tempPatches/sbep2.patch b/tempPatches/sbep2.patch
new file mode 100644
index 00000000..4c2d585b
--- /dev/null
+++ b/tempPatches/sbep2.patch
@@ -0,0 +1,28 @@
+diff --git bundles/org.eclipse.equinox.servletbridge.extensionbundle/META-INF/p2.inf bundles/org.eclipse.equinox.servletbridge.extensionbundle/META-INF/p2.inf
+index c82a8c2..8709a52 100644
+--- bundles/org.eclipse.equinox.servletbridge.extensionbundle/META-INF/p2.inf
++++ bundles/org.eclipse.equinox.servletbridge.extensionbundle/META-INF/p2.inf
+@@ -1,12 +1,12 @@
+-provides.0.namespace = java.package
+-provides.0.name = javax.servlet
+-provides.0.version = 2.5
+-provides.1.namespace = java.package
+-provides.1.name = javax.servlet.http
+-provides.1.version = 2.5
+-provides.2.namespace = java.package
+-provides.2.name = javax.servlet.resources
+-provides.2.version = 2.5
++!provides.0.namespace = java.package
++!provides.0.name = javax.servlet
++!provides.0.version = 2.5
++!provides.1.namespace = java.package
++!provides.1.name = javax.servlet.http
++!provides.1.version = 2.5
++!provides.2.namespace = java.package
++!provides.2.name = javax.servlet.resources
++!provides.2.version = 2.5
+ provides.3.namespace = java.package
+ provides.3.name = org.eclipse.equinox.servletbridge
+-provides.3.version = 1.1
+\ No newline at end of file
++provides.3.version = 1.1

Back to the top