[netperf-dev] netperf4 commit notice r126 - in branches/glib_migration/src: . NetPerfDir NetServerDir NetSysstatDir NetTestBSDDir

raj at netperf.org raj at netperf.org
Tue Apr 4 18:00:02 PDT 2006 

Author: raj
Date: 2006-04-04 18:00:01 -0700 (Tue, 04 Apr 2006)
New Revision: 126

Added:
   branches/glib_migration/src/NetPerfDir/config.h
   branches/glib_migration/src/NetServerDir/config.h
   branches/glib_migration/src/NetSysstatDir/
   branches/glib_migration/src/NetSysstatDir/makefile
   branches/glib_migration/src/NetSysstatDir/sources
   branches/glib_migration/src/NetTestBSDDir/
   branches/glib_migration/src/NetTestBSDDir/config.h
   branches/glib_migration/src/NetTestBSDDir/inet_ntop.c
   branches/glib_migration/src/NetTestBSDDir/makefile
   branches/glib_migration/src/NetTestBSDDir/sources
Modified:
   branches/glib_migration/src/NetPerfDir/sources
Log:
Checkin some changes related to building netperf under Windows

Added: branches/glib_migration/src/NetPerfDir/config.h
===================================================================
--- branches/glib_migration/src/NetPerfDir/config.h	2006-04-05 00:52:59 UTC (rev 125)
+++ branches/glib_migration/src/NetPerfDir/config.h	2006-04-05 01:00:01 UTC (rev 126)
@@ -0,0 +1,16 @@
+
+#define WITH_GLIB 1
+#define HAVE_FCNTL_H 1
+#define HAVE_LIMITS_H 1
+#define HAVE_MATH_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STDIO_H 1
+#define HAVE_STRING_H 1
+#define HAVE_WINDOWS_H 1
+#define HAVE_WINSOCK2_H 1
+#define HAVE_WS2TCPIP_H 1
+
+
+#define HAVE_GETADDRINFO 1
+#define HAVE_GETNAMEINFO 1
+

Modified: branches/glib_migration/src/NetPerfDir/sources
===================================================================
--- branches/glib_migration/src/NetPerfDir/sources	2006-04-05 00:52:59 UTC (rev 125)
+++ branches/glib_migration/src/NetPerfDir/sources	2006-04-05 01:00:01 UTC (rev 126)
@@ -5,24 +5,28 @@
 LINKLIBS= \
 	$(SDK_LIB_PATH)\kernel32.lib \
 	$(SDK_LIB_PATH)\ws2_32.lib \
-	$(SDK_LIB_PATH)\wsock32.lib
+	$(SDK_LIB_PATH)\wsock32.lib \
+	..\..\glib-2.8.6\lib\glib-2.0.lib \
+	..\..\glib-2.8.6\lib\gobject-2.0.lib \
+	..\..\glib-2.8.6\lib\gmodule-2.0.lib \
+	..\..\glib-2.8.6\lib\gthread-2.0.lib \
+        ..\..\libxml2-2.6.23.win32\lib\libxml2.lib
 
 USE_CRTDLL=1
 UMTYPE=console
 
-INCLUDES=$(SDK_INC_PATH);.
+INCLUDES=$(SDK_INC_PATH);.;..\..\libxml2-2.6.23.win32\include;..\..\iconv-1.9.1.win32\include;..\..\glib-2.8.6\include\glib-2.0;..\..\glib-2.8.6\lib\glib-2.0\include
 
+386_STDCALL=0
+
 MSC_WARNING_LEVEL=/W3 /WX
 
-C_DEFINES=$(C_DEFINES) -D_CONSOLE_ -DDO_IPV6 -DHAVE_GETADDRINFO -DHAVE_GETNAMEINFO -DSTDC_HEADERS
+C_DEFINES=$(C_DEFINES) -D_CONSOLE_ -DNETPERFDIR="\"foo\"" -DLIBDIR="\"bar\"" -DHAVE_CONFIG_H -DSTDC_HEADERS
 
 SOURCES= \
