notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r913 - trunk/main/etc/nsi

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r913 - trunk/main/etc/nsi
Date: Thu, 12 Jan 2006 18:58:52 +0100

Author: mcconnell
Date: 2006-01-12 18:58:50 +0100 (Thu, 12 Jan 2006)
New Revision: 913

Added:
trunk/main/etc/nsi/PathManipulation.nsh
Removed:
trunk/main/etc/nsi/PathMunge.nsh
Modified:
trunk/main/etc/nsi/dpml.nsi
Log:
improving the installer

Added: trunk/main/etc/nsi/PathManipulation.nsh
===================================================================
--- trunk/main/etc/nsi/PathManipulation.nsh 2006-01-12 09:41:19 UTC (rev
912)
+++ trunk/main/etc/nsi/PathManipulation.nsh 2006-01-12 17:58:50 UTC (rev
913)
@@ -0,0 +1,443 @@
+!ifndef _AddToPath_nsh
+!define _AddToPath_nsh
+
+!verbose 3
+!include "WinMessages.NSH"
+!verbose 4
+
+!ifndef WriteEnvStr_RegKey
+ !ifdef ALL_USERS
+ !define WriteEnvStr_RegKey \
+ 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
+ !else
+ !define WriteEnvStr_RegKey 'HKCU "Environment"'
+ !endif
+!endif
+
+; AddToPath - Adds the given dir to the search path.
+; Input - head of the stack
+; Note - Win9x systems requires reboot
+
+Function AddToPath
+
+ Exch $0
+ Push $1
+ Push $2
+ Push $3
+
+ MessageBox MB_OK|MB_ICONINFORMATION "Starting path processing."
+
+ # don't add if the path doesn't exist
+ #IfFileExists "$0\*.*" "" FileDoesNotExist
+ #Goto FileExists
+ #FileDoesNotExist:
+ #MessageBox MB_OK|MB_ICONINFORMATION "The path does not exist."
+ #FileExists:
+
+ ReadEnvStr $1 PATH
+ Push "$1;"
+ Push "$0;"
+ Call StrStr
+ Pop $2
+ DetailPrint "Checkpoint 1."
+ MessageBox MB_OK|MB_ICONINFORMATION "context: $1"
+ MessageBox MB_OK|MB_ICONINFORMATION "search: $0"
+ MessageBox MB_OK|MB_ICONINFORMATION "result: $2"
+ StrCmp $2 "" "" AddToPath_done
+ Push "$1;"
+ Push "$0\;"
+ Call StrStr
+ Pop $2
+ DetailPrint "Checkpoint 2."
+ MessageBox MB_OK|MB_ICONINFORMATION "context: $1"
+ MessageBox MB_OK|MB_ICONINFORMATION "search: $0"
+ MessageBox MB_OK|MB_ICONINFORMATION "result: $2"
+ StrCmp $2 "" "" AddToPath_done
+ GetFullPathName /SHORT $3 $0
+ Push "$1;"
+ Push "$3;"
+ Call StrStr
+ Pop $2
+ DetailPrint "Checkpoint 3."
+ MessageBox MB_OK|MB_ICONINFORMATION "context: $1"
+ MessageBox MB_OK|MB_ICONINFORMATION "search: $3"
+ MessageBox MB_OK|MB_ICONINFORMATION "result: $2"
+ StrCmp $2 "" "" AddToPath_done
+ Push "$1;"
+ Push "$3\;"
+ Call StrStr
+ Pop $2
+ DetailPrint "Checkpoint 4."
+ MessageBox MB_OK|MB_ICONINFORMATION "context: $1"
+ MessageBox MB_OK|MB_ICONINFORMATION "search: $3"
+ MessageBox MB_OK|MB_ICONINFORMATION "result: $2"
+ StrCmp $2 "" "" AddToPath_done
+
+ Call IsNT
+ Pop $1
+ StrCmp $1 1 AddToPath_NT
+ ; Not on NT
+ MessageBox MB_OK|MB_ICONINFORMATION "This is not an NT System."
+ StrCpy $1 $WINDIR 2
+ FileOpen $1 "$1\autoexec.bat" a
+ FileSeek $1 -1 END
+ FileReadByte $1 $2
+ IntCmp $2 26 0 +2 +2 # DOS EOF
+ FileSeek $1 -1 END # write over EOF
+ FileWrite $1 "$\r$\nSET PATH=%PATH%;$3$\r$\n"
+ FileClose $1
+ SetRebootFlag true
+ Goto AddToPath_done
+
+ AddToPath_NT:
+ MessageBox MB_OK|MB_ICONINFORMATION "Reading NT Path"
+ ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH"
+ StrCpy $2 $1 1 -1 # copy last char
+ StrCmp $2 ";" 0 +2 # if last char == ;
+ StrCpy $1 $1 -1 # remove last char
+ StrCmp $1 "" AddToPath_NTdoIt
+ StrCpy $0 "$1;$0"
+ AddToPath_NTdoIt:
+ WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $0
+ SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment"
/TIMEOUT=5000
+
+ AddToPath_done:
+ MessageBox MB_OK|MB_ICONINFORMATION "Add to path - DONE"
+ Pop $3
+ Pop $2
+ Pop $1
+ Pop $0
+FunctionEnd
+
+; RemoveFromPath - Remove a given dir from the path
+; Input: head of the stack
+
+Function un.RemoveFromPath
+ Exch $0
+ Push $1
+ Push $2
+ Push $3
+ Push $4
+ Push $5
+ Push $6
+
+ IntFmt $6 "%c" 26 # DOS EOF
+
+ Call un.IsNT
+ Pop $1
+ StrCmp $1 1 unRemoveFromPath_NT
+ ; Not on NT
+ StrCpy $1 $WINDIR 2
+ FileOpen $1 "$1\autoexec.bat" r
+ GetTempFileName $4
+ FileOpen $2 $4 w
+ GetFullPathName /SHORT $0 $0
+ StrCpy $0 "SET PATH=%PATH%;$0"
+ Goto unRemoveFromPath_dosLoop
+
+ unRemoveFromPath_dosLoop:
+ FileRead $1 $3
+ StrCpy $5 $3 1 -1 # read last char
+ StrCmp $5 $6 0 +2 # if DOS EOF
+ StrCpy $3 $3 -1 # remove DOS EOF so we can compare
+ StrCmp $3 "$0$\r$\n" unRemoveFromPath_dosLoopRemoveLine
+ StrCmp $3 "$0$\n" unRemoveFromPath_dosLoopRemoveLine
+ StrCmp $3 "$0" unRemoveFromPath_dosLoopRemoveLine
+ StrCmp $3 "" unRemoveFromPath_dosLoopEnd
+ FileWrite $2 $3
+ Goto unRemoveFromPath_dosLoop
+ unRemoveFromPath_dosLoopRemoveLine:
+ SetRebootFlag true
+ Goto unRemoveFromPath_dosLoop
+
+ unRemoveFromPath_dosLoopEnd:
+ FileClose $2
+ FileClose $1
+ StrCpy $1 $WINDIR 2
+ Delete "$1\autoexec.bat"
+ CopyFiles /SILENT $4 "$1\autoexec.bat"
+ Delete $4
+ Goto unRemoveFromPath_done
+
+ unRemoveFromPath_NT:
+ ReadRegStr $1 ${WriteEnvStr_RegKey} "PATH"
+ StrCpy $5 $1 1 -1 # copy last char
+ StrCmp $5 ";" +2 # if last char != ;
+ StrCpy $1 "$1;" # append ;
+ Push $1
+ Push "$0;"
+ Call un.StrStr ; Find `$0;` in $1
+ Pop $2 ; pos of our dir
+ StrCmp $2 "" unRemoveFromPath_done
+ ; else, it is in path
+ # $0 - path to add
+ # $1 - path var
+ StrLen $3 "$0;"
+ StrLen $4 $2
+ StrCpy $5 $1 -$4 # $5 is now the part before the path to remove
+ StrCpy $6 $2 "" $3 # $6 is now the part after the path to remove
+ StrCpy $3 $5$6
+
+ StrCpy $5 $3 1 -1 # copy last char
+ StrCmp $5 ";" 0 +2 # if last char == ;
+ StrCpy $3 $3 -1 # remove last char
+
+ WriteRegExpandStr ${WriteEnvStr_RegKey} "PATH" $3
+ SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment"
/TIMEOUT=5000
+
+ unRemoveFromPath_done:
+ Pop $6
+ Pop $5
+ Pop $4
+ Pop $3
+ Pop $2
+ Pop $1
+ Pop $0
+FunctionEnd
+
+
+
+; AddToEnvVar - Adds the given value to the given environment var
+; Input - head of the stack $0 environement variable $1=value to add
+; Note - Win9x systems requires reboot
+
+Function AddToEnvVar
+
+ Exch $1 ; $1 has environment variable value
+ Exch
+ Exch $0 ; $0 has environment variable name
+
+ DetailPrint "Adding $1 to $0"
+ Push $2
+ Push $3
+ Push $4
+
+
+ ReadEnvStr $2 $0
+ Push "$2;"
+ Push "$1;"
+ Call StrStr
+ Pop $3
+ StrCmp $3 "" "" AddToEnvVar_done
+
+ Push "$2;"
+ Push "$1\;"
+ Call StrStr
+ Pop $3
+ StrCmp $3 "" "" AddToEnvVar_done
+
+
+ Call IsNT
+ Pop $2
+ StrCmp $2 1 AddToEnvVar_NT
+ ; Not on NT
+ StrCpy $2 $WINDIR 2
+ FileOpen $2 "$2\autoexec.bat" a
+ FileSeek $2 -1 END
+ FileReadByte $2 $3
+ IntCmp $3 26 0 +2 +2 # DOS EOF
+ FileSeek $2 -1 END # write over EOF
+ FileWrite $2 "$\r$\nSET $0=%$0%;$4$\r$\n"
+ FileClose $2
+ SetRebootFlag true
+ Goto AddToEnvVar_done
+
+ AddToEnvVar_NT:
+ ReadRegStr $2 ${WriteEnvStr_RegKey} $0
+ StrCpy $3 $2 1 -1 # copy last char
+ StrCmp $3 ";" 0 +2 # if last char == ;
+ StrCpy $2 $2 -1 # remove last char
+ StrCmp $2 "" AddToEnvVar_NTdoIt
+ StrCpy $1 "$2;$1"
+ AddToEnvVar_NTdoIt:
+ WriteRegExpandStr ${WriteEnvStr_RegKey} $0 $1
+ SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment"
/TIMEOUT=5000
+
+ AddToEnvVar_done:
+ Pop $4
+ Pop $3
+ Pop $2
+ Pop $1
+ Pop $0
+
+FunctionEnd
+
+; RemoveFromEnvVar - Remove a given value from a environment var
+; Input: head of the stack
+
+Function un.RemoveFromEnvVar
+
+ Exch $1 ; $1 has environment variable value
+ Exch
+ Exch $0 ; $0 has environment variable name
+
+ DetailPrint "Removing $1 from $0"
+ Push $2
+ Push $3
+ Push $4
+ Push $5
+ Push $6
+ Push $7
+
+ IntFmt $7 "%c" 26 # DOS EOF
+
+ Call un.IsNT
+ Pop $2
+ StrCmp $2 1 unRemoveFromEnvVar_NT
+ ; Not on NT
+ StrCpy $2 $WINDIR 2
+ FileOpen $2 "$2\autoexec.bat" r
+ GetTempFileName $5
+ FileOpen $3 $5 w
+ GetFullPathName /SHORT $1 $1
+ StrCpy $1 "SET $0=%$0%;$1"
+ Goto unRemoveFromEnvVar_dosLoop
+
+ unRemoveFromEnvVar_dosLoop:
+ FileRead $2 $4
+ StrCpy $6 $4 1 -1 # read last char
+ StrCmp $6 $7 0 +2 # if DOS EOF
+ StrCpy $4 $4 -1 # remove DOS EOF so we can compare
+ StrCmp $4 "$1$\r$\n" unRemoveFromEnvVar_dosLoopRemoveLine
+ StrCmp $4 "$1$\n" unRemoveFromEnvVar_dosLoopRemoveLine
+ StrCmp $4 "$1" unRemoveFromEnvVar_dosLoopRemoveLine
+ StrCmp $4 "" unRemoveFromEnvVar_dosLoopEnd
+ FileWrite $3 $4
+ Goto unRemoveFromEnvVar_dosLoop
+ unRemoveFromEnvVar_dosLoopRemoveLine:
+ SetRebootFlag true
+ Goto unRemoveFromEnvVar_dosLoop
+
+ unRemoveFromEnvVar_dosLoopEnd:
+ FileClose $3
+ FileClose $2
+ StrCpy $2 $WINDIR 2
+ Delete "$2\autoexec.bat"
+ CopyFiles /SILENT $5 "$2\autoexec.bat"
+ Delete $5
+ Goto unRemoveFromEnvVar_done
+
+ unRemoveFromEnvVar_NT:
+ ReadRegStr $2 ${WriteEnvStr_RegKey} $0
+ StrCpy $6 $2 1 -1 # copy last char
+ StrCmp $6 ";" +2 # if last char != ;
+ StrCpy $2 "$2;" # append ;
+ Push $2
+ Push "$1;"
+ Call un.StrStr ; Find `$1;` in $2
+ Pop $3 ; pos of our dir
+ StrCmp $3 "" unRemoveFromEnvVar_done
+ ; else, it is in path
+ # $1 - path to add
+ # $2 - path var
+ StrLen $4 "$1;"
+ StrLen $5 $3
+ StrCpy $6 $2 -$5 # $6 is now the part before the path to remove
+ StrCpy $7 $3 "" $4 # $7 is now the part after the path to remove
+ StrCpy $4 $6$7
+
+ StrCpy $6 $4 1 -1 # copy last char
+ StrCmp $6 ";" 0 +2 # if last char == ;
+ StrCpy $4 $4 -1 # remove last char
+
+ WriteRegExpandStr ${WriteEnvStr_RegKey} $0 $4
+ SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment"
/TIMEOUT=5000
+
+ unRemoveFromEnvVar_done:
+ Pop $7
+ Pop $6
+ Pop $5
+ Pop $4
+ Pop $3
+ Pop $2
+ Pop $1
+ Pop $0
+FunctionEnd
+
+
+
+
+!ifndef IsNT_KiCHiK
+!define IsNT_KiCHiK
+
+###########################################
+# Utility Functions #
+###########################################
+
+; IsNT
+; no input
+; output, top of the stack = 1 if NT or 0 if not
+;
+; Usage:
+; Call IsNT
+; Pop $R0
+; ($R0 at this point is 1 or 0)
+
+!macro IsNT un
+Function ${un}IsNT
+ Push $0
+ ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion"
CurrentVersion
+ StrCmp $0 "" 0 IsNT_yes
+ ; we are not NT.
+ Pop $0
+ Push 0
+ Return
+
+ IsNT_yes:
+ ; NT!!!
+ Pop $0
+ Push 1
+FunctionEnd
+!macroend
+!insertmacro IsNT ""
+!insertmacro IsNT "un."
+
+!endif ; IsNT_KiCHiK
+
+; StrStr
+; input, top of stack = string to search for
+; top of stack-1 = string to search in
+; output, top of stack (replaces with the portion of the string remaining)
+; modifies no other variables.
+;
+; Usage:
+; Push "this is a long ass string"
+; Push "ass"
+; Call StrStr
+; Pop $R0
+; ($R0 at this point is "ass string")
+
+!macro StrStr un
+Function ${un}StrStr
+Exch $R1 ; st=haystack,old$R1, $R1=needle
+ Exch ; st=old$R1,haystack
+ Exch $R2 ; st=old$R1,old$R2, $R2=haystack
+ Push $R3
+ Push $R4
+ Push $R5
+ StrLen $R3 $R1
+ StrCpy $R4 0
+ ; $R1=needle
+ ; $R2=haystack
+ ; $R3=len(needle)
+ ; $R4=cnt
+ ; $R5=tmp
+ loop:
+ StrCpy $R5 $R2 $R3 $R4
+ StrCmp $R5 $R1 done
+ StrCmp $R5 "" done
+ IntOp $R4 $R4 + 1
+ Goto loop
+done:
+ StrCpy $R1 $R2 "" $R4
+ Pop $R5
+ Pop $R4
+ Pop $R3
+ Pop $R2
+ Exch $R1
+FunctionEnd
+!macroend
+!insertmacro StrStr ""
+!insertmacro StrStr "un."
+
+!endif ; _AddToPath_nsh

