Author: abayer
Date: Mon Sep 19 23:16:30 2011
New Revision: 1172892

URL: http://svn.apache.org/viewvc?rev=1172892&view=rev
Log:
BIGTOP-100. Moves build call to standard do-component-build.

Added:
    incubator/bigtop/trunk/bigtop-packages/src/common/flume/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/hbase/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/mahout/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/oozie/do-component-build
      - copied, changed from r1172780, 
incubator/bigtop/trunk/bigtop-packages/src/common/oozie/do-release-build
    incubator/bigtop/trunk/bigtop-packages/src/common/pig/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/do-component-build
    incubator/bigtop/trunk/bigtop-packages/src/common/whirr/do-component-build
    
incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/do-component-build
Removed:
    incubator/bigtop/trunk/bigtop-packages/src/common/oozie/do-release-build
Modified:
    incubator/bigtop/trunk/bigtop-packages/src/deb/flume/rules
    incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules
    incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules
    incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules
    incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules
    incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules
    incubator/bigtop/trunk/bigtop-packages/src/deb/pig/rules
    incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/rules
    incubator/bigtop/trunk/bigtop-packages/src/deb/whirr/rules
    incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/rules
    incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/pig/SPECS/pig.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
    incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec
    
incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec

Added: 
incubator/bigtop/trunk/bigtop-packages/src/common/flume/do-component-build
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/flume/do-component-build?rev=1172892&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/flume/do-component-build 
(added)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/flume/do-component-build 
Mon Sep 19 23:16:30 2011
@@ -0,0 +1,19 @@
+#!/bin/sh
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -ex
+
+ant -Dversion=${FLUME_VERSION} tar "$@" 

Added: 
incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/do-component-build
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/do-component-build?rev=1172892&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/do-component-build 
(added)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hadoop/do-component-build 
Mon Sep 19 23:16:30 2011
@@ -0,0 +1,29 @@
+#!/bin/sh
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -ex
+
+ant  \
+  -Djava5.home=$JAVA5_HOME \
+  -Dforrest.home=$FORREST_HOME \
+  -Dversion=${HADOOP_VERSION} \
+  -Dcompile.native=true \
+  -Dhadoop.conf.dir=/etc/hadoop/conf \
+  -Dlibhdfs=1 -Dcompile.c++=true -Djdiff.build.dir=build/docs/jdiff-cloudera \
+  api-report bin-package compile-contrib package \
+  "$@"
+
+       

Added: 
incubator/bigtop/trunk/bigtop-packages/src/common/hbase/do-component-build
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hbase/do-component-build?rev=1172892&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hbase/do-component-build 
(added)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hbase/do-component-build 
Mon Sep 19 23:16:30 2011
@@ -0,0 +1,20 @@
+#!/bin/sh
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -ex
+
+mvn clean -DskipTests -Dhbase.version=${HBASE_VERSION} install 
assembly:assembly "$@"
+

Added: incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build?rev=1172892&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build 
(added)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/hive/do-component-build 
Mon Sep 19 23:16:30 2011
@@ -0,0 +1,19 @@
+#!/bin/sh
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -ex
+
+ant -f src/build.xml package "$@"

Added: 
incubator/bigtop/trunk/bigtop-packages/src/common/mahout/do-component-build
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/mahout/do-component-build?rev=1172892&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/mahout/do-component-build 
(added)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/mahout/do-component-build 
Mon Sep 19 23:16:30 2011
@@ -0,0 +1,20 @@
+#!/bin/sh
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -ex
+
+mvn clean install -Dmahout.skip.distribution=false -DskipTests "$@"
+

Copied: 
incubator/bigtop/trunk/bigtop-packages/src/common/oozie/do-component-build 
(from r1172780, 
incubator/bigtop/trunk/bigtop-packages/src/common/oozie/do-release-build)
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/oozie/do-component-build?p2=incubator/bigtop/trunk/bigtop-packages/src/common/oozie/do-component-build&p1=incubator/bigtop/trunk/bigtop-packages/src/common/oozie/do-release-build&r1=1172780&r2=1172892&rev=1172892&view=diff
==============================================================================
    (empty)

