Skip to content

Commit

Permalink
version updated 2.0.3-alpha3
Browse files Browse the repository at this point in the history
  • Loading branch information
Chunosov committed Feb 11, 2019
1 parent 24bac61 commit d5b10c5
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 13 deletions.
2 changes: 1 addition & 1 deletion release/history.json
Expand Up @@ -2,7 +2,7 @@
"history": [
{
"version": "2.0.3-alpha3",
"date": "?",
"date": "2019-02-11",
"changes": [
{
"text": "The start window with MRU, actions, tools and tips panels.",
Expand Down
4 changes: 2 additions & 2 deletions release/version.pri
Expand Up @@ -2,5 +2,5 @@

APP_VER_MAJOR=2
APP_VER_MINOR=0
APP_VER_PATCH=2
APP_VER_CODENAME=alpha2
APP_VER_PATCH=3
APP_VER_CODENAME=alpha3
13 changes: 9 additions & 4 deletions release/version.rc
@@ -1,7 +1,12 @@
// Seems Qt can't use several RC-files, so we have to mix version info and app icon setting.

// Setting the Application Icon (http://doc.qt.io/qt-5/appicon.html)
IDI_ICON1 ICON DISCARDABLE "../img/icon/icon_main_2.ico"

// Setting the Version Info
1 VERSIONINFO
PRODUCTVERSION 2,0,2,0
FILEVERSION 2,0,2,0
PRODUCTVERSION 2,0,3,0
FILEVERSION 2,0,3,0
FILEOS 0x4
FILETYPE 0
BEGIN
Expand All @@ -10,12 +15,12 @@ BEGIN
BLOCK "040904B0"
BEGIN
VALUE "CompanyName", "orion-project.org\0"
VALUE "FileVersion", "2.0.2.0\0"
VALUE "FileVersion", "2.0.3.0\0"
VALUE "InternalName", "rezonator\0"
VALUE "LegalCopyright", "Chunosov N.I. (c) 2006-2018\0"
VALUE "OriginalFilename", "rezonator.exe\0"
VALUE "ProductName", "rezonator\0"
VALUE "ProductVersion", "2.0.2.0\0"
VALUE "ProductVersion", "2.0.3.0\0"
END
END
BLOCK "VarFileInfo"
Expand Down
2 changes: 1 addition & 1 deletion release/version.txt
@@ -1 +1 @@
2.0.2-alpha2
2.0.3-alpha3
15 changes: 11 additions & 4 deletions scripts/make_package_linux.sh
Expand Up @@ -11,12 +11,19 @@ if [ ! -d out ]; then mkdir out; fi
cd out

# Download linuxdeplyqt if none
# https://github.com/probonopd/linuxdeployqt
LINUXDEPLOYQT=linuxdeployqt-continuous-x86_64.AppImage
# Download linuxdeplyqt if none (https://github.com/probonopd/linuxdeployqt)
# NOTE: It've broken compatibility with newer OS versions forsing to stick at Ubuntu 14 LTS.
# See discussion here: https://github.com/probonopd/linuxdeployqt/issues/340
# But I have nor a machine running Trusty or a wish to stick at Qt 5.5
# (the last supported for Trusty) so have to use a more relaxed 5th version of the tool.
#LINUXDEPLOYQT=linuxdeployqt-continuous-x86_64.AppImage
#LINUXDEPLOYQT_URL=https://github.com/probonopd/linuxdeployqt/releases/download/continuous/${LINUXDEPLOYQT}
LINUXDEPLOYQT=linuxdeployqt-5-x86_64.AppImage
LINUXDEPLOYQT_URL=https://github.com/probonopd/linuxdeployqt/releases/download/5/${LINUXDEPLOYQT}
if [ ! -f ${LINUXDEPLOYQT} ]; then
echo
echo "Downloading ${LINUXDEPLOYQT}..."
wget -c https://github.com/probonopd/linuxdeployqt/releases/download/continuous/${LINUXDEPLOYQT}
wget -c ${LINUXDEPLOYQT_URL}
chmod a+x ${LINUXDEPLOYQT}
if [ "${?}" != "0" ]; then exit 1; fi
fi
Expand All @@ -33,7 +40,7 @@ cp ../bin/rezonator AppDir/usr/bin
cp -r ../bin/examples AppDir/usr/bin
cp -r ../bin/test_files AppDir/usr/bin
cp ../release/rezonator.desktop AppDir/usr/share/applications
cp ../img/icon/icon_main_2_256.png AppDir/usr/share/icons/hicolor/256x256/apps/rezonator.png
cp ../img/icon/main_2_256.png AppDir/usr/share/icons/hicolor/256x256/apps/rezonator.png
if [ "${?}" != "0" ]; then exit 1; fi

# Run linuxdeplyqt on the AppDir
Expand Down
2 changes: 1 addition & 1 deletion src/ProjectWindow.cpp
Expand Up @@ -468,7 +468,7 @@ void ProjectWindow::actionHelpAbout()
auto text = tr(
"<p><font size=4><b>{app} {app_ver}</b></font>"
"<p>Built: {build_date}"
"<p>Copyright: Chunosov N.&nbsp;I. © 2006-2018"
"<p>Copyright: Chunosov N.&nbsp;I. © 2006-2019"
"<p>Web: <a href='{www}'>{www}</a>"
"<p>E-mail: <a href='mailto://{email}'>{email}</a>"
"<p>Credits: <a href='http://www.qcustomplot.com'>QCustomPlot</a>"
Expand Down

0 comments on commit d5b10c5

Please sign in to comment.