From 486506827661f63002aea56f9b0e5fee10f11404 Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Sat, 5 Nov 2016 00:05:14 -0500
Subject: closure-compiler: updating version

---
 libre/closure-compiler/PKGBUILD | 70 ++++++++++++++---------------------------
 1 file changed, 24 insertions(+), 46 deletions(-)

(limited to 'libre/closure-compiler/PKGBUILD')

diff --git a/libre/closure-compiler/PKGBUILD b/libre/closure-compiler/PKGBUILD
index a0694b260..a10cab359 100644
--- a/libre/closure-compiler/PKGBUILD
+++ b/libre/closure-compiler/PKGBUILD
@@ -2,33 +2,21 @@
 # Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=closure-compiler
-pkgver=20160713
+pkgver=20161024
 pkgrel=1.parabola1
 pkgdesc="Performs checking, instrumentation and optimizations on Javascript code."
 arch=('any')
 url="https://developers.google.com/closure/compiler/"
 license=('APACHE')
 depends=('java-runtime')
-makedepends=(
-  'apache-ant'
-  'args4j'
-  'java-guava'
-  #'java-jarjar'
-  'java-gson'
-  'jsr305'
-  'junit'
-  'protobuf-java'
-  #'java-mockito-core' # does not exist
-  #'objenesis' # does not exist
-  'jh'
-)
-
+makedepends=('apache-ant' 'args4j' 'java-gson' 'java-guava' 'jsr305' 'protobuf-java' 'jh')
 source=("https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz"
-        'closure-compiler.sh'
-        'closure-compiler-fix_build.patch')
-sha256sums=('23bf36c418e41eaef9e7375ef6a27fbc0f52a52bd3c8375e949c8f7b23ca5c0c'
-            '10b0d74a305548b029f05bd4fb0ffabec2ff782f9e3c054c2f5236f1bf4c6630'
-            '214582d37ec2adeae4dd14bd12ac715a2d9cb0e48b66ad8567bd3dda1dca29a4')
+        "https://repo1.maven.org/maven2/com/google/jsinterop/jsinterop-annotations/1.0.1/jsinterop-annotations-1.0.1-sources.jar"
+        'build.xml' 'closure-compiler.sh')
+sha256sums=('4aab6ad08ff83f05226312199bd39be128d57afa62789252d9facab6260efc65'
+            '082d7a7cba06f0543b7d0085929897f343054acd8491a4d7020ab433d4f6daf5'
+            '7b3db592705a140dde6c60b61ed6de1f36be43389327aad132461cc36f1759b4'
+            '10b0d74a305548b029f05bd4fb0ffabec2ff782f9e3c054c2f5236f1bf4c6630')
 
 mkdepends=(git)
 mksource=("$pkgname-$pkgver::git+https://github.com/google/closure-compiler.git#tag=v$pkgver")
@@ -36,17 +24,8 @@ mkmd5sums=('SKIP')
 
 mksource() {
   cd "$srcdir/$pkgname-$pkgver"
-  rm -rv lib/*.jar
-
-  sed -i "
-    /<target name=\"relversion\">/,/<\/target>/ {
-      s/executable=\"git\"/executable=\"echo\"/
-      /<arg/d
-      /<\/exec>/i<arg value=\"v$pkgver\" />
-    }" \
-    build.xml
 
-  sed -i "s/1\.0-SNAPSHOT/v$pkgver/g" \
+  sed -i "s/1.0-SNAPSHOT/v$pkgver/g" \
     externs/pom.xml \
     pom.xml \
     pom-main.xml
@@ -55,23 +34,24 @@ mksource() {
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ln -sf /usr/share/apache-ant/lib/ant.jar          lib/ant.jar
-  ln -sf /usr/share/apache-ant/lib/ant-launcher.jar lib/ant-launcher.jar
+  mv ../build.xml .
+  sed -i "s/1.0-SNAPSHOT/v$pkgver/g" build.xml
+
+  mkdir -p {jsinterop,lib}
+  ln -sf /usr/share/apache-ant/lib/ant.jar    lib/ant.jar
   ln -sf /usr/share/java/args4j.jar           lib/args4j.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/gson.jar             lib/gson.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/mockito-core.jar     lib/mockito-core.jar
-  #ln -sf /usr/share/java/objenesis.jar        lib/objenesis.jar
   ln -sf /usr/share/java/protobuf.jar         lib/protobuf-java.jar
-
-  patch -Np1 -i "$srcdir/closure-compiler-fix_build.patch"
 }
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
+
+  javac -d jsinterop $(find ../jsinterop/ -name \*.java)
+  jar -cvf lib/jsinterop.jar -C jsinterop .
+
   ant jar javadoc
 }
 
@@ -83,19 +63,17 @@ package() {
 
   # Install documentation
   install -d "$pkgdir/usr/share/doc/$pkgname"
-  cp -r "build/javadoc" "$pkgdir/usr/share/doc/$pkgname"
+  cp -r build/javadoc "$pkgdir/usr/share/doc/$pkgname"
 
   # Install Maven artifacts
-  export DESTDIR="$pkgdir"
+  export DESTDIR=$pkgdir
   jh mvn-install com.google.javascript "$pkgname-parent"  "v$pkgver" pom.xml
   jh mvn-install com.google.javascript "$pkgname-externs" "v$pkgver" externs/pom.xml
   jh mvn-install com.google.javascript "$pkgname"         "v$pkgver" pom-main.xml \
-    build/compiler.jar "$pkgname-$pkgver.jar"
-  ln -s "/usr/share/java/$pkgname-$pkgver.jar" \
-    "$pkgdir/usr/share/java/$pkgname.jar"
+    build/compiler.jar "$pkgname.jar"
 
-  install -Dm755 "$srcdir/closure-compiler.sh" "$pkgdir/usr/bin/closure-compiler"
+  ln -s "/usr/share/java/$pkgname.jar" \
+    "$pkgdir/usr/share/java/$pkgname-$pkgver.jar"
 
-  # symlink for compatibility with Arch's [community]/closure-compiler
-  ln -s closure-compiler "$pkgdir/usr/bin/closure"
+  install -Dm755 "$srcdir/closure-compiler.sh" "$pkgdir/usr/bin/closure-compiler"
 }
-- 
cgit v1.2.3