[Winmerge-svn] SF.net SVN: winmerge:[7367] trunk/Tools/Scripts/create_release.py

[<ki...@us...>]

Revision: 7367
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7367&view=rev
Author:   kimmov
Date:     2010-10-27 18:36:46 +0000 (Wed, 27 Oct 2010)

Log Message:
-----------
BuildScript: Fix creating InnoSetup installer.

Need to CD to InnoSetup installer file's folder before building the installer.

Modified Paths:
--------------
    trunk/Tools/Scripts/create_release.py

Modified: trunk/Tools/Scripts/create_release.py
===================================================================
--- trunk/Tools/Scripts/create_release.py	2010-10-27 18:12:07 UTC (rev 7366)
+++ trunk/Tools/Scripts/create_release.py	2010-10-27 18:36:46 UTC (rev 7367)
@@ -325,15 +325,15 @@
 
     innosetup_exe = os.path.join(prog.innosetup_path, 'iscc.exe')
     cur_path = os.getcwd()
+    os.chdir('Installer/InnoSetup')
 
-    winmerge_iss_path = os.path.join(cur_path, 'Installer\\InnoSetup\\WinMerge.iss')
-
     #output_switch = '/O"' + target_folder + '"'
 
     print 'Build Innosetup installer...'
     # Should be able to give folder for created file and Q switch to make build quiet
     #call([innosetup_exe, '/Q', output_switch, winmerge_iss])
-    call([innosetup_exe, winmerge_iss_path])
+    call([innosetup_exe, 'WinMerge.iss'])
+    os.chdir(cur_path)
 
 def get_and_create_bin_folder(dist_folder, folder):
     """Formats and creates binary distribution folder."""
@@ -436,6 +436,13 @@
         print vs_cmd
         print 'Please check script configuration.'
         return False
+    
+    innosetup_exe = os.path.join(prog.innosetup_path, 'iscc.exe')
+    if not os.path.exists(innosetup_exe):
+        print 'InnoSetup executable could not be found from:'
+        print innosetup_exe
+        print 'Please check script configuration.'
+        return False
 
     pathhhc = os.path.join(root_path, 'Docs/Users/Manual/build/hhc/hhc.exe')
     folderdtd = os.path.join(root_path, 'Docs/Users/Manual/build/dtd')


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