Calculator: Clean up build; enable; closes #26
This commit is contained in:
parent
0563fd26c2
commit
58a8441bf2
|
@ -73,46 +73,32 @@ Build:v3.4.2,49
|
||||||
target=android-17
|
target=android-17
|
||||||
|
|
||||||
Build:4.3,63
|
Build:4.3,63
|
||||||
disable=testing
|
|
||||||
commit=7ad3de71422a75b7c3865835b53cf1f6ca64a6ce
|
commit=7ad3de71422a75b7c3865835b53cf1f6ca64a6ce
|
||||||
subdir=Calculator
|
subdir=Calculator
|
||||||
patch=glassless-manifest.patch
|
patch=glassless-manifest.patch
|
||||||
gradle=yes
|
gradle=yes
|
||||||
srclibs=EJML@v0.25,Google-Gson@gson-2.2.4,Slider@00020deb7fa5499bb33cc4471af2bd5256d10e78,ArityXlythe@459535ba5005c6f3a03101b15354e44df161a637
|
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
|
rm=Calculator/libs/*jar
|
||||||
prebuild=pushd $$EJML$$ && \
|
prebuild=pushd $$EJML$$ && $$MVN3$$ package && popd && \
|
||||||
$$MVN3$$ package && \
|
pushd $$Google-Gson$$ && $$MVN3$$ package && popd && \
|
||||||
popd && \
|
pushd $$Slider$$ && android update project -p ./ && ant release && popd && \
|
||||||
cp $$EJML$$/target/ejml-0.25.jar libs/ && \
|
pushd $$ArityXlythe$$ && rm -fR bin/* && find -name "*.java" > sources.txt && \
|
||||||
pushd $$Google-Gson$$ && \
|
javac -d bin @sources.txt && cd bin && jar cf arity.jar org && popd && \
|
||||||
$$MVN3$$ package && \
|
rm src/main/java/com/android2/calculator3/GlassHomeActivity.java src/main/java/com/android2/calculator3/GlassResultActivity.java && \
|
||||||
popd && \
|
cp $$EJML$$/target/ejml-0.25.jar $$Google-Gson$$/target/gson-2.2.4.jar $$Slider$$/bin/classes.jar $$ArityXlythe$$/bin/arity.jar libs/
|
||||||
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/ && \
|
|
||||||
echo cp $$SDK$$/add-ons/addon-google_gdk-google-19/libs/gdk.jar libs/ && \
|
|
||||||
rm src/main/java/com/android2/calculator3/GlassHomeActivity.java src/main/java/com/android2/calculator3/GlassResultActivity.java
|
|
||||||
|
|
||||||
Maintainer Notes:
|
Maintainer Notes:
|
||||||
* REPLACED gson-2.2.4.jar with source-build 2.2.4 from upstream.
|
The JAR files slider.jar, gson-2.2.4.jar and ejml-0.21.jar have been replaced
|
||||||
* REPLACED ejml-0.21.jar with source-build 0.25 from upsteam.
|
by a version build from upstream sources. As arity-2.1.6.jar is no longer
|
||||||
* REPLACED arity-2.1.6.jar with source-build from app author as upstream is no longer available.
|
available from upstream, it has been replaced by a repo-copy of the author
|
||||||
# REPLACED gdk.jar with file from Android Glass Development Kit.
|
of this app.
|
||||||
* REMOVED gdk.jar and removed references from source.
|
|
||||||
* REPLACED slider.jar with source-build latest from upstream
|
Google's Glass Development Kit is currently not available under a free license,
|
||||||
* REMOVED wearable-preview-support.jar -- builds, but does it run?
|
so $$SDK$$/add-ons/addon-google_gdk-google-19/libs/gdk.jar cannot be used. It
|
||||||
|
hhas been removed and the code has been patched to not use it.
|
||||||
|
|
||||||
|
Google's wearable-preview-support.jar is currently not available under a free
|
||||||
|
license. It seems like it's not used in this version, so it has been removed.
|
||||||
.
|
.
|
||||||
|
|
||||||
Auto Update Mode:None
|
Auto Update Mode:None
|
||||||
|
|
Loading…
Reference in a new issue