Fix InnoSetup Version (#621)

jopohl · Feb 24, 2019 · 22b4fc9 · 22b4fc9
1 parent a0ff0e2
commit 22b4fc9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/data/azure-pipelines.yml b/data/azure-pipelines.yml
@@ -141,9 +141,7 @@ jobs:
     displayName: "Run PyInstaller"
 
   - script: |
-      choco install innosetup
-      python src/urh/version.py > C:\urh_version.txt
-      set /p URHVERSION=<C:\urh_version.txt
+      for /f %%i in ('python src/urh/version.py') do set URHVERSION=%%i
       iscc /dMyAppVersion=%URHVERSION% /dArch=$(python.arch) data/inno.iss
     condition: eq(variables['python.version'], '3.7')
     displayName: "Create setup.exe"

diff --git a/data/inno.iss b/data/inno.iss
@@ -16,7 +16,7 @@ DefaultDirName={pf}\Universal Radio Hacker
 DisableProgramGroupPage=yes
 LicenseFile=..\LICENSE
 OutputDir=..\dist
-OutputBaseFilename=Universal.Radio.Hacker-{#Arch}
+OutputBaseFilename=Universal.Radio.Hacker-{#MyAppVersion}-{#Arch}
 Compression=lzma2/ultra
 SolidCompression=yes
 

diff --git a/data/release.py b/data/release.py
@@ -1,3 +1,4 @@
+import fileinput
 import os
 import shutil
 import sys
@@ -46,8 +47,10 @@ def release():
     numbers[-1] = str(int(numbers[-1]) + 1)
     cur_version = ".".join(numbers)
 
-    with open(version_file, "w") as f:
-        f.write('VERSION = "{0}" \n'.format(cur_version))
+    for line in fileinput.input(version_file, inplace=True):
+        if line.startswith("VERSION"):
+            line = 'VERSION = "{0}" \n'.format(cur_version)
+        print(line, end='')
 
     # Publish new version number
     call(["git", "add", version_file])

diff --git a/src/urh/version.py b/src/urh/version.py
@@ -1 +1,5 @@
-VERSION = "2.5.6" 
+VERSION = "2.5.6"
+
+if __name__ == '__main__':
+    # To read out version easy on command line for InnoSetup
+    print(VERSION)