Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

New Android app uploaded to Play. Version 2 aka '0.6.1'. 

Change-Id: I0f655de272e15f854a909b629b68a2dd012e36c2
This commit is contained in:
Brad Fitzpatrick 2014-02-21 18:17:59 -08:00
parent 84fa82e0d0
commit 593682dc2d
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clients/android/AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.camlistore"
android:versionCode="1"
android:versionName="1.0">
android:versionCode="2"
android:versionName="0.6.1">
<!-- Now using Gingerbread and up.... -->
<uses-sdk android:minSdkVersion="10" android:targetSdkVersion="17" />

8
clients/android/build-in-docker.pl
View File

@ -27,6 +27,14 @@ system("cp", "-p", "$GENDIR/linux_arm/camput", "$ASSETS/camput.arm")
and die "cp failure";
# TODO: build an x86 version too? if/when those Android devices matter.
{
open(my $vfh, ">$ASSETS/camput-version.txt") or die "open camput-version error: $!";
# TODO(bradfitz): make these values automatic, and don't make the
# "Version" menu say "camput version" when it runs. Also maybe
# keep a history of these somewhere more convenient.
print $vfh "app 0.6.1 camput ccacf764 go 70499e5fbe5b";
}
chdir $ASSETS or die "can't cd to assets dir";
my $digest = `openssl sha1 camput.arm`;

17
clients/android/devenv/Dockerfile
View File

@ -5,15 +5,23 @@
FROM wasabeef/android
MAINTAINER bradfitz <brad@danga.com>
# Found these from: android list sdk -u -e
RUN android list sdk -u -e | grep build-tools- | perl -npe 's/.+"(.+)"/$1/' > /tmp/build-tools-version
RUN perl -e 'die "No Android build tools version found." unless -s "/tmp/build-tools-version"'
RUN echo y | android update sdk -u -t $(cat /tmp/build-tools-version)
RUN echo y | android update sdk -u -t android-17
# Don't need mercurial yet, since we're just using the archive URL to fetch Go.
# But it's possible we may want to switch to using hg, in which case:
# RUN yum -y install mercurial
# Update the GOVERS to depend on a new version of Go.
#
# The ec5195954667 version is in the Go 1.3 dev cycle, after I fixed some net/http
# bugs (that are also worked around in Camlistore, but...)
ENV GOVERS ec5195954667
# The 70499e5fbe5b version is in the Go 1.3 dev cycle (2014-02-21),
# after I fixed some net/http bugs (that are also worked around in
# Camlistore, but...), and after some Go 1.3 GC precision fixes. It
# enables precise stack scanning too, for better or worse (risk).
ENV GOVERS 70499e5fbe5b
RUN cd /usr/local && curl -O http://go.googlecode.com/archive/$GOVERS.zip
RUN cd /usr/local && unzip -q $GOVERS.zip
@ -22,9 +30,6 @@ RUN chmod 0755 /usr/local/go/src/make.bash
RUN echo $GOVERS > /usr/local/go/VERSION
RUN GOROOT=/usr/local/go GOARCH=arm bash -c "cd /usr/local/go/src && ./make.bash"
# Found these from: android list sdk -u -e
RUN echo y | android update sdk -u -t android-17
RUN echo y | android update sdk -u -t build-tools-19.0.1
ENV ANDROID_HOME /usr/local/android-sdk-linux
ENV ANT_HOME /usr/local/apache-ant-1.9.2