View | Details | Raw Unified | Return to bug 198253 | Differences between
and this patch

Collapse All | Expand All

(-)customBuildCallbacks.xml (-12 / +12 lines)
Lines 27-39 Link Here
27
	<!-- ===================================================================== -->
27
	<!-- ===================================================================== -->
28
	<target name="post.build.jars">
28
	<target name="post.build.jars">
29
		<property name="buildLabel" value="global" />
29
		<property name="buildLabel" value="global" />
30
		<property name="postingDirectory" value="${basedir}/ecj" />
30
		<property name="postingDirectory" value="${basedir}/../org.eclipse.jdt.core/ecj" />
31
		<property name="dest" value="${postingDirectory}/${buildLabel}" />
31
		<property name="dest" value="${postingDirectory}/${buildLabel}" />
32
		<mkdir dir="${dest}/checksum" />
32
		<mkdir dir="${dest}/checksum" />
33
		<checksum file="${dest}/ecj.jar" property="md5" />
33
		<checksum file="${dest}/ecj-${buildLabel}.jar" property="md5-ecj.jar" />
34
		<echo message="${md5} ecj.jar" file="${dest}/checksum/ecj.jar.md5" />
34
		<echo message="${md5-ecj.jar} ecj-${buildLabel}.jar" file="${dest}/checksum/ecj-${buildLabel}.jar.md5" />
35
		<checksum file="${dest}/ecjsrc.zip" property="md5" />
35
		<checksum file="${dest}/ecjsrc-${buildLabel}.zip" property="md5-ecjsrc.zip" />
36
		<echo message="${md5} ecjsrc.zip" file="${dest}/checksum/ecjsrc.zip.md5" />
36
		<echo message="${md5-ecjsrc.zip} ecjsrc-${buildLabel}.zip" file="${dest}/checksum/ecjsrc-${buildLabel}.zip.md5" />
37
	</target>
37
	</target>
38
38
39
	<!-- ===================================================================== -->
39
	<!-- ===================================================================== -->
Lines 82-95 Link Here
82
82
83
	<target name="post.compile.@dot">
83
	<target name="post.compile.@dot">
84
		<property name="buildLabel" value="global" />
84
		<property name="buildLabel" value="global" />
85
		<property name="postingDirectory" value="${basedir}/ecj" />
85
		<property name="postingDirectory" value="${basedir}/../org.eclipse.jdt.core/ecj" />
86
		<echo message="UPDATE ecj.jar" />
86
		<echo message="UPDATE ecj-${buildLabel}.jar" />
87
		<property name="unjarDestBin" value="${basedir}/tempbin"/>
87
		<property name="unjarDestBin" value="${basedir}/tempbin"/>
88
		<mkdir dir="${unjarDestBin}"/>
88
		<mkdir dir="${unjarDestBin}"/>
89
		<unjar
89
		<unjar
90
			src="${postingDirectory}/${buildLabel}/ecj.jar"
90
			src="${postingDirectory}/${buildLabel}/ecj-${buildLabel}.jar"
91
			dest="${unjarDestBin}"/>
91
			dest="${unjarDestBin}"/>
92
		<zip destfile="${postingDirectory}/${buildLabel}/ecj.jar">
92
		<zip destfile="${postingDirectory}/${buildLabel}/ecj-${buildLabel}.jar">
93
			<fileset dir="${unjarDestBin}"/>
93
			<fileset dir="${unjarDestBin}"/>
94
			<fileset dir="${target.folder}">
94
			<fileset dir="${target.folder}">
95
				<include name="**/*"/>
95
				<include name="**/*"/>
Lines 100-112 Link Here
100
		</zip>
100
		</zip>
101
		<delete dir="${unjarDestBin}" failonerror="false"/>
101
		<delete dir="${unjarDestBin}" failonerror="false"/>
102
102
103
		<echo message="UPDATE ecjsrc.zip" />
103
		<echo message="UPDATE ecjsrc-${buildLabel}.zip" />
