Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-18705 bin/hbase does not find cached_classpath.txt 

Signed-off-by: tedyu <yuzhihong@gmail.com>
Signed-off-by: Michael Stack <stack@apache.org>
This commit is contained in:
Balazs Meszaros 2017-08-28 11:31:19 +02:00 committed by Michael Stack
parent 547d46cfac
commit 28185c5171
No known key found for this signature in database
GPG Key ID: 9816C7FC8ACC93D2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/hbase
View File

@ -172,7 +172,7 @@ if [ -d "$HBASE_HOME/hbase-server/target/hbase-webapps" ]; then
fi fi
add_maven_deps_to_classpath() { add_maven_deps_to_classpath() {
f="${HBASE_HOME}/target/cached_classpath.txt" f="${HBASE_HOME}/hbase-build-configuration/target/cached_classpath.txt"
if [ ! -f "${f}" ] if [ ! -f "${f}" ]
then then
echo "As this is a development environment, we need ${f} to be generated from maven (command: mvn install -DskipTests)" echo "As this is a development environment, we need ${f} to be generated from maven (command: mvn install -DskipTests)"
@ -329,7 +329,7 @@ if [[ $jruby_needed ]]; then
else # JRUBY_HOME is not specified explicitly else # JRUBY_HOME is not specified explicitly
if $in_dev_env; then # in dev environment if $in_dev_env; then # in dev environment
F_JRUBY="${HBASE_HOME}/target/cached_classpath_jruby.txt" F_JRUBY="${HBASE_HOME}/hbase-build-configuration/target/cached_classpath_jruby.txt"
if [ ! -f "${F_JRUBY}" ]; then if [ ! -f "${F_JRUBY}" ]; then
echo "As this is a development environment, we need ${F_JRUBY} to be generated from maven (command: mvn install -DskipTests)" echo "As this is a development environment, we need ${F_JRUBY} to be generated from maven (command: mvn install -DskipTests)"
exit 1 exit 1

4
bin/hbase.cmd
View File

@ -103,7 +103,7 @@ if defined HBASE_OFFHEAPSIZE (
set CLASSPATH=%HBASE_CONF_DIR%;%JAVA_HOME%\lib\tools.jar set CLASSPATH=%HBASE_CONF_DIR%;%JAVA_HOME%\lib\tools.jar
rem Add maven target directory rem Add maven target directory
set cached_classpath_filename=%HBASE_HOME%\target\cached_classpath.txt set cached_classpath_filename=%HBASE_HOME%\hbase-build-configuration\target\cached_classpath.txt
if "%in_dev_env%"=="true" ( if "%in_dev_env%"=="true" (
rem adding maven main classes to classpath rem adding maven main classes to classpath
@ -288,7 +288,7 @@ if defined jruby-needed (
if not defined JRUBY_HOME ( if not defined JRUBY_HOME (
@rem in dev environment @rem in dev environment
if "%in_dev_env%"=="true" ( if "%in_dev_env%"=="true" (
set cached_classpath_jruby_filename=%HBASE_HOME%\target\cached_classpath_jruby.txt set cached_classpath_jruby_filename=%HBASE_HOME%\hbase-build-configuration\target\cached_classpath_jruby.txt
if not exist "!cached_classpath_jruby_filename!" ( if not exist "!cached_classpath_jruby_filename!" (
echo "As this is a development environment, we need !cached_classpath_jruby_filename! to be generated from maven (command: mvn install -DskipTests)" echo "As this is a development environment, we need !cached_classpath_jruby_filename! to be generated from maven (command: mvn install -DskipTests)"
goto :eof goto :eof