[openMSX-commits] SF.net SVN: openmsx:[9898] openmsx/trunk/build/package-windows

[<mfe...@us...>]

Revision: 9898
          http://openmsx.svn.sourceforge.net/openmsx/?rev=9898&view=rev
Author:   mfeingol
Date:     2009-05-25 19:06:24 +0000 (Mon, 25 May 2009)

Log Message:
-----------
Improve package-windows directory handling

Modified Paths:
--------------
    openmsx/trunk/build/package-windows/packagemsi.py
    openmsx/trunk/build/package-windows/packagewindows.py

Modified: openmsx/trunk/build/package-windows/packagemsi.py
===================================================================
--- openmsx/trunk/build/package-windows/packagemsi.py	2009-05-25 18:29:39 UTC (rev 9897)
+++ openmsx/trunk/build/package-windows/packagemsi.py	2009-05-25 19:06:24 UTC (rev 9898)
@@ -14,9 +14,9 @@
 
 	print 'Generating install files...'
 	packagewindows.GenerateInstallFiles(info);
-		
+
 	wixIntermediatePath = os.path.join(info.buildPath, 'build\\WiX')
-	packagewindows.DeleteDirectoryIfExists(wixIntermediatePath)
+	packagewindows.EmptyOrCreateDirectory(wixIntermediatePath)
 	
 	if not os.path.exists(info.packagePath):
 		os.mkdir(info.packagePath)

Modified: openmsx/trunk/build/package-windows/packagewindows.py
===================================================================
--- openmsx/trunk/build/package-windows/packagewindows.py	2009-05-25 18:29:39 UTC (rev 9897)
+++ openmsx/trunk/build/package-windows/packagewindows.py	2009-05-25 19:06:24 UTC (rev 9898)
@@ -1,11 +1,13 @@
 import os, sys
 import install
 
-def DeleteDirectoryIfExists(top):
+def EmptyOrCreateDirectory(top):
 	if os.path.exists(top):
-		DeleteDirectory(top)
-		
-def DeleteDirectory(top):
+		EmptyDirectory(top)
+	else:
+		os.makedirs(top)
+
+def EmptyDirectory(top):
 	for root, dirs, files in os.walk(top, topdown=False):
 		for name in files:
 			os.remove(os.path.join(root, name))
@@ -13,7 +15,7 @@
 			os.rmdir(os.path.join(root, name))
 
 def GenerateInstallFiles(info):
-	DeleteDirectoryIfExists(info.makeInstallPath)
+	EmptyOrCreateDirectory(info.makeInstallPath)
 	install.installAll(info.makeInstallPath + os.sep, 'bin', 'share', 'doc', info.openmsxExePath, 'mingw32', True, True)
 
 def WalkPath(sourcePath):


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