104
		<property name="unjarDestSrc" value="${basedir}/tempsrc"/>
104
		<property name="unjarDestSrc" value="${basedir}/tempsrc"/>
105
		<mkdir dir="${unjarDestSrc}"/>
105
		<mkdir dir="${unjarDestSrc}"/>
106
		<unzip
106
		<unzip
107
			src="${postingDirectory}/${buildLabel}/ecjsrc.zip"
107
			src="${postingDirectory}/${buildLabel}/ecjsrc-${buildLabel}.zip"
108
			dest="${unjarDestSrc}"/>
108
			dest="${unjarDestSrc}"/>
109
		<zip destfile="${postingDirectory}/${buildLabel}/ecjsrc.zip">
109
		<zip destfile="${postingDirectory}/${buildLabel}/ecjsrc-${buildLabel}.zip">
110
			<zipfileset dir="src" />
110
			<zipfileset dir="src" />
111
			<zipfileset dir="${unjarDestSrc}"/>
111
			<zipfileset dir="${unjarDestSrc}"/>
112
			<zipfileset dir="${basedir}">
112
			<zipfileset dir="${basedir}">
(-)customBuildCallbacks.xml (-12 / +12 lines)
Lines 27-39 Link Here
27
	<!-- ===================================================================== -->
27
	<!-- ===================================================================== -->
28
	<target name="post.build.jars">
28
	<target name="post.build.jars">
29
		<property name="buildLabel" value="global" />
29
		<property name="buildLabel" value="global" />
30
		<property name="postingDirectory" value="${basedir}/ecj" />
30
		<property name="postingDirectory" value="${basedir}/../org.eclipse.jdt.core/ecj" />
31
		<property name="dest" value="${postingDirectory}/${buildLabel}" />
31
		<property name="dest" value="${postingDirectory}/${buildLabel}" />
32
		<mkdir dir="${dest}/checksum" />
32
		<mkdir dir="${dest}/checksum" />
33
		<checksum file="${dest}/ecj.jar" property="md5" /> 
33
		<checksum file="${dest}/ecj-${buildLabel}.jar" property="md5-ecj.jar" /> 
34
		<echo message="${md5} ecj.jar" file="${dest}/checksum/ecj.jar.md5" /> 
34
		<echo message="${md5-ecj.jar} ecj-${buildLabel}.jar" file="${dest}/checksum/ecj-${buildLabel}.jar.md5" /> 
35
		<checksum file="${dest}/ecjsrc.zip" property="md5" /> 
35
		<checksum file="${dest}/ecjsrc-${buildLabel}.zip" property="md5-ecjsrc.zip" /> 
36
		<echo message="${md5} ecjsrc.zip" file="${dest}/checksum/ecjsrc.zip.md5" /> 
36
		<echo message="${md5-ecjsrc.zip} ecjsrc-${buildLabel}.zip" file="${dest}/checksum/ecjsrc-${buildLabel}.zip.md5" /> 
37
	</target>
37
	</target>
38
38
39
	<!-- ===================================================================== -->
39
	<!-- ===================================================================== -->
Lines 82-95 Link Here
82
82
83
	<target name="post.compile.@dot">
83
	<target name="post.compile.@dot">
84
		<property name="buildLabel" value="global" />
84
		<property name="buildLabel" value="global" />
85
		<property name="postingDirectory" value="${basedir}/ecj" />
85
		<property name="postingDirectory" value="${basedir}/../org.eclipse.jdt.core/ecj" />
86
		<echo message="UPDATE ecj.jar" />
86
		<echo message="UPDATE ecj-${buildLabel}.jar" />
87
		<property name="unjarDestBin" value="${basedir}/tempbin"/>
87
		<property name="unjarDestBin" value="${basedir}/tempbin"/>
88
		<mkdir dir="${unjarDestBin}"/>
88
		<mkdir dir="${unjarDestBin}"/>
89
		<unjar
89
		<unjar
90
			src="${postingDirectory}/${buildLabel}/ecj.jar"
