Skip to content

Commit 3c1c229

Browse files
kyngchaoskyngchaos
committed
Give QGIS Browser icon and info.plist to make it a complete app, other Mac build updates
1 parent fe4026a commit 3c1c229

6 files changed

Lines changed: 118 additions & 6 deletions

File tree

‎images/icons/mac/CMakeLists.txt‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11

2-
FILE (GLOB ICONS *.icns)
3-
INSTALL (FILES ${ICONS}
4-
DESTINATION ${CMAKE_INSTALL_PREFIX}/../Resources)
2+
IF (WITH_DESKTOP)
3+
FILE (GLOB ICONS *.icns)
4+
INSTALL (FILES ${ICONS}
5+
DESTINATION ${CMAKE_INSTALL_PREFIX}/../Resources)
6+
7+
ADD_SUBDIRECTORY(browser)
8+
ENDIF (WITH_DESKTOP)

‎images/icons/mac/browser/CMakeLists.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
FILE (GLOB ICONS *.icns)
3+
INSTALL (FILES ${ICONS}
4+
DESTINATION "${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_DIR}/QGIS Browser.app/Contents/Resources")
5+
# create alias now, so alias file gets correct icon
6+
INSTALL (CODE "EXECUTE_PROCESS(COMMAND osascript -e \"tell application \\\"Finder\\\" to make alias file to POSIX file \\\"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_DIR}/QGIS Browser.app\\\" at POSIX file \\\"$ENV{DESTDIR}${QGIS_INSTALL_PREFIX}/\\\"\")")

‎images/icons/mac/browser/qgisb.icns‎

48.3 KB
Binary file not shown.

‎mac/app.info.plist.in‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundleSignature</key>
1616
<string>QGIS</string>
1717
<key>CFBundleGetInfoString</key>
18-
<string>${QGIS_APP_NAME} ${COMPLETE_VERSION}-${RELEASE_NAME} (${REVISION}), © 2002-2011 QGIS Development Team</string>
18+
<string>${QGIS_APP_NAME} ${COMPLETE_VERSION}-${RELEASE_NAME} (${REVISION}), © 2002-2012 QGIS Development Team</string>
1919
<key>CFBundleShortVersionString</key>
2020
<string>${COMPLETE_VERSION}</string>
2121
<key>CFBundleVersion</key>
@@ -185,33 +185,52 @@
185185
<key>CFBundleLocalizations</key>
186186
<array>
187187
<string>en</string>
188+
<string>af</string>
188189
<string>ar</string>
190+
<string>bg</string>
191+
<string>ca_ES</string>
189192
<string>cs_CZ</string>
193+
<string>da_DK</string>
190194
<string>de</string>
191195
<string>el_GR</string>
192196
<string>es</string>
197+
<string>fa</string>
198+
<string>fi</string>
193199
<string>fr</string>
200+
<string>gl_ES</string>
201+
<string>he</string>
202+
<string>hr_HR</string>
194203
<string>hu</string>
195204
<string>id</string>
205+
<string>is</string>
196206
<string>it</string>
197207
<string>ja</string>
208+
<string>ka_GE</string>
209+
<string>ko_KR</string>
198210
<string>lo</string>
199211
<string>lt</string>
200212
<string>lv</string>
201-
<string>ka</string>
202213
<string>mn</string>
203214
<string>nl</string>
215+
<string>no</string>
204216
<string>pl_PL</string>
205217
<string>pt_BR</string>
218+
<string>pt_PT</string>
206219
<string>ro</string>
207220
<string>ru</string>
208221
<string>sk</string>
222+
<string>sl_SI</string>
209223
<string>sq_AL</string>
224+
<string>sr_CS-Latn</string>
210225
<string>sv</string>
226+
<string>ta</string>
211227
<string>th</string>
212228
<string>tr</string>
229+
<string>uk</string>
213230
<string>vi</string>
231+
<string>xh</string>
214232
<string>zh_CN</string>
233+
<string>zh_TW</string>
215234
</array>
216235
</dict>
217236
</plist>

