[SCM] eclipse - Powerful IDE written in java - Debian package. branch, upstream, updated. 6efcc6552d8b5de50a93d4a1ae28c6126d4e354e
Benjamin Drung
bdrung-guest at alioth.debian.org
Fri Feb 26 22:33:52 UTC 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".
The branch, upstream has been updated
via 6efcc6552d8b5de50a93d4a1ae28c6126d4e354e (commit)
from 5f855421b7aa582abbc6ca61914d2574b0d3af15 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 6efcc6552d8b5de50a93d4a1ae28c6126d4e354e
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Fri Feb 26 22:53:08 2010 +0100
Import eclipse-build symlinkDependencies branch (revision 24298).
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 21 ++
build.properties | 3 +-
build.xml | 34 ++--
buildSDKSource.sh | 249 +++++++-------------
generateAdditionalPlatforms.xml | 2 +-
.../eclipse-nosourcebundlesfordependencies.patch | 24 +-
pdebuild.properties | 1 +
pdebuild.xml | 3 +-
regenerateBootstrapFiles.sh | 10 +-
9 files changed, 149 insertions(+), 198 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cb57379..dbca334 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,26 @@
2010-02-26 Andrew Overholt <overholt at redhat.com>
+ * buildSDKSource.sh: Generate source tarball using upstream srcIncluded
+ drop.
+
+2010-02-26 Andrew Overholt <overholt at redhat.com>
+
+ * build.xml: Use new source tarball name and directory structure (no more
+ "-fetched"). Update version number and label. For now, don't re-symlink
+ in installation directory.
+ * regenerateBootstrapFiles.sh: Likewise.
+ * generateAdditionalPlatforms.xml: Likewise.
+ * pdebuild.xml: Likewise. Don't reference .source bundles.
+ * build.properties: Set label to 3.5.2.
+ * pdebuild.properties: Likewise.
+
+2010-02-26 Andrew Overholt <overholt at redhat.com>
+
+ * patches/eclipse-nosourcebundlesfordependencies.patch: Don't generate
+ JUnit4 source bundle.
+
+2010-02-26 Andrew Overholt <overholt at redhat.com>
+
* task-src/org/eclipse/linuxtools/eclipsebuild/SymlinkOSGiJars.java
(execute): Don't assume location of dependency manifests. Create symlink
filenames based on Bundle-SymbolicName_Bundle-Version when keepOrigNames
diff --git a/build.properties b/build.properties
index dd91f87..d6c4600 100644
--- a/build.properties
+++ b/build.properties
@@ -2,9 +2,10 @@
# Note: this is also in pdebuild.properties
buildId=M200100210-0800
buildTag=vM20100210-0800
+label=3.5.2
testsBuildLabel=3.5.2
p2.director.version=${testsBuildLabel}
-testsBuildId=v20090227
+testsBuildId=v20100210
featureToBuild=eclipse-build-feature
skipBase=true
skipFetch=true
diff --git a/build.xml b/build.xml
index 15efcfe..4901407 100644
--- a/build.xml
+++ b/build.xml
@@ -5,7 +5,7 @@
<property file="build.properties" />
- <available file="eclipse-${buildTag}-fetched-src.tar.bz2" property="sdkSourcePresent" value="true" />
+ <available file="eclipse-${label}-src.tar.bz2" property="sdkSourcePresent" value="true" />
<available file="eclipse/plugins/org.eclipse.equinox.launcher/build.properties" property="extractedSdkSourcePresent" value="true" />
<condition property="onlyExtractedSdkSourcePresent">
@@ -22,12 +22,12 @@
</condition>
<available file="eclipse-build-generatedScripts.tar.bz2" property="scriptsPresent" value="true" />
- <available file="eclipse-sdktests-${buildTag}-fetched-src.tar.bz2" property="testsSourcePresent" value="true" />
- <available file="eclipse-sdktests-${buildTag}-fetched-scripts.tar.bz2" property="testsScriptsPresent" value="true" />
+ <available file="eclipse-sdktests-${label}-src.tar.bz2" property="testsSourcePresent" value="true" />
+ <available file="eclipse-sdktests-${label}-scripts.tar.bz2" property="testsScriptsPresent" value="true" />
<!-- Check what has already been done -->
<available property="unpack.complete" file="unpack-stamp" value="true" />
- <uptodate property="testsunpack.complete" srcfile="${basedir}/eclipse-sdktests-${buildTag}-fetched-src.tar.bz2" targetfile="testsunpack-stamp" />
+ <uptodate property="testsunpack.complete" srcfile="${basedir}/eclipse-sdktests-${label}-src.tar.bz2" targetfile="testsunpack-stamp" />
<uptodate property="buildId.complete" srcfile="unpack-stamp" targetfile="buildId-stamp" />
<uptodate property="patch.complete" srcfile="unpack-stamp" targetfile="patch-stamp" />
<uptodate property="symlinks.complete" srcfile="patch-stamp" targetfile="symlinks-stamp" />
@@ -45,8 +45,8 @@
<property name="homeDir" value="${basedir}/home" />
<property name="baseworkspace" value="${basedir}/baseworkspace" />
<property name="buildworkspace" value="${basedir}/buildworkspace" />
- <property name="buildDirectory" value="${topBuildDir}/eclipse-${buildTag}-fetched-src" />
- <property name="testsBuildDirectory" value="${testsBuildDir}/eclipse-sdktests-${buildTag}-fetched-src" />
+ <property name="buildDirectory" value="${topBuildDir}/eclipse-${label}-src" />
+ <property name="testsBuildDirectory" value="${testsBuildDir}/eclipse-sdktests-${label}-src" />
<property name="buildConfigs" value="${buildDirectory}/buildConfigs" />
<property name="buildConfig" value="${buildConfigs}/eclipse-build-config" />
<property name="productFiles" value="${buildConfig}/productFiles" />
@@ -109,15 +109,15 @@
</target>
<target name="extractBuildXmls" if="scriptsPresent">
- <untar compression="bzip2" dest="${basedir}/build/eclipse-${buildTag}-fetched-src" src="${basedir}/eclipse-build-generatedScripts.tar.bz2" />
+ <untar compression="bzip2" dest="${basedir}/build/eclipse-${label}-src" src="${basedir}/eclipse-build-generatedScripts.tar.bz2" />
<!--
<fail message="Build scripts to bootstrap PDE Build must be generated and present in eclipse-build-generatedScripts.tar.bz2. See pdebuild.xml for details."/>
-->
</target>
<target name="extractSource" unless="onlyExtractedSdkSourcePresent">
- <echo message="Extracting SDK source (tar jxf eclipse-${buildTag}-fetched-src.tar.bz2)" />
- <untar dest="${topBuildDir}" src="${basedir}/eclipse-${buildTag}-fetched-src.tar.bz2" compression="bzip2" />
+ <echo message="Extracting SDK source (tar jxf eclipse-${label}-src.tar.bz2)" />
+ <untar dest="${topBuildDir}" src="${basedir}/eclipse-${label}-src.tar.bz2" compression="bzip2" />
</target>
<target name="copySource" unless="sdkSourcePresent">
@@ -160,7 +160,7 @@
<fileset dir="eclipse-build-feature" />
</copy>
<!-- add additional archs -->
- <untar compression="bzip2" dest="${basedir}/build/eclipse-${buildTag}-fetched-src/plugins" src="${basedir}/eclipse-build-additionalArchs.tar.bz2" />
+ <untar compression="bzip2" dest="${basedir}/build/eclipse-${label}-src/plugins" src="${basedir}/eclipse-build-additionalArchs.tar.bz2" />
<!-- prepare ecf build tree -->
<delete>
<fileset dir="${buildDirectory}/plugins" includes="org.eclipse.ecf*" />
@@ -191,11 +191,11 @@
<delete dir="${buildworkspace}" />
<mkdir dir="${buildworkspace}" />
- <echo message="Extracting SDK tests source (tar jxf eclipse-sdktests-${buildTag}-fetched-src.tar.bz2)" />
- <untar dest="${testsBuildDir}" src="${basedir}/eclipse-sdktests-${buildTag}-fetched-src.tar.bz2" compression="bzip2" />
- <untar dest="${testsBuildDir}" src="${basedir}/eclipse-sdktests-${buildTag}-fetched-scripts.tar.bz2" compression="bzip2" />
+ <echo message="Extracting SDK tests source (tar jxf eclipse-sdktests-${label}-src.tar.bz2)" />
+ <untar dest="${testsBuildDir}" src="${basedir}/eclipse-sdktests-${label}-src.tar.bz2" compression="bzip2" />
+ <untar dest="${testsBuildDir}" src="${basedir}/eclipse-sdktests-${label}-scripts.tar.bz2" compression="bzip2" />
<move todir="${testsBuildDir}">
- <fileset dir="${testsBuildDir}/eclipse-sdktests-${buildTag}-fetched-scripts">
+ <fileset dir="${testsBuildDir}/eclipse-sdktests-${label}-scripts">
<include name="**/*" />
</fileset>
</move>
@@ -609,6 +609,7 @@
</copy>
<!-- Delete system JARs that have been copied over as their symlink target names -->
+ <!--
<delete>
<fileset dir="${buildDirectory}/installation/plugins" includes="com.ibm.icu*" />
<fileset dir="${buildDirectory}/installation/plugins" includes="com.jcraft.jsch*" />
@@ -635,17 +636,18 @@
keepOrigNames="false"/>
<symlinkNonOSGiJars dependencies="${basedir}/nonosgidependencies.properties"
topLevelDir="${buildDirectory}/installation/plugins"/>
-
+ -->
<!-- FIXME the junit4 bundle has no qualifier at build time but does
at install time. Watch out for other distros with different
locations of junit4's system JAR.
-->
+ <!--
<delete dir="${buildDirectory}/installation/plugins/org.junit4" />
<delete file="${buildDirectory}/installation/plugins/org.junit4_4.5.0.v20090824/junit.jar" />
<symlink link="${buildDirectory}/installation/plugins/org.junit4_4.5.0.v20090824/junit.jar"
resource="/usr/share/java/junit4.jar" />
-
+ -->
<echo file="provision.sdk-stamp" />
</target>
diff --git a/buildSDKSource.sh b/buildSDKSource.sh
index 2367c2d..be02616 100755
--- a/buildSDKSource.sh
+++ b/buildSDKSource.sh
@@ -1,24 +1,28 @@
#!/bin/bash
set -e
-# Possible optimizations:
-# - don't check out non-Linux fragments (will need to patch features for this)
+# We use the upstream srcIncluded drop as input. It can be obtained
+# from: http://download.eclipse.org/eclipse/downloads/drops/
+#
+# In our case, we're using: R-3.5.2-201002111343/eclipse-sourceBuild-srcIncluded-3.5.2.zip
+
+equinoxTag="R35x_v20100209"
+ecfTag="v20090831-1453"
+label="3.5.2"
+buildID="R3_5_2"
+upstreamSrcDrop="/tmp/eclipse-sourceBuild-srcIncluded-${label}.zip"
+
+eclipsebuildURL=svn://dev.eclipse.org/svnroot/technology/org.eclipse.linuxtools/eclipse-build/branches/symlinkDependencies
+
+baseBuilderTag="R3_5"
baseDir=$(pwd)
workDirectory=
-buildID="vM20100211-1343"
-mapsTag="M20100211-1343"
-equinoxTag=R3_5_1
baseBuilder=
eclipseBuilder=
-baseBuilderTag="R3_5"
-eclipseBuilderTag=${buildID}
fetchTests="no"
-orbitRepoZip=orbitRepo-R20090825191606.zip
-ecfBundlesZip=ecf-R3_5_1.zip
-ecfTag="v20090831-1453"
-usage="usage: <build ID> [-workdir <working directory>] [-baseBuilder <path to org.eclipse.releng.basebuilder checkout>] [-eclipseBuilder <path to org.eclipse.releng.eclipsebuilder checkout>] [-baseBuilderTag <org.eclipse.releng.basebuilder tag to check out>] [-noTests]"
+usage="usage: <build ID> [-workdir <working directory>] [-upstreamSrcDrop <path to upstream srcIncluded zip>] [-baseBuilder <path to org.eclipse.releng.basebuilder checkout>] [-baseBuilderTag <org.eclipse.releng.basebuilder tag to check out>] [-noTests]"
while [ $# -gt 0 ]
do
@@ -27,134 +31,37 @@ do
-workDir) workDirectory="$2"; shift;;
-baseBuilder) baseBuilder="$2"; shift;;
-baseBuilderTag) baseBuilderTag="$2"; shift;;
- -eclipseBuilder) eclipseBuilder="$2"; shift;;
- -eclipseBuilderTag) eclipseBuilderTag="$2"; shift;;
+ -upstreamSrcDrop) upstreamSrcDrop="$2"; shift;;
-noTests) fetchTests="no"; shift;;
-help) echo $usage; exit 0;;
--help) echo $usage; exit 0;;
-h) echo $usage; exit 0;;
- *) buildID="$1";
esac
shift
done
-# Must specify a build ID
-if [ "x${buildID}x" = "xx" ]; then
- echo >&2 "Must specify build ID. Example: R3_5_1 ."
- echo >&2 "${usage}"
- exit 1
-else
- echo "Going to create source tarballs for ${buildID}."
-fi
-
if [ "x${workDirectory}x" = "xx" ]; then
workDirectory="${baseDir}"
echo "Working directory not set; using this directory (${baseDir})."
fi
-if [ "x${baseBuilder}x" = "xx" ]; then
- baseBuilder="${workDirectory}"/org.eclipse.releng.basebuilder
- echo "Basebuilder checkout not specified; will check out ${baseBuilderTag} into ${baseBuilder}."
-fi
-if [ "x${eclipseBuilder}x" = "xx" ]; then
- eclipseBuilder="${workDirectory}"/org.eclipse.releng.eclipsebuilder
- echo "Eclipsebuilder checkout not specified; will check out into ${eclipseBuilder}."
-fi
-
-fetchDirectory="${workDirectory}"/fetch
-mkdir -p "${fetchDirectory}"
-homeDirectory="${workDirectory}"/userhome
-rm -rf "${homeDirectory}"
-mkdir -p "${homeDirectory}"
-workspace="${workDirectory}"/workspace
-rm -rf "${workspace}"
-mkdir -p "${workspace}"
-cvsRepo=":pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse"
-mapsRoot="org.eclipse.releng/maps"
-
-# Fetch basebuilder
-if [ ! -e "${baseBuilder}" ]; then
- mkdir -p "${baseBuilder}"
- cd "${baseBuilder}"/..
- cvs -d${cvsRepo} co -r ${baseBuilderTag} org.eclipse.releng.basebuilder
- cd "${baseDir}"
-fi
-
-# Fetch eclipsebuilder
-if [ ! -e ${eclipseBuilder} ]; then
- mkdir -p "${eclipseBuilder}"
- cd "${eclipseBuilder}"/..
- cvs -d${cvsRepo} co -r ${eclipseBuilderTag} org.eclipse.releng.eclipsebuilder
- cd "${eclipseBuilder}"
- patch -p0 < "${baseDir}"/patches/eclipse-addFetchMasterAndTestsTargets.patch
- cd "${baseDir}"
-fi
-
-if [ -e ${orbitRepoZip} ]; then
- if [ ! -e ${fetchDirectory}/orbitRepo ]; then
- # Unzip Orbit repo
- # Note: This is a zip of the repository available at:
- #
- # http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite
- #
- # temporarily available at:
- #
- # http://build.eclipse.org/eclipse/e4/build/e4/downloads/drops/4.0.0/targets/orbit/orbitRepo-R20090825191606.zip
- #
- # To avoid issues with mirrors that were out of sync with the repo, we
- # use this zipped copy. Thanks to Paul Webster for help generating
- # it. This is only done if we have a local copy of it.
- mkdir -p ${fetchDirectory}/orbitRepo
- unzip -q -d ${fetchDirectory}/orbitRepo ${orbitRepoZip}
- fi
-fi
-
-# Due to timeouts with eclipse.org, we keep a zipped copy of the binary
-# ECF jars used y p2
-if [ -e ${ecfBundlesZip} ]; then
- if [ ! -e ${fetchDirectory}/ecfBundles ]; then
- unzip -q -d ${fetchDirectory} ${ecfBundlesZip}
- fi
-fi
-
-if [ -e ${fetchDirectory}/orbitRepo ]; then
- cd "${eclipseBuilder}"
- patch -p0 < "${baseDir}"/patches/eclipse-dontusefullmoonformaster.patch
- cd "${baseDir}"
-fi
-
-if [ -e ${fetchDirectory}/ecfBundles ]; then
- cd "${eclipseBuilder}"
- patch -p0 < "${baseDir}"/patches/eclipse-useLocalECFBundles.patch
- cd "${baseDir}"
-fi
+mkdir -p ${workDirectory}
+cd ${workDirectory}
-# Build must be run from within o.e.r.eclipsebuilder checkout
-cd "${eclipseBuilder}"
+mkdir eclipse-${label}-src
+cd eclipse-${label}-src
-java -jar \
-"${baseBuilder}"/plugins/org.eclipse.equinox.launcher_*.jar \
--consolelog \
--data "${workspace}" \
--application org.eclipse.ant.core.antRunner \
--f buildAll.xml \
-fetchMasterFeature \
--DbuildDirectory="${fetchDirectory}" \
--DskipBase=true \
--DmapsRepo=${cvsRepo} \
--DmapCvsRoot=${cvsRepo} \
--DmapsCvsRoot=${cvsRepo} \
--DmapsRoot=${mapsRoot} \
--DmapsCheckoutTag=${mapsTag} \
--DmapVersionTag=${mapsTag} \
--Duser.home="${homeDirectory}" \
-2>&1 | tee ${workDirectory}/sourcesFetch.log
+unzip -d upstream -q ${upstreamSrcDrop}
+mv upstream/org.eclipse.releng.eclipsebuilder ..
+eclipseBuilder=$(pwd)/../org.eclipse.releng.eclipsebuilder
+mv upstream/src .
+rm -rf upstream
-cd "${fetchDirectory}"
+cd src
+# Source for ECF bits that aren't part of SDK source drop
mkdir ecf-src
-# Source for ECF bits that aren't part of SDK map files
for f in \
org.eclipse.ecf \
org.eclipse.ecf.filetransfer \
@@ -187,11 +94,6 @@ export -r ${equinoxTag} org.eclipse.equinox/components/bundles/org.eclipse.equin
mv org.eclipse.equinox/components/bundles/* ecf-src
rm -rf org.eclipse.equinox
-cd "${fetchDirectory}"
-# We don't want to re-ship these as those bundles inside will already be
-# copied into the right places for the build
-rm -rf ecfBundles orbitRepo
-
# Remove files from the version control system
find -depth -name CVS -exec rm -rf {} \;
@@ -201,42 +103,61 @@ find \( -name '*.jnilib' -o -name '*.sl' \) -delete
find \( -name '*.a' -o -name '*.so' -o -name '*.so.2' \) -delete
find features/org.eclipse.equinox.executable -name eclipse -delete
-# Remove unused files
-rm -f plugins/org.eclipse.core.resources/natives/ref.c
-
-# Remove unused jar files
-rm -f plugins/org.apache.ant_*/lib/ant-jai.jar
-rm -f plugins/org.apache.ant_*/lib/ant-jmf.jar
-rm -f plugins/org.apache.ant_*/lib/ant-netrexx.jar
-rm -f plugins/org.apache.ant_*/lib/ant-starteam.jar
-rm -f plugins/org.apache.ant_*/lib/ant-stylebook.jar
-rm -f plugins/org.apache.ant_*/lib/ant-weblogic.jar
-rm -f plugins/org.apache.ws.commons.util_*.jar
-rm -f plugins/org.apache.ws.jaxme_*.jar
-rm -f plugins/org.apache.xmlrpc_*.jar
-rm -f plugins/org.eclipse.jdt.ui.examples.projects/archive/junit/junit381src.jar
-rm -f plugins/org.eclipse.osgi/osgi/ee.foundation.jar
-rm -f plugins/org.eclipse.osgi/osgi/ee.minimum-1.2.0.jar
-rm -f plugins/org.eclipse.osgi/osgi/ee.minimum.jar
-rm -f plugins/org.eclipse.osgi/osgi/exceptions.jar
-rm -f plugins/org.eclipse.osgi/osgi/osgi.cmpn.jar
-rm -f plugins/org.eclipse.osgi/osgi/osgi.core.jar
-rm -f plugins/org.eclipse.pde.core/ant_tasks/pde-ant.jar
-rm -f plugins/org.eclipse.swt/extra_jars/exceptions.jar
-rm -f plugins/org.eclipse.ecf*.jar
-rm -f plugins/org.mortbay.jetty_5*.jar
-
# Remove empty directories
find -depth -type d -empty -delete
-mkdir eclipse-${buildID}-fetched-src
-mv * eclipse-${buildID}-fetched-src
-tar cjf "${workDirectory}"/eclipse-${buildID}-fetched-src.tar.bz2 \
- eclipse-${buildID}-fetched-src
-cd "${eclipseBuilder}"
-
+# Remove binary JARs
+cd plugins
+rm *.jar
+rm org.apache.ant_*/lib/*.jar
+rm org.junit_*/junit.jar
+rm org.junit4/junit.jar
+rm org.eclipse.osgi/osgi/*.jar
+rm org.eclipse.swt/extra_jars/exceptions.jar
+rm -rf *\.source_*
+cd ../features
+rm -rf *\.source
+
+cd ${workDirectory}
+mv eclipse-${label}-src/src/* eclipse-${label}-src
+rmdir eclipse-${label}-src/src
+tar cjf eclipse-${label}-src.tar.bz2 \
+ eclipse-${label}-src
+
+#-------------- / Tests / --------------------#
if [ "${fetchTests}" = "yes" ]; then
+homeDirectory="${workDirectory}"/userhome
+rm -rf "${homeDirectory}"
+mkdir -p "${homeDirectory}"
+workspace="${workDirectory}"/workspace
+rm -rf "${workspace}"
+mkdir -p "${workspace}"
+cvsRepo=":pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse"
+mapsRoot="org.eclipse.releng/maps"
+
+pushd ${eclipseBuilder}
+patch -p0 < "${baseDir}"/patches/eclipse-addFetchMasterAndTestsTargets.patch
+popd
+
+# Fetch basebuilder
+if [ "x${baseBuilder}x" = "xx" ]; then
+ baseBuilder="${workDirectory}"/org.eclipse.releng.basebuilder
+ echo "Basebuilder checkout not specified; will check out ${baseBuilderTag} into ${baseBuilder}."
+fi
+
+if [ ! -e "${baseBuilder}" ]; then
+ mkdir -p "${baseBuilder}"
+ cd "${baseBuilder}"/..
+ cvs -d${cvsRepo} co -r ${baseBuilderTag} org.eclipse.releng.basebuilder
+ cd "${baseDir}"
+fi
+
+# Build must be run from within o.e.r.eclipsebuilder checkout
+cd ${eclipsebuilder}
+
+fetchDirectory="${workDirectory}"/fetch
+mkdir -p "${fetchDirectory}"
rm -rf "${fetchDirectory}"/*
java -jar \
@@ -258,25 +179,27 @@ fetchSdkTestsFeature \
2>&1 | tee "${workDirectory}"/testsFetch.log
cd "${fetchDirectory}"
-mkdir eclipse-sdktests-${buildID}-fetched-src
-mv * eclipse-sdktests-${buildID}-fetched-src
-tar cjf "${workDirectory}"/eclipse-sdktests-${buildID}-fetched-src.tar.bz2 \
- eclipse-sdktests-${buildID}-fetched-src
+mkdir eclipse-sdktests-${label}-src
+mv * ${workDirectory}/eclipse-sdktests-${label}-src
+tar cjf "${workDirectory}"/eclipse-sdktests-${label}-src.tar.bz2 \
+ ${workDirectory}/eclipse-sdktests-${label}-src
# Testing runtests and test.xml scripts which are not in org.eclipse.test
cvs -d:pserver:anonymous at dev.eclipse.org:/cvsroot/eclipse co \
-r ${buildID} \
org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testScripts
scriptsDir=org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testScripts
-testScripts=eclipse-sdktests-${buildID}-fetched-scripts
+testScripts=eclipse-sdktests-${label}-scripts
mkdir ${testScripts}
mv ${scriptsDir}/runtests ${testScripts}
mv ${scriptsDir}/test.xml ${testScripts}
rm -rf org.eclipse.releng.eclipsebuilder
tar cjf \
- "${workDirectory}"/eclipse-sdktests-${buildID}-fetched-scripts.tar.bz2 \
+ "${workDirectory}"/eclipse-sdktests-${label}-fetched-scripts.tar.bz2 \
${testScripts}
fi
+#-------------- / tests / --------------------#
+rm -rf ${eclipseBuilder}
-cd "${baseDir}"
+cd "${baseDir}"
\ No newline at end of file
diff --git a/generateAdditionalPlatforms.xml b/generateAdditionalPlatforms.xml
index 99724a3..642fd35 100644
--- a/generateAdditionalPlatforms.xml
+++ b/generateAdditionalPlatforms.xml
@@ -1,7 +1,7 @@
<project name="Pdebuild bootstrap" default="cleanGenerate" basedir=".">
<target name="cleanGenerate" depends="clean, createTarball" />
<property name="archsDir" value="additionalArchs" />
- <property name="sourceDir" value="build/eclipse-R3_5_1-fetched-src" />
+ <property name="sourceDir" value="build/eclipse-3.5.2-src" />
<macrodef name="copyPlugin">
<attribute name="pluginName" />
diff --git a/patches/eclipse-nosourcebundlesfordependencies.patch b/patches/eclipse-nosourcebundlesfordependencies.patch
index 9510e63..4a79c0c 100644
--- a/patches/eclipse-nosourcebundlesfordependencies.patch
+++ b/patches/eclipse-nosourcebundlesfordependencies.patch
@@ -1,6 +1,6 @@
-diff -up ./features/org.eclipse.platform/sourceTemplateFeature/build.properties.nodepsourcebundles ./features/org.eclipse.platform/sourceTemplateFeature/build.properties
---- ./features/org.eclipse.platform/sourceTemplateFeature/build.properties.nodepsourcebundles 2010-02-26 10:43:44.777974439 -0500
-+++ ./features/org.eclipse.platform/sourceTemplateFeature/build.properties 2010-02-26 10:45:40.561701587 -0500
+diff -up ./features/org.eclipse.platform/sourceTemplateFeature/build.properties.nosourcebundlesfordependencies ./features/org.eclipse.platform/sourceTemplateFeature/build.properties
+--- ./features/org.eclipse.platform/sourceTemplateFeature/build.properties.nosourcebundlesfordependencies 2010-02-26 13:45:43.000000000 -0500
++++ ./features/org.eclipse.platform/sourceTemplateFeature/build.properties 2010-02-26 13:46:34.000000000 -0500
@@ -15,7 +15,7 @@ feature.xml,\
feature.properties,\
license.html
@@ -10,12 +10,14 @@ diff -up ./features/org.eclipse.platform/sourceTemplateFeature/build.properties.
generate.feature at org.eclipse.equinox.p2.user.ui.source=org.eclipse.equinox.p2.user.ui,\
plugin at org.eclipse.ecf.source;version=3.0.0.qualifier;unpack="false",\
plugin at org.eclipse.ecf.ssl.source;version=1.0.0.qualifier;unpack="false",\
-@@ -25,8 +25,6 @@ generate.feature at org.eclipse.equinox.p2.
+@@ -24,9 +24,7 @@ generate.feature at org.eclipse.equinox.p2.
+ plugin at org.eclipse.ecf.provider.filetransfer.source;version=3.0.0.qualifier;unpack="false",\
plugin at org.eclipse.ecf.provider.filetransfer.ssl.source;version=1.0.0.qualifier;unpack="false",\
plugin at org.eclipse.ecf.provider.filetransfer.httpclient.source;version=3.0.0.qualifier;unpack="false",\
- plugin at org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false",\
+- plugin at org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false",\
- plugin at org.apache.commons.codec.source;version=1.3.0.qualifier;unpack="false,\
- plugin at org.apache.commons.httpclient.source;version=3.1.0.qualifier;unpack="false"
++ plugin at org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source;version=1.0.0.qualifier;unpack="false"
@@ -26,10 +28,10 @@ diff -up ./features/org.eclipse.platform/sourceTemplateFeature/build.properties.
-
\ No newline at end of file
+
-diff -up ./features/org.eclipse.sdk/build.properties.nodepsourcebundles ./features/org.eclipse.sdk/build.properties
---- ./features/org.eclipse.sdk/build.properties.nodepsourcebundles 2010-02-26 10:43:53.435706672 -0500
-+++ ./features/org.eclipse.sdk/build.properties 2010-02-26 10:47:14.500699386 -0500
-@@ -11,26 +11,13 @@
+diff -up ./features/org.eclipse.sdk/build.properties.nosourcebundlesfordependencies ./features/org.eclipse.sdk/build.properties
+--- ./features/org.eclipse.sdk/build.properties.nosourcebundlesfordependencies 2010-02-26 13:45:53.000000000 -0500
++++ ./features/org.eclipse.sdk/build.properties 2010-02-26 13:47:39.000000000 -0500
+@@ -11,26 +11,14 @@
bin.includes=epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html
generate.feature at org.eclipse.platform.source=org.eclipse.platform,feature at org.eclipse.rcp.source,feature at org.eclipse.equinox.p2.user.ui.source;optional="true",plugin at org.eclipse.platform.doc.isv;unpack="false",\
@@ -40,8 +42,10 @@ diff -up ./features/org.eclipse.sdk/build.properties.nodepsourcebundles ./featur
generate.feature at org.eclipse.jdt.source=org.eclipse.jdt, plugin at org.eclipse.jdt.doc.isv;unpack="false",\
-plugin at org.junit.source;version=3.8.2.qualifier;unpack="false",\
-plugin at org.hamcrest.core.source;version=1.1.0.qualifier;unpack="false",\
- exclude at org.eclipse.jdt.doc.user
+-exclude at org.eclipse.jdt.doc.user
-generate.feature at org.eclipse.pde.source=org.eclipse.pde,plugin at org.objectweb.asm.source;version=3.1.0.qualifier;unpack="false",\exclude at org.eclipse.pde.doc.user
++exclude at org.eclipse.jdt.doc.user,\
++exclude at org.junit4
+generate.feature at org.eclipse.pde.source=org.eclipse.pde,exclude at org.eclipse.pde.doc.user
generate.feature at org.eclipse.pde.p2.source=org.eclipse.pde.p2
generate.feature at org.eclipse.cvs.source=org.eclipse.cvs
diff --git a/pdebuild.properties b/pdebuild.properties
index b64cdd2..8df501e 100644
--- a/pdebuild.properties
+++ b/pdebuild.properties
@@ -4,6 +4,7 @@ os=linux
buildId=M20100210-0800
buildTag=vM20100210-0800
+label=3.5.2
bootclasspath=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.jar:/usr/lib/jvm/default-java/jre/lib/rt.jar:/usr/lib/jvm/default-java/jre/lib/jce.jar
#build.compiler=org.eclipse.jdt.core.JDTCompilerAdapter
diff --git a/pdebuild.xml b/pdebuild.xml
index 166f3b8..5cf637a 100644
--- a/pdebuild.xml
+++ b/pdebuild.xml
@@ -1,6 +1,6 @@
<project name="Pdebuild bootstrap" default="cleanBuild" basedir=".">
<property file="pdebuild.properties" />
- <property name="sdkSource" value="build/eclipse-${buildTag}-fetched-src" />
+ <property name="sdkSource" value="build/eclipse-${label}-src" />
<target name="cleanBuild" depends="clean,zipPlugins2" />
<macrodef name="generateBuildScripts">
<attribute name="buildDirs" />
@@ -112,7 +112,6 @@
<include name="org.hamcrest.core*" />
<include name="javax.servlet*" />
<include name="org.objectweb.asm*" />
- <exclude name="*.source*" />
</fileset>
<path id="pdebuildClasspath">
<pathelement location="${sdkSource}/plugins/org.eclipse.pde.build/lib/pdebuild-ant.jar" />
diff --git a/regenerateBootstrapFiles.sh b/regenerateBootstrapFiles.sh
index b962e8f..d46018b 100644
--- a/regenerateBootstrapFiles.sh
+++ b/regenerateBootstrapFiles.sh
@@ -2,14 +2,14 @@
baseDir=$(pwd)
workDirectory=
-buildID=R3_5_1
+buildID=R3_5_2
baseBuilder=
eclipseBuilder=
baseBuilderTag="R3_5"
-eclipseBuilderTag="R3_5_1"
+eclipseBuilderTag="R3_5_2"
fetchTests="no"
orbitRepoZip=orbitRepo-R20090825191606.zip
-ecfBundlesZip=ecf-R3_5_1.zip
+ecfBundlesZip=ecf-R3_5_2.zip
ecfTag="v20090604-1131"
java -jar \
@@ -18,7 +18,7 @@ java -jar \
-data build/eclipse-vM20100210-0800-fetched-src \
-application org.eclipse.ant.core.antRunner \
-f pdebuild.xml generateScripts \
--DbuildDirectory=build/eclipse-vM20100210-0800-fetched-src \
+-DbuildDirectory=build/eclipse-3.5.2-src \
-DskipBase=true \
--DsdkSource=build/eclipse-vM20100210-0800-fetched-src \
+-DsdkSource=build/eclipse-3.5.2-src \
2>&1 | tee ./generatePdeBuildScripts.log
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list