90
			src="${postingDirectory}/${buildLabel}/ecj-${buildLabel}.jar"
91
			dest="${unjarDestBin}"/>
91
			dest="${unjarDestBin}"/>
92
		<zip destfile="${postingDirectory}/${buildLabel}/ecj.jar">
92
		<zip destfile="${postingDirectory}/${buildLabel}/ecj-${buildLabel}.jar">
93
			<fileset dir="${unjarDestBin}">
93
			<fileset dir="${unjarDestBin}">
94
				<include name="**/*"/>
94
				<include name="**/*"/>
95
				<include name="*/*"/>
95
				<include name="*/*"/>
Lines 103-115 Link Here
103
		</zip>
103
		</zip>
104
		<delete dir="${unjarDestBin}" failonerror="false"/>
104
		<delete dir="${unjarDestBin}" failonerror="false"/>
105
105
106
		<echo message="UPDATE ecjsrc.zip" />
106
		<echo message="UPDATE ecjsrc-${buildLabel}.zip" />
107
		<property name="unjarDestSrc" value="${basedir}/tempsrc"/>
107
		<property name="unjarDestSrc" value="${basedir}/tempsrc"/>
108
		<mkdir dir="${unjarDestSrc}"/>
108
		<mkdir dir="${unjarDestSrc}"/>
109
		<unzip
109
		<unzip
110
			src="${postingDirectory}/${buildLabel}/ecjsrc.zip"
110
			src="${postingDirectory}/${buildLabel}/ecjsrc-${buildLabel}.zip"
111
			dest="${unjarDestSrc}"/>
111
			dest="${unjarDestSrc}"/>
112
		<zip destfile="${postingDirectory}/${buildLabel}/ecjsrc.zip">
112
		<zip destfile="${postingDirectory}/${buildLabel}/ecjsrc-${buildLabel}.zip">
113
			<zipfileset dir="src" />
113
			<zipfileset dir="src" />
114
			<zipfileset dir="${unjarDestSrc}" />
114
			<zipfileset dir="${unjarDestSrc}" />
115
			<zipfileset dir="${basedir}">
115
			<zipfileset dir="${basedir}">
(-)scripts/export-ecj.xml (-13 / +17 lines)
Lines 4-13 Link Here
4
<project name="Eclipse Batch Compiler" default="export-all" basedir="..">
4
<project name="Eclipse Batch Compiler" default="export-all" basedir="..">
5
	<target name="init">
5
	<target name="init">
6
		<tstamp/>
6
		<tstamp/>
7
		<property name="dest" value="../../ecj-export" />
8
		<property name="ecj-temp-folder" value="${basedir}/ecj-temp-folder" />
7
		<property name="ecj-temp-folder" value="${basedir}/ecj-temp-folder" />
9
		<property name="ecj-temp-src-folder" value="${basedir}/ecj-temp-src-folder" />
8
		<property name="ecj-temp-src-folder" value="${basedir}/ecj-temp-src-folder" />
10
		<mkdir dir="${dest}" />
11
		<mkdir dir="${ecj-temp-src-folder}" />
9
		<mkdir dir="${ecj-temp-src-folder}" />
12
		<mkdir dir="${ecj-temp-folder}"/>
10
		<mkdir dir="${ecj-temp-folder}"/>
13
	</target>
11
	</target>
Lines 33-39 Link Here
33
				<exclude name="org/eclipse/jdt/internal/compiler/SourceJavadocParser*.class"/>
31
				<exclude name="org/eclipse/jdt/internal/compiler/SourceJavadocParser*.class"/>
34
				<exclude name="org/eclipse/jdt/internal/compiler/parser/SourceTypeConverter*.class"/>
32
				<exclude name="org/eclipse/jdt/internal/compiler/parser/SourceTypeConverter*.class"/>
35
			</fileset>
33
			</fileset>
36
		</copy>		
34
		</copy>
37
	</target>
35
	</target>
38
36
39
	<target name="extract-_jsr199" depends="init">
37
	<target name="extract-_jsr199" depends="init">
