From c753545c9e3030e1b5c6a09f91838f9c7b5f46e3 Mon Sep 17 00:00:00 2001 From: Ayla Khan Date: Thu, 29 Jun 2017 09:42:51 -0600 Subject: [PATCH] Move tmp package out of package root directory. --- src/CMake/Scripts/repair_package.sh.in | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/CMake/Scripts/repair_package.sh.in b/src/CMake/Scripts/repair_package.sh.in index 48053853a..8f40decc1 100755 --- a/src/CMake/Scripts/repair_package.sh.in +++ b/src/CMake/Scripts/repair_package.sh.in @@ -1,6 +1,7 @@ #!/usr/bin/env bash seg3dbuild_dir=@CMAKE_BINARY_DIR@ +productbuild_dir=@PKG_BUILD_DIR@ productroot_dir=@PKG_ROOT_DIR@ if [[ ! -e $productroot_dir ]]; then @@ -13,9 +14,9 @@ fi --component-plist $seg3dbuild_dir/@CPACK_PACKAGE_NAME@.plist \ --install-location /Applications $seg3dbuild_dir/@CPACK_PACKAGE_NAME@.pkg @PRODUCTBUILD_EXE@ --distribution $seg3dbuild_dir/CPack.Distribution.dist \ - --package-path $productroot_dir $productroot_dir/tmp.pkg + --package-path $productroot_dir $productbuild_dir/tmp.pkg # Tip: pkgutil --expand can be used to debug package building -@PKGUTIL_EXE@ --expand $productroot_dir/tmp.pkg $productroot_dir/tmp -@PKGUTIL_EXE@ --flatten $productroot_dir/tmp $seg3dbuild_dir/@PKG_FILE_NAME@.pkg +@PKGUTIL_EXE@ --expand $productbuild_dir/tmp.pkg $productbuild_dir/tmp +@PKGUTIL_EXE@ --flatten $productbuild_dir/tmp $seg3dbuild_dir/@PKG_FILE_NAME@.pkg rm -f $seg3dbuild_dir/@CPACK_PACKAGE_NAME@.pkg $seg3dbuild_dir/@CPACK_PACKAGE_NAME@.plist -rm -Rf $productroot_dir/tmp +rm -Rf $productbuild_dir/tmp