Fix ee and ln build source. workaround CentOS 5.x detection

xwang2713 · Jul 16, 2014 · dad9bcb · dad9bcb
1 parent 8b1b9cc
commit dad9bcb
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/Linux-Builds/bin/build/build_ee b/Linux-Builds/bin/build/build_ee
@@ -8,8 +8,8 @@ cmakeOptions=${scriptName}_cmake_options
 . ${curDir}/build_common
 . ${curDir}/build_common_${PKG_TYPE}
 
-echo "cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=ENTERPRISE -DCHECK_GIT_TAG=1 -DUSE_LIBARCHIVE=false -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF -DUSE_MYSQL=OFF -DUSE_SQLITE3=OFF ${CMAKE_OPTIONS} ../HPCC-Platform" 
-cmake  -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=ENTERPRISE -DCHECK_GIT_TAG=1 -DUSE_LIBARCHIVE=false -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF -DUSE_MYSQL=OFF -DUSE_SQLITE3=OFF ${CMAKE_OPTIONS} ../HPCC-Platform || exit 1
+echo "cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=ENTERPRISE -DCHECK_GIT_TAG=1 -DUSE_LIBARCHIVE=false -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF -DUSE_MYSQL=OFF -DUSE_SQLITE3=OFF ${CMAKE_OPTIONS} ../LN" 
+cmake  -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=ENTERPRISE -DCHECK_GIT_TAG=1 -DUSE_LIBARCHIVE=false -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF -DUSE_MYSQL=OFF -DUSE_SQLITE3=OFF ${CMAKE_OPTIONS} ../LN || exit 1
 
 build_package || exit 1
 

diff --git a/Linux-Builds/bin/build/build_ee_wp b/Linux-Builds/bin/build/build_ee_wp
@@ -8,8 +8,8 @@ cmakeOptions=${scriptName}_cmake_options
 . ${curDir}/build_common
 . ${curDir}/build_common_${PKG_TYPE}
 
-echo "cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=ENTERPRISE -DCHECK_GIT_TAG=1 -DCMAKE_CXX_FLAGS=-D_DALIUSER_STACKTRACE ${CMAKE_OPTIONS} ../HPCC-Platform" 
-cmake  -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=ENTERPRISE -DCHECK_GIT_TAG=1 -DCMAKE_CXX_FLAGS="-D_DALIUSER_STACKTRACE" ${CMAKE_OPTIONS} ../HPCC-Platform || exit 1
+echo "cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=ENTERPRISE -DCHECK_GIT_TAG=1 -DCMAKE_CXX_FLAGS=-D_DALIUSER_STACKTRACE ${CMAKE_OPTIONS} ../LN" 
+cmake  -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=ENTERPRISE -DCHECK_GIT_TAG=1 -DCMAKE_CXX_FLAGS="-D_DALIUSER_STACKTRACE" ${CMAKE_OPTIONS} ../LN || exit 1
 
 build_package || exit 1
 

diff --git a/Linux-Builds/bin/build/build_ln b/Linux-Builds/bin/build/build_ln
@@ -8,8 +8,8 @@ cmakeOptions=${scriptName}_cmake_options
 . ${curDir}/build_common
 . ${curDir}/build_common_${PKG_TYPE}
 
-echo "cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=INTERNAL -DCHECK_GIT_TAG=1 -DCMAKE_CXX_FLAGS=-D_DALIUSER_STACKTRACE  -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF -DUSE_MYSQL=OFF -DUSE_SQLITE3=OFF ${CMAKE_OPTIONS} ../HPCC-Platform" 
-cmake  -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=INTERNAL -DCHECK_GIT_TAG=1 -DCMAKE_CXX_FLAGS="-D_DALIUSER_STACKTRACE"  -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF -DUSE_MYSQL=OFF -DUSE_SQLITE3=OFF ${CMAKE_OPTIONS} ../HPCC-Platform || exit 1
+echo "cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=INTERNAL -DCHECK_GIT_TAG=1 -DCMAKE_CXX_FLAGS=-D_DALIUSER_STACKTRACE  -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF -DUSE_MYSQL=OFF -DUSE_SQLITE3=OFF ${CMAKE_OPTIONS} ../LN" 
+cmake  -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=INTERNAL -DCHECK_GIT_TAG=1 -DCMAKE_CXX_FLAGS="-D_DALIUSER_STACKTRACE"  -DUSE_PYTHON=OFF -DUSE_V8=OFF -DUSE_JNI=OFF -DUSE_RINSIDE=OFF -DUSE_MYSQL=OFF -DUSE_SQLITE3=OFF ${CMAKE_OPTIONS} ../LN || exit 1
 
 build_package || exit 1
 

diff --git a/Linux-Builds/bin/build/build_ln_wp b/Linux-Builds/bin/build/build_ln_wp
@@ -8,8 +8,8 @@ cmakeOptions=${scriptName}_cmake_options
 . ${curDir}/build_common
 . ${curDir}/build_common_${PKG_TYPE}
 
-echo "cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=INTERNAL -DCHECK_GIT_TAG=1 -DCMAKE_CXX_FLAGS=-D_DALIUSER_STACKTRACE ${CMAKE_OPTIONS} ../HPCC-Platform" 
-cmake  -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=INTERNAL -DCHECK_GIT_TAG=1 -DCMAKE_CXX_FLAGS="-D_DALIUSER_STACKTRACE" ${CMAKE_OPTIONS} ../HPCC-Platform || exit 1
+echo "cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=INTERNAL -DCHECK_GIT_TAG=1 -DCMAKE_CXX_FLAGS=-D_DALIUSER_STACKTRACE ${CMAKE_OPTIONS} ../LN" 
+cmake  -DCMAKE_BUILD_TYPE=Release -DBUILD_LEVEL=INTERNAL -DCHECK_GIT_TAG=1 -DCMAKE_CXX_FLAGS="-D_DALIUSER_STACKTRACE" ${CMAKE_OPTIONS} ../LN || exit 1
 
 build_package || exit 1
 

diff --git a/Linux-Builds/bin/common b/Linux-Builds/bin/common
@@ -8,6 +8,19 @@
 #
 check_distro ()
 {
+
+   cat /etc/*release | grep -i -q "CentOS release 5."
+   if [ $? -eq 0 ]
+   then
+      DISTRO=centos
+      PKG_TYPE=rpm
+      DISTRO_DISPLAY_NAME=CentOS
+      CODENAME=el5
+      ARCH=$(uname -m)
+      return
+
+   fi
+
    declare -A _distros
    _distros=( 
         [ubuntu]=deb,amd64,lsb-release,,Ubuntu