reactos/RosBE
1
0
Fork 0
mirror of https://github.com/reactos/RosBE.git synced 2024-11-23 11:29:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Preparation for RosBE 2.1.6 for Windows (#1)

Browse Source 
- HTTP -> HTTPS in updater script
- Fix Updater script by granting access rights for it. ROSBE-129
- Remove sSVN and it's SVN binaries being useless now.
- Update changelog showing the binary updates.
- Update Copyright header year -> 2018
- 2.1.5 -> 2.1.6
This commit is contained in:
Daniel Reimer 2018-01-28 20:08:38 +01:00 committed by Amine Khaldi
parent 37e471df8a
commit 5c651a0491
61 changed files with 99 additions and 716 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RosBE-Windows/Powershell/Build.ps1
View File

@ -3,7 +3,7 @@
# LICENSE: GNU General Public License v2. (see LICENSE.txt)
# FILE: Root/Build.ps1
# PURPOSE: Perform the build of ReactOS.
# COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
# COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
#
if ($_ROSBE_USECCACHE -eq 1) {

2
RosBE-Windows/Powershell/Clean.ps1
View File

@ -3,7 +3,7 @@
# LICENSE: GNU General Public License v2. (see LICENSE.txt)
# FILE: Root/Clean.ps1
# PURPOSE: Clean the ReactOS source directory.
# COPYRIGHT: Copyright 2017 Daniel Reimer <reimer.daniel@freenet.de>
# COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
#
$host.ui.RawUI.WindowTitle = "Cleaning..."

22
RosBE-Windows/Powershell/Help.ps1
View File

@ -3,7 +3,7 @@
# LICENSE: GNU General Public License v2. (see LICENSE.txt)
# FILE: Root/Help.ps1
# PURPOSE: Display help for the commands included with the ReactOS Build Environment.
# COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
# COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
#
# Check if we are displaying help on all commands, if so, display it.
@ -67,12 +67,6 @@ if ("$args" -eq "") {
" shortcutted ReactOS source directories."
}
if (Test-Path "$_ROSBE_BASEDIR\sSVN.ps1") {
" ssvn [OPTIONS] - Create, update or clean-up your ReactOS source"
" tree or show the revision number of the local"
" and online trees."
}
if (Test-Path "$_ROSBE_BASEDIR\options.ps1") {
" options - Starts the RosBE configurator and sets the."
" changes active immediately."
@ -209,20 +203,6 @@ if ("$args" -eq "") {
if (Test-Path "$_ROSBE_BASEDIR\scut.ps1") {
IEX "& scut.exe --help"
}
} elseif ("$args" -eq "ssvn") {
if (Test-Path "$_ROSBE_BASEDIR\sSVN.ps1") {
" Usage: ssvn [OPTIONS]"
" Creates, updates or cleans up your ReactOS source tree or shows the revision"
" number of the local and online trees."
""
" update - Updates to HEAD revision or to a specific one when the second"
" parameter specifies one."
" create - Creates a new ReactOS source tree."
" rosapps - Creates / Updates a ReactOS RosApps source tree."
" rostests - Creates / Updates a ReactOS RosTests source tree."
" cleanup - Cleans up and fixes errors in the source tree."
" status - Show the current local and online revision numbers."
}
} elseif ("$args" -eq "options") {
if (Test-Path "$_ROSBE_BASEDIR\options.ps1") {
" Usage: options"

2
RosBE-Windows/Powershell/Remake.ps1
View File

@ -3,7 +3,7 @@
# LICENSE: GNU General Public License v2. (see LICENSE.txt)
# FILE: Root/Remake.ps1
# PURPOSE: Fully re-make one or several modules.
# COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
# COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
#
$argindex = 0

2
RosBE-Windows/Powershell/Remakex.ps1
View File

@ -3,7 +3,7 @@
# LICENSE: GNU General Public License v2. (see LICENSE.txt)
# FILE: Root/Remakex.ps1
# PURPOSE: Fully re-make one or several modules multithreaded.
# COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
# COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
#
$argindex = 0

13
RosBE-Windows/Powershell/RosBE.ps1
View File

@ -4,7 +4,7 @@
# FILE: Root/RosBE.ps1
# PURPOSE: This script provides/sets up various build environments for
# ReactOS. Currently it provides a GCC 4.7.2 build environment.
# COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
# COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
#
$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION"
@ -53,7 +53,7 @@ $global:BUILD_ENVIRONMENT = "MinGW"
$global:0 = $myInvocation.MyCommand.Definition
$global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0)
$global:_ROSBE_PREFIX = $null
$global:_ROSBE_VERSION = "2.1.5"
$global:_ROSBE_VERSION = "2.1.6"
$global:_ROSBE_ROSSOURCEDIR = "$pwd"
$global:_ROSBE_SHOWTIME = 1
$global:_ROSBE_WRITELOG = 1
@ -230,10 +230,7 @@ if ($_ROSBE_SHOWVERSION -eq 1) {
"-------------------------------------------------"
""
# Look if the ReactOS source directory is empty. If so,
# inform the user and mention 'ssvn create' (only if ssvn is installed).
if (!(Test-Path "$_ROSBE_BASEDIR\sSVN.ps1")) {
if ((get-childitem $_ROSBE_ROSSOURCEDIR).Count -le 0) {
"No ReactOS source detected. Please use ""ssvn create"" to download it."
}
# Look if the ReactOS source directory is empty.
if ((get-childitem $_ROSBE_ROSSOURCEDIR).Count -le 0) {
"No ReactOS source detected. Please check https://reactos.org/wiki/ReactOS_Git_For_Dummies to download it."
}

2
RosBE-Windows/Powershell/charch.ps1
View File

@ -3,7 +3,7 @@
# LICENSE: GNU General Public License v2. (see LICENSE.txt)
# FILE: Root/charch.ps1
# PURPOSE: Tool to change the current Arch to build ROS for in RosBE.
# COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
# COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
#
$host.ui.RawUI.WindowTitle = "Change the Architecture to build for..."

2
RosBE-Windows/Powershell/chdefdir.ps1
View File

@ -4,7 +4,7 @@
# FILE: Root/chdefdir.ps1
# PURPOSE: Tool to change the current working ReactOS source directory
# in RosBE.
# COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
# COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
#
$host.ui.RawUI.WindowTitle = "Change the current working ReactOS source directory..."

2
RosBE-Windows/Powershell/chdefgcc.ps1
View File

@ -3,7 +3,7 @@
# LICENSE: GNU General Public License v2. (see LICENSE.txt)
# FILE: Root/chdefgcc.ps1
# PURPOSE: Tool to change the current gcc in RosBE.
# COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
# COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
#
$host.ui.RawUI.WindowTitle = "Change the current MinGW/GCC Host/Target directory..."

2
RosBE-Windows/Powershell/kdbg.ps1
View File

@ -3,7 +3,7 @@
# LICENSE: GNU General Public License v2. (see LICENSE.txt)
# FILE: Root/kdbg.ps1
# PURPOSE: Displays a KDBG Session Interactively.
# COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
# COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
#
$DATENAME = get-date -f dyMMyyyy

2
RosBE-Windows/Powershell/options.ps1
View File

@ -3,7 +3,7 @@
# LICENSE: GNU General Public License v2. (see LICENSE.txt)
# FILE: Root/options.ps1
# PURPOSE: Starts options.exe and restarts RosBE afterwards.
# COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
# COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
#
$host.ui.RawUI.WindowTitle = "Options"

2
RosBE-Windows/Powershell/reladdr2line.ps1
View File

@ -3,7 +3,7 @@
# LICENSE: GNU General Public License v2. (see LICENSE.txt)
# FILE: Root/reladdr2line.ps1
# PURPOSE: Converts a value to hex and displays it.
# COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
# COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
#
$host.ui.RawUI.WindowTitle = "reladdr2line..."

2
RosBE-Windows/Powershell/reladdr2lineNW.ps1
View File

@ -3,7 +3,7 @@
# LICENSE: GNU General Public License v2. (see LICENSE.txt)
# FILE: Root/reladdr2line.ps1
# PURPOSE: Converts a value to hex and displays it.
# COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
# COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
#
$host.ui.RawUI.WindowTitle = "reladdr2line..."

2
RosBE-Windows/Powershell/rosbe-gcc-env.ps1
View File

@ -3,7 +3,7 @@
# LICENSE: GNU General Public License v2. (see LICENSE.txt)
# FILE: Root/rosbe-gcc-env.ps1
# PURPOSE: Set up the GCC 4.x.x build environment.
# COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
# COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
#
# Check if we're switching to the AMD64 or AMR architecture.

260
RosBE-Windows/Powershell/sSVN.ps1
View File

@ -1,260 +0,0 @@
#
# PROJECT: RosBE - ReactOS Build Environment for Windows
# LICENSE: GNU General Public License v2. (see LICENSE.txt)
# FILE: Root/sSVN.ps1
# PURPOSE: Integrated SVN Client.
# COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
#
$ROS_SVNURL = "https://svn.reactos.org/reactos"
if ("$ENV:ROS_BRANCH" -eq "") {
$ROS_SVNURL = "$ROS_SVNURL/trunk"
} else {
$ROS_SVNURL = "$ROS_SVNURL/branches/$ENV:ROS_BRANCH"
}
get-webfile $ROS_SVNURL/reactos "$ENV:TEMP\tmp"
if ("$_ROSBE_DWERRLVL" -eq "1") {
get-webfile $ROS_SVNURL "$ENV:TEMP\tmp2"
if ("$_ROSBE_DWERRLVL" -eq "1") {
throw {"ERROR: The selected branch does not exist or the Internet Connection is down."}
exit
} else {
$rsubfolder = ""
$disapptest = 1
}
} else {
$rsubfolder = "/reactos"
$disapptest = 0
}
$_ROSBE_SSVNSOURCEDIR = "$pwd"
$_ROSBE_SVN_EXECUTABLE = '"$_ROSBE_BASEDIR\bin\svn.exe"'
function UP($arg) {
$OFFSVN = IEX "& $_ROSBE_SVN_EXECUTABLE info" | select-string "Last Changed Rev:"
$OFFSVN = $OFFSVN -replace "(.*)Last Changed Rev: ",''
$OFFSVN = [CONVERT]::ToInt32($OFFSVN,10)
$ONSVN = IEX "& $_ROSBE_SVN_EXECUTABLE info $ROS_SVNURL$rsubfolder" | select-string "Last Changed Rev:"
$ONSVN = $ONSVN -replace "(.*)Last Changed Rev: ",''
$ONSVN = [CONVERT]::ToInt32($ONSVN,10)
"Local Revision: $OFFSVN"
"Online HEAD Revision: $ONSVN"
""
if ($OFFSVN -lt $ONSVN) {
if ("$_ROSBE_SSVN_JOB" -eq "status") {
"Your tree is not up to date. Do you want to update it?"
$UP = Read-Host "Please enter 'yes' or 'no': "
if (("$UP" -eq "yes") -or ("$UP" -eq "y")) {
$_ROSBE_SSVN_JOB = "update"
}
}
}
if ("$_ROSBE_SSVN_JOB" -eq "update") {
if ("$($arg[1])" -ne "") {
$temparg = $arg[1]
if ($temparg -eq $OFFSVN) {
"Your Local Repository is currently $temparg"
}
if ($temparg -lt $OFFSVN) {
"Downgrading to $temparg ..."
}
if ($temparg -gt $OFFSVN) {
"Updating to $temparg ..."
}
if ("$_BUILDBOT_SVNSKIPMAINTRUNK" -ne "1") {
IEX "& $_ROSBE_SVN_EXECUTABLE update -r $temparg"
} else {
"Skipping ReactOS Trunk update."
}
if (Test-Path "modules\rosapps\.") {
Set-Location "modules\rosapps"
"Updating RosApps..."
IEX "& $_ROSBE_SVN_EXECUTABLE update -r $temparg"
Set-Location "$_ROSBE_SSVNSOURCEDIR"
}
if (Test-Path "modules\rostests\.") {
Set-Location "modules\rostests"
"Updating RosTests..."
IEX "& $_ROSBE_SVN_EXECUTABLE update -r $temparg"
Set-Location "$_ROSBE_SSVNSOURCEDIR"
}
} else {
if ("$_BUILDBOT_SVNSKIPMAINTRUNK" -ne "1") {
IEX "& $_ROSBE_SVN_EXECUTABLE update"
} else {
"Skipping ReactOS Trunk update."
}
if (Test-Path "modules\rosapps\.") {
Set-Location "modules\rosapps"
"Updating RosApps..."
IEX "& $_ROSBE_SVN_EXECUTABLE update"
Set-Location "$_ROSBE_SSVNSOURCEDIR"
}
if (Test-Path "modules\rostests\.") {
Set-Location "modules\rostests"
"Updating RosTests..."
IEX "& $_ROSBE_SVN_EXECUTABLE update"
Set-Location "$_ROSBE_SSVNSOURCEDIR"
}
}
"Do you want to see the changelog?"
$CL = Read-Host "Please enter 'yes' or 'no': "
if (("$CL" -eq "yes") -or ("$CL" -eq "y")) {
$range = "$OFFSVN" + ":" + "$ONSVN"
IEX "& $_ROSBE_SVN_EXECUTABLE log -r $range"
}
}
if ($OFFSVN -eq $ONSVN) {
"Your tree is up to date."
exit
}
}
# Receive the first parameter and decide what to do.
if ("$($args[0])" -eq "") {
"No parameter specified. Try 'help [COMMAND]'."
}
# These two are directly parsed to svn.
elseif ("$($args[0])" -eq "update") {
$host.ui.RawUI.WindowTitle = "SVN Updating..."
"This might take a while, so please be patient."
""
$_ROSBE_SSVN_JOB = "update"
UP($args)
}
elseif ("$($args[0])" -eq "cleanup") {
$host.ui.RawUI.WindowTitle = "SVN Cleaning..."
"This might take a while, so please be patient."
""
IEX "& $_ROSBE_SVN_EXECUTABLE cleanup"
}
# Check if the folder is empty. If not, output an error.
elseif ("$($args[0])" -eq "create") {
$host.ui.RawUI.WindowTitle = "SVN Creating..."
if (Test-Path ".svn\.") {
throw {"ERROR: Folder already contains a repository."}
} else {
$null = (Remove-Item "$_ROSBE_LOGDIR" -recurse -force)
$dir = get-childitem
if ("$dir" -eq "") {
if ("$($args[1])" -ne "") {
IEX "& $_ROSBE_SVN_EXECUTABLE -r $($args[1]) checkout $ROS_SVNURL$rsubfolder ."
} else {
IEX "& $_ROSBE_SVN_EXECUTABLE checkout $ROS_SVNURL$rsubfolder ."
}
} else {
throw {"ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED"}
}
}
}
# Check if the folder is empty. If not, output an error.
elseif ("$($args[0])" -eq "rosapps") {
if ("$disapptest" -eq "0") {
if ("$($args[1])" -ne "") {
if (!(Test-Path "modules\rosapps\.")) {
new-item -path "modules" -name rosapps -type directory
}
if (Test-Path "modules\rosapps\.svn\.") {
$host.ui.RawUI.WindowTitle = "SVN RosApps Updating..."
Set-Location "modules\rosapps"
IEX "& $_ROSBE_SVN_EXECUTABLE update -r $($args[1])"
} else {
$host.ui.RawUI.WindowTitle = "SVN RosApps Creating..."
Set-Location "modules\rosapps"
$dir = get-childitem
if ("$dir" -eq "") {
IEX "& $_ROSBE_SVN_EXECUTABLE checkout -r $($args[1]) $ROS_SVNURL/rosapps ."
} else {
throw {"ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED"}
}
}
} else {
if (!(Test-Path "modules\rosapps\.")) {
new-item -path "modules" -name rosapps -type directory
}
if (Test-Path "modules\rosapps\.svn\.") {
$host.ui.RawUI.WindowTitle = "SVN RosApps Updating..."
Set-Location "modules\rosapps"
IEX "& $_ROSBE_SVN_EXECUTABLE update"
} else {
$host.ui.RawUI.WindowTitle = "SVN RosApps Creating..."
Set-Location "modules\rosapps"
$dir = get-childitem
if ("$dir" -eq "") {
IEX "& $_ROSBE_SVN_EXECUTABLE checkout $ROS_SVNURL/rosapps ."
} else {
throw {"ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED"}
}
}
}
Set-Location "$_ROSBE_SSVNSOURCEDIR"
} else {
"ROSApps is disabled."
}
}
# Check if the folder is empty. If not, output an error.
elseif ("$($args[0])" -eq "rostests") {
if ("$disapptest" -eq "0") {
if ("$($args[1])" -ne "") {
if (!(Test-Path "modules\rostests\.")) {
new-item -path "modules" -name rostests -type directory
}
if (Test-Path "modules\rostests\.svn\.") {
$host.ui.RawUI.WindowTitle = "SVN RosTests Updating..."
Set-Location "modules\rostests"
IEX "& $_ROSBE_SVN_EXECUTABLE update -r $($args[1])"
} else {
$host.ui.RawUI.WindowTitle = "SVN RosTests Creating..."
Set-Location "modules\rostests"
$dir = get-childitem
if ("$dir" -eq "") {
IEX "& $_ROSBE_SVN_EXECUTABLE checkout -r $($args[1]) $ROS_SVNURL/rostests ."
} else {
throw {"ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED"}
}
}
} else {
if (!(Test-Path "modules\rostests\.")) {
new-item -path "modules" -name rostests -type directory
}
if (Test-Path "modules\rostests\.svn\.") {
$host.ui.RawUI.WindowTitle = "SVN RosTests Updating..."
Set-Location "modules\rostests"
IEX "& $_ROSBE_SVN_EXECUTABLE update"
} else {
$host.ui.RawUI.WindowTitle = "SVN RosTests Creating..."
Set-Location "modules\rostests"
$dir = get-childitem
if ("$dir" -eq "") {
IEX "& $_ROSBE_SVN_EXECUTABLE checkout $ROS_SVNURL/rostests ."
} else {
throw {"ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED"}
}
}
}
Set-Location "$_ROSBE_SSVNSOURCEDIR"
} else {
"ROSTests is disabled."
}
}
# Output the revision of the local and online trees and tell the user if
# its up to date or not.
elseif ("$($args[0])" -eq "status") {
$host.ui.RawUI.WindowTitle = "SVN Status"
$_ROSBE_SSVN_JOB = "status"
UP($args)
}
elseif ("$($args[0])" -ne "") {
"Unknown parameter specified. Try 'help ssvn'."
}
$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION"

2
RosBE-Windows/Powershell/scut.ps1
View File

@ -3,7 +3,7 @@
# LICENSE: GNU General Public License v2. (see LICENSE.txt)
# FILE: Root/scut.ps1
# PURPOSE: Manages named shortcuts to ReactOS source directories.
# COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
# COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
#
function paramcall($arg) {

4
RosBE-Windows/Powershell/update.ps1
View File

@ -3,7 +3,7 @@
# LICENSE: GNU General Public License v2. (see LICENSE.txt)
# FILE: Root/update.ps1
# PURPOSE: RosBE Updater.
# COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
# COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
#
$host.ui.RawUI.WindowTitle = "Updating..."
@ -76,7 +76,7 @@ function UPDCHECK {
}
# The Update Server.
$_ROSBE_URL = "http://svn.reactos.org/downloads/rosbe"
$_ROSBE_URL = "https://svn.reactos.org/downloads/rosbe"
# Save the recent dir to cd back there at the end.
$_ROSBE_OPATH = "$pwd"

2
RosBE-Windows/Powershell/version.ps1
View File

@ -3,7 +3,7 @@
# LICENSE: GNU General Public License v2. (see LICENSE.txt)
# FILE: Root/version.ps1
# PURPOSE: Display the current version of GCC, NASM, ld and make.
# COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
# COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
#
$_ROSBE_NINJAVER = (& "$_ROSBE_BASEDIR\bin\ninja.exe" --version)

2
RosBE-Windows/Root/Basedir.cmd
View File

@ -3,7 +3,7 @@
:: LICENSE: GNU General Public License v2. (see LICENSE.txt)
:: FILE: Root/Basedir.cmd
:: PURPOSE: Temporarily change the Basedir in RosBE.
:: COPYRIGHT: Copyright 2016 Colin Finck <colin@reactos.org>
:: COPYRIGHT: Copyright 2018 Colin Finck <colin@reactos.org>
::
@echo off

2
RosBE-Windows/Root/Build-Shared.cmd
View File

@ -3,7 +3,7 @@
:: LICENSE: GNU General Public License v2. (see LICENSE.txt)
:: FILE: Root/Build-Shared.cmd
:: PURPOSE: Perform the build of ReactOS - Shared commands.
:: COPYRIGHT: Copyright 2016 Daniel Reimer <daniel.reimer@reactos.org>
:: COPYRIGHT: Copyright 2018 Daniel Reimer <daniel.reimer@reactos.org>
:: Colin Finck <colin@reactos.org>
:: Peter Ward <dralnix@gmail.com>
::

8
RosBE-Windows/Root/ChangeLog.txt
View File

@ -1,3 +1,11 @@
*** Feb 01th, 2018 - RosBE 2.1.6 Released
- Removed sSVN command and SVN due to GIT merge of ReactOS code base. (Daniel Reimer)
- Updated Flex to 2.6.3 (Daniel Reimer)
- Updated WGet to 1.19.4 (Daniel Reimer)
- Updated Ninja to 1.8.2 (Daniel Reimer)
- Updated CMake to 3.2.1 + VS2017 support (Amine Khaldi)
*** Aug 08th, 2017 - RosBE 2.1.5 Released
- Changed ninja to Win32 build (Daniel Reimer)

2
RosBE-Windows/Root/Clean.cmd
View File

@ -3,7 +3,7 @@
:: LICENSE: GNU General Public License v2. (see LICENSE.txt)
:: FILE: Root/Clean.cmd
:: PURPOSE: Clean the ReactOS source directory.
:: COPYRIGHT: Copyright 2017 Daniel Reimer <reimer.daniel@freenet.de>
:: COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
:: Peter Ward <dralnix@gmail.com>
:: Colin Finck <colin@reactos.org>
::

22
RosBE-Windows/Root/Help.cmd
View File

@ -3,7 +3,7 @@
:: LICENSE: GNU General Public License v2. (see LICENSE.txt)
:: FILE: Root/Help.cmd
:: PURPOSE: Display help for the commands included with the ReactOS Build Environment.
:: COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
:: COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
:: Peter Ward <dralnix@gmail.com>
:: Colin Finck <colin@reactos.org>
::
@ -75,12 +75,6 @@ if "%1" == "" (
echo shortcutted ReactOS source directories.
)
if exist "%_ROSBE_BASEDIR%\sSVN.cmd" (
echo ssvn [OPTIONS] - Create, update or clean-up your ReactOS source
echo tree or show the revision number of the local
echo and online trees.
)
if exist "%_ROSBE_BASEDIR%\options.cmd" (
echo options - Starts the RosBE configurator and sets the
echo changes active immediately.
@ -215,20 +209,6 @@ if "%1" == "" (
if exist "%_ROSBE_BASEDIR%\scut.cmd" (
scut.exe --help
)
) else if /i "%1" == "ssvn" (
if exist "%_ROSBE_BASEDIR%\sSVN.cmd" (
echo Usage: ssvn [OPTIONS]
echo Creates, updates or cleans up your ReactOS source tree or shows the revision
echo number of the local and online trees.
echo.
echo update - Updates to HEAD revision or to a specific one when the second
echo parameter specifies one.
echo create - Creates a new ReactOS source tree.
echo rosapps - Creates / Updates a ReactOS RosApps source tree.
echo rostests - Creates / Updates a ReactOS RosTests source tree.
echo cleanup - Cleans up and fixes errors in the source tree.
echo status - Show the current local and online revision numbers.
)
) else if /i "%1" == "options" (
if exist "%_ROSBE_BASEDIR%\options.cmd" (
echo Usage: options

2
RosBE-Windows/Root/LICENSE.txt
View File

@ -1,4 +1,4 @@
ReactOS Build Environment v2.1.5
ReactOS Build Environment v2.1.6
Various parts of the ReactOS Build Environment are under different license's, the license's are as follows.
(The complete text for each license is included in this document excluding Subversion)

2
RosBE-Windows/Root/Make.cmd
View File

@ -3,7 +3,7 @@
:: LICENSE: GNU General Public License v2. (see LICENSE.txt)
:: FILE: Root/Make.cmd
:: PURPOSE: Perform a uniprocessor build
:: COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
:: COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
:: Colin Finck <colin@reactos.org>
:: Peter Ward <dralnix@gmail.com>
::

2
RosBE-Windows/Root/Makex.cmd
View File

@ -3,7 +3,7 @@
:: LICENSE: GNU General Public License v2. (see LICENSE.txt)
:: FILE: Root/Makex.cmd
:: PURPOSE: Perform a multiprocessor build
:: COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
:: COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
:: Colin Finck <colin@reactos.org>
:: Peter Ward <dralnix@gmail.com>
::

BIN
RosBE-Windows/Root/README.odt
View File

Binary file not shown.

BIN
RosBE-Windows/Root/README.pdf
View File

Binary file not shown.

2
RosBE-Windows/Root/Remake.cmd
View File

@ -3,7 +3,7 @@
:: LICENSE: GNU General Public License v2. (see LICENSE.txt)
:: FILE: Root/Remake.cmd
:: PURPOSE: Fully re-make one or several modules.
:: COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
:: COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
::
@echo off

2
RosBE-Windows/Root/Remakex.cmd
View File

@ -3,7 +3,7 @@
:: LICENSE: GNU General Public License v2. (see LICENSE.txt)
:: FILE: Root/Remakex.cmd
:: PURPOSE: Fully re-make one or several modules multithreaded.
:: COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
:: COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
::
@echo off

2
RosBE-Windows/Root/Renv.cmd
View File

@ -3,7 +3,7 @@
:: LICENSE: GNU General Public License v2. (see LICENSE.txt)
:: FILE: Root/Renv.cmd
:: PURPOSE: Shows RosBE's Environment Variables.
:: COPYRIGHT: Copyright 2016 Colin Finck <colin@reactos.org>
:: COPYRIGHT: Copyright 2018 Colin Finck <colin@reactos.org>
::
@echo off

15
RosBE-Windows/Root/RosBE.cmd
View File

@ -4,7 +4,7 @@
:: FILE: Root/RosBE.cmd
:: PURPOSE: This script provides/sets up various build environments for
:: ReactOS. Currently it provides a GCC 4.7.2 build environment.
:: COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
:: COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
:: Peter Ward <dralnix@gmail.com>
:: Colin Finck <colin@reactos.org>
::
@ -75,7 +75,7 @@ if defined _ROSBE_CMAKE_DIFF (
set BUILD_ENVIRONMENT=MinGW
set _ROSBE_BASEDIR=%~dp0
set _ROSBE_BASEDIR=%_ROSBE_BASEDIR:~0,-1%
set _ROSBE_VERSION=2.1.5
set _ROSBE_VERSION=2.1.6
set _ROSBE_ROSSOURCEDIR=%CD%
set _ROSBE_SHOWTIME=1
set _ROSBE_WRITELOG=1
@ -166,13 +166,10 @@ echo For a list of all included commands, type: "help"
echo -------------------------------------------------
echo.
:: Look if the ReactOS source directory is empty. If so,
:: inform the user and mention 'ssvn create' (only if ssvn is installed).
:: Look if the ReactOS source directory is empty.
setlocal enabledelayedexpansion
if exist "%_ROSBE_BASEDIR%\sSVN.cmd" (
dir /b "%_ROSBE_ROSSOURCEDIR%" 2>nul | findstr "." >nul
if !errorlevel! == 1 (
echo No ReactOS source detected. Please use "ssvn create" to download it.
)
dir /b "%_ROSBE_ROSSOURCEDIR%" 2>nul | findstr "." >nul
if !errorlevel! == 1 (
echo No ReactOS source detected. Please check https://reactos.org/wiki/ReactOS_Git_For_Dummies to download it.
)
endlocal

2
RosBE-Windows/Root/TimeDate.cmd
View File

@ -3,7 +3,7 @@
:: LICENSE: GNU General Public License v2. (see LICENSE.txt)
:: FILE: Root/TimeDate.cmd
:: PURPOSE: Get the current date and time for use in our build log's file name.
:: COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
:: COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
:: Peter Ward <dralnix@gmail.com>
:: Colin Finck <colin@reactos.org>
::

2
RosBE-Windows/Root/charch.cmd
View File

@ -3,7 +3,7 @@
:: LICENSE: GNU General Public License v2. (see LICENSE.txt)
:: FILE: Root/charch.cmd
:: PURPOSE: Tool to change the current Arch to build ROS for in RosBE.
:: COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
:: COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
:: Colin Finck <colin@reactos.org>
::

2
RosBE-Windows/Root/chdefdir.cmd
View File

@ -4,7 +4,7 @@
:: FILE: Root/chdefdir.cmd
:: PURPOSE: Tool to change the current working ReactOS source directory
:: in RosBE.
:: COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
:: COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
:: Peter Ward <dralnix@gmail.com>
:: Colin Finck <colin@reactos.org>
::

2
RosBE-Windows/Root/chdefgcc.cmd
View File

@ -3,7 +3,7 @@
:: LICENSE: GNU General Public License v2. (see LICENSE.txt)
:: FILE: Root/chdefgcc.cmd
:: PURPOSE: Tool to change the current gcc in RosBE.
:: COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
:: COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
:: Peter Ward <dralnix@gmail.com>
:: Colin Finck <colin@reactos.org>
::

2
RosBE-Windows/Root/kdbg.cmd
View File

@ -3,7 +3,7 @@
:: LICENSE: GNU General Public License v2. (see LICENSE.txt)
:: FILE: Root/kdbg.cmd
:: PURPOSE: Displays a KDBG Session Interactively.
:: COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
:: COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
::
@echo off

2
RosBE-Windows/Root/options.cmd
View File

@ -3,7 +3,7 @@
:: LICENSE: GNU General Public License v2. (see LICENSE.txt)
:: FILE: Root/options.cmd
:: PURPOSE: Starts options.exe and restarts RosBE afterwards.
:: COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
:: COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
::
@echo off

2
RosBE-Windows/Root/raddr2line.cmd
View File

@ -3,7 +3,7 @@
:: LICENSE: GNU General Public License v2. (see LICENSE.txt)
:: FILE: Root/raddr2line.cmd
:: PURPOSE: Converts a value to hex and displays it.
:: COPYRIGHT: Copyright 2016 Christoph von Wittich <Christoph_vW@reactos.org>
:: COPYRIGHT: Copyright 2018 Christoph von Wittich <Christoph_vW@reactos.org>
:: Daniel Reimer <reimer.daniel@freenet.de>
:: Peter Ward <dralnix@gmail.com>
:: Colin Finck <colin@reactos.org>

2
RosBE-Windows/Root/raddr2lineNW.cmd
View File

@ -3,7 +3,7 @@
:: LICENSE: GNU General Public License v2. (see LICENSE.txt)
:: FILE: Root/raddr2line.cmd
:: PURPOSE: Converts a value to hex and displays it.
:: COPYRIGHT: Copyright 2016 Christoph von Wittich <Christoph_vW@reactos.org>
:: COPYRIGHT: Copyright 2018 Christoph von Wittich <Christoph_vW@reactos.org>
:: Daniel Reimer <reimer.daniel@freenet.de>
:: Peter Ward <dralnix@gmail.com>
:: Colin Finck <colin@reactos.org>

2
RosBE-Windows/Root/rosbe-gcc-env.cmd
View File

@ -3,7 +3,7 @@
:: LICENSE: GNU General Public License v2. (see LICENSE.txt)
:: FILE: Root/rosbe-gcc-env.cmd
:: PURPOSE: Set up toolchain-specific settings when initializing RosBE and when using "charch" or "chdefgcc"
:: COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
:: COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
:: Peter Ward <dralnix@gmail.com>
:: Colin Finck <colin@reactos.org>
::

273
RosBE-Windows/Root/sSVN.cmd
View File

@ -1,273 +0,0 @@
::
:: PROJECT: RosBE - ReactOS Build Environment for Windows
:: LICENSE: GNU General Public License v2. (see LICENSE.txt)
:: FILE: Root/sSVN.cmd
:: PURPOSE: Integrated SVN Client.
:: COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
::
@echo off
if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0
if %_ROSBE_DEBUG% == 1 (
@echo on
)
setlocal enabledelayedexpansion
set ROS_SVNURL=https://svn.reactos.org/reactos
if not defined ROS_BRANCH (
set ROS_SVNURL=%ROS_SVNURL%/trunk
) else (
set ROS_SVNURL=%ROS_SVNURL%/branches/%ROS_BRANCH%
)
wget --spider --no-verbose %ROS_SVNURL%/reactos 1> NUL 2> NUL
if ERRORLEVEL 1 (
wget --spider --no-verbose %ROS_SVNURL% 1> NUL 2> NUL
if ERRORLEVEL 1 (
echo The selected branch does not exist or the Internet Connection is down.
goto :EOC
) else (
set rsubfolder=
set disapptest=1
)
) else (
set rsubfolder=/reactos
set disapptest=0
)
set _ROSBE_SSVNSOURCEDIR=%CD%
set _ROSBE_SVN_EXECUTABLE="%_ROSBE_BASEDIR%\bin\svn.exe"
:: Receive the first parameter and decide what to do.
if "%1" == "" (
echo No parameter specified. Try 'help [COMMAND]'.
goto :EOC
)
:: These two are directly parsed to svn.
if /i "%1" == "update" (
title SVN Updating...
echo This might take a while, so please be patient.
echo.
set _ROSBE_SSVN_JOB=update
goto :UP
)
if /i "%1" == "cleanup" (
title SVN Cleaning...
%_ROSBE_SVN_EXECUTABLE% cleanup
goto :EOC
)
:: Check if the folder is empty. If not, output an error.
if /i "%1" == "create" (
title SVN Creating...
if exist ".svn\." (
echo ERROR: Folder already contains a repository.
goto :EOC
)
rd /s /q "%_ROSBE_LOGDIR%" 1> NUL 2> NUL
dir /b 2>nul | findstr "." >nul
if errorlevel 1 (
if not "%2" == "" (
%_ROSBE_SVN_EXECUTABLE% checkout -r %2 %ROS_SVNURL%%rsubfolder% .
) else (
%_ROSBE_SVN_EXECUTABLE% checkout %ROS_SVNURL%%rsubfolder% .
)
) else (
echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED
)
goto :EOC
)
:: Check if the folder is empty. If not, output an error.
if /i "%1" == "rosapps" (
if "%disapptest%" == "0" (
if not "%2" == "" (
if not exist "modules\rosapps\." (
md "modules\rosapps"
)
if exist "modules\rosapps\.svn\." (
title SVN RosApps Updating...
cd "modules\rosapps"
%_ROSBE_SVN_EXECUTABLE% update -r %2
) else (
title SVN RosApps Creating...
cd "modules\rosapps"
dir /b 2>nul | findstr "." >nul
if errorlevel 1 (
%_ROSBE_SVN_EXECUTABLE% checkout -r %2 %ROS_SVNURL%/rosapps .
) else (
echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED
)
)
) else (
if not exist "modules\rosapps\." (
md "modules\rosapps"
)
if exist "modules\rosapps\.svn\." (
title SVN RosApps Updating...
cd "modules\rosapps"
%_ROSBE_SVN_EXECUTABLE% update
) else (
title SVN RosApps Creating...
cd "modules\rosapps"
dir /b 2>nul | findstr "." >nul
if errorlevel 1 (
%_ROSBE_SVN_EXECUTABLE% checkout %ROS_SVNURL%/rosapps .
) else (
echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED
)
)
)
cd "%_ROSBE_SSVNSOURCEDIR%"
goto :EOC
) else (
echo Rosapps and Rostests disabled.
)
)
:: Check if the folder is empty. If not, output an error.
if /i "%1" == "rostests" (
if "%disapptest%" == "0" (
if not "%2" == "" (
if not exist "modules\rostests\." (
md "modules\rostests"
)
if exist "modules\rostests\.svn\." (
title SVN RosTests Updating...
cd "modules\rostests"
%_ROSBE_SVN_EXECUTABLE% update -r %2
) else (
title SVN RosTests Creating...
cd "modules\rostests"
dir /b 2>nul | findstr "." >nul
if errorlevel 1 (
%_ROSBE_SVN_EXECUTABLE% checkout -r %2 %ROS_SVNURL%/rostests .
) else (
echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED
)
)
) else (
if not exist "modules\rostests\." (
md "modules\rostests"
)
if exist "modules\rostests\.svn\." (
title SVN RosTests Updating...
cd "modules\rostests"
%_ROSBE_SVN_EXECUTABLE% update
) else (
title SVN RosTests Creating...
cd "modules\rostests"
dir /b 2>nul | findstr "." >nul
if errorlevel 1 (
%_ROSBE_SVN_EXECUTABLE% checkout %ROS_SVNURL%/rostests .
) else (
echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED
)
)
)
cd "%_ROSBE_SSVNSOURCEDIR%"
goto :EOC
) else (
echo Rosapps and Rostests disabled.
)
)
:: Output the revision of the local and online trees and tell the user if
:: its up to date or not.
if /i "%1" == "status" (
title SVN Status
echo This might take a while, so please be patient.
echo.
set _ROSBE_SSVN_JOB=status
goto :UP
)
if not "%1" == "" (
echo Unknown parameter specified. Try 'help ssvn'.
)
goto :EOC
:UP
for /f "usebackq tokens=4" %%i in (`call %_ROSBE_SVN_EXECUTABLE% info ^| find "Last Changed Rev:"`) do set OFFSVN=%%i
for /f "usebackq tokens=4" %%j in (`call %_ROSBE_SVN_EXECUTABLE% info %ROS_SVNURL%%rsubfolder% ^| find "Last Changed Rev:"`) do set ONSVN=%%j
echo Local Revision: !OFFSVN!
echo Online HEAD Revision: !ONSVN!
echo.
if !OFFSVN! lss !ONSVN! (
if "!_ROSBE_SSVN_JOB!" == "status" (
echo Your tree is not up to date. Do you want to update it?
set /p UP="Please enter 'yes' or 'no': "
if /i "!UP!" == "yes" set _ROSBE_SSVN_JOB=update
)
)
if !OFFSVN! equ !ONSVN! (
echo Your tree is up to date.
goto :EOC
)
if "!_ROSBE_SSVN_JOB!" == "update" (
if not "%2" == "" (
if "%2" == "!OFFSVN!" (
echo Your Local Repository is currently %2
)
if "%2" LSS "!OFFSVN!" (
echo Downgrading to %2 ...
)
if "%2" GTR "!OFFSVN!" (
echo Updating to %2 ...
)
if not "%_BUILDBOT_SVNSKIPMAINTRUNK%" == "1" (
%_ROSBE_SVN_EXECUTABLE% update -r %2
) else (
echo Skipping ReactOS Trunk update.
)
if exist "modules\rosapps\." (
cd "modules\rosapps"
echo Updating RosApps...
%_ROSBE_SVN_EXECUTABLE% update -r %2
cd "%_ROSBE_SSVNSOURCEDIR%"
)
if exist "modules\rostests\." (
cd "modules\rostests"
echo Updating RosTests...
%_ROSBE_SVN_EXECUTABLE% update -r %2
cd "%_ROSBE_SSVNSOURCEDIR%"
)
) else (
if not "%_BUILDBOT_SVNSKIPMAINTRUNK%" == "1" (
%_ROSBE_SVN_EXECUTABLE% update
) else (
echo Skipping ReactOS Trunk update.
)
if exist "modules\rosapps\." (
cd "modules\rosapps"
echo Updating RosApps...
%_ROSBE_SVN_EXECUTABLE% update
cd "%_ROSBE_SSVNSOURCEDIR%"
)
if exist "modules\rostests\." (
cd "modules\rostests"
echo Updating RosTests...
%_ROSBE_SVN_EXECUTABLE% update
cd "%_ROSBE_SSVNSOURCEDIR%"
)
)
echo Do you want to see the changelog?
set /p CL="Please enter 'yes' or 'no': "
if /i "!CL!"=="yes" (
%_ROSBE_SVN_EXECUTABLE% log -r !OFFSVN!:!ONSVN!
)
)
goto :EOC
:EOC
title ReactOS Build Environment %_ROSBE_VERSION%
endlocal

2
RosBE-Windows/Root/scut.cmd
View File

@ -3,7 +3,7 @@
:: LICENSE: GNU General Public License v2. (see LICENSE.txt)
:: FILE: Root/scut.cmd
:: PURPOSE: Manages named shortcuts to ReactOS source directories.
:: COPYRIGHT: Copyright 2016 Colin Finck <mail@colinfinck.de>
:: COPYRIGHT: Copyright 2018 Colin Finck <mail@colinfinck.de>
:: Daniel Reimer <reimer.daniel@freenet.de>
:: Peter Ward <dralnix@gmail.com>
::

4
RosBE-Windows/Root/update.cmd
View File

@ -3,7 +3,7 @@
:: LICENSE: GNU General Public License v2. (see LICENSE.txt)
:: FILE: Root/update.cmd
:: PURPOSE: RosBE Updater.
:: COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
:: COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
::
@echo off
@ -17,7 +17,7 @@ setlocal enabledelayedexpansion
title Updating...
:: The Update Server.
set _ROSBE_URL=http://svn.reactos.org/downloads/rosbe
set _ROSBE_URL=https://svn.reactos.org/downloads/rosbe
:: Save the recent dir to cd back there at the end.
set _ROSBE_OPATH=%CD%

2
RosBE-Windows/Root/version.cmd
View File

@ -3,7 +3,7 @@
:: LICENSE: GNU General Public License v2. (see LICENSE.txt)
:: FILE: Root/version.cmd
:: PURPOSE: Display the current version of GCC, NASM, ld and make.
:: COPYRIGHT: Copyright 2016 Daniel Reimer <reimer.daniel@freenet.de>
:: COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
:: Colin Finck <colin@reactos.org>
::

64
RosBE-Windows/RosBE.nsi
View File

@ -1,6 +1,6 @@
Unicode true
!define PRODUCT_NAME "ReactOS Build Environment"
!define PRODUCT_VERSION "2.1.5"
!define PRODUCT_VERSION "2.1.6"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKCU"
@ -18,15 +18,15 @@ ShowUnInstDetails show
;;
;; Add version/product information metadata to the installation file.
;;
VIAddVersionKey /LANG=1033 "FileVersion" "2.1.5.0"
VIAddVersionKey /LANG=1033 "FileVersion" "2.1.6.0"
VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}"
VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}"
VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System"
VIAddVersionKey /LANG=1033 "CompanyName" "ReactOS Foundation"
VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2017 ReactOS Foundation"
VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2017 ReactOS Foundation"
VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2018 ReactOS Foundation"
VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2018 ReactOS Foundation"
VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup"
VIProductVersion "2.1.5.0"
VIProductVersion "2.1.6.0"
CRCCheck force
SetDatablockOptimize on
@ -109,6 +109,10 @@ ReserveFile /plugin InstallOptions.dll
!insertmacro MUI_LANGUAGE "English"
Section -BaseFiles SEC01
;; Make the directory "$INSTDIR" read write accessible by all users
AccessControl::GrantOnFile "$INSTDIR" "(BU)" "GenericRead + GenericWrite"
SetShellVarContext current
SetOutPath "$INSTDIR"
SetOverwrite try
@ -135,7 +139,6 @@ Section -BaseFiles SEC01
File /r Root\RosBE.cmd
File /r Root\rosbe-gcc-env.cmd
File /r Root\scut.cmd
File /r Root\sSVN.cmd
File /r Root\TimeDate.cmd
File /r Root\update.cmd
File /r Root\version.cmd
@ -146,7 +149,6 @@ Section -BaseFiles SEC01
SetOverwrite try
File /r Components\Bin\7z.dll
File /r Components\Bin\7z.exe
File /r Components\Bin\apr_ldap-1.dll
File /r Components\Bin\bison.exe
File /r Components\Bin\buildtime.exe
File /r Components\Bin\ccache.exe
@ -160,8 +162,6 @@ Section -BaseFiles SEC01
File /r Components\Bin\cpucount.exe
File /r Components\Bin\ctest.exe
File /r Components\Bin\diff.exe
File /r Components\Bin\diff3.exe
File /r Components\Bin\diff4.exe
File /r Components\Bin\echoh.exe
File /r Components\Bin\elevate.exe
File /r Components\Bin\flash.exe
@ -169,26 +169,12 @@ Section -BaseFiles SEC01
File /r Components\Bin\gdb.exe
File /r Components\Bin\gdbserver.exe
File /r Components\Bin\getdate.exe
File /r Components\Bin\libapr-1.dll
File /r Components\Bin\libapriconv-1.dll
File /r Components\Bin\libaprutil-1.dll
File /r Components\Bin\libeay32.dll
File /r Components\Bin\libexpat-1.dll
File /r Components\Bin\libgcc_s_dw2-1.dll
File /r Components\Bin\libiconv2.dll
File /r Components\Bin\libiconv-2.dll
File /r Components\Bin\libintl3.dll
File /r Components\Bin\libintl-8.dll
File /r Components\Bin\libsasl.dll
File /r Components\Bin\libsvn_client-1.dll
File /r Components\Bin\libsvn_delta-1.dll
File /r Components\Bin\libsvn_diff-1.dll
File /r Components\Bin\libsvn_fs-1.dll
File /r Components\Bin\libsvn_ra-1.dll
File /r Components\Bin\libsvn_repos-1.dll
File /r Components\Bin\libsvn_subr-1.dll
File /r Components\Bin\libsvn_wc-1.dll
File /r Components\Bin\libsvnjavahl-1.dll
File /r Components\Bin\log2lines.exe
File /r Components\Bin\m4.exe
File /r Components\Bin\Microsoft.VC90.CRT.manifest
@ -197,10 +183,8 @@ Section -BaseFiles SEC01
File /r Components\Bin\MSVCM90.dll
File /r Components\Bin\msvcp60.dll
File /r Components\Bin\MSVCP90.dll
File /r Components\Bin\MSVCP100.dll
File /r Components\Bin\MSVCP120.dll
File /r Components\Bin\MSVCR90.dll
File /r Components\Bin\MSVCR100.dll
File /r Components\Bin\MSVCR120.dll
File /r Components\Bin\ninja.exe
File /r Components\Bin\options.exe
@ -211,37 +195,10 @@ Section -BaseFiles SEC01
File /r Components\Bin\playwav.exe
File /r Components\Bin\regex2.dll
File /r Components\Bin\rquote.exe
File /r Components\Bin\saslANONYMOUS.dll
File /r Components\Bin\saslCRAMMD5.dll
File /r Components\Bin\saslDIGESTMD5.dll
File /r Components\Bin\saslLOGIN.dll
File /r Components\Bin\saslNTLM.dll
File /r Components\Bin\saslPLAIN.dll
File /r Components\Bin\scut.exe
File /r Components\Bin\sdiff.exe
File /r Components\Bin\ssleay32.dll
File /r Components\Bin\svn.exe
File /r Components\Bin\svnadmin.exe
File /r Components\Bin\svnauthz.exe
File /r Components\Bin\svnauthz-validate.exe
File /r Components\Bin\svndumpfilter.exe
File /r Components\Bin\svnlook.exe
File /r Components\Bin\svnmucc.exe
File /r Components\Bin\svn-populate-node-origins-index.exe
File /r Components\Bin\svnraisetreeconflict.exe
File /r Components\Bin\svnrdump.exe
File /r Components\Bin\svnserve.exe
File /r Components\Bin\svnsync.exe
File /r Components\Bin\svnversion.exe
File /r Components\Bin\tee.exe
File /r Components\Bin\wget.exe
File /r Components\Bin\zlib1.dll
SetOutPath "$INSTDIR\Bin\iconv"
SetOverwrite try
File /r Components\Bin\iconv\*.*
SetOutPath "$INSTDIR\Bin\license"
SetOverwrite try
File /r Components\Bin\license\*.*
SetOutPath "$INSTDIR\Bin\data"
SetOverwrite try
File /r Components\Bin\data\*.*
@ -309,7 +266,6 @@ Section /o "PowerShell Version" SEC05
File /r Components\Powershell\RosBE.ps1
File /r Components\Powershell\rosbe-gcc-env.ps1
File /r Components\Powershell\scut.ps1
File /r Components\Powershell\sSVN.ps1
File /r Components\Powershell\update.ps1
File /r Components\Powershell\version.ps1
SetOutPath "$DESKTOP"
@ -464,8 +420,6 @@ Section Uninstall
Delete /REBOOTOK "$INSTDIR\rosbe-gcc-env.ps1"
Delete /REBOOTOK "$INSTDIR\scut.cmd"
Delete /REBOOTOK "$INSTDIR\scut.ps1"
Delete /REBOOTOK "$INSTDIR\sSVN.cmd"
Delete /REBOOTOK "$INSTDIR\sSVN.ps1"
Delete /REBOOTOK "$INSTDIR\TimeDate.cmd"
Delete /REBOOTOK "$INSTDIR\uninstall.ico"
Delete /REBOOTOK "$INSTDIR\update.cmd"

6
RosBE-Windows/Tools/buildtime.c
View File

@ -3,9 +3,9 @@
* LICENSE: GNU General Public License v2. (see LICENSE.txt)
* FILE: Tools/buildtime.c
* PURPOSE: Buildtime Counter
* COPYRIGHT: Copyright 2007 KJK::Hyperion
* Copyright 2007 Peter Ward <dralnix@gmail.com>
* Copyright 2010 Colin Finck <colin@reactos.org>
* COPYRIGHT: Copyright 2018 KJK::Hyperion
* Peter Ward <dralnix@gmail.com>
* Colin Finck <colin@reactos.org>
*
*/

2
RosBE-Windows/Tools/chknewer.c
View File

@ -3,7 +3,7 @@
* LICENSE: GNU General Public License v2. (see LICENSE.txt)
* FILE: Tools/chknewer.c
* PURPOSE: Check if a file is newer than another.
* COPYRIGHT: Copyright 2008 Peter Ward <dralnix@gmail.com>
* COPYRIGHT: Copyright 2018 Peter Ward <dralnix@gmail.com>
*
*/

2
RosBE-Windows/Tools/chkslash.c
View File

@ -3,7 +3,7 @@
* LICENSE: GNU General Public License v2. (see LICENSE.txt)
* FILE: Tools/chkslash.c
* PURPOSE: Checks if a string has a backslash '\' in it or not.
* COPYRIGHT: Copyright 2008 Peter Ward <dralnix@gmail.com>
* COPYRIGHT: Copyright 2018 Peter Ward <dralnix@gmail.com>
*
*/

18
RosBE-Windows/Tools/config/x86/options.c
View File

@ -3,9 +3,9 @@
* LICENSE: GNU General Public License v2. (see LICENSE.txt)
* FILE: Tools/config/options.c
* PURPOSE: Configuring RosBE
* COPYRIGHT: Copyright 2007 Maarten Bosma
* Copyright 2007 Pierre Schweitzer
* Copyright 2016 Daniel Reimer
* COPYRIGHT: Copyright 2018 Maarten Bosma
* Pierre Schweitzer
* Daniel Reimer
*
*/
@ -62,9 +62,9 @@ getConfigFileCMD()
}
else
{
if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-2.1.5.cmd")) < MAX_PATH)
if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-2.1.6.cmd")) < MAX_PATH)
{
wcscat(filename, L"\\RosBE\\rosbe-options-2.1.5.cmd");
wcscat(filename, L"\\RosBE\\rosbe-options-2.1.6.cmd");
}
}
}
@ -80,7 +80,7 @@ getConfigFileCMD()
}
else
{
wcscpy(filename, L"rosbe-options-2.1.5.cmd");
wcscpy(filename, L"rosbe-options-2.1.6.cmd");
}
}
return filename;
@ -110,9 +110,9 @@ getConfigFilePS1()
}
else
{
if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-2.1.5.ps1")) < MAX_PATH)
if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-2.1.6.ps1")) < MAX_PATH)
{
wcscat(filename, L"\\RosBE\\rosbe-options-2.1.5.ps1");
wcscat(filename, L"\\RosBE\\rosbe-options-2.1.6.ps1");
}
}
}
@ -128,7 +128,7 @@ getConfigFilePS1()
}
else
{
wcscpy(filename, L"rosbe-options-2.1.5.ps1");
wcscpy(filename, L"rosbe-options-2.1.6.ps1");
}
}
return filename;

2
RosBE-Windows/Tools/config/x86/options.exe.Manifest
View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="ReactOS.options"
processorArchitecture="x86"
version="2.1.5.0"
version="2.1.6.0"
type="win32"/>
<description>Config Tool</description>
<dependency>

6
RosBE-Windows/Tools/config/x86/options.h
View File

@ -3,9 +3,9 @@
* LICENSE: GNU General Public License v2. (see LICENSE.txt)
* FILE: Tools/config/options.h
* PURPOSE: Configuring RosBE
* COPYRIGHT: Copyright 2007 Maarten Bosma
* Copyright 2007 Pierre Schweitzer
* Copyright 2016 Daniel Reimer
* COPYRIGHT: Copyright 2018 Maarten Bosma
* Pierre Schweitzer
* Daniel Reimer
*
*/

6
RosBE-Windows/Tools/config/x86/options.rc
View File

@ -24,12 +24,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Marteen Bosma / Daniel Reimer / Pierre Schweitzer\0"
VALUE "FileDescription", "Config Tool for RosBE\0"
VALUE "FileVersion", "2.1.5.0\0"
VALUE "FileVersion", "2.1.6.0\0"
VALUE "InternalName", "options\0"
VALUE "LegalCopyright", "Copyright © Marteen Bosma / Daniel Reimer / Pierre Schweitzer 2016\0"
VALUE "LegalCopyright", "Copyright © Marteen Bosma / Daniel Reimer / Pierre Schweitzer 2018\0"
VALUE "OriginalFilename", "options.exe\0"
VALUE "ProductName", "Config Tool for RosBE\0"
VALUE "ProductVersion", "2.1.5.0\0"
VALUE "ProductVersion", "2.1.6.0\0"
END
END
BLOCK "VarFileInfo"

6
RosBE-Windows/Tools/config/x86/resources.h
View File

@ -3,9 +3,9 @@
* LICENSE: GNU General Public License v2. (see LICENSE.txt)
* FILE: Tools/config/resources.h
* PURPOSE: Configuring RosBE
* COPYRIGHT: Copyright 2007 Maarten Bosma
* Copyright 2007 Pierre Schweitzer
* Copyright 2011 Daniel Reimer
* COPYRIGHT: Copyright 2018 Maarten Bosma
* Pierre Schweitzer
* Daniel Reimer
*
*/

2
RosBE-Windows/Tools/echoh.c
View File

@ -3,7 +3,7 @@
* LICENSE: GNU General Public License v2. (see LICENSE.txt)
* FILE: Tools/echoh.c
* PURPOSE: Converts a value to hex and displays it
* COPYRIGHT: Copyright 2008 Christoph von Wittich <Christoph_vW@reactos.org>
* COPYRIGHT: Copyright 2018 Christoph von Wittich <Christoph_vW@reactos.org>
*
*/

2
RosBE-Windows/Tools/flash.c
View File

@ -3,7 +3,7 @@
* LICENSE: GNU General Public License v2. (see LICENSE.txt)
* FILE: Tools/flash.c
* PURPOSE: Taskbar Flasher
* COPYRIGHT: Copyright 2008 Ged Murphy <gedmurphy@reactos.org>
* COPYRIGHT: Copyright 2018 Ged Murphy <gedmurphy@reactos.org>
*
*/

2
RosBE-Windows/Tools/getdate.c
View File

@ -3,7 +3,7 @@
* LICENSE: GNU General Public License v2. (see LICENSE.txt)
* FILE: Tools/getdate.c
* PURPOSE: Returns System Date
* COPYRIGHT: Copyright 2008 Peter Ward <dralnix@gmail.com>
* COPYRIGHT: Copyright 2018 Peter Ward <dralnix@gmail.com>
*
*/

2
RosBE-Windows/Tools/playwav.cpp
View File

@ -3,7 +3,7 @@
* LICENSE: GNU General Public License v2. (see LICENSE.txt)
* FILE: Tools/playwav.c
* PURPOSE: WAVE Player
* COPYRIGHT: Copyright 2010 Daniel Reimer <reimer.daniel@freenet.de>
* COPYRIGHT: Copyright 2018 Daniel Reimer <reimer.daniel@freenet.de>
*
*/

2
RosBE-Windows/Tools/rquote.c
View File

@ -3,7 +3,7 @@
* LICENSE: GNU General Public License v2. (see LICENSE.txt)
* FILE: Tools/rquote.c
* PURPOSE: Removes all quotes from a string.
* COPYRIGHT: Copyright 2008 Peter Ward <dralnix@gmail.com>
* COPYRIGHT: Copyright 2018 Peter Ward <dralnix@gmail.com>
*
*/

2
RosBE-Windows/Tools/tee.c
View File

@ -3,7 +3,7 @@
* LICENSE: GNU General Public License v2. (see LICENSE.txt)
* FILE: Tools/tee.c
* PURPOSE: Spit stdin to stdout and a file.
* COPYRIGHT: Copyright 2008 Peter Ward <dralnix@gmail.com>
* COPYRIGHT: Copyright 2018 Peter Ward <dralnix@gmail.com>
*
*/

2
RosBE-Windows/rosbe.xsl
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2011, Ziliang Guo
Copyright (c) 2018, Ziliang Guo
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,