[ros-diffs] [lsuggs] 43828: Making it closer to building properly.

Author: lsuggs
Date: Thu Oct 29 19:01:27 2009
New Revision: 43828

URL: http://svn.reactos.org/svn/reactos?rev=43828&view=rev
Log:
Making it closer to building properly.

Added:
    branches/nslookup/dll/3rdparty/bind9/bind9.rbuild   (with props)
    branches/nslookup/dll/3rdparty/isccfg/isccfg.rbuild   (with props)
    branches/nslookup/dll/3rdparty/lwres/lwres.rbuild   (with props)
Modified:
    branches/nslookup/dll/3rdparty/3rdparty.rbuild
    branches/nslookup/dll/3rdparty/dns/dns.rbuild
    branches/nslookup/dll/3rdparty/isc/include/config.h
    branches/nslookup/dll/3rdparty/isc/include/isc/log.h
    branches/nslookup/dll/3rdparty/isc/include/versions.h
    branches/nslookup/dll/3rdparty/isc/isc.rbuild
    branches/nslookup/dll/3rdparty/isc/win32/include/isc/platform.h
    branches/nslookup/dll/3rdparty/isc/win32/net.c
    branches/nslookup/dll/3rdparty/lwres/win32/include/lwres/netdb.h

Modified: branches/nslookup/dll/3rdparty/3rdparty.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/3rdparty.…
==============================================================================
--- branches/nslookup/dll/3rdparty/3rdparty.rbuild [iso-8859-1] (original)
+++ branches/nslookup/dll/3rdparty/3rdparty.rbuild [iso-8859-1] Thu Oct 29 19:01:27 2009
@@ -3,9 +3,6 @@
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 	<directory name="isc">
 		<xi:include href="isc/isc.rbuild" />
-	</directory>
-	<directory name="dns">
-		<xi:include href="dns/dns.rbuild" />
 	</directory>
 	<directory name="mesa32">
 		<xi:include href="mesa32/mesa32.rbuild" />

Added: branches/nslookup/dll/3rdparty/bind9/bind9.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/bind9/bin…
==============================================================================
--- branches/nslookup/dll/3rdparty/bind9/bind9.rbuild (added)
+++ branches/nslookup/dll/3rdparty/bind9/bind9.rbuild [iso-8859-1] Thu Oct 29 19:01:27
2009
@@ -1,0 +1,23 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
+<module name="bind9" type="win32dll"
installbase="system32" installname="libbind9.dll"
allowwarnings="true">
+	<include base="ReactOS">dll/3rdparty/isc/include</include>
+	<include base="ReactOS">dll/3rdparty/isc/win32</include>
+	<include base="ReactOS">dll/3rdparty/isc/win32/include</include>
+	<include
base="ReactOS">dll/3rdparty/isc/noatomic/include</include>
+	<include base="ReactOS">dll/3rdparty/dns/include</include>
+	<include base="ReactOS">dll/3rdparty/isccfg/include</include>
+	<include base="ReactOS">dll/3rdparty/bind9/include</include>
+	<include
base="ReactOS">dll/3rdparty/bind9/win32/include</include>
+	<define name="WIN32" />
+	<define name="USE_MD5" />
+	<define name="LIBBIND9_EXPORTS" />
+	<define name="ISC_PLATFORM_HAVEIN6PKTINFO" />
+	<define name="ISC_PLATFORM_USEGCCASM" />
+	<file>check.c</file>
+	<file>getaddresses.c</file>
+	<directory name="win32">
+		<file>DLLMain.c</file>
+		<file>version.c</file>
+	</directory>
+</module>

Propchange: branches/nslookup/dll/3rdparty/bind9/bind9.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/nslookup/dll/3rdparty/dns/dns.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/dns/dns.r…
==============================================================================
--- branches/nslookup/dll/3rdparty/dns/dns.rbuild [iso-8859-1] (original)
+++ branches/nslookup/dll/3rdparty/dns/dns.rbuild [iso-8859-1] Thu Oct 29 19:01:27 2009
@@ -2,9 +2,11 @@
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="dns" type="win32dll"
installbase="system32" installname="libdns.dll"
allowwarnings="true">
 	<include base="ReactOS">dll/3rdparty/dns/include</include>
