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

android: fix/update docker build 

Fixes #772

Change-Id: I3980b14714d44950a2710ca5908d3db90f0f09bd
This commit is contained in:
mpl 2016-05-13 21:06:23 +02:00
parent 555b5cfd09
commit 8143b55e77
2 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,14 +16,14 @@ umask 0;
make_path($GENDIR, { mode => 0755 }) unless -d $GENDIR;
$ENV{GOROOT} = "/usr/local/go";
$ENV{GOBIN} = $GENDIR;
$ENV{GOPATH} = "/";
$ENV{GOARCH} = "arm";
$ENV{GOARM} = "7";
print "Building ARM camlistore.org/cmd/camput\n";
system("/usr/local/go/bin/go", "install", "camlistore.org/cmd/camput")
system("/usr/local/go/bin/go", "build", "-o", "$GENDIR/camput", "camlistore.org/cmd/camput")
and die "Failed to build camput";
system("cp", "-p", "$GENDIR/linux_arm/camput", "$ASSETS/camput.arm")
system("cp", "-p", "$GENDIR/camput", "$ASSETS/camput.arm")
and die "cp failure";
# TODO: build an x86 version too? if/when those Android devices matter.
@ -32,7 +32,7 @@ system("cp", "-p", "$GENDIR/linux_arm/camput", "$ASSETS/camput.arm")
# 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";
print $vfh "app 0.6.1 camput 0.9 go 1.6.2";
}
chdir $ASSETS or die "can't cd to assets dir";

19
clients/android/devenv/Dockerfile
View File

@ -15,20 +15,11 @@ RUN echo y | android update sdk -u -t android-17
# 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 073fc578434b version is Go 1.3.1 (2014-02-21),
# to satisfy the dependency for Go 1.3 in the Docker build of
# camput.
ENV GOVERS 073fc578434b
RUN cd /usr/local && curl -O http://go.googlecode.com/archive/$GOVERS.zip
RUN cd /usr/local && unzip -q $GOVERS.zip
RUN cd /usr/local && mv go-$GOVERS go
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"
# Get Go stable release
WORKDIR /tmp
RUN curl -O https://storage.googleapis.com/golang/go1.6.2.linux-amd64.tar.gz
RUN echo 'e40c36ae71756198478624ed1bb4ce17597b3c19d243f3f0899bb5740d56212a go1.6.2.linux-amd64.tar.gz' | sha256sum -c
RUN tar -C /usr/local -xzf go1.6.2.linux-amd64.tar.gz
ENV ANDROID_HOME /usr/local/android-sdk-linux
ENV ANT_HOME /usr/local/apache-ant-1.9.2