WebSVN – DevTools – Diff – /nsis_library/trunk/src/VIX/VixMacros.nsh

 ; The macro should be inserted in an install section, usually the same one that calls VIX_CREATE_UNINSTALLER_AND_REGISTRY
+;
 ; Uses registers $0, $1, $2, $3, $4, $5, $6 without saving them
+;
 ; The following defines are available after this macro is inserted
+; VIX_PACKAGING_ROOTKEY           - The Root key where VIX_PACKAGING_SUBKEY is rooted
 ; VIX_PACKAGING_SUBKEY            - The Registry key where the values are inserted
 ; VIX_PACKAGING_PARAMETERS_SUBKEY - A Subdir of VIX_PACKAGING_SUBKEY that can contain installer parameters
 ;                                   Used by VIX_SAVE_PACKAGING_PARAMETER & VIX_GET_PACKAGING_PARAMETER macros
 ;                                   to save and retrieve installer parameters
+;
 ; SectionEnd
 !define VIX_CREATE_PACKAGING_REGISTRY `!insertmacro VIX_CREATE_PACKAGING_REGISTRY`
 !macro VIX_CREATE_PACKAGING_REGISTRY
+    !ifdef VIX_PACKAGING_ROOTKEY
+        !undef VIX_PACKAGING_ROOTKEY
+    !endif
+    !define VIX_PACKAGING_ROOTKEY "SOFTWARE\ERG\AFC"
     !ifdef VIX_PACKAGING_SUBKEY
         !undef VIX_PACKAGING_SUBKEY
     !endif
-    !define VIX_PACKAGING_SUBKEY "SOFTWARE\ERG\AFC\${GBE_PACKAGE}"
+    !define VIX_PACKAGING_SUBKEY "${VIX_PACKAGING_ROOTKEY}\${GBE_PACKAGE}"
     !ifdef VIX_PACKAGING_PARAMETERS_SUBKEY
         !undef VIX_PACKAGING_PARAMETERS_SUBKEY
     !endif
-    !define VIX_PACKAGING_PARAMETERS_SUBKEY "SOFTWARE\ERG\AFC\${GBE_PACKAGE}\InstallParameters"
+    !define VIX_PACKAGING_PARAMETERS_SUBKEY "${VIX_PACKAGING_ROOTKEY}\${GBE_PACKAGE}\InstallParameters"
     ClearErrors
     ; Determine the install time in format MM-DD-YYYY HH:MM:SS
     ${GetTime} "" "L" $0 $1 $2 $3 $4 $5 $6
 !macroend
+;---------------------------------------------------------------------------------------------------
+; macro VIX_CHECK_VIXPKG_PREREQ
+; Checks the VIX_PACKAGING_ROOTKEY for PKGNAME to see if package has been intalled.
+; This is for VIX packages that create the registry entries using VIX_CREATE_PACKAGING_REGISTRY in NSIS or in installshield
+; It does not use the Uninstaller registry locations
+;
+; Parameters
+; PKGNAME  - The name of the VIX Package to look for
+; KEYVALUE - A Variable that has PKGNAME appended to it if PkgName is not installed.
+;
+; Used in .onInit function
+; Declare Global var first
+; Var MISSING_PREREQ
+; Then in .onInit
+; ${VIX_CHECK_VIXPKG_PREREQ} "ERGcots" $MISSING_PREREQ
+; ${VIX_CHECK_VIXPKG_PREREQ} "ERGsnmpagt" $MISSING_PREREQ
+;StrCmp $MISSING_PREREQ "" +2
+;    MessageBox MB_OK|MB_ICONINFORMATION 'The following pre-requisite Package(s) are not installed. Please install to complete installation$\n$MISSING_PREREQ' /SD IDOK
+!define VIX_CHECK_VIXPKG_PREREQ `!insertmacro VIX_CHECK_VIXPKG_PREREQ`
+!macro VIX_CHECK_VIXPKG_PREREQ PKGNAME PKGSNOTFOUND
+    ClearErrors
+    !ifndef VIX_PACKAGING_ROOTKEY
+        !error "The VIX_CHECK_VIXPKG_PREREQ macro must be inserted in script after VIX_CREATE_PACKAGING_REGISTRY"
+    !endif
+    push $0
+    ReadRegStr $0 HKLM "${VIX_PACKAGING_ROOTKEY}\${PKGNAME}" "PkgName"
+    IfErrors 0 +5
+        StrCmp ${PKGSNOTFOUND} "" +3
+            StrCpy ${PKGSNOTFOUND} "${PKGSNOTFOUND}, ${PKGNAME}"
+            Goto +2
+        StrCpy ${PKGSNOTFOUND} "${PKGNAME}"
+    pop $0
+!macroend
 ;---------------------------------------------------------------------------------------------------
 ; macro VIX_SAVE_PACKAGING_PARAMETER
 ; Saves key values in VIX_PACKAGING_PARAMETERS_SUBKEY registry for recall on when installing new version
 ; Must be inserted in your script after the insertion of VIX_CREATE_PACKAGING_REGISTRY for required defines
     !ifndef VIX_UNINSTALL_KEY
         !error "The VIX_SETINSTDIR_IFINSTALLED macro must be inserted in script after VIX_CREATE_UNINSTALLER_AND_REGISTRY"
     !endif
     ClearErrors
+    push $0
     ReadRegStr $0 HKLM ${VIX_UNINSTALL_KEY} "InstallLocation"
     IfErrors +2 0
         ; set default installdir to what was previously used
         StrCpy $INSTDIR $0
-    Nop
+    Pop $0
 !macroend
 ;---------------------------------------------------------------------------------------------------
 ; macro VIX_ONINIT_UNINSTALL_EXISTING_VERSION
+;
 ; Parameter:
 ; OLDVERSION: Contains the version number of the uninstalled version (or ???? if old version is detected but cant get version number)
 ;             otherwise set to empty string to indicate no uninstall is done
+;
-; Uses registers $0, $1, $2, $3 without saving
+; Uses registers $0, $1, $2, $3
+;
 !define VIX_ONINIT_UNINSTALL_EXISTING_VERSION `!insertmacro VIX_ONINIT_UNINSTALL_EXISTING_VERSION`
 !macro VIX_ONINIT_UNINSTALL_EXISTING_VERSION OLDVERSION
     !ifndef VIX_UNINSTALL_KEY
         !error "The VIX_ONINIT_UNINSTALL_EXISTING_VERSION macro must be inserted in script after VIX_CREATE_UNINSTALLER_AND_REGISTRY"
     !endif
     ClearErrors
+    push $0
+    push $1
+    push $2
+    push $3
     StrCpy ${OLDVERSION} ""  ; Empty string indicates no uninstall done
     ; If these are not in registry then package is not installed so do nothing
     ReadRegStr $0 HKLM ${VIX_UNINSTALL_KEY} "UninstallString"
     IfErrors Label.VIX_ONINIT_UNINSTALL_EXISTING_VERSION.done
         MessageBox MB_OK "Failed to uninstall current version"
         Abort
     Delete $3
 Label.VIX_ONINIT_UNINSTALL_EXISTING_VERSION.done:
+    pop $3
+    pop $2
+    pop $1
+    pop $0
 !macroend

Subversion Repositories DevTools

(root)/nsis_library/trunk/src/VIX/VixMacros.nsh – Rev 2340 → 4920