[arch-commits] Commit in eclipse-ecj/repos/extra-any (8 files)
Maxime Gauduin
alucryd at gemini.archlinux.org
Wed Jan 26 10:52:22 UTC 2022
Date: Wednesday, January 26, 2022 @ 10:52:22
Author: alucryd
Revision: 435163
archrelease: copy trunk to extra-any
Added:
eclipse-ecj/repos/extra-any/01-ecj-include-props.patch
(from rev 435161, eclipse-ecj/trunk/01-ecj-include-props.patch)
eclipse-ecj/repos/extra-any/02-buildxml-fix-manifest.patch
(from rev 435161, eclipse-ecj/trunk/02-buildxml-fix-manifest.patch)
eclipse-ecj/repos/extra-any/PKGBUILD
(from rev 435161, eclipse-ecj/trunk/PKGBUILD)
eclipse-ecj/repos/extra-any/ecj
(from rev 435161, 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 | 25 +++----
02-buildxml-fix-manifest.patch | 22 +++---
PKGBUILD | 123 ++++++++++++++++++++-------------------
ecj | 8 +-
4 files changed, 89 insertions(+), 89 deletions(-)
Deleted: 01-ecj-include-props.patch
===================================================================
--- 01-ecj-include-props.patch 2022-01-26 10:52:22 UTC (rev 435162)
+++ 01-ecj-include-props.patch 2022-01-26 10:52:22 UTC (rev 435163)
@@ -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 435161, eclipse-ecj/trunk/01-ecj-include-props.patch)
===================================================================
--- 01-ecj-include-props.patch (rev 0)
+++ 01-ecj-include-props.patch 2022-01-26 10:52:22 UTC (rev 435163)
@@ -0,0 +1,10 @@
+--- build.xml.orig 2022-01-26 11:48:44.269379689 +0100
++++ build.xml 2022-01-26 11:49:09.631741629 +0100
+@@ -41,6 +41,7 @@
+ <include name="**/readableNames.props"/>
+ <include name="META-INF/**"/>
+ <include name="**/*.properties"/>
++ <include name="**/*.props"/>
+ <exclude name="META-INF/eclipse.inf"/>
+ <exclude name="META-INF/ECLIPSE_.SF"/>
+ <exclude name="META-INF/ECLIPSE_.RSA"/>
Deleted: 02-buildxml-fix-manifest.patch
===================================================================
--- 02-buildxml-fix-manifest.patch 2022-01-26 10:52:22 UTC (rev 435162)
+++ 02-buildxml-fix-manifest.patch 2022-01-26 10:52:22 UTC (rev 435163)
@@ -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 435161, eclipse-ecj/trunk/02-buildxml-fix-manifest.patch)
===================================================================
--- 02-buildxml-fix-manifest.patch (rev 0)
+++ 02-buildxml-fix-manifest.patch 2022-01-26 10:52:22 UTC (rev 435163)
@@ -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 2022-01-26 10:52:22 UTC (rev 435162)
+++ PKGBUILD 2022-01-26 10:52:22 UTC (rev 435163)
@@ -1,59 +0,0 @@
-# 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=2
-_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"
-}
Copied: eclipse-ecj/repos/extra-any/PKGBUILD (from rev 435161, eclipse-ecj/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-01-26 10:52:22 UTC (rev 435163)
@@ -0,0 +1,64 @@
+# 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.22
+pkgrel=1
+_date=202111241800
+pkgdesc='Eclipse java bytecode compiler'
+arch=(any)
+license=(EPL)
+url=https://www.eclipse.org/
+makedepends=(
+ ant
+ java-environment=11
+)
+_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}
+ ${_base_url}/checksum/${_sha_file_name}
+ 01-ecj-include-props.patch
+ 02-buildxml-fix-manifest.patch
+ ecj
+)
+validpgpkeys=(3C91FED3922D52296888BAE9B6D3AB9BCC641282) # Eclipse Platform Project <platform-releng-dev at eclipse.org>
+sha512sums=('cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c'
+ 'd4ba6a2bd89e0804e0ae45f9f7bc49e05f65cc2339638e73d9e00663686ebd288ff6badcda00baed664790fce6e875b3d05513d5d89f644547c3fec665366e14'
+ '0eb47ad770e2b7bff82cfe933073a044d3c506946436671f6a76a43c94a72194c8fc93eaf065512235214dce8fc1730cf93fab7dfa106adeb1b814336ca46281'
+ '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() {
+ export LANG=en_US.UTF-8
+ ant build
+}
+
+package() {
+ depends=(java-runtime)
+
+ install -Dm 644 "${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 -Dm 755 ecj -t "${pkgdir}"/usr/bin/
+ install -Dm 644 ecj.1 -t "${pkgdir}"/usr/share/man/man1/
+}
+
+# vim: ts=2 sw=2 et:
Deleted: ecj
===================================================================
--- ecj 2022-01-26 10:52:22 UTC (rev 435162)
+++ ecj 2022-01-26 10:52:22 UTC (rev 435163)
@@ -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 435161, eclipse-ecj/trunk/ecj)
===================================================================
--- ecj (rev 0)
+++ ecj 2022-01-26 10:52:22 UTC (rev 435163)
@@ -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