[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.6, updated. eclipse-ppa/maverick-163-gcea61d6
Benjamin Drung
bdrung-guest at alioth.debian.org
Fri Aug 6 21:46:59 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, master-3.6 has been updated
via cea61d6b0ce2e600e1d04017b8ba9dadc188809e (commit)
via 05e400e1d809a3b78e97b76e263c71569a8956ca (commit)
via d1bba732ef09fe688dbaea31fe8635ac089167c7 (commit)
from 1e571bd03f6a324a729dd066ecf98a0f623be8d4 (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 cea61d6b0ce2e600e1d04017b8ba9dadc188809e
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Fri Aug 6 23:14:25 2010 +0200
Refresh patches.
commit 05e400e1d809a3b78e97b76e263c71569a8956ca
Merge: 1e571bd d1bba73
Author: Benjamin Drung <bdrung at ubuntu.com>
Date: Fri Aug 6 23:12:14 2010 +0200
Merge branch 'upstream-3.6' into master-3.6
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 22 +++++
build.xml | 87 ++++++++++++++------
debian/patches/compile-IPluginDescriptor.patch | 2 +-
debian/patches/compile-jarinjarloader.patch | 2 +-
debian/patches/eclipse-manpage.patch | 4 +-
...nerate-metadata-and-extract-swt-libraries.patch | 4 +-
debian/patches/remove-unnecessary-files.patch | 2 +-
debian/patches/strip-destDir.patch | 2 +-
patches/donotstorebuildlogsinfiles.patch | 11 +++
runtests.sh | 70 ++++++++++++----
10 files changed, 155 insertions(+), 51 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c8a49f2..3aaddb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2010-08-06 Andrew Overholt <overholt at redhat.com>
+
+ Bug #286825
+
+ * patches/donotstorebuildlogsinfiles.patch: Output SWT build information
+ to stdout and not a log file (Niels Thykier).
+
+2010-08-04 Andrew Overholt <overholt at redhat.com>
+
+ Bug #321612
+
+ * build.xml: Add ability to pass through -v and -d flags to runtests.sh.
+ Use -DdebugTests=true or -DverboseTests=true.
+ * runtests.sh: Add verbose option (-v). Pass -data option to test runs.
+
+2010-08-04 Andrew Overholt <overholt at redhat.com>
+
+ Bug #321660
+
+ * build.xml: Remove sdk-tests.properties in clean-sdk task and tests_* in
+ distclean task. Clean up formatting a bit.
+
2010-08-03 Andrew Overholt <overholt at redhat.com>
Bug #321284
diff --git a/build.xml b/build.xml
index 2118530..ce157a0 100644
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,7 @@
<project name="Eclipse SDK build" default="provision.sdk" basedir=".">
<tstamp>
- <format property="timestamp" pattern="yyyyMMddHHmmss"/>
- </tstamp>
+ <format property="timestamp" pattern="yyyyMMddHHmmss"/>
+ </tstamp>
<record name="build_${timestamp}.log"/>
<echo message="Build log is available in build_${timestamp}.log" />
<property name="baseBuilder" value="${basedir}/bootstrap" />
@@ -75,10 +75,14 @@
<matches pattern="sparcv9" string="${uname-m}"/>
</condition>
<condition property="hostArch" value="${uname-m}">
- <not><isset property="hostArch" /></not>
+ <not>
+ <isset property="hostArch" />
+ </not>
</condition>
<condition property="buildArch" value="${hostArch}">
- <not><isset property="buildArch" /></not>
+ <not>
+ <isset property="buildArch" />
+ </not>
</condition>
<echo message="uname -m: ${uname-m}. Build eclipse on ${hostArch} for ${buildArch}."/>
@@ -246,6 +250,7 @@
<delete>
<fileset dir="." includes="*-stamp" />
</delete>
+ <delete file="sdk-tests.properties" />
</target>
<target name="clean" depends="clean-sdk">
@@ -261,6 +266,9 @@
<delete>
<fileset dir="." includes="*.log" />
</delete>
+ <delete includeemptydirs="true">
+ <fileset dir="." includes="tests_*/**" />
+ </delete>
</target>
<target name="insertBuildId" depends="unpack" unless="buildId.complete">
@@ -330,26 +338,26 @@
classname="org.eclipse.linuxtools.eclipsebuild.SymlinkNonOSGiJars"
classpath="${basedir}/task-bin" />
</target>
-
+
<target name="symlinkDeps" depends="applyPatches,defineTasks" unless="symlinks.complete">
- <symlinkOSGiJars dependencies="${basedir}/dependencies.properties"
+ <symlinkOSGiJars dependencies="${basedir}/dependencies.properties"
topLevelDir="${buildDirectory}/plugins"
manifests="${basedir}/dependencyManifests"/>
- <symlinkNonOSGiJars dependencies="${basedir}/nonosgidependencies.properties"
+ <symlinkNonOSGiJars dependencies="${basedir}/nonosgidependencies.properties"
topLevelDir="${buildDirectory}/plugins"/>
- <replaceregexp file="${buildDirectory}/plugins/org.apache.ant_1.7.1.v20100518-1145/META-INF/MANIFEST.MF" flags="m,g,s">
+ <replaceregexp file="${buildDirectory}/plugins/org.apache.ant_1.7.1.v20100518-1145/META-INF/MANIFEST.MF" flags="m,g,s">
<regexp pattern="^Name.*"/>
<substitution expression=""/>
</replaceregexp>
- <replaceregexp file="${buildDirectory}/plugins/org.apache.ant_1.7.1.v20100518-1145/META-INF/MANIFEST.MF" flags="m,g,s">
+ <replaceregexp file="${buildDirectory}/plugins/org.apache.ant_1.7.1.v20100518-1145/META-INF/MANIFEST.MF" flags="m,g,s">
<regexp pattern="^SHA1-Digest.*"/>
<substitution expression=""/>
</replaceregexp>
- <replaceregexp file="${buildDirectory}/plugins/org.junit_3.8.2.v20090203-1005/META-INF/MANIFEST.MF" flags="m,g,s">
+ <replaceregexp file="${buildDirectory}/plugins/org.junit_3.8.2.v20090203-1005/META-INF/MANIFEST.MF" flags="m,g,s">
<regexp pattern="^Name.*"/>
<substitution expression=""/>
</replaceregexp>
- <replaceregexp file="${buildDirectory}/plugins/org.junit_3.8.2.v20090203-1005/META-INF/MANIFEST.MF" flags="m,g,s">
+ <replaceregexp file="${buildDirectory}/plugins/org.junit_3.8.2.v20090203-1005/META-INF/MANIFEST.MF" flags="m,g,s">
<regexp pattern="^SHA1-Digest.*"/>
<substitution expression=""/>
</replaceregexp>
@@ -412,15 +420,15 @@
-->
<target name="buildTests" depends="provision.sdk,applyTestPatches" unless="testsbuild.complete">
-
+
<path id="pdebuilddir.id">
- <dirset dir="${provisionDir}/plugins">
- <include name="org.eclipse.pde.build_*"/>
- </dirset>
+ <dirset dir="${provisionDir}/plugins">
+ <include name="org.eclipse.pde.build_*"/>
+ </dirset>
</path>
<property name="pdebuilddir" refid="pdebuilddir.id"/>
-
+
<!-- Test framework -->
<exec executable="${provisionDir}/eclipse">
<arg line="-nosplash " />
@@ -640,7 +648,7 @@
<param name="p2.arch" value="${buildArch}" />
<param name="p2.repo" value="${reposource}" />
</antcall>
-
+
<copy todir="${provisionDir}/plugins">
<fileset dir="${buildDirectory}/plugins/org.eclipse.equinox.initializer">
<include name="org.eclipse.equinox.initializer*.jar" />
@@ -654,10 +662,10 @@
topLevelDir="${provisionDir}/plugins"/>
<fileset id="junit4.jar" dir="${provisionDir}/plugins">
- <include name="**/org.junit4_**/junit.jar"/>
+ <include name="**/org.junit4_**/junit.jar"/>
</fileset>
<property name="junit4jar.path" refid="junit4.jar"/>
-
+
<delete file="${provisionDir}/plugins/${junit4jar.path}" />
<!-- FIXME: Watch out for other distros with different
locations of junit4's system JAR. -->
@@ -666,8 +674,35 @@
<echo file="provision.sdk-stamp" />
</target>
+
+ <target name="checkDebugAndVerbose">
+ <condition property="bothDebugAndVerbose.set">
+ <and>
+ <isset property="debugTests"/>
+ <isset property="verboseTests"/>
+ </and>
+ </condition>
+ </target>
+
+ <target name="setDebugAndVerbose" depends="checkDebugAndVerbose" if="bothDebugAndVerbose.set">
+ <property name="testSwitches" value="-dv"/>
+ </target>
+
+ <target name="setDebugTests" if="debugTests">
+ <property name="testSwitches" value="-d"/>
+ </target>
+
+ <target name="setVerboseTests" if="verboseTests">
+ <property name="testSwitches" value="-v"/>
+ </target>
+
+ <target name="setDebugAndVerboseArgs" depends="setDebugAndVerbose,setDebugTests,setVerboseTests"/>
+
+ <target name="runTests" depends="buildTests,setDebugAndVerboseArgs">
+ <!-- These two next calls just set the properties to an empty string if they are not previously set -->
+ <property name="debugTestsSwitch" value="" />
+ <property name="verboseTestsSwitch" value="" />
- <target name="runTests" depends="buildTests">
<echo message="###################################################################" />
<echo message="# #" />
<echo message="# Please post and discuss results here: #" />
@@ -679,10 +714,14 @@
<format property="timestamp" pattern="yyyyMMddHHmmss" />
</tstamp>
<chmod perm="ugo+rx" file="${basedir}/runtests.sh" />
+ <!--
+ <echo message="Calling runtests with (debug, verbose) = (${testSwitches})" />
+ -->
<exec executable="${basedir}/runtests.sh" dir="${basedir}">
<arg value="-t${timestamp}" />
<arg value="-b ${testsBuildDirectory}" />
<arg value="-p ${provisionDir}" />
+ <arg value="${testSwitches}" />
</exec>
<property name="testResultDir" value="${basedir}/tests_${timestamp}/results" />
<!-- Copy over the XML to generate a top-level report for all of the tests -->
@@ -786,7 +825,7 @@
<arg value="${provisionDir}" />
<arg value="${installationDir}" />
</exec>
-
+
<!-- install desktop file -->
<copy file="eclipse.desktop" todir="${destDir}${prefix}/share/applications" />
<!-- install icons -->
@@ -800,7 +839,7 @@
<!-- eclipse binary -->
<mkdir dir="${destDir}${prefix}/bin" />
<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
- <!-- FIXME: we really shouldn't need this anymore but at least pdebuild.sh will need to be updated -->
+ <!-- FIXME: we really shouldn't need this anymore but at least pdebuild.sh will need to be updated -->
<!-- Create the "startup.jar" symlink -->
<fileset dir="${installationDir}/plugins" includes="org.eclipse.equinox.launcher_*" id="startupjar" />
<property name="startupjarpath" refid="startupjar" />
@@ -811,7 +850,7 @@
<symlink link="${installationDir}/swt-gtk-3.5.2.jar" resource="plugins/${swtjarpath}" />
<symlink link="${installationDir}/swt-gtk.jar" resource="plugins/${swtjarpath}" />
<symlink link="${installationDir}/swt.jar" resource="plugins/${swtjarpath}" />
-
+
<echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" />
<!-- Extract SWT JNI .so files -->
@@ -848,7 +887,7 @@
<mkdir dir="${destDir}/etc" />
<move file="${installationDir}/eclipse.ini" tofile="${destDir}/etc/eclipse.ini" />
<symlink link="${installationDir}/eclipse.ini" resource="/etc/eclipse.ini" />
-
+
</target>
<target name="package.extract.swt">
diff --git a/debian/patches/compile-IPluginDescriptor.patch b/debian/patches/compile-IPluginDescriptor.patch
index cf9bf4a..a00962e 100644
--- a/debian/patches/compile-IPluginDescriptor.patch
+++ b/debian/patches/compile-IPluginDescriptor.patch
@@ -4,7 +4,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319478
--- a/build.xml
+++ b/build.xml
-@@ -372,6 +372,32 @@
+@@ -380,6 +380,32 @@
<zip destfile="${buildDirectory}/plugins/org.eclipse.jdt.ui/jar-in-jar-loader.zip"
basedir="${basedir}/temp/"/>
<delete dir="${basedir}/temp/"/>
diff --git a/debian/patches/compile-jarinjarloader.patch b/debian/patches/compile-jarinjarloader.patch
index 50db2bc..1761f6f 100644
--- a/debian/patches/compile-jarinjarloader.patch
+++ b/debian/patches/compile-jarinjarloader.patch
@@ -12,7 +12,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319476
<uptodate property="testspatch.complete" srcfile="testsunpack-stamp" targetfile="testspatch-stamp" />
<uptodate property="compilelibs.complete" srcfile="unpack-stamp" targetfile="compilelibs-stamp" />
<uptodate property="build.complete" srcfile="patch-stamp" targetfile="build-stamp" />
-@@ -358,7 +359,24 @@
+@@ -366,7 +367,24 @@
<echo file="symlinks-stamp" />
</target>
diff --git a/debian/patches/eclipse-manpage.patch b/debian/patches/eclipse-manpage.patch
index 0dd6d43..eeb7a35 100644
--- a/debian/patches/eclipse-manpage.patch
+++ b/debian/patches/eclipse-manpage.patch
@@ -624,7 +624,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/494065
+</refentry>
--- a/build.xml
+++ b/build.xml
-@@ -800,6 +800,12 @@
+@@ -839,6 +839,12 @@
<!-- eclipse binary -->
<mkdir dir="${destDir}${prefix}/bin" />
<symlink link="${destDir}${prefix}/bin/eclipse" resource="../${libDir}/eclipse/eclipse" />
@@ -634,6 +634,6 @@ Bug-Ubuntu: https://launchpad.net/bugs/494065
+ <arg value="eclipse.1.xml" />
+ </exec>
+ <move file="eclipse.1" tofile="${destDir}${prefix}/share/man/man1/eclipse.1" />
- <!-- FIXME: we really shouldn't need this anymore but at least pdebuild.sh will need to be updated -->
+ <!-- FIXME: we really shouldn't need this anymore but at least pdebuild.sh will need to be updated -->
<!-- Create the "startup.jar" symlink -->
<fileset dir="${installationDir}/plugins" includes="org.eclipse.equinox.launcher_*" id="startupjar" />
diff --git a/debian/patches/generate-metadata-and-extract-swt-libraries.patch b/debian/patches/generate-metadata-and-extract-swt-libraries.patch
index a8b106f..ff03471 100644
--- a/debian/patches/generate-metadata-and-extract-swt-libraries.patch
+++ b/debian/patches/generate-metadata-and-extract-swt-libraries.patch
@@ -4,8 +4,8 @@ From: Benjamin Drung <bdrung at ubuntu.com>
--- a/build.xml
+++ b/build.xml
-@@ -864,6 +864,55 @@
-
+@@ -903,6 +903,55 @@
+
<echo append="true" file="${installationDir}/eclipse.ini" message="-Dorg.eclipse.equinox.p2.reconciler.dropins.directory=${prefix}/share/eclipse/dropins" />
+ <!-- Generate metadata -->
diff --git a/debian/patches/remove-unnecessary-files.patch b/debian/patches/remove-unnecessary-files.patch
index 2291bc3..b6dcf9f 100644
--- a/debian/patches/remove-unnecessary-files.patch
+++ b/debian/patches/remove-unnecessary-files.patch
@@ -3,7 +3,7 @@ From: Benjamin Drung <bdrung at ubuntu.com>
--- a/build.xml
+++ b/build.xml
-@@ -943,6 +943,10 @@
+@@ -982,6 +982,10 @@
<fileset dir="${installationDir}/configuration" includes="**/data/**" />
</delete>
diff --git a/debian/patches/strip-destDir.patch b/debian/patches/strip-destDir.patch
index f34f090..022ea35 100644
--- a/debian/patches/strip-destDir.patch
+++ b/debian/patches/strip-destDir.patch
@@ -4,7 +4,7 @@ Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=319473
--- a/build.xml
+++ b/build.xml
-@@ -947,6 +947,21 @@
+@@ -986,6 +986,21 @@
<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/binary" />
<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/features" />
<delete dir="${destDir}/${prefix}/${libDir}/eclipse/metadata/plugins" />
diff --git a/patches/donotstorebuildlogsinfiles.patch b/patches/donotstorebuildlogsinfiles.patch
index 9c26364..4ffd1a3 100644
--- a/patches/donotstorebuildlogsinfiles.patch
+++ b/patches/donotstorebuildlogsinfiles.patch
@@ -51,3 +51,14 @@
<arg line="@${basedir}/${optionsFile} -J-Xmx1000M" />
</exec>
+--- a/plugins/org.eclipse.swt/tasks/build.xml 2010-08-06 19:35:21.199817105 +0200
++++ b/plugins/org.eclipse.swt/tasks/build.xml 2010-08-06 19:36:32.704372712 +0200
+@@ -1097,7 +1097,7 @@
+ <argument value="${tasks}"/>
+ </commandline>
+ </cvs>
+- <ant antfile="${tasks}/build.xml" output="${logdir}/${build_version}/${fragment}.log" dir="${tmpdir}" target="build_fragment">
++ <ant antfile="${tasks}/build.xml" dir="${tmpdir}" target="build_fragment">
+ <property name="cp" value="${cp}"/>
+ <property name="fragment" value="${fragment}"/>
+ <property name="build_target" value="${build_target}"/>
diff --git a/runtests.sh b/runtests.sh
index b124d05..dfb9188 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -12,10 +12,11 @@ Run Eclipse SDK tests
Optional arguments:
-h Show this help message
-g Don't run the tests headless
- -d Allow remote connection to test runs' JVM
+ -d Debug tests (allow remote connection to test runs' JVM)
-b Tests build directory
-p Clean installation directory to copy for running test suites
-t Timestamp string with which to tag the results
+ -v Make test runs output to the console
_EOF_
}
@@ -72,8 +73,15 @@ function init() {
# org.eclipse.jdt.compiler.tool.tests \
# Defaults
- debugTests=0
- headless=1
+ if [ -z ${verbose} ]; then
+ verbose=0
+ fi
+ if [ -z ${debugTests} ]; then
+ debugTests=0
+ fi
+ if [ -z ${headless} ]; then
+ headless=1
+ fi
label=$(grep label build.properties | sed s/label=//)
testframework=$(grep ^testframework build.properties | sed s/testframework=//)
@@ -191,21 +199,42 @@ function setArch() {
function runTestSuite() {
libraryXml=${eclipseHome}/plugins/${testframework}/library.xml
- ${eclipseHome}/eclipse \
- -application org.eclipse.ant.core.antRunner \
- -file $testDriver \
- -Declipse-home=${eclipseHome} \
- -Dos=linux \
- -Dws=gtk \
- -Darch=${arch} \
- -Dlibrary-file=$libraryXml \
- -propertyfile $properties \
- -logger org.apache.tools.ant.DefaultLogger \
- -vmargs \
- -Duser.home=${homedir} \
- -Dosgi.os=linux \
- -Dosgi.ws=gtk \
- -Dosgi.arch=${arch}
+ if [ $verbose -eq 1 ]; then
+ ${eclipseHome}/eclipse \
+ -debug -consolelog \
+ -data ${datadir} \
+ -application org.eclipse.ant.core.antRunner \
+ -file $testDriver \
+ -Declipse-home=${eclipseHome} \
+ -Dos=linux \
+ -Dws=gtk \
+ -Darch=${arch} \
+ -Dlibrary-file=$libraryXml \
+ -propertyfile $properties \
+ -logger org.apache.tools.ant.DefaultLogger \
+ -vmargs \
+ -Duser.home=${homedir} \
+ -Dosgi.os=linux \
+ -Dosgi.ws=gtk \
+ -Dosgi.arch=${arch}
+ else
+ ${eclipseHome}/eclipse \
+ -data ${datadir} \
+ -application org.eclipse.ant.core.antRunner \
+ -file $testDriver \
+ -Declipse-home=${eclipseHome} \
+ -Dos=linux \
+ -Dws=gtk \
+ -Darch=${arch} \
+ -Dlibrary-file=$libraryXml \
+ -propertyfile $properties \
+ -logger org.apache.tools.ant.DefaultLogger \
+ -vmargs \
+ -Duser.home=${homedir} \
+ -Dosgi.os=linux \
+ -Dosgi.ws=gtk \
+ -Dosgi.arch=${arch}
+ fi
}
function cleanAfterTestSuite() {
@@ -317,7 +346,7 @@ function genHtml() {
}
# Command-line arguments
-while getopts "de:gb:p:t:h" OPTION
+while getopts "vde:gb:p:t:h" OPTION
do
case $OPTION in
d)
@@ -339,6 +368,9 @@ do
usage
exit 1
;;
+ v)
+ verbose=1
+ ;;
esac
done
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list