+	<include base="ReactOS">dll/3rdparty/dns/win32/include</include>
 	<include base="ReactOS">dll/3rdparty/isc/include</include>
+	<include base="ReactOS">dll/3rdparty/isc/win32</include>
 	<include base="ReactOS">dll/3rdparty/isc/win32/include</include>
-	<include base="ReactOS">dll/3rdparty/isc/x86_32/include</include>
+	<include
base="ReactOS">dll/3rdparty/isc/noatomic/include</include>
 	<define name="WIN32" />
 	<define name="USE_MD5" />
 	<define name="LIBDNS_EXPORTS" />

Modified: branches/nslookup/dll/3rdparty/isc/include/config.h
URL:
http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/inclu…
==============================================================================
--- branches/nslookup/dll/3rdparty/isc/include/config.h [iso-8859-1] (original)
+++ branches/nslookup/dll/3rdparty/isc/include/config.h [iso-8859-1] Thu Oct 29 19:01:27
2009
@@ -56,8 +56,9 @@
  * Windows NT and 2K only
  */
 #ifndef __REACTOS__
-#define _WIN32_WINNT 0x0400
-#endif
+#define _WIN32_WINNT 0x0520
+#endif
+
 /* Define if you have the ANSI C header files.  */
 #define STDC_HEADERS 1
 

Modified: branches/nslookup/dll/3rdparty/isc/include/isc/log.h
URL:
http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/inclu…
==============================================================================
--- branches/nslookup/dll/3rdparty/isc/include/isc/log.h [iso-8859-1] (original)
+++ branches/nslookup/dll/3rdparty/isc/include/isc/log.h [iso-8859-1] Thu Oct 29 19:01:27
2009
@@ -24,10 +24,7 @@
 
 #include <stdio.h>
 #include <stdarg.h>
-
-#ifndef __REACTOS__
 #include <syslog.h> /* XXXDCL NT */
-#endif
 
 #include <isc/formatcheck.h>
 #include <isc/lang.h>

Modified: branches/nslookup/dll/3rdparty/isc/include/versions.h
URL:
http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/inclu…
==============================================================================
--- branches/nslookup/dll/3rdparty/isc/include/versions.h [iso-8859-1] (original)
+++ branches/nslookup/dll/3rdparty/isc/include/versions.h [iso-8859-1] Thu Oct 29 19:01:27
2009
@@ -36,4 +36,22 @@
 #define LIBAGE			2
 #endif /* LIBDNS_EXPORTS */
 
+#ifdef LIBLWRES_EXPORTS
+#define LIBINTERFACE	50
+#define LIBREVISION		2
+#define LIBAGE			0
+#endif /* LIBLWRES_EXPORTS */
+
+#ifdef LIBBIND9_EXPORTS
+#define LIBINTERFACE	50
+#define LIBREVISION		3
+#define LIBAGE			0
+#endif /* LIBBIND9_EXPORTS */
+
+#ifdef LIBISCCFG_EXPORTS
+#define LIBINTERFACE	50
+#define LIBREVISION		0
+#define LIBAGE			0
+#endif /* LIBISCCFG_EXPORTS */
+
 #endif /* VERSIONS_H */

Modified: branches/nslookup/dll/3rdparty/isc/isc.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/isc.r…
==============================================================================
--- branches/nslookup/dll/3rdparty/isc/isc.rbuild [iso-8859-1] (original)
+++ branches/nslookup/dll/3rdparty/isc/isc.rbuild [iso-8859-1] Thu Oct 29 19:01:27 2009
@@ -2,13 +2,12 @@
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="isc" type="win32dll"
installbase="system32" installname="libisc.dll"
allowwarnings="true">
 	<include base="ReactOS">dll/3rdparty/isc/include</include>
