Various updates.
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -6,3 +6,4 @@ CmdBar
|
|||||||
CmdBar.app
|
CmdBar.app
|
||||||
cmdbar_updater
|
cmdbar_updater
|
||||||
src/updater
|
src/updater
|
||||||
|
ids
|
||||||
|
|||||||
12
Makefile
12
Makefile
@@ -1,12 +1,17 @@
|
|||||||
|
APPLE_ID := $(shell cat ./ids/APPLE_ID)
|
||||||
|
TEAM_ID := $(shell cat ./ids/TEAM_ID)
|
||||||
|
APP_SPECIFIC_PASSWORD := $(shell cat ./ids/APP_SPECIFIC_PASSWORD)
|
||||||
|
|
||||||
CmdBar.app:
|
CmdBar.app:
|
||||||
$(MAKE) -C src FLAGS=-O CFLAGS=-O3 all
|
$(MAKE) -C src FLAGS=-O CFLAGS=-O3 default
|
||||||
|
|
||||||
container:
|
container:
|
||||||
ditto -c -k --keepParent ./src/CmdBar.app ./build/CmdBar.zip
|
ditto -c -k --keepParent ./src/CmdBar.app ./build/CmdBar.zip
|
||||||
|
|
||||||
notarize:
|
notarize:
|
||||||
xcrun notarytool submit ./build/CmdBar.zip \
|
xcrun notarytool submit ./build/CmdBar.zip \
|
||||||
--keychain-profile "notarytool-password" --wait
|
--apple-id "$(APPLE_ID)" --team-id "$(TEAM_ID)" \
|
||||||
|
--password "$(APP_SPECIFIC_PASSWORD)" --wait
|
||||||
|
|
||||||
staple:
|
staple:
|
||||||
cd build && \
|
cd build && \
|
||||||
@@ -27,6 +32,9 @@ dmg:
|
|||||||
|
|
||||||
all: CmdBar.app container notarize staple zip dmg
|
all: CmdBar.app container notarize staple zip dmg
|
||||||
|
|
||||||
|
status:
|
||||||
|
@echo 'xcrun notarytool log "" --apple-id "$(APPLE_ID)" --team-id "$(TEAM_ID)" --password "$(APP_SPECIFIC_PASSWORD)" developer_log.json'
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf build
|
rm -rf build
|
||||||
|
|
||||||
|
|||||||
@@ -2,20 +2,13 @@ import AppKit
|
|||||||
|
|
||||||
// MARK: - Constants
|
// MARK: - Constants
|
||||||
fileprivate enum AboutLinks {
|
fileprivate enum AboutLinks {
|
||||||
static let website = "https://cmdbar.app"
|
static let website = "https://cmdbar.rednera.com"
|
||||||
static let documentation = "https://cmdbar.app/documentation"
|
static let documentation = "https://cmdbar.rednera.com/documentation"
|
||||||
static let privacy = "https://cmdbar.app/#privacy-policy"
|
static let privacy = "https://cmdbar.rednera.com/#privacy-policy"
|
||||||
}
|
}
|
||||||
|
|
||||||
enum Strings {
|
enum Strings {
|
||||||
static let copyright = "Copyright © 2024\nGarikMI. All rights reserved."
|
static let copyright = "Copyright © 2026 Rednera.\nAll rights reserved."
|
||||||
static let evaluationTitle = "License - Evaluation"
|
|
||||||
static let evaluationMessage = "You are currently using evaluation license. CmdBar will quit after 20 minutes. If you already own a license, enter it below or purchase a license."
|
|
||||||
static let activate = "Activate"
|
|
||||||
static let proTitle = "License - Activated"
|
|
||||||
static let proMessage = "Thank you for purchasing CmdBar! Enjoy!"
|
|
||||||
static let deactivate = "Deactivate"
|
|
||||||
static let activating = "Activating..."
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// MARK: - Controller
|
// MARK: - Controller
|
||||||
@@ -105,7 +98,7 @@ class AboutViewController: NSViewController, NSTextFieldDelegate {
|
|||||||
|
|
||||||
private var websiteButton: NSButton = {
|
private var websiteButton: NSButton = {
|
||||||
let button = NSButton()
|
let button = NSButton()
|
||||||
button.title = "CmdBar.app"
|
button.title = "CmdBar"
|
||||||
button.sizeToFit()
|
button.sizeToFit()
|
||||||
button.bezelStyle = .rounded
|
button.bezelStyle = .rounded
|
||||||
button.action = #selector(website)
|
button.action = #selector(website)
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
<key>CFBundleIconName</key>
|
<key>CFBundleIconName</key>
|
||||||
<string>AppIcon</string>
|
<string>AppIcon</string>
|
||||||
<key>CFBundleIdentifier</key>
|
<key>CFBundleIdentifier</key>
|
||||||
<string>com.garikme.CmdBar</string>
|
<string>com.rednera.CmdBar</string>
|
||||||
<key>CFBundleInfoDictionaryVersion</key>
|
<key>CFBundleInfoDictionaryVersion</key>
|
||||||
<string>6.0</string>
|
<string>6.0</string>
|
||||||
<key>CFBundleName</key>
|
<key>CFBundleName</key>
|
||||||
@@ -19,13 +19,13 @@
|
|||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>1.93</string>
|
<string>1.94.0</string>
|
||||||
<key>CFBundleSupportedPlatforms</key>
|
<key>CFBundleSupportedPlatforms</key>
|
||||||
<array>
|
<array>
|
||||||
<string>MacOSX</string>
|
<string>MacOSX</string>
|
||||||
</array>
|
</array>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>1.93</string>
|
<string>1.94.0</string>
|
||||||
<key>DTPlatformName</key>
|
<key>DTPlatformName</key>
|
||||||
<string>macosx</string>
|
<string>macosx</string>
|
||||||
<key>DTPlatformVersion</key>
|
<key>DTPlatformVersion</key>
|
||||||
@@ -40,5 +40,7 @@
|
|||||||
<true/>
|
<true/>
|
||||||
<key>NSPrincipalClass</key>
|
<key>NSPrincipalClass</key>
|
||||||
<string>NSApplication</string>
|
<string>NSApplication</string>
|
||||||
|
<key>NSHumanReadableCopyright</key>
|
||||||
|
<string>Copyright © 2026 Rednera. All rights reserved.</string>
|
||||||
</dict>
|
</dict>
|
||||||
</plist>
|
</plist>
|
||||||
|
|||||||
15
src/Makefile
15
src/Makefile
@@ -1,3 +1,6 @@
|
|||||||
|
APPLE_DEVELOPMENT := $(shell cat ../ids/APPLE_DEVELOPMENT)
|
||||||
|
APPLE_DEVELOPER_ID_APPLICATION := $(shell cat ../ids/APPLE_DEVELOPER_ID_APPLICATION)
|
||||||
|
|
||||||
# FLAGS = -g
|
# FLAGS = -g
|
||||||
FLAGS = -O
|
FLAGS = -O
|
||||||
MACOS_VERSION = 13.0
|
MACOS_VERSION = 13.0
|
||||||
@@ -75,15 +78,11 @@ $(EXEC).app: $(EXEC)
|
|||||||
cp Info.plist $@/Contents/ && \
|
cp Info.plist $@/Contents/ && \
|
||||||
cp resources/AppIcon.icns $@/Contents/Resources/ && \
|
cp resources/AppIcon.icns $@/Contents/Resources/ && \
|
||||||
cp $(EXEC) $@/Contents/MacOS/
|
cp $(EXEC) $@/Contents/MacOS/
|
||||||
# $(if $(DEBUG), codesign --entitlements Grapp.entitlements \
|
$(if $(DEBUG), codesign --entitlements $(EXEC).entitlements \
|
||||||
# -s ${APPLE_DEVELOPMENT} -f --timestamp -o runtime $(EXEC).app, \
|
-s ${APPLE_DEVELOPMENT} -f --timestamp -o runtime $(EXEC).app, \
|
||||||
# codesign -s ${APPLE_DEVELOPER_ID_APPLICATION} -f --timestamp \
|
codesign -s ${APPLE_DEVELOPER_ID_APPLICATION} -f --timestamp \
|
||||||
# -o runtime $(EXEC).app)
|
-o runtime $(EXEC).app)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf $(EXEC) $(EXEC).app arm64 x86_64
|
rm -rf $(EXEC) $(EXEC).app arm64 x86_64
|
||||||
mkdir -p arm64 x86_64
|
mkdir -p arm64 x86_64
|
||||||
|
|
||||||
clean-all: clean
|
|
||||||
$(MAKE) -C libs/Zip/Zip/minizip clean
|
|
||||||
$(MAKE) -C libs/Zip/Zip clean
|
|
||||||
|
|||||||
Reference in New Issue
Block a user