Attachment 135389 Details for Bug 253114 – modified patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] modified patch

clipboard.txt (text/plain), 4.58 KB, created by Nick Boldt

on 2009-05-12 12:01:16 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Nick Boldt

Created: 2009-05-12 12:01:16 EDT

Size: 4.58 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.gef.tree
>Index: org.eclipse.gef.releng/builder/tests/configs/local/relengbuildgtk.sh
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.gef/org.eclipse.gef.releng/builder/tests/configs/local/relengbuildgtk.sh,v
>retrieving revision 1.25
>diff -u -r1.25 relengbuildgtk.sh
>--- org.eclipse.gef.releng/builder/tests/configs/local/relengbuildgtk.sh	23 Dec 2008 22:05:17 -0000	1.25
>+++ org.eclipse.gef.releng/builder/tests/configs/local/relengbuildgtk.sh	12 May 2009 14:45:58 -0000
>@@ -127,7 +127,7 @@
> Dflags=$Dflags" "-Dplatform=linux.gtk
> os=linux
> ws=gtk
>-arch=x86 
>+arch=x86_64
> 
> # default value to determine if eclipse should be reinstalled between running of tests
> installmode="clean"
>@@ -174,19 +174,19 @@
> 	fi
> done
> 
>-J2SE15flags="";
>-# TODO: if a 1.5 JDK and want source/target = 1.5, leave these in
>-# TODO: if source/target = 1.4, remove these!
>-#if [ ${JAVA_HOME##*1.5*}"" = "" -o ${JAVA_HOME##*15*}"" = "" -o ${JAVA_HOME##*5.0*}"" = "" -o ${JAVA_HOME##*50*}"" = "" ]; then
>-#	# set J2SE-1.5 properties (-Dflags)
>-#	bootclasspath="."`find $JAVA_HOME/jre/lib -name "*.jar" -printf ":%p"`;
>-#	J2SE15flags=$J2SE15flags" -DJ2SE-1.5=$bootclasspath"
>-#	J2SE15flags=$J2SE15flags" -DbundleBootClasspath=$bootclasspath"
>-#	J2SE15flags=$J2SE15flags" -DjavacSource=1.5"
>-#	J2SE15flags=$J2SE15flags" -DjavacTarget=1.5"
>-#	J2SE15flags=$J2SE15flags" -DbundleJavacSource=1.5"
>-#	J2SE15flags=$J2SE15flags" -DbundleJavacTarget=1.5"
>-#fi
>+J2SE16flags="";
>+# TODO: if a 1.6 JDK and want source/target = 1.6, leave these in
>+# TODO: if source/target = 1.6, remove these!
>+#if [ ${JAVA_HOME##*1.6*}"" = "" -o ${JAVA_HOME##*16*}"" = "" -o ${JAVA_HOME##*6.0*}"" = "" -o ${JAVA_HOME##*60*}"" = "" ]; then
>+#	# set JavaSE-1.6 properties (-Dflags)
>+#	bootclasspath="."`find $JAVA_HOME/jre/lib -name "*.jar" -printf ":%p"`;
>+#	J2SE16flags=$J2SE16flags" -DJavaSE-1.6=$bootclasspath"
>+#	J2SE16flags=$J2SE16flags" -DbundleBootClasspath=$bootclasspath"
>+#	J2SE16flags=$J2SE16flags" -DjavacSource=1.6"
>+#	J2SE16flags=$J2SE16flags" -DjavacTarget=1.6"
>+#	J2SE16flags=$J2SE16flags" -DbundleJavacSource=1.6"
>+#	J2SE16flags=$J2SE16flags" -DbundleJavacTarget=1.6"
>+#fi
> 
> # different ways to get the launcher and Main class
> if [[ -f eclipse/startup.jar ]]; then 
>@@ -197,14 +197,15 @@
>   cpAndMain=`find eclipse/ -name "org.eclipse.equinox.launcher_*.jar" | sort | head -1`" org.eclipse.equinox.launcher.Main"; 
> fi
> 
>-# add swt jar
>-cpAndMain=`find eclipse/ -name "org.eclipse.swt.gtk.linux.x86_*.jar" | sort | head -1`":"$cpAndMain; 
>+# add swt jars
>+cpAndMain=`find eclipse/ -name "org.eclipse.swt_*.jar" | sort | head -1`":"$cpAndMain; 
>+cpAndMain=`find eclipse/ -name "org.eclipse.swt.gtk.linux.${arch}_*.jar" | sort | head -1`":"$cpAndMain; 
> 
> # run tests
> echo "[runtests] [`date +%H\:%M\:%S`] Launching Eclipse (installmode = $installmode with -enableassertions turned on) ..."
> execCmd "$JAVA_HOME/bin/java $Xflags -enableassertions -cp $cpAndMain -ws $ws -os $os -arch $arch \
> -application org.eclipse.ant.core.antRunner -data $workspaceDir -file test.xml $antTestTarget \
>-$Dflags -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $J2SE15flags \
>+$Dflags -Dws=$ws -Dos=$os -Darch=$arch -D$installmode=true $J2SE16flags \
> $properties -logger org.apache.tools.ant.DefaultLogger" $consolelog;
> echo "[runtests] [`date +%H\:%M\:%S`] Eclipse test run completed. "
> 
>Index: org.eclipse.gef.releng/builder/all/build.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.gef/org.eclipse.gef.releng/builder/all/build.properties,v
>retrieving revision 1.3
>diff -u -r1.3 build.properties
>--- org.eclipse.gef.releng/builder/all/build.properties	17 Apr 2009 19:17:39 -0000	1.3
>+++ org.eclipse.gef.releng/builder/all/build.properties	12 May 2009 14:45:58 -0000
>@@ -25,7 +25,7 @@
> configs=*,*,*
> baseos=linux
> basews=gtk
>-basearch=x86
>+basearch=x86_64
> bootclasspath=${java.home}/lib/*.jar
> javacFailOnError=true
> javacVerbose=true
>Index: org.eclipse.gef.releng/builder/tests/build.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.gef/org.eclipse.gef.releng/builder/tests/build.properties,v
>retrieving revision 1.2
>diff -u -r1.2 build.properties
>--- org.eclipse.gef.releng/builder/tests/build.properties	17 Apr 2009 19:17:39 -0000	1.2
>+++ org.eclipse.gef.releng/builder/tests/build.properties	12 May 2009 14:45:58 -0000
>@@ -13,7 +13,7 @@
> configs=*,*,*
> baseos=linux
> basews=gtk
>-basearch=x86
>+basearch=x86_64
> bootclasspath=${java.home}/lib/*.jar
> javacFailOnError=true
> javacVerbose=true

Actions: View | Diff

Attachments on bug 253114: 122846 | 135361 | 135362 | 135389