‎mac/browser.info.plist.in‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>English</string>
7+
<key>CFBundleName</key>
8+
<string>QGIS Browser</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>org.qgis.qgis</string>
11+
<key>CFBundleExecutable</key>
12+
<string>QGIS Browser</string>
13+
<key>CFBundlePackageType</key>
14+
<string>APPL</string>
15+
<key>CFBundleSignature</key>
16+
<string>QGSB</string>
17+
<key>CFBundleGetInfoString</key>
18+
<string>${QGIS_APP_NAME} Browser ${COMPLETE_VERSION}-${RELEASE_NAME} (${REVISION}), © 2002-2012 QGIS Development Team</string>
19+
<key>CFBundleShortVersionString</key>
20+
<string>${COMPLETE_VERSION}</string>
21+
<key>CFBundleVersion</key>
22+
<string>${COMPLETE_VERSION} (${REVISION})</string>
23+
<key>CFBundleIconFile</key>
24+
<string>qgisb.icns</string>
25+
<key>CFBundleInfoDictionaryVersion</key>
26+
<string>6.0</string>
27+
<key>CSResourcesFileMapped</key>
28+
<true/>
29+
<key>CFBundleLocalizations</key>
30+
<array>
31+
<string>en</string>
32+
<string>af</string>
33+
<string>ar</string>
34+
<string>bg</string>
35+
<string>ca_ES</string>
36+
<string>cs_CZ</string>
37+
<string>da_DK</string>
38+
<string>de</string>
39+
<string>el_GR</string>
40+
<string>es</string>
41+
<string>fa</string>
42+
<string>fi</string>
43+
<string>fr</string>
44+
<string>gl_ES</string>
45+
<string>he</string>
46+
<string>hr_HR</string>
47+
<string>hu</string>
48+
<string>id</string>
49+
<string>is</string>
50+
<string>it</string>
51+
<string>ja</string>
52+
<string>ka_GE</string>
53+
<string>ko_KR</string>
54+
<string>lo</string>
55+
<string>lt</string>
56+
<string>lv</string>
57+
<string>mn</string>
58+
<string>nl</string>
59+
<string>no</string>
60+
<string>pl_PL</string>
61+
<string>pt_BR</string>
62+
<string>pt_PT</string>
63+
<string>ro</string>
64+
<string>ru</string>
65+
<string>sk</string>
66+
<string>sl_SI</string>
67+
<string>sq_AL</string>
68+
<string>sr_CS-Latn</string>
69+
<string>sv</string>
70+
<string>ta</string>
71+
<string>th</string>
72+
<string>tr</string>
73+
<string>uk</string>
74+
<string>vi</string>
75+
<string>xh</string>
76+
<string>zh_CN</string>
77+
<string>zh_TW</string>
78+
</array>
79+
</dict>
80+
</plist>

‎src/browser/CMakeLists.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ IF(APPLE)
9090
SET_TARGET_PROPERTIES(qbrowser PROPERTIES
9191
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${QGIS_LIB_DIR}
9292
INSTALL_RPATH_USE_LINK_PATH true
93+
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/browser.info.plist.in"
94+
OUTPUT_NAME "QGIS Browser"
9395
)
9496
ENDIF(APPLE)
9597

@@ -101,5 +103,6 @@ INSTALL (TARGETS qbrowser
101103
RUNTIME DESTINATION ${QGIS_BIN_DIR}
102104
)
103105
IF (APPLE)
104-
INSTALL (CODE "EXECUTE_PROCESS(COMMAND ln -sfh ../../../${QGIS_FW_SUBDIR} \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_DIR}/qbrowser.app/Contents/Frameworks\")")
106+
INSTALL (CODE "EXECUTE_PROCESS(COMMAND ln -sfh ../../../${QGIS_FW_SUBDIR} \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_DIR}/QGIS Browser.app/Contents/Frameworks\")")
107+
INSTALL (CODE "EXECUTE_PROCESS(COMMAND ln -sfh ../../../../${QGIS_LIB_SUBDIR} \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_DIR}/QGIS Browser.app/Contents/MacOS/lib\")")
105108
ENDIF (APPLE)

0 commit comments

Comments
 (0)