Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build MacOS executables as application bundles #230

Merged
merged 3 commits into from
Nov 22, 2023
Merged

Build MacOS executables as application bundles #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be235d8
cmake: Install crashpad_handler with executable bit
ltoenning Nov 21, 2023
29b05b7
Fix VATSIM spelling
ltoenning Nov 21, 2023
2848435
Build MacOS executables as bundles
ltoenning Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ if(SWIFT_USE_CRASHPAD)
endif()

if(APPLE)
set(CMAKE_INSTALL_RPATH @loader_path/../lib)
set(CMAKE_INSTALL_RPATH @loader_path/../../../../lib)
elseif(UNIX)
set(CMAKE_INSTALL_RPATH \$ORIGIN/../lib)
endif()
Expand Down
2 changes: 1 addition & 1 deletion cmake/install.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ elseif(SWIFT_WIN64)
elseif(APPLE)
set(crashpad_handler_path ${swift_SOURCE_DIR}/externals/macx-clang/64/bin/swift_crashpad_handler)
endif()
install(FILES ${crashpad_handler_path} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
install(PROGRAMS ${crashpad_handler_path} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)

# create_dbus_machineid
if(APPLE)
Expand Down
16 changes: 12 additions & 4 deletions scripts/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,11 +384,14 @@ def _should_create_symbols(self):
return True

def _strip_debug(self):
bundle_files = [
"bin/swiftcore.app/Contents/MacOS/swiftcore",
"bin/swiftdata.app/Contents/MacOS/swiftdata",
"bin/swiftguistd.app/Contents/MacOS/swiftguistd",
"bin/swiftlauncher.app/Contents/MacOS/swiftlauncher",
]

files = [
"bin/swiftcore",
"bin/swiftdata",
"bin/swiftguistd",
"bin/swiftlauncher",
"lib/libcore.dylib",
"lib/libgui.dylib",
"lib/libinput.dylib",
Expand All @@ -405,6 +408,11 @@ def _strip_debug(self):
"xswiftbus/64/mac.xpl",
]
dist_path = path.join(self._get_swift_source_path(), "dist")

# Put output of bundle files directly in bin folder
for file in bundle_files:
subprocess.check_call(["dsymutil", path.join(dist_path, file), "-o", path.join(dist_path, "bin", file.split("/")[-1] + ".dSYM")], env=dict(os.environ))

for file in files:
subprocess.check_call(["dsymutil", path.join(dist_path, file)], env=dict(os.environ))

Expand Down
14 changes: 13 additions & 1 deletion src/swiftcore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,22 @@ target_link_libraries(swiftcore
core
)

if(APPLE)
set_target_properties(swiftcore PROPERTIES MACOSX_BUNDLE TRUE)
set_target_properties(swiftcore PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
set(RESOURCE_FILES swiftcore.icns qt.conf)
target_sources(swiftcore PRIVATE ${RESOURCE_FILES})
set_target_properties(swiftcore PROPERTIES RESOURCE "${RESOURCE_FILES}")
endif()

add_dependencies(swiftcore resources)

if(WIN32)
add_dependencies(swiftcore copy_externals_to_build_dir)
endif()

install(TARGETS swiftcore)
if(APPLE)
install(TARGETS swiftcore BUNDLE DESTINATION bin)
else()
install(TARGETS swiftcore)
endif()
12 changes: 6 additions & 6 deletions src/swiftcore/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,24 @@
<key>CFBundleDisplayName</key>
<string>swift core</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<string>swiftcore</string>
<key>CFBundleGetInfoString</key>
<string>swift project - free and open source pilot client</string>
<key>CFBundleIconFile</key>
<string>${ASSETCATALOG_COMPILER_APPICON_NAME}</string>
<string>swiftcore.icns</string>
<key>CFBundleIdentifier</key>
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
<string>org.swift-project.swiftcore</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>${QMAKE_PKGINFO_TYPEINFO}</string>
<string>????</string>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<string>10.13</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>NSSupportsAutomaticGraphicsSwitching</key>
<true/>
<key>NSMicrophoneUsageDescription</key>
<string>This application needs access to your Microphone for Vatsim Voice.</string>
<string>This application needs access to your Microphone for VATSIM Voice.</string>
</dict>
</plist>
14 changes: 13 additions & 1 deletion src/swiftdata/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,22 @@ target_link_libraries(swiftdata
core
)

if(APPLE)
set_target_properties(swiftdata PROPERTIES MACOSX_BUNDLE TRUE)
set_target_properties(swiftdata PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
set(RESOURCE_FILES swiftdata.icns qt.conf)
target_sources(swiftdata PRIVATE ${RESOURCE_FILES})
set_target_properties(swiftdata PROPERTIES RESOURCE "${RESOURCE_FILES}")
endif()

add_dependencies(swiftdata resources)

if(WIN32)
add_dependencies(swiftdata copy_externals_to_build_dir)
endif()

install(TARGETS swiftdata)
if(APPLE)
install(TARGETS swiftdata BUNDLE DESTINATION bin)
else()
install(TARGETS swiftdata)
endif()
10 changes: 5 additions & 5 deletions src/swiftdata/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@
<key>CFBundleDisplayName</key>
<string>swift data</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<string>swiftdata</string>
<key>CFBundleGetInfoString</key>
<string>swift project - free and open source pilot client</string>
<key>CFBundleIconFile</key>
<string>${ASSETCATALOG_COMPILER_APPICON_NAME}</string>
<string>swiftdata.icns</string>
<key>CFBundleIdentifier</key>
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
<string>org.swift-project.swiftdata</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>${QMAKE_PKGINFO_TYPEINFO}</string>
<string>????</string>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<string>10.13</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>NSSupportsAutomaticGraphicsSwitching</key>
Expand Down
14 changes: 13 additions & 1 deletion src/swiftguistandard/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,22 @@ target_link_libraries(swiftguistd
sound
)

if(APPLE)
set_target_properties(swiftguistd PROPERTIES MACOSX_BUNDLE TRUE)
set_target_properties(swiftguistd PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
set(RESOURCE_FILES swift.icns qt.conf)
target_sources(swiftguistd PRIVATE ${RESOURCE_FILES})
set_target_properties(swiftguistd PROPERTIES RESOURCE "${RESOURCE_FILES}")
endif()

add_dependencies(swiftguistd resources)

if(WIN32)
add_dependencies(swiftguistd copy_externals_to_build_dir)
endif()

install(TARGETS swiftguistd)
if(APPLE)
install(TARGETS swiftguistd BUNDLE DESTINATION bin)
else()
install(TARGETS swiftguistd)
endif()
12 changes: 6 additions & 6 deletions src/swiftguistandard/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,24 @@
<key>CFBundleDisplayName</key>
<string>swift gui</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<string>swiftguistd</string>
<key>CFBundleGetInfoString</key>
<string>swift project - free and open source pilot client</string>
<key>CFBundleIconFile</key>
<string>${ASSETCATALOG_COMPILER_APPICON_NAME}</string>
<string>swift.icns</string>
<key>CFBundleIdentifier</key>
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
<string>org.swift-project.swiftguistd</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>${QMAKE_PKGINFO_TYPEINFO}</string>
<string>????</string>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<string>10.13</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>NSSupportsAutomaticGraphicsSwitching</key>
<true/>
<key>NSMicrophoneUsageDescription</key>
<string>This application needs access to your Microphone for Vatsim Voice.</string>
<string>This application needs access to your Microphone for VATSIM Voice.</string>
</dict>
</plist>
14 changes: 13 additions & 1 deletion src/swiftlauncher/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,22 @@ target_link_libraries(swiftlauncher
core
)

if(APPLE)
set_target_properties(swiftlauncher PROPERTIES MACOSX_BUNDLE TRUE)
set_target_properties(swiftlauncher PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist)
set(RESOURCE_FILES swiftlauncher.icns qt.conf)
target_sources(swiftlauncher PRIVATE ${RESOURCE_FILES})
set_target_properties(swiftlauncher PROPERTIES RESOURCE "${RESOURCE_FILES}")
endif()

add_dependencies(swiftlauncher resources)

if(WIN32)
add_dependencies(swiftlauncher copy_externals_to_build_dir)
endif()

install(TARGETS swiftlauncher)
if(APPLE)
install(TARGETS swiftlauncher BUNDLE DESTINATION bin)
else()
install(TARGETS swiftlauncher)
endif()
12 changes: 6 additions & 6 deletions src/swiftlauncher/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,24 @@
<key>CFBundleDisplayName</key>
<string>swift launcher</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<string>swiftlauncher</string>
<key>CFBundleGetInfoString</key>
<string>swift project - free and open source pilot client</string>
<key>CFBundleIconFile</key>
<string>${ASSETCATALOG_COMPILER_APPICON_NAME}</string>
<string>swiftlauncher.icns</string>
<key>CFBundleIdentifier</key>
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
<string>org.swift-project.swiftlauncher</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleSignature</key>
<string>${QMAKE_PKGINFO_TYPEINFO}</string>
<string>????</string>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<string>10.13</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
<key>NSSupportsAutomaticGraphicsSwitching</key>
<true/>
<key>NSMicrophoneUsageDescription</key>
<string>This application needs access to your Microphone for Vatsim Voice.</string>
<string>This application needs access to your Microphone for VATSIM Voice.</string>
</dict>
</plist>