incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org
Subject svn commit: r1311509 - in /incubator/bigtop/trunk: bigtop.mk package.mk
Date Mon, 09 Apr 2012 22:49:57 GMT
Author: rvs
Date: Mon Apr  9 22:49:57 2012
New Revision: 1311509

URL: http://svn.apache.org/viewvc?rev=1311509&view=rev
Log:
BIGTOP-509. make all is failing because flume-1.0.0-incubating.tar.gz does not exist in APACHE_MIRROR
(Ron Bogdanoff via rvs)

Modified:
    incubator/bigtop/trunk/bigtop.mk
    incubator/bigtop/trunk/package.mk

Modified: incubator/bigtop/trunk/bigtop.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop.mk?rev=1311509&r1=1311508&r2=1311509&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop.mk (original)
+++ incubator/bigtop/trunk/bigtop.mk Mon Apr  9 22:49:57 2012
@@ -23,7 +23,9 @@ HADOOP_PKG_VERSION=$(HADOOP_BASE_VERSION
 HADOOP_RELEASE_VERSION=1
 HADOOP_TARBALL_DST=$(HADOOP_NAME)-$(HADOOP_BASE_VERSION).tar.gz
 HADOOP_TARBALL_SRC=$(HADOOP_TARBALL_DST)
-HADOOP_SITE=$(APACHE_MIRROR)/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)/
+HADOOP_DOWNLOAD_PATH=/hadoop/common/$(HADOOP_NAME)-$(HADOOP_BASE_VERSION)
+HADOOP_SITE=$(APACHE_MIRROR)$(HADOOP_DOWNLOAD_PATH)
+HADOOP_ARCHIVE=$(APACHE_ARCHIVE)$(HADOOP_DOWNLOAD_PATH)
 $(eval $(call PACKAGE,hadoop,HADOOP))
 
 # ZooKeeper
@@ -35,7 +37,9 @@ ZOOKEEPER_PKG_VERSION=3.4.3
 ZOOKEEPER_RELEASE_VERSION=1
 ZOOKEEPER_TARBALL_DST=zookeeper-$(ZOOKEEPER_BASE_VERSION).tar.gz
 ZOOKEEPER_TARBALL_SRC=$(ZOOKEEPER_TARBALL_DST)
-ZOOKEEPER_SITE=$(APACHE_MIRROR)/zookeeper/zookeeper-$(ZOOKEEPER_BASE_VERSION)/
+ZOOKEEPER_DOWNLOAD_PATH=/zookeeper/zookeeper-$(ZOOKEEPER_BASE_VERSION)
+ZOOKEEPER_SITE=$(APACHE_MIRROR)$(ZOOKEEPER_DOWNLOAD_PATH)
+ZOOKEEPER_ARCHIVE=$(APACHE_ARCHIVE)$(ZOOKEEPER_DOWNLOAD_PATH)
 $(eval $(call PACKAGE,zookeeper,ZOOKEEPER))
 
 # HBase
@@ -47,7 +51,9 @@ HBASE_PKG_VERSION=$(HBASE_BASE_VERSION)
 HBASE_RELEASE_VERSION=1
 HBASE_TARBALL_DST=hbase-$(HBASE_BASE_VERSION).tar.gz
 HBASE_TARBALL_SRC=$(HBASE_TARBALL_DST)
-HBASE_SITE=$(APACHE_MIRROR)/hbase/hbase-$(HBASE_BASE_VERSION)/
+HBASE_DOWNLOAD_PATH=/hbase/hbase-$(HBASE_BASE_VERSION)
+HBASE_SITE=$(APACHE_MIRROR)$(HBASE_DOWNLOAD_PATH)
+HBASE_ARCHIVE=$(APACHE_ARCHIVE)$(HBASE_DOWNLOAD_PATH)
 $(eval $(call PACKAGE,hbase,HBASE))
 
 # Pig
@@ -59,7 +65,9 @@ PIG_RELNOTES_NAME=Apache Pig
 PIG_PKG_NAME=pig
 PIG_TARBALL_DST=pig-$(PIG_BASE_VERSION).tar.gz
 PIG_TARBALL_SRC=$(PIG_TARBALL_DST)