+	<include base="ReactOS">dll/3rdparty/isc/win32</include>
 	<include base="ReactOS">dll/3rdparty/isc/win32/include</include>
-	<include base="ReactOS">dll/3rdparty/isc/x86_32/include</include>
+	<include
base="ReactOS">dll/3rdparty/isc/noatomic/include</include>
+	<include base="ReactOS">dll/3rdparty/isccfg/include</include>
 	<define name="WIN32" />
-	<define name="USE_MD5" />
 	<define name="LIBISC_EXPORTS" />
-	<define name="ISC_PLATFORM_HAVEIN6PKTINFO" />
-	<define name="ISC_PLATFORM_USEGCCASM" />
 	<file>assertions.c</file>
 	<file>base32.c</file>
 	<file>base64.c</file>
@@ -32,6 +31,7 @@
 	<file>lex.c</file>
 	<file>lfsr.c</file>
 	<file>lib.c</file>
+	<file>log.c</file>
 	<file>md5.c</file>
 	<file>mem.c</file>
 	<file>mutexblock.c</file>
@@ -75,7 +75,6 @@
 		<file>ipv6.c</file>
 		<file>keyboard.c</file>
 		<file>net.c</file>
-		<file>ntgroups.c</file>
 		<file>ntpaths.c</file>
 		<file>once.c</file>
 		<file>os.c</file>

Modified: branches/nslookup/dll/3rdparty/isc/win32/include/isc/platform.h
URL:
http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/win32…
==============================================================================
--- branches/nslookup/dll/3rdparty/isc/win32/include/isc/platform.h [iso-8859-1]
(original)
+++ branches/nslookup/dll/3rdparty/isc/win32/include/isc/platform.h [iso-8859-1] Thu Oct
29 19:01:27 2009
@@ -30,7 +30,10 @@
  *** Network.
  ***/
 
+#ifndef __REACTOS__
 #define ISC_PLATFORM_HAVEIPV6
+#endif
+
 #if _MSC_VER > 1200
 #define ISC_PLATFORM_HAVEIN6PKTINFO
 #endif

Modified: branches/nslookup/dll/3rdparty/isc/win32/net.c
URL:
http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/win32…
==============================================================================
--- branches/nslookup/dll/3rdparty/isc/win32/net.c [iso-8859-1] (original)
+++ branches/nslookup/dll/3rdparty/isc/win32/net.c [iso-8859-1] Thu Oct 29 19:01:27 2009
@@ -197,7 +197,7 @@
 	ipv6only_result = ISC_R_SUCCESS;
 
 close:
-	closeocket(s);
+	closesocket(s);
 	return;
 #endif /* IPV6_V6ONLY */
 }

Added: branches/nslookup/dll/3rdparty/isccfg/isccfg.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isccfg/is…
==============================================================================
--- branches/nslookup/dll/3rdparty/isccfg/isccfg.rbuild (added)
+++ branches/nslookup/dll/3rdparty/isccfg/isccfg.rbuild [iso-8859-1] Thu Oct 29 19:01:27
2009
@@ -1,0 +1,26 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
+<module name="isccfg" type="win32dll"
installbase="system32" installname="libisccfg.dll"
allowwarnings="true">
+	<include base="ReactOS">dll/3rdparty/isc/include</include>
+	<include base="ReactOS">dll/3rdparty/isc/win32</include>
+	<include base="ReactOS">dll/3rdparty/isc/win32/include</include>
+	<include
base="ReactOS">dll/3rdparty/isc/noatomic/include</include>
+	<include base="ReactOS">dll/3rdparty/dns/include</include>
+	<include base="ReactOS">dll/3rdparty/dns/win32/include</include>
+	<include
base="ReactOS">dll/3rdparty/dns/sec/openssl/include</include>
+	<include base="ReactOS">dll/3rdparty/isccfg/include</include>
+	<include
base="ReactOS">dll/3rdparty/isccfg/win32/include</include>
+	<define name="WIN32" />
+	<define name="USE_MD5" />
+	<define name="LIBISCCFG_EXPORTS" />
+	<define name="ISC_PLATFORM_HAVEIN6PKTINFO" />
+	<define name="ISC_PLATFORM_USEGCCASM" />
+	<file>aclconf.c</file>
+	<file>log.c</file>
+	<file>namedconf.c</file>
+	<file>parser.c</file>
+	<directory name="win32">
+		<file>DLLMain.c</file>
+		<file>version.c</file>
+	</directory>
+</module>

