From 5cc8ffba41d032d2656ef5eb325ee68b9005eae8 Mon Sep 17 00:00:00 2001 From: Jeffrey Zampieron Date: Mon, 31 Aug 2020 13:33:08 -0400 Subject: [PATCH] Start setting up 1-liner conda build --- brew_install_osx_deps.sh | 27 --------------------------- build.sh => build_osx_conda.sh | 9 +++++---- 2 files changed, 5 insertions(+), 31 deletions(-) delete mode 100755 brew_install_osx_deps.sh rename build.sh => build_osx_conda.sh (97%) diff --git a/brew_install_osx_deps.sh b/brew_install_osx_deps.sh deleted file mode 100755 index 43886b6102..0000000000 --- a/brew_install_osx_deps.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash - -BREW_LIST=(ninja \ - doxygen \ - hdf5@1.10 \ - boost \ - xerces-c \ - opencascade \ - vtk \ - swig \ - qt5 \ - freecad/freecad/coin \ - boost-python3 \ - pcl \ - pyside \ - libspnav \ - pybind11 \ -) - -for pkg in ${BREW_LIST[@]}; do - echo "Brew Installing Pkg: ${pkg}" - brew install ${pkg} - if [ $? != 0 ]; then - echo "Failed to install ${pkg}" - exit 1 - fi -done \ No newline at end of file diff --git a/build.sh b/build_osx_conda.sh similarity index 97% rename from build.sh rename to build_osx_conda.sh index 48e1568ac2..df5dea98f7 100755 --- a/build.sh +++ b/build_osx_conda.sh @@ -1,14 +1,15 @@ ##!/usr/bin/env bash +BUILDDIR=freecad_build HOST=$(uname) -mkdir -p build -cd build +mkdir -p ${BUILDDIR} +pushd ${BUILDDIR} if [[ ${FEATURE_DEBUG} = 1 ]]; then - BUILD_TYPE="Debug" + BUILD_TYPE="Debug" else - BUILD_TYPE="Release" + BUILD_TYPE="Release" fi declare -a CMAKE_PLATFORM_FLAGS