Re: [ros-dev] [ros-diffs] [jgardou] 52831: [LIBWINE] - new tentative to fix build : get rid of libwine's stricmp, we have it in our crt

2011-07-24 Thread Gabriel ilardi 

Wouldn't it be advisable besides the commit message also to add a comment to 
the code as why stuff is commented out ?


> Date: Sun, 24 Jul 2011 10:29:53 +
> To: ros-di...@reactos.org
> From: jgar...@svn.reactos.org
> Subject: [ros-diffs] [jgardou] 52831: [LIBWINE] - new tentative to fix build 
> : get rid of libwine's stricmp, we have it in our crt
> 
> Author: jgardou
> Date: Sun Jul 24 10:29:52 2011
> New Revision: 52831
> 
> URL: http://svn.reactos.org/svn/reactos?rev=52831&view=rev
> Log:
> [LIBWINE]
> - new tentative to fix build : get rid of libwine's stricmp, we have it in 
> our crt
> 
> Modified:
> trunk/reactos/lib/3rdparty/libwine/CMakeLists.txt
> trunk/reactos/lib/3rdparty/libwine/libwine.rbuild
> 
> Modified: trunk/reactos/lib/3rdparty/libwine/CMakeLists.txt
> URL: 
> http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/CMakeLists.txt?rev=52831&r1=52830&r2=52831&view=diff
> ==
> --- trunk/reactos/lib/3rdparty/libwine/CMakeLists.txt [iso-8859-1] (original)
> +++ trunk/reactos/lib/3rdparty/libwine/CMakeLists.txt [iso-8859-1] Sun Jul 24 
> 10:29:52 2011
> @@ -6,7 +6,7 @@
>  config.c
>  debug_ros.c
>  loader.c
> -string.c)
> +#string.c)
>  
>  add_library(wine ${SOURCE})
>  
> 
> Modified: trunk/reactos/lib/3rdparty/libwine/libwine.rbuild
> URL: 
> http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/libwine.rbuild?rev=52831&r1=52830&r2=52831&view=diff
> ==
> --- trunk/reactos/lib/3rdparty/libwine/libwine.rbuild [iso-8859-1] (original)
> +++ trunk/reactos/lib/3rdparty/libwine/libwine.rbuild [iso-8859-1] Sun Jul 24 
> 10:29:52 2011
> @@ -7,7 +7,7 @@
>   config.c
>   debug_ros.c
>   loader.c
> - string.c
> + 
>  
>  
>   include/reactos/wine
> 
> 
  ___
Ros-dev mailing list
Ros-dev@reactos.org
http://www.reactos.org/mailman/listinfo/ros-dev

Re: [ros-dev] cmake rant

2011-07-24 Thread caemyr 
After some checks, it seems that a single header file change takes around 1m to 
do a quick rebuild. If cmake files are touched, CMake does recheck and it takes 
around 3-3.5m. The full build  takes around 5m. Please mind that these values 
are affected by CCache.

On Sat, 23 Jul 2011 18:38 -0500, "Conan Kudo (ニール・ゴンパ)"  
wrote:
> Does this mean that we can purge rbuild and update the wiki docs to have
> information on how to build ReactOS from source using CMake? Or are there
> any other showstopping issues that would prevent this?
> 
> On Sat, Jul 23, 2011 at 6:33 PM, Amine Khaldi
> wrote:
> 
> > Hi,
> >
> > Being one of the "CMake people", I'm obviously biased toward the adoption
> > ;)
> >
> > Seriously, it's the logical/rational thing to do.
> >
> > That said, I just committed a temporary revert so that backtraces are
> > reliable again and CMake adoption can really be possible now.
> >
> > I also want to make sure everyone understands one thing: CMake is awesome
> > for us. CMake allows us to have our build system maintained by 3rd party. It
> > allows us to have simple, readable build system macros/functions which means
> > anyone can hack them. It allows us to support several ways to compile ros
> > (CMake generators), from using xcode to eclipse to VS to nmake and
> > (mingw/unix) make files. It allows us to have the MSVC builds we always have
> > been wanting.
> >
> > There is one tiny catch though: because of the excellent dependency
> > tracking, CMake build can be significantly slower compared to rbuild build.
> > You won't notice this if you check dependencies yourself and use make
> > module/fast, but if you compile full bootcd for example you'll notice that
> > it takes a moment to do dependency checking. This very slowness is nothing
> > compared to rbuild looping around itself n times though ;)
> >
> > As I'm sure you realize, it's not just about speed. The features we gain
> > are well worth it.
> >
> > As final note: rest assured that we will do our best to make the CMake
> > build as fast as possible.
> >
> > Regards,
> > Amine.
> >
> >
> > __**_
> > Ros-dev mailing list
> > Ros-dev@reactos.org
> > http://www.reactos.org/**mailman/listinfo/ros-dev
> >
> 
> ___
> Ros-dev mailing list
> Ros-dev@reactos.org
> http://www.reactos.org/mailman/listinfo/ros-dev
With best regards
Caemyr

___
Ros-dev mailing list
Ros-dev@reactos.org
http://www.reactos.org/mailman/listinfo/ros-dev

Re: [ros-dev] cmake rant

2011-07-24 Thread caemyr 
The test runtime is working again. Seems that debugging is back to working 
state, even without umode autotracing.

We should now push the cmake transition. Waiting wont change much, will only 
make it more difficut.

