[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs] installer/hlxserver/nodist copyfiles_win32.py,1.7,1.8
From:       dcollins () helixcommunity ! org
Date:       2008-04-22 21:36:03
Message-ID: 200804222136.m3MLaCY7023005 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/server/installer/hlxserver/nodist
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv21815

Modified Files:
	copyfiles_win32.py 
Log Message:
always copy msvcp71.dll and msvcr71.dll into the installer
CR: pending


Index: copyfiles_win32.py
===================================================================
RCS file: /cvsroot/server/installer/hlxserver/nodist/copyfiles_win32.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- copyfiles_win32.py	8 Jun 2007 00:58:40 -0000	1.7
+++ copyfiles_win32.py	22 Apr 2008 21:36:00 -0000	1.8
@@ -61,11 +61,10 @@
 
 #include the MS Visual C++ runtime dlls, if found (release builds only):
 if not (project.IsDefined('DEBUG')):
-    if (os.environ.has_key('FRAMEWORKSDKDIR')):
-        msvc_sdk = os.environ.get('FRAMEWORKSDKDIR', '') + "/Bin/"
-        msvcp = "msvcp71.dll"
-        msvcr = "msvcr71.dll"
-        inst.CopyFiles(
-            (msvc_sdk + msvcp, "Bin"),
-            (msvc_sdk + msvcr, "Bin"))
+    msvc_sdk = os.environ.get('FRAMEWORKSDKDIR', '') + "/Bin/"
+    msvcp = "msvcp71.dll"
+    msvcr = "msvcr71.dll"
+    inst.CopyFiles(
+        (msvc_sdk + msvcp, "Bin"),
+        (msvc_sdk + msvcr, "Bin"))
 


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs
[prev in list] [next in list] [prev in thread] [next in thread]