fixing up Linux packaging script

halide · Jul 23, 2020 · 34c7d14 · 34c7d14
1 parent b3b793f
commit 34c7d14
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 21 deletions.
diff --git a/packaging/Linux.cmake b/packaging/Linux.cmake
@@ -0,0 +1,11 @@
+include("shared-Release/CPackConfig.cmake")
+
+set(CPACK_COMPONENTS_HALIDE_RUNTIME Halide_Runtime)
+set(CPACK_COMPONENTS_HALIDE_DEVELOPMENT Halide_Development)
+
+set(CPACK_INSTALL_CMAKE_PROJECTS
+    static-Debug   Halide ALL /
+    shared-Debug   Halide ALL /
+    static-Release Halide ALL /
+    shared-Release Halide ALL /
+)
diff --git a/tools/package-linux.sh b/tools/package-linux.sh
@@ -3,27 +3,22 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 DIR="$(readlink -f $DIR/..)"
 
-cmake -G "Ninja Multi-Config" \
-      -DLLVM_DIR=$LLVM_DIR -DClang_DIR=$Clang_DIR \
-      -DBUILD_SHARED_LIBS=NO \
-      -DWITH_TESTS=NO -DWITH_APPS=NO -DWITH_TUTORIALS=NO \
-      -DWITH_DOCS=YES -DWITH_UTILS=NO -DWITH_PYTHON_BINDINGS=NO \
-      -S "$DIR" -B "$DIR/build/static"
+flag_shared="-DBUILD_SHARED_LIBS=YES"
+flag_static="-DBUILD_SHARED_LIBS=NO"
 
-cmake -G "Ninja Multi-Config" \
-      -DLLVM_DIR=$LLVM_DIR -DClang_DIR=$Clang_DIR \
-      -DBUILD_SHARED_LIBS=YES \
-      -DWITH_TESTS=NO -DWITH_APPS=NO -DWITH_TUTORIALS=NO \
-      -DWITH_DOCS=YES -DWITH_UTILS=NO -DWITH_PYTHON_BINDINGS=NO \
-      -S "$DIR" -B "$DIR/build/shared"
+for ty in shared static
+do
+  for cfg in Debug Release
+  do
+    flag_name=flag_$ty
+    cmake -G Ninja -DCMAKE_BUILD_TYPE=$cfg ${!flag_name}\
+          -DLLVM_DIR=$LLVM_DIR -DClang_DIR=$Clang_DIR \
+          -DWITH_TESTS=NO -DWITH_APPS=NO -DWITH_TUTORIALS=NO \
+          -DWITH_DOCS=YES -DWITH_UTILS=NO -DWITH_PYTHON_BINDINGS=NO \
+          -S "$DIR" -B "$DIR/build/$ty-$cfg"
+    cmake --build "$DIR/build/$ty-$cfg"
+  done
+done
 
-cmake --build "$DIR/build/shared" --config Debug
-cmake --build "$DIR/build/shared" --config Release 
-cmake --build "$DIR/build/static" --config Debug
-cmake --build "$DIR/build/static" --config Release 
-
-cmake --install "$DIR/build/shared" --prefix "$DIR/build/install" --config Debug
-cmake --install "$DIR/build/shared" --prefix "$DIR/build/install" --config Release 
-cmake --install "$DIR/build/static" --prefix "$DIR/build/install" --config Debug
-cmake --install "$DIR/build/static" --prefix "$DIR/build/install" --config Release
+(cd "$DIR/build"; cpack --config "$DIR/packaging/Linux.cmake")