Deleted: trunk/main/etc/nsi/PathMunge.nsh
===================================================================
--- trunk/main/etc/nsi/PathMunge.nsh 2006-01-12 09:41:19 UTC (rev 912)
+++ trunk/main/etc/nsi/PathMunge.nsh 2006-01-12 17:58:50 UTC (rev 913)
@@ -1,236 +0,0 @@
-!verbose 3
-!include "WinMessages.NSH"
-!verbose 4
-
-; AddToPath - Adds the given dir to the search path.
-; Input - head of the stack
-; Note - Win9x systems requires reboot
-
-Function AddToPath
- Exch $0
- Push $1
- Push $2
- Push $3
-
- # don't add if the path doesn't exist
- IfFileExists $0 "" AddToPath_done
-
- ReadEnvStr $1 PATH
- Push "$1;"
- Push "$0;"
- Call StrStr
- Pop $2
- StrCmp $2 "" "" AddToPath_done
- Push "$1;"
- Push "$0\;"
- Call StrStr
- Pop $2
- StrCmp $2 "" "" AddToPath_done
- GetFullPathName /SHORT $3 $0
- Push "$1;"
- Push "$3;"
- Call StrStr
- Pop $2
- StrCmp $2 "" "" AddToPath_done
- Push "$1;"
- Push "$3\;"
- Call StrStr
- Pop $2
- StrCmp $2 "" "" AddToPath_done
-
- Call IsNT
- Pop $1
- StrCmp $1 1 AddToPath_NT
- ; Not on NT
- StrCpy $1 $WINDIR 2
- FileOpen $1 "$1\autoexec.bat" a
- FileSeek $1 -1 END
- FileReadByte $1 $2
- IntCmp $2 26 0 +2 +2 # DOS EOF
- FileSeek $1 -1 END # write over EOF
- FileWrite $1 "$\r$\nSET PATH=%PATH%;$3$\r$\n"
- FileClose $1
- SetRebootFlag true
- Goto AddToPath_done
-
- AddToPath_NT:
- ReadRegStr $1 HKCU "Environment" "PATH"
- StrCpy $2 $1 1 -1 # copy last char
- StrCmp $2 ";" 0 +2 # if last char == ;
- StrCpy $1 $1 -1 # remove last char
- StrCmp $1 "" AddToPath_NTdoIt
- StrCpy $0 "$1;$0"
- AddToPath_NTdoIt:
- WriteRegExpandStr HKCU "Environment" "PATH" $0
- SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment"
/TIMEOUT=5000
-
- AddToPath_done:
- Pop $3
- Pop $2
- Pop $1
- Pop $0
-FunctionEnd
-
-; RemoveFromPath - Remove a given dir from the path
-; Input: head of the stack
-
-Function un.RemoveFromPath
- Exch $0
- Push $1
- Push $2
- Push $3
- Push $4
- Push $5
- Push $6
-
- IntFmt $6 "%c" 26 # DOS EOF
-
- Call un.IsNT
- Pop $1
- StrCmp $1 1 unRemoveFromPath_NT
- ; Not on NT
- StrCpy $1 $WINDIR 2
- FileOpen $1 "$1\autoexec.bat" r
- GetTempFileName $4
- FileOpen $2 $4 w
- GetFullPathName /SHORT $0 $0
- StrCpy $0 "SET PATH=%PATH%;$0"
- Goto unRemoveFromPath_dosLoop
-
- unRemoveFromPath_dosLoop:
- FileRead $1 $3
- StrCpy $5 $3 1 -1 # read last char
- StrCmp $5 $6 0 +2 # if DOS EOF
- StrCpy $3 $3 -1 # remove DOS EOF so we can compare
- StrCmp $3 "$0$\r$\n" unRemoveFromPath_dosLoopRemoveLine
- StrCmp $3 "$0$\n" unRemoveFromPath_dosLoopRemoveLine
- StrCmp $3 "$0" unRemoveFromPath_dosLoopRemoveLine
- StrCmp $3 "" unRemoveFromPath_dosLoopEnd
- FileWrite $2 $3
- Goto unRemoveFromPath_dosLoop
- unRemoveFromPath_dosLoopRemoveLine:
- SetRebootFlag true
- Goto unRemoveFromPath_dosLoop
-
- unRemoveFromPath_dosLoopEnd:
- FileClose $2
- FileClose $1
- StrCpy $1 $WINDIR 2
- Delete "$1\autoexec.bat"
- CopyFiles /SILENT $4 "$1\autoexec.bat"
- Delete $4
- Goto unRemoveFromPath_done
-
- unRemoveFromPath_NT:
- ReadRegStr $1 HKCU "Environment" "PATH"
- StrCpy $5 $1 1 -1 # copy last char
- StrCmp $5 ";" +2 # if last char != ;
- StrCpy $1 "$1;" # append ;
- Push $1
- Push "$0;"
- Call un.StrStr ; Find `$0;` in $1
- Pop $2 ; pos of our dir
- StrCmp $2 "" unRemoveFromPath_done
- ; else, it is in path
- # $0 - path to add
- # $1 - path var
- StrLen $3 "$0;"
- StrLen $4 $2
- StrCpy $5 $1 -$4 # $5 is now the part before the path to remove
- StrCpy $6 $2 "" $3 # $6 is now the part after the path to remove
- StrCpy $3 $5$6
-
- StrCpy $5 $3 1 -1 # copy last char
- StrCmp $5 ";" 0 +2 # if last char == ;
- StrCpy $3 $3 -1 # remove last char
-
- WriteRegExpandStr HKCU "Environment" "PATH" $3
- SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment"
/TIMEOUT=5000
-
- unRemoveFromPath_done:
- Pop $6
- Pop $5
- Pop $4
- Pop $3
- Pop $2
- Pop $1
- Pop $0
-FunctionEnd
-
-###########################################
-# Utility Functions #
-###########################################
-
-; IsNT
-; no input
-; output, top of the stack = 1 if NT or 0 if not
-;
-; Usage:
-; Call IsNT
-; Pop $R0
-; ($R0 at this point is 1 or 0)
-
-!macro IsNT un
-Function ${un}IsNT
- Push $0
- ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion"
CurrentVersion
- StrCmp $0 "" 0 IsNT_yes
- ; we are not NT.
- Pop $0
- Push 0
- Return
-
- IsNT_yes:
- ; NT!!!
- Pop $0
- Push 1
-FunctionEnd
-!macroend
-!insertmacro IsNT ""
-!insertmacro IsNT "un."
-
-; StrStr
-; input, top of stack = string to search for
-; top of stack-1 = string to search in
-; output, top of stack (replaces with the portion of the string remaining)
-; modifies no other variables.
-;
-; Usage:
-; Push "this is a long ass string"
-; Push "ass"
-; Call StrStr
-; Pop $R0
-; ($R0 at this point is "ass string")
-
-!macro StrStr un
-Function ${un}StrStr
-Exch $R1 ; st=haystack,old$R1, $R1=needle
- Exch ; st=old$R1,haystack
- Exch $R2 ; st=old$R1,old$R2, $R2=haystack
- Push $R3
- Push $R4
- Push $R5
- StrLen $R3 $R1
- StrCpy $R4 0
- ; $R1=needle
- ; $R2=haystack
- ; $R3=len(needle)
- ; $R4=cnt
- ; $R5=tmp
- loop:
- StrCpy $R5 $R2 $R3 $R4
- StrCmp $R5 $R1 done
- StrCmp $R5 "" done
- IntOp $R4 $R4 + 1
- Goto loop
-done:
- StrCpy $R1 $R2 "" $R4
- Pop $R5
- Pop $R4
- Pop $R3
- Pop $R2
- Exch $R1
-FunctionEnd
-!macroend
-!insertmacro StrStr ""
-!insertmacro StrStr "un."
\ No newline at end of file

