[ros-diffs] [dreimer] 36293: ByeBye 2nd Path Dialog. Now the shortcuts get both the same path

Author: dreimer
Date: Wed Sep 17 14:48:50 2008
New Revision: 36293

URL: http://svn.reactos.org/svn/reactos?rev=36293&view=rev
Log:
ByeBye 2nd Path Dialog. Now the shortcuts get both the same path

Removed:
    trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.ini
    trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.nsh
Modified:
    trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi

Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Wed Sep 17 14:48:50 2008
@@ -33,7 +33,6 @@
 !include "MUI2.nsh"
 !include "InstallOptions.nsh"
 !include "RosSourceDir.nsh"
-!include "RosSourceDir64.nsh"
 !include "LogicLib.nsh"
 !include "x64.nsh"
 
@@ -54,7 +53,6 @@
     ${Endif}
     Call UninstallPrevious
     !insertmacro INSTALLOPTIONS_EXTRACT "RosSourceDir.ini"
-    !insertmacro INSTALLOPTIONS_EXTRACT "RosSourceDir64.ini"
 FunctionEnd
 
 ;;
@@ -75,8 +73,6 @@
 ;;
 var REACTOS_SOURCE_DIRECTORY
 !insertmacro CUSTOM_PAGE_ROSDIRECTORY
-var REACTOS_SOURCE_DIRECTORY64
-!insertmacro CUSTOM_PAGE_ROSDIRECTORY64
 
 ;;
 ;; Start menu page
@@ -273,7 +269,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 $REACTOS_SOURCE_DIRECTORY64
+        SetOutPath $REACTOS_SOURCE_DIRECTORY
         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"
@@ -293,7 +289,7 @@
     ;;
     SetOutPath $REACTOS_SOURCE_DIRECTORY
     CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk"
"$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"'
"$INSTDIR\rosbe.ico"
-    SetOutPath $REACTOS_SOURCE_DIRECTORY64
+    SetOutPath $REACTOS_SOURCE_DIRECTORY
     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"
@@ -307,7 +303,7 @@
     ;;
     SetOutPath $REACTOS_SOURCE_DIRECTORY
     CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk"
"$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"'
"$INSTDIR\rosbe.ico"
-    SetOutPath $REACTOS_SOURCE_DIRECTORY64
+    SetOutPath $REACTOS_SOURCE_DIRECTORY
     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"

Removed: trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.ini
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosSourc…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.ini [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.ini (removed)
@@ -1,26 +1,0 @@
-[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

Removed: trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.nsh
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosSourc…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.nsh [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/RosSourceDir64.nsh (removed)
@@ -1,16 +1,0 @@
-!macro CUSTOM_PAGE_ROSDIRECTORY64
-    PageEx custom
-        Caption ""
-        PageCallBacks "RosDir64.show" "RosDir64.leave"
-    PageExEnd
-
-    Function RosDir64.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 RosDir64.leave
-        !insertmacro INSTALLOPTIONS_READ $REACTOS_SOURCE_DIRECTORY64
"RosSourceDir64.ini" "Field 2" "State"
-    FunctionEnd
-!macroend