Added: 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=1172892&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/pig/do-component-build 
(added)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/pig/do-component-build 
Mon Sep 19 23:16:30 2011
@@ -0,0 +1,21 @@
+#!/bin/sh
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -ex
+
+ant -Djavac.version=1.6 -Djava5.home=${JAVA5_HOME} 
-Dforrest.home=${FORREST_HOME} -Ddist.dir=debian/tmp 
-Dversion=${PIG_BASE_VERSION} package "$@"
+
+

Added: 
incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/do-component-build
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/do-component-build?rev=1172892&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/do-component-build 
(added)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/sqoop/do-component-build 
Mon Sep 19 23:16:30 2011
@@ -0,0 +1,21 @@
+#!/bin/sh
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -ex
+
+ant -f build.xml package "$@"
+
+

Added: 
incubator/bigtop/trunk/bigtop-packages/src/common/whirr/do-component-build
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/whirr/do-component-build?rev=1172892&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/whirr/do-component-build 
(added)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/whirr/do-component-build 
Mon Sep 19 23:16:30 2011
@@ -0,0 +1,20 @@
+#!/bin/sh
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -ex
+
+mvn clean source:jar install assembly:assembly -Pjavadoc site -DskipTests "$@"
+

Added: 
incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/do-component-build
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/do-component-build?rev=1172892&view=auto
==============================================================================
--- 
incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/do-component-build 
(added)
+++ 
incubator/bigtop/trunk/bigtop-packages/src/common/zookeeper/do-component-build 
Mon Sep 19 23:16:30 2011
@@ -0,0 +1,21 @@
+#!/bin/sh
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -ex
+
+ant -f build.xml package "$@"
+
+

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/flume/rules
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/flume/rules?rev=1172892&r1=1172891&r2=1172892&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/flume/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/flume/rules Mon Sep 19 
23:16:30 2011
@@ -40,7 +40,8 @@ clean:        
 build-indep: build-indep-stamp
 build-indep-stamp: patch-stamp
        # Temporarily disabled - we'll just use the build from the tarball.
-       ant -Dversion=$(build_version) -Divy.home=`pwd`/debian/.ivy tar
+       env FLUME_VERSION=$(build_version) \
+               sh debian/do-component-build -Divy.home=`pwd`/debian/.ivy
        mkdir -p debian/tmp
        tar cf - --exclude=debian/\* . | (cd debian/tmp && tar xf -)
        touch $@

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules?rev=1172892&r1=1172891&r2=1172892&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hadoop/rules Mon Sep 19 
23:16:30 2011
@@ -39,13 +39,8 @@ endif
 build: build-stamp
 build-stamp:
        dh_testdir
-       ant  \
-   -Dversion=${hadoop_version} \
-       -Divy.home=$(shell pwd)/build/ivy.home \
-       -Dcompile.native=true \
-       -Dhadoop.conf.dir=/etc/hadoop/conf \
-       -Dlibhdfs=1 -Dcompile.c++=true 
-Djdiff.build.dir=build/docs/jdiff-cloudera \
-       api-report bin-package compile-contrib
+       env HADOOP_VERSION=${hadoop_version} \
+               sh debian/do-component-build -Divy.home=`pwd`/debian/.ivy
        touch $@
 
 clean:  

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules?rev=1172892&r1=1172891&r2=1172892&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/rules Mon Sep 19 
23:16:30 2011
@@ -36,7 +36,7 @@ clean:        
 
 build:
        dh_testdir
-       mvn clean -DskipTests -Dhbase.version=${HBASE_VERSION} install 
assembly:assembly -Dmaven.repo.local=${HOME}/.m2/repository  
+       bash debian/do-component-build 
-Dmaven.repo.local=${HOME}/.m2/repository  
 
        
 install: build

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules?rev=1172892&r1=1172891&r2=1172892&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hive/rules Mon Sep 19 
23:16:30 2011
@@ -34,7 +34,7 @@ clean:        
 build-indep: build-indep-stamp
 build-indep-stamp:
        mkdir -p /tmp/debian-hive/.ivy
