build: launch nim_status_client directly in packaged builds for macOS
Remove the `nim_status_client.sh` launcher script and make related changes.
This commit is contained in:
parent
4d55e3f583
commit
02b26f3c28
|
@ -1,28 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleDisplayName</key>
|
||||
<string>Status Desktop</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>nim_status_client.sh</string>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>status.icns</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>im.Status.NimStatusClient</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>Status</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0.0</string>
|
||||
<key>IFMajorVersion</key>
|
||||
<integer>1</integer>
|
||||
<key>IFMinorVersion</key>
|
||||
<integer>0</integer>
|
||||
<key>NSHighResolutionCapable</key>
|
||||
<string>True</string>
|
||||
</dict>
|
||||
</plist>
|
3
Makefile
3
Makefile
|
@ -301,8 +301,6 @@ $(STATUS_CLIENT_DMG): nim_status_client $(DMG_TOOL)
|
|||
mkdir -p $(MACOS_OUTER_BUNDLE)/Contents/Resources
|
||||
cp Info.plist $(MACOS_OUTER_BUNDLE)/Contents/
|
||||
cp bin/nim_status_client $(MACOS_OUTER_BUNDLE)/Contents/MacOS/
|
||||
cp nim_status_client.sh $(MACOS_OUTER_BUNDLE)/Contents/MacOS/
|
||||
chmod +x $(MACOS_OUTER_BUNDLE)/Contents/MacOS/nim_status_client.sh
|
||||
cp status.icns $(MACOS_OUTER_BUNDLE)/Contents/Resources/
|
||||
cp status.svg $(MACOS_OUTER_BUNDLE)/Contents/
|
||||
cp -R resources.rcc $(MACOS_OUTER_BUNDLE)/Contents/
|
||||
|
@ -315,7 +313,6 @@ $(STATUS_CLIENT_DMG): nim_status_client $(DMG_TOOL)
|
|||
$(MACOS_OUTER_BUNDLE) \
|
||||
-executable=$(MACOS_OUTER_BUNDLE)/Contents/MacOS/nim_status_client \
|
||||
-qmldir=ui
|
||||
cp Info.runner.plist $(MACOS_OUTER_BUNDLE)/Contents/Info.plist
|
||||
macdeployqt \
|
||||
$(MACOS_INNER_BUNDLE) \
|
||||
-executable=$(MACOS_INNER_BUNDLE)/Contents/MacOS/QtWebEngineProcess
|
||||
|
|
|
@ -1,4 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
cd "${0%/*}"
|
||||
./nim_status_client
|
|
@ -25,6 +25,9 @@ logScope:
|
|||
topics = "main"
|
||||
|
||||
proc mainProc() =
|
||||
if defined(macosx) and defined(production):
|
||||
setCurrentDir(getAppDir())
|
||||
|
||||
let fleets =
|
||||
if defined(windows) and defined(production):
|
||||
"/../resources/fleets.json"
|
||||
|
|
Loading…
Reference in New Issue