admin/noo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- build speed improved (-j4)

Browse Source 
- fix uploading
- version 0.9.2 is on the server
This commit is contained in:
dmytro.bogovych 2020-03-29 08:42:30 +03:00
parent 7ffdbcfee9
commit 6af105fe21
6 changed files with 26 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/build-number/build_number.h
View File

@ -1,2 +1,2 @@
// Auto generated file ! Please do not edit ! // Auto generated file ! Please do not edit !
#define APP_BUILD_NUMBER 53 #define APP_BUILD_NUMBER 54

35
redist/build_osx_qt5.sh
View File

@ -32,11 +32,11 @@ if [ "$MAKE_BUILD" = "YES" ]; then
QT_BINARY_DIR=/Users/anand/qt/5.12.2/clang_64/bin QT_BINARY_DIR=/Users/anand/qt/5.12.2/clang_64/bin
cd build cd build
QT_CMAKE_DIR=~/qt/5.12.2/clang_64/lib/cmake QT_CMAKE_DIR=~/qt/5.12.2/clang_64/lib/cmake
cmake .. -D Qt5Core_DIR=$QT_CMAKE_DIR/Qt5Core \ cmake .. -D Qt5Core_DIR=$QT_CMAKE_DIR/Qt5Core \
-D Qt5Widgets_DIR=$QT_CMAKE_DIR/Qt5Widgets \ -D Qt5Widgets_DIR=$QT_CMAKE_DIR/Qt5Widgets \
-D Qt5PrintSupport_DIR=$QT_CMAKE_DIR/Qt5PrintSupport \ -D Qt5PrintSupport_DIR=$QT_CMAKE_DIR/Qt5PrintSupport \
-D Qt5Network_DIR=$QT_CMAKE_DIR/Qt5Network \ -D Qt5Network_DIR=$QT_CMAKE_DIR/Qt5Network \
-D Qt5OpenGL_DIR=$QT_CMAKE_DIR/Qt5OpenGL \ -D Qt5OpenGL_DIR=$QT_CMAKE_DIR/Qt5OpenGL \
-D Qt5LinguistTools_DIR=$QT_CMAKE_DIR/Qt5LinguistTools -D Qt5LinguistTools_DIR=$QT_CMAKE_DIR/Qt5LinguistTools
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -44,7 +44,7 @@ if [ "$MAKE_BUILD" = "YES" ]; then
exit exit
fi fi
cmake --build . cmake --build . -j4
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "cmake build failed. Exiting." echo "cmake build failed. Exiting."
exit exit
@ -78,34 +78,31 @@ if [ "$MAKE_BUILD" = "YES" ]; then
DMGBUILD=Litt-osx-$version.dmg DMGBUILD=Litt-osx-$version.dmg
fi fi
exit
cd ../client
if [ "$PREPARE_PUBLISH" = "YES" ]; then if [ "$PREPARE_PUBLISH" = "YES" ]; then
# Updating release notes file & application cast file # 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 # Format cast file
xmllint -format ../site/LittAppCast.xml > ../site/LittAppCast2.xml xmllint -format site/LittAppCast.xml > site/LittAppCast2.xml
rm -rf ../site/LittAppCast.xml rm -rf site/LittAppCast.xml
mv ../site/LittAppCast2.xml ../site/LittAppCast.xml mv site/LittAppCast2.xml site/LittAppCast.xml
# Prepare index.html # Prepare index.html
# sed -i "s/Litt-osx.*\\.zip/$ZIPBUILD/g" ../site/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 # .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 fi
UPLOAD_ROLE=root@voipobjects.com UPLOAD_ROLE=root@voipobjects.com
if [ "$PUBLISH_BUILD" = "YES" ]; then if [ "$PUBLISH_BUILD" = "YES" ]; then
# Copy to server # Copy to server
echo Copying files... echo Copying files...
scp ../$DMGBUILD $UPLOAD_ROLE:/var/www/satorilight.com/public_html/downloads scp $DMGBUILD $UPLOAD_ROLE:/var/www/satorilight.com/public_html/downloads
# scp ../$ZIPBUILD uploader@voipobjects.com:/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/releasenotes.html $UPLOAD_ROLE:/var/www/satorilight.com/public_html
scp ../site/LittAppCast.xml $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 site/index.html $UPLOAD_ROLE:/var/www/satorilight.com/public_html
echo Modify symbol links... 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 # ssh uploader@voipobjects.com ln -s /var/www/satorilight.com/public_html/downloads/$ZIPBUILD /var/www/satorilight.com/public_html/downloads/litt-osx.zip

9
redist/changes.html
View File

@ -1,6 +1,3 @@
<p><b>Changes in version 0.9.1</b></p> <p><b>Changes in version 0.9.2</b></p>
<p> - rebuild with Qt 5.12 - native support Mojave dark mode</p> <p> - limited markdown support</p>
<p> - keychain support</p>
<p><b>Changes in version 0.8.16<b></p>
<p> - one more fixed bug in time interval removing.</p>

4
site/LittAppCast.xml
View File

@ -8,11 +8,11 @@
<atom:link href="http://satorilight.com/LittAppCast.xml" rel="self" type="application/rss+xml"/> <atom:link href="http://satorilight.com/LittAppCast.xml" rel="self" type="application/rss+xml"/>
<item> <item>
<title>Version 0.9.2</title> <title>Version 0.9.2</title>
<pubDate>Sun, 12 May 2019 17:19:50 +0000</pubDate> <pubDate>Sun, 29 Mar 2020 05:33:44 +0000</pubDate>
<guid isPermalink="true">http://satorilight.com/releasenotes.html</guid> <guid isPermalink="true">http://satorilight.com/releasenotes.html</guid>
<link>http://satorilight.com/releasenotes.html</link> <link>http://satorilight.com/releasenotes.html</link>
<sparkle:releaseNotesLink>http://satorilight.com/releasenotes.html</sparkle:releaseNotesLink> <sparkle:releaseNotesLink>http://satorilight.com/releasenotes.html</sparkle:releaseNotesLink>
<enclosure url="http://satorilight.com/downloads/Litt-osx-0.9.2.dmg" type="application/octet-stream" length="148703" fervor:platform="Q_OS_MAC" sparkle:version="0.9.2" sparkle:dsaSignature="0000000000"/> <enclosure url="http://satorilight.com/downloads/Litt-osx-0.9.2.dmg" type="application/octet-stream" length="13311780" fervor:platform="Q_OS_MAC" sparkle:version="0.9.2" sparkle:dsaSignature="0000000000"/>
</item> </item>
<item> <item>
<title>Version 0.9.1</title> <title>Version 0.9.1</title>

2
site/index.html
View File

@ -83,7 +83,7 @@
</div> </div>
<footer class="footer clearfix"> <footer class="footer clearfix">
<div class="copyright">(C) com.satorilight 2012 - 2018</div> <div class="copyright">(C) com.satorilight 2012 - 2020</div>
</footer> </footer>
</div> </div>

9
site/releasenotes.html
View File

@ -18,12 +18,9 @@
<body> <body>
<!-- begin version=0.9.2 --> <!-- begin version=0.9.2 -->
<p><b>Changes in version 0.9.1</b></p> <p><b>Changes in version 0.9.2</b></p>
<p> - rebuild with Qt 5.12 - native support Mojave dark mode</p> <p> - limited markdown support</p>
<p> - keychain support</p>
<p><b>Changes in version 0.8.16<b></p>
<p> - one more fixed bug in time interval removing.</p>
<!-- end version=0.9.2 --> <!-- end version=0.9.2 -->