Attachment 218749 Details for Bug 385154 – Patch proposition

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch proposition

0001-385154-JDT-core-is-not-ready-for-tycho-builds.patch (text/plain), 6.13 KB, created by Krzysztof Daniel

on 2012-07-16 07:59:01 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof Daniel

Created: 2012-07-16 07:59:01 EDT

Size: 6.13 KB

patch

obsolete

>From 34cb03c544f89f7943a783a0763bd2aa55e9bad5 Mon Sep 17 00:00:00 2001
>From: Krzysztof Daniel <kdaniel@redhat.com>
>Date: Mon, 16 Jul 2012 12:55:18 +0200
>Subject: [PATCH] 385154: JDT core is not ready for tycho builds.
>
>This is a part one of the fix. When org.eclipse.jdt.apt.core is built
>or org.eclipse.jdt.compiler.tool are built, they should add appropriate
>classes to the ecj batch compiler, just as it was done in
>customBuildCallbacks.
>
>https://bugs.eclipse.org/bugs/show_bug.cgi?id=385154
>---
> org.eclipse.jdt.compiler.apt/pom.xml  |   78 +++++++++++++++++++++++++++++++++
> org.eclipse.jdt.compiler.tool/pom.xml |   78 +++++++++++++++++++++++++++++++++
> 2 files changed, 156 insertions(+)
>
>diff --git a/org.eclipse.jdt.compiler.apt/pom.xml b/org.eclipse.jdt.compiler.apt/pom.xml
>index 02d0129..849ba1b 100644
>--- a/org.eclipse.jdt.compiler.apt/pom.xml
>+++ b/org.eclipse.jdt.compiler.apt/pom.xml
>@@ -22,4 +22,82 @@
>   <artifactId>org.eclipse.jdt.compiler.apt</artifactId>
>   <version>1.0.500-SNAPSHOT</version>
>   <packaging>eclipse-plugin</packaging>
>+
>+
>+  <build>
>+	<plugins>
>+          <plugin>
>+            <artifactId>maven-antrun-plugin</artifactId>
>+            <version>1.7</version>
>+            <executions>
>+              <execution>
>+                <id>natives</id>
>+                <phase>process-classes</phase>
>+                <configuration>
>+                  <target>
>+
>+			<path id="ecj.id">
>+			    <fileset dir="${basedir}/../org.eclipse.jdt.core/target/">
>+			        <include name="org.eclipse.jdt.core-*-SNAPSHOT-batch-compiler.jar"/>
>+			     </fileset>
>+			</path> 
>+
>+			<property name="ecj.file" refid="ecj.id"/>
>+		
>+			<echo message="UPDATE ${ecj.file}" />
>+
>+			<property name="unjarDestBin" value="${basedir}/tempbin"/>
>+			<mkdir dir="${unjarDestBin}"/>
>+			
>+			<unjar
>+				src="${ecj.file}"
>+				dest="${unjarDestBin}"/>
>+	
>+			<zip destfile="${ecj.file}" update="true">
>+				
>+				<fileset dir="${unjarDestBin}"/>	
>+				
>+				<fileset dir="${basedir}/target/classes">
>+					<include name="**/*"/>
>+				</fileset>
>+				<fileset dir="${basedir}">
>+					<include name="META-INF/services/**" />
>+				</fileset>
>+			</zip>
>+			<delete dir="${unjarDestBin}" failonerror="false"/>
>+
>+			
>+
>+                  </target>
>+                </configuration>
>+                <goals>
>+                  <goal>run</goal>
>+                </goals>
>+              </execution>
>+            </executions>
>+            <dependencies>
>+              <dependency>
>+                <groupId>bsf</groupId>
>+                <artifactId>bsf</artifactId>
>+                <version>2.4.0</version>
>+              </dependency>
>+              <dependency>
>+                <groupId>rhino</groupId>
>+                <artifactId>js</artifactId>
>+                <version>1.7R2</version>
>+              </dependency>
>+              <dependency>
>+                <groupId>org.apache.ant</groupId>
>+                <artifactId>ant-apache-bsf</artifactId>
>+                <version>1.8.3</version>
>+              </dependency>
>+              <dependency>
>+                <groupId>org.apache.ant</groupId>
>+                <artifactId>ant-nodeps</artifactId>
>+                <version>1.8.1</version>
>+              </dependency>
>+            </dependencies>
>+          </plugin>
>+        </plugins>
>+  </build>
> </project>
>diff --git a/org.eclipse.jdt.compiler.tool/pom.xml b/org.eclipse.jdt.compiler.tool/pom.xml
>index f34327c..34542e2 100644
>--- a/org.eclipse.jdt.compiler.tool/pom.xml
>+++ b/org.eclipse.jdt.compiler.tool/pom.xml
>@@ -22,4 +22,82 @@
>   <artifactId>org.eclipse.jdt.compiler.tool</artifactId>
>   <version>1.0.101-SNAPSHOT</version>
>   <packaging>eclipse-plugin</packaging>
>+
>+
>+  <build>
>+	<plugins>
>+          <plugin>
>+            <artifactId>maven-antrun-plugin</artifactId>
>+            <version>1.7</version>
>+            <executions>
>+              <execution>
>+                <id>update-ecj</id>
>+                <phase>process-classes</phase>
>+                <configuration>
>+                  <target>
>+
>+			<path id="ecj.id">
>+			    <fileset dir="${basedir}/../org.eclipse.jdt.core/target/">
>+			        <include name="org.eclipse.jdt.core-*-SNAPSHOT-batch-compiler.jar"/>
>+			     </fileset>
>+			</path> 
>+
>+			<property name="ecj.file" refid="ecj.id"/>
>+		
>+			<echo message="UPDATE ${ecj.file}" />
>+
>+			<property name="unjarDestBin" value="${basedir}/tempbin"/>
>+			<mkdir dir="${unjarDestBin}"/>
>+			
>+			<unjar
>+				src="${ecj.file}"
>+				dest="${unjarDestBin}"/>
>+	
>+			<zip destfile="${ecj.file}" update="true">
>+				
>+				<fileset dir="${unjarDestBin}"/>	
>+				
>+				<fileset dir="${basedir}/target/classes">
>+					<include name="**/*"/>
>+				</fileset>
>+				<fileset dir="${basedir}">
>+					<include name="META-INF/services/**" />
>+				</fileset>
>+			</zip>
>+			<delete dir="${unjarDestBin}" failonerror="false"/>
>+
>+			
>+
>+                  </target>
>+                </configuration>
>+                <goals>
>+                  <goal>run</goal>
>+                </goals>
>+              </execution>
>+            </executions>
>+            <dependencies>
>+              <dependency>
>+                <groupId>bsf</groupId>
>+                <artifactId>bsf</artifactId>
>+                <version>2.4.0</version>
>+              </dependency>
>+              <dependency>
>+                <groupId>rhino</groupId>
>+                <artifactId>js</artifactId>
>+                <version>1.7R2</version>
>+              </dependency>
>+              <dependency>
>+                <groupId>org.apache.ant</groupId>
>+                <artifactId>ant-apache-bsf</artifactId>
>+                <version>1.8.3</version>
>+              </dependency>
>+              <dependency>
>+                <groupId>org.apache.ant</groupId>
>+                <artifactId>ant-nodeps</artifactId>
>+                <version>1.8.1</version>
>+              </dependency>
>+            </dependencies>
>+          </plugin>
>+        </plugins>
>+  </build>
> </project>
>-- 
>1.7.10.4
>

Actions: View | Diff

Attachments on bug 385154: 218749 | 225635 | 225636 | 225697 | 229199 | 229613