From 608caa63f686193a107ce65390ca3f89d3a27f24 Mon Sep 17 00:00:00 2001
From: Boris Kraut <krt@blackbox.local>
Date: Sun, 13 Jul 2014 14:20:44 +0200
Subject: [PATCH] Calculator: Build arity from source; WIP for #26

---
 metadata/com.android2.calculator3.txt | 33 +++++++++++++++++++++------
 srclibs/AChartengineXlythe.txt        |  2 ++
 srclibs/ArityXlythe.txt               |  2 ++
 3 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 srclibs/AChartengineXlythe.txt
 create mode 100644 srclibs/ArityXlythe.txt

diff --git a/metadata/com.android2.calculator3.txt b/metadata/com.android2.calculator3.txt
index 21f4ea194d..68e2fe4fed 100644
--- a/metadata/com.android2.calculator3.txt
+++ b/metadata/com.android2.calculator3.txt
@@ -73,21 +73,40 @@ Build:v3.4.2,49
     target=android-17
 
 Build:4.3,63
-    disabled=google glass and wearable jars
+    disable=google glass and wearable jars
     commit=7ad3de71422a75b7c3865835b53cf1f6ca64a6ce
     subdir=Calculator
-    rm=Calculator/libs/slider.jar,Calculator/libs/ejml*jar,Calculator/libs/gson*jar,Calculator/libs/wearable-preview-support.jar,Calculator/libs/gdk.jar
     gradle=yes
-    srclibs=EJML@v0.25,Google-Gson@gson-2.2.4,Slider@00020deb7fa5499bb33cc4471af2bd5256d10e78
-    prebuild=pushd $$EJML$$ && $$MVN3$$ package && popd && cp $$EJML$$/target/ejml-0.25.jar libs/ && \
-        pushd $$Google-Gson$$ && $$MVN3$$ package && popd && cp $$Google-Gson$$/target/gson-2.2.4.jar libs/ && \
-        pushd $$Slider$$ && android update project -p ./ && ant release && popd && cp $$Slider$$/bin/classes.jar libs/slider.jar && \
+    srclibs=EJML@v0.25,Google-Gson@gson-2.2.4,Slider@00020deb7fa5499bb33cc4471af2bd5256d10e78,ArityXlythe@459535ba5005c6f3a03101b15354e44df161a637
+    rm=Calculator/libs/slider.jar,Calculator/libs/ejml*jar,Calculator/libs/gson*jar,Calculator/libs/wearable-preview-support.jar,Calculator/libs/gdk.jar,Calculator/libs/arity-2.1.6.jar
+    prebuild=pushd $$EJML$$ && \
+        $$MVN3$$ package && \
+        popd && \
+        cp $$EJML$$/target/ejml-0.25.jar libs/ && \
+        pushd $$Google-Gson$$ && \
+        $$MVN3$$ package && \
+        popd && \
+        cp $$Google-Gson$$/target/gson-2.2.4.jar libs/ && \
+        pushd $$Slider$$ && \
+        android update project -p ./ && \
+        ant release && \
+        popd && \
+        cp $$Slider$$/bin/classes.jar libs/slider.jar && \
+        pushd $$ArityXlythe$$ && \
+        rm -fR bin && \
+        mkdir bin && \
+        find -name "*.java" > sources.txt && \
+        javac -d bin @sources.txt && \
+        cd bin && \
+        jar cf arity.jar org && \
+        popd && \
+        cp $$ArityXlythe$$/bin/arity.jar libs/ && \
         cp $$SDK$$/add-ons/addon-google_gdk-google-19/libs/gdk.jar libs/
 
 Maintainer Notes:
 * REPLACED gson-2.2.4.jar with source-build 2.2.4 from upstream.
 * REPLACED ejml-0.21.jar with source-build 0.25 from upsteam.
-* CHECKED arity-2.1.6.jar against https://code.google.com/p/arity-calculator/source/browse/libs/arity-2.1.6.jar from the original author as https://code.google.com/p/arity/ is no longer available -- missing source!
+* REPLACED arity-2.1.6.jar with source-build from app author as upstream is no longer available.
 * REPLACED gdk.jar with file from Android Glass Development Kit.
 * REPLACED slider.jar with source-build latest from upstream
 * REMOVED wearable-preview-support.jar -- builds, but does it run?
diff --git a/srclibs/AChartengineXlythe.txt b/srclibs/AChartengineXlythe.txt
new file mode 100644
index 0000000000..f0e9c05dea
--- /dev/null
+++ b/srclibs/AChartengineXlythe.txt
@@ -0,0 +1,2 @@
+Repo Type:git
+Repo:https://github.com/Xlythe/achartengine
diff --git a/srclibs/ArityXlythe.txt b/srclibs/ArityXlythe.txt
new file mode 100644
index 0000000000..8a7a26e7e3
--- /dev/null
+++ b/srclibs/ArityXlythe.txt
@@ -0,0 +1,2 @@
+Repo Type:git
+Repo:https://github.com/Xlythe/Arity