On Sun, 24 Jul 2011 15:48 +0200, cae...@myopera.com wrote:
> After some checks, it seems that a single header file change takes around
> 1m to do a quick rebuild. If cmake files are touched, CMake does recheck
> and it takes around 3-3.5m. The full build  takes around 5m. Please mind
> that these values are affected by CCache.
> 

With best regards
Caemyr

___
Ros-dev mailing list
Ros-dev@reactos.org
http://www.reactos.org/mailman/listinfo/ros-dev

Re: [ros-dev] [ros-diffs] [jgardou] 52840: [CRT] - get back atexit handling as it was before. (reverts 52838, 52829, 52828) Thanks to Kai and Timo for the explanation

2011-07-24 Thread Jérôme Gardou 

Reverts 52836, 52829 and 52828, sorry.

Le 24/07/2011 18:45, jgar...@svn.reactos.org a écrit :

Author: jgardou
Date: Sun Jul 24 16:45:41 2011
New Revision: 52840

URL: http://svn.reactos.org/svn/reactos?rev=52840&view=rev
Log:
[CRT]
- get back atexit handling as it was before.
(reverts 52838, 52829, 52828)
Thanks to Kai and Timo for the explanation

Modified:
 trunk/reactos/dll/win32/msvcrt/msvcrt.spec
 trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec
 trunk/reactos/dll/win32/msvcrt40/msvcrt40.spec
 trunk/reactos/lib/3rdparty/mingw/crtexe.c
 trunk/reactos/lib/3rdparty/mingw/mingw.rbuild
 trunk/reactos/lib/sdk/crt/msvcrtex.cmake
 trunk/reactos/lib/sdk/crt/startup/crtdll.c
 trunk/reactos/lib/sdk/crt/startup/crtexe.c

Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.spec?rev=52840&r1=52839&r2=52840&view=diff
==
--- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Sun Jul 24 16:45:41 
2011
@@ -1156,7 +1156,7 @@
  @ cdecl asin(double)
  @ cdecl atan(double)
  @ cdecl atan2(double double)
-@ cdecl atexit(ptr)
+@ extern atexit #<-- keep this as an extern, thank you
  @ cdecl atof(str)
  @ cdecl atoi(str)
  @ cdecl atol(str)

Modified: trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec?rev=52840&r1=52839&r2=52840&view=diff
==
--- trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvcrt20/msvcrt20.spec [iso-8859-1] Sun Jul 24 
16:45:41 2011
@@ -937,7 +937,7 @@
  @ cdecl asin(double)
  @ cdecl atan(double)
  @ cdecl atan2(double double)
-@ cdecl atexit(ptr)
+@ extern atexit #<-- do not touch this!
  @ cdecl atof(str)
  @ cdecl atoi(str)
  @ cdecl atol(str)

Modified: trunk/reactos/dll/win32/msvcrt40/msvcrt40.spec
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt40/msvcrt40.spec?rev=52840&r1=52839&r2=52840&view=diff
==
--- trunk/reactos/dll/win32/msvcrt40/msvcrt40.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvcrt40/msvcrt40.spec [iso-8859-1] Sun Jul 24 
16:45:41 2011
@@ -975,7 +975,7 @@
  @ cdecl asin(double)
  @ cdecl atan(double)
  @ cdecl atan2(double double)
-@ cdecl atexit(ptr)
+@ extern atexit #<-- changing this will kill your cat, understand?
  @ cdecl atof(str)
  @ cdecl atoi(str)
  @ cdecl atol(str)

Modified: trunk/reactos/lib/3rdparty/mingw/crtexe.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/crtexe.c?rev=52840&r1=52839&r2=52840&view=diff
==
--- trunk/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/mingw/crtexe.c [iso-8859-1] Sun Jul 24 16:45:41 
2011
@@ -71,8 +71,8 @@
  /* TLS initialization hook.  */
  extern const PIMAGE_TLS_CALLBACK __dyn_tls_init_callback;

-//extern _PVFV *__onexitbegin;
-//extern _PVFV *__onexitend;
+extern _PVFV *__onexitbegin;
+extern _PVFV *__onexitend;

  extern int mingw_app_type;

@@ -119,7 +119,7 @@
  __set_app_type(_GUI_APP);
else
  __set_app_type (_CONSOLE_APP);
-//  __onexitbegin = __onexitend = (_PVFV *) _encode_pointer ((_PVFV *)(-1));
+  __onexitbegin = __onexitend = (_PVFV *) _encode_pointer ((_PVFV *)(-1));

* __MINGW_IMP_SYMBOL(_fmode) = _fmode;
* __MINGW_IMP_SYMBOL(_commode) = _commode;

Modified: trunk/reactos/lib/3rdparty/mingw/mingw.rbuild
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/mingw/mingw.rbuild?rev=52840&r1=52839&r2=52840&view=diff
==
--- trunk/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Sun Jul 24 
16:45:41 2011
@@ -12,7 +12,7 @@
include/reactos/mingw-w64
kernel32
_newmode.c
-   
+   atonexit.c
binmode.c
charmax.c
cinitexe.c

Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake?rev=52840&r1=52839&r2=52840&view=diff
==
--- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original)
+++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Sun Jul 24 16:45:41 
2011
@@ -17,7 +17,7 @@
  startup/natstart.c
  startup/charmax.c
  startup/merr.c
-#startup/atonexit.c
+startup/atonexit.c
  startup/txtmode.c
  startup/pesect.c
  startup/tlsmcrt.c

Modified: trunk/reactos/lib/sdk/crt/startup/crtdll.