[Sphere-axis-commits] CVS: Axis axis.nsi,1.4,1.4.4.1

[Philip E. <pes...@us...>]

Update of /cvsroot/sphere-axis/Axis
In directory sc8-pr-cvs1:/tmp/cvs-serv17047

Modified Files:
      Tag: v0_13-Stable
	axis.nsi 
Log Message:
Updated the install script to include the MSVC 7.0 dlls.

Index: axis.nsi
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/axis.nsi,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -r1.4 -r1.4.4.1
*** axis.nsi	17 Nov 2002 04:25:27 -0000	1.4
--- axis.nsi	22 Aug 2003 04:01:51 -0000	1.4.4.1
***************
*** 25,30 ****
  Section "" ; (default section)
  SetOutPath "$INSTDIR"
! ; add files / whatever that need to be installed here.
  File /r install\*.*
  IfFileExists "$SYSDIR\UOMap.ocx" +1 +3
  UnregDLL "$SYSDIR\UOMap.ocx"
--- 25,31 ----
  Section "" ; (default section)
  SetOutPath "$INSTDIR"
! ; Install Axis files
  File /r install\*.*
+ ; Make sure the ocx files aren't in the system directory
  IfFileExists "$SYSDIR\UOMap.ocx" +1 +3
  UnregDLL "$SYSDIR\UOMap.ocx"
***************
*** 35,38 ****
--- 36,62 ----
  RegDLL "$INSTDIR\UOMap.ocx"
  RegDLL "$INSTDIR\UOArt.ocx"
+ ; install the msvcr70 dll if necessary
+ SetOutPath $SYSDIR
+ GetFiletimeLocal "d:\winnt\system32\msvcr70.dll" $0 $1
+ IfFileExists "$SYSDIR\msvcr70.dll" +1 +4
+ GetFiletime "$SYSDIR\msvcr70.dll" $2 $3
+ IntCmp $2 $0 +1 +2 +3
+ IntCmp $3 $1 +2 +1 +2
+ File "d:\winnt\system32\msvcr70.dll"
+ ; install the mfc70 dll if necessary
+ GetFiletimeLocal "d:\winnt\system32\mfc70.dll" $0 $1
+ IfFileExists "$SYSDIR\mfc70.dll" +1 +4
+ GetFiletime "$SYSDIR\mfc70.dll" $2 $3
+ IntCmp $2 $0 +1 +2 +3
+ IntCmp $3 $1 +2 +1 +2
+ File "d:\winnt\system32\mfc70.dll"
+ ; install the msvcp70.dll if necessary
+ GetFiletimeLocal "d:\winnt\system32\msvcp70.dll" $0 $1
+ IfFileExists "$SYSDIR\msvcp70.dll" +1 +4
+ GetFiletime "$SYSDIR\msvcp70.dll" $2 $3
+ IntCmp $2 $0 +1 +2 +3
+ IntCmp $3 $1 +2 +1 +2
+ File "d:\winnt\system32\msvcp70.dll"
+ 
  ;WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Menasoft\GM Tools" "" "$INSTDIR"
  WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\Axis" "DisplayName" "Axis (remove only)"
***************
*** 66,69 ****
--- 90,94 ----
  DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Axis"
  ; RMDir "$INSTDIR"
+ ; Don't uninstall the system files, because we have no idea what else is using them.
  SectionEnd ; end of uninstall section