Skip to content

Commit 063616d

Browse files
lucydodolucydodo
committed
build: use new icon, naming for macOS nightly builds
Reference: sqlitebrowser#3339
1 parent ca257ff commit 063616d

File tree

6 files changed

+160
-10
lines changed

6 files changed

+160
-10
lines changed

‎LICENSE-PLUGINS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,10 @@ NonCommercial Share Alike 4.0
6969
http://creativecommons.org/licenses/by-nc-sa/4.0/
7070
Check https://codefisher.org/pastel-svg/ for clarification.
7171

72+
The construction emoji for the icon used in the nightly version come
73+
from the OpenMoji under CC BY-SA 4.0 license.
74+
Check https://openmoji.org/library/emoji-1F6A7/ and
75+
https://openmoji.org/faq/ for clarification.
76+
7277
Some icons might have other open licenses, check history of the files
7378
under `src/icons`.

‎images/logo-nightly.png

18.5 KB
Loading

‎images/logo-nightly.svg

Lines changed: 117 additions & 0 deletions
Loading

‎installer/macos/build_sqlitebrowser_nightly-arm64.sh

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,13 @@ for i in ar zh_CN zh_TW cs en fr de it ko pl pt pt_BR ru es uk; do
134134
done
135135

136136
# Add the icon file
137-
cp installer/macos/macapp.icns build/DB\ Browser\ for\ SQLite.app/Contents/Resources/ >>$LOG 2>&1
138-
/usr/libexec/PlistBuddy -c "Set :CFBundleIconFile macapp.icns" build/DB\ Browser\ for\ SQLite.app/Contents/Info.plist >>$LOG 2>&1
137+
if [ "${NIGHTLY}" = "1" ]; then
138+
cp installer/macos/macapp-nightly.icns build/DB\ Browser\ for\ SQLite.app/Contents/Resources/ >>$LOG 2>&1
139+
/usr/libexec/PlistBuddy -c "Set :CFBundleIconFile macapp-nightly.icns" build/DB\ Browser\ for\ SQLite.app/Contents/Info.plist >>$LOG 2>&1
140+
else
141+
cp installer/macos/macapp.icns build/DB\ Browser\ for\ SQLite.app/Contents/Resources/ >>$LOG 2>&1
142+
/usr/libexec/PlistBuddy -c "Set :CFBundleIconFile macapp.icns" build/DB\ Browser\ for\ SQLite.app/Contents/Info.plist >>$LOG 2>&1
143+
fi
139144

140145
# Sign the manually added extensions. Needs to be done prior to the ".app signing" bit below, as that doesn't seem to sign these... which results in notarisation failure later on
141146
codesign --sign "${DEV_ID}" --verbose --deep --force --keychain "/Library/Keychains/System.keychain" --options runtime --timestamp build/DB\ Browser\ for\ SQLite.app/Contents/Extensions/fileio.dylib >>$LOG 2>&1
@@ -233,8 +238,13 @@ for i in ar zh_CN zh_TW cs en fr de it ko pl pt pt_BR ru es uk; do
233238
done
234239

235240
# Add the icon file
236-
cp installer/macos/macapp.icns build/DB\ Browser\ for\ SQLite.app/Contents/Resources/ >>$LOG 2>&1
237-
/usr/libexec/PlistBuddy -c "Set :CFBundleIconFile macapp.icns" build/DB\ Browser\ for\ SQLite.app/Contents/Info.plist >>$LOG 2>&1
241+
if [ "${NIGHTLY}" = "1" ]; then
242+
cp installer/macos/macapp-nightly.icns build/DB\ Browser\ for\ SQLite.app/Contents/Resources/ >>$LOG 2>&1
243+
/usr/libexec/PlistBuddy -c "Set :CFBundleIconFile macapp-nightly.icns" build/DB\ Browser\ for\ SQLite.app/Contents/Info.plist >>$LOG 2>&1
244+
else
245+
cp installer/macos/macapp.icns build/DB\ Browser\ for\ SQLite.app/Contents/Resources/ >>$LOG 2>&1
246+
/usr/libexec/PlistBuddy -c "Set :CFBundleIconFile macapp.icns" build/DB\ Browser\ for\ SQLite.app/Contents/Info.plist >>$LOG 2>&1
247+
fi
238248

239249
# Sign the manually added extensions. Needs to be done prior to the ".app signing" bit below, as that doesn't seem to sign these... which results in notarisation failure later on
240250
codesign --sign "${DEV_ID}" --verbose --deep --force --keychain "/Library/Keychains/System.keychain" --options runtime --timestamp build/DB\ Browser\ for\ SQLite.app/Contents/Extensions/fileio.dylib >>$LOG 2>&1
@@ -245,7 +255,11 @@ codesign --sign "${DEV_ID}" --verbose --deep --force --keychain "/Library/Keycha
245255
codesign --sign "${DEV_ID}" --verbose --deep --force --keychain "/Library/Keychains/System.keychain" --options runtime --timestamp build/DB\ Browser\ for\ SQLite.app >>$LOG 2>&1
246256

247257
# Make a .dmg file from the .app
248-
mv build/DB\ Browser\ for\ SQLite.app $HOME/appdmg/ >>$LOG 2>&1
258+
if [ "${NIGHTLY}" = "1" ]; then
259+
mv build/DB\ Browser\ for\ SQLite.app $HOME/appdmg/DB\ Browser\ for\ SQLite\ Nightly.app >>$LOG 2>&1
260+
else
261+
mv build/DB\ Browser\ for\ SQLite.app $HOME/appdmg/ >>$LOG 2>&1
262+
fi
249263
cd $HOME/appdmg >>$LOG 2>&1
250264
appdmg --quiet nightly.json DB\ Browser\ for\ SQLite-sqlcipher-arm64_${DATE}.dmg >>$LOG 2>&1
251265
codesign --sign "${DEV_ID}" --verbose --keychain "/Library/Keychains/System.keychain" --options runtime --timestamp DB\ Browser\ for\ SQLite-sqlcipher-arm64_${DATE}.dmg >>$LOG 2>&1

