From 4beb39c2dcde0458f6bfbad3415345d229b1cf01 Mon Sep 17 00:00:00 2001 From: agibert Date: Mon, 26 Nov 2001 10:17:43 +0000 Subject: [PATCH] Merge win32 branche (1.1.2.1) with main trunc ! --- demo/Makefile | 8 ++++ demo/nddemo0.dsw | 29 +++++++++++++ lib/Makefile | 11 +++++ lib/libnode.dsp | 104 ++++++++++++++++++++++++++++++++++++++++++++++ lib/libnode.dsw | 29 +++++++++++++ util/Makefile | 8 ++++ util/ndbench.dsw | 29 +++++++++++++ util/test-all.ndb | 3 ++ 8 files changed, 221 insertions(+) create mode 100644 demo/Makefile create mode 100644 demo/nddemo0.dsw create mode 100644 lib/Makefile create mode 100644 lib/libnode.dsp create mode 100644 lib/libnode.dsw create mode 100644 util/Makefile create mode 100644 util/ndbench.dsw create mode 100644 util/test-all.ndb diff --git a/demo/Makefile b/demo/Makefile new file mode 100644 index 0000000..4d679cc --- /dev/null +++ b/demo/Makefile @@ -0,0 +1,8 @@ + +all: demo0 + +demo0: demo0.c ../../libver/ver.h ../lib/node.h ../../libver/libver.so ../lib/libnode.so Makefile + gcc -g -o demo0 -I ../../libver -I ../lib -ldl ../../libver/libver.so ../lib/libnode.so demo0.c + +clean: + rm demo0 diff --git a/demo/nddemo0.dsw b/demo/nddemo0.dsw new file mode 100644 index 0000000..2ce5c96 --- /dev/null +++ b/demo/nddemo0.dsw @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "demo0"=.\demo0\demo0.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/lib/Makefile b/lib/Makefile new file mode 100644 index 0000000..4ba273f --- /dev/null +++ b/lib/Makefile @@ -0,0 +1,11 @@ + +all: libnode.so + +libnode.o: libnode.c node.h libnode.h ../../libver/ver.h Makefile + gcc -c -g -o libnode.o -I . -I ../../libver libnode.c + +libnode.so: libnode.o + ld -shared -o libnode.so libnode.o + +clean: + rm libnode.o libnode.so diff --git a/lib/libnode.dsp b/lib/libnode.dsp new file mode 100644 index 0000000..1449739 --- /dev/null +++ b/lib/libnode.dsp @@ -0,0 +1,104 @@ +# Microsoft Developer Studio Project File - Name="libnode" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Static Library" 0x0104 + +CFG=libnode - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "libnode.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "libnode.mak" CFG="libnode - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "libnode - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "libnode - Win32 Debug" (based on "Win32 (x86) Static Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "libnode - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ELSEIF "$(CFG)" == "libnode - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /FR /YX /FD /GZ /c +# ADD BASE RSC /l 0x809 /d "_DEBUG" +# ADD RSC /l 0x809 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LIB32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo + +!ENDIF + +# Begin Target + +# Name "libnode - Win32 Release" +# Name "libnode - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\libnode.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\libnode.h +# End Source File +# Begin Source File + +SOURCE=.\node.h +# End Source File +# End Group +# End Target +# End Project diff --git a/lib/libnode.dsw b/lib/libnode.dsw new file mode 100644 index 0000000..0970a5e --- /dev/null +++ b/lib/libnode.dsw @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "libnode"=.\libnode.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/util/Makefile b/util/Makefile new file mode 100644 index 0000000..e184f0d --- /dev/null +++ b/util/Makefile @@ -0,0 +1,8 @@ + +all: ndbench + +ndbench: ndbench.c ../../libver/ver.h ../lib/node.h ../../libver/libver.so ../lib/libnode.so Makefile + gcc -g -o ndbench -I ../../libver -I ../lib -ldl ../../libver/libver.so ../lib/libnode.so ndbench.c + +clean: + rm ndbench diff --git a/util/ndbench.dsw b/util/ndbench.dsw new file mode 100644 index 0000000..0aed722 --- /dev/null +++ b/util/ndbench.dsw @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "ndbench"=.\ndbench.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/util/test-all.ndb b/util/test-all.ndb new file mode 100644 index 0000000..823d87a --- /dev/null +++ b/util/test-all.ndb @@ -0,0 +1,3 @@ +Batch_Run test-10K.ndb +Batch_Run test-100K.ndb +Batch_Run test-1M.ndb