-PIG_SITE=$(APACHE_MIRROR)/pig/pig-$(PIG_BASE_VERSION)/
+PIG_DOWNLOAD_PATH=/pig/pig-$(PIG_BASE_VERSION)
+PIG_SITE=$(APACHE_MIRROR)$(PIG_DOWNLOAD_PATH)
+PIG_ARCHIVE=$(APACHE_ARCHIVE)$(PIG_DOWNLOAD_PATH)
 $(eval $(call PACKAGE,pig,PIG))
 
 # Hive
@@ -71,7 +79,9 @@ HIVE_PKG_VERSION=$(HIVE_BASE_VERSION)
 HIVE_RELEASE_VERSION=1
 HIVE_TARBALL_DST=hive-$(HIVE_BASE_VERSION).tar.gz
 HIVE_TARBALL_SRC=$(HIVE_TARBALL_DST)
-HIVE_SITE=$(APACHE_MIRROR)/hive/hive-$(HIVE_BASE_VERSION)/
+HIVE_DOWNLOAD_PATH=/hive/hive-$(HIVE_BASE_VERSION)
+HIVE_SITE=$(APACHE_MIRROR)$(HIVE_DOWNLOAD_PATH)
+HIVE_ARCHIVE=$(APACHE_ARCHIVE)$(HIVE_DOWNLOAD_PATH)
 $(eval $(call PACKAGE,hive,HIVE))
 
 # Sqoop
@@ -83,10 +93,11 @@ SQOOP_PKG_VERSION=1.4.1
 SQOOP_RELEASE_VERSION=1
 SQOOP_TARBALL_DST=$(SQOOP_NAME)-$(SQOOP_BASE_VERSION).tar.gz
 SQOOP_TARBALL_SRC=$(SQOOP_NAME)-$(SQOOP_BASE_VERSION)-src.tar.gz
-SQOOP_SITE=$(APACHE_MIRROR)/sqoop/$(SQOOP_BASE_VERSION)/
+SQOOP_DOWNLOAD_PATH=/sqoop/$(SQOOP_BASE_VERSION)
+SQOOP_SITE=$(APACHE_MIRROR)$(SQOOP_DOWNLOAD_PATH)
+SQOOP_ARCHIVE=$(APACHE_ARCHIVE)$(SQOOP_DOWNLOAD_PATH)
 $(eval $(call PACKAGE,sqoop,SQOOP))
 
-
 # Oozie
 OOZIE_NAME=oozie
 OOZIE_RELNOTES_NAME=Apache Oozie
@@ -96,7 +107,9 @@ OOZIE_PKG_VERSION=3.1.3
 OOZIE_RELEASE_VERSION=1
 OOZIE_TARBALL_DST=oozie-$(OOZIE_BASE_VERSION).tar.gz
 OOZIE_TARBALL_SRC=oozie-$(OOZIE_BASE_VERSION)-src.tar.gz
-OOZIE_SITE=$(APACHE_MIRROR)/incubator/$(OOZIE_NAME)/$(OOZIE_NAME)-$(OOZIE_BASE_VERSION)/
+OOZIE_DOWNLOAD_PATH=/incubator/$(OOZIE_NAME)/$(OOZIE_NAME)-$(OOZIE_BASE_VERSION)
+OOZIE_SITE=$(APACHE_MIRROR)$(OOZIE_DOWNLOAD_PATH)
+OOZIE_ARCHIVE=$(APACHE_ARCHIVE)$(OOZIE_DOWNLOAD_PATH)
 $(eval $(call PACKAGE,oozie,OOZIE))
 
 # Whirr
@@ -108,7 +121,10 @@ WHIRR_PKG_VERSION=0.7.1
 WHIRR_RELEASE_VERSION=1
 WHIRR_TARBALL_DST=whirr-$(WHIRR_BASE_VERSION).tar.gz
 WHIRR_TARBALL_SRC=$(WHIRR_TARBALL_DST)