-       ant -f src/build.xml -Divy.home=`pwd`/debian/.ivy package
+       bash debian/do-component-build -Divy.home=`pwd`/debian/.ivy
        touch $@
 
 install: install-indep

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules?rev=1172892&r1=1172891&r2=1172892&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/rules Mon Sep 19 
23:16:30 2011
@@ -38,7 +38,7 @@ clean:        
 build-indep: build-indep-stamp
 build-indep-stamp: patch-stamp
        # we'll just use the build from the tarball.
-       (export DO_MAVEN_DEPLOY="";mvn clean install 
-Dmahout.skip.distribution=false -Dmaven.repo.local=${HOME}/.m2/repository 
-DskipTests)
+       bash debian/do-component-build -Dmaven.repo.local=${HOME}/.m2/repository
        mkdir -p debian/tmp
        (cd 
distribution/target/mahout-distribution-${MAHOUT_BASE_VERSION}/mahout-distribution-${MAHOUT_BASE_VERSION}
 && tar cf - --exclude=debian/\* .) | (cd debian/tmp && tar xf -)
 #      (cd debian/tmp && tar xvzf 
../../distribution/target/mahout-distribution-${MAHOUT_BASE_VERSION}.tar.gz)

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules?rev=1172892&r1=1172891&r2=1172892&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/oozie/rules Mon Sep 19 
23:16:30 2011
@@ -49,7 +49,7 @@ build-indep: build-indep-stamp
 build-indep-stamp: patch-stamp
 #      M2_CACHE=`mktemp -d /tmp/oozie.m2.XXXXX`
        mkdir -p distro/downloads
-       (export DO_MAVEN_DEPLOY=""; export FULL_VERSION=2.3.1; sh -x 
debian/do-release-build -Dmaven.repo.local=${HOME}/.m2/repository 
${m2_settings_flag} -DskipTests)
+       (export DO_MAVEN_DEPLOY=""; export FULL_VERSION=2.3.1; sh -x 
debian/do-component-build -Dmaven.repo.local=${HOME}/.m2/repository 
${m2_settings_flag} -DskipTests)
 #      rm -rf ${M2_CACHE}
        mkdir -p debian/tmp
        tar cf - --exclude=debian/\* . | (cd debian/tmp && tar xf -)

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=1172892&r1=1172891&r2=1172892&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/pig/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/pig/rules Mon Sep 19 
23:16:30 2011
@@ -38,7 +38,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 
-Dversion=${PIG_BASE_VERSION} package
+       bash debian/do-component-build -Divy.home=`pwd`/debian/.ivy
        touch $@
 
 install: install-indep

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/rules
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/rules?rev=1172892&r1=1172891&r2=1172892&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/sqoop/rules Mon Sep 19 
23:16:30 2011
@@ -37,7 +37,7 @@ clean:        
 
 build-indep: build-indep-stamp
 build-indep-stamp: patch-stamp
-       ant -Divy.home=`pwd`/debian/.ivy -f build.xml package
+       bash debian/do-component-build -Divy.home=`pwd`/debian/.ivy
        touch $@
 
 install: install-indep

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/whirr/rules
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/whirr/rules?rev=1172892&r1=1172891&r2=1172892&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/whirr/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/whirr/rules Mon Sep 19 
23:16:30 2011
@@ -37,7 +37,7 @@ clean:        
 
 build-indep: build-indep-stamp
 build-indep-stamp: patch-stamp
