Attachment 36149 Details for Bug 131377 – patch for org.eclipse.swt.win32.win32.x86

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

[patch] patch for org.eclipse.swt.win32.win32.x86

build.xml_patch.txt (text/plain), 3.45 KB, created by Veronika Irvine

on 2006-03-13 10:56:49 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Veronika Irvine

Created: 2006-03-13 10:56:49 EST

Size: 3.45 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.swt.win32.win32.x86
>Index: build.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.swt.win32.win32.x86/build.xml,v
>retrieving revision 1.14
>diff -u -r1.14 build.xml
>--- build.xml	24 Nov 2005 21:41:30 -0000	1.14
>+++ build.xml	13 Mar 2006 15:56:35 -0000
>@@ -14,7 +14,9 @@
> 		<property name="destination" value="${basedir}"/>
> 		<property name="plugindir" value="../org.eclipse.swt"/>
> 		<property name="bootclasspath" value=""/>
>-		<property name="javacVerbose" value="true"/>
>+		<property name="javacVerbose" value="false"/>
>+		<property name="javacDestDir" value="${temp.folder}/@dot.bin"/>
>+		<property name="logExtension" value=".log"/>
> 	</target>
> 
> 	<target name="properties" if="eclipse.running">
>@@ -33,10 +35,9 @@
> 	</target>
> 
> 	<target name="@dot" depends="init" unless="@dot" description="Create jar: @dot.">
>-		<property name="destdir" value="${temp.folder}/@dot.bin"/>
>-		<delete dir="${temp.folder}/@dot.bin"/>
>-		<mkdir dir="${temp.folder}/@dot.bin"/>
>-		<javac destdir="${temp.folder}/@dot.bin" verbose="${javacVerbose}" debug="on" failonerror="no" bootclasspath="${bootclasspath}" source="1.3" target="1.2">
>+		<delete dir="${javacDestDir}"/>
>+		<mkdir dir="${javacDestDir}"/>
>+		<javac destdir="${javacDestDir}" verbose="${javacVerbose}" debug="on" failonerror="no" bootclasspath="${bootclasspath}" source="1.3" target="1.2">
> 			<src path="${plugindir}/Eclipse SWT/common/"/>
> 			<src path="${plugindir}/Eclipse SWT/common_j2se/"/>
> 			<src path="${plugindir}/Eclipse SWT/win32/"/>
>@@ -58,10 +59,11 @@
> 			<src path="${plugindir}/Eclipse SWT Printing/win32/"/>
> 			<src path="${plugindir}/Eclipse SWT Program/common/"/>
> 			<src path="${plugindir}/Eclipse SWT Program/win32/"/>
>+			<compilerarg line="-log ${javacDestDir}${logExtension}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
> 		</javac>
>         <property name="includes" value=""/>
>         <property name="excludes" value="**/*.java,**/library/,**/package.htm*"/>
>-		<copy todir="${temp.folder}/@dot.bin">
>+		<copy todir="${javacDestDir}">
> 			<fileset dir="${plugindir}/Eclipse SWT/common/" includes="${includes}" excludes="${excludes}"/>
> 			<fileset dir="${plugindir}/Eclipse SWT/common_j2se/" includes="${includes}" excludes="${excludes}"/>
> 			<fileset dir="${plugindir}/Eclipse SWT/win32/" includes="${includes}" excludes="${excludes}"/>
>@@ -87,11 +89,11 @@
> 
> 		<mkdir dir="${build.result.folder}/@dot"/>
> 		<copy todir="${build.result.folder}/@dot" failonerror="true">
>-			<fileset dir="${temp.folder}/@dot.bin"/>
>+			<fileset dir="${javacDestDir}"/>
> 		</copy>
> 		
>-		<jar jarfile="${build.result.folder}/swt.jar" basedir="${temp.folder}/@dot.bin"/>
>-		<delete dir="${temp.folder}/@dot.bin"/>
>+		<jar jarfile="${build.result.folder}/swt.jar" basedir="${javacDestDir}"/>
>+		<delete dir="${javacDestDir}"/>
> 	</target>
> 
> 	<target name="build.jars" depends="init">
>@@ -151,7 +153,7 @@
> 
> 	<target name="gather.logs" depends="init" if="destination.temp.folder">
> 		<mkdir dir="${destination.temp.folder}/${full.name}"/>
>-		<copy file="${temp.folder}/@dot.bin.log" todir="${destination.temp.folder}/${full.name}/"/>
>+		<copy file="${javacDestDir}${logExtension}" todir="${destination.temp.folder}/${full.name}/"/>
> 	</target>
> 
> 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">

Actions: View | Diff

Attachments on bug 131377: 36077 | 36082 | 36083 | 36149