If you are using GitLab outside of the ILL, then you will need to use HTTPS and not SSH for clone/push/pull operations. SSH will work normally if you are using the VPN.

Commit 297a3ae8 authored by Tobias WEBER's avatar Tobias WEBER

continued with mac compatibility

parent 62cb6153
......@@ -24,6 +24,7 @@ Debug/*
Release/*
build/*
takin.app/*
*.dmg
.DS_*
.clang/*
.codelite/*
......
......@@ -31,12 +31,11 @@ declare -a SRC_LIBS=(
"/usr/local/opt/qt5/lib/QtDBus.framework"
"/usr/local/opt/qwt/lib/qwt.framework"
"/usr/local/opt/minuit2/lib/libMinuit2.0.dylib"
"/usr/local/opt/boost/lib/libboost_system.dylib"
"/usr/local/opt/boost/lib/libboost_filesystem.dylib"
"/usr/local/opt/boost/lib/libboost_iostreams.dylib"
"/usr/local/opt/boost/lib/libboost_regex.dylib"
"/usr/local/opt/boost/lib/libboost_program_options.dylib"
"/usr/local/opt/boost-python/lib/libboost_python27.dylib"
"/usr/local/opt/boost/lib/libboost_system-mt.dylib"
"/usr/local/opt/boost/lib/libboost_filesystem-mt.dylib"
"/usr/local/opt/boost/lib/libboost_iostreams-mt.dylib"
"/usr/local/opt/boost/lib/libboost_regex-mt.dylib"
"/usr/local/opt/boost/lib/libboost_program_options-mt.dylib"
"/usr/local/opt/boost-python3/lib/libboost_python37.dylib"
"/usr/local/opt/freetype/lib/libfreetype.6.dylib"
"/usr/local/opt/libpng/lib/libpng16.16.dylib"
......@@ -70,6 +69,7 @@ mkdir -pv "${DST_PLUGIN_DIR}/platforms"
mkdir -pv "${DST_PLUGIN_DIR}/platformthemes"
mkdir -pv "${DST_PLUGIN_DIR}/styles"
mkdir -pv "${PRG}/Contents/MacOS"
mkdir -pv "${PRG}/Contents/Resources"
# -----------------------------------------------------------------------------
......@@ -101,6 +101,7 @@ cp -v bin/polextract "${PRG}/Contents/MacOS/"
# data files
cp -v setup_mac/Info.plist "${PRG}/Contents/"
cp -rv data/res "${PRG}/Contents/"
cp -v data/res/takin.icns "${PRG}/Contents/Resources/"
# -----------------------------------------------------------------------------
......
......@@ -39,13 +39,12 @@ declare -a filestochange=(
"${PRG}/Contents/Frameworks/libpng16.16.dylib"
"${PRG}/Contents/Frameworks/libjpeg.9.dylib"
"${PRG}/Contents/Frameworks/libtiff.5.dylib"
"${PRG}/Contents/Frameworks/libboost_iostreams.dylib"
"${PRG}/Contents/Frameworks/libboost_filesystem.dylib"
"${PRG}/Contents/Frameworks/libboost_python27.dylib"
"${PRG}/Contents/Frameworks/libboost_iostreams-mt.dylib"
"${PRG}/Contents/Frameworks/libboost_filesystem-mt.dylib"
"${PRG}/Contents/Frameworks/libboost_python37.dylib"
"${PRG}/Contents/Frameworks/libboost_regex.dylib"
"${PRG}/Contents/Frameworks/libboost_system.dylib"
"${PRG}/Contents/Frameworks/libboost_program_options.dylib"
"${PRG}/Contents/Frameworks/libboost_regex-mt.dylib"
"${PRG}/Contents/Frameworks/libboost_system-mt.dylib"
"${PRG}/Contents/Frameworks/libboost_program_options-mt.dylib"
"${PRG}/Contents/MacOS/takin"
"${PRG}/Contents/MacOS/convofit"
"${PRG}/Contents/MacOS/convoseries"
......@@ -98,20 +97,17 @@ declare -a changefrom=(
"/usr/local/opt/qt5/lib/QtDBus.framework/Versions/5/QtDBus"
"/usr/local/opt/qwt/lib/qwt.framework/Versions/6/qwt"
"/usr/local/opt/minuit2/lib/libMinuit2.0.dylib"
"/usr/local/opt/boost/lib/libboost_system.dylib"
"/usr/local/opt/boost/lib/libboost_filesystem.dylib"
"/usr/local/opt/boost/lib/libboost_iostreams.dylib"
"/usr/local/opt/boost/lib/libboost_regex.dylib"
"/usr/local/opt/boost/lib/libboost_program_options.dylib"
"/usr/local/opt/boost-python/lib/libboost_python27.dylib"
"/usr/local/opt/boost/lib/libboost_system-mt.dylib"
"/usr/local/opt/boost/lib/libboost_filesystem-mt.dylib"
"/usr/local/opt/boost/lib/libboost_iostreams-mt.dylib"
"/usr/local/opt/boost/lib/libboost_regex-mt.dylib"
"/usr/local/opt/boost/lib/libboost_program_options-mt.dylib"
"/usr/local/opt/boost-python3/lib/libboost_python37.dylib"
"/usr/local/opt/freetype/lib/libfreetype.6.dylib"
"/usr/local/opt/libpng/lib/libpng16.16.dylib"
"/usr/local/opt/libjpeg/lib/libjpeg.9.dylib"
"/usr/local/opt/jpeg/lib/libjpeg.9.dylib"
"/usr/local/opt/libtiff/lib/libtiff.5.dylib"
"/usr/local/opt/python/Frameworks/Python.framework/Versions/3.7/Python"
"/usr/local/opt/python3/Frameworks/Python.framework/Versions/3.7/Python"
)
......@@ -159,20 +155,17 @@ declare -a changeto=(
"@executable_path/../Frameworks/QtDBus.framework/Versions/5/QtDBus"
"@executable_path/../Frameworks/qwt.framework/Versions/6/qwt"
"@executable_path/../Frameworks/libMinuit2.0.dylib"
"@executable_path/../Frameworks/libboost_system.dylib"
"@executable_path/../Frameworks/libboost_filesystem.dylib"
"@executable_path/../Frameworks/libboost_iostreams.dylib"
"@executable_path/../Frameworks/libboost_regex.dylib"
"@executable_path/../Frameworks/libboost_program_options.dylib"
"@executable_path/../Frameworks/libboost_python27.dylib"
"@executable_path/../Frameworks/libboost_system-mt.dylib"
"@executable_path/../Frameworks/libboost_filesystem-mt.dylib"
"@executable_path/../Frameworks/libboost_iostreams-mt.dylib"
"@executable_path/../Frameworks/libboost_regex-mt.dylib"
"@executable_path/../Frameworks/libboost_program_options-mt.dylib"
"@executable_path/../Frameworks/libboost_python37.dylib"
"@executable_path/../Frameworks/libfreetype.6.dylib"
"@executable_path/../Frameworks/libpng16.16.dylib"
"@executable_path/../Frameworks/libjpeg.9.dylib"
"@executable_path/../Frameworks/libjpeg.9.dylib"
"@executable_path/../Frameworks/libtiff.5.dylib"
"@executable_path/../Frameworks/Python"
"@executable_path/../Frameworks/Python"
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment