Merge branch 'release-2.0.0-beta8'

.gitignore

@@ -1,9 +1,39 @@
 pkg
+.flashlight-builder-context/
+.lantern-builder-context/
 bin
 .DS_Store
 *.cov
+*.swp
+*.deb
+*.swo
+update_*.bz2
 flashlight_darwin_amd64
 flashlight_linux_386
 flashlight_linux_amd64
 flashlight_windows_386.exe
+lantern_darwin_amd64
+lantern_linux_386
+lantern_linux_amd64
+lantern_windows_386.exe
+lantern.exe
+lantern-installer-unsigned.exe
+lantern-installer.exe
+src/github.com/getlantern/fronted/testcert.pem
+src/github.com/getlantern/fronted/testpk.pem
 flashlight.yaml
+envvars.bash
+Lantern.app
+lantern.dmg
+src/github.com/getlantern/autoupdate/_test_app/main.go
+src/github.com/getlantern/autoupdate/_test_app/autoupdate-binary-*
+src/github.com/getlantern/autoupdate/_test_app/main
+src/github.com/getlantern/flashlight/ui/resources.go
+src/github.com/getlantern/flashlight/*.syso
+dmgbackground.png
+dmgbackground_versioned.svg
+src/github.com/getlantern/systray/sysdtray.sdf
+src/github.com/getlantern/systray/Debug
+src/github.com/getlantern/systray/Release
+src/github.com/getlantern/systray/systray/Debug
+src/github.com/getlantern/systray/systray/Release

.travis.yml

@@ -1,15 +1,17 @@
 language: go
-
 go:
-  - 1.3.3
-
+- 1.4.2
 install:
-  - go get code.google.com/p/go.tools/cmd/cover
-  - go get -v github.com/axw/gocov/gocov
-  - go get -v github.com/mattn/goveralls
-
+- sudo apt-get install make libgtk-3-dev libappindicator3-dev -y
+- go get golang.org/x/tools/cmd/cover
+- go get -v github.com/axw/gocov/gocov
+- go get -v github.com/mattn/goveralls
 script:
-  - ./testandcover.bash
-
+- openssl aes-256-cbc -K $encrypted_f217260732a9_key -iv $encrypted_f217260732a9_iv
+  -in envvars.bash.enc -out envvars.bash -d
+- make test-and-cover
 after_success:
-  - GOPATH=`pwd`:$GOPATH $HOME/gopath/bin/goveralls -coverprofile=profile.cov -service=travis-ci
+- GOPATH=`pwd`:$GOPATH $HOME/gopath/bin/goveralls -coverprofile=profile.cov -service=travis-ci
+before_install:
+- openssl aes-256-cbc -K $encrypted_f217260732a9_key -iv $encrypted_f217260732a9_iv
+  -in envvars.bash.enc -out envvars.bash -d

Dockerfile

@@ -0,0 +1,84 @@
+# Dockerfile to build an image able to compile flashlight for a variety of
+# platforms.
+#
+# > make docker
+
+FROM fedora:21
+MAINTAINER "José Carlos Nieto" <xiam@getlantern.org>
+
+ENV GO_VERSION go1.4.2
+ENV GOROOT_BOOTSTRAP /go1.4
+ENV GOROOT /go
+ENV GOPATH /
+
+ENV PATH $PATH:$GOROOT/bin
+ENV WORKDIR /lantern
+
+# Go binary for bootstrapping.
+ENV GO_PACKAGE_URL https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz
+
+# Updating system.
+RUN yum -y update && yum clean all
+
+# Requisites for building Go.
+RUN yum install -y git tar gzip curl hostname pcre-devel mercurial && yum clean all
+
+# Compilers and tools for CGO.
+RUN yum install -y gcc gcc-c++ libgcc.i686 gcc-c++.i686 pkg-config && yum clean all
+
+# Getting Go.
+RUN (curl -sSL $GO_PACKAGE_URL | tar -xvz -C /tmp) && \
+  mv /tmp/go $GOROOT_BOOTSTRAP
+
+# Getting Go source.
+RUN mkdir -p $GOROOT && \
+  git clone https://go.googlesource.com/go $GOROOT && \
+  cd $GOROOT && \
+  git checkout release-branch.go1.4
+
+# Patch for skipping a failing test in new docker versions. See https://github.com/getlantern/lantern/issues/2578
+RUN yum install -y patch && yum clean all
+RUN curl https://gist.githubusercontent.com/xiam/f50f6dd6085f9a07ccfd/raw/5e0f472221f9c1556fe34788ff01724b63980337/docker_golang | patch -p0
+
+# Bootstrapping Go.
+RUN cd $GOROOT/src && CGO_ENABLED=1 ./all.bash
+
+# Requisites for bootstrapping.
+RUN yum install -y glibc-devel glibc-static && yum clean all
+RUN yum install -y glibc-devel.i686 glib2-static.i686 glibc-2.20-8.fc21.i686 libgcc.i686 && yum clean all
+
+# Requisites for windows.
+RUN yum install -y mingw32-gcc.x86_64 && yum clean all
+
+# Boostrapping Go for different platforms.
+RUN cd $GOROOT/src && CGO_ENABLED=1 GOOS=linux GOARCH=amd64 ./make.bash --no-clean
+RUN cd $GOROOT/src && CGO_ENABLED=1 GOOS=linux GOARCH=386 ./make.bash --no-clean
+RUN cd $GOROOT/src && CXX_FOR_TARGET=i686-w64-mingw32-g++ CC_FOR_TARGET=i686-w64-mingw32-gcc CGO_ENABLED=1 GOOS=windows GOARCH=386 ./make.bash --no-clean
+
+RUN cd $GOROOT/src && GOARCH=386 ./make.bash --no-clean
+
+# Requisites for building Lantern on Linux.
+RUN yum install -y gtk3-devel libappindicator-gtk3 libappindicator-gtk3-devel && yum clean all
+RUN yum install -y pango.i686 pango-devel.i686 gtk3-devel.i686 gdk-pixbuf2-devel.i686 cairo-gobject-devel.i686 atk-devel.i686 libappindicator-gtk3-devel.i686 libdbusmenu-devel.i686 dbus-devel.i686 pkgconfig.i686 && yum clean all
+
+# Requisites for packing Lantern for Debian.
+# The fpm packer. (https://rubygems.org/gems/fpm)
+RUN yum install -y ruby ruby-devel make && yum clean all
+RUN gem install fpm
+
+# Requisites for packing Lantern for Windows.
+RUN yum install -y osslsigncode mingw32-nsis && yum clean all
+
+# Requisites for genassets.
+RUN yum install -y nodejs npm && yum clean all
+RUN npm install -g gulp
+
+# Expect the $WORKDIR volume to be mounted.
+ENV SECRETS /secrets
+
+RUN mkdir -p $WORKDIR
+RUN mkdir -p $SECRETS
+
+VOLUME [ "$WORKDIR" ]
+
+WORKDIR $WORKDIR