mirror of
https://github.com/reactos/RosBE.git
synced 2024-11-26 21:00:28 +00:00
- M4 path needs the FULL path, not the folder the exe is inside...
- Fix a 'maybe' problem with multi arch and options.exe - Remove color codes from shortcuts. We do things the same way now on PS and Batch
This commit is contained in:
Daniel Reimer
parent
9f4cda089c
commit
00db2b4591
@ -70,7 +70,7 @@ $ENV:CCACHE_SLOPPINESS = "time_macros"
|
||||
|
||||
# Fix Bison package path (just in case RosBE is installed in a path which contains spaces) and add M4 path to a env var
|
||||
$ENV:BISON_PKGDATADIR = ((New-Object -ComObject Scripting.FileSystemObject).GetFolder("$_ROSBE_BASEDIR\share\bison")).ShortPath
|
||||
$ENV:M4 = ((New-Object -ComObject Scripting.FileSystemObject).GetFolder("$_ROSBE_BASEDIR\bin")).ShortPath
|
||||
$ENV:M4 = ((New-Object -ComObject Scripting.FileSystemObject).GetFile("$_ROSBE_BASEDIR\bin\m4.exe")).ShortPath
|
||||
|
||||
# Get the number of CPUs in the system so we know how many jobs to execute.
|
||||
# To modify the number used, see the cpucount usage for getting to know about the possible options
|
||||
@ -190,10 +190,6 @@ if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options-$ENV:ROS_ARCH.ps1") {
|
||||
& "$ENV:APPDATA\RosBE\rosbe-options-$ENV:ROS_ARCH.ps1"
|
||||
}
|
||||
|
||||
if (Test-Path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG") {
|
||||
$ENV:ROS_RBUILDFLAGS = get-content "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG"
|
||||
}
|
||||
|
||||
$global:_ROSBE_ORIGINALPATH = "$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\bin;$_ROSBE_BASEDIR\samples;$ENV:PATH"
|
||||
|
||||
if ("$_ROSBE_SYSPATH" -eq "0") {
|
||||
|
||||
@ -91,7 +91,7 @@ set CCACHE_SLOPPINESS=time_macros
|
||||
|
||||
:: Fix Bison package path (just in case RosBE is installed in a path which contains spaces) and add M4 path to a env var
|
||||
set BISON_PKGDATADIR=%~ds0%~sp0%share\bison
|
||||
set M4=%~ds0%~sp0%bin
|
||||
set M4=%~ds0%~sp0%bin\m4.exe
|
||||
|
||||
:: Get the number of CPUs in the system so we know how many jobs to execute.
|
||||
:: To modify the number used, see the cpucount usage for getting to know about the possible options
|
||||
@ -109,6 +109,9 @@ set C_INCLUDE_PATH=
|
||||
set CPLUS_INCLUDE_PATH=
|
||||
set LIBRARY_PATH=
|
||||
|
||||
if "%ROS_ARCH%" == "i386" (
|
||||
color 0A
|
||||
)
|
||||
if "%ROS_ARCH%" == "amd64" (
|
||||
color 0B
|
||||
)
|
||||
@ -122,12 +125,14 @@ if not exist "%APPDATA%\RosBE\." (
|
||||
)
|
||||
|
||||
:: Load the user's options if any
|
||||
if exist "%APPDATA%\RosBE\rosbe-options-%_ROSBE_VERSION%.cmd" (
|
||||
call "%APPDATA%\RosBE\rosbe-options-%_ROSBE_VERSION%.cmd"
|
||||
)
|
||||
|
||||
if exist "%APPDATA%\RosBE\rosbe-options-%1.cmd" (
|
||||
call "%APPDATA%\RosBE\rosbe-options-%1.cmd"
|
||||
if "%ROS_ARCH%" == "i386" (
|
||||
if exist "%APPDATA%\RosBE\rosbe-options-%_ROSBE_VERSION%.cmd" (
|
||||
call "%APPDATA%\RosBE\rosbe-options-%_ROSBE_VERSION%.cmd"
|
||||
)
|
||||
) else (
|
||||
if exist "%APPDATA%\RosBE\rosbe-options-%1.cmd" (
|
||||
call "%APPDATA%\RosBE\rosbe-options-%1.cmd"
|
||||
)
|
||||
)
|
||||
|
||||
set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\bin;%_ROSBE_BASEDIR%\samples;%PATH%
|
||||
|
||||
@ -318,12 +318,12 @@ Section -StartMenuShortcuts SEC07
|
||||
CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
|
||||
SetOutPath $REACTOS_SOURCE_DIRECTORY
|
||||
IfFileExists "$INSTDIR\RosBE.cmd" 0 +2
|
||||
CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico"
|
||||
CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico"
|
||||
IfFileExists "$INSTDIR\RosBE.ps1" 0 +2
|
||||
CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico"
|
||||
IfFileExists "$INSTDIR\amd64\*" 0 +5
|
||||
IfFileExists "$INSTDIR\RosBE.cmd" 0 +2
|
||||
CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment ${PRODUCT_VERSION} AMD64.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico"
|
||||
CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment ${PRODUCT_VERSION} AMD64.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico"
|
||||
IfFileExists "$INSTDIR\RosBE.ps1" 0 +2
|
||||
CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\ReactOS Build Environment ${PRODUCT_VERSION} AMD64 - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico"
|
||||
SetOutPath $INSTDIR
|
||||
@ -344,12 +344,12 @@ Section /o "Desktop Shortcuts" SEC08
|
||||
IfFileExists "$DESKTOP\ReactOS Build Environment ${PRODUCT_VERSION}.lnk" +11 0
|
||||
SetOutPath $REACTOS_SOURCE_DIRECTORY
|
||||
IfFileExists "$INSTDIR\RosBE.cmd" 0 +2
|
||||
CreateShortCut "$DESKTOP\ReactOS Build Environment ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico"
|
||||
CreateShortCut "$DESKTOP\ReactOS Build Environment ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico"
|
||||
IfFileExists "$INSTDIR\RosBE.ps1" 0 +2
|
||||
CreateShortCut "$DESKTOP\ReactOS Build Environment ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico"
|
||||
IfFileExists "$INSTDIR\amd64\*" 0 +5
|
||||
IfFileExists "$INSTDIR\RosBE.cmd" 0 +2
|
||||
CreateShortCut "$DESKTOP\ReactOS Build Environment ${PRODUCT_VERSION} AMD64.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico"
|
||||
CreateShortCut "$DESKTOP\ReactOS Build Environment ${PRODUCT_VERSION} AMD64.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico"
|
||||
IfFileExists "$INSTDIR\RosBE.ps1" 0 +2
|
||||
CreateShortCut "$DESKTOP\ReactOS Build Environment ${PRODUCT_VERSION} AMD64 - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico"
|
||||
SectionEnd
|
||||
@ -362,12 +362,12 @@ Section /o "Quick Launch Shortcuts" SEC09
|
||||
IfFileExists "$QUICKLAUNCH\ReactOS Build Environment ${PRODUCT_VERSION}.lnk" +11 0
|
||||
SetOutPath $REACTOS_SOURCE_DIRECTORY
|
||||
IfFileExists "$INSTDIR\RosBE.cmd" 0 +2
|
||||
CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico"
|
||||
CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico"
|
||||
IfFileExists "$INSTDIR\RosBE.ps1" 0 +2
|
||||
CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico"
|
||||
IfFileExists "$INSTDIR\amd64\*" 0 +5
|
||||
IfFileExists "$INSTDIR\RosBE.cmd" 0 +2
|
||||
CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment ${PRODUCT_VERSION} AMD64.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico"
|
||||
CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment ${PRODUCT_VERSION} AMD64.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico"
|
||||
IfFileExists "$INSTDIR\RosBE.ps1" 0 +2
|
||||
CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment ${PRODUCT_VERSION} AMD64 - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico"
|
||||
SectionEnd
|
||||
|
||||
Loading…
Reference in New Issue
Block a user