Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2013-01-25 13:23:30 -0500
committerDavid Williams2013-01-25 13:23:30 -0500
commitb068aec0b07ca86ba4fe0d51f79b880add3e6b7f (patch)
treee8ae5aee4f042263a30e92c516ac9922f4ba2193
parent72877af9e06f0c59af054ed669407959ea384578 (diff)
downloadeclipse.platform.releng.aggregator-b068aec0b07ca86ba4fe0d51f79b880add3e6b7f.tar.gz
eclipse.platform.releng.aggregator-b068aec0b07ca86ba4fe0d51f79b880add3e6b7f.tar.xz
eclipse.platform.releng.aggregator-b068aec0b07ca86ba4fe0d51f79b880add3e6b7f.zip
synch scripts
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/helpernew.xml2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/details.php6
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml2
-rw-r--r--scripts/build-functions.sh2
-rw-r--r--scripts/master-build.sh9
6 files changed, 12 insertions, 11 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml
index f7b679cb..1d9a77ce 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml
@@ -521,7 +521,7 @@
value="${buildType}" />
<property
name="dropTokenList"
- value="%sdk%,%tests%,%example%,%rcpruntime%,%rcpsdk%,%deltapack%,%icubase%,%runtime%,%jdt%,%jdtsdk%,%jdtc%,%jarprocessor%,%pde%,%pdesdk%,%cvs%,%cvssdk%,%swt%,%relengtools%" />
+ value="%sdk%,%tests%,%example%,%rcpruntime%,%rcpsdk%,%deltapack%,%icubase%,%runtime%,%jdt%,%jdtsdk%,%jdtc%,%pde%,%pdesdk%,%cvs%,%cvssdk%,%swt%,%relengtools%" />
<property
name="platformIdentifierToken"
value="%platform%" />
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helpernew.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helpernew.xml
index 04a2c7e9..79a108fb 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helpernew.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helpernew.xml
@@ -554,7 +554,7 @@
value="${buildType}" />
<property
name="dropTokenList"
- value="%sdk%,%tests%,%example%,%rcpruntime%,%rcpsdk%,%deltapack%,%icubase%,%runtime%,%jdt%,%jdtsdk%,%jdtc%,%jarprocessor%,%pde%,%pdesdk%,%cvs%,%cvssdk%,%swt%,%relengtools%" />
+ value="%sdk%,%tests%,%example%,%rcpruntime%,%rcpsdk%,%deltapack%,%icubase%,%runtime%,%jdt%,%jdtsdk%,%jdtc%,%pde%,%pdesdk%,%cvs%,%cvssdk%,%swt%,%relengtools%" />
<property
name="platformIdentifierToken"
value="%platform%" />
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/details.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/details.php
index ee62745f..6db766c1 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/details.php
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/details.php
@@ -84,7 +84,6 @@ if (window.attachEvent) window.attachEvent("onload", sfHover);
<li><a href="#JDTRuntime">JDT Runtime Binary</a></li>
<li><a href="#JDTSDK">JDT SDK</a></li>
<li><a href="#JDTCORE">JDT Core Batch Compiler</a></li>
-<li><a href="#JARPROCESSOR">Jar Processor</a></li>
<li><a href="#PDERuntime">PDE Runtime Binary</a></li>
<li><a href="#PDESDK">PDE SDK</a></li>
<li><a href="#CVSRuntime">CVS Client Runtime Binary</a></li>
@@ -214,11 +213,6 @@ from the <a href="http://download.eclipse.org/tools/orbit/downloads/">Orbit Down
<li>
These drops contain the standalone batch java compiler, Ant compiler adapter and associated source. The batch compiler and Ant adapter (ecj.jar) are extracted from the org.eclipse.jdt.core plug-in as a 1.2MB download. For examples of usage, please refer to this help section: JDT Plug-in Developer Guide>Programmer's Guide>JDT Core>Compiling Java code.</li></ul>
- <li><a name="JARPROCESSOR"> <b> Jar Processor </b> </a>
- <ul>
- <li>
- These drops contain the standalone jar processor and associated source. The jar processor is extracted from org.eclipse.update.core. For details, see the wiki pages for <a href="http://wiki.eclipse.org/index.php/Update_Site_Optimization">Update Site Optimization</a> and <a href="http://wiki.eclipse.org/index.php/Pack200#Jar_Processor">Pack200 Compression</a>.</li></ul>
-
<li><a name="PDERuntime"> <b> PDE Runtime Binary </b> </a>
<ul>
<li>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
index 0c5acb78..77c29e72 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
@@ -55,6 +55,8 @@
<platform id="PLG264" name="Linux (x86_64/GTK 2) (&lt;a href=&quot;http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-platform-@build@-linux-gtk-x86_64.tar.gz"></platform>
<platform id="PLG2PPC" name="Linux (PPC/GTK 2) (&lt;a href=&quot;http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-platform-@build@-linux-gtk-ppc.tar.gz"></platform>
<platform id="PLG2PPC64" name="Linux (PPC64/GTK 2) (&lt;a href=&quot;http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-platform-@build@-linux-gtk-ppc64.tar.gz"></platform>
+ <platform id="PLG2S390X" name="Linux (s390x/GTK 2) (&lt;a href=&quot;http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-platform-@build@-linux-gtk-s390x.tar.gz"></platform>
+ <platform id="PLG2S390" name="Linux (s390/GTK 2) (&lt;a href=&quot;http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-platform-@build@-linux-gtk-s390.tar.gz"></platform>
<platform id="PSG" name="Solaris 10 (SPARC/GTK 2)" fileName="eclipse-platform-@build@-solaris-gtk.zip"></platform>
<platform id="PSGX" name="Solaris 10 (x86/GTK 2)" fileName="eclipse-platform-@build@-solaris-gtk-x86.zip"></platform>
<platform id="PHPUX" name="HPUX (ia64/GTK 2)" fileName="eclipse-platform-@build@-hpux-gtk-ia64.zip"></platform>
diff --git a/scripts/build-functions.sh b/scripts/build-functions.sh
index bf1dca58..14c9423b 100644
--- a/scripts/build-functions.sh
+++ b/scripts/build-functions.sh
@@ -562,6 +562,8 @@ fn-gather-platform ()
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-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
+ cp org.eclipse.rcp.sdk.id-linux.gtk.s390x.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk-s390x.tar.gz
cp org.eclipse.rcp.sdk.id-linux.gtk.x86_64.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk-x86_64.tar.gz
cp org.eclipse.rcp.sdk.id-linux.gtk.x86.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk.tar.gz
cp org.eclipse.rcp.sdk.id-macosx.cocoa.x86_64.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz
diff --git a/scripts/master-build.sh b/scripts/master-build.sh
index b5b22023..23096463 100644
--- a/scripts/master-build.sh
+++ b/scripts/master-build.sh
@@ -127,9 +127,12 @@ checkForErrorExit $? "Error occurred during run maven build"
$SCRIPT_PATH/gather-parts.sh $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/gather-parts-ouptut.txt
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"
+$SCRIPT_PATH/parse-logs.sh $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/parse-logs-ouptut.txt
+$checkForErrorExit $? "Error occurred during parse-logs"
-/bin/bash $SCRIPT_PATH/publish-eclipse.sh $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/publish-eclipse-ouptut.txt
+$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"

Back to the top