Modified: trunk/main/etc/nsi/dpml.nsi
===================================================================
--- trunk/main/etc/nsi/dpml.nsi 2006-01-12 09:41:19 UTC (rev 912)
+++ trunk/main/etc/nsi/dpml.nsi 2006-01-12 17:58:50 UTC (rev 913)
@@ -15,25 +15,26 @@
; limitations under the License.

!define ALL_USERS
-
!define TEMP $R0
+!define VERSION '@PROJECT-VERSION@'

!include "WriteEnvStr.nsh"
-!include "PathMunge.nsh"
+!include "PathManipulation.nsh"
!include "MUI.nsh"

;--------------------------------
;Configuration

;General
- Name "DPML SDK @PROJECT-VERSION@"
+ Name "DPML SDK"
+ Caption "DPML SDK (${VERSION}) Setup"
OutFile "dpml-sdk-@PROJECT-VERSION@.exe"

;Folder selection page
- InstallDir "C:\dpml"
-
+ InstallDir $PROGRAMFILES\DPML
+
;Remember install folder
- InstallDirRegKey HKCU "Software\DPML\@PROJECT-VERSION@" ""
+ InstallDirRegKey HKLM "Software\DPML" ""

;--------------------------------
;Variables
@@ -57,7 +58,7 @@

