Add Timo's LD Patch discussed in ML.

Fix Log naming in PS CMake build script.
Set the errorlevel to 0 before testing for cmake in PS.
Update changelog.

svn path=/trunk/RosBE/; revision=1257
This commit is contained in:
Daniel Reimer 2011-01-02 16:50:09 +00:00
parent 4242a21a52
commit 9a5d788ca5
4 changed files with 54 additions and 10 deletions

View File

@ -0,0 +1,27 @@
Index: pe-dll.c
===================================================================
RCS file: /cvs/src/src/ld/pe-dll.c,v
retrieving revision 1.133
diff -u -r1.133 pe-dll.c
--- pe-dll.c 27 Jun 2010 04:07:54 -0000 1.133
+++ pe-dll.c 29 Dec 2010 20:18:01 -0000
@@ -773,14 +773,16 @@
{
for (i = 0; i < NE; i++)
{
- if (strchr (pe_def_file->exports[i].name, '@'))
+ /* Check for stdcall/fastcall decoration, ignore C++ mangled names */
+ if (strchr (pe_def_file->exports[i].name, '@') &&
+ pe_def_file->exports[i].name[0] != '?')
{
/* This will preserve internal_name, which may have been
pointing to the same memory as name, or might not
have. */
int lead_at = (*pe_def_file->exports[i].name == '@');
char *tmp = xstrdup (pe_def_file->exports[i].name + lead_at);
- char *tmp_at = strchr (tmp, '@');
+ char *tmp_at = strrchr (tmp, '@');
if (tmp_at)
*tmp_at = 0;

View File

@ -6,14 +6,22 @@
# COPYRIGHT: Copyright 2011 Daniel Reimer <reimer.daniel@freenet.de>
#
$LASTEXITCODE = 0
$null = "$ENV:PATH" | select-string -pattern "cmake"
if ($LASTEXITCODE -ne 0) {
"CMake not found. Build cant be continued, until a CMake version of 2.6 or newer"
"is properly installed on this system. The newest Version can be found here:"
"http://www.cmake.org/cmake/resources/software.html"
"ADD IT TO SYSTEM PATH!"
exit
}
# Get the current date and time for use in in our build log's file name.
$TIMERAW = get-date -f t
$DATENAME = get-date -f dMMyyyy
$TIMENAME = get-date -f Hms
if ($_ROSBE_WRITELOG -eq 1) {
if (!(Test-Path "$_ROSBE_LOGDIR")) {
New-Item -path "$_ROSBE_LOGDIR" -type directory
@ -22,11 +30,6 @@ if ($_ROSBE_WRITELOG -eq 1) {
$file2 = "..\$_ROSBE_LOGDIR\BuildROSLog-$ENV:ROS_ARCH-$DATENAME-$TIMENAME.txt"
}
# Get the current date and time for use in in our build log's file name.
$TIMERAW = get-date -f t
$DATENAME = get-date -f dMMyyyy
$TIMENAME = get-date -f Hms
# Setting for MinGW Compiler in CMake
$ENV:BUILD_ENVIRONMENT = "MINGW"

View File

@ -17,6 +17,7 @@ if errorlevel 1 (
echo CMake not found. Build cant be continued, until a CMake version of 2.6 or newer
echo is properly installed on this system. The newest Version can be found here:
echo http://www.cmake.org/cmake/resources/software.html
echo ADD IT TO SYSTEM PATH!
goto :EOC
)

View File

@ -1,18 +1,31 @@
*** Aug XXth, 2010 - RosBE 1.6 Released
*** Jan XXth, 2011 - RosBE 1.6 Released
- Updated Binutils to 2.20.51-20100801 (snapshot) (Daniel Reimer)
- Updated GCC to 4.5.1 (Daniel Reimer)
- Updated GCC to 4.5.2 (Daniel Reimer)
* gmp 5.0.1
* mpfr 3.0.0
* mpc 0.8.2
* MinGW-w64 Runtime 20100730
* MinGW-w64 Runtime 20101002
- Updated NASM to 2.08.02 (Daniel Reimer)
- Updated YASM to 1.0.1 (Daniel Reimer)
- Updated SVN to 1.6.12 (Daniel Reimer)
- Bug 5426 resolved (Adam Kachwalla)
- Cleanup the options tool (Christoph von Wittich)
- Add Support for the cmake bringup branch. Just install cmake and type make inside the branch (Daniel Reimer)
- Renamed make back to mingw32-make to make cmake happy (Daniel Reimer)
- Add Support for the cmake bringup branch. Just install cmake and type make/makex inside the branch (Daniel Reimer)
- Renamed make.exe back to mingw32-make.exe to make cmake happy (Daniel Reimer)
- Add a way to modify the ccache dir by setting the _ROSBE_CCACHE_DIR Variable accordingly. (Daniel Reimer)
- Fix ccache build by setting a higher cache size and make it User customizeable with the _ROSBE_CACHESIZE Variable representing the allowed GB. (Daniel Reimer)
- Make the config.rbuild too old error non fatal. Now it continues to build, but I still don't recommend it. (Daniel Reimer)
- Remove the old config command for rbuild. (Daniel Reimer)
- Modify clean command to be cmake compatible. (Daniel Reimer)
- Add cmake to the Version show up. (Daniel Reimer)
- Make cmake build failsafe if no cmake 2.6+ is properly installed. It shows a Information what to do now. (Daniel Reimer)
- Make RosBE silent by changing the variable _ROSBE_NOSOUND to 1. (Daniel Reimer)
- Make the log dir not dependent of the main tree. Use the current dir instead.
This makes is possible to have different logs of different branches separate in their own folder.
P.S. Win2000 Support is no more.
*** May 19th, 2010 - RosBE 1.5.1.1 Released