Permalink
Browse files

Merge pull request #143 from stefanha/per-target-file-cleanups

There are several per-target (Wahjam, jammr, etc) files that can be
eliminated by autogenerating them instead. Doing so reduces the number
of boilerplate files that need to be maintained. For example, it removes
the need to update a hardcoded version number in the macOS Info.plist
file for each release.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
  • Loading branch information...
stefanha committed Dec 10, 2016
2 parents 9b54ef2 + 809937d commit 6e7b4a3faf587d9c824fe724427eded00e86672b
Showing with 9 additions and 29 deletions.
  1. +3 −3 qtclient/{Info.plist-jammr → Info.plist}
  2. +0 −22 qtclient/Info.plist-wahjam
  3. +0 −1 qtclient/jammr.rc
  4. +6 −3 qtclient/qtclient.pro
@@ -9,14 +9,14 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleGetInfoString</key>
<string>1.2.4</string>
<string>@FULL_VERSION@</string>
<key>CFBundleShortVersionString</key>
<string>1.2.4</string>
<string>@FULL_VERSION@</string>
<key>CFBundleSignature</key>
<string>@TYPEINFO@</string>
<key>CFBundleExecutable</key>
<string>@EXECUTABLE@</string>
<key>CFBundleIdentifier</key>
<string>net.jammr.@EXECUTABLE@</string>
<string>@BUNDLEIDENTIFIER@</string>
</dict>
</plist>
View

This file was deleted.

Oops, something went wrong.
View

This file was deleted.

Oops, something went wrong.
View
@@ -67,14 +67,17 @@ LIBS += -lportmidi
}
win32 {
exists($${TARGET}.rc) {
RC_FILE = $${TARGET}.rc
exists($${TARGET}.ico) {
RC_ICONS = $${TARGET}.ico
}
}
mac {
LIBS += -framework Foundation -framework AudioUnit -framework AppKit
QMAKE_INFO_PLIST = Info.plist-$${TARGET}
QMAKE_TARGET_BUNDLE_PREFIX = $$split(ORGDOMAIN, .)
QMAKE_TARGET_BUNDLE_PREFIX = $$reverse(QMAKE_TARGET_BUNDLE_PREFIX)
QMAKE_TARGET_BUNDLE_PREFIX = $$join(QMAKE_TARGET_BUNDLE_PREFIX, .)
QMAKE_INFO_PLIST = Info.plist
exists($${TARGET}.icns) {
ICON = $${TARGET}.icns

0 comments on commit 6e7b4a3

Please sign in to comment.