;Start Menu Folder Page Configuration
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU"
- !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\Modern UI Test"
+ !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\DPML"
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"

!insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
@@ -79,6 +80,9 @@
;Language Strings

;Description
+ LangString DESC_SecData ${LANG_ENGLISH} "Installs Local data"
+ LangString DESC_SecPrefs ${LANG_ENGLISH} "Installs Default Preferences"
+ LangString DESC_SecShare ${LANG_ENGLISH} "Installs Shared Libraries"
LangString DESC_SecPlatform ${LANG_ENGLISH} "Installs Transit Resource
Management, Depot Build Management, Metro Runtime and the Station Application
Controller"
LangString DESC_SecStation ${LANG_ENGLISH} "Installs Station SCM"
LangString DESC_SecDoc ${LANG_ENGLISH} "Installs Platform and API
Documentation"
@@ -86,13 +90,13 @@
;--------------------------------
;Installer Sections

-Section "platform" SecPlatform
+Section "-platform" SecPlatform

SetOutPath $INSTDIR
File ..\bundle\README.txt
File ..\bundle\LICENSE.txt
File ..\bundle\NOTICE.txt
-
+
Push "DPML_HOME"
Push $INSTDIR
Call WriteEnvStr
@@ -100,32 +104,68 @@
Push $INSTDIR\share\bin
Call AddToPath