-       mvn clean source:jar install assembly:assembly -Pjavadoc site 
-Dmaven.repo.local=${HOME}/.m2/repository -Dskiptests
+       bash debian/do-component-build -Dmaven.repo.local=${HOME}/.m2/repository
        mkdir -p debian/tmp
        # NOTE: FIXME me right away
        cp -r debian/whirr.1 .

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/rules
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/rules?rev=1172892&r1=1172891&r2=1172892&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/rules (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/zookeeper/rules Mon Sep 19 
23:16:30 2011
@@ -37,7 +37,7 @@ clean:        
 
 build-indep: build-indep-stamp
 build-indep-stamp: patch-stamp
-       ant -f build.xml package -Divy.home=`pwd`/debian/.ivy 
+       bash debian/do-component-build -Divy.home=`pwd`/debian/.ivy 
        mkdir -p debian/tmp
        tar cf - --exclude=debian/\* . | (cd debian/tmp && tar xf -)
        touch $@

Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec?rev=1172892&r1=1172891&r2=1172892&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec 
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/flume/SPECS/flume.spec Mon 
Sep 19 23:16:30 2011
@@ -59,9 +59,10 @@ Buildroot: %{_topdir}/INSTALL/%{name}-%{
 BuildArch: noarch
 License: APL2
 Source0: flume-%{flume_base_version}.tar.gz
-Source1: init.d
-Source2: init.d.suse
-Source3: install_flume.sh
+Source1: do-component-build
+Source2: install_%{name}.sh
+Source3: init.d
+Source4: init.d.suse
 Requires: sh-utils, textutils, /usr/sbin/useradd, /sbin/chkconfig, 
/sbin/service, hadoop-zookeeper >= 3.3.1, hadoop >= 0.20.2
 BuildRequires: ant xml-commons xml-commons-apis
 
@@ -114,11 +115,11 @@ Flume is a reliable, scalable, and manag
 %setup -n %{name}-%{flume_base_version}
 
 %build
-ant -f build.xml tar -Dversion=%{version}
+env FLUME_VERSION=%{version} sh %{SOURCE1}
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
-sh $RPM_SOURCE_DIR/install_flume.sh \
+sh %{SOURCE2} \
           --build-dir=. \
           --prefix=$RPM_BUILD_ROOT \
          --doc-dir=%{doc_flume}

Modified: 
incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1172892&r1=1172891&r2=1172892&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec 
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec Mon 
Sep 19 23:16:30 2011
@@ -99,12 +99,14 @@ License: Apache License v2.0
 URL: http://hadoop.apache.org/core/
 Group: Development/Libraries
 Source0: %{name}-%{hadoop_base_version}.tar.gz
-Source1: hadoop.default
-Source2: hadoop-init.tmpl
-Source3: hadoop-init.tmpl.suse
-Source4: hadoop.1
-Source5: hadoop-fuse-dfs.1
-Source6: hadoop-fuse.default
+Source1: do-component-build
+Source2: install_%{name}.sh
+Source3: hadoop.default
+Source4: hadoop-init.tmpl
+Source5: hadoop-init.tmpl.suse
+Source6: hadoop.1
+Source7: hadoop-fuse-dfs.1
+Source8: hadoop-fuse.default
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: python >= 2.4, git, fuse-devel,fuse, automake, autoconf
 Requires: textutils, /usr/sbin/useradd, /usr/sbin/usermod, /sbin/chkconfig, 
/sbin/service
@@ -284,15 +286,7 @@ Hadoop Pipes Library
 # This assumes that you installed Java JDK 5 and set JAVA5_HOME
 # This assumes that you installed Forrest and set FORREST_HOME
 
-ant -Dversion=%{version} \
-    -Djava5.home=$JAVA5_HOME \
-    -Dforrest.home=$FORREST_HOME \
-    -Dcompile.native=true \
-        -Dhadoop.conf.dir=/etc/hadoop/conf \
-        -Dlibhdfs=1 \
-        -Dcompile.c++=true \
-        -Djdiff.build.dir=build/docs/jdiff-cloudera \
-        api-report bin-package compile-contrib package
+env HADOOP_VERSION=%{hadoop_version} bash %{SOURCE1}
 
 %clean
 %__rm -rf $RPM_BUILD_ROOT
@@ -305,7 +299,7 @@ ant -Dversion=%{version} \
 
 %__install -d -m 0755 $RPM_BUILD_ROOT/%{lib_hadoop}
 
-bash $RPM_SOURCE_DIR/install_hadoop.sh \
+bash %{SOURCE2} \
   --distro-dir=$RPM_SOURCE_DIR \
   --build-dir=$PWD/build/%{name}-%{version} \
   --src-dir=$RPM_BUILD_ROOT%{src_hadoop} \

Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec?rev=1172892&r1=1172891&r2=1172892&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec 
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SPECS/hbase.spec Mon 
Sep 19 23:16:30 2011
@@ -61,10 +61,11 @@ Group: Development/Libraries
 Buildroot: %{_topdir}/INSTALL/%{name}-%{version}
 License: APL2
 Source0: hbase-%{hbase_base_version}.tar.gz
-Source1: hadoop-hbase.sh
-Source2: hadoop-hbase.sh.suse
-Source3: hbase.default
-Source4: install_hbase.sh
+Source1: do-component-build
+Source2: install_hbase.sh
+Source3: hadoop-hbase.sh
+Source4: hadoop-hbase.sh.suse
+Source5: hbase.default
 BuildArch: noarch
 Requires: sh-utils, textutils, /usr/sbin/useradd, /sbin/chkconfig, 
/sbin/service, hadoop-zookeeper, hadoop >= 0.20.2, hadoop-zookeeper >= 3.3.1
 
@@ -149,12 +150,11 @@ Documentation for Hbase
 %setup -n hbase-%{hbase_base_version}
 
 %build
-mvn clean
-mvn -DskipTests -Dhbase.version=%{version} install assembly:assembly  
+env HBASE_VERSION=%{version} bash %{SOURCE1}
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
-sh $RPM_SOURCE_DIR/install_hbase.sh \
+sh %{SOURCE2} \
        --build-dir=. \
    --doc-dir=%{doc_hbase} \
        --prefix=$RPM_BUILD_ROOT

Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec?rev=1172892&r1=1172891&r2=1172892&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec 
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hive/SPECS/hive.spec Mon Sep 
19 23:16:30 2011
@@ -61,12 +61,14 @@ Group: Development/Libraries
 Buildroot: %{_topdir}/INSTALL/%{name}-%{version}
 BuildArch: noarch
 Source0: hive-%{hive_base_version}.tar.gz
-Source1: hadoop-hive.sh
-Source2: hadoop-hive.sh.suse
-Source3: hadoop-hive-server.default
-Source4: hadoop-hive-metastore.default
-Source5: hive.1
-Source6: hive-site.xml
+Source1: do-component-build
+Source2: install_hive.sh
+Source3: hadoop-hive.sh
+Source4: hadoop-hive.sh.suse
+Source5: hadoop-hive-server.default
+Source6: hadoop-hive-metastore.default
+Source7: hive.1
+Source8: hive-site.xml
 Requires: hadoop >= 0.20.1
 Obsoletes: %{name}-webinterface
 
@@ -114,7 +116,7 @@ This optional package hosts a metadata s
 %setup -n hive-%{hive_base_version}
 
 %build
-ant -f src/build.xml package
+bash %{SOURCE1}
 
 #########################
 #### INSTALL SECTION ####
@@ -124,7 +126,7 @@ ant -f src/build.xml package
 
 cp $RPM_SOURCE_DIR/hive.1 .
 cp $RPM_SOURCE_DIR/hive-site.xml .
-/bin/bash $RPM_SOURCE_DIR/install_hive.sh \
+/bin/bash %{SOURCE2} \
   --prefix=$RPM_BUILD_ROOT \
   --build-dir=%{hive_dist} \
   --doc-dir=$RPM_BUILD_ROOT/%{doc_hive}

Modified: 
incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec?rev=1172892&r1=1172891&r2=1172892&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec 
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec Mon 
Sep 19 23:16:30 2011
@@ -41,7 +41,8 @@ BuildArch: noarch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 License: ASL 2.0 
 Source0: %{name}-distribution-%{mahout_base_version}-src.tar.gz
-Source1: install_%{name}.sh
+Source1: do-component-build 
+Source2: install_%{name}.sh
 Requires: hadoop >= 0.20.2, /sbin/chkconfig
 
 
@@ -66,8 +67,7 @@ also on potential use cases. Come to the
 %setup -n %{name}-distribution-%{mahout_base_version}
 
 %build
-
-mvn clean install -Dmahout.skip.distribution=false -DskipTests
+bash $RPM_SOURCE_DIR/do-component-build
 
 %install
 %__rm -rf $RPM_BUILD_ROOT

Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec?rev=1172892&r1=1172891&r2=1172892&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec 
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/oozie/SPECS/oozie.spec Mon 
Sep 19 23:16:30 2011
@@ -33,6 +33,8 @@ Group: Development/Libraries
 Buildroot: %{_topdir}/INSTALL/%{name}-%{version}
 License: APL2
 Source0: %{name}-%{oozie_base_version}.tar.gz
+Source1: do-component-build
+Source2: create-package-layout
 Requires(pre): /usr/sbin/groupadd, /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
@@ -104,12 +106,12 @@ BuildArch: noarch
     M2_CACHE=`mktemp -d /tmp/oozie.m2.XXXXX`
     mkdir -p distro/downloads
     # curl --retry 5 -# -L -k -o distro/downloads/tomcat.tar.gz 
http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.29/bin/apache-tomcat-6.0.29.tar.gz
    
-    (export DO_MAVEN_DEPLOY="";export FULL_VERSION=%{version};cp 
$RPM_SOURCE_DIR/do-release-build bin; sh -x bin/do-release-build 
-Dmaven.repo.local=${HOME}/.m2/repository -DskipTests)
+    (export DO_MAVEN_DEPLOY="";export FULL_VERSION=%{version};cp %{SOURCE1} 
bin; sh -x bin/do-component-build -Dmaven.repo.local=${HOME}/.m2/repository 
-DskipTests)
     rm -rf ${M2_CACHE}
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
-    sh $RPM_SOURCE_DIR/create-package-layout --extra-dir=$RPM_SOURCE_DIR 
--build-dir=. --server-dir=$RPM_BUILD_ROOT --client-dir=$RPM_BUILD_ROOT 
--docs-dir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} 
--initd-dir=$RPM_BUILD_ROOT%{initd_dir}
+    sh %{SOURCE2} --extra-dir=$RPM_SOURCE_DIR --build-dir=. 
--server-dir=$RPM_BUILD_ROOT --client-dir=$RPM_BUILD_ROOT 
--docs-dir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} 
--initd-dir=$RPM_BUILD_ROOT%{initd_dir}
 
 %__install -d -m 0755 $RPM_BUILD_ROOT/usr/bin
 

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=1172892&r1=1172891&r2=1172892&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 Mon Sep 
19 23:16:30 2011
@@ -75,10 +75,11 @@ Buildroot: %{_topdir}/INSTALL/%{name}-%{
 BuildRequires: /usr/bin/git
 BuildArch: noarch
 Source0: pig-%{pig_base_version}.tar.gz
-Source1: install_pig.sh
-Source2: log4j.properties
-Source3: pig.1
-Source4: pig.properties
+Source1: do-component-build
+Source2: install_pig.sh
+Source3: log4j.properties
+Source4: pig.1
+Source5: pig.properties
 Requires: hadoop
 
 %description 
@@ -108,8 +109,7 @@ language called Pig Latin, which has the
 %setup -n pig-%{pig_base_version}
 
 %build
-
-ant -Djavac.version=1.6 -Djava5.home=$JAVA5_HOME -Dforrest.home=$FORREST_HOME 
-Dversion=%{pig_base_version} package
+env PIG_BASE_VERSION=%{pig_base_version} bash %{SOURCE1}
 
 
 #########################
@@ -121,7 +121,7 @@ ant -Djavac.version=1.6 -Djava5.home=$JA
 cp $RPM_SOURCE_DIR/log4j.properties .
 cp $RPM_SOURCE_DIR/pig.1 .
 cp $RPM_SOURCE_DIR/pig.properties .
-sh -x $RPM_SOURCE_DIR/install_pig.sh \
+sh -x %{SOURCE2} \
           --build-dir=. \
           --doc-dir=$RPM_BUILD_ROOT%{doc_pig} \
           --prefix=$RPM_BUILD_ROOT

Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec?rev=1172892&r1=1172891&r2=1172892&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec 
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/sqoop/SPECS/sqoop.spec Mon 
Sep 19 23:16:30 2011
@@ -36,9 +36,10 @@ Group: Development/Libraries
 Buildroot: %{_topdir}/INSTALL/%{name}-%{version}
 License: APL2
 Source0: %{name}-%{sqoop_base_version}.tar.gz
-Source1: sqoop-metastore.sh
-Source2: sqoop-metastore.sh.suse
-Source3: install_sqoop.sh
+Source1: do-component-build
+Source2: install_%{name}.sh
+Source3: sqoop-metastore.sh
+Source4: sqoop-metastore.sh.suse
 Buildarch: noarch
 BuildRequires:  asciidoc, xmlto
 Prereq: hadoop
@@ -70,11 +71,11 @@ server for Sqoop clients across a networ
 %setup -n sqoop-%{sqoop_base_version}
 
 %build
-ant -f build.xml package -Dversion=%{version}
+bash %{SOURCE1} -Dversion=%{version}
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
-sh $RPM_SOURCE_DIR/install_sqoop.sh \
+sh %{SOURCE2} \
           --build-dir=. \
           --doc-dir=%{doc_sqoop} \
           --prefix=$RPM_BUILD_ROOT

Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec?rev=1172892&r1=1172891&r2=1172892&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec 
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/whirr/SPECS/whirr.spec Mon 
Sep 19 23:16:30 2011
@@ -28,8 +28,9 @@ BuildArch: noarch
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 License: ASL 2.0 
 Source0: %{name}-%{whirr_base_version}-incubating-src.tar.gz
-Source1: install_%{name}.sh
-Source2: whirr.1
+Source1: do-component-build
+Source2: install_%{name}.sh
+Source3: whirr.1
 
 %description 
 Whirr provides
@@ -46,13 +47,12 @@ Whirr provides
 %setup -n %{name}-%{whirr_base_version}-incubating
 
 %build
-
-mvn clean source:jar install assembly:assembly -Pjavadoc site
+bash %{SOURCE1}
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
 cp $RPM_SOURCE_DIR/whirr.1 .
-sh $RPM_SOURCE_DIR/install_whirr.sh \
+sh %{SOURCE2} \
           --build-dir=. \
           --prefix=$RPM_BUILD_ROOT
 

Modified: 
incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec?rev=1172892&r1=1172891&r2=1172892&view=diff
==============================================================================
--- 
incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec 
(original)
+++ 
incubator/bigtop/trunk/bigtop-packages/src/rpm/zookeeper/SPECS/zookeeper.spec 
Mon Sep 19 23:16:30 2011
@@ -65,10 +65,11 @@ Group: Development/Libraries
 Buildroot: %{_topdir}/INSTALL/%{name}-%{version}
 License: APL2
 Source0: zookeeper-%{zookeeper_base_version}.tar.gz
-Source1: hadoop-zookeeper.sh
-Source2: hadoop-zookeeper.sh.suse
-Source3: install_zookeeper.sh
-Source4: zookeeper.1
+Source1: do-component-build
+Source2: install_zookeeper.sh
+Source3: hadoop-zookeeper.sh
+Source4: hadoop-zookeeper.sh.suse
+Source5: zookeeper.1
 BuildArch: noarch
 BuildRequires: ant, autoconf, automake, subversion
 Requires(pre): coreutils, shadow-utils
@@ -109,12 +110,12 @@ This package starts the zookeeper server
 %setup -n zookeeper-%{zookeeper_base_version}
 
 %build
-ant -f build.xml package -Dversion=%{version}
+bash %{SOURCE1} -Dversion=%{version}
 
 %install
 %__rm -rf $RPM_BUILD_ROOT
 cp $RPM_SOURCE_DIR/zookeeper.1 .
-sh $RPM_SOURCE_DIR/install_zookeeper.sh \
+sh %{SOURCE2} \
           --build-dir=. \
           --doc-dir=%{doc_zookeeper} \
           --prefix=$RPM_BUILD_ROOT


Reply via email to