Build script modificatioin (#44)

- modified zlib version to 1.2.13 in ./prebuild.sh because 1.2.12 is N/A
- able to specify hardware platform when use build.sh
- changed ENABLE_MSDK to ENABLE_SG1 in CMakeList
- added option ENABLE_ATSM in CMakeList

Author: zhang-shizhao

src/CMakeLists.txt

@@ -7,8 +7,11 @@ OPTION(USE_TRACE
        "Use trace"
        OFF)
 
-OPTION(ENABLE_MSDK
-       "Enable MSDK"
+OPTION(ENABLE_SG1
+       "Enable SG1"
+       OFF)
+OPTION(ENABLE_ATSM
+       "Enable ATSM"
        OFF)
 
 OPTION(USE_SAFE_MEM_LIB
@@ -19,9 +22,12 @@ IF(USE_TRACE)
   ADD_DEFINITIONS("-D_USE_TRACE_")
 ENDIF()
 
-IF(ENABLE_MSDK)
+IF(ENABLE_SG1)
    ADD_DEFINITIONS("-D_ENABLE_MSDK_")
 ENDIF()
+IF(ENABLE_ATSM)
+   ADD_DEFINITIONS("-D_ENABLE_VPL_")
+ENDIF()
 
 IF(USE_SAFE_MEM_LIB)
   SET(USE_SAFE_MEM true)

src/external/build.sh

@@ -2,12 +2,14 @@
 
 TARGET=$1
 PREBUILD_FLAG=$2
+HARDWARE=$3
 EX_PATH=${PWD}
 SRC_PATH=${PWD}/..
 
 parameters_usage(){
     echo 'Usage: 1. <target>:           [ server, client, test ]'
     echo '       2. <prebuild_flag>:    [ y, n ]'
+    echo '       3. <hardware>:         [ SG1, ATSM ]'
 }
 
 build_server(){
@@ -22,7 +24,13 @@ build_server(){
         thrift -r --gen cpp shared.thrift
         patch gen-cpp/shared_types.h Implement_operator_RegionInformation.patch
         cd -
-        cmake -DCMAKE_BUILD_TYPE=Release -DTARGET=server -DDE_FLAG=true -DUSE_SAFE_MEM_LIB=OFF -DENABLE_MSDK=OFF ../..
+        if [ -z "${HARDWARE}" ]; then
+             cmake -DCMAKE_BUILD_TYPE=Release -DTARGET=server -DDE_FLAG=true -DUSE_SAFE_MEM_LIB=OFF ../..
+        elif [ "${HARDWARE}" == "SG1" ]; then
+            cmake -DCMAKE_BUILD_TYPE=Release -DTARGET=server -DDE_FLAG=true -DUSE_SAFE_MEM_LIB=OFF -DENABLE_SG1=ON ../..
+        elif [ "${HARDWARE}" == "ATSM" ]; then
+            cmake -DCMAKE_BUILD_TYPE=Release -DTARGET=server -DDE_FLAG=true -DUSE_SAFE_MEM_LIB=OFF -DENABLE_ATSM=ON ../..
+        fi
     else
         sudo cp ../../ffmpeg/dependency/*.so /usr/local/lib/
         sudo cp ../../ffmpeg/dependency/*.pc /usr/local/lib/pkgconfig/
@@ -178,6 +186,24 @@ build_test(){
     fi
 }
 
+if [ $# == 3 ] ; then
+    if [ "${HARDWARE}" != "SG1" ] && [ "${HARDWARE}" != "ATSM" ] ; then
+        echo "${HARDWARE} not supported! [SG1, ATSM] only."
+        exit 1
+    fi
+
+    if [ "${TARGET}" == "server" ] ; then
+        if [ "${PREBUILD_FLAG}" != "y" ] && [ "${PREBUILD_FLAG}" != "n" ] ; then
+            parameters_usage
+            exit 1
+        else
+            build_server oss
+        fi
+    else
+        echo "Hardware support is only for server"
+    fi
+fi
+
 if [ $# == 2 ] ; then
 
     if [ "${TARGET}" == "server" ] ; then

src/external/prebuild.sh

@@ -69,11 +69,11 @@ install_tools() {
     fi
 
     mkdir -p ../build/external && cd ../build/external
-    if [ ! -f "./zlib-1.2.12.tar.gz" ];then
-        wget http://zlib.net/zlib-1.2.12.tar.gz
+    if [ ! -f "./zlib-1.2.13.tar.gz" ];then
+        wget http://zlib.net/zlib-1.2.13.tar.gz
     fi
-    tar xf zlib-1.2.12.tar.gz
-    cd zlib-1.2.12 && ./configure && make -j $(nproc) && sudo make install && cd ..
+    tar xf zlib-1.2.13.tar.gz
+    cd zlib-1.2.13 && ./configure && make -j $(nproc) && sudo make install && cd ..
 
     program_exists yasm
     if [ $? != 0 ];then