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

[Guillaume Alaux]

    Date: Thursday, January 10, 2013 @ 04:00:32
  Author: guillaume
Revision: 174995

archrelease: copy trunk to extra-any

Added:
  eclipse-ecj/repos/extra-any/01-ecj-include-props.patch
    (from rev 174994, eclipse-ecj/trunk/01-ecj-include-props.patch)
  eclipse-ecj/repos/extra-any/PKGBUILD
    (from rev 174994, eclipse-ecj/trunk/PKGBUILD)
  eclipse-ecj/repos/extra-any/ecj
    (from rev 174994, eclipse-ecj/trunk/ecj)
Deleted:
  eclipse-ecj/repos/extra-any/PKGBUILD
  eclipse-ecj/repos/extra-any/ecj

----------------------------+
 01-ecj-include-props.patch |   15 +++++++++
 PKGBUILD                   |   68 +++++++++++++++++++++----------------------
 ecj                        |    8 ++---
 3 files changed, 53 insertions(+), 38 deletions(-)

Copied: eclipse-ecj/repos/extra-any/01-ecj-include-props.patch (from rev 174994, eclipse-ecj/trunk/01-ecj-include-props.patch)
===================================================================
--- 01-ecj-include-props.patch	                        (rev 0)
+++ 01-ecj-include-props.patch	2013-01-10 09:00:32 UTC (rev 174995)
@@ -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: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-10 08:58:55 UTC (rev 174994)
+++ PKGBUILD	2013-01-10 09:00:32 UTC (rev 174995)
@@ -1,34 +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.2.1
-pkgrel=1
-_date=201209141800
-pkgdesc='Eclipse java bytecode compiler'
-arch=('any')
-license=('EPL')
-url='http://www.eclipse.org/'
-depends=('java-runtime')
-makedepends=('unzip' 'apache-ant' 'java-environment')
-source=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}/ecjsrc-${pkgver}.jar
-        ecj)
-sha256sums=('d261b2158f598640f1923805d2e9bf47eb21d8333f4e1b37f59f847ad00d48f4'
-            '63aff3d126243d303ddc4305cfa77827df72e87ccf85bd8a22a2f832357e396c')
-
-build() {
-  cd ${srcdir}
-  mkdir src
-  unzip ecjsrc-${pkgver}.jar -d src
-  cd src
-  ant build
-}
-
-package() {
-  install -Dm644 ${srcdir}/src/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 174994, eclipse-ecj/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2013-01-10 09:00:32 UTC (rev 174995)
@@ -0,0 +1,34 @@
+# $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.2.1
+pkgrel=2
+_date=201209141800
+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
+        ecj)
+sha256sums=('d261b2158f598640f1923805d2e9bf47eb21d8333f4e1b37f59f847ad00d48f4'
+            '8f6259c76dfe493549bbaec3c8a7ba29e82c70e127c918adca28737dcb570f6b'
+            '63aff3d126243d303ddc4305cfa77827df72e87ccf85bd8a22a2f832357e396c')
+
+build() {
+  cd ${srcdir}
+  patch -p0 < 01-ecj-include-props.patch
+  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
+}

Deleted: ecj
===================================================================
--- ecj	2013-01-10 08:58:55 UTC (rev 174994)
+++ ecj	2013-01-10 09:00:32 UTC (rev 174995)
@@ -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 174994, eclipse-ecj/trunk/ecj)
===================================================================
--- ecj	                        (rev 0)
+++ ecj	2013-01-10 09:00:32 UTC (rev 174995)
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+CLASSPATH=/usr/share/java/ecj.jar${CLASSPATH:+:}$CLASSPATH \
+java org.eclipse.jdt.internal.compiler.batch.Main "$@"