[dreimer] 36281: Add additional Page in the Setup to set the Source Path for the 64 Bit Source.
Author: dreimer Date: Wed Sep 17 07:49:52 2008 New Revision: 36281
URL: http://svn.reactos.org/svn/reactos?rev=36281&view=rev Log: Add additional Page in the Setup to set the Source Path for the 64 Bit Source.
Added: trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.ini (with props) trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.nsh (with props) Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/RosSourceDir.ini
Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.nsi... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Wed Sep 17 07:49:52 2008 @@ -33,6 +33,7 @@ !include "MUI2.nsh" !include "InstallOptions.nsh" !include "RosSourceDir.nsh" +!include "RosSourceDir64.nsh" !include "LogicLib.nsh" !include "x64.nsh"
@@ -53,6 +54,7 @@ ${Endif} Call UninstallPrevious !insertmacro INSTALLOPTIONS_EXTRACT "RosSourceDir.ini" + !insertmacro INSTALLOPTIONS_EXTRACT64 "RosSourceDir64.ini" FunctionEnd
;; @@ -69,10 +71,12 @@ !insertmacro MUI_PAGE_DIRECTORY
;; -;; ReactOS source directory page +;; ReactOS Source Directory Pages ;; var REACTOS_SOURCE_DIRECTORY !insertmacro CUSTOM_PAGE_ROSDIRECTORY +var REACTOS_SOURCE_DIRECTORY64 +!insertmacro CUSTOM_PAGE_ROSDIRECTORY64
;; ;; Start menu page @@ -269,7 +273,7 @@ CreateDirectory "$SMPROGRAMS$ICONS_GROUP" SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" - SetOutPath $PROFILE + SetOutPath $REACTOS_SOURCE_DIRECTORY64 CreateShortCut "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" SetOutPath $PROFILE CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" @@ -289,7 +293,7 @@ ;; SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" - SetOutPath $PROFILE + SetOutPath $REACTOS_SOURCE_DIRECTORY64 CreateShortCut "$DESKTOP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" SetOutPath $PROFILE CreateShortCut "$DESKTOP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" @@ -303,7 +307,7 @@ ;; SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" - SetOutPath $PROFILE + SetOutPath $REACTOS_SOURCE_DIRECTORY64 CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" SetOutPath $PROFILE CreateShortCut "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico"
Modified: trunk/tools/RosBE/RosBE-Windows/RosSourceDir.ini URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosSource... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosSourceDir.ini [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosSourceDir.ini [iso-8859-1] Wed Sep 17 07:49:52 2008 @@ -19,7 +19,7 @@
[Field 3] Type=Label -Text=Select the directory where the ReactOS sources are located or will be checked out to later. +Text=Select the directory where the ReactOS Sources are located or will be checked out to later. Left=0 Right=-1 Top=6
Added: trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.ini URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosSource... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.ini (added) +++ trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.ini [iso-8859-1] Wed Sep 17 07:49:52 2008 @@ -1,0 +1,26 @@ +[Settings] +NumFields=3 + +[Field 1] +Type=Groupbox +Text=ReactOS 64 Bit Source Directory +Left=0 +Right=-1 +Top=72 +Bottom=109 + +[Field 2] +Type=DirRequest +State= +Left=10 +Right=-10 +Top=86 +Bottom=99 + +[Field 3] +Type=Label +Text=Select the directory where the ReactOS 64 Bit Sources are located or will be checked out to later. +Left=0 +Right=-1 +Top=6 +Bottom=32
Propchange: trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.ini ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosSource... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.nsh (added) +++ trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.nsh [iso-8859-1] Wed Sep 17 07:49:52 2008 @@ -1,0 +1,16 @@ +!macro CUSTOM_PAGE_ROSDIRECTORY64 + PageEx custom + Caption "" + PageCallBacks "RosDir.show" "RosDir.leave" + PageExEnd + + Function RosDir.show + !insertmacro MUI_HEADER_TEXT "Select ReactOS 64 Bit Source Location" "Select the directory where the ReactOS 64 Bit sources are located or will be checked out to later." + !insertmacro INSTALLOPTIONS_WRITE "RosSourceDir64.ini" "Field 2" "State" "$PROFILE\reactos" + !insertmacro INSTALLOPTIONS_DISPLAY "RosSourceDir64.ini" + FunctionEnd + + Function RosDir.leave + !insertmacro INSTALLOPTIONS_READ $REACTOS_SOURCE_DIRECTORY "RosSourceDir64.ini" "Field 2" "State" + FunctionEnd +!macroend
Propchange: trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.nsh ------------------------------------------------------------------------------ svn:eol-style = native
-
dreimer＠svn.reactos.org