Skip to content

Commit 90bca42

Browse files
authored
Windows installer: fix version in window title (#878)
1 parent 0250d15 commit 90bca42

File tree

5 files changed

+13
-11
lines changed

5 files changed

+13
-11
lines changed

.github/workflows/pr-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ jobs:
160160
run: |
161161
VERSION_STRIPPED=$(sed "s/-.*//" <<< "${{ env.TAG_NAME }}")
162162
if [[ "$VERSION_STRIPPED" == "" ]]; then
163-
VERSION_STRIPPED=0.0.0
163+
VERSION_STRIPPED=5.2.50
164164
fi
165165
VERSION_MAJOR=$(cut -d. -f1 <<< "${VERSION_STRIPPED}")
166166
VERSION_MINOR=$(cut -d. -f2 <<< "${VERSION_STRIPPED}")

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ jobs:
135135
run: |
136136
VERSION_STRIPPED=$(sed "s/-.*//" <<< "${{ env.TAG_NAME }}")
137137
if [[ "$VERSION_STRIPPED" == "" ]]; then
138-
VERSION_STRIPPED=0.0.0
138+
VERSION_STRIPPED=5.2.50
139139
fi
140140
VERSION_MAJOR=$(cut -d. -f1 <<< "${VERSION_STRIPPED}")
141141
VERSION_MINOR=$(cut -d. -f2 <<< "${VERSION_STRIPPED}")

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ project(MediaWriter)
77
cmake_minimum_required(VERSION 3.17)
88

99
set(MEDIAWRITER_MAJOR_VERSION "5")
10-
set(MEDIAWRITER_MINOR_VERSION "0")
10+
set(MEDIAWRITER_MINOR_VERSION "2")
1111
# MICRO_VERSION >= 50 means a development version
1212
set(MEDIAWRITER_MICRO_VERSION "50")
1313
set(MEDIAWRITER_VERSION "${MEDIAWRITER_MAJOR_VERSION}.${MEDIAWRITER_MINOR_VERSION}.${MEDIAWRITER_MICRO_VERSION}")

dist/win/mediawriter.nsi

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ XPStyle on
66
# they show up in a few places.
77
# All the other settings can be tweaked by editing the !defines at the top of this script
88

9+
# These three must be defined from command line
10+
#!define VERSIONMAJOR
11+
#!define VERSIONMINOR
12+
#!define VERSIONBUILD
13+
914
!define APPNAME "Fedora Media Writer"
1015
!define /date CURRENTYEAR "%Y"
1116
!define COMPANYNAME "Fedora Project"
@@ -16,10 +21,6 @@ XPStyle on
1621
Name "${APPNAME}"
1722
Caption "${APPNAME} ${FULLVERSION}"
1823

19-
# These three must be defined from command line
20-
#!define VERSIONMAJOR
21-
#!define VERSIONMINOR
22-
#!define VERSIONBUILD
2324
# These will be displayed by the "Click here for support information" link in "Add/Remove Programs"
2425
# It is possible to use "mailto:" links in here to open the email client
2526

dist/win/mediawriter_native.nsi

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ XPStyle on
66
# they show up in a few places.
77
# All the other settings can be tweaked by editing the !defines at the top of this script
88

9+
# These three must be defined from command line
10+
#!define VERSIONMAJOR
11+
#!define VERSIONMINOR
12+
#!define VERSIONBUILD
13+
914
!define APPNAME "Fedora Media Writer"
1015
!define /date CURRENTYEAR "%Y"
1116
!define COMPANYNAME "Fedora Project"
@@ -16,10 +21,6 @@ XPStyle on
1621
Name "${APPNAME}"
1722
Caption "${APPNAME} ${FULLVERSION}"
1823

19-
# These three must be defined from command line
20-
#!define VERSIONMAJOR
21-
#!define VERSIONMINOR
22-
#!define VERSIONBUILD
2324
# These will be displayed by the "Click here for support information" link in "Add/Remove Programs"
2425
# It is possible to use "mailto:" links in here to open the email client
2526

0 commit comments

Comments
 (0)