Author: abayer
Date: Thu Aug 18 23:36:21 2011
New Revision: 1159446
URL: http://svn.apache.org/viewvc?rev=1159446&view=rev
Log:
BIGTOP-23. Switching to pig 0.9.0 to allow for building with Java 6.
There's a Forrest 0.8/Java 6/Pig < 0.9.0 problem that leads to
hangs/out of heap space errors. This was fixed in Pig 0.9.0, so we'll
switch our pig version to that. This does end up also requiring
explicitly specifying the pig version on the ant calls in the Debian
and RPM builds, due to a snafu in the pig tarball where the version is
set to 0.9.1-SNAPSHOT, even though it's the 0.9.0 release
tarball. Some minor tweaks were needed to package.mk to support making
sure the needed variable was available in the Debian build.
Modified:
incubator/bigtop/trunk/bigtop.mk
incubator/bigtop/trunk/package.mk
incubator/bigtop/trunk/src/pkg/deb/pig/rules
incubator/bigtop/trunk/src/pkg/rpm/pig/SPECS/pig.spec
Modified: incubator/bigtop/trunk/bigtop.mk
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop.mk?rev=1159446&r1=1159445&r2=1159446&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop.mk (original)
+++ incubator/bigtop/trunk/bigtop.mk Thu Aug 18 23:36:21 2011
@@ -52,15 +52,15 @@ HBASE_SITE=$(APACHE_MIRROR)/hbase/hbase-
$(eval $(call PACKAGE,hbase,HBASE))
# Pig
-PIG_BASE_VERSION=0.8.1
-PIG_PKG_VERSION=0.8.1
+PIG_BASE_VERSION=0.9.0
+PIG_PKG_VERSION=$(PIG_BASE_VERSION)
PIG_RELEASE_VERSION=1
PIG_NAME=pig
PIG_RELNOTES_NAME=Apache Pig
PIG_PKG_NAME=hadoop-pig
PIG_TARBALL_DST=pig-$(PIG_BASE_VERSION).tar.gz
PIG_TARBALL_SRC=$(PIG_TARBALL_DST)
-PIG_SITE=$(APACHE_MIRROR)/pig/pig-0.8.1/
+PIG_SITE=$(APACHE_MIRROR)/pig/pig-$(PIG_BASE_VERSION)/
$(eval $(call PACKAGE,pig,PIG))
# Hive
Modified: incubator/bigtop/trunk/package.mk
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/package.mk?rev=1159446&r1=1159445&r2=1159446&view=diff
==============================================================================
--- incubator/bigtop/trunk/package.mk (original)
+++ incubator/bigtop/trunk/package.mk Thu Aug 18 23:36:21 2011
@@ -98,6 +98,7 @@ $(BUILD_DIR)/%/.deb:
--preserve-envvar FORREST_HOME \
--preserve-envvar MAVEN3_HOME \
--preserve-envvar JAVA_HOME \
+
--set-envvar=$(PKG)_BASE_VERSION=$($(PKG)_BASE_VERSION) \
--set-envvar=$(PKG)_VERSION=$($(PKG)_PKG_VERSION)$(BIGTOP_BUILD_STAMP) \
--set-envvar=$(PKG)_RELEASE=$($(PKG)_RELEASE_VERSION) \
-uc -us -b
Modified: incubator/bigtop/trunk/src/pkg/deb/pig/rules
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/src/pkg/deb/pig/rules?rev=1159446&r1=1159445&r2=1159446&view=diff
==============================================================================
--- incubator/bigtop/trunk/src/pkg/deb/pig/rules (original)
+++ incubator/bigtop/trunk/src/pkg/deb/pig/rules Thu Aug 18 23:36:21 2011
@@ -22,7 +22,7 @@ clean:
build-indep: build-indep-stamp
build-indep-stamp: patch-stamp
- ant -Divy.home=`pwd`/debian/.ivy -Djava5.home=${JAVA5_HOME}
-Dforrest.home=${FORREST_HOME} -Ddist.dir=debian/tmp package
+ ant -Divy.home=`pwd`/debian/.ivy -Djava5.home=${JAVA5_HOME}
-Dforrest.home=${FORREST_HOME} -Ddist.dir=debian/tmp
-Dversion=${PIG_BASE_VERSION} package
touch $@
install: install-indep
Modified: incubator/bigtop/trunk/src/pkg/rpm/pig/SPECS/pig.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/trunk/src/pkg/rpm/pig/SPECS/pig.spec?rev=1159446&r1=1159445&r2=1159446&view=diff
==============================================================================
--- incubator/bigtop/trunk/src/pkg/rpm/pig/SPECS/pig.spec (original)
+++ incubator/bigtop/trunk/src/pkg/rpm/pig/SPECS/pig.spec Thu Aug 18 23:36:21
2011
@@ -108,7 +108,7 @@ language called Pig Latin, which has the
%build
-ant -Djavac.version=1.6 -Djava5.home=$JAVA5_HOME -Dforrest.home=$FORREST_HOME
package
+ant -Djavac.version=1.6 -Djava5.home=$JAVA5_HOME -Dforrest.home=$FORREST_HOME
-Dversion=%{pig_base_version} package
#########################
