winmerge-svn

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

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

Revision: 7204
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7204&view=rev
Author:   kimmov
Date:     2010-06-19 13:00:23 +0000 (Sat, 19 Jun 2010)

Log Message:
-----------
Fix typo in release script.

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

Modified: trunk/Tools/Scripts/create_release.py
===================================================================
--- trunk/Tools/Scripts/create_release.py	2010-06-19 12:52:04 UTC (rev 7203)
+++ trunk/Tools/Scripts/create_release.py	2010-06-19 13:00:23 UTC (rev 7204)
@@ -81,7 +81,7 @@
 import os
 import os.path
 import sys
-simport optparse
+import optparse
 import shutil
 import SetVersions
 import ToolSettings


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

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

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

Revision: 7255
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7255&view=rev
Author:   kimmov
Date:     2010-09-13 18:11:18 +0000 (Mon, 13 Sep 2010)

Log Message:
-----------
Buildscript: Update project/solution files before building.

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

Modified: trunk/Tools/Scripts/create_release.py
===================================================================
--- trunk/Tools/Scripts/create_release.py	2010-09-13 17:35:27 UTC (rev 7254)
+++ trunk/Tools/Scripts/create_release.py	2010-09-13 18:11:18 UTC (rev 7255)
@@ -85,6 +85,7 @@
 import shutil
 import SetVersions
 import ToolSettings
+import UpgradeProjects
 
 # global settings class instance
 prog = ToolSettings.ToolSettings()
@@ -494,6 +495,13 @@
     else:
         return True
 
+def update_project_files(root_path):
+    '''Upgrade project/solution files for the VS version used.'''
+
+    print 'Update VS project/solution files for used VS version...'
+    UpgradeProjects.tools.read_ini('Tools.ini')
+    UpgradeProjects.upgrade_projects(root_path)
+
 def main(argv):
     global prog
     ver_file = ''
@@ -511,7 +519,7 @@
 
     if options.version:
         prog_version = options.version
-        print 'Start building Frhed release version ' + prog_version
+        print 'Start building WinMerge release version ' + prog_version
 
     if options.cleanup:
         if cleanup_build() == True:
@@ -584,6 +592,8 @@
     if setup_translations() == False:
         sys.exit(1)
 
+    update_project_files(root_path)
+
     if build_targets() == False:
         sys.exit(1)
     build_manual()


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

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

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

Revision: 7256
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7256&view=rev
Author:   kimmov
Date:     2010-09-13 18:27:49 +0000 (Mon, 13 Sep 2010)

Log Message:
-----------
Buildscript: Don't build ANSI targets as we are not distributing them anymore.

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

Modified: trunk/Tools/Scripts/create_release.py
===================================================================
--- trunk/Tools/Scripts/create_release.py	2010-09-13 18:11:18 UTC (rev 7255)
+++ trunk/Tools/Scripts/create_release.py	2010-09-13 18:27:49 UTC (rev 7256)
@@ -113,12 +113,6 @@
         print 'Skipping folder %s' % winmerge_temp
     
     try:
-        print 'Remove ANSI files'
-        if os.path.exists('build/mergerelease/WinMerge.exe'):
-            os.remove('build/mergerelease/WinMerge.exe')
-        if os.path.exists('build/mergerelease/MergeLang.dll'):
-            os.remove('build/mergerelease/MergeLang.dll')
-
         print 'Remove Unicode files'
         if os.path.exists('build/mergeunicoderelease/WinMergeU.exe'):
             os.remove('build/mergeunicoderelease/WinMergeU.exe')
@@ -132,16 +126,12 @@
         print 'Remove expat files'
         if os.path.exists('build/expat'):
             shutil.rmtree('build/expat', True)
-        if os.path.exists('build/mergerelease/libexpat.dll'):
-            os.remove('build/mergerelease/libexpat.dll')
         if os.path.exists('build/mergeunicoderelease/libexpat.dll'):
             os.remove('build/mergeunicoderelease/libexpat.dll')
 
         print 'Remove pcre files'
         if os.path.exists('build/pcre'):
             shutil.rmtree('build/pcre', True)
