Attachment 225635 Details for Bug 385154 – jdt.core.patch v2

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

[patch] jdt.core.patch v2

jdt.core.patch (text/plain), 5.77 KB, created by Thanh Ha

on 2013-01-15 10:07:33 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Thanh Ha

Created: 2013-01-15 10:07:33 EST

Size: 5.77 KB

patch

obsolete

>diff --git a/org.eclipse.jdt.compiler.apt/pom.xml b/org.eclipse.jdt.compiler.apt/pom.xml
>index e577373..c58ca68 100644
>--- a/org.eclipse.jdt.compiler.apt/pom.xml
>+++ b/org.eclipse.jdt.compiler.apt/pom.xml
>@@ -22,4 +22,81 @@
>   <artifactId>org.eclipse.jdt.compiler.apt</artifactId>
>   <version>1.0.600-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 6093d10..fe35c80 100644
>--- a/org.eclipse.jdt.compiler.tool/pom.xml
>+++ b/org.eclipse.jdt.compiler.tool/pom.xml
>@@ -22,4 +22,81 @@
>   <artifactId>org.eclipse.jdt.compiler.tool</artifactId>
>   <version>1.0.200-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>

Actions: View | Diff

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