From 6af105fe21e193a9952df432ed58d61ec5706ee5 Mon Sep 17 00:00:00 2001 From: "dmytro.bogovych" Date: Sun, 29 Mar 2020 08:42:30 +0300 Subject: [PATCH] - build speed improved (-j4) - fix uploading - version 0.9.2 is on the server --- client/build-number/build_number.h | 2 +- redist/build_osx_qt5.sh | 35 ++++++++++++++---------------- redist/changes.html | 9 +++----- site/LittAppCast.xml | 4 ++-- site/index.html | 2 +- site/releasenotes.html | 9 +++----- 6 files changed, 26 insertions(+), 35 deletions(-) diff --git a/client/build-number/build_number.h b/client/build-number/build_number.h index 4c1053c..99a86df 100644 --- a/client/build-number/build_number.h +++ b/client/build-number/build_number.h @@ -1,2 +1,2 @@ // Auto generated file ! Please do not edit ! -#define APP_BUILD_NUMBER 53 \ No newline at end of file +#define APP_BUILD_NUMBER 54 \ No newline at end of file diff --git a/redist/build_osx_qt5.sh b/redist/build_osx_qt5.sh index 9e707a8..e24b59b 100755 --- a/redist/build_osx_qt5.sh +++ b/redist/build_osx_qt5.sh @@ -32,11 +32,11 @@ if [ "$MAKE_BUILD" = "YES" ]; then QT_BINARY_DIR=/Users/anand/qt/5.12.2/clang_64/bin cd build QT_CMAKE_DIR=~/qt/5.12.2/clang_64/lib/cmake - cmake .. -D Qt5Core_DIR=$QT_CMAKE_DIR/Qt5Core \ - -D Qt5Widgets_DIR=$QT_CMAKE_DIR/Qt5Widgets \ - -D Qt5PrintSupport_DIR=$QT_CMAKE_DIR/Qt5PrintSupport \ - -D Qt5Network_DIR=$QT_CMAKE_DIR/Qt5Network \ - -D Qt5OpenGL_DIR=$QT_CMAKE_DIR/Qt5OpenGL \ + cmake .. -D Qt5Core_DIR=$QT_CMAKE_DIR/Qt5Core \ + -D Qt5Widgets_DIR=$QT_CMAKE_DIR/Qt5Widgets \ + -D Qt5PrintSupport_DIR=$QT_CMAKE_DIR/Qt5PrintSupport \ + -D Qt5Network_DIR=$QT_CMAKE_DIR/Qt5Network \ + -D Qt5OpenGL_DIR=$QT_CMAKE_DIR/Qt5OpenGL \ -D Qt5LinguistTools_DIR=$QT_CMAKE_DIR/Qt5LinguistTools if [ $? -ne 0 ]; then @@ -44,7 +44,7 @@ if [ "$MAKE_BUILD" = "YES" ]; then exit fi - cmake --build . + cmake --build . -j4 if [ $? -ne 0 ]; then echo "cmake build failed. Exiting." exit @@ -78,34 +78,31 @@ if [ "$MAKE_BUILD" = "YES" ]; then DMGBUILD=Litt-osx-$version.dmg fi -exit - -cd ../client if [ "$PREPARE_PUBLISH" = "YES" ]; then # Updating release notes file & application cast file - ../redist/updater.py -v $version -d ../$DMGBUILD -r ../site/releasenotes.html -c ../redist/changes.html -a ../site/LittAppCast.xml + redist/updater.py -v $version -d $DMGBUILD -r site/releasenotes.html -c redist/changes.html -a site/LittAppCast.xml # Format cast file - xmllint -format ../site/LittAppCast.xml > ../site/LittAppCast2.xml - rm -rf ../site/LittAppCast.xml - mv ../site/LittAppCast2.xml ../site/LittAppCast.xml + xmllint -format site/LittAppCast.xml > site/LittAppCast2.xml + rm -rf site/LittAppCast.xml + mv site/LittAppCast2.xml site/LittAppCast.xml # Prepare index.html # sed -i "s/Litt-osx.*\\.zip/$ZIPBUILD/g" ../site/index.html # .bak modifier will produce backup file for index.html; it is neccessary for OS X - sed -i.bak "s/Litt-osx.*\\.dmg/$DMGBUILD/g" ../site/index.html + sed -i.bak "s/Litt-osx.*\\.dmg/$DMGBUILD/g" site/index.html fi UPLOAD_ROLE=root@voipobjects.com if [ "$PUBLISH_BUILD" = "YES" ]; then # Copy to server echo Copying files... - scp ../$DMGBUILD $UPLOAD_ROLE:/var/www/satorilight.com/public_html/downloads -# scp ../$ZIPBUILD uploader@voipobjects.com:/var/www/satorilight.com/public_html/downloads - scp ../site/releasenotes.html $UPLOAD_ROLE:/var/www/satorilight.com/public_html - scp ../site/LittAppCast.xml $UPLOAD_ROLE:/var/www/satorilight.com/public_html - scp ../site/index.html $UPLOAD_ROLE:/var/www/satorilight.com/public_html + scp $DMGBUILD $UPLOAD_ROLE:/var/www/satorilight.com/public_html/downloads + scp $ZIPBUILD $UPLOAD_ROLE:/var/www/satorilight.com/public_html/downloads + scp site/releasenotes.html $UPLOAD_ROLE:/var/www/satorilight.com/public_html + scp site/LittAppCast.xml $UPLOAD_ROLE:/var/www/satorilight.com/public_html + scp site/index.html $UPLOAD_ROLE:/var/www/satorilight.com/public_html echo Modify symbol links... # ssh uploader@voipobjects.com ln -s /var/www/satorilight.com/public_html/downloads/$ZIPBUILD /var/www/satorilight.com/public_html/downloads/litt-osx.zip diff --git a/redist/changes.html b/redist/changes.html index d8b454a..88bb274 100644 --- a/redist/changes.html +++ b/redist/changes.html @@ -1,6 +1,3 @@ -

Changes in version 0.9.1

-

- rebuild with Qt 5.12 - native support Mojave dark mode

- -

Changes in version 0.8.16

-

- one more fixed bug in time interval removing.

- +

Changes in version 0.9.2

+

- limited markdown support

+

- keychain support

diff --git a/site/LittAppCast.xml b/site/LittAppCast.xml index b4266ea..4aa1850 100644 --- a/site/LittAppCast.xml +++ b/site/LittAppCast.xml @@ -8,11 +8,11 @@ Version 0.9.2 - Sun, 12 May 2019 17:19:50 +0000 + Sun, 29 Mar 2020 05:33:44 +0000 http://satorilight.com/releasenotes.html http://satorilight.com/releasenotes.html http://satorilight.com/releasenotes.html - + Version 0.9.1 diff --git a/site/index.html b/site/index.html index c66e4e6..7e3da92 100644 --- a/site/index.html +++ b/site/index.html @@ -83,7 +83,7 @@
-
(C) com.satorilight 2012 - 2018
+
(C) com.satorilight 2012 - 2020
diff --git a/site/releasenotes.html b/site/releasenotes.html index 212a95e..19ca624 100644 --- a/site/releasenotes.html +++ b/site/releasenotes.html @@ -18,12 +18,9 @@ -

Changes in version 0.9.1

-

- rebuild with Qt 5.12 - native support Mojave dark mode

- -

Changes in version 0.8.16

-

- one more fixed bug in time interval removing.

- +

Changes in version 0.9.2

+

- limited markdown support

+

- keychain support