incubator-bigtop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bm...@apache.org
Subject svn commit: r1189516 - in /incubator/bigtop/trunk/bigtop-packages/src: common/mahout/install_mahout.sh deb/mahout/control rpm/mahout/SPECS/mahout.spec
Date Wed, 26 Oct 2011 22:51:05 GMT
Author: bmahe
Date: Wed Oct 26 22:51:05 2011
New Revision: 1189516

URL: http://svn.apache.org/viewvc?rev=1189516&view=rev
Log:
BIGTOP-180. All of Mahout wrapper scripts and init.d scripts need to start include find-java
code from bigtop-utils

Modified:
    incubator/bigtop/trunk/bigtop-packages/src/common/mahout/install_mahout.sh
    incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/control
    incubator/bigtop/trunk/bigtop-packages/src/rpm/mahout/SPECS/mahout.spec

Modified: incubator/bigtop/trunk/bigtop-packages/src/common/mahout/install_mahout.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/common/mahout/install_mahout.sh?rev=1189516&r1=1189515&r2=1189516&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/common/mahout/install_mahout.sh (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/common/mahout/install_mahout.sh Wed Oct 26
22:51:05 2011
@@ -121,6 +121,14 @@ install -d -m 0755 $PREFIX/$BIN_DIR
 cat > $PREFIX/$BIN_DIR/mahout <<EOF
 #!/bin/sh
 . /etc/default/hadoop
+
+# Autodetect JAVA_HOME if not defined
+if [ -e /usr/libexec/bigtop-detect-javahome ]; then
+  source /usr/libexec/bigtop-detect-javahome
+elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+  source /usr/lib/bigtop-utils/bigtop-detect-javahome
+fi
+
 export MAHOUT_HOME=\${MAHOUT_HOME:-$INSTALLED_LIB_DIR}
 export MAHOUT_CONF_DIR=\${MAHOUT_CONF_DIR:-$CONF_DIR}
 exec $INSTALLED_LIB_DIR/bin/mahout "\$@"

Modified: incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/control
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/control?rev=1189516&r1=1189515&r2=1189516&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/control (original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/mahout/control Wed Oct 26 22:51:05 2011
@@ -23,7 +23,7 @@ Homepage: http://mahout.apache.org
 
 Package:  mahout
 Architecture: all
-Depends: hadoop 
+Depends: hadoop, bigtop-utils
 Description: A set of Java libraries for scalable machine learning.
  Mahout's goal is to build scalable machine learning libraries. 
  With scalable we mean:

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=1189516&r1=1189515&r2=1189516&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 Wed Oct 26 22:51:05
2011
@@ -44,7 +44,7 @@ License: ASL 2.0 
 Source0: %{name}-distribution-%{mahout_base_version}-src.tar.gz
 Source1: do-component-build 
 Source2: install_%{name}.sh
-Requires: hadoop >= 0.20.2
+Requires: hadoop >= 0.20.2, bigtop-utils
 
 
 %description 



Mime
View raw message