[dreimer] 40767: Hopefully fixed the shortcuts in the Installer. Modified the Path Variable to be not overwritten. Now it stays but is being extended. Readded LIBRARY_PATH to fix some problems. (Thx to DerSani from the German Chat)
1 May
2009
1 May
'09
10:42 p.m.
Author: dreimer
Date: Sat May 2 02:42:09 2009
New Revision: 40767
URL: http://svn.reactos.org/svn/reactos?rev=40767&view=rev
Log:
Hopefully fixed the shortcuts in the Installer.
Modified the Path Variable to be not overwritten. Now it stays but is being extended.
Readded LIBRARY_PATH to fix some problems. (Thx to DerSani from the German Chat)
Modified:
trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1
trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd
trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd
trunk/tools/RosBE/RosBE-Windows/RosBE.nsi
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Sat May 2 02:42:09
2009
@@ -18,7 +18,6 @@
if ($ENV:APPDATA.Length -lt 1) {
$ENV:APPDATA = $ENV:USERPROFILE
}
-$ENV:PATH = "$ENV:SystemRoot\system32;$ENV:SystemRoot"
$global:_ROSBE_VERSION = 1.4.2
$global:0 = $myInvocation.MyCommand.Definition
$global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0)
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Sat May 2
02:42:09 2009
@@ -67,7 +67,6 @@
#
$ENV:PATH =
"$_ROSBE_HOST_MINGWPATH\bin;$_ROSBE_TARGET_MINGWPATH\bin;$_ROSBE_ORIGINALPATH"
$global:_ROSBE_MINGWMAKE = "$_ROSBE_HOST_MINGWPATH\bin\mingw32-make.exe"
-$ENV:LIBRARY_PATH = $null
if ($ENV:ROS_ARCH -ne $null) {
& "$ENV:ROS_PREFIX-gcc" -v 2> gcctvers.tmp
@@ -111,3 +110,5 @@
$ENV:ROSBE_TARGET_CFLAGS = $null
$ENV:ROSBE_TARGET_CXXFLAGS = $null
}
+
+ENV:LIBRARY_PATH =
"$_ROSBE_HOST_MINGWPATH\lib;$_ROSBE_HOST_MINGWPATH\lib\gcc\mingw32\$_ROSBE_GCCVERSION"
Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Sat May 2 02:42:09 2009
@@ -20,7 +20,6 @@
:: the options utility.
::
if not defined APPDATA set APPDATA=%USERPROFILE%
-set PATH=%SystemRoot%\system32;%SystemRoot%
set _ROSBE_VERSION=1.4.2
set _ROSBE_BASEDIR=%~dp0
set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1%
Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Sat May 2
02:42:09 2009
@@ -72,7 +72,6 @@
set PATH=%_ROSBE_HOST_MINGWPATH%\bin;%_ROSBE_TARGET_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH%
set _ROSBE_MINGWMAKE=%_ROSBE_HOST_MINGWPATH%\bin\mingw32-make.exe
-set LIBRARY_PATH=
if not .%ROS_ARCH%. == .. (
for /f "usebackq tokens=3" %%i in (`"%ROS_PREFIX%-gcc -v 2>&1 |
find "gcc version""`) do set _ROSBE_GCCVERSION=%%i
@@ -114,6 +113,8 @@
set ROSBE_TARGET_CXXFLAGS=
)
+set
LIBRARY_PATH=%_ROSBE_HOST_MINGWPATH%\lib;%_ROSBE_HOST_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION%
+
:: HAX !!!!
set HOST_CFLAGS=%ROSBE_HOST_CFLAGS%
set HOST_CPPFLAGS=%ROSBE_HOST_CXXFLAGS%
Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Sat May 2 02:42:09 2009
@@ -283,7 +283,7 @@
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 +2
- CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment -
Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe"
'-noexit &"$INSTDIR\RosBE.ps1"' "$INSTDIR\rosbe.ico"
+ 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"
SetOutPath $INSTDIR
@@ -304,7 +304,7 @@
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 +2
- CreateShortCut "$DESKTOP\ReactOS Build Environment - Powershell.lnk"
"$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" '-noexit
&"$INSTDIR\RosBE.ps1"' "$INSTDIR\rosbe.ico"
+ 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"
SectionEnd
@@ -319,7 +319,7 @@
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 +2
- CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - Powershell.lnk"
"$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" '-noexit
&"$INSTDIR\RosBE.ps1"' "$INSTDIR\rosbe.ico"
+ 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"
SectionEnd
6031
days inactive
6031
days old
0 comments
1 participants
participants (1)
-
dreimer＠svn.reactos.org