Skip to content

Commit ea1d59b

Browse files
committed
Minor build system cleanups
1 parent 6246d25 commit ea1d59b

5 files changed

Lines changed: 6 additions & 10 deletions

File tree

‎.gitignore‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ Release/*
3030
WatchFlower.xcodeproj/*
3131
asset_catalog_compiler.Info.plist
3232

33-
# XCode signatures
34-
assets/ios/ios_signature.pri
35-
assets/macos/macos_signature.pri
36-
3733
# Others
3834
stash/*
3935
.DS_Store

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ qt_add_translations(${CMAKE_PROJECT_NAME}
210210

211211
################################################################################
212212

213-
# 'Other Files" macro
213+
# "Other Files" macro
214214
function(add_other_files target)
215215
foreach(file IN LISTS ARGN)
216216
target_sources(${target} PRIVATE ${file})

‎assets/android/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ buildscript {
66

77
dependencies {
88
//noinspection AndroidGradlePluginVersion
9-
classpath 'com.android.tools.build:gradle:8.6.1' // works with Qt 6.8+ // Java 17
109
//classpath 'com.android.tools.build:gradle:8.10.1' // works with Qt 6.10+ // Java 17
10+
classpath 'com.android.tools.build:gradle:8.6.1' // works with Qt 6.8+ // Java 17
1111
}
1212
}
1313

@@ -86,7 +86,7 @@ android {
8686
ndk.abiFilters = qtTargetAbiList.split(",")
8787

8888
namespace 'com.emeric.watchflower'
89-
versionName "6.0"
89+
versionName '6.0'
9090
versionCode timestampInt
9191
manifestPlaceholders = [versionName: versionName, versionCode: versionCode]
9292
}

‎assets/macos/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<string>NSApplication</string>
3737

3838
<key>NSHumanReadableCopyright</key>
39-
<string>Copyright Emeric Grange 2025</string>
39+
<string>Copyright Emeric Grange 2026</string>
4040

4141
<key>NSHighResolutionCapable</key>
4242
<true/>

‎deploy_macos.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ if [[ $use_contribs = true ]] ; then
5757
export LD_LIBRARY_PATH=$(pwd)/contribs/src/env/macOS_x86_64/usr/lib/:$(pwd)/contribs/src/env/macOS_arm64/usr/lib/:$LD_LIBRARY_PATH
5858
fi
5959

60-
# only if we are on a GitHub Action server, because this remove the plugins from the Qt directory
6160
if [[ -n "${QT_ROOT_DIR:-}" ]]; then
6261
# cleanup undeployable Qt plugins (present, but missing their own dependencies)
62+
# only if we are on a GitHub Action server, because this remove the plugins from the Qt directory
6363
echo '---- Remove undeployable Qt plugins'
6464
sudo rm $QT_ROOT_DIR/plugins/position/libqtposition_nmea.dylib
6565
sudo rm $QT_ROOT_DIR/plugins/sqldrivers/libqsqlmimer.dylib
@@ -80,7 +80,7 @@ fi
8080
## APP DEPLOY ##################################################################
8181

8282
echo '---- Running macdeployqt'
83-
if [[ $notarize_bundle = true ]] ; then
83+
if [[ $notarize_bundle = true && -n "${MACOS_CERTIFICATE_NAME:-}" ]] ; then
8484
macdeployqt bin/$APP_NAME.app -qmldir=qml/ -hardened-runtime -timestamp -appstore-compliant -codesign=$MACOS_CERTIFICATE_NAME
8585
else
8686
macdeployqt bin/$APP_NAME.app -qmldir=qml/

0 commit comments

Comments
 (0)