Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 131377 | Differences between
and this patch

Collapse All | Expand All

(-)build.xml (-10 / +12 lines)
Lines 14-20 Link Here
14
		<property name="destination" value="${basedir}"/>
14
		<property name="destination" value="${basedir}"/>
15
		<property name="plugindir" value="../org.eclipse.swt"/>
15
		<property name="plugindir" value="../org.eclipse.swt"/>
16
		<property name="bootclasspath" value=""/>
16
		<property name="bootclasspath" value=""/>
17
		<property name="javacVerbose" value="true"/>
17
		<property name="javacVerbose" value="false"/>
18
		<property name="javacDestDir" value="${temp.folder}/@dot.bin"/>
19
		<property name="logExtension" value=".log"/>
18
	</target>
20
	</target>
19
21
20
	<target name="properties" if="eclipse.running">
22
	<target name="properties" if="eclipse.running">
Lines 33-42 Link Here
33
	</target>
35
	</target>
34
36
35
	<target name="@dot" depends="init" unless="@dot" description="Create jar: @dot.">
37
	<target name="@dot" depends="init" unless="@dot" description="Create jar: @dot.">
36
		<property name="destdir" value="${temp.folder}/@dot.bin"/>
38
		<delete dir="${javacDestDir}"/>
37
		<delete dir="${temp.folder}/@dot.bin"/>
39
		<mkdir dir="${javacDestDir}"/>
38
		<mkdir dir="${temp.folder}/@dot.bin"/>
40
		<javac destdir="${javacDestDir}" verbose="${javacVerbose}" debug="on" failonerror="no" bootclasspath="${bootclasspath}" source="1.3" target="1.2">
39
		<javac destdir="${temp.folder}/@dot.bin" verbose="${javacVerbose}" debug="on" failonerror="no" bootclasspath="${bootclasspath}" source="1.3" target="1.2">
40
			<src path="${plugindir}/Eclipse SWT/common/"/>
41
			<src path="${plugindir}/Eclipse SWT/common/"/>
41
			<src path="${plugindir}/Eclipse SWT/common_j2se/"/>
42
			<src path="${plugindir}/Eclipse SWT/common_j2se/"/>
42
			<src path="${plugindir}/Eclipse SWT/win32/"/>
43
			<src path="${plugindir}/Eclipse SWT/win32/"/>
Lines 58-67 Link Here
58
			<src path="${plugindir}/Eclipse SWT Printing/win32/"/>
59
			<src path="${plugindir}/Eclipse SWT Printing/win32/"/>
59
			<src path="${plugindir}/Eclipse SWT Program/common/"/>
60
			<src path="${plugindir}/Eclipse SWT Program/common/"/>
60
			<src path="${plugindir}/Eclipse SWT Program/win32/"/>
61
			<src path="${plugindir}/Eclipse SWT Program/win32/"/>
62
			<compilerarg line="-log ${javacDestDir}${logExtension}" compiler="org.eclipse.jdt.core.JDTCompilerAdapter"/>
61
		</javac>
63
		</javac>
62
        <property name="includes" value=""/>
64
        <property name="includes" value=""/>
63
        <property name="excludes" value="**/*.java,**/library/,**/package.htm*"/>
65
        <property name="excludes" value="**/*.java,**/library/,**/package.htm*"/>
64
		<copy todir="${temp.folder}/@dot.bin">
66
		<copy todir="${javacDestDir}">
65
			<fileset dir="${plugindir}/Eclipse SWT/common/" includes="${includes}" excludes="${excludes}"/>
67
			<fileset dir="${plugindir}/Eclipse SWT/common/" includes="${includes}" excludes="${excludes}"/>
66
			<fileset dir="${plugindir}/Eclipse SWT/common_j2se/" includes="${includes}" excludes="${excludes}"/>
68
			<fileset dir="${plugindir}/Eclipse SWT/common_j2se/" includes="${includes}" excludes="${excludes}"/>
67
			<fileset dir="${plugindir}/Eclipse SWT/win32/" includes="${includes}" excludes="${excludes}"/>
69
			<fileset dir="${plugindir}/Eclipse SWT/win32/" includes="${includes}" excludes="${excludes}"/>
Lines 87-97 Link Here
87
89
88
		<mkdir dir="${build.result.folder}/@dot"/>
90
		<mkdir dir="${build.result.folder}/@dot"/>
89
		<copy todir="${build.result.folder}/@dot" failonerror="true">
91
		<copy todir="${build.result.folder}/@dot" failonerror="true">
90
			<fileset dir="${temp.folder}/@dot.bin"/>
92
			<fileset dir="${javacDestDir}"/>
91
		</copy>
93
		</copy>
92
		<!-- prepare a jar file solely for the download target -->
94
		<!-- prepare a jar file solely for the download target -->
93
		<jar jarfile="${build.result.folder}/swt.jar" basedir="${temp.folder}/@dot.bin"/>
95
		<jar jarfile="${build.result.folder}/swt.jar" basedir="${javacDestDir}"/>
94
		<delete dir="${temp.folder}/@dot.bin"/>
96
		<delete dir="${javacDestDir}"/>
95
	</target>
97
	</target>
96
98
97
	<target name="build.jars" depends="init">
99
	<target name="build.jars" depends="init">
Lines 151-157 Link Here
151
153
152
	<target name="gather.logs" depends="init" if="destination.temp.folder">
154
	<target name="gather.logs" depends="init" if="destination.temp.folder">
153
		<mkdir dir="${destination.temp.folder}/${full.name}"/>
155
		<mkdir dir="${destination.temp.folder}/${full.name}"/>
154
		<copy file="${temp.folder}/@dot.bin.log" todir="${destination.temp.folder}/${full.name}/"/>
156
		<copy file="${javacDestDir}${logExtension}" todir="${destination.temp.folder}/${full.name}/"/>
155
	</target>
157
	</target>
156
158
157
	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
159
	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">

Return to bug 131377