[GME-commit]
GMESRC/Install/Build check.py,1.6,1.7 testwinzip.bat,1.1,1.2
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Mon Jan 30 17:31:26 CST 2006
Update of /project/gme-repository/GMESRC/Install/Build
In directory escher:/tmp/cvs-serv25588/Build
Modified Files:
check.py testwinzip.bat
Log Message:
Getting rid of WinZip dependency
CVS User: Peter Volgyesi, ISIS (volgy)
Index: testwinzip.bat
===================================================================
RCS file: /project/gme-repository/GMESRC/Install/Build/testwinzip.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** testwinzip.bat 12 Feb 2003 16:31:00 -0000 1.1
--- testwinzip.bat 30 Jan 2006 17:31:24 -0000 1.2
***************
*** 6,10 ****
cd ..\..
set ZZ=test.zip
! "%PROGRAMFILES%\WinZip\WINZIP32" -min -a %ZZ%
if errorlevel 1 goto errorlabel
--- 6,10 ----
cd ..\..
set ZZ=test.zip
! "Install\Build\7za.exe" -min -a %ZZ%
if errorlevel 1 goto errorlabel
Index: check.py
===================================================================
RCS file: /project/gme-repository/GMESRC/Install/Build/check.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** check.py 7 Apr 2005 20:48:18 -0000 1.6
--- check.py 30 Jan 2006 17:31:24 -0000 1.7
***************
*** 20,29 ****
raise
! def checkWinZip():
try:
! print "Checking Winzip"
tools.system( os.getcwd() + "\\" + params.gme_path + "\\Install\\Build\\testwinzip.bat" )
except:
! print "WinZip is not installed!"
raise
--- 20,29 ----
raise
! def check7Zip():
try:
! print "Checking 7-Zip"
tools.system( os.getcwd() + "\\" + params.gme_path + "\\Install\\Build\\testwinzip.bat" )
except:
! print "7-Zip cannot be found!"
raise
***************
*** 39,43 ****
def checkAll():
checkVisualC()
! checkWinZip()
checkInstallShield()
--- 39,43 ----
def checkAll():
checkVisualC()
! check7Zip()
checkInstallShield()
More information about the GME-commit
mailing list