Attachment 183472 Details for Bug 327899 – Proposed fix

[patch] Proposed fix

patch_327899.txt (text/plain), 6.09 KB, created by Olivier Thomann

on 2010-11-19 09:56:42 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2010-11-19 09:56:42 EST

Size: 6.09 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core
>Index: customBuildCallbacks.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/customBuildCallbacks.xml,v
>retrieving revision 1.11
>diff -u -r1.11 customBuildCallbacks.xml
>--- customBuildCallbacks.xml	28 Apr 2009 16:53:03 -0000	1.11
>+++ customBuildCallbacks.xml	19 Nov 2010 14:56:17 -0000
>@@ -1,5 +1,5 @@
> <?xml version="1.0" encoding="UTF-8"?>

> 	
>-	
>-	<target name="post.compile.jdtCompilerAdapter.jar">
>-		<ant antfile="${basedir}/scripts/export-ecj.xml" target="extract-ant-adapter-compiler"/>
>+	
	
	
	
	
	
	
	
	
	
	<target name="post.compile.jdtCompilerAdapter.jar">
>+		<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>	
> 	</target>
>-	
>+
> 	
> 	
>-	
>+	
	
> 	<target name="post.jdtCompilerAdapter.jar">
>-	</target>
>+		<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>
> </project>
>\ No newline at end of file
>Index: scripts/antadapter/META-INF/MANIFEST.MF
>===================================================================
>RCS file: scripts/antadapter/META-INF/MANIFEST.MF
>diff -N scripts/antadapter/META-INF/MANIFEST.MF
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ scripts/antadapter/META-INF/MANIFEST.MF	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,14 @@
>+Manifest-Version: 1.0
>+Bundle-ManifestVersion: 2
>+Bundle-Name: %pluginName
>+Bundle-SymbolicName: org.eclipse.jdt.core.ant.compiler.adapter;singleton:=true
>+Bundle-Version: 1.0.0
>+Bundle-ClassPath: bogus
>+Bundle-RequiredExecutionEnvironment: J2SE-1.4
>+Import-Package: org.eclipse.jdt.core.compiler,
>+ org.eclipse.jdt.internal.antadapter,
>+ org.eclipse.jdt.internal.compiler.batch,
>+ org.eclipse.jdt.internal.compiler.impl,
>+ org.eclipse.jdt.internal.compiler.util
>+Bundle-Vendor: %providerName
>+Bundle-Localization: plugin
>Index: scripts/antadapter/plugin.properties
>===================================================================
>RCS file: scripts/antadapter/plugin.properties
>diff -N scripts/antadapter/plugin.properties
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ scripts/antadapter/plugin.properties	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,13 @@
>+###############################################################################
>+# Copyright (c) 2010 EclipseSource Inc. and others.
>+# All rights reserved. This program and the accompanying materials
>+# are made available under the terms of the Eclipse Public License v1.0
>+# which accompanies this distribution, and is available at
>+# http://www.eclipse.org/legal/epl-v10.html
>+#
>+# Contributors:
>+#     EclipseSource Inc. - initial API and implementation
>+###############################################################################
>+
>+providerName=Eclipse.org
>+pluginName=JDT ECJ Ant Compiler Adapter
>Index: scripts/antadapter/plugin.xml
>===================================================================
>RCS file: scripts/antadapter/plugin.xml
>diff -N scripts/antadapter/plugin.xml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ scripts/antadapter/plugin.xml	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,20 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<?eclipse version="3.0"?>
>+
>+<plugin>
>+<extension 
>+	point="org.eclipse.ant.core.extraClasspathEntries">
>+	<extraClasspathEntry
>+		library="/">
>+	</extraClasspathEntry>
>+</extension> 
>+</plugin>

Actions: View | Diff

Attachments on bug 327899: 181349 | 182675 | 183025 | 183472 | 184492