reactos/RosBE
1
0
Fork 0
mirror of https://github.com/reactos/RosBE.git synced 2025-02-17 09:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update RosBE to 2.1 Amine Edition and update changelog

Browse Source 
svn path=/trunk/RosBE/; revision=1664
This commit is contained in:
Daniel Reimer 2012-09-15 12:26:52 +00:00
parent cda561969f
commit 42e3619062
8 changed files with 63 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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.0"
$global:_ROSBE_VERSION = "2.1"
$global:_ROSBE_ROSSOURCEDIR = "$pwd"
$global:_ROSBE_SHOWTIME = 1
$global:_ROSBE_WRITELOG = 1

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

@ -1,12 +1,25 @@
*** Feb XXth, 2012 - RosBE 2.0 Released
*** Sep XXth, 2012 - RosBE 2.1 Released
- Amine Edition -
- Updated GCC to 4.7.1 mingw-w64 (Amine Khaldi)
- Updated ccache to 3.1.8 (Amine Khaldi)
- Updated cmake to 2.8.9 (Amine Khaldi)
- Added ninja 120715 (Amine Khaldi)
- Updated nasm to 2.10.5 (Daniel Reimer)
- Updated SVN to 1.7.6 (Daniel Reimer)
- Updated NSIS to 2.46.5 unicode (Daniel Reimer)
- Fix detection of all CPU cores in VMWare ESXi environment (Daniel Reimer)
- Stop SEGV from trying to fclose(NULL) in options.exe (Mike Nordell)
*** Feb 12th, 2012 - RosBE 2.0 Released
- Updated parts of GCC
* gmp 5.0.2
* mpfr 3.0.1
- Updated pexports 0.44.1 (Daniel Reimer)
- Updated make 3.8.2 (Amine Khaldi)
- Updated gdb 7.3-2 (Daniel Reimer)
- Updated 7-zip 9.2.0 (Daniel Reimer)
- Updated pexports to 0.44.1 (Daniel Reimer)
- Updated make to 3.8.2 (Amine Khaldi)
- Updated gdb to 7.3-2 (Daniel Reimer)
- Updated 7-zip to 9.2.0 (Daniel Reimer)
- Updated cmake to 2.8.7 patched (Amine Khaldi)
- Updated svn to 1.7.2 (Daniel Reimer)
- Updated bison to 2.5 (Daniel Reimer)

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

@ -1,4 +1,4 @@
ReactOS Build Environment v2.0
ReactOS Build Environment v2.1
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)

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

Binary file not shown.

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

@ -32,7 +32,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.0
set _ROSBE_VERSION=2.1
set _ROSBE_ROSSOURCEDIR=%CD%
set _ROSBE_SHOWTIME=1
set _ROSBE_WRITELOG=1

59
RosBE-Windows/RosBE.nsi
View File

