[OMPT-svn-commit] SF.net SVN: modplug:[4777] trunk/OpenMPT

[<sag...@us...>]

Revision: 4777
          http://sourceforge.net/p/modplug/code/4777
Author:   saga-games
Date:     2015-02-21 01:06:22 +0000 (Sat, 21 Feb 2015)
Log Message:
-----------
[Mod] Make installer generation scripts a bit more reliable.

Modified Paths:
--------------
    trunk/OpenMPT/build/auto/build_openmpt_release_packages.py
    trunk/OpenMPT/installer/install.iss
    trunk/OpenMPT/mptrack/manual_generator/wiki.py

Modified: trunk/OpenMPT/build/auto/build_openmpt_release_packages.py
===================================================================
--- trunk/OpenMPT/build/auto/build_openmpt_release_packages.py	2015-02-20 12:45:18 UTC (rev 4776)
+++ trunk/OpenMPT/build/auto/build_openmpt_release_packages.py	2015-02-21 01:06:22 UTC (rev 4777)
@@ -3,7 +3,7 @@
 # http://openmpt.org/
 # Requires pywin32 (https://sourceforge.net/projects/pywin32/)
 
-from win32api import GetFileVersionInfo, LOWORD, HIWORD
+from win32api import GetFileVersionInfo
 from subprocess import Popen
 from sys import executable
 import os, shutil, hashlib
@@ -70,6 +70,8 @@
 copy_other(openmpt_zip_64bit_path, openmpt_version_short)
 
 pManual.communicate()
+if(pManual.returncode != 0):
+    raise Exception("Something went wrong during manual creation!")
 
 print("Creating zip files and installers...")
 p7z32 = Popen(["C:\\Program Files\\7-Zip\\7z.exe", "a", "-tzip", "-mx=9", "../" + openmpt_version_name + ".zip", openmpt_version_name + "/"], cwd=openmpt_zip_32bit_basepath)
@@ -82,7 +84,7 @@
 pInno64.communicate()
 
 if(p7z32.returncode != 0 or p7z64.returncode != 0 or pInno32.returncode != 0 or pInno64.returncode != 0):
-    raise error("Something went wrong during packaging!")
+    raise Exception("Something went wrong during packaging!")
 
 def hash_file(filename):
     md5 = hashlib.md5()

Modified: trunk/OpenMPT/installer/install.iss
===================================================================
--- trunk/OpenMPT/installer/install.iss	2015-02-20 12:45:18 UTC (rev 4776)
+++ trunk/OpenMPT/installer/install.iss	2015-02-21 01:06:22 UTC (rev 4777)
@@ -7,9 +7,9 @@
 ; win32.iss - For generating the standard Win32 setup.
 ; win64.iss - For generating the standard Win64 setup.
 ; install-unmo3-free-itd.iss - For generating the unmo3-free setup with InnoTools Downloader.
-; install-unmo3-free.iss - For generating the unmo3-free setup with ISTool downloader.
+; install-unmo3-free.iss - For generating the unmo3-free setup with Inno Download Plugin.
 
-#define GetAppVersion StringChange(GetFileProductVersion("..\bin\Win32\mptrack.exe"), ",", ".")
+#define GetAppVersion StringChange(GetFileProductVersion("..\bin\" + PlatformFolder + "\mptrack.exe"), ",", ".")
 #define GetAppVersionShort Copy(GetAppVersion, 1, 4)
 
 #ifndef PlatformName

Modified: trunk/OpenMPT/mptrack/manual_generator/wiki.py
===================================================================
--- trunk/OpenMPT/mptrack/manual_generator/wiki.py	2015-02-20 12:45:18 UTC (rev 4776)
+++ trunk/OpenMPT/mptrack/manual_generator/wiki.py	2015-02-21 01:06:22 UTC (rev 4777)
@@ -158,7 +158,8 @@
 """)
 toc.close()
 
-subprocess.call(['htmlhelp/hhc.exe', '"html/OpenMPT Manual.hhp"'])
+if(subprocess.call(['htmlhelp/hhc.exe', '"html/OpenMPT Manual.hhp"']) != 1):
+    raise Exception("Something went wrong during manual creation!")
 try:
     os.remove('../../packageTemplate/html/OpenMPT Manual.chm')
 except OSError:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.