Author: rvs
Date: Wed May 30 22:32:02 2012
New Revision: 1344489
URL: http://svn.apache.org/viewvc?rev=1344489&view=rev
Log:
BIGTOP-603. Bump version of Pig to 0.10.0
Modified:
incubator/bigtop/trunk/Makefile
incubator/bigtop/trunk/bigtop-packages/src/common/pig/do-component-build
incubator/bigtop/trunk/bigtop-packages/src/deb/pig/rules
incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec
incubator/bigtop/trunk/bigtop.mk
incubator/bigtop/trunk/package.mk
Modified: incubator/bigtop/trunk/Makefile
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/Makefile?rev=1344489&r1=1344488&r2=1344489&view=diff
==============================================================================
--- incubator/bigtop/trunk/Makefile (original)
+++ incubator/bigtop/trunk/Makefile Wed May 30 22:32:02 2012
@@ -48,6 +48,7 @@ world: all
packages: $(TARGETS)
help-header:
+ @echo " Bigtop BOM: $(BIGTOP_BOM)"
@echo " targets:"
@echo " all (all TGZs/SRPMS/SDEBS)"
@echo " srpm (all SRPMs)"
Modified:
incubator/bigtop/trunk/bigtop-packages/src/common/pig/do-component-build
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/pig/do-component-build?rev=1344489&r1=1344488&r2=1344489&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/pig/do-component-build
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/pig/do-component-build
Wed May 30 22:32:02 2012
@@ -16,6 +16,17 @@
set -ex
-ant -Djavac.version=1.6 -Djava5.home=${JAVA5_HOME}
-Dforrest.home=${FORREST_HOME} -Dversion=${PIG_BASE_VERSION} -Dhadoopversion=23
package "$@"
+. `dirname ${0}`/bigtop.bom
+cat <<__EOT__ >> ivy/libraries.properties
+hbase.version=$HBASE_VERSION
+hive.version=$HIVE_VERSION
+zookeeper.version=$ZOOKEEPER_VERSION
+hadoop-core.version=$HADOOP_VERSION
+hadoop-test.version=$HADOOP_VERSION
+hadoop-common.version=$HADOOP_VERSION
+hadoop-hdfs.version=$HADOOP_VERSION
+hadoop-mapreduce.version=$HADOOP_VERSION
+__EOT__
+ant -Djavac.version=1.6 -Dforrest.home=${FORREST_HOME}
-Dversion=${PIG_VERSION} -Dhadoopversion=23 package "$@"
Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/pig/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/pig/rules?rev=1344489&r1=1344488&r2=1344489&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/pig/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/pig/rules Wed May 30
22:32:02 2012
@@ -51,7 +51,7 @@ install-indep:
cp debian/*.properties .
cp debian/pig.1 .
sh -x debian/install_pig.sh \
- --build-dir=build/pig-${PIG_BASE_VERSION} \
+ --build-dir=build/tar/pig-${PIG_BASE_VERSION} \
--prefix=debian/${pig_pkg_name} \
--doc-dir=debian/${pig_pkg_name}/usr/share/doc/${pig_pkg_name} \
--examples-dir=debian/${pig_pkg_name}/usr/share/doc/${pig_pkg_name}/examples
Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec?rev=1344489&r1=1344488&r2=1344489&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec Wed May
30 22:32:02 2012
@@ -81,6 +81,7 @@ Source2: install_pig.sh
Source3: log4j.properties
Source4: pig.1
Source5: pig.properties
+Source6: bigtop.bom
Requires: hadoop-client, bigtop-utils
%description
@@ -123,7 +124,7 @@ cp $RPM_SOURCE_DIR/log4j.properties .
cp $RPM_SOURCE_DIR/pig.1 .
cp $RPM_SOURCE_DIR/pig.properties .
sh -x %{SOURCE2} \
- --build-dir=build/pig-%{pig_base_version} \
+ --build-dir=build/tar/pig-%{pig_base_version} \
--doc-dir=$RPM_BUILD_ROOT%{doc_pig} \
--prefix=$RPM_BUILD_ROOT
Modified: incubator/bigtop/trunk/bigtop.mk
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop.mk?rev=1344489&r1=1344488&r2=1344489&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop.mk (original)
+++ incubator/bigtop/trunk/bigtop.mk Wed May 30 22:32:02 2012
@@ -59,7 +59,7 @@ HBASE_ARCHIVE=$(APACHE_ARCHIVE)$(HBASE_D
$(eval $(call PACKAGE,hbase,HBASE))
# Pig
-PIG_BASE_VERSION=0.9.2
+PIG_BASE_VERSION=0.10.0
PIG_PKG_VERSION=$(PIG_BASE_VERSION)
PIG_RELEASE_VERSION=1
PIG_NAME=pig
Modified: incubator/bigtop/trunk/package.mk
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/package.mk?rev=1344489&r1=1344488&r2=1344489&view=diff
==============================================================================
--- incubator/bigtop/trunk/package.mk (original)
+++ incubator/bigtop/trunk/package.mk Wed May 30 22:32:02 2012
@@ -52,6 +52,7 @@ $(BUILD_DIR)/%/.srpm:
mkdir -p $(PKG_BUILD_DIR)/rpm/{INSTALL,SOURCES,BUILD,SRPMS}
[ -z "$($(PKG)_TARBALL_SRC)" ] || cp $($(PKG)_DOWNLOAD_DST)
$(PKG_BUILD_DIR)/rpm/SOURCES
[ -d $(BASE_DIR)/bigtop-packages/src/common/$($(PKG)_NAME) ] && cp -r
$(BASE_DIR)/bigtop-packages/src/common/$($(PKG)_NAME)/*
$(PKG_BUILD_DIR)/rpm/SOURCES
+ echo -e "$(BIGTOP_BOM)" | tr ' ' '\012' >>
$(PKG_BUILD_DIR)/rpm/SOURCES/bigtop.bom
PKG_NAME_FOR_PKG=$(subst -,_,$($(PKG)_NAME)); \
rpmbuild --define "_topdir $(PKG_BUILD_DIR)/rpm/" \
--define
"$${PKG_NAME_FOR_PKG}_base_version $($(PKG)_BASE_VERSION)" \
@@ -99,7 +100,7 @@ $(BUILD_DIR)/%/.sdeb:
cd
$(PKG_BUILD_DIR)/deb/$($(PKG)_NAME)-$(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP) && \
cp -r $(BASE_DIR)/bigtop-packages/src/deb/$($(PKG)_NAME) debian && \
cp -r $(BASE_DIR)/bigtop-packages/src/common/$($(PKG)_NAME)/* debian
&& \
- echo -e "version=$(PKG_PKG_VERSION)\ngit.hash=deadbeaf" >>
debian/build.properties && \
+ echo -e "$(BIGTOP_BOM)" | tr ' ' '\012' >> debian/bigtop.bom && \
(echo -e "$($(PKG)_PKG_NAME)
($(PKG_PKG_VERSION)$(BIGTOP_BUILD_STAMP)-$($(PKG)_RELEASE)) stable;
urgency=low\n" && \
echo " Clean build" && \
echo " -- Bigtop <[email protected]> "`date +'%a,
%d %b %Y %T %z'`) > debian/changelog && \
@@ -251,4 +252,6 @@ TARGETS_SDEB += $(1)-sdeb
TARGETS_DEB += $(1)-deb
TARGETS_YUM += $(1)-yum
TARGETS_APT += $(1)-apt
+
+BIGTOP_BOM += $(2)_VERSION=$($(2)_BASE_VERSION)
endef
