bug 776783 - backout of downloading gaia over http r=cjones
authorJohn Ford <jhford@mozilla.com>
Fri, 07 Sep 2012 16:52:44 -0700
changeset 104632 257489870be6dec8cc5a59dc1b3623e64d646b68
parent 104631 fc73c2c680d18cead3d6c50cdfee4e599b6200c5
child 104633 b2ee42b9b74941f38c6737b9de4c15e89c73b413
push id23433
push userryanvm@gmail.com
push dateSat, 08 Sep 2012 04:11:45 +0000
treeherdermozilla-central@1d4fc0c60063 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscjones
bugs776783
milestone18.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 776783 - backout of downloading gaia over http r=cjones
b2g/gaia/Makefile.in
--- a/b2g/gaia/Makefile.in
+++ b/b2g/gaia/Makefile.in
@@ -21,35 +21,22 @@ DEFINES += \
   -DB2G_NAME=\"$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)\" \
   -DGAIA_PATH=\"$(GAIA_PATH)\" \
   $(NULL)
 
 # This is needed to avoid making run-b2g depend on mozglue
 WRAP_LDFLAGS :=
 endif
 
-ZIP_URL := http://people.mozilla.org/~jford/master.zip
-
 GENERATED_DIRS += $(DIST)/bin/$(GAIA_PATH)
 
 include $(topsrcdir)/config/rules.mk
 
 
 libs::
-	# For now, let's fetch a copy of Gaia over http
-	rm -rf master.zip mozilla-b2g-gaia-*
-ifeq ($(OS_ARCH),Darwin)
-	curl -L -o master.zip $(ZIP_URL)
-else
-	wget -O master.zip $(ZIP_URL) || \
-	wget -O master.zip --no-check-certificate $(ZIP_URL)
-endif
-	unzip master.zip
-	mv mozilla-b2g-* $(topsrcdir)/gaia
-	
 	# Below here is how Gaia gets built
 	# The Gaia build system freaks out when N > 1 for -jN
 	$(MAKE) -j1 -C $(GAIADIR) clean
 	$(MAKE) -j1 -C $(GAIADIR) profile GAIA_DOMAIN=desktop-builds.$(MOZ_APP_NAME).mozilla.org
 	(cd $(GAIADIR)/profile && tar $(TAR_CREATE_FLAGS) - .) | (cd $(abspath $(DIST))/bin/$(GAIA_PATH) && tar -xf -)