[arch-commits] Commit in eclipse-ecj/repos/extra-any (8 files)

Guillaume Alaux guillaume at nymeria.archlinux.org
Wed Jun 25 19:32:44 UTC 2014


    Date: Wednesday, June 25, 2014 @ 21:32:44
  Author: guillaume
Revision: 215450

archrelease: copy trunk to extra-any

Added:
  eclipse-ecj/repos/extra-any/01-ecj-include-props.patch
    (from rev 215449, eclipse-ecj/trunk/01-ecj-include-props.patch)
  eclipse-ecj/repos/extra-any/02-buildxml-fix-manifest.patch
    (from rev 215449, eclipse-ecj/trunk/02-buildxml-fix-manifest.patch)
  eclipse-ecj/repos/extra-any/PKGBUILD
    (from rev 215449, eclipse-ecj/trunk/PKGBUILD)
  eclipse-ecj/repos/extra-any/ecj
    (from rev 215449, eclipse-ecj/trunk/ecj)
Deleted:
  eclipse-ecj/repos/extra-any/01-ecj-include-props.patch
  eclipse-ecj/repos/extra-any/02-buildxml-fix-manifest.patch
  eclipse-ecj/repos/extra-any/PKGBUILD
  eclipse-ecj/repos/extra-any/ecj

--------------------------------+
 01-ecj-include-props.patch     |   30 +++++++--------
 02-buildxml-fix-manifest.patch |   22 +++++------
 PKGBUILD                       |   78 ++++++++++++++++++++-------------------
 ecj                            |    8 ++--
 4 files changed, 70 insertions(+), 68 deletions(-)

Deleted: 01-ecj-include-props.patch
===================================================================
--- 01-ecj-include-props.patch	2014-06-25 19:29:38 UTC (rev 215449)
+++ 01-ecj-include-props.patch	2014-06-25 19:32:44 UTC (rev 215450)
@@ -1,15 +0,0 @@
---- build.xml	2012-09-14 18:22:48.000000000 +0000
-+++ build.xml.patched	2013-01-09 10:19:28.414079935 +0000
-@@ -46,9 +46,10 @@
- 				<include name="**/*.rsc"/>
- 				<include name="META-INF/**"/>
- 				<include name="**/*.properties"/>
-+				<include name="**/*.props"/>
- 				<exclude name="META-INF/eclipse.inf"/>
- 			</fileset>
- 		</zip>
- 		<delete dir="${output}" />
- 	</target>
--</project>
-\ No newline at end of file
-+</project>

Copied: eclipse-ecj/repos/extra-any/01-ecj-include-props.patch (from rev 215449, eclipse-ecj/trunk/01-ecj-include-props.patch)
===================================================================
--- 01-ecj-include-props.patch	                        (rev 0)
+++ 01-ecj-include-props.patch	2014-06-25 19:32:44 UTC (rev 215450)
@@ -0,0 +1,15 @@
+--- build.xml	2012-09-14 18:22:48.000000000 +0000
++++ build.xml.patched	2013-01-09 10:19:28.414079935 +0000
+@@ -46,9 +46,10 @@
+ 				<include name="**/*.rsc"/>
+ 				<include name="META-INF/**"/>
+ 				<include name="**/*.properties"/>
++				<include name="**/*.props"/>
+ 				<exclude name="META-INF/eclipse.inf"/>
+ 			</fileset>
+ 		</zip>
+ 		<delete dir="${output}" />
+ 	</target>
+-</project>
+\ No newline at end of file
++</project>

Deleted: 02-buildxml-fix-manifest.patch
===================================================================
--- 02-buildxml-fix-manifest.patch	2014-06-25 19:29:38 UTC (rev 215449)
+++ 02-buildxml-fix-manifest.patch	2014-06-25 19:32:44 UTC (rev 215450)
@@ -1,11 +0,0 @@
---- build.xml.orig	2013-10-03 13:55:28.579003290 +0000
-+++ build.xml	2013-10-03 13:57:52.971400439 +0000
-@@ -39,8 +39,6 @@
- 			<compilerarg line="-Xlint:none"/>
- 		</javac>
- 
--		<delete file="${basedir}/META-INF/MANIFEST.MF" failonerror="false"/>
--		<copy tofile="${basedir}/META-INF/MANIFEST.MF" file="${basedir}/scripts/binary/META-INF/MANIFEST.MF"/>
- 		<zip destfile="${basedir}/${jar_file}">
- 			<fileset dir="${output}" />
- 			<fileset dir="${basedir}">

