From e224e3d8c039d58be452107e7e5698c85258fdc7 Mon Sep 17 00:00:00 2001 From: Andrew Bell Date: Mon, 27 Mar 2017 23:46:48 -0400 Subject: [PATCH] MSW updates to packageRelease.py --- tools/scripts/packageRelease.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/scripts/packageRelease.py b/tools/scripts/packageRelease.py index 7d579dff13..c3efbaef4c 100644 --- a/tools/scripts/packageRelease.py +++ b/tools/scripts/packageRelease.py @@ -58,7 +58,9 @@ def printUsage(): def processExport( outputName, compilerName, version ): print "creating a clean clone of cinder" baseDir = os.getcwd() - os.system( "git clone --recursive --depth 1 -b master . ../cinder_temp/" ) + fileUrl = "file://" + baseDir + fileUrl.replace( os.sep, "/" ) + os.system( "git clone --recursive --depth 1 -b master " + fileUrl + " .." + os.sep + "cinder_temp" ) os.chdir( baseDir + os.sep + ".." + os.sep + "cinder_temp" ) outputDir = baseDir + os.sep + ".." + os.sep + "cinder_" + version + "_" + outputName + os.sep print "performing selective copy to " + outputDir @@ -100,14 +102,13 @@ def cleanupMswLibDir( dir ): outputDir = processExport( "vc2013", "vc2013", sys.argv[1] ) os.chdir( outputDir + "proj\\vc2013" ) os.system( "msbuild cinder.vcxproj /p:platform=win32 /p:configuration=debug" ) - shutil.rmtree( outputDir + "proj\\vc2013\\Debug" ) os.system( "msbuild cinder.vcxproj /p:platform=win32 /p:configuration=release" ) - shutil.rmtree( outputDir + "proj\\vc2013\\Release" ) + shutil.rmtree( outputDir + "proj\\vc2013\\build" ) # os.system( "msbuild cinder.vcxproj /p:platform=x64 /p:configuration=debug" ) # shutil.rmtree( outputDir + "vc2013\\x64\\Debug" ) # os.system( "msbuild cinder.vcxproj /p:platform=x64 /p:configuration=release" ) # shutil.rmtree( outputDir + "vc2013\\x64\\Release" ) - cleanupMswLibDir( outputDir + "lib\\msw\\x86" ) + cleanupMswLibDir( outputDir + "lib\\msw\\x86\\debug" ) # cleanupMswLibDir( outputDir + "lib\\msw\\x64" ) elif sys.argv[2] == 'vc2015': gCompiler = 'vc2015'