@ -1,5 +1,5 @@
!define PRODUCT_NAME "ReactOS Build Environment for Windows"
!define PRODUCT_VERSION "2.0"
!define PRODUCT_NAME "ReactOS Build Environment Amine Edition"
!define PRODUCT_VERSION "2.1"
!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"
@ -17,7 +17,7 @@ ShowUnInstDetails show
;;
;; Add version/product information metadata to the installation file.
;;
VIAddVersionKey /LANG=1033 "FileVersion" "2.0.0.0"
VIAddVersionKey /LANG=1033 "FileVersion" "2.1.0.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"
@ -25,7 +25,7 @@ VIAddVersionKey /LANG=1033 "CompanyName" "ReactOS Foundation"
VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2012 ReactOS Foundation"
VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2012 ReactOS Foundation"
VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup"
VIProductVersion "2.0.0.0"
VIProductVersion "2.1.0.0"
CRCCheck force
SetDatablockOptimize on
@ -36,7 +36,6 @@ SetCompressor /FINAL /SOLID lzma
!include "InstallOptions.nsh"
!include "RosSourceDir.nsh"
!include "LogicLib.nsh"
!include "x64.nsh"
;;
;; Read our custom page ini, remove previous version and make sure only
@ -51,11 +50,7 @@ Function .onInit
StrCmp $R0 0 +3
MessageBox MB_OK|MB_ICONEXCLAMATION "The ${PRODUCT_NAME} v${PRODUCT_VERSION} installer is already running."
Abort
${If} ${RunningX64}
StrCpy $INSTDIR "$PROGRAMFILES64\RosBE"
${Else}
StrCpy $INSTDIR "$PROGRAMFILES\RosBE"
${Endif}
StrCpy $INSTDIR "C:\RosBE"
Call UninstallPrevious
!insertmacro INSTALLOPTIONS_EXTRACT "RosSourceDir.ini"
FunctionEnd
@ -131,6 +126,7 @@ Section -BaseFiles SEC01
File /r Root\Makex.cmd
File /r Root\options.cmd
File /r Root\raddr2line.cmd
File /r Root\raddr2lineNW.cmd
File /r Root\Remake.cmd
File /r Root\Remakex.cmd
File /r Root\Renv.cmd
@ -147,12 +143,15 @@ Section -BaseFiles SEC01
SetOutPath "$INSTDIR\Bin"
SetOverwrite try
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
File /r Components\Bin\chknewer.exe
File /r Components\Bin\chkslash.exe
File /r Components\Bin\cmake.exe
File /r Components\Bin\cmake-gui.exe
File /r Components\Bin\cmcldeps.exe
File /r Components\Bin\cmp.exe
File /r Components\Bin\cmw9xcom.exe
File /r Components\Bin\cpack.exe
@ -167,23 +166,6 @@ 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\log2lines.exe
File /r Components\Bin\m4.exe
File /r Components\Bin\mingw32-make.exe
File /r Components\Bin\options.exe
File /r Components\Bin\patch.exe
File /r Components\Bin\pexports.exe
File /r Components\Bin\piperead.exe
File /r Components\Bin\playwav.exe
File /r Components\Bin\rquote.exe
File /r Components\Bin\scut.exe
File /r Components\Bin\sdiff.exe
File /r Components\Bin\svn.exe
File /r Components\Bin\svnrdump.exe
File /r Components\Bin\svnversion.exe
File /r Components\Bin\tee.exe
File /r Components\Bin\wget.exe
File /r Components\Bin\apr_ldap-1.dll
File /r Components\Bin\libapr-1.dll
File /r Components\Bin\libapriconv-1.dll
File /r Components\Bin\libaprutil-1.dll
@ -204,16 +186,36 @@ Section -BaseFiles SEC01
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\mingw32-make.exe
File /r Components\Bin\MSVCM90.dll
File /r Components\Bin\MSVCP90.dll
File /r Components\Bin\MSVCR90.dll
File /r Components\Bin\MSVCP100.dll
File /r Components\Bin\MSVCR100.dll
File /r Components\Bin\ninja.exe
File /r Components\Bin\options.exe
File /r Components\Bin\patch.exe
File /r Components\Bin\pexports.exe
File /r Components\Bin\piperead.exe
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\svnrdump.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\license"
SetOverwrite try
@ -246,6 +248,7 @@ SetShellVarContext current
File /r Components\Powershell\options.ps1
File /r Components\Powershell\playwav.ps1
File /r Components\Powershell\reladdr2line.ps1
File /r Components\Powershell\reladdr2lineNW.ps1
File /r Components\Powershell\Remake.ps1
File /r Components\Powershell\Remakex.ps1
File /r Components\Powershell\RosBE.ps1
@ -389,8 +392,10 @@ Section Uninstall
Delete /REBOOTOK "$INSTDIR\options.ps1"
Delete /REBOOTOK "$INSTDIR\playwav.ps1"
Delete /REBOOTOK "$INSTDIR\raddr2line.cmd"
Delete /REBOOTOK "$INSTDIR\raddr2lineNW.cmd"
Delete /REBOOTOK "$INSTDIR\README.pdf"
Delete /REBOOTOK "$INSTDIR\reladdr2line.ps1"
Delete /REBOOTOK "$INSTDIR\reladdr2lineNW.ps1"
Delete /REBOOTOK "$INSTDIR\Remake.cmd"
Delete /REBOOTOK "$INSTDIR\Remakex.cmd"
Delete /REBOOTOK "$INSTDIR\Remake.ps1"

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

@ -62,9 +62,9 @@ getConfigFileCMD()
}
else
{
if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-2.0.cmd")) < MAX_PATH)
if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-2.1.cmd")) < MAX_PATH)
{
wcscat(filename, L"\\RosBE\\rosbe-options-2.0.cmd");
wcscat(filename, L"\\RosBE\\rosbe-options-2.1.cmd");
}
}
}
@ -80,7 +80,7 @@ getConfigFileCMD()
}
else
{
wcscpy(filename, L"rosbe-options-2.0.cmd");
wcscpy(filename, L"rosbe-options-2.1.cmd");
}
}
return filename;
@ -110,9 +110,9 @@ getConfigFilePS1()
}
else
{
if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-2.0.ps1")) < MAX_PATH)
if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options-2.1.ps1")) < MAX_PATH)
{
wcscat(filename, L"\\RosBE\\rosbe-options-2.0.ps1");
wcscat(filename, L"\\RosBE\\rosbe-options-2.1.ps1");
}
}
}
@ -128,7 +128,7 @@ getConfigFilePS1()
}
else
{
wcscpy(filename, L"rosbe-options-2.0.ps1");
wcscpy(filename, L"rosbe-options-2.1.ps1");
}
}
return filename;

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

@ -6,8 +6,8 @@ ID_OPTICON ICON "options.ico"
1 24 "options.exe.Manifest"
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,0,0,0
PRODUCTVERSION 2,0,0,0
FILEVERSION 2,1,0,0
PRODUCTVERSION 2,1,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -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.0.0.0\0"
VALUE "FileVersion", "2.1.0.0\0"
VALUE "InternalName", "options\0"
VALUE "LegalCopyright", "Copyright © Daniel Reimer 2011\0"
VALUE "OriginalFilename", "options.exe\0"
VALUE "ProductName", "Config Tool for RosBE\0"
VALUE "ProductVersion", "2.0.0.0\0"
VALUE "ProductVersion", "2.1.0.0\0"
END
END
BLOCK "VarFileInfo"