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

Collapse All | Expand All

(-)customBuildCallbacks.xml (-6 / +4 lines)
Lines 42-50 Link Here
42
		<mkdir dir="${dest}/checksum" />
42
		<mkdir dir="${dest}/checksum" />
43
		<checksum file="${dest}/ecj-${buildLabel}.jar" property="md5-ecj.jar" />
43
		<checksum file="${dest}/ecj-${buildLabel}.jar" property="md5-ecj.jar" />
44
		<echo message="${md5-ecj.jar} ecj-${buildLabel}.jar" file="${dest}/checksum/ecj-${buildLabel}.jar.md5" />
44
		<echo message="${md5-ecj.jar} ecj-${buildLabel}.jar" file="${dest}/checksum/ecj-${buildLabel}.jar.md5" />
45
		<checksum file="${dest}/ecjsrc-${buildLabel}.zip" property="md5-ecjsrc.zip" />
45
		<checksum file="${dest}/ecjsrc-${buildLabel}.jar" property="md5-ecjsrc.jar" /> 
		<echo message="${md5-ecjsrc.jar} ecjsrc-${buildLabel}.jar" file="${dest}/checksum/ecjsrc-${buildLabel}.jar.md5" /> 
	</target>
46
		<echo message="${md5-ecjsrc.zip} ecjsrc-${buildLabel}.zip" file="${dest}/checksum/ecjsrc-${buildLabel}.zip.md5" />
47
	</target>
48
46
49
	<!-- ===================================================================== -->
47
	<!-- ===================================================================== -->
50
	<!-- Steps to do before the target build.sources                           -->
48
	<!-- Steps to do before the target build.sources                           -->
Lines 110-122 Link Here
110
		</zip>
108
		</zip>
111
		<delete dir="${unjarDestBin}" failonerror="false"/>
109
		<delete dir="${unjarDestBin}" failonerror="false"/>
112
110
113
		<echo message="UPDATE ecjsrc-${buildLabel}.zip" />
111
		<echo message="UPDATE ecjsrc-${buildLabel}.jar" />
114
		<property name="unjarDestSrc" value="${basedir}/tempsrc"/>
112
		<property name="unjarDestSrc" value="${basedir}/tempsrc"/>
115
		<mkdir dir="${unjarDestSrc}"/>
113
		<mkdir dir="${unjarDestSrc}"/>
116
		<unzip
114
		<unzip
117
			src="${postingDirectory}/${buildLabel}/ecjsrc-${buildLabel}.zip"
115
			src="${postingDirectory}/${buildLabel}/ecjsrc-${buildLabel}.jar"
118
			dest="${unjarDestSrc}"/>
116
			dest="${unjarDestSrc}"/>
119
		<zip destfile="${postingDirectory}/${buildLabel}/ecjsrc-${buildLabel}.zip">
117
		<zip destfile="${postingDirectory}/${buildLabel}/ecjsrc-${buildLabel}.jar">
120
			<zipfileset dir="src" />
118
			<zipfileset dir="src" />
121
			<zipfileset dir="${unjarDestSrc}"/>
119
			<zipfileset dir="${unjarDestSrc}"/>
122
			<zipfileset dir="${basedir}">
120
			<zipfileset dir="${basedir}">
(-)customBuildCallbacks.xml (-6 / +6 lines)
Lines 1-5 Link Here
1
<?xml version="1.0" encoding="UTF-8"?>
<!--
1
<?xml version="1.0" encoding="UTF-8"?>
<!--
2
    Copyright (c) 2006, 2009 IBM Corporation and others.
2
    Copyright (c) 2006, 2010 IBM Corporation and others.
3
    All rights reserved. This program and the accompanying materials
3
    All rights reserved. This program and the accompanying materials
4
    are made available under the terms of the Eclipse Public License v1.0
4
    are made available under the terms of the Eclipse Public License v1.0
5
    which accompanies this distribution, and is available at
5
    which accompanies this distribution, and is available at
Lines 42-49 Link Here
42
		<mkdir dir="${dest}/checksum" />
42
		<mkdir dir="${dest}/checksum" />
43
		<checksum file="${dest}/ecj-${buildLabel}.jar" property="md5-ecj.jar" /> 
43
		<checksum file="${dest}/ecj-${buildLabel}.jar" property="md5-ecj.jar" /> 
