Commit fa53de98d3bcf139f36d401f7edcc10456bafa66

Authored by Peter Zhigalov
1 parent 0947f867

Унифицировал строки описания приложений и добавил создание lproj-директорий в deploy-скрипты

buildscripts/osx_qt4.8.7_clang64.sh
... ... @@ -17,7 +17,10 @@ ${CMD_QMAKE} CONFIG+="release" CONFIG+="x86_64" -r -spec unsupported/macx-clang
17 17 make
18 18 cp -a "../${V_INFO_PLIST}" "${V_APPNAME}.app/Contents/Info.plist"
19 19 sed -e 's/10.6.0/10.5.0/' -i "" "${V_APPNAME}.app/Contents/Info.plist"
20   -cp -a "../${V_ICON}" "${V_APPNAME}.app/Contents/Resources/"
  20 +RES_PATH="${V_APPNAME}.app/Contents/Resources"
  21 +rm -f "${RES_PATH}/empty.lproj"
  22 +mkdir -p "${RES_PATH}/en.lproj" "${RES_PATH}/ru.lproj"
  23 +cp -a "../${V_ICON}" "${RES_PATH}/"
21 24 ${CMD_DEPLOY} "${V_APPNAME}.app" -dmg -verbose=2
22 25  
23 26 hdiutil convert -format UDRW -o "${V_APPNAME}_rw.dmg" "${V_APPNAME}.dmg"
... ...
buildscripts/osx_qt5.3.2_clang64.sh
... ... @@ -14,6 +14,9 @@ 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 +RES_PATH="${V_APPNAME}.app/Contents/Resources"
  18 +rm -f "${RES_PATH}/empty.lproj"
  19 +mkdir -p "${RES_PATH}/en.lproj" "${RES_PATH}/ru.lproj"
17 20 ${CMD_DEPLOY} "${V_APPNAME}.app" -dmg -verbose=2
18 21  
19 22 hdiutil convert -format UDRW -o "${V_APPNAME}_rw.dmg" "${V_APPNAME}.dmg"
... ...
buildscripts/osx_qt5.7.0_clang64.sh
... ... @@ -15,6 +15,9 @@ cd "${V_BUILDDIR}"
15 15 ${CMD_QMAKE} CONFIG+="release" QMAKE_MACOSX_DEPLOYMENT_TARGET=10.8 "../${V_PROJECT}.pro"
16 16 make
17 17 sed -e 's/10.6.0/10.8.0/' -i "" "${V_APPNAME}.app/Contents/Info.plist"
  18 +RES_PATH="${V_APPNAME}.app/Contents/Resources"
  19 +rm -f "${RES_PATH}/empty.lproj"
  20 +mkdir -p "${RES_PATH}/en.lproj" "${RES_PATH}/ru.lproj"
18 21 ${CMD_DEPLOY} "${V_APPNAME}.app" -dmg -verbose=2
19 22  
20 23 hdiutil convert -format UDRW -o "${V_APPNAME}_rw.dmg" "${V_APPNAME}.dmg"
... ...
resources/Info.plist
... ... @@ -11,7 +11,7 @@
11 11 <key>CFBundleIconFile</key>
12 12 <string>fem_draw.icns</string>
13 13 <key>CFBundleIdentifier</key>
14   - <string>ru.codefreak.fem_draw</string>
  14 + <string>ru.codefreak.fami.fem_draw</string>
15 15 <key>CFBundleInfoDictionaryVersion</key>
16 16 <string>6.0</string>
17 17 <key>CFBundleName</key>
... ... @@ -35,7 +35,7 @@
35 35 <key>LSMinimumSystemVersion</key>
36 36 <string>10.6.0</string>
37 37 <key>NSHumanReadableCopyright</key>
38   - <string>Copyright (c) 2014-2016, Peter Zhigalov</string>
  38 + <string>(c) Peter Zhigalov, 2014-2016</string>
39 39 <key>CFBundleDocumentTypes</key>
40 40 <array>
41 41 <dict>
... ...
src_qt/resources.rc
... ... @@ -8,10 +8,10 @@ IDI_ICON1 ICON DISCARDABLE &quot;../resources/icon.ico&quot;
8 8 #define VER_PRODUCTVERSION_STR "1.7\0"
9 9 #define VER_FILEDESCRIPTION_STR "Tool for plot scalar and vector fields"
10 10 #define VER_INTERNALNAME_STR "fem_draw_qt"
11   -#define VER_LEGALCOPYRIGHT_STR "Copyright (c) 2014-2016, Peter Zhigalov"
  11 +#define VER_LEGALCOPYRIGHT_STR "(c) Peter Zhigalov, 2014-2016"
12 12 #define VER_ORIGINALFILENAME_STR "fem_draw_qt.exe"
13 13 #define VER_PRODUCTNAME_STR "FEM Draw (Qt)"
14   -#define VER_COMPANYNAME_STR "Peter Zhigalov"
  14 +#define VER_COMPANYNAME_STR "FAMI Net Team"
15 15  
16 16 VS_VERSION_INFO VERSIONINFO
17 17 FILEVERSION VER_FILEVERSION
... ...
src_winapi/resources.rc
... ... @@ -25,10 +25,10 @@ END
25 25 #define VER_PRODUCTVERSION_STR "1.7\0"
26 26 #define VER_FILEDESCRIPTION_STR "Tool for plot scalar and vector fields"
27 27 #define VER_INTERNALNAME_STR "fem_draw_winapi"
28   -#define VER_LEGALCOPYRIGHT_STR "Copyright (c) 2014-2016, Peter Zhigalov"
  28 +#define VER_LEGALCOPYRIGHT_STR "(c) Peter Zhigalov, 2014-2016"
29 29 #define VER_ORIGINALFILENAME_STR "fem_draw_winapi.exe"
30 30 #define VER_PRODUCTNAME_STR "FEM Draw (WinAPI)"
31   -#define VER_COMPANYNAME_STR "Peter Zhigalov"
  31 +#define VER_COMPANYNAME_STR "FAMI Net Team"
32 32  
33 33 VS_VERSION_INFO VERSIONINFO
34 34 FILEVERSION VER_FILEVERSION
... ...