Propchange: branches/nslookup/dll/3rdparty/isccfg/isccfg.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Added: branches/nslookup/dll/3rdparty/lwres/lwres.rbuild
URL:
http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/lwres/lwr…
==============================================================================
--- branches/nslookup/dll/3rdparty/lwres/lwres.rbuild (added)
+++ branches/nslookup/dll/3rdparty/lwres/lwres.rbuild [iso-8859-1] Thu Oct 29 19:01:27
2009
@@ -1,0 +1,41 @@
+<module name="lwres" type="win32dll"
installbase="system32" installname="liblwres.dll"
allowwarnings="true">
+	<include base="ReactOS">dll/3rdparty/isc/include</include>
+	<include base="ReactOS">dll/3rdparty/isc/win32</include>
+	<include base="ReactOS">dll/3rdparty/isc/win32/include</include>
+	<include
base="ReactOS">dll/3rdparty/isc/noatomic/include</include>
+	<include
base="ReactOS">dll/3rdparty/lwres/win32/include/lwres</include>
+	<include base="ReactOS">dll/3rdparty/lwres/include</include>
+	<include
base="ReactOS">dll/3rdparty/lwres/win32/include</include>
+	<include base="ReactOS">dll/3rdparty/dns/include</include>
+	<include base="ReactOS">dll/3rdparty/dns/win32/include</include>
+	<include
base="ReactOS">dll/3rdparty/dns/sec/openssl/include</include>
+	<define name="WIN32" />
+	<define name="USE_MD5" />
+	<define name="LIBLWRES_EXPORTS" />
+	<define name="ISC_PLATFORM_HAVEIN6PKTINFO" />
+	<define name="ISC_PLATFORM_USEGCCASM" />
+	<file>context.c</file>
+	<file>gai_strerror.c</file>
+	<file>getaddrinfo.c</file>
+	<file>gethost.c</file>
+	<file>getipnode.c</file>
+	<file>getnameinfo.c</file>
+	<file>getrrset.c</file>
+	<file>herror.c</file>
+	<file>lwbuffer.c</file>
+	<file>lwinetaton.c</file>
+	<file>lwinetntop.c</file>
+	<file>lwinetpton.c</file>
+	<file>lwpacket.c</file>
+	<file>lwres_gabn.c</file>
+	<file>lwres_gnba.c</file>
+	<file>lwres_grbn.c</file>
+	<file>lwres_noop.c</file>
+	<file>lwresutil.c</file>
+	<directory name="win32">
+		<file>lwconfig.c</file>
+		<file>DLLMain.c</file>
+		<file>version.c</file>
+		<file>socket.c</file>
+	</directory>
+</module>

Propchange: branches/nslookup/dll/3rdparty/lwres/lwres.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/nslookup/dll/3rdparty/lwres/win32/include/lwres/netdb.h
URL:
http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/lwres/win…
==============================================================================
--- branches/nslookup/dll/3rdparty/lwres/win32/include/lwres/netdb.h [iso-8859-1]
(original)
+++ branches/nslookup/dll/3rdparty/lwres/win32/include/lwres/netdb.h [iso-8859-1] Thu Oct
29 19:01:27 2009
@@ -31,7 +31,9 @@
 /*
  * Define if <netdb.h> does not declare struct addrinfo.
  */
+#ifndef __REACTOS__
 #define ISC_LWRES_NEEDADDRINFO 1
+#endif
 
 #ifdef ISC_LWRES_NEEDADDRINFO
 struct addrinfo {