-WHIRR_SITE=$(APACHE_ARCHIVE)/whirr/whirr-$(WHIRR_BASE_VERSION)/
+WHIRR_DOWNLOAD_PATH=/whirr/whirr-$(WHIRR_BASE_VERSION)
+WHIRR_SITE=$(APACHE_MIRROR)$(WHIRR_DOWNLOAD_PATH)
+WHIRR_ARCHIVE=$(APACHE_ARCHIVE)$(WHIRR_DOWNLOAD_PATH)
+
 $(eval $(call PACKAGE,whirr,WHIRR))
 
 # Mahout
@@ -120,7 +136,9 @@ MAHOUT_PKG_VERSION=0.6
 MAHOUT_RELEASE_VERSION=1
 MAHOUT_TARBALL_DST=mahout-distribution-$(MAHOUT_BASE_VERSION)-src.tar.gz
 MAHOUT_TARBALL_SRC=$(MAHOUT_TARBALL_DST)
-MAHOUT_SITE=$(APACHE_MIRROR)/mahout/$(MAHOUT_BASE_VERSION)/
+MAHOUT_DOWNLOAD_PATH=/mahout/$(MAHOUT_BASE_VERSION)
+MAHOUT_SITE=$(APACHE_MIRROR)$(MAHOUT_DOWNLOAD_PATH)
+MAHOUT_ARCHIVE=$(APACHE_ARCHIVE)$(MAHOUT_DOWNLOAD_PATH)
 $(eval $(call PACKAGE,mahout,MAHOUT))
 
 # Flume
@@ -132,7 +150,9 @@ FLUME_PKG_VERSION=1.1.0
 FLUME_RELEASE_VERSION=1
 FLUME_TARBALL_DST=apache-$(FLUME_NAME)-$(FLUME_BASE_VERSION).tar.gz
 FLUME_TARBALL_SRC=apache-$(FLUME_NAME)-$(FLUME_BASE_VERSION).tar.gz
-FLUME_SITE=$(APACHE_MIRROR)/incubator/$(FLUME_NAME)/$(FLUME_NAME)-$(FLUME_BASE_VERSION)/
+FLUME_DOWNLOAD_PATH=/incubator/flume/$(FLUME_PKG_NAME)-$(FLUME_BASE_VERSION)
+FLUME_SITE=$(APACHE_MIRROR)$(FLUME_DOWNLOAD_PATH)
+FLUME_ARCHIVE=$(APACHE_ARCHIVE)$(FLUME_DOWNLOAD_PATH)
 $(eval $(call PACKAGE,flume,FLUME))
 
 # Bigtop-utils

Modified: incubator/bigtop/trunk/package.mk
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/package.mk?rev=1311509&r1=1311508&r2=1311509&view=diff
==============================================================================
--- incubator/bigtop/trunk/package.mk (original)
+++ incubator/bigtop/trunk/package.mk Mon Apr  9 22:49:57 2012
@@ -141,7 +141,11 @@ $(2)_SOURCE_DIR       = $$($(2)_BUILD_DI
 $(2)_DOWNLOAD_URL = $($(2)_SITE)/$($(2)_TARBALL_SRC)
 $(2)_DOWNLOAD_DST = $(DL_DIR)/$($(2)_TARBALL_DST)
 
-# Define the file stamps
+# test that the download url will return http 200.  If it does not, use the ARCHIVE url instead
of the MIRROR SITE url
+ifneq ($$(shell curl -o /dev/null --silent --head --write-out '%{http_code}' $$($(2)_DOWNLOAD_URL)),200)
+	$(2)_DOWNLOAD_URL = $($(2)_ARCHIVE)/$($(2)_TARBALL_SRC)
+endif 
+
 $(2)_TARGET_DL       = $$($(2)_BUILD_DIR)/.download
 $(2)_TARGET_SRPM     = $$($(2)_BUILD_DIR)/.srpm
 $(2)_TARGET_RPM      = $$($(2)_BUILD_DIR)/.rpm



Mime
View raw message