‎installer/macos/build_sqlitebrowser_nightly-intel.sh

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,13 @@ for i in ar zh_CN zh_TW cs en fr de it ko pl pt ru es uk; do
135135
done
136136

137137
# Add the icon file
138-
cp installer/macos/macapp.icns build/DB\ Browser\ for\ SQLite.app/Contents/Resources/ >>$LOG 2>&1
139-
/usr/libexec/PlistBuddy -c "Set :CFBundleIconFile macapp.icns" build/DB\ Browser\ for\ SQLite.app/Contents/Info.plist >>$LOG 2>&1
138+
if [ "${NIGHTLY}" = "1" ]; then
139+
cp installer/macos/macapp-nightly.icns build/DB\ Browser\ for\ SQLite.app/Contents/Resources/ >>$LOG 2>&1
140+
/usr/libexec/PlistBuddy -c "Set :CFBundleIconFile macapp-nightly.icns" build/DB\ Browser\ for\ SQLite.app/Contents/Info.plist >>$LOG 2>&1
141+
else
142+
cp installer/macos/macapp.icns build/DB\ Browser\ for\ SQLite.app/Contents/Resources/ >>$LOG 2>&1
143+
/usr/libexec/PlistBuddy -c "Set :CFBundleIconFile macapp.icns" build/DB\ Browser\ for\ SQLite.app/Contents/Info.plist >>$LOG 2>&1
144+
fi
140145

141146
# Sign the manually added extensions. Needs to be done prior to the ".app signing" bit below, as that doesn't seem to sign these... which results in notarisation failure later on
142147
codesign --sign "${DEV_ID}" --verbose --deep --force --keychain "/Library/Keychains/System.keychain" --options runtime --timestamp build/DB\ Browser\ for\ SQLite.app/Contents/Extensions/fileio.dylib >>$LOG 2>&1
@@ -252,8 +257,13 @@ for i in ar zh_CN zh_TW cs en fr de it ko pl pt ru es uk; do
252257
done
253258

254259
# Add the icon file
255-
cp installer/macos/macapp.icns build/DB\ Browser\ for\ SQLite.app/Contents/Resources/ >>$LOG 2>&1
256-
/usr/libexec/PlistBuddy -c "Set :CFBundleIconFile macapp.icns" build/DB\ Browser\ for\ SQLite.app/Contents/Info.plist >>$LOG 2>&1
260+
if [ "${NIGHTLY}" = "1" ]; then
261+
cp installer/macos/macapp-nightly.icns build/DB\ Browser\ for\ SQLite.app/Contents/Resources/ >>$LOG 2>&1
262+
/usr/libexec/PlistBuddy -c "Set :CFBundleIconFile macapp-nightly.icns" build/DB\ Browser\ for\ SQLite.app/Contents/Info.plist >>$LOG 2>&1
263+
else
264+
cp installer/macos/macapp.icns build/DB\ Browser\ for\ SQLite.app/Contents/Resources/ >>$LOG 2>&1
265+
/usr/libexec/PlistBuddy -c "Set :CFBundleIconFile macapp.icns" build/DB\ Browser\ for\ SQLite.app/Contents/Info.plist >>$LOG 2>&1
266+
fi
257267

258268
# Sign the manually added extensions. Needs to be done prior to the ".app signing" bit below, as that doesn't seem to sign these... which results in notarisation failure later on
259269
codesign --sign "${DEV_ID}" --verbose --deep --force --keychain "/Library/Keychains/System.keychain" --options runtime --timestamp build/DB\ Browser\ for\ SQLite.app/Contents/Extensions/fileio.dylib >>$LOG 2>&1
@@ -264,7 +274,11 @@ codesign --sign "${DEV_ID}" --verbose --deep --force --keychain "/Library/Keycha
264274
codesign --sign "${DEV_ID}" --verbose --deep --force --keychain "/Library/Keychains/System.keychain" --options runtime --timestamp build/DB\ Browser\ for\ SQLite.app >>$LOG 2>&1
265275

266276
# Make a .dmg file from the .app
267-
mv build/DB\ Browser\ for\ SQLite.app $HOME/appdmg/ >>$LOG 2>&1
277+
if [ "${NIGHTLY}" = "1" ]; then
278+
mv build/DB\ Browser\ for\ SQLite.app $HOME/appdmg/DB\ Browser\ for\ SQLite\ Nightly.app >>$LOG 2>&1
279+
else
280+
mv build/DB\ Browser\ for\ SQLite.app $HOME/appdmg/ >>$LOG 2>&1
281+
fi
268282
cd $HOME/appdmg >>$LOG 2>&1
269283
appdmg --quiet nightly.json DB\ Browser\ for\ SQLite-sqlcipher-intel_${DATE}.dmg >>$LOG 2>&1
270284
codesign --sign "${DEV_ID}" --verbose --keychain "/Library/Keychains/System.keychain" --options runtime --timestamp DB\ Browser\ for\ SQLite-sqlcipher-intel_${DATE}.dmg >>$LOG 2>&1

‎installer/macos/macapp-nightly.icns

259 KB
Binary file not shown.

0 commit comments

Comments
 (0)