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

Antonio Rojas arojas at archlinux.org
Wed Nov 28 20:30:15 UTC 2018


    Date: Wednesday, November 28, 2018 @ 20:30:14
  Author: arojas
Revision: 340559

archrelease: copy trunk to extra-any

Added:
  eclipse-ecj/repos/extra-any/01-ecj-include-props.patch
    (from rev 340558, eclipse-ecj/trunk/01-ecj-include-props.patch)
  eclipse-ecj/repos/extra-any/02-buildxml-fix-manifest.patch
    (from rev 340558, eclipse-ecj/trunk/02-buildxml-fix-manifest.patch)
  eclipse-ecj/repos/extra-any/PKGBUILD
    (from rev 340558, eclipse-ecj/trunk/PKGBUILD)
  eclipse-ecj/repos/extra-any/ecj
    (from rev 340558, 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                       |  108 +++++++++++++++++++++------------------
 ecj                            |    8 +-
 4 files changed, 89 insertions(+), 79 deletions(-)

Deleted: 01-ecj-include-props.patch
===================================================================
--- 01-ecj-include-props.patch	2018-11-28 20:29:46 UTC (rev 340558)
+++ 01-ecj-include-props.patch	2018-11-28 20:30:14 UTC (rev 340559)
@@ -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 340558, eclipse-ecj/trunk/01-ecj-include-props.patch)
===================================================================
--- 01-ecj-include-props.patch	                        (rev 0)
+++ 01-ecj-include-props.patch	2018-11-28 20:30:14 UTC (rev 340559)
@@ -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	2018-11-28 20:29:46 UTC (rev 340558)
+++ 02-buildxml-fix-manifest.patch	2018-11-28 20:30:14 UTC (rev 340559)
@@ -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 340558, eclipse-ecj/trunk/02-buildxml-fix-manifest.patch)
===================================================================
--- 02-buildxml-fix-manifest.patch	                        (rev 0)
+++ 02-buildxml-fix-manifest.patch	2018-11-28 20:30:14 UTC (rev 340559)
@@ -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	2018-11-28 20:29:46 UTC (rev 340558)
+++ PKGBUILD	2018-11-28 20:30:14 UTC (rev 340559)
@@ -1,49 +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.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"
-}

Copied: eclipse-ecj/repos/extra-any/PKGBUILD (from rev 340558, eclipse-ecj/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-11-28 20:30:14 UTC (rev 340559)
@@ -0,0 +1,59 @@
+# 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.3
+pkgrel=1
+_date=201703010400
+pkgdesc='Eclipse java bytecode compiler'
+arch=('any')
+license=('EPL')
+url='https://www.eclipse.org/'
+makedepends=('ant' 'java-environment=8')
+_base_url=https://archive.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date}
+_source_file_name=ecjsrc-${pkgver}.jar
+_sha_file_name=eclipse-${pkgver}-SUMSSHA512
+source=(${_base_url}/${_source_file_name}
+        ${_base_url}/checksum/${_sha_file_name}{,.asc}
+        01-ecj-include-props.patch
+        02-buildxml-fix-manifest.patch
+        ecj)
+validpgpkeys=('869FF7E31C98FBCFCF167CDE01D81CA560A48EFD') # Eclipse Project
+
+sha512sums=('a509b6d1fd7e5218ca6d9748b6c899c8c57a9d016d01e3f1d2116876f3aab796f792e1b1733189a436b6251caf8c208ec3928e3978cd0803c1449b29eae1891d'
+            '2965df1005362bb4e6e17b5048ca17c0b583c746f8ac05c46451ff603707816d7eb7b9e4ffc398fadaa18229ef0d41993f3126802c22fa2c6d488dc03797557a'
+            'SKIP'
+            '72c8a2437333e8068e60e1a035bf4e5e9b66881fc06936600a6867dc7e4eb4670f94c4b2392634ebb28f85f8fdf88248ccb9cc315717e257ce336b495c2f2d68'
+            '11ca94869d71842401e48acca72fd89e339ba65c81909cf8501bb243457caa21dc659d268b98c42ac77a1834fb7de46138787e8ea0966d96324c8de829fe563c'
+            '1895c12c63262a08a2c889bb1db61308b5cb8846e5f20e584cde6878afd4da5ee051045a61a0a5a4498146a7315c8a14bf120e5d369365f4efc573d371381846')
+
+prepare() {
+  cd "${srcdir}"
+  local _source_file_sum=$(grep -m 1 ${_source_file_name} ${_sha_file_name} | cut -d ' ' -f 1)
+  if [[ "${sha512sums[0]}" != "${_source_file_sum}" ]]; then
+    echo "Source file ${_source_file_name} does not match the SHA sum"
+    echo "provided by upstream in their PGP signed file"
+    return 1
+  fi
+
+  for p in 01-ecj-include-props 02-buildxml-fix-manifest; do
+    patch -p0 < ${p}.patch
+  done
+}
+
+build() {
+  cd "${srcdir}"
+  export LANG=en_US.UTF-8
+  ant build
+}
+
+package() {
+  depends=('java-runtime')
+
+  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	2018-11-28 20:29:46 UTC (rev 340558)
+++ ecj	2018-11-28 20:30:14 UTC (rev 340559)
@@ -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 340558, eclipse-ecj/trunk/ecj)
===================================================================
--- ecj	                        (rev 0)
+++ ecj	2018-11-28 20:30:14 UTC (rev 340559)
@@ -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