+	..\netperf.c \
 	..\netlib.c \
-	..\netsh.c \
+	..\netconfidence.c \
 	..\netlib_none.c \
-	..\netmsg.c \
-	..\netconfidence.c \
-	inet_ntop.c \
-	..\netperf.c
+	..\netmsg.c
 
-

Added: branches/glib_migration/src/NetServerDir/config.h
===================================================================
--- branches/glib_migration/src/NetServerDir/config.h	2006-04-05 00:52:59 UTC (rev 125)
+++ branches/glib_migration/src/NetServerDir/config.h	2006-04-05 01:00:01 UTC (rev 126)
@@ -0,0 +1,16 @@
+
+#define WITH_GLIB 1
+#define HAVE_FCNTL_H 1
+#define HAVE_LIMITS_H 1
+#define HAVE_MATH_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STDIO_H 1
+#define HAVE_STRING_H 1
+#define HAVE_WINDOWS_H 1
+#define HAVE_WINSOCK2_H 1
+#define HAVE_WS2TCPIP_H 1
+
+
+#define HAVE_GETADDRINFO 1
+#define HAVE_GETNAMEINFO 1
+

Added: branches/glib_migration/src/NetSysstatDir/makefile
===================================================================
--- branches/glib_migration/src/NetSysstatDir/makefile	2006-04-05 00:52:59 UTC (rev 125)
+++ branches/glib_migration/src/NetSysstatDir/makefile	2006-04-05 01:00:01 UTC (rev 126)
@@ -0,0 +1,7 @@
+#
+# DO NOT EDIT THIS FILE!!!  Edit .\sources. if you want to add a new source
+# file to this component.  This file merely indirects to the real make file
+# that is shared by all the driver components of the Windows NT DDK
+#
+
+!INCLUDE $(NTMAKEENV)\makefile.def
\ No newline at end of file

Added: branches/glib_migration/src/NetSysstatDir/sources
===================================================================
--- branches/glib_migration/src/NetSysstatDir/sources	2006-04-05 00:52:59 UTC (rev 125)
+++ branches/glib_migration/src/NetSysstatDir/sources	2006-04-05 01:00:01 UTC (rev 126)
@@ -0,0 +1,29 @@
+TARGETNAME=netsysstats
+TARGETPATH=OBJ
+TARGETTYPE=DYNLINK
+
+LINKLIBS= \
+	$(SDK_LIB_PATH)\kernel32.lib \
+	$(SDK_LIB_PATH)\ws2_32.lib \
+	$(SDK_LIB_PATH)\wsock32.lib \
+	..\..\glib-2.8.6\lib\glib-2.0.lib \
+	..\..\glib-2.8.6\lib\gobject-2.0.lib \
+	..\..\glib-2.8.6\lib\gmodule-2.0.lib \
+	..\..\glib-2.8.6\lib\gthread-2.0.lib \
+        ..\..\libxml2-2.6.23.win32\lib\libxml2.lib
+
+USE_CRTDLL=1
+UMTYPE=console
+
+INCLUDES=$(SDK_INC_PATH);.;..\..\libxml2-2.6.23.win32\include;..\..\iconv-1.9.1.win32\include;..\..\glib-2.8.6\include\glib-2.0;..\..\glib-2.8.6\lib\glib-2.0\include
+
+386_STDCALL=0
+
+MSC_WARNING_LEVEL=/W3 /WX
+
+C_DEFINES=$(C_DEFINES) -D_CONSOLE_ -DNETPERFDIR="\"foo\"" -DLIBDIR="\"bar\"" -DHAVE_CONFIG_H -DSTDC_HEADERS
+
+SOURCES= \
+	..\netsysstats_common.c \
+	..\netsysstats_none.c
+