Lines 41-47 Link Here
41
		<echo message="Extract .class file and properties for the jsr199" />
39
		<echo message="Extract .class file and properties for the jsr199" />
42
		<copy todir="${ecj-temp-folder}" failonerror="false">
40
		<copy todir="${ecj-temp-folder}" failonerror="false">
43
			<fileset dir="${target.folder}"/>
41
			<fileset dir="${target.folder}"/>
44
		</copy>		
42
		</copy>
45
	</target>
43
	</target>
46
	
44
	
47
	<target name="extract-_jsr269" depends="init">
45
	<target name="extract-_jsr269" depends="init">
Lines 50-60 Link Here
50
		<echo message="Extract .class file and properties for the jsr269" />
48
		<echo message="Extract .class file and properties for the jsr269" />
51
		<copy todir="${ecj-temp-folder}" failonerror="false">
49
		<copy todir="${ecj-temp-folder}" failonerror="false">
52
			<fileset dir="${target.folder}"/>
50
			<fileset dir="${target.folder}"/>
53
		</copy>		
51
		</copy>
54
	</target>
52
	</target>
55
53
56
	<target name="extract-ant-adapter-compiler" depends="init">
54
	<target name="extract-ant-adapter-compiler" depends="init">
57
		<property name="target.folder" value="antbin"/>
55
		<property name="target.folder" value="${basedir}/antbin"/>
58
		<echo message="Extract .class file and properties for the ant adapter" />
56
		<echo message="Extract .class file and properties for the ant adapter" />
59
		<mkdir dir="${ecj-temp-folder}"/>
57
		<mkdir dir="${ecj-temp-folder}"/>
60
		<copy todir="${ecj-temp-folder}">
58
		<copy todir="${ecj-temp-folder}">
Lines 65-73 Link Here
65
	</target>
63
	</target>
66
64
67
	<target name="export" depends="init">
65
	<target name="export" depends="init">
68
		<echo message="UPDATE ecj.jar" />
66
		<property name="dest" value="../../ecj-export" />
69
		<delete file="${dest}/ecj.jar" failonerror="false"/>
67
		<mkdir dir="${dest}" />
70
		<zip zipfile="${dest}/ecj.jar">
68
		<echo message="UPDATE ecj-${buildLabel}.jar" />
69
		<delete file="${dest}/ecj-${buildLabel}.jar" failonerror="false"/>
70
		<zip zipfile="${dest}/ecj-${buildLabel}.jar">
71
			<fileset dir="${ecj-temp-folder}">
71
			<fileset dir="${ecj-temp-folder}">
72
				<include name="**/*"/>
72
				<include name="**/*"/>
73
			</fileset>
73
			</fileset>
Lines 76-84 Link Here
76
				<include name="about.html" />
76
				<include name="about.html" />
77
			</fileset>
77
			</fileset>
78
		</zip>
78
		</zip>
79
		<echo message="UPDATE ecjsrc.zip" />
79
		<echo message="UPDATE ecjsrc-${buildLabel}.zip" />
80
		<delete file="${dest}/ecjsrc.zip" failonerror="false"/>
80
		<delete file="${dest}/ecjsrc-${buildLabel}.zip" failonerror="false"/>
81
		<zip zipfile="${dest}/ecjsrc.zip">
81
		<zip zipfile="${dest}/ecjsrc-${buildLabel}.zip">
82
			<zipfileset dir="batch" />
82
			<zipfileset dir="batch" />
83
			<zipfileset dir="compiler" />
83
			<zipfileset dir="compiler" />
84
			<zipfileset dir="antadapter">
84
			<zipfileset dir="antadapter">
Lines 90-98 Link Here
90
				<include name="build.xml" />
90
				<include name="build.xml" />
91
			</zipfileset>
91
			</zipfileset>
92
		</zip>
92
		</zip>
93
		<antcall target="cleanup"/>
93
	</target>
94
	</target>
94
	
95
	
95
	<target name="export_src_bin">
96
	<target name="export_src_bin">
97
		<property name="dest" value="../../ecj-export" />
98
		<mkdir dir="${dest}" />
96
		<echo message="UPDATE ecj_all.jar" />
99
		<echo message="UPDATE ecj_all.jar" />
97
		<delete file="${dest}/ecj_all.jar" failonerror="false"/>
100
		<delete file="${dest}/ecj_all.jar" failonerror="false"/>
98
		<mkdir dir="${ecj-temp-src-folder}/src" />
101
		<mkdir dir="${ecj-temp-src-folder}/src" />
Lines 116-127 Link Here
116
				<include name="about.html" />
119
				<include name="about.html" />
117
			</fileset>
120
			</fileset>
118
		</zip>
121
		</zip>
119
		
122
120
		<delete dir="${ecj-temp-src-folder}" failonerror="false"/>
123
		<delete dir="${ecj-temp-src-folder}" failonerror="false"/>
121
	</target>
124
	</target>
122
125
123
	<target name="cleanup">
126
	<target name="cleanup">
124
		<delete dir="${ecj-temp-folder}" failonerror="false"/>
127
		<delete dir="${ecj-temp-folder}" failonerror="false"/>
128
		<delete dir="${ecj-temp-src-folder}" failonerror="false"/>
125
	</target>
129
	</target>
126
130
127
	<target name="export-all" depends="init">
131
	<target name="export-all" depends="init">
(-)customBuildCallbacks.xml (-10 / +5 lines)
Lines 27-37 Link Here
27
	<!-- ===================================================================== -->
27
	<!-- ===================================================================== -->
28
	<target name="post.build.jars">
28
	<target name="post.build.jars">
29
		<property name="buildLabel" value="global" />
29
		<property name="buildLabel" value="global" />
30
		<property name="postingDirectory" value="${basedir}/ecj" />
30
		<property name="build.result.folder" value="${basedir}" />
31
		<property name="postingDirectory" value="${build.result.folder}/ecj" />
31
		<property name="dest" value="${postingDirectory}/${buildLabel}" />
32
		<property name="dest" value="${postingDirectory}/${buildLabel}" />
32
		<ant antfile="${basedir}/scripts/export-ecj.xml" target="export">
33
		<ant antfile="${basedir}/scripts/export-ecj.xml" target="export"/>
33
			<property name="dest" value="${dest}" />
34
		</ant>
35
	</target>
34
	</target>
36
	
35
	
37
	<!-- ===================================================================== -->
36
	<!-- ===================================================================== -->
Lines 79-87 Link Here
79
	</target>
78
	</target>
80
79
81
	<target name="post.compile.@dot">
80
	<target name="post.compile.@dot">
82
		<ant antfile="${basedir}/scripts/export-ecj.xml" target="extract-batch-compiler">
81
		<ant antfile="${basedir}/scripts/export-ecj.xml" target="extract-batch-compiler"/>
83
			<property name="target.folder" value="${target.folder}" />
84
		</ant>
85
	</target>
82
	</target>
86
	
83
	
87
	<!-- ===================================================================== -->
84
	<!-- ===================================================================== -->
Lines 176-184 Link Here
176
	<!-- Steps to do after the target compile.jdtCompilerAdapter.jar           -->
173
	<!-- Steps to do after the target compile.jdtCompilerAdapter.jar           -->
177
	<!-- ===================================================================== -->
174
	<!-- ===================================================================== -->
178
	<target name="post.compile.jdtCompilerAdapter.jar">
175
	<target name="post.compile.jdtCompilerAdapter.jar">
179
		<ant antfile="${basedir}/scripts/export-ecj.xml" target="extract-ant-adapter-compiler">
176
		<ant antfile="${basedir}/scripts/export-ecj.xml" target="extract-ant-adapter-compiler"/>
180
			<property name="target.folder" value="${target.folder}" />
181
		</ant>
182
	</target>
177
	</target>
183
	
178
	
184
	<!-- ===================================================================== -->
179
	<!-- ===================================================================== -->

Return to bug 198253