merging brances...

11 files changed, 276 insertions, 3 deletions

diff --git a/java/closure-compiler/PKGBUILD b/java/closure-compiler/PKGBUILD
new file mode 100644
index 000000000..25d5d60ad
--- /dev/null
+++ b/java/closure-compiler/PKGBUILD
@@ -0,0 +1,67 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=closure-compiler
+pkgver=20130603
+pkgdesc="A JavaScript optimizing compiler."
+url="https://code.google.com/closure/compiler/"
+license=('Apache2')
+
+pkgrel=1
+arch=('any')
+depends=('java-runtime' 'sh')
+makedepends=(
+  'apache-ant'
+  #'java-args4j' # does not exist
+  #'google-caja' # does not exist
+  #'java-guava' # does not build
+  'java-jarjar'
+  'java-json'
+  #'java-jsr305' # does not exist
+  'junit'
+  #'java-protobuf' # does not build
+  # maven-ant-tasks
+  'jh')
+
+source=("libre://$pkgname-$pkgver.tar.gz" 'closure-compiler.sh')
+
+mksource=("$pkgname-$pkgver::git+https://code.google.com/p/closure-compiler/#tag=v${pkgver}")
+mkmd5sums=('SKIP')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ln -sf /opt/apache-ant/lib/ant.jar          lib/ant.jar
+  ln -sf /opt/apache-ant/lib/ant-launcher.jar lib/ant-launcher.jar
+  #ln -sf /usr/share/java/args4.jar            lib/args4j.jar
+  #ln -sf /usr/share/java/caja-r4314.jar       lib/caja-r4314.jar
+  #ln -sf /usr/share/java/guava.jar            lib/guava.jar
+  ln -sf /usr/share/java/jarjar.jar           lib/jarjar.jar
+  ln -sf /usr/share/java/json.jar             lib/json.jar
+  #ln -sf /usr/share/java/jsr305.jar           lib/jsr305.jar
+  ln -sf /usr/share/java/junit.jar            lib/junit.jar
+  #ln -sf /usr/share/java/protobuf.jar         lib/protobuf-java.jar
+  #ln -sf /...                                 tools/maven-ant-tasks-2.1.3.jar
+
+  sed -i "
+/<target name=\"relversion\">/,/<\/target>/ {
+  s/executable=\"git\"/executable=\"echo\"/
+  /<arg/d
+  /<\/exec>/i<arg value=\"v${pkgver}\" />
+}" build.xml
+
+  ant jar pom
+}
+
+package() {
+  cd "$srcdir"
+  install -Dm755 closure-compiler.sh  "$pkgdir"/usr/bin/closure-compiler
+
+  cd "$srcdir/$pkgname-$pkgver"
+  DESTDIR="$pkgdir" jh mvn-install \
+    com.google.javascript closure-compiler v${pkgver} \
+    build/pom.xml build/compiler.jar \
+    closure-compiler.jar
+}
+
+md5sums=('00b89084401b9550166a1f1294f9ba39'
+         'd4ead4585fcc7039d3c32eb5c4491bb9')
diff --git a/java/closure-compiler/closure-compiler.sh b/java/closure-compiler/closure-compiler.sh
new file mode 100644
index 000000000..e06590db2
--- /dev/null
+++ b/java/closure-compiler/closure-compiler.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+java -jar /usr/share/java/closure-compiler.jar "$@"
diff --git a/java/java-json-android/PKGBUILD b/java/java-json-android/PKGBUILD
index 3b0a08195..a5ec08c9f 100644
--- a/java/java-json-android/PKGBUILD
+++ b/java/java-json-android/PKGBUILD
@@ -10,7 +10,7 @@ pkgver=${_pkgver//_/.}
 provides=(java-json)
 conflicts=(java-json)
 
-pkgrel=1
+pkgrel=2
 arch=(any)
 
 depends=(java-runtime)
@@ -45,6 +45,6 @@ check() {
 
 package() {
   cd "$srcdir"/android-libcore-$_pkgver/json
-  install -Dm644 NOTICE "pkgdir"/usr/share/licenses/$pkgname
-  install -Dm644 src/main/java/json.jar "pkgdir"/usr/share/java/json.jar
+  install -Dm644 NOTICE "$pkgdir"/usr/share/licenses/$pkgname/NOTICE
+  install -Dm644 src/main/java/json.jar "$pkgdir"/usr/share/java/json.jar
 }
diff --git a/java/not-working/java-asm4/PKGBUILD b/java/not-working/java-asm4/PKGBUILD
new file mode 100644
index 000000000..3db06dddc
--- /dev/null
+++ b/java/not-working/java-asm4/PKGBUILD
@@ -0,0 +1,17 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgver=4.1
+. ../java-asm2/common.sh
+depends+=('java-bnd')
+
+####
+
+pkgrel=5
+_checksource_ignore=(src/org/objectweb/asm/optimizer/jdk{1.2.2_017,1.3.1_19}.txt.gz)
+
+mksource() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  rm examples/jasmin/test/jasmin.jar
+}
+
+md5sums=('cbfd7445edc517e0867ad410e48cb106')
diff --git a/java/not-working/java-asm4/TODO b/java/not-working/java-asm4/TODO
new file mode 100644
index 000000000..563c88bc9
--- /dev/null
+++ b/java/not-working/java-asm4/TODO
@@ -0,0 +1 @@
+Depends on java-bnd, which is not packaged
\ No newline at end of file
diff --git a/java/not-working/java-guava/PKGBUILD b/java/not-working/java-guava/PKGBUILD
new file mode 100644
index 000000000..0250e7183
--- /dev/null
+++ b/java/not-working/java-guava/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=guava
+pkgname=java-guava
+pkgver=13.0.1
+pkgdesc="Google Core Libraries for Java."
+url="https://code.google.com/p/guava-libraries/"
+license=('Apache2')
+
+pkgrel=1
+arch=('any')
+depends=('java-runtime>=5')
+makedepends=('java-runtime>=6' 'maven' 'junit-truth' 'jh')
+conflicts=('openjdk6') # OpenJDK bug 100167 conflicts
+source=("$pkgname::git+https://code.google.com/p/guava-libraries/#tag=v$pkgver")
+
+mksource() {
+  cd "$srcdir/$pkgname"
+  rm guava/lib/*.jar
+  rm guava-test/lib/*.jar
+}
+
+build() {
+  cd "$srcdir/$pkgname"
+  eval `jh mksource`
+
+  ln -s /usr/share/java/junit-truth.jar guava-tests/lib/libtruth.java
+
+  mvn package
+}
+
+package() {
+    :
+}
diff --git a/java/not-working/java-guava/TODO b/java/not-working/java-guava/TODO
new file mode 100644
index 000000000..ee0a18042
--- /dev/null
+++ b/java/not-working/java-guava/TODO
@@ -0,0 +1,2 @@
+* depends on junit-truth, which does not build yet
+* package() hasn't been written
diff --git a/java/not-working/junit-truth/PKGBUILD b/java/not-working/junit-truth/PKGBUILD
new file mode 100644
index 000000000..61a0ee469
--- /dev/null
+++ b/java/not-working/junit-truth/PKGBUILD
@@ -0,0 +1,45 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname=junit-truth
+pkgdesc="Assertion/Proposition framework for Java unit tests."
+url="https://github.com/truth0/truth"
+license=('Apache2')
+
+#_pkgver=0.5.0-beta1
+#pkgver=${_pkgver//-/.}
+#_tag=v${_pkgver}
+
+#pkgver=0.7.0
+#_tag=truth-rel-${pkgver//./-}
+
+#pkgver=0.8
+#_tag=truth-${pkgver}
+
+#pkgver=0.9
+#_tag=release_${pkgver//./_}
+
+pkgver=0.10
+_tag=release_${pkgver//./_}
+
+pkgrel=1
+arch=('any')
+depends=('junit')
+makedepends=('maven' 'jh')
+conflicts=('openjdk6') # OpenJDK bug 100167 conflicts
+source=("$pkgname::git://github.com/truth0/truth.git#tag=$tag")
+
+build() {
+  cd "${srcdir}/${pkgname}"
+  jh checksource
+  mvn package
+}
+
+package() {
+  cd "${srcdir}/${pkgname}"
+  install -d "${pkgdir}"/usr/share/java/${pkgname}
+  JAR=${pkgname}-${pkgver}.jar
+  install -Dm 644 target/${JAR} "${pkgdir}"/usr/share/java/${pkgname}
+  ln -s       ${pkgname}/${JAR} "${pkgdir}"/usr/share/java/${pkgname}.jar
+}
+
+md5sums=('SKIP')
diff --git a/java/not-working/junit-truth/TODO b/java/not-working/junit-truth/TODO
new file mode 100644
index 000000000..d21b3e472
--- /dev/null
+++ b/java/not-working/junit-truth/TODO
@@ -0,0 +1 @@
+has unpackaged dependencies
diff --git a/java/not-working/protobuf/PKGBUILD b/java/not-working/protobuf/PKGBUILD
new file mode 100644
index 000000000..699bde0cf
--- /dev/null
+++ b/java/not-working/protobuf/PKGBUILD
@@ -0,0 +1,99 @@
+# Maintainer: Thomas S Hatch <thatch45@gmail.com>
+# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgbase=protobuf
+pkgname=('protobuf' 'python2-protobuf' 'java-protobuf')
+pkgver=2.4.1
+pkgrel=2.1
+pkgdesc="A way of encoding structured data in an efficient yet extensible format"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/protobuf/"
+license=('APACHE')
+depends=('gcc-libs' 'zlib')
+makedepends=('python2' 'python2-distribute' 'java-environment')
+options=(!libtool)
+source=(http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
+md5sums=('ed436802019c9e1f40cc750eaf78f318')
+
+####
+
+build() {
+  build_protobuf
+  build_python2-protobuf
+  build_java-protobuf
+}
+
+check() {
+  check_protobuf
+  check_python2-protobuf
+  check_java-protobuf
+}
+
+package() {
+  package_protobuf
+  package_python2-protobuf
+  package_java-protobuf
+}
+
+####
+
+build_protobuf() {
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+check_protobuf() {
+  cd $srcdir/$pkgname-$pkgver
+  make check
+}
+
+package_protobuf() {
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+}
+
+####
+
+build_python2-protobuf() {
+  cd $srcdir/$pkgname-$pkgver/python
+  python2 setup.py build
+}
+
+check_python2-protobuf() {
+  cd $srcdir/$pkgname-$pkgver/python
+  python2 setup.py test
+}
+
+package_python2-protobuf() {
+  pkgdesc="protobuf python2 API"
+  replaces=('protobuf-python')
+  provides=("protobuf-python=${pkgver}")
+  depends=("python2" "protobuf=${pkgver}")
+
+  cd $srcdir/protobuf-$pkgver/python
+  python2 setup.py install --prefix=/usr --root $pkgdir
+}
+
+####
+
+build_java-protobuf() {
+  cd $srcdir/$pkgname-$pkgver/java
+  mvn compile
+}
+
+check_java-protobuf() {
+  cd $srcdir/$pkgname-$pkgver/java
+  mvn test
+}
+
+package_java-protobuf() {
+  pkgdesc="protobuf Java API"
+  replaces=('protobuf-java')
+  provides=("protobuf-java=${pkgver}")
+  depends=("java-runtime" "protobuf=${pkgver}")
+
+  cd $srcdir/$pkgname-$pkgver/java
+  :
+}
diff --git a/java/not-working/protobuf/TODO b/java/not-working/protobuf/TODO
new file mode 100644
index 000000000..6a126b757
--- /dev/null
+++ b/java/not-working/protobuf/TODO
@@ -0,0 +1,5 @@
+* Missing dependencies:
+ * junit:junit:4.4 (4.10 is packaged, patch to use 4.10?)
+ * org.easymock:easymock:2.2
+ * org.easymock:easymockclassextension:2.2.1
+* package_java-protobuf() has not been written