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, master has been updated
via 68944a0751e9bc28bf176ff148d61cb750045452 (commit)
via 63867c17aba55348473bc35858c1bac207247a50 (commit)
via b428b3396bb17459df8faa7ac296e5a92f1b9294 (commit)
via 5abbf42e218eee1722259b8aa72873414be22497 (commit)
via 5a85b852c5dc55940a6b91eb24ff1a4e451a0f75 (commit)
from 6db837fabc3eeef6262256b835e0f1be0d82c6ad (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 68944a0751e9bc28bf176ff148d61cb750045452
Author: Benjamin Drung <[email protected]>
Date: Thu Oct 1 13:29:43 2009 +0200
update debian/changelog
commit 63867c17aba55348473bc35858c1bac207247a50
Merge: 6db837fabc3eeef6262256b835e0f1be0d82c6ad
b428b3396bb17459df8faa7ac296e5a92f1b9294
Author: Benjamin Drung <[email protected]>
Date: Thu Oct 1 13:28:48 2009 +0200
Merge branch 'upstream'
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 32 ++++++
build.properties | 7 +-
build.xml | 33 +++---
buildSDKSource.sh | 112 ++++++++++++++++----
debian/changelog | 4 +-
...tar.bz2 => eclipse-R3_5_1-fetched-src.2.tar.bz2 | Bin 86737752 -> 86976475
bytes
eclipse-build-config/ChangeLog | 5 +
.../productFiles/rcp.sdk/rcp.product | 2 +-
eclipse-build-config/productFiles/sdk/sdk.product | 2 +-
eclipse-build-feature/ChangeLog | 6 +-
eclipse-build-feature/feature.xml | 2 +-
eclipse-build-generatedScripts.tar.bz2 | Bin 13294 -> 13474 bytes
eclipse.desktop | 1 -
patches/eclipse-dontusefullmoonformaster.patch | 13 +++
patches/eclipse-useLocalECFBundles.patch | 10 ++
15 files changed, 183 insertions(+), 46 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7fbb6fc..6f7ba77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,35 @@
+2009-09-30 Alexander Kurtakov <[email protected]>
+
+ * build.properties: Separate buildId and buildTag.
+ * build.xml: Likewise.
+
+2009-09-30 Alexander Kurtakov <[email protected]>
+
+ * eclipse-build-generatedScripts.tar.bz2: Regenerate for 3.5.1.
+
+2009-09-30 Andrew Overholt <[email protected]>
+
+ * buildSDKSource.sh: Don't use "v" prefix for tag of tests.
+
+2009-09-29 Andrew Overholt <[email protected]>
+
+ * buildSDKSource.sh: Update for 3.5.1. Use local Orbit and ECF dumps if
+ present. Check out a version of eclipsebuilder (not HEAD). Don't
generate
+ bootstrap build.xml files as part of source fetching. Fetch ECF
sources.
+ * build.xml: Use testsBuildLabel and p2.director.version properties from
+ build.properties.
+ * build.properties: Move testsBuildLabel and p2.director.version here.
+ Update default buildId.
+ * patches/eclipse-useLocalECFBundles.patch: Initial check-in. Use local
ECF
+ bundles instead of hitting eclipse.org where possible.
+ * patches/eclipse-dontusefullmoonformaster.patch: Initial check-in.
Don't use
+ internal IBM mirror.
+
+2009-09-25 Andrew Overholt <[email protected]>
+
+ * eclipse.desktop: Remove Encoding
+ (see http://standards.freedesktop.org/desktop-entry-spec/1.0/apc.html).
+
2009-09-25 Alexander Kurtakov <[email protected]>
* patches/tests-nostyletask.patch: New file.
diff --git a/build.properties b/build.properties
index 8965ae4..560d186 100644
--- a/build.properties
+++ b/build.properties
@@ -1,6 +1,9 @@
#baseLocation=${basedir}/bootstrap
# Note: this is also in pdebuild.properties
-buildId=I20090611-1540
+buildId=M20090917-0800
+buildTag=R3_5_1
+testsBuildLabel=3.5.1
+p2.director.version=${testsBuildLabel}
testsBuildId=v20090227
featureToBuild=eclipse-build-feature
skipBase=true
@@ -61,4 +64,4 @@
PersonalJava-1.2=/usr/lib/jvm/java/jre/lib/rt.jar:/usr/lib/jvm/java/jre/lib/jce.
CDC-1.0/PersonalBasis-1.0=/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
CDC-1.0/PersonalJava-1.0=/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
CDC-1.1/PersonalBasis-1.1=/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
-CDC-1.1/PersonalJava-1.1=/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
\ No newline at end of file
+CDC-1.1/PersonalJava-1.1=/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
diff --git a/build.xml b/build.xml
index 2ccdc8c..a3355d3 100644
--- a/build.xml
+++ b/build.xml
@@ -5,14 +5,14 @@
<property file="build.properties" />
- <available file="eclipse-${buildId}-fetched-src.tar.bz2"
property="sdkSourcePresent" value="true" />
+ <available file="eclipse-${buildTag}-fetched-src.tar.bz2"
property="sdkSourcePresent" value="true" />
<available file="eclipse-build-generatedScripts.tar.bz2"
property="scriptsPresent" value="true" />
- <available file="eclipse-sdktests-${buildId}-fetched-src.tar.bz2"
property="testsSourcePresent" value="true" />
- <available file="eclipse-sdktests-${buildId}-fetched-scripts.tar.bz2"
property="testsScriptsPresent" 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" />
<!-- Check what has already been done -->
- <uptodate property="unpack.complete"
srcfile="${basedir}/eclipse-${buildId}-fetched-src.tar.bz2"
targetfile="unpack-stamp" />
- <uptodate property="testsunpack.complete"
srcfile="${basedir}/eclipse-sdktests-${buildId}-fetched-src.tar.bz2"
targetfile="testsunpack-stamp" />
+ <uptodate property="unpack.complete"
srcfile="${basedir}/eclipse-${buildTag}-fetched-src.tar.bz2"
targetfile="unpack-stamp" />
+ <uptodate property="testsunpack.complete"
srcfile="${basedir}/eclipse-sdktests-${buildTag}-fetched-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="testspatch.complete" srcfile="testsunpack-stamp"
targetfile="testspatch-stamp" />
@@ -29,13 +29,12 @@
<property name="homeDir" value="${basedir}/home" />
<property name="baseworkspace" value="${basedir}/baseworkspace" />
<property name="buildworkspace" value="${basedir}/buildworkspace" />
- <property name="buildDirectory"
value="${topBuildDir}/eclipse-${buildId}-fetched-src" />
- <property name="testsBuildDirectory"
value="${testsBuildDir}/eclipse-sdktests-${buildId}-fetched-src" />
+ <property name="buildDirectory"
value="${topBuildDir}/eclipse-${buildTag}-fetched-src" />
+ <property name="testsBuildDirectory"
value="${testsBuildDir}/eclipse-sdktests-${buildTag}-fetched-src" />
<property name="buildConfigs" value="${buildDirectory}/buildConfigs" />
<property name="buildConfig"
value="${buildConfigs}/eclipse-build-config" />
<property name="productFiles" value="${buildConfig}/productFiles" />
<property name="reposource" value="${buildDirectory}/reposource" />
- <property name="testsBuildLabel" value="3.5"/>
<property name="destDir" value="" />
<property name="prefix" value="/usr/local" />
@@ -91,7 +90,7 @@
</target>
<target name="extractBuildXmls" if="scriptsPresent">
- <untar compression="bzip2"
dest="${basedir}/build/eclipse-${buildId}-fetched-src"
+ <untar compression="bzip2"
dest="${basedir}/build/eclipse-${buildTag}-fetched-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."/>
@@ -112,8 +111,8 @@
<delete dir="${buildworkspace}" />
<mkdir dir="${buildworkspace}" />
- <echo message="Extracting SDK source (tar jxf
eclipse-${buildId}-fetched-src.tar.bz2)" />
- <untar dest="${topBuildDir}"
src="${basedir}/eclipse-${buildId}-fetched-src.tar.bz2" compression="bzip2" />
+ <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" />
<antcall target="extractBuildXmls"/>
<delete dir="${buildDirectory}/buildConfigs" />
@@ -145,11 +144,11 @@
<delete dir="${buildworkspace}" />
<mkdir dir="${buildworkspace}" />
- <echo message="Extracting SDK tests source (tar jxf
eclipse-sdktests-${buildId}-fetched-src.tar.bz2)" />
- <untar dest="${testsBuildDir}"
src="${basedir}/eclipse-sdktests-${buildId}-fetched-src.tar.bz2"
compression="bzip2" />
- <untar dest="${testsBuildDir}"
src="${basedir}/eclipse-sdktests-${buildId}-fetched-scripts.tar.bz2"
compression="bzip2" />
+ <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" />
<move todir="${testsBuildDir}">
- <fileset
dir="${testsBuildDir}/eclipse-sdktests-${buildId}-fetched-scripts">
+ <fileset
dir="${testsBuildDir}/eclipse-sdktests-${buildTag}-fetched-scripts">
<include name="**/*" />
</fileset>
</move>
@@ -326,7 +325,7 @@
</target>
<target name="p2prep" depends="build" unless="p2prep.complete">
- <!--<property name="builtZip"
value="${buildDirectory}/${buildLabel}/${featureToBuild}-${buildId}-group.group.group.zip"
/>-->
+ <!--<property name="builtZip"
value="${buildDirectory}/${buildLabel}/${featureToBuild}-${buildTag}-group.group.group.zip"
/>-->
<!-- archiveName is set in the build config's customTargets.xml
-->
<!-- FIXME buildLabel should be used here but it's not defined
so we cheat and use I.${buildId} instead. -->
<property name="builtZip"
value="${buildDirectory}/I.${buildId}/eclipse-SDK-${buildId}.zip"/>
@@ -468,7 +467,7 @@
<echo message="Installing into:
${buildDirectory}/installation"/>
<antcall target="run.director">
<param name="p2.director.installIU"
value="org.eclipse.sdk.ide" />
- <param name="p2.director.version"
value="3.5.0.${buildId}" />
+ <param name="p2.director.version"
value="${p2.director.version}" />
<param name="p2.director.profile" value="SDKProfile" />
<param name="p2.director.install.path"
value="${buildDirectory}/installation" />
<param name="p2.director.extraArgs"
value="-profileProperties org.eclipse.update.install.features=true" />
diff --git a/buildSDKSource.sh b/buildSDKSource.sh
index 3c6b2fd..3ffd7a2 100755
--- a/buildSDKSource.sh
+++ b/buildSDKSource.sh
@@ -1,16 +1,19 @@
-#!/bin/sh
+#!/bin/bash
# Possible optimizations:
# - don't check out non-Linux fragments (will need to patch features for this)
baseDir=$(pwd)
workDirectory=
-buildID=I20090611-1540
+buildID=R3_5_1
baseBuilder=
eclipseBuilder=
baseBuilderTag="R3_5"
+eclipseBuilderTag="R3_5_1"
fetchTests="no"
-eclipse-buildTag="R0_0_1"
+orbitRepoZip=orbitRepo-R20090825191606.zip
+ecfBundlesZip=ecf-R3_5_1.zip
+ecfTag="v20090604-1131"
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]"
@@ -22,6 +25,7 @@ do
-baseBuilder) baseBuilder="$2"; shift;;
-baseBuilderTag) baseBuilderTag="$2"; shift;;
-eclipseBuilder) eclipseBuilder="$2"; shift;;
+ -eclipseBuilderTag) eclipseBuilderTag="$2"; shift;;
-noTests) fetchTests="no"; shift;;
-help) echo $usage; exit 0;;
--help) echo $usage; exit 0;;
@@ -33,7 +37,7 @@ done
# Must specify a build ID
if [ "x${buildID}x" = "xx" ]; then
- echo >&2 "Must specify build ID. Example: I20090611-1540 ."
+ echo >&2 "Must specify build ID. Example: R3_5_1 ."
echo >&2 "${usage}"
exit 1
else
@@ -77,12 +81,51 @@ fi
if [ ! -e ${eclipseBuilder} ]; then
mkdir -p "${eclipseBuilder}"
cd "${eclipseBuilder}"/..
- cvs -d${cvsRepo} co org.eclipse.releng.eclipsebuilder
- cd org.eclipse.releng.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
+
# Build must be run from within o.e.r.eclipsebuilder checkout
cd "${eclipseBuilder}"
@@ -104,19 +147,48 @@ fetchMasterFeature \
-Duser.home="${homeDirectory}" \
2>&1 | tee ${workDirectory}/sourcesFetch.log
-java -jar \
-"${baseBuilder}"/plugins/org.eclipse.equinox.launcher_*.jar \
--consolelog \
--data "${workspace}" \
--application org.eclipse.ant.core.antRunner \
--f ../pdebuild.xml generateScripts \
--DbuildDirectory="${fetchDirectory}" \
--DskipBase=true \
--Duser.home="${homeDirectory}" \
--DsdkSource="${fetchDirectory}" \
-2>&1 | tee "${workDirectory}"/generatePdeBuildScripts.log
+cd "${fetchDirectory}"
+
+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 \
+ org.eclipse.ecf.identity \
+ org.eclipse.ecf.ssl \
+; do
+cvs -d :pserver:[email protected]:/cvsroot/rt \
+export -r ${ecfTag} org.eclipse.ecf/framework/bundles/$f;
+done
+
+mv org.eclipse.ecf/framework/bundles/* ecf-src
+rm -fr org.eclipse.ecf/framework
+
+for f in \
+ org.eclipse.ecf.provider.filetransfer \
+ org.eclipse.ecf.provider.filetransfer.httpclient \
+ org.eclipse.ecf.provider.filetransfer.httpclient.ssl \
+ org.eclipse.ecf.provider.filetransfer.ssl \
+; do
+cvs -d :pserver:[email protected]:/cvsroot/rt \
+export -r ${ecfTag} org.eclipse.ecf/providers/bundles/$f;
+done
+
+mv org.eclipse.ecf/providers/bundles/* ecf-src
+rm -fr org.eclipse.ecf
+
+cvs -d :pserver:[email protected]:/cvsroot/rt \
+export -r ${buildID}
org.eclipse.equinox/components/bundles/org.eclipse.equinox.concurrent;
+
+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
+
mkdir eclipse-${buildID}-fetched-src
mv * eclipse-${buildID}-fetched-src
tar cjf "${workDirectory}"/eclipse-${buildID}-fetched-src.tar.bz2 \
@@ -151,11 +223,9 @@ mv * eclipse-sdktests-${buildID}-fetched-src
tar cjf "${workDirectory}"/eclipse-sdktests-${buildID}-fetched-src.tar.bz2 \
eclipse-sdktests-${buildID}-fetched-src
-fi
-
# Testing runtests and test.xml scripts which are not in org.eclipse.test
cvs -d:pserver:[email protected]:/cvsroot/eclipse co \
- -r v${buildID} \
+ -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
@@ -167,4 +237,6 @@ tar cjf \
"${workDirectory}"/eclipse-sdktests-${buildID}-fetched-scripts.tar.bz2 \
${testScripts}
+fi
+
cd "${baseDir}"
diff --git a/debian/changelog b/debian/changelog
index 8ac53b8..50aeaf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-eclipse (3.5.0-1) UNRELEASED; urgency=low
+eclipse (3.5.1-1) UNRELEASED; urgency=low
* New upstream release. (LP: #123064)
- Supports xulrunner-1.9.1 (Closes: #538871, #507536)
@@ -15,7 +15,7 @@ eclipse (3.5.0-1) UNRELEASED; urgency=low
* Removed dependency on libtomcat5.5-java and liblucene-javadoc.
(Closes: #530722, #537605)
- -- Niels Thykier <[email protected]> Sun, 23 Aug 2009 19:39:51 +0200
+ -- Benjamin Drung <[email protected]> Thu, 01 Oct 2009 13:29:24 +0200
eclipse (3.4.1-1) unstable; urgency=low
diff --git a/eclipse-I20090611-1540-fetched-src.tar.bz2
b/eclipse-R3_5_1-fetched-src.2.tar.bz2
similarity index 84%
rename from eclipse-I20090611-1540-fetched-src.tar.bz2
rename to eclipse-R3_5_1-fetched-src.2.tar.bz2
index 74d1a03..c434f30 100644
Binary files a/eclipse-I20090611-1540-fetched-src.tar.bz2 and
b/eclipse-R3_5_1-fetched-src.2.tar.bz2 differ
diff --git a/eclipse-build-config/ChangeLog b/eclipse-build-config/ChangeLog
index 793b677..df82e8c 100644
--- a/eclipse-build-config/ChangeLog
+++ b/eclipse-build-config/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-30 Andrew Overholt <[email protected]>
+
+ * productFiles/sdk/sdk.product: Update for 3.5.1.
+ * productFiles/rcp.sdk/rcp.product: Likewise.
+
2009-09-22 Andrew Overholt <[email protected]>
* productFiles/sdk/sdk.product: Remote dropins from default eclipse.ini
as
diff --git a/eclipse-build-config/productFiles/rcp.sdk/rcp.product
b/eclipse-build-config/productFiles/rcp.sdk/rcp.product
index edd8b0c..2d2313e 100644
--- a/eclipse-build-config/productFiles/rcp.sdk/rcp.product
+++ b/eclipse-build-config/productFiles/rcp.sdk/rcp.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Eclipse RCP SDK" uid="org.eclipse.rcp.sdk.id"
version="3.5...@qualifier@" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse RCP SDK" uid="org.eclipse.rcp.sdk.id"
version="3.5...@qualifier@" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
diff --git a/eclipse-build-config/productFiles/sdk/sdk.product
b/eclipse-build-config/productFiles/sdk/sdk.product
index cb95c66..0228566 100644
--- a/eclipse-build-config/productFiles/sdk/sdk.product
+++ b/eclipse-build-config/productFiles/sdk/sdk.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Eclipse SDK" id="org.eclipse.sdk.ide"
application="org.eclipse.ui.ide.workbench" version="3.5...@qualifier@"
useFeatures="true" includeLaunchers="true">
+<product name="Eclipse SDK" id="org.eclipse.sdk.ide"
application="org.eclipse.ui.ide.workbench" version="3.5...@qualifier@"
useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
diff --git a/eclipse-build-feature/ChangeLog b/eclipse-build-feature/ChangeLog
index 950be1a..fca85bf 100644
--- a/eclipse-build-feature/ChangeLog
+++ b/eclipse-build-feature/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-29 Andrew Overholt <[email protected]>
+
+ * feature.xml: Update to 3.5.1
+
2009-06-17 Andrew Overholt <[email protected]>
* feature.xml: Include master-jetty feature to avoid building loops.
@@ -5,4 +9,4 @@
2009-06-09 Andrew Overholt <[email protected]>
* build.properties: Initial checkin.
- * feature.xml: Likewise.
\ No newline at end of file
+ * feature.xml: Likewise.
diff --git a/eclipse-build-feature/feature.xml
b/eclipse-build-feature/feature.xml
index e35efa9..91a9170 100755
--- a/eclipse-build-feature/feature.xml
+++ b/eclipse-build-feature/feature.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="eclipse-build-feature"
- version="3.5.0.qualifier">
+ version="3.5.1.qualifier">
<includes
id="master-jetty"
diff --git a/eclipse-build-generatedScripts.tar.bz2
b/eclipse-build-generatedScripts.tar.bz2
index d7236b7..654c773 100644
Binary files a/eclipse-build-generatedScripts.tar.bz2 and
b/eclipse-build-generatedScripts.tar.bz2 differ
diff --git a/eclipse.desktop b/eclipse.desktop
index e28e1e9..f63d9ec 100644
--- a/eclipse.desktop
+++ b/eclipse.desktop
@@ -1,5 +1,4 @@
[Desktop Entry]
-Encoding=UTF-8
Type=Application
Name=Eclipse
Comment=Eclipse Integrated Development Environment
diff --git a/patches/eclipse-dontusefullmoonformaster.patch
b/patches/eclipse-dontusefullmoonformaster.patch
new file mode 100644
index 0000000..4cff4e0
--- /dev/null
+++ b/patches/eclipse-dontusefullmoonformaster.patch
@@ -0,0 +1,13 @@
+--- eclipse/buildConfigs/master/customTargets.xml 2009-06-26
10:21:47.000000000 -0400
++++ eclipse/buildConfigs/master/customTargets.xml 2009-09-29
09:56:25.000000000 -0400
+@@ -118,6 +118,10 @@
+ <!-- Steps to do before fetching the build elements -->
+ <!--
===================================================================== -->
+ <target name="preFetch">
++ <replace file="${buildDirectory}/directory.txt"
token="http://fullmoon.ottawa.ibm.com/tools/orbit/downloads/drops/R20090825191606/updateSite";
value="file://${buildDirectory}/orbitRepo" />
++ <replace file="${buildDirectory}/directory.txt"
token="http://www.eclipse.org/external/tools/orbit/downloads/drops/R20090825191606/updateSite";
value="file://${buildDirectory}/orbitRepo" />
++ <replace file="${buildDirectory}/directory.txt"
token="http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite";
value="file://${buildDirectory}/orbitRepo" />
++ <replace file="${buildDirectory}/directory.txt"
token="http://download.eclipse.org/tools/orbit/downloads/drops/S20090426201227/bundles";
value="file://${buildDirectory}/orbitRepo/plugins" />
+ </target>
+
+ <!--
===================================================================== -->
diff --git a/patches/eclipse-useLocalECFBundles.patch
b/patches/eclipse-useLocalECFBundles.patch
new file mode 100644
index 0000000..f86497d
--- /dev/null
+++ b/patches/eclipse-useLocalECFBundles.patch
@@ -0,0 +1,10 @@
+--- eclipse/buildConfigs/master/customTargets.xml.orig 2009-09-29
15:43:44.000000000 -0400
++++ eclipse/buildConfigs/master/customTargets.xml 2009-09-29
15:44:31.000000000 -0400
+@@ -122,6 +122,7 @@
+ <replace file="${buildDirectory}/directory.txt"
token="http://www.eclipse.org/external/tools/orbit/downloads/drops/R20090825191606/updateSite";
value="file://${buildDirectory}/orbitRepo" />
+ <replace file="${buildDirectory}/directory.txt"
token="http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/updateSite";
value="file://${buildDirectory}/orbitRepo" />
+ <replace file="${buildDirectory}/directory.txt"
token="http://download.eclipse.org/tools/orbit/downloads/drops/S20090426201227/bundles";
value="file://${buildDirectory}/orbitRepo/plugins" />
++ <replace file="${buildDirectory}/directory.txt"
token="http://www.eclipse.org/external/rt/ecf/integration/platform/v2009-08-31_12-00-11/plugins";
value="file://${buildDirectory}/ecfBundles" />
+ </target>
+
+ <!--
===================================================================== -->
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