- ;Store install folder
- WriteRegStr HKCU "Software\DPML" "" $INSTDIR
-
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-
;Create shortcuts
CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk"
"$INSTDIR\Uninstall.exe"
-
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\DPML Home (local).lnk"
"$INSTDIR\share\docs\index.html"
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\DPML Platform API.lnk"
"$INSTDIR\share\docs\api\dpml\@PROJECT-VERSION@\index.html"
-
!insertmacro MUI_STARTMENU_WRITE_END

;Create uninstaller
WriteUninstaller "$INSTDIR\Uninstall.exe"

- SetOutPath $INSTDIR
- File /r ..\bundle\*
-
SectionEnd

+Section "data" SecData
+ SectionIn RO
+ SetOutPath $INSTDIR\data
+ File /nonfatal /r ..\bundle\data\*
+SectionEND
+
+Section "prefs" SecPrefs
+ SectionIn RO
+ SetOutPath $INSTDIR\prefs
+ File /r ..\bundle\prefs\*
+SectionEND
+
+Section "share" SecShare
+ SectionIn RO
+ SetOutPath $INSTDIR\share\bin
+ File ..\bundle\share\bin\security.policy
+ File ..\bundle\share\bin\transit.exe
+ File ..\bundle\share\bin\transit.lap
+ File ..\bundle\share\bin\depot.exe
+ File ..\bundle\share\bin\depot.lap
+ File ..\bundle\share\bin\build.exe
+ File ..\bundle\share\bin\build.lap
+ File ..\bundle\share\bin\metro.exe
+ File ..\bundle\share\bin\metro.lap
+ File ..\bundle\share\bin\station.exe
+ File ..\bundle\share\bin\station.lap
+ SetOutPath $INSTDIR\share\bin\scm
+ File /r ..\bundle\share\bin\scm\*
+ SetOutPath $INSTDIR\share\lib
+ File /r ..\bundle\share\lib\*
+ SetOutPath $INSTDIR\share\local
+ File /r ..\bundle\share\local\*
+SectionEND
+
+Section "docs" SecDoc
+ SetOutPath $INSTDIR\share\docs
+ File /r ..\bundle\share\docs\*
+ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\DPML Home (local).lnk"
"$INSTDIR\share\docs\index.html"
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\DPML Platform API.lnk"
"$INSTDIR\share\docs\api\dpml\@PROJECT-VERSION@\index.html"
+ !insertmacro MUI_STARTMENU_WRITE_END
+SectionEND
+
Section "station scm" SecStation
Exec "$INSTDIR\share\bin\scm\wrapper.exe -i
$INSTDIR\share\bin\scm\conf\wrapper.conf"
SectionEND

+Section "-post"
+ WriteRegStr HKLM "Software\DPML" "" $INSTDIR
+SectionEND
+
;--------------------------------
;Descriptions

@@ -144,22 +184,13 @@
Push "DPML_HOME"
Call un.DeleteEnvStr

- Push $INSTDIR\bin
+ Push $INSTDIR\share\bin
Call un.RemoveFromPath

!insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP

Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
RMDir /r "$SMPROGRAMS\$MUI_TEMP"
-
RMDir /r $INSTDIR

SectionEnd
-
-; todo:
-; Check for JVM and Version. Install endorsed jars if needed
-; see
http://nsis.sourceforge.net/archive/nsisweb.php?page=543&instances=0
-; Check for if we are installing for one user or many
-; Install a default app that includes the facilities
-
-; eof

r913 - trunk/main/etc/nsi, mcconnell at BerliOS, 01/12/2006