From 60c3ed3c546fc5e7a6054e94588d85549f6f1380 Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Wed, 2 Jan 2019 18:34:58 -0600 Subject: [PATCH 1/8] Make macOS .dmg use correct build number --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e9720a2..f25d3d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ script: before_deploy: - mv ${DEPLOY_DIR}/bin/spectral.dmg ./ -- sed -i -e "s/TRAVIS_BUILD_NUMBER/${TRAVIS_BUILD_NUMBER}/g" .ci/bintray-release.json +- sed -i -e "s/TRAVIS_BUILD_NUMBER/$(git rev-list --count HEAD)/g" .ci/bintray-release.json deploy: - provider: bintray From 446c9194bf05829eee4535e90dbdcbd21a2eb1c8 Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Wed, 2 Jan 2019 20:58:43 -0600 Subject: [PATCH 2/8] Set macOS Info.plist --- .gitignore | 3 +++ macOS/Info.plist | 24 ++++++++++++++++++++++++ spectral.pro | 3 +++ 3 files changed, 30 insertions(+) create mode 100644 .gitignore create mode 100644 macOS/Info.plist diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c1a50b2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +build + +.DS_Store \ No newline at end of file diff --git a/macOS/Info.plist b/macOS/Info.plist new file mode 100644 index 0000000..304f16d --- /dev/null +++ b/macOS/Info.plist @@ -0,0 +1,24 @@ + + + + + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIconFile + ${ASSETCATALOG_COMPILER_APPICON_NAME} + CFBundleIdentifier + ${PRODUCT_BUNDLE_IDENTIFIER} + CFBundleShortVersionString + ${QMAKE_FULL_VERSION} + CFBundleVersion + ${QMAKE_FULL_VERSION} + CFBundlePackageType + APPL + LSMinimumSystemVersion + 10.11 + NSPrincipalClass + NSApplication + NSSupportsAutomaticGraphicsSwitching + + + diff --git a/spectral.pro b/spectral.pro index 8c86282..f78e454 100644 --- a/spectral.pro +++ b/spectral.pro @@ -83,7 +83,10 @@ win32 { } mac { + QMAKE_TARGET_BUNDLE_PREFIX = org.eu.encom.spectral + VERSION = 0.0.$$system(git rev-list --count HEAD) ICON = assets/img/icon.icns + QMAKE_INFO_PLIST = macOS/Info.plist } HEADERS += \ From da7fb89c81a0b0b0e65849b0280961b764cd9a11 Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Wed, 2 Jan 2019 21:36:17 -0600 Subject: [PATCH 3/8] Set version number like major.minor.patch.build on macOS Qt is supposed to work with these kinds of version numbers but it doesn't seem to actually work for some reason http://doc.qt.io/qt-5/qmake-variable-reference.html#version. You should eventually be able to revert this commit (and remove the VERSION line) once there are version numbers set that are just major.minor.patch. --- macOS/Info.plist | 4 ++-- spectral.pro | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/macOS/Info.plist b/macOS/Info.plist index 304f16d..930df5f 100644 --- a/macOS/Info.plist +++ b/macOS/Info.plist @@ -9,9 +9,9 @@ CFBundleIdentifier ${PRODUCT_BUNDLE_IDENTIFIER} CFBundleShortVersionString - ${QMAKE_FULL_VERSION} + CFBundleVersion - ${QMAKE_FULL_VERSION} + CFBundlePackageType APPL LSMinimumSystemVersion diff --git a/spectral.pro b/spectral.pro index f78e454..4a0a121 100644 --- a/spectral.pro +++ b/spectral.pro @@ -84,7 +84,12 @@ win32 { mac { QMAKE_TARGET_BUNDLE_PREFIX = org.eu.encom.spectral - VERSION = 0.0.$$system(git rev-list --count HEAD) + + VERSION = 0.0.0.$$system(git rev-list --count HEAD) + INFO_PLIST_PATH = $$shell_quote($${OUT_PWD}/$${TARGET}.app/Contents/Info.plist) + QMAKE_POST_LINK += /usr/libexec/PlistBuddy -c \"Set :CFBundleVersion $${VERSION}\" $${INFO_PLIST_PATH} + QMAKE_POST_LINK += && /usr/libexec/PlistBuddy -c \"Set :CFBundleShortVersionString $${VERSION}\" $${INFO_PLIST_PATH} + ICON = assets/img/icon.icns QMAKE_INFO_PLIST = macOS/Info.plist } From c90e96072c842508e66bcd98b409946cfeae7cd3 Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Wed, 2 Jan 2019 21:40:36 -0600 Subject: [PATCH 4/8] Fix the CFBundleIdentifier --- spectral.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spectral.pro b/spectral.pro index 4a0a121..881e417 100644 --- a/spectral.pro +++ b/spectral.pro @@ -83,7 +83,7 @@ win32 { } mac { - QMAKE_TARGET_BUNDLE_PREFIX = org.eu.encom.spectral + QMAKE_TARGET_BUNDLE_PREFIX = org.eu.encom VERSION = 0.0.0.$$system(git rev-list --count HEAD) INFO_PLIST_PATH = $$shell_quote($${OUT_PWD}/$${TARGET}.app/Contents/Info.plist) From 40b8ca437a034bfae4e5ff12f77f8ac7b5c2cb7e Mon Sep 17 00:00:00 2001 From: Black Hat Date: Fri, 4 Jan 2019 10:16:24 +0000 Subject: [PATCH 5/8] Revert "Merge branch 'macos-build-number' into 'master'" This reverts merge request !34 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f25d3d6..e9720a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ script: before_deploy: - mv ${DEPLOY_DIR}/bin/spectral.dmg ./ -- sed -i -e "s/TRAVIS_BUILD_NUMBER/$(git rev-list --count HEAD)/g" .ci/bintray-release.json +- sed -i -e "s/TRAVIS_BUILD_NUMBER/${TRAVIS_BUILD_NUMBER}/g" .ci/bintray-release.json deploy: - provider: bintray From e7adc0098fbe92a92d13c23a4f6adec238d4cd49 Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Sat, 5 Jan 2019 17:06:09 -0600 Subject: [PATCH 6/8] Make macOS .dmg use correct build number, take 2 --- .travis.yml | 5 ++++- BUILD.md | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e9720a2..d029f53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ language: cpp +git: + depth: false + matrix: include: - os: osx @@ -17,7 +20,7 @@ script: before_deploy: - mv ${DEPLOY_DIR}/bin/spectral.dmg ./ -- sed -i -e "s/TRAVIS_BUILD_NUMBER/${TRAVIS_BUILD_NUMBER}/g" .ci/bintray-release.json +- sed -i -e "s/TRAVIS_BUILD_NUMBER/$(git rev-list --count HEAD)/g" .ci/bintray-release.json deploy: - provider: bintray diff --git a/BUILD.md b/BUILD.md index 874234e..04083a0 100644 --- a/BUILD.md +++ b/BUILD.md @@ -3,6 +3,7 @@ 1. Update Qt to v5.10+ brew install qt5 + brew link qt5 --force 2. Download Spectral source @@ -16,8 +17,8 @@ 4. Build Spectral - /usr/local/Cellar/qt5/5.10.1/bin/qmake - make + qmake ../spectral.pro + make -j4 5. Open Spectral From 11a4d37c37336b4c1b3138d55eed2f8384cd04b6 Mon Sep 17 00:00:00 2001 From: Aaron Raimist Date: Tue, 8 Jan 2019 17:34:52 -0600 Subject: [PATCH 7/8] Set Bintray version to be the same as the in app version This is needed for Homebrew Cask. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d029f53..7718dc2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ script: before_deploy: - mv ${DEPLOY_DIR}/bin/spectral.dmg ./ -- sed -i -e "s/TRAVIS_BUILD_NUMBER/$(git rev-list --count HEAD)/g" .ci/bintray-release.json +- sed -i -e "s/TRAVIS_BUILD_NUMBER/0.0.0.$(git rev-list --count HEAD)/g" .ci/bintray-release.json deploy: - provider: bintray From 69a240ec1d6ea4370e9def62a69747acf68a107c Mon Sep 17 00:00:00 2001 From: Black Hat Date: Wed, 1 May 2019 04:28:05 +0000 Subject: [PATCH 8/8] Update appdata. --- org.eu.encom.spectral.appdata.xml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/org.eu.encom.spectral.appdata.xml b/org.eu.encom.spectral.appdata.xml index e172c90..3c6d87d 100644 --- a/org.eu.encom.spectral.appdata.xml +++ b/org.eu.encom.spectral.appdata.xml @@ -13,18 +13,17 @@ Spectral is a glossy cross-platform client for Matrix, the decentralized communication protocol for instant messaging.

- The source code is generally available at https://gitlab.com/b0/spectral + The source code is available at https://gitlab.com/b0/spectral

https://gitlab.com/b0/spectral https://gitlab.com/b0/spectral/issues - https://doc.spectral.encom.eu.org + https://b0.gitlab.io/spectral-doc Matrix Internet - Qt Black Hat @@ -37,9 +36,17 @@ https://gitlab.com/b0/spectral/raw/master/screenshots/1.png - Room Config + Room Timeline https://gitlab.com/b0/spectral/raw/master/screenshots/2.png + + Room Config + https://gitlab.com/b0/spectral/raw/master/screenshots/3.png + + + Settings + https://gitlab.com/b0/spectral/raw/master/screenshots/4.png + @@ -48,6 +55,7 @@ +