Updating building to 2.2a

ovilab · Oct 29, 2017 · f37d9ca · f37d9ca
1 parent 13ce395
commit f37d9ca
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ script:
 after_success:
 - openssl aes-256-cbc -K $encrypted_082f9a3f227a_key -iv $encrypted_082f9a3f227a_iv
   -in .snapcraft/travis_snapcraft.cfg -out .snapcraft/snapcraft.cfg -d
-- tar czfv atomify-2.1.2-x86_64.tar.gz snapdump/*
+- tar czfv atomify-2.2a-x86_64.tar.gz snapdump/*
 deploy:
   - provider: script
     'on':
@@ -23,6 +23,6 @@ deploy:
   - provider: releases
     api_key:
       secure: Kkj9oAOkEpOIlDATOCMEsHzuqgsES+Qpf6quCQ+v40ti5ShjARQHKxXVNPVHxTq9JR1FBhX8d1vGgwPHZvv3lwtZ0dsJBGyjbKth0Us1TL2N2NvWaX7rc+CsTMduDsKPWfxnckMc9rfx4fHLDy4eYh8tfPVVOUBYPojX8V/mm8s=
-    file: "atomify-2.1.2-x86_64.tar.gz"
+    file: "atomify-2.2a-x86_64.tar.gz"
     on:
       tags: true
diff --git a/deploy/deploy_linux.sh b/deploy/deploy_linux.sh
@@ -21,4 +21,4 @@ cd deploy/atomify/
 cp -r ~/Qt/5.9.1/gcc_64/qml/QtQuick/Controls/* qml/QtQuick/Controls/
 
 cd ..
-tar -cvzf ../../atomify-2.1.2-linux-x86_64.tar.gz atomify
+tar -cvzf ../../atomify-2.2a-linux-x86_64.tar.gz atomify
diff --git a/deploy/macos/deploy_app_store.sh b/deploy/macos/deploy_app_store.sh
@@ -16,13 +16,13 @@ rm -rf pkg/*
 cp -r Atomify.app pkg
 cd pkg
 xattr -cr Atomify.app
-macdeployqt Atomify.app -dmg -qmldir=../../../../src/qml -codesign="3rd Party Mac Developer Application: Anders Hafreager" -appstore-compliant
+macdeployqt Atomify.app -dmg -qmldir=../../../../src/qml -codesign="3rd Party Mac Developer Application: Anders Hafreager (4XKET6P69R)" -appstore-compliant
 cd "Atomify.app"
 find . -name *.dSYM | xargs -I $ rm -R $
 cd ..
 cp ../Atomify.app/Contents/MacOS/atomify Atomify.app/Contents/MacOS/
 
-codesign -s "3rd Party Mac Developer Application: Anders Hafreager" --entitlements ../../../../macos/entitlements.plist Atomify.app
-productbuild --component Atomify.app /Applications --sign "3rd Party Mac Developer Installer: Anders Hafreager" Atomify.pkg
-macdeployqt Atomify.app -qmldir=../../../../src/qml -codesign="3rd Party Mac Developer Application: Anders Hafreager" -appstore-compliant
-productbuild --component Atomify.app /Applications --sign "3rd Party Mac Developer Installer: Anders Hafreager" Atomify.pkg
+codesign -s "3rd Party Mac Developer Application: Anders Hafreager (4XKET6P69R)" --entitlements ../../../../macos/entitlements.plist Atomify.app
+productbuild --component Atomify.app /Applications --sign "3rd Party Mac Developer Installer: Anders Hafreager (4XKET6P69R)" Atomify.pkg
+macdeployqt Atomify.app -qmldir=../../../../src/qml -codesign="3rd Party Mac Developer Application: Anders Hafreager (4XKET6P69R)" -appstore-compliant
+productbuild --component Atomify.app /Applications --sign "3rd Party Mac Developer Installer: Anders Hafreager (4XKET6P69R)" Atomify.pkg
diff --git a/deploy/macos/deploy_brew.sh b/deploy/macos/deploy_brew.sh
@@ -8,5 +8,5 @@ rm -rf .git
 cd src/examples
 rm -rf .git
 cd ../../..
-tar -czvf atomify-2.1.2-src.tar.gz atomify
-cp atomify-2.1.2-src.tar.gz ..
+tar -czvf atomify-2.2a-src.tar.gz atomify
+cp atomify-2.2a-src.tar.gz ..
diff --git a/deploy/macos/deploy_pkg.sh b/deploy/macos/deploy_pkg.sh
@@ -37,5 +37,5 @@ macdeployqt Atomify.app -dmg -qmldir=../../../../src/qml -codesign="Developer ID
 cd "Atomify.app"
 find . -name *.dSYM | xargs -I $ rm -R $
 cd ..
-productbuild --component Atomify.app /Applications --sign "Developer ID Installer: Anders Hafreager" Atomify-2.1.2-macos-installer.pkg
-cp Atomify-2.1.2-macos-installer.pkg ../../
+productbuild --component Atomify.app /Applications --sign "Developer ID Installer: Anders Hafreager" Atomify-2.2a-macos-installer.pkg
+cp Atomify-2.2a-macos-installer.pkg ../../
diff --git a/macos/macos.plist b/macos/macos.plist
@@ -17,7 +17,7 @@
         <key>CFBundlePackageType</key>
         <string>APPL</string>
         <key>CFBundleShortVersionString</key>
-        <string>2.1.2</string>
+        <string>2.2a</string>
         <key>CFBundleSignature</key>
         <string>????</string>
         <key>CFBundleVersion</key>

diff --git a/src/qml/desktop/MainDesktop.qml b/src/qml/desktop/MainDesktop.qml
@@ -127,10 +127,10 @@ Rectangle {
                         hoverEnabled: true
                         onHoveredChanged: {
                             if(containsMouse) {
-                                logoLabel.text = "Atomify<br>2.1.2"
+                                logoLabel.text = "Atomify<br>2.2a"
                                 root.title = "Caffeinify"
                             } else {
-                                logoLabel.text = "Atomify<br>2.1.2"
+                                logoLabel.text = "Atomify<br>2.2a"
                                 root.title = "Atomify"
                             }
                         }
@@ -150,7 +150,7 @@ Rectangle {
                     fontSizeMode: Text.Fit
                     height: 24
 
-                    text: "Atomify<br>2.1.2"
+                    text: "Atomify<br>2.2a"
                     horizontalAlignment: Text.AlignHCenter
                 }
             }

diff --git a/src/src.pro b/src/src.pro
@@ -5,7 +5,7 @@ DEFINES += LAMMPS_GZIP
 TARGET = atomify
 
 QT += qml quick widgets opengl openglextensions svg charts datavisualization
-DEFINES += ATOMIFYVERSION=\\\"2.1.2\\\"
+DEFINES += ATOMIFYVERSION=\\\"2.2a\\\"
 unix:!macx {
     QMAKE_CXXFLAGS += -fopenmp
     LIBS += -fopenmp