Added: branches/glib_migration/src/NetTestBSDDir/config.h
===================================================================
--- branches/glib_migration/src/NetTestBSDDir/config.h	2006-04-05 00:52:59 UTC (rev 125)
+++ branches/glib_migration/src/NetTestBSDDir/config.h	2006-04-05 01:00:01 UTC (rev 126)
@@ -0,0 +1,16 @@
+
+#define WITH_GLIB 1
+#define HAVE_FCNTL_H 1
+#define HAVE_LIMITS_H 1
+#define HAVE_MATH_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STDIO_H 1
+#define HAVE_STRING_H 1
+#define HAVE_WINDOWS_H 1
+#define HAVE_WINSOCK2_H 1
+#define HAVE_WS2TCPIP_H 1
+
+
+#define HAVE_GETADDRINFO 1
+#define HAVE_GETNAMEINFO 1
+

Added: branches/glib_migration/src/NetTestBSDDir/inet_ntop.c
===================================================================
--- branches/glib_migration/src/NetTestBSDDir/inet_ntop.c	2006-04-05 00:52:59 UTC (rev 125)
+++ branches/glib_migration/src/NetTestBSDDir/inet_ntop.c	2006-04-05 01:00:01 UTC (rev 126)
@@ -0,0 +1 @@
+#include "..\missing\inet_ntop.c"
\ No newline at end of file

Added: branches/glib_migration/src/NetTestBSDDir/makefile
===================================================================
--- branches/glib_migration/src/NetTestBSDDir/makefile	2006-04-05 00:52:59 UTC (rev 125)
+++ branches/glib_migration/src/NetTestBSDDir/makefile	2006-04-05 01:00:01 UTC (rev 126)
@@ -0,0 +1,7 @@
+#
+# DO NOT EDIT THIS FILE!!!  Edit .\sources. if you want to add a new source
+# file to this component.  This file merely indirects to the real make file
+# that is shared by all the driver components of the Windows NT DDK
+#
+
+!INCLUDE $(NTMAKEENV)\makefile.def
\ No newline at end of file

Added: branches/glib_migration/src/NetTestBSDDir/sources
===================================================================
--- branches/glib_migration/src/NetTestBSDDir/sources	2006-04-05 00:52:59 UTC (rev 125)
+++ branches/glib_migration/src/NetTestBSDDir/sources	2006-04-05 01:00:01 UTC (rev 126)
@@ -0,0 +1,28 @@
+TARGETNAME=nettest_bsd
+TARGETPATH=OBJ
+TARGETTYPE=DYNLINK
+
+LINKLIBS= \
+	$(SDK_LIB_PATH)\kernel32.lib \
+	$(SDK_LIB_PATH)\ws2_32.lib \
+	$(SDK_LIB_PATH)\wsock32.lib \
+	..\..\glib-2.8.6\lib\glib-2.0.lib \
+	..\..\glib-2.8.6\lib\gobject-2.0.lib \
+	..\..\glib-2.8.6\lib\gmodule-2.0.lib \
+	..\..\glib-2.8.6\lib\gthread-2.0.lib \
+        ..\..\libxml2-2.6.23.win32\lib\libxml2.lib
+
+USE_CRTDLL=1
+UMTYPE=console
+
+INCLUDES=$(SDK_INC_PATH);.;..\..\libxml2-2.6.23.win32\include;..\..\iconv-1.9.1.win32\include;..\..\glib-2.8.6\include\glib-2.0;..\..\glib-2.8.6\lib\glib-2.0\include
+
+386_STDCALL=0
+
+MSC_WARNING_LEVEL=/W3 /WX
+
+C_DEFINES=$(C_DEFINES) -D_CONSOLE_ -DNETPERFDIR="\"foo\"" -DLIBDIR="\"bar\"" -DHAVE_CONFIG_H -DSTDC_HEADERS
+
+SOURCES= \
+	..\nettest_bsd.c
+

More information about the netperf-dev mailing list