Commit 07093280c45d8885efabc9cacfd5d30990394707

Authored by Peter Zhigalov
1 parent f36c2e03

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

buildscripts/osx_qt4.8.7_clang64.sh
... ... @@ -16,7 +16,7 @@ cd "${V_BUILDDIR}"
16 16 ${CMD_QMAKE} CONFIG+="release" CONFIG+="x86_64" -r -spec unsupported/macx-clang QMAKE_MACOSX_DEPLOYMENT_TARGET=10.5 "../${V_PROJECT}.pro"
17 17 make
18 18 cp -a "../${V_INFO_PLIST}" "${V_APPNAME}.app/Contents/Info.plist"
19   -sed -e 's/10.7.0/10.5.0/' -i "" "${V_APPNAME}.app/Contents/Info.plist"
  19 +sed -e 's/10.6.0/10.5.0/' -i "" "${V_APPNAME}.app/Contents/Info.plist"
20 20 cp -a "../${V_ICON}" "${V_APPNAME}.app/Contents/Resources/"
21 21 ${CMD_DEPLOY} "${V_APPNAME}.app" -dmg -verbose=2
22 22  
... ...
buildscripts/osx_qt5.3.2_clang64.sh
... ... @@ -14,7 +14,6 @@ mkdir -p "${V_BUILDDIR}"
14 14 cd "${V_BUILDDIR}"
15 15 ${CMD_QMAKE} CONFIG+="release" QMAKE_MACOSX_DEPLOYMENT_TARGET=10.6 "../${V_PROJECT}.pro"
16 16 make
17   -sed -e 's/10.7.0/10.6.0/' -i "" "${V_APPNAME}.app/Contents/Info.plist"
18 17 ${CMD_DEPLOY} "${V_APPNAME}.app" -dmg -verbose=2
19 18  
20 19 hdiutil convert -format UDRW -o "${V_APPNAME}_rw.dmg" "${V_APPNAME}.dmg"
... ...
buildscripts/osx_qt5.6.0_clang64.sh renamed to buildscripts/osx_qt5.7.0_clang64.sh
1 1 #!/bin/bash
2 2 V_PROJECT=fem_draw_qt
3   -V_BUILDDIR=build_osx_qt5.6.0_clang64
  3 +V_BUILDDIR=build_osx_qt5.7.0_clang64
4 4 V_APPNAME="FEM Draw"
5 5 V_DMGNAME="fem_draw_qt"
6 6  
7   -QTDIR="${HOME}/Qt/5.6/clang_64"
  7 +QTDIR="${HOME}/Qt/5.7/clang_64"
8 8 CMD_QMAKE="${QTDIR}/bin/qmake"
9 9 CMD_DEPLOY="${QTDIR}/bin/macdeployqt"
10 10  
... ... @@ -12,8 +12,9 @@ cd "$(dirname $0)"/..
12 12 rm -rf "${V_BUILDDIR}"
13 13 mkdir -p "${V_BUILDDIR}"
14 14 cd "${V_BUILDDIR}"
15   -${CMD_QMAKE} CONFIG+="release" QMAKE_MACOSX_DEPLOYMENT_TARGET=10.7 "../${V_PROJECT}.pro"
  15 +${CMD_QMAKE} CONFIG+="release" QMAKE_MACOSX_DEPLOYMENT_TARGET=10.8 "../${V_PROJECT}.pro"
16 16 make
  17 +sed -e 's/10.6.0/10.8.0/' -i "" "${V_APPNAME}.app/Contents/Info.plist"
17 18 ${CMD_DEPLOY} "${V_APPNAME}.app" -dmg -verbose=2
18 19  
19 20 hdiutil convert -format UDRW -o "${V_APPNAME}_rw.dmg" "${V_APPNAME}.dmg"
... ...
fem_draw_qt.pro
... ... @@ -84,3 +84,9 @@ use_static_qico {
84 84 DEFINES += USE_STATIC_QICO
85 85 }
86 86  
  87 +DESTDIR = .
  88 +OBJECTS_DIR = build
  89 +MOC_DIR = build
  90 +RCC_DIR = build
  91 +UI_DIR = build
  92 +
... ...
resources/Info.plist
... ... @@ -33,7 +33,7 @@
33 33 <string>x86_64</string>
34 34 </array>
35 35 <key>LSMinimumSystemVersion</key>
36   - <string>10.7.0</string>
  36 + <string>10.6.0</string>
37 37 <key>NSHumanReadableCopyright</key>
38 38 <string>Copyright (c) 2014-2016, Peter Zhigalov</string>
39 39 <key>CFBundleDocumentTypes</key>
... ... @@ -47,7 +47,7 @@
47 47 <string>plt</string>
48 48 </array>
49 49 <key>CFBundleTypeName</key>
50   - <string>Qt UI File</string>
  50 + <string>Tecplot Data File</string>
51 51 </dict>
52 52 </array>
53 53 </dict>
... ...