Copied: eclipse-ecj/repos/extra-any/02-buildxml-fix-manifest.patch (from rev 215449, eclipse-ecj/trunk/02-buildxml-fix-manifest.patch)
===================================================================
--- 02-buildxml-fix-manifest.patch	                        (rev 0)
+++ 02-buildxml-fix-manifest.patch	2014-06-25 19:32:44 UTC (rev 215450)
@@ -0,0 +1,11 @@
+--- build.xml.orig	2013-10-03 13:55:28.579003290 +0000
++++ build.xml	2013-10-03 13:57:52.971400439 +0000
+@@ -39,8 +39,6 @@
+ 			<compilerarg line="-Xlint:none"/>
+ 		</javac>
+ 
+-		<delete file="${basedir}/META-INF/MANIFEST.MF" failonerror="false"/>
+-		<copy tofile="${basedir}/META-INF/MANIFEST.MF" file="${basedir}/scripts/binary/META-INF/MANIFEST.MF"/>
+ 		<zip destfile="${basedir}/${jar_file}">
+ 			<fileset dir="${output}" />
+ 			<fileset dir="${basedir}">

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-25 19:29:38 UTC (rev 215449)
+++ PKGBUILD	2014-06-25 19:32:44 UTC (rev 215450)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-# Contributor: Allan McRae <allan at archlinux.org>
-
-pkgname=eclipse-ecj
-pkgver=4.3.1
-pkgrel=1
-_date=201309111000
-pkgdesc='Eclipse java bytecode compiler'
-arch=('any')
-license=('EPL')
-url='http://www.eclipse.org/'
-depends=('java-runtime')
-makedepends=('apache-ant' 'java-environment')
-source=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/ecjsrc-${pkgver}.jar
-        01-ecj-include-props.patch
-        02-buildxml-fix-manifest.patch
-        ecj)
-sha256sums=('2f6e214af951ed247a5bbc018df29706e2365cc2e9f7866e536b4cce0da8b66a'
-            '8f6259c76dfe493549bbaec3c8a7ba29e82c70e127c918adca28737dcb570f6b'
-            '5ca6bd94c2b1cb4c6f116d38c160edf1c4ca520647ac74b26486f958254767af'
-            '63aff3d126243d303ddc4305cfa77827df72e87ccf85bd8a22a2f832357e396c')
-
-build() {
-  cd ${srcdir}
-  for p in 01-ecj-include-props 02-buildxml-fix-manifest; do
-    patch -p0 < ${p}.patch
-  done
-  ant build
-}
-
-package() {
-  install -Dm644 ${srcdir}/ecj.jar ${pkgdir}/usr/share/java/eclipse-ecj-${pkgver}.jar
-  ln -s eclipse-ecj-${pkgver}.jar ${pkgdir}/usr/share/java/ecj.jar
-  ln -s eclipse-ecj-${pkgver}.jar ${pkgdir}/usr/share/java/eclipse-ecj.jar
-  install -Dm755 ecj ${pkgdir}/usr/bin/ecj
-}

Copied: eclipse-ecj/repos/extra-any/PKGBUILD (from rev 215449, eclipse-ecj/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-06-25 19:32:44 UTC (rev 215450)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+
+pkgname=eclipse-ecj
+pkgver=4.4
+pkgrel=1
+_date=201406061215
+pkgdesc='Eclipse java bytecode compiler'
+arch=('any')
+license=('EPL')
+url='http://www.eclipse.org/'
+depends=('java-runtime')
+makedepends=('apache-ant' 'java-environment')
+source=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/ecjsrc-${pkgver}.jar
+        01-ecj-include-props.patch
+        02-buildxml-fix-manifest.patch
+        ecj)
+sha256sums=('429a65013ae9740e4f05451f8e2968b389ec04ef2c7178ccfa5ef6714488fd12'
+            '8f6259c76dfe493549bbaec3c8a7ba29e82c70e127c918adca28737dcb570f6b'
+            '5ca6bd94c2b1cb4c6f116d38c160edf1c4ca520647ac74b26486f958254767af'
+            '63aff3d126243d303ddc4305cfa77827df72e87ccf85bd8a22a2f832357e396c')
+
+build() {
+  cd "${srcdir}"
+  for p in 01-ecj-include-props 02-buildxml-fix-manifest; do
+    patch -p0 < ${p}.patch
+  done
+  export LANG=en_US.UTF-8
+  ant build
+}
+
+package() {
+  install -Dm644 "${srcdir}/ecj.jar" "${pkgdir}/usr/share/java/eclipse-ecj-${pkgver}.jar"
+  ln -s eclipse-ecj-${pkgver}.jar "${pkgdir}/usr/share/java/ecj.jar"
+  ln -s eclipse-ecj-${pkgver}.jar "${pkgdir}/usr/share/java/eclipse-ecj.jar"
+  install -Dm755 ecj "${pkgdir}/usr/bin/ecj"
+  install -D -m 644 ecj.1 "${pkgdir}/usr/share/man/man1/ecj.1"
+}

Deleted: ecj
===================================================================
--- ecj	2014-06-25 19:29:38 UTC (rev 215449)
+++ ecj	2014-06-25 19:32:44 UTC (rev 215450)
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-CLASSPATH=/usr/share/java/ecj.jar${CLASSPATH:+:}$CLASSPATH \
-java org.eclipse.jdt.internal.compiler.batch.Main "$@"

Copied: eclipse-ecj/repos/extra-any/ecj (from rev 215449, eclipse-ecj/trunk/ecj)
===================================================================
--- ecj	                        (rev 0)
+++ ecj	2014-06-25 19:32:44 UTC (rev 215450)
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+CLASSPATH=/usr/share/java/ecj.jar${CLASSPATH:+:}$CLASSPATH \
+java org.eclipse.jdt.internal.compiler.batch.Main "$@"




More information about the arch-commits mailing list