[dreimer] 40752: Fix charch to be compatible to arch specific configuration, too. Powershell shortcuts are only generated if the PS files are installed too. Still untested.
Author: dreimer Date: Thu Apr 30 14:53:51 2009 New Revision: 40752
URL: http://svn.reactos.org/svn/reactos?rev=40752&view=rev Log: Fix charch to be compatible to arch specific configuration, too. Powershell shortcuts are only generated if the PS files are installed too. Still untested.
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] Thu Apr 30 14:53:51 2009 @@ -17,6 +17,12 @@ # Refresh all needed Params by recalling the main Path setting CMD File. # function SYSPARAM { + + # arch specific settings. + if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_ARCH.ps1") { + IEX "& '$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_ARCH.ps1'" + } + IEX "& '$_ROSBE_BASEDIR\rosbe-gcc-env.ps1'" version }
Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/char... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Thu Apr 30 14:53:51 2009 @@ -36,7 +36,13 @@
:EOA
+:: arch specific settings. +if exist "%APPDATA%\RosBE\rosbe-options-%ROS_ARCH%.cmd" ( + call "%APPDATA%\RosBE\rosbe-options-%ROS_ARCH%.cmd" +) + call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" + "%_ROSBE_BASEDIR%\version.cmd" goto :EOC
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] Thu Apr 30 14:53:51 2009 @@ -277,11 +277,12 @@ ;; ;; Add our start menu shortcuts. ;; - IfFileExists "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment.lnk" +10 0 + IfFileExists "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment.lnk" +12 0 !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory "$SMPROGRAMS$ICONS_GROUP" SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" + IfFileExists "$INSTDIR\RosBE.ps1" 0 +1 CreateShortCut "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" '-noexit &"$INSTDIR\RosBE.ps1"' "$INSTDIR\rosbe.ico" SetOutPath $PROFILE CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" @@ -299,9 +300,10 @@ ;; ;; Add our desktop shortcuts. ;; - IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" +4 0 + IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" +6 0 SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" + IfFileExists "$INSTDIR\RosBE.ps1" 0 +1 CreateShortCut "$DESKTOP\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" '-noexit &"$INSTDIR\RosBE.ps1"' "$INSTDIR\rosbe.ico" SetOutPath $PROFILE CreateShortCut "$DESKTOP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" @@ -313,9 +315,10 @@ ;; ;; Add our quick launch shortcuts. ;; - IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" +4 0 + IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" +6 0 SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" + IfFileExists "$INSTDIR\RosBE.ps1" 0 +1 CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" '-noexit &"$INSTDIR\RosBE.ps1"' "$INSTDIR\rosbe.ico" SetOutPath $PROFILE CreateShortCut "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" @@ -352,15 +355,19 @@ RMDir /r /REBOOTOK "$APPDATA\RosBE" MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ "Do you want to remove the Shortcuts? If you just want to Update to a new Version of RosBE, keep them. This keeps your previous settings." \ - IDNO +8 - IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" 0 +2 + IDNO +12 + IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" 0 +1 Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk" - IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" 0 +2 + IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" 0 +1 Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment.lnk" - IfFileExists "$DESKTOP\Standard MinGW Build Environment.lnk" 0 +2 + IfFileExists "$DESKTOP\Standard MinGW Build Environment.lnk" 0 +1 Delete /REBOOTOK "$DESKTOP\Standard MinGW Build Environment.lnk" - IfFileExists "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" 0 +2 + IfFileExists "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" 0 +1 Delete /REBOOTOK "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" + IfFileExists "$DESKTOP\ReactOS Build Environment - Powershell.lnk" 0 +1 + Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - Powershell.lnk" + IfFileExists "$QUICKLAUNCH\ReactOS Build Environment - Powershell.lnk" 0 +1 + Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - Powershell.lnk" FunctionEnd
Section Uninstall
-
dreimer＠svn.reactos.org