[bjam] patch, review needed - W32_GETREG rule under CYGWIN

From: Alexey Pakhunov (alexeypa_at_[hidden])
Date: 2005-09-20 14:50:11

Hi All,

While discussing autodetection code for the msvc toolset we decided to 
use registry-based autodetection. Unfortunately W32_GETREG is not 
enabled under CYGWIN. The attached patch fixes this.

Best regards/Venlig hilsen,
Alexey Pakhunov.
 --------------010708010308040809010502 Content-Type: text/plain;
name="cygwin_w32_getreg.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="cygwin_w32_getreg.diff"

Index: build.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/jam_src/build.jam,v
retrieving revision 1.67
diff -c -3 -r1.67 build.jam
*** build.jam	19 Jun 2005 19:39:53 -0000	1.67
--- build.jam	20 Sep 2005 19:36:56 -0000
***************
*** 282,288 ****
jam.c jambase.c jamgram.c
lists.c make.c make1.c newstr.c
option.c parse.c regexp.c rules.c
! scan.c search.c subst.c
timestamp.c variable.c modules.c strings.c filesys.c 
builtins.c pwd.c class.c native.c modules/set.c 
modules/path.c modules/regex.c modules/property-set.c
--- 282,288 ----
jam.c jambase.c jamgram.c
lists.c make.c make1.c newstr.c
option.c parse.c regexp.c rules.c
! scan.c search.c subst.c w32_getreg.c
timestamp.c variable.c modules.c strings.c filesys.c 
builtins.c pwd.c class.c native.c modules/set.c 
modules/path.c modules/regex.c modules/property-set.c
***************
*** 290,296 ****
;
if $(NT)
{
! jam.source += execnt.c filent.c pathunix.c w32_getreg.c ;
}
else if $(OS2)
{
--- 290,296 ----
;
if $(NT)
{
! jam.source += execnt.c filent.c pathunix.c ;
}
else if $(OS2)
{
Index: build.sh
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/jam_src/build.sh,v
retrieving revision 1.35
diff -c -3 -r1.35 build.sh
*** build.sh	1 Aug 2005 14:14:43 -0000	1.35
--- build.sh	20 Sep 2005 19:37:49 -0000
***************
*** 192,199 ****
hdrmacro.c headers.c jam.c jambase.c jamgram.c lists.c make.c make1.c\
newstr.c option.c parse.c pathunix.c pathvms.c regexp.c\
rules.c scan.c search.c subst.c timestamp.c variable.c modules.c\
! strings.c filesys.c builtins.c pwd.c class.c native.c modules/set.c\
! modules/path.c modules/regex.c modules/property-set.c\
modules/sequence.c modules/order.c"

BJAM_UPDATE=
--- 192,199 ----
hdrmacro.c headers.c jam.c jambase.c jamgram.c lists.c make.c make1.c\
newstr.c option.c parse.c pathunix.c pathvms.c regexp.c\
rules.c scan.c search.c subst.c timestamp.c variable.c modules.c\
! strings.c filesys.c builtins.c pwd.c class.c native.c w32_getreg.c\
! modules/set.c modules/path.c modules/regex.c modules/property-set.c\
modules/sequence.c modules/order.c"

BJAM_UPDATE=
Index: builtins.c
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/jam_src/builtins.c,v
retrieving revision 1.43
diff -c -3 -r1.43 builtins.c
*** builtins.c	4 Aug 2005 06:38:41 -0000	1.43
--- builtins.c	20 Sep 2005 19:40:51 -0000
***************
*** 51,57 ****
# define P0 (PARSE *)0
# define C0 (char *)0

! # ifdef OS_NT
LIST* builtin_system_registry( PARSE *parse, FRAME *frame );
# endif

--- 51,57 ----
# define P0 (PARSE *)0
# define C0 (char *)0

! # if defined( OS_NT ) || defined( OS_CYGWIN )
LIST* builtin_system_registry( PARSE *parse, FRAME *frame );
# endif

***************
*** 310,316 ****
}
#endif

! # ifdef OS_NT
{
char * args[] = { "key_path", ":", "data", "?", 0 };
bind_builtin( "W32_GETREG",
--- 310,316 ----
}
#endif

! # if defined( OS_NT ) || defined( OS_CYGWIN )
{
char * args[] = { "key_path", ":", "data", "?", 0 };
bind_builtin( "W32_GETREG",
Index: w32_getreg.c
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/jam_src/w32_getreg.c,v
retrieving revision 1.5
diff -c -3 -r1.5 w32_getreg.c
*** w32_getreg.c	17 Jul 2005 16:09:33 -0000	1.5
--- w32_getreg.c	20 Sep 2005 19:19:44 -0000
***************
*** 3,8 ****
--- 3,11 ----
/* file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */

# include "jam.h"
+ 
+ # if defined( OS_NT ) || defined( OS_CYGWIN )
+ 
# include "lists.h"
# include "newstr.h"
# include "parse.h"
***************
*** 122,124 ****
--- 125,128 ----
return result;
}

+ # endif
 --------------010708010308040809010502--