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

Collapse All | Expand All

(-)customBuildCallbacks.xml (-7 / +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 181-194 Link Here
181
181
182
	<!-- ===================================================================== -->
182
	<!-- ===================================================================== -->
183
	<!-- Steps to do after the target compile.jdtCompilerAdapter.jar           -->
183
	<!-- Steps to do after the target compile.jdtCompilerAdapter.jar           -->
184
	<!-- ===================================================================== -->
184
	<!-- ===================================================================== -->
	<!-- Steps to do during the compilation target <name>, after the compile   -->
	<!-- but before jaring.  Substitute "name" with the name of the compilation-->
	<!-- target, eg @dot                                                       -->
	<!-- Available parameters :                                                -->
	<!--   source.foldern : n = 1 ... N, the source folders                    -->
	<!--   target.folder  : where the results of the compilation go            -->
	<!--   <name>.classpath : name = name of the compilation target. A         -->
	<!--                      reference to the classpath structure.            -->
	<!-- ===================================================================== -->
	<target name="post.compile.jdtCompilerAdapter.jar">
185
	<target name="post.compile.jdtCompilerAdapter.jar">
185
		<ant antfile="${basedir}/scripts/export-ecj.xml" target="extract-ant-adapter-compiler"/>
		<copy todir="${target.folder}">
			<fileset dir="${basedir}/scripts/antadapter">
				<include name="plugin.properties"/>
				<include name="plugin.xml"/>
			</fileset>
		</copy>	
186
		<ant antfile="${basedir}/scripts/export-ecj.xml" target="extract-ant-adapter-compiler"/>
187
	</target>
186
	</target>
188
	
187
189
	<!-- ===================================================================== -->
188
	<!-- ===================================================================== -->
190
	<!-- Steps to do after the target jdtCompilerAdapter.jar                   -->
189
	<!-- Steps to do after the target jdtCompilerAdapter.jar                   -->
191
	<!-- ===================================================================== -->
190
	<!--   jar.Location : the location of the file jdtCompilerAdapter.jar      -->
	<!-- ===================================================================== -->
192
	<target name="post.jdtCompilerAdapter.jar">
191
	<target name="post.jdtCompilerAdapter.jar">
193
	</target>
192
		<property name="unjarDestBin" value="${basedir}/tempbin"/>
		<mkdir dir="${unjarDestBin}"/>
		<unjar src="${jar.Location}" dest="${unjarDestBin}"/>
		<delete file="${unjarDestBin}/META-INF/MANIFEST.MF" failonerror="false"/>
		<copy file="${basedir}/scripts/antadapter/META-INF/MANIFEST.MF" todir="${unjarDestBin}/META-INF"/>
		<zip destfile="${jar.Location}">
			<fileset dir="${unjarDestBin}">
				<include name="**/*"/>
				<include name="*/*"/>
			</fileset>
		</zip>
		<delete dir="${unjarDestBin}" failonerror="false"/>
	</target>
194
</project>
193
</project>
(-)scripts/antadapter/META-INF/MANIFEST.MF (+14 lines)
Added Link Here
1
Manifest-Version: 1.0
2
Bundle-ManifestVersion: 2
3
Bundle-Name: %pluginName
4
Bundle-SymbolicName: org.eclipse.jdt.core.ant.compiler.adapter;singleton:=true
5
Bundle-Version: 1.0.0
6
Bundle-ClassPath: bogus
7
Bundle-RequiredExecutionEnvironment: J2SE-1.4
8
Import-Package: org.eclipse.jdt.core.compiler,
9
 org.eclipse.jdt.internal.antadapter,
10
 org.eclipse.jdt.internal.compiler.batch,
11
 org.eclipse.jdt.internal.compiler.impl,
12
 org.eclipse.jdt.internal.compiler.util
13
Bundle-Vendor: %providerName
14
Bundle-Localization: plugin
(-)scripts/antadapter/plugin.properties (+13 lines)
Added Link Here
1
###############################################################################
2
# Copyright (c) 2010 EclipseSource Inc. and others.
3
# All rights reserved. This program and the accompanying materials
4
# are made available under the terms of the Eclipse Public License v1.0
5
# which accompanies this distribution, and is available at
6
# http://www.eclipse.org/legal/epl-v10.html
7
#
8
# Contributors:
9
#     EclipseSource Inc. - initial API and implementation
10
###############################################################################
11
12
providerName=Eclipse.org
13
pluginName=JDT ECJ Ant Compiler Adapter
(-)scripts/antadapter/plugin.xml (+20 lines)
Added Link Here
1
<?xml version="1.0" encoding="UTF-8"?>
2
<?eclipse version="3.0"?>
3
<!--
4
    Copyright (c) 2010 EclipseSource Inc. and others.
5
    All rights reserved. This program and the accompanying materials
6
    are made available under the terms of the Eclipse Public License v1.0
7
    which accompanies this distribution, and is available at
8
    http://www.eclipse.org/legal/epl-v10.html
9
10
    Contributors:
11
      EclipseSource Inc. - initial API and implementation
12
 -->
13
<plugin>
14
<extension 
15
	point="org.eclipse.ant.core.extraClasspathEntries">
16
	<extraClasspathEntry
17
		library="/">
18
	</extraClasspathEntry>
19
</extension> 
20
</plugin>

Return to bug 327899