[arch-commits] Commit in eclipse-ecj/repos/extra-any (8 files)
Guillaume Alaux
guillaume at archlinux.org
Wed Oct 26 17:31:18 UTC 2016
Date: Wednesday, October 26, 2016 @ 17:31:17
Author: guillaume
Revision: 279292
archrelease: copy trunk to extra-any
Added:
eclipse-ecj/repos/extra-any/01-ecj-include-props.patch
(from rev 279291, eclipse-ecj/trunk/01-ecj-include-props.patch)
eclipse-ecj/repos/extra-any/02-buildxml-fix-manifest.patch
(from rev 279291, eclipse-ecj/trunk/02-buildxml-fix-manifest.patch)
eclipse-ecj/repos/extra-any/PKGBUILD
(from rev 279291, eclipse-ecj/trunk/PKGBUILD)
eclipse-ecj/repos/extra-any/ecj
(from rev 279291, 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 | 89 +++++++++++++++++++++------------------
ecj | 8 +--
4 files changed, 79 insertions(+), 70 deletions(-)
Deleted: 01-ecj-include-props.patch
===================================================================
--- 01-ecj-include-props.patch 2016-10-26 17:29:32 UTC (rev 279291)
+++ 01-ecj-include-props.patch 2016-10-26 17:31:17 UTC (rev 279292)
@@ -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 279291, eclipse-ecj/trunk/01-ecj-include-props.patch)
===================================================================
--- 01-ecj-include-props.patch (rev 0)
+++ 01-ecj-include-props.patch 2016-10-26 17:31:17 UTC (rev 279292)
@@ -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 2016-10-26 17:29:32 UTC (rev 279291)
+++ 02-buildxml-fix-manifest.patch 2016-10-26 17:31:17 UTC (rev 279292)
@@ -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 279291, eclipse-ecj/trunk/02-buildxml-fix-manifest.patch)
===================================================================
--- 02-buildxml-fix-manifest.patch (rev 0)
+++ 02-buildxml-fix-manifest.patch 2016-10-26 17:31:17 UTC (rev 279292)
@@ -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 2016-10-26 17:29:32 UTC (rev 279291)
+++ PKGBUILD 2016-10-26 17:31:17 UTC (rev 279292)
@@ -1,40 +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.6
-pkgrel=1
-_date=201606061100
-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=('98e8a53fede81668879cc8052eb4334ae5a06a296a9d20c798c7d42054233ddc'
- '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"
-}
Copied: eclipse-ecj/repos/extra-any/PKGBUILD (from rev 279291, eclipse-ecj/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2016-10-26 17:31:17 UTC (rev 279292)
@@ -0,0 +1,49 @@
+# $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.6.1
+pkgrel=1
+_date=201609071200
+pkgdesc='Eclipse java bytecode compiler'
+arch=('any')
+license=('EPL')
+url='http://www.eclipse.org/'
+depends=('java-runtime')
+makedepends=('apache-ant' 'java-environment')
+_base_url=http://download.eclipse.org/eclipse/downloads/drops4
+_sum_file_url=${_base_url}/R-${pkgver}-${_date}/checksum/eclipse-${pkgver}-SUMSSHA512
+_source_file_name=ecjsrc-${pkgver}.jar
+source=(${_base_url}/R-${pkgver}-${_date}/${_source_file_name}
+ ${_sum_file_url}{,.asc}
+ 01-ecj-include-props.patch
+ 02-buildxml-fix-manifest.patch
+ ecj)
+validpgpkeys=('869FF7E31C98FBCFCF167CDE01D81CA560A48EFD') # Eclipse Project
+
+_source_file_sum=$(curl ${_sum_file_url} | grep -m 1 ${_source_file_name} | cut -d ' ' -f 1)
+sha512sums=(${_source_file_sum}
+ 'ae98861af1ab9d2a90a3d1660700de2c5654a272f1c3d0af0698dc6d1827d3a2e2ccda4690eff706836f87bf0d5e1fbe283121ab41da7087c8618fc3fecb4d27'
+ 'SKIP'
+ '72c8a2437333e8068e60e1a035bf4e5e9b66881fc06936600a6867dc7e4eb4670f94c4b2392634ebb28f85f8fdf88248ccb9cc315717e257ce336b495c2f2d68'
+ '11ca94869d71842401e48acca72fd89e339ba65c81909cf8501bb243457caa21dc659d268b98c42ac77a1834fb7de46138787e8ea0966d96324c8de829fe563c'
+ '1895c12c63262a08a2c889bb1db61308b5cb8846e5f20e584cde6878afd4da5ee051045a61a0a5a4498146a7315c8a14bf120e5d369365f4efc573d371381846')
+
+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 2016-10-26 17:29:32 UTC (rev 279291)
+++ ecj 2016-10-26 17:31:17 UTC (rev 279292)
@@ -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 279291, eclipse-ecj/trunk/ecj)
===================================================================
--- ecj (rev 0)
+++ ecj 2016-10-26 17:31:17 UTC (rev 279292)
@@ -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