HAWQ-1728. fix dependency path hard code
diff --git a/depends/dbcommon/CMake/Options.cmake b/depends/dbcommon/CMake/Options.cmake
index 8be997e..8ef0749 100644
--- a/depends/dbcommon/CMake/Options.cmake
+++ b/depends/dbcommon/CMake/Options.cmake
@@ -5,25 +5,10 @@
##############################################################################
# Setup build and dependencies information
##############################################################################
-#SET(DEPENDENCY_INSTALL_PREFIX "/opt/dependency")
-SET(DEPENDENCY_INSTALL_PREFIX "/usr/local/hawq")
-IF($ENV{DEPENDENCY_INSTALL_PREFIX})
- SET(DEPENDENCY_INSTALL_PREFIX $ENV{DEPENDENCY_INSTALL_PREFIX})
-ENDIF()
-SET(DEPENDENCY_DIST_PACKAGE_NAME "dependency-dist-package.tar.gz")
-IF($ENV{DEPENDENCY_DIST_PACKAGE_NAME})
- SET(DEPENDENCY_DIST_PACKAGE_NAME $ENV{DEPENDENCY_DIST_PACKAGE_NAME})
-ENDIF()
-
-SET(CMAKE_PREFIX_PATH "${DEPENDENCY_INSTALL_PREFIX}" ${CMAKE_PREFIX_PATH})
-SET(CMAKE_PREFIX_PATH "${DEPENDENCY_INSTALL_PREFIX}/package" ${CMAKE_PREFIX_PATH})
-SET(CMAKE_PREFIX_PATH "${DEPENDENCY_INSTALL_PREFIX}/tools" ${CMAKE_PREFIX_PATH})
-
-#SET(DEPENDENCY_LIBRARY_PATH "${DEPENDENCY_INSTALL_PREFIX}/package/lib:${DEPENDENCY_LIBRARY_PATH}")
-#SET(DEPENDENCY_LIBRARY_PATH "${DEPENDENCY_INSTALL_PREFIX}/package/lib64:${DEPENDENCY_LIBRARY_PATH}")
-SET(DEPENDENCY_LIBRARY_PATH "${DEPENDENCY_INSTALL_PREFIX}/lib:${DEPENDENCY_LIBRARY_PATH}")
-SET(DEPENDENCY_LIBRARY_PATH "${DEPENDENCY_INSTALL_PREFIX}/lib64:${DEPENDENCY_LIBRARY_PATH}")
+SET(CMAKE_PREFIX_PATH "$ENV{DEPENDENCY_INSTALL_PREFIX}/lib" ${CMAKE_PREFIX_PATH})
+SET(CMAKE_PREFIX_PATH "$ENV{DEPENDENCY_INSTALL_PREFIX}/lib64" ${CMAKE_PREFIX_PATH})
+SET(CMAKE_PREFIX_PATH "$ENV{DEPENDENCY_INSTALL_PREFIX}/include" ${CMAKE_PREFIX_PATH})
##############################################################################
# Setup build flags
diff --git a/depends/dbcommon/Makefile.global b/depends/dbcommon/Makefile.global
index de78d01..e471d53 100644
--- a/depends/dbcommon/Makefile.global
+++ b/depends/dbcommon/Makefile.global
@@ -27,8 +27,8 @@
# Support for VPATH builds
vpath_build = no
-abs_top_srcdir = /Users/tuyu/hawq
-abs_top_builddir = /Users/tuyu/hawq
+abs_top_srcdir = /data/apache-hawq
+abs_top_builddir = /data/apache-hawq
ifneq ($(vpath_build),yes)
top_srcdir = $(top_builddir)
diff --git a/depends/dbcommon/bootstrap b/depends/dbcommon/bootstrap
index 51a8a24..e3a7056 100755
--- a/depends/dbcommon/bootstrap
+++ b/depends/dbcommon/bootstrap
@@ -24,21 +24,21 @@
echo "$1" | sed "s/^${2-[^=]*=}//" | sed "s/:/;/g"
}
-export CMAKE_INCLUDE_PATH=/usr/local/include
-export CMAKE_LIBRARY_PATH=/usr/local/lib
+# set install prefix
+export DEPENDENCY_INSTALL_PREFIX=`arg "$1"`
# Detect directory information.
source_dir=`cd "\`dirname \"$0\"\`";pwd`
binary_dir=`pwd`
# Choose the default install prefix.
-default_prefix=${source_dir}/dist
+default_prefix="/usr/local/hawq"
# Choose the default dependency install prefix
default_dependency=${DEPENDENCY_INSTALL_PREFIX}
if [ x"${default_dependency}" = x"" ]; then
- default_dependency="/opt/dependency"
+ default_dependency=${default_prefix}
fi
# Display bootstrap usage
diff --git a/depends/dbcommon/src/CMakeLists.txt b/depends/dbcommon/src/CMakeLists.txt
index a112af5..8e2141a 100644
--- a/depends/dbcommon/src/CMakeLists.txt
+++ b/depends/dbcommon/src/CMakeLists.txt
@@ -107,10 +107,10 @@
INCLUDE_DIRECTORIES(${dbcommon_ROOT_DIR})
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/codegen/src)
INCLUDE_DIRECTORIES(${GLOG_INCLUDE_DIRS})
-INCLUDE_DIRECTORIES(${DEPENDENCY_INSTALL_PREFIX}/include)
+INCLUDE_DIRECTORIES($ENV{DEPENDENCY_INSTALL_PREFIX}/include)
INCLUDE_DIRECTORIES(/usr/local/include)
INCLUDE_DIRECTORIES(/usr/libiconv/include)
-LINK_DIRECTORIES(${DEPENDENCY_INSTALL_PREFIX}/lib)
+LINK_DIRECTORIES($ENV{DEPENDENCY_INSTALL_PREFIX}/lib)
LINK_DIRECTORIES(/usr/local/lib)
LINK_DIRECTORIES(/usr/libiconv/lib64)
diff --git a/depends/dbcommon/test/CMakeLists.txt b/depends/dbcommon/test/CMakeLists.txt
index 5ebfcc6..9b5885b 100644
--- a/depends/dbcommon/test/CMakeLists.txt
+++ b/depends/dbcommon/test/CMakeLists.txt
@@ -9,12 +9,12 @@
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/codegen/src)
INCLUDE_DIRECTORIES(/usr/libiconv/include)
INCLUDE_DIRECTORIES(${GLOG_INCLUDE_DIRS})
-INCLUDE_DIRECTORIES(${DEPENDENCY_INSTALL_PREFIX}/include)
+INCLUDE_DIRECTORIES($ENV{DEPENDENCY_INSTALL_PREFIX}/include)
LINK_DIRECTORIES(/usr/local/lib)
LINK_DIRECTORIES(/usr/libiconv/lib64)
LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/src)
-LINK_DIRECTORIES(${DEPENDENCY_INSTALL_PREFIX}/lib)
+LINK_DIRECTORIES($ENV{DEPENDENCY_INSTALL_PREFIX}/lib)
ADD_SUBDIRECTORY(unit)
diff --git a/depends/libhdfs3/bootstrap b/depends/libhdfs3/bootstrap
index e435b8e..c13d9b5 100755
--- a/depends/libhdfs3/bootstrap
+++ b/depends/libhdfs3/bootstrap
@@ -29,13 +29,13 @@
binary_dir=`pwd`
# Choose the default install prefix.
-default_prefix=${source_dir}/dist
+default_prefix="/usr/local/hawq"
# Choose the default dependency install prefix
default_dependency=${DEPENDENCY_INSTALL_PREFIX}
if [ x"${default_dependency}" = x"" ]; then
- default_dependency="/opt/dependency"
+ default_dependency=${default_prefix}
fi
# Display bootstrap usage
diff --git a/depends/libyarn/bootstrap b/depends/libyarn/bootstrap
index 6b35bf1..b490d53 100755
--- a/depends/libyarn/bootstrap
+++ b/depends/libyarn/bootstrap
@@ -31,13 +31,13 @@
binary_dir=`pwd`
# Choose the default install prefix.
-default_prefix=${source_dir}/dist
+default_prefix="/usr/local/hawq"
# Choose the default dependency install prefix
default_dependency=${DEPENDENCY_INSTALL_PREFIX}
if [ x"${default_dependency}" = x"" ]; then
- default_dependency="/opt/dependency"
+ default_dependency=${default_prefix}
fi
# Display bootstrap usage
diff --git a/depends/storage/CMake/Options.cmake b/depends/storage/CMake/Options.cmake
index 8be997e..8ef0749 100644
--- a/depends/storage/CMake/Options.cmake
+++ b/depends/storage/CMake/Options.cmake
@@ -5,25 +5,10 @@
##############################################################################
# Setup build and dependencies information
##############################################################################
-#SET(DEPENDENCY_INSTALL_PREFIX "/opt/dependency")
-SET(DEPENDENCY_INSTALL_PREFIX "/usr/local/hawq")
-IF($ENV{DEPENDENCY_INSTALL_PREFIX})
- SET(DEPENDENCY_INSTALL_PREFIX $ENV{DEPENDENCY_INSTALL_PREFIX})
-ENDIF()
-SET(DEPENDENCY_DIST_PACKAGE_NAME "dependency-dist-package.tar.gz")
-IF($ENV{DEPENDENCY_DIST_PACKAGE_NAME})
- SET(DEPENDENCY_DIST_PACKAGE_NAME $ENV{DEPENDENCY_DIST_PACKAGE_NAME})
-ENDIF()
-
-SET(CMAKE_PREFIX_PATH "${DEPENDENCY_INSTALL_PREFIX}" ${CMAKE_PREFIX_PATH})
-SET(CMAKE_PREFIX_PATH "${DEPENDENCY_INSTALL_PREFIX}/package" ${CMAKE_PREFIX_PATH})
-SET(CMAKE_PREFIX_PATH "${DEPENDENCY_INSTALL_PREFIX}/tools" ${CMAKE_PREFIX_PATH})
-
-#SET(DEPENDENCY_LIBRARY_PATH "${DEPENDENCY_INSTALL_PREFIX}/package/lib:${DEPENDENCY_LIBRARY_PATH}")
-#SET(DEPENDENCY_LIBRARY_PATH "${DEPENDENCY_INSTALL_PREFIX}/package/lib64:${DEPENDENCY_LIBRARY_PATH}")
-SET(DEPENDENCY_LIBRARY_PATH "${DEPENDENCY_INSTALL_PREFIX}/lib:${DEPENDENCY_LIBRARY_PATH}")
-SET(DEPENDENCY_LIBRARY_PATH "${DEPENDENCY_INSTALL_PREFIX}/lib64:${DEPENDENCY_LIBRARY_PATH}")
+SET(CMAKE_PREFIX_PATH "$ENV{DEPENDENCY_INSTALL_PREFIX}/lib" ${CMAKE_PREFIX_PATH})
+SET(CMAKE_PREFIX_PATH "$ENV{DEPENDENCY_INSTALL_PREFIX}/lib64" ${CMAKE_PREFIX_PATH})
+SET(CMAKE_PREFIX_PATH "$ENV{DEPENDENCY_INSTALL_PREFIX}/include" ${CMAKE_PREFIX_PATH})
##############################################################################
# Setup build flags
diff --git a/depends/storage/Makefile.global b/depends/storage/Makefile.global
index a2e43f1..8fd25bf 100644
--- a/depends/storage/Makefile.global
+++ b/depends/storage/Makefile.global
@@ -27,8 +27,8 @@
# Support for VPATH builds
vpath_build = no
-abs_top_srcdir = /Users/tuyu/hawq
-abs_top_builddir = /Users/tuyu/hawq
+abs_top_srcdir = /data/apache-hawq
+abs_top_builddir = /data/apache-hawq
ifneq ($(vpath_build),yes)
top_srcdir = $(top_builddir)
diff --git a/depends/storage/bootstrap b/depends/storage/bootstrap
index 51a8a24..e3a7056 100755
--- a/depends/storage/bootstrap
+++ b/depends/storage/bootstrap
@@ -24,21 +24,21 @@
echo "$1" | sed "s/^${2-[^=]*=}//" | sed "s/:/;/g"
}
-export CMAKE_INCLUDE_PATH=/usr/local/include
-export CMAKE_LIBRARY_PATH=/usr/local/lib
+# set install prefix
+export DEPENDENCY_INSTALL_PREFIX=`arg "$1"`
# Detect directory information.
source_dir=`cd "\`dirname \"$0\"\`";pwd`
binary_dir=`pwd`
# Choose the default install prefix.
-default_prefix=${source_dir}/dist
+default_prefix="/usr/local/hawq"
# Choose the default dependency install prefix
default_dependency=${DEPENDENCY_INSTALL_PREFIX}
if [ x"${default_dependency}" = x"" ]; then
- default_dependency="/opt/dependency"
+ default_dependency=${default_prefix}
fi
# Display bootstrap usage
diff --git a/depends/storage/src/CMakeLists.txt b/depends/storage/src/CMakeLists.txt
index 7e6b1f3..4de8805 100644
--- a/depends/storage/src/CMakeLists.txt
+++ b/depends/storage/src/CMakeLists.txt
@@ -43,13 +43,12 @@
AUTO_SOURCES(testutil_HEADER "*.h" "${storage_SRC_DIR}/testutil")
INCLUDE_DIRECTORIES(${storage_ROOT_DIR})
-#INCLUDE_DIRECTORIES(${DEPENDENCY_INSTALL_PREFIX}/package/include)
-INCLUDE_DIRECTORIES(${DEPENDENCY_INSTALL_PREFIX}/include)
+INCLUDE_DIRECTORIES($ENV{DEPENDENCY_INSTALL_PREFIX}/include)
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/src)
INCLUDE_DIRECTORIES(/usr/local/include)
INCLUDE_DIRECTORIES(/usr/libiconv/include)
LINK_DIRECTORIES(/usr/local/lib)
-LINK_DIRECTORIES(${DEPENDENCY_INSTALL_PREFIX}/lib)
+LINK_DIRECTORIES($ENV{DEPENDENCY_INSTALL_PREFIX}/lib)
LINK_DIRECTORIES(/usr/libiconv/lib64)
ADD_LIBRARY(storage-shared SHARED ${storage_SOURCES} ${storage_PROTO_SRCS} ${storage_PROTO_HDRS})
diff --git a/depends/storage/test/CMakeLists.txt b/depends/storage/test/CMakeLists.txt
index 8ca9ab5..3775fce 100644
--- a/depends/storage/test/CMakeLists.txt
+++ b/depends/storage/test/CMakeLists.txt
@@ -8,10 +8,11 @@
INCLUDE_DIRECTORIES(/usr/libiconv/include)
INCLUDE_DIRECTORIES(${storage_ROOT_DIR})
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/src)
-INCLUDE_DIRECTORIES(${DEPENDENCY_INSTALL_PREFIX}/include)
+INCLUDE_DIRECTORIES($ENV{DEPENDENCY_INSTALL_PREFIX}/include)
INCLUDE_DIRECTORIES(/usr/local/include)
LINK_DIRECTORIES(/usr/local/lib)
LINK_DIRECTORIES(/usr/libiconv/lib64)
+LINK_DIRECTORIES($ENV{DEPENDENCY_INSTALL_PREFIX}/lib)
ADD_SUBDIRECTORY(unit)
diff --git a/depends/storage/test/unit/CMakeLists.txt b/depends/storage/test/unit/CMakeLists.txt
index f922dce..c69d99e 100644
--- a/depends/storage/test/unit/CMakeLists.txt
+++ b/depends/storage/test/unit/CMakeLists.txt
@@ -14,7 +14,6 @@
INCLUDE_DIRECTORIES(${GTEST_INCLUDE_DIRS})
LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/src)
-LINK_DIRECTORIES(${DEPENDENCY_INSTALL_PREFIX}/lib)
ADD_EXECUTABLE(unit EXCLUDE_FROM_ALL
${unit_SOURCES}
diff --git a/depends/univplan/CMake/Options.cmake b/depends/univplan/CMake/Options.cmake
index 8be997e..8ef0749 100644
--- a/depends/univplan/CMake/Options.cmake
+++ b/depends/univplan/CMake/Options.cmake
@@ -5,25 +5,10 @@
##############################################################################
# Setup build and dependencies information
##############################################################################
-#SET(DEPENDENCY_INSTALL_PREFIX "/opt/dependency")
-SET(DEPENDENCY_INSTALL_PREFIX "/usr/local/hawq")
-IF($ENV{DEPENDENCY_INSTALL_PREFIX})
- SET(DEPENDENCY_INSTALL_PREFIX $ENV{DEPENDENCY_INSTALL_PREFIX})
-ENDIF()
-SET(DEPENDENCY_DIST_PACKAGE_NAME "dependency-dist-package.tar.gz")
-IF($ENV{DEPENDENCY_DIST_PACKAGE_NAME})
- SET(DEPENDENCY_DIST_PACKAGE_NAME $ENV{DEPENDENCY_DIST_PACKAGE_NAME})
-ENDIF()
-
-SET(CMAKE_PREFIX_PATH "${DEPENDENCY_INSTALL_PREFIX}" ${CMAKE_PREFIX_PATH})
-SET(CMAKE_PREFIX_PATH "${DEPENDENCY_INSTALL_PREFIX}/package" ${CMAKE_PREFIX_PATH})
-SET(CMAKE_PREFIX_PATH "${DEPENDENCY_INSTALL_PREFIX}/tools" ${CMAKE_PREFIX_PATH})
-
-#SET(DEPENDENCY_LIBRARY_PATH "${DEPENDENCY_INSTALL_PREFIX}/package/lib:${DEPENDENCY_LIBRARY_PATH}")
-#SET(DEPENDENCY_LIBRARY_PATH "${DEPENDENCY_INSTALL_PREFIX}/package/lib64:${DEPENDENCY_LIBRARY_PATH}")
-SET(DEPENDENCY_LIBRARY_PATH "${DEPENDENCY_INSTALL_PREFIX}/lib:${DEPENDENCY_LIBRARY_PATH}")
-SET(DEPENDENCY_LIBRARY_PATH "${DEPENDENCY_INSTALL_PREFIX}/lib64:${DEPENDENCY_LIBRARY_PATH}")
+SET(CMAKE_PREFIX_PATH "$ENV{DEPENDENCY_INSTALL_PREFIX}/lib" ${CMAKE_PREFIX_PATH})
+SET(CMAKE_PREFIX_PATH "$ENV{DEPENDENCY_INSTALL_PREFIX}/lib64" ${CMAKE_PREFIX_PATH})
+SET(CMAKE_PREFIX_PATH "$ENV{DEPENDENCY_INSTALL_PREFIX}/include" ${CMAKE_PREFIX_PATH})
##############################################################################
# Setup build flags
diff --git a/depends/univplan/Makefile.global b/depends/univplan/Makefile.global
index a981862..a291648 100644
--- a/depends/univplan/Makefile.global
+++ b/depends/univplan/Makefile.global
@@ -27,8 +27,8 @@
# Support for VPATH builds
vpath_build = no
-abs_top_srcdir = /Users/tuyu/hawq
-abs_top_builddir = /Users/tuyu/hawq
+abs_top_srcdir = /data/apache-hawq
+abs_top_builddir = /data/apache-hawq
ifneq ($(vpath_build),yes)
top_srcdir = $(top_builddir)
diff --git a/depends/univplan/bootstrap b/depends/univplan/bootstrap
index 51a8a24..e3a7056 100755
--- a/depends/univplan/bootstrap
+++ b/depends/univplan/bootstrap
@@ -24,21 +24,21 @@
echo "$1" | sed "s/^${2-[^=]*=}//" | sed "s/:/;/g"
}
-export CMAKE_INCLUDE_PATH=/usr/local/include
-export CMAKE_LIBRARY_PATH=/usr/local/lib
+# set install prefix
+export DEPENDENCY_INSTALL_PREFIX=`arg "$1"`
# Detect directory information.
source_dir=`cd "\`dirname \"$0\"\`";pwd`
binary_dir=`pwd`
# Choose the default install prefix.
-default_prefix=${source_dir}/dist
+default_prefix="/usr/local/hawq"
# Choose the default dependency install prefix
default_dependency=${DEPENDENCY_INSTALL_PREFIX}
if [ x"${default_dependency}" = x"" ]; then
- default_dependency="/opt/dependency"
+ default_dependency=${default_prefix}
fi
# Display bootstrap usage
diff --git a/depends/univplan/src/CMakeLists.txt b/depends/univplan/src/CMakeLists.txt
index abecee4..e855c2a 100644
--- a/depends/univplan/src/CMakeLists.txt
+++ b/depends/univplan/src/CMakeLists.txt
@@ -45,10 +45,10 @@
INCLUDE_DIRECTORIES(${univplan_ROOT_DIR})
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/src)
-INCLUDE_DIRECTORIES(${DEPENDENCY_INSTALL_PREFIX}/include)
+INCLUDE_DIRECTORIES($ENV{DEPENDENCY_INSTALL_PREFIX}/include)
INCLUDE_DIRECTORIES(/usr/local/include)
LINK_DIRECTORIES(/usr/local/lib)
-LINK_DIRECTORIES(${DEPENDENCY_INSTALL_PREFIX}/lib)
+LINK_DIRECTORIES($ENV{DEPENDENCY_INSTALL_PREFIX}/lib)
ADD_LIBRARY(univplan-shared SHARED
${UNIVPLAN_PROTO_HDRS}
diff --git a/depends/univplan/test/CMakeLists.txt b/depends/univplan/test/CMakeLists.txt
index c39e29b..a088bf8 100644
--- a/depends/univplan/test/CMakeLists.txt
+++ b/depends/univplan/test/CMakeLists.txt
@@ -7,11 +7,11 @@
INCLUDE_DIRECTORIES(${univplan_ROOT_DIR})
INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/src)
-INCLUDE_DIRECTORIES(${DEPENDENCY_INSTALL_PREFIX}/include)
+INCLUDE_DIRECTORIES($ENV{DEPENDENCY_INSTALL_PREFIX}/include)
INCLUDE_DIRECTORIES(/usr/local/include)
LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/src)
-LINK_DIRECTORIES(${DEPENDENCY_INSTALL_PREFIX}/lib)
+LINK_DIRECTORIES($ENV{DEPENDENCY_INSTALL_PREFIX}/lib)
LINK_DIRECTORIES(/usr/local/lib)
LINK_DIRECTORIES(/usr/local/lib64)
diff --git a/depends/univplan/test/unit/CMakeLists.txt b/depends/univplan/test/unit/CMakeLists.txt
index 2eebc74..47b7b92 100644
--- a/depends/univplan/test/unit/CMakeLists.txt
+++ b/depends/univplan/test/unit/CMakeLists.txt
@@ -6,6 +6,7 @@
INCLUDE_DIRECTORIES(${univplan_ROOT_DIR}/test/unit)
INCLUDE_DIRECTORIES(${GTEST_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES($ENV{DEPENDENCY_INSTALL_PREFIX}/include)
ADD_EXECUTABLE(unit EXCLUDE_FROM_ALL
${unit_SOURCES}
