Commit 07093280 authored by Peter Zhigalov's avatar Peter Zhigalov

Поправил мелкие косяки в сборке OS X, обновил сборочные скрипты

parent f36c2e03
......@@ -16,7 +16,7 @@ cd "${V_BUILDDIR}"
${CMD_QMAKE} CONFIG+="release" CONFIG+="x86_64" -r -spec unsupported/macx-clang QMAKE_MACOSX_DEPLOYMENT_TARGET=10.5 "../${V_PROJECT}.pro"
make
cp -a "../${V_INFO_PLIST}" "${V_APPNAME}.app/Contents/Info.plist"
sed -e 's/10.7.0/10.5.0/' -i "" "${V_APPNAME}.app/Contents/Info.plist"
sed -e 's/10.6.0/10.5.0/' -i "" "${V_APPNAME}.app/Contents/Info.plist"
cp -a "../${V_ICON}" "${V_APPNAME}.app/Contents/Resources/"
${CMD_DEPLOY} "${V_APPNAME}.app" -dmg -verbose=2
......
......@@ -14,7 +14,6 @@ mkdir -p "${V_BUILDDIR}"
cd "${V_BUILDDIR}"
${CMD_QMAKE} CONFIG+="release" QMAKE_MACOSX_DEPLOYMENT_TARGET=10.6 "../${V_PROJECT}.pro"
make
sed -e 's/10.7.0/10.6.0/' -i "" "${V_APPNAME}.app/Contents/Info.plist"
${CMD_DEPLOY} "${V_APPNAME}.app" -dmg -verbose=2
hdiutil convert -format UDRW -o "${V_APPNAME}_rw.dmg" "${V_APPNAME}.dmg"
......
#!/bin/bash
V_PROJECT=fem_draw_qt
V_BUILDDIR=build_osx_qt5.6.0_clang64
V_BUILDDIR=build_osx_qt5.7.0_clang64
V_APPNAME="FEM Draw"
V_DMGNAME="fem_draw_qt"
QTDIR="${HOME}/Qt/5.6/clang_64"
QTDIR="${HOME}/Qt/5.7/clang_64"
CMD_QMAKE="${QTDIR}/bin/qmake"
CMD_DEPLOY="${QTDIR}/bin/macdeployqt"
......@@ -12,8 +12,9 @@ cd "$(dirname $0)"/..
rm -rf "${V_BUILDDIR}"
mkdir -p "${V_BUILDDIR}"
cd "${V_BUILDDIR}"
${CMD_QMAKE} CONFIG+="release" QMAKE_MACOSX_DEPLOYMENT_TARGET=10.7 "../${V_PROJECT}.pro"
${CMD_QMAKE} CONFIG+="release" QMAKE_MACOSX_DEPLOYMENT_TARGET=10.8 "../${V_PROJECT}.pro"
make
sed -e 's/10.6.0/10.8.0/' -i "" "${V_APPNAME}.app/Contents/Info.plist"
${CMD_DEPLOY} "${V_APPNAME}.app" -dmg -verbose=2
hdiutil convert -format UDRW -o "${V_APPNAME}_rw.dmg" "${V_APPNAME}.dmg"
......
......@@ -84,3 +84,9 @@ use_static_qico {
DEFINES += USE_STATIC_QICO
}
DESTDIR = .
OBJECTS_DIR = build
MOC_DIR = build
RCC_DIR = build
UI_DIR = build
......@@ -33,7 +33,7 @@
<string>x86_64</string>
</array>
<key>LSMinimumSystemVersion</key>
<string>10.7.0</string>
<string>10.6.0</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright (c) 2014-2016, Peter Zhigalov</string>
<key>CFBundleDocumentTypes</key>
......@@ -47,7 +47,7 @@
<string>plt</string>
</array>
<key>CFBundleTypeName</key>
<string>Qt UI File</string>
<string>Tecplot Data File</string>
</dict>
</array>
</dict>
......
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