44
		<echo message="${md5-ecj.jar} ecj-${buildLabel}.jar" file="${dest}/checksum/ecj-${buildLabel}.jar.md5" /> 
44
		<echo message="${md5-ecj.jar} ecj-${buildLabel}.jar" file="${dest}/checksum/ecj-${buildLabel}.jar.md5" /> 
45
		<checksum file="${dest}/ecjsrc-${buildLabel}.zip" property="md5-ecjsrc.zip" /> 
45
		<checksum file="${dest}/ecjsrc-${buildLabel}.jar" property="md5-ecjsrc.jar" /> 
46
		<echo message="${md5-ecjsrc.zip} ecjsrc-${buildLabel}.zip" file="${dest}/checksum/ecjsrc-${buildLabel}.zip.md5" /> 
46
		<echo message="${md5-ecjsrc.jar} ecjsrc-${buildLabel}.jar" file="${dest}/checksum/ecjsrc-${buildLabel}.jar.md5" /> 
47
	</target>
47
	</target>
48
48
49
	<!-- ===================================================================== -->
49
	<!-- ===================================================================== -->
Lines 113-125 Link Here
113
		</zip>
113
		</zip>
114
		<delete dir="${unjarDestBin}" failonerror="false"/>
114
		<delete dir="${unjarDestBin}" failonerror="false"/>
115
115
116
		<echo message="UPDATE ecjsrc-${buildLabel}.zip" />
116
		<echo message="UPDATE ecjsrc-${buildLabel}.jar" />
117
		<property name="unjarDestSrc" value="${basedir}/tempsrc"/>
117
		<property name="unjarDestSrc" value="${basedir}/tempsrc"/>
118
		<mkdir dir="${unjarDestSrc}"/>
118
		<mkdir dir="${unjarDestSrc}"/>
119
		<unzip
119
		<unzip
120
			src="${postingDirectory}/${buildLabel}/ecjsrc-${buildLabel}.zip"
120
			src="${postingDirectory}/${buildLabel}/ecjsrc-${buildLabel}.jar"
121
			dest="${unjarDestSrc}"/>
121
			dest="${unjarDestSrc}"/>
122
		<zip destfile="${postingDirectory}/${buildLabel}/ecjsrc-${buildLabel}.zip">
122
		<zip destfile="${postingDirectory}/${buildLabel}/ecjsrc-${buildLabel}.jar">
123
			<zipfileset dir="src" />
123
			<zipfileset dir="src" />
124
			<zipfileset dir="${unjarDestSrc}" />
124
			<zipfileset dir="${unjarDestSrc}" />
125
			<zipfileset dir="${basedir}">
125
			<zipfileset dir="${basedir}">
(-)scripts/export-ecj.xml (-3 / +3 lines)
Lines 93-105 Link Here
93
		</zip>
93
		</zip>
94
94
95
95
96
		<echo message="UPDATE ecjsrc-${buildLabel}.zip" />
96
		<echo message="UPDATE ecjsrc-${buildLabel}.jar" />
97
		<delete file="${dest}/ecjsrc-${buildLabel}.zip" failonerror="false"/>
97
		<delete file="${dest}/ecjsrc-${buildLabel}.jar" failonerror="false"/>
98
		<copy todir="${ecj-temp-src-folder}">
98
		<copy todir="${ecj-temp-src-folder}">
99
			<fileset dir="scripts/source" />
99
			<fileset dir="scripts/source" />
100
		</copy>
100
		</copy>
101
		<replace file="${ecj-temp-src-folder}/META-INF/MANIFEST.MF" token="qualifier" value="${buildLabel}"/>
101
		<replace file="${ecj-temp-src-folder}/META-INF/MANIFEST.MF" token="qualifier" value="${buildLabel}"/>
102
		<zip zipfile="${dest}/ecjsrc-${buildLabel}.zip">
102
		<zip zipfile="${dest}/ecjsrc-${buildLabel}.jar">
103
			<zipfileset dir="ecj-temp-src-folder" />
103
			<zipfileset dir="ecj-temp-src-folder" />
104
			<zipfileset dir="batch" />
104
			<zipfileset dir="batch" />
105
			<zipfileset dir="compiler" />
105
			<zipfileset dir="compiler" />

Return to bug 327817