-        if os.path.exists('build/mergerelease/pcre.dll'):
-            os.remove('build/mergerelease/pcre.dll')
         if os.path.exists('build/mergeunicoderelease/pcre.dll'):
             os.remove('build/mergeunicoderelease/pcre.dll')
 
@@ -266,9 +256,7 @@
     """Builds all WinMerge targets."""
 
     build_libraries()
-
     vs_cmd = get_vs_ide_bin()
-
     ret = build_winmerge(vs_cmd)
     if ret:
         ret = build_shellext(vs_cmd)
@@ -282,15 +270,9 @@
     #print sol_path
 
     # devenv Src\Merge.dsp /rebuild Release
-    print 'Build WinMerge executables...'
-    ret = call([vs_cmd, solution_path, '/rebuild', 'Release'], shell = True)
+    print 'Build WinMerge executable...'
+    ret = call([vs_cmd, solution_path, '/rebuild', 'UnicodeRelease'], shell = True)
     if ret == 0:
-        ret = call([vs_cmd, solution_path, '/rebuild', 'UnicodeRelease'], shell = True)
-    else:
-        print 'ERROR: Failed to build ANSI release target of WinMerge!'
-        return False
-
-    if ret == 0:
         return True
     else:
         print 'ERROR: Failed to build Unicode release target of WinMerge!'
@@ -307,14 +289,8 @@
 
     # devenv Src\Merge.dsp /rebuild Release
     print 'Build ShellExtension dlls...'
-    ret = call([vs_cmd, solution_path, '/rebuild', 'Release MinDependency'])
+    ret = call([vs_cmd, solution_path, '/rebuild', 'Unicode Release MinDependency'])
     if ret == 0:
-        ret = call([vs_cmd, solution_path, '/rebuild', 'Unicode Release MinDependency'])
-    else:
-        print 'ERROR: Failed to build ANSI target of ShellExtension!'
-        return False
-        
-    if ret == 0:
         if build_64bit == True:
             ret = call([vs_cmd, solution_path, '/rebuild', 'X64 Release|x64'])
         else:
@@ -382,11 +358,9 @@
     os.chdir(cur_path)
 
     print 'Copying files to binary distribution folder...'
-    shutil.copy('build/mergerelease/WinMerge.exe', bin_folder)
     shutil.copy('build/mergeunicoderelease/WinMergeU.exe', bin_folder)
     shutil.copy('build/mergeunicoderelease/MergeLang.dll', bin_folder)
 
-    shutil.copy('build/ShellExtension/release mindependency/ShellExtension.dll', bin_folder)
     shutil.copy('build/ShellExtension/unicode release mindependency/ShellExtensionU.dll', bin_folder)
     shutil.copy('build/ShellExtension/x64 release/ShellExtensionX64.dll', bin_folder)
     shutil.copy('ShellExtension/Register.bat', bin_folder)


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

[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.

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

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

Revision: 7370
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7370&view=rev
Author:   kimmov
Date:     2010-10-27 19:40:45 +0000 (Wed, 27 Oct 2010)

Log Message:
-----------
BuildScript: Specify Win32 target for 32-bit ShellExtension.

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:42:06 UTC (rev 7369)
+++ trunk/Tools/Scripts/create_release.py	2010-10-27 19:40:45 UTC (rev 7370)
@@ -289,7 +289,7 @@
 
     # devenv Src\Merge.dsp /rebuild Release
     print 'Build ShellExtension dlls...'
-    ret = call([vs_cmd, solution_path, '/rebuild', 'Unicode Release MinDependency'])
+    ret = call([vs_cmd, solution_path, '/rebuild', 'Unicode Release MinDependency|Win32'])
     if ret == 0:
         if build_64bit == True:
             ret = call([vs_cmd, solution_path, '/rebuild', 'X64 Release|x64'])


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