Merge pull request #2285 from rstudio/feature/macos-pkg-build

Allow building macOS package outside build folder

package/osx/make-package

@@ -4,19 +4,26 @@ set -e
 
 PACKAGE_DIR=`pwd`
 
+BUILD_DIR=$(pwd)/build
+
+# find package source folder
+PKG_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
 if [ "$1" == "clean" ]
 then
    # remove existing build dir
-   rm -rf build
+   rm -rf "$BUILD_DIR"
 
-   # clean out ant build
-   cd ../../src/gwt
-   ant clean
+   # clean out ant build if
+   if [ -d "../../src/gwt" ]; then
+      cd ../../src/gwt
+      ant clean
+   fi
    cd $PACKAGE_DIR
 fi
 
-mkdir -p build
-cd build
+mkdir -p $BUILD_DIR/gwt
+cd $BUILD_DIR
 rm -f CMakeCache.txt
 rm -rf build/_CPack_Packages
 
@@ -29,7 +36,10 @@ fi
 cmake -DRSTUDIO_TARGET=Desktop \
       -DCMAKE_BUILD_TYPE=Release \
       -DRSTUDIO_PACKAGE_BUILD=1 \
-      ../../..
+      -DGWT_BIN_DIR="$BUILD_DIR/gwt/bin" \
+      -DGWT_WWW_DIR="$BUILD_DIR/gwt/www" \
+      -DGWT_EXTRAS_DIR="$BUILD_DIR/gwt/extras" \
+      $PKG_DIR/../..
 
 MAKEFLAGS="$MAKEFLAGS -j$(sysctl -n hw.ncpu)"
 
@@ -38,4 +48,4 @@ make $MAKEFLAGS
 
 cpack -G DragNDrop
 
-cd ..
+cd $PACKAGE_DIR