Fix bugs in original windows build files

diff --git a/windows/cmd/tools/Acyclic.dsp b/windows/cmd/tools/Acyclic.dsp
new file mode 100644 (file)
index 0000000..6eb19ca
--- /dev/null
+++ b/windows/cmd/tools/Acyclic.dsp
@@ -0,0 +1,108 @@
+# Microsoft Developer Studio Project File - Name="Acyclic" - Package Owner=<4>\r
+# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
+# ** DO NOT EDIT **\r
+\r
+# TARGTYPE "Win32 (x86) Console Application" 0x0103\r
+\r
+CFG=Acyclic - Win32 Debug\r
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
+!MESSAGE use the Export Makefile command and run\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "Acyclic.mak".\r
+!MESSAGE \r
+!MESSAGE You can specify a configuration when running NMAKE\r
+!MESSAGE by defining the macro CFG on the command line. For example:\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "Acyclic.mak" CFG="Acyclic - Win32 Debug"\r
+!MESSAGE \r
+!MESSAGE Possible choices for configuration are:\r
+!MESSAGE \r
+!MESSAGE "Acyclic - Win32 Release" (based on "Win32 (x86) Console Application")\r
+!MESSAGE "Acyclic - Win32 Debug" (based on "Win32 (x86) Console Application")\r
+!MESSAGE \r
+\r
+# Begin Project\r
+# PROP AllowPerConfigDependencies 0\r
+# PROP Scc_ProjName ""\r
+# PROP Scc_LocalPath ""\r
+CPP=cl.exe\r
+RSC=rc.exe\r
+\r
+!IF  "$(CFG)" == "Acyclic - Win32 Release"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Output_Dir "Release"\r
+# PROP BASE Intermediate_Dir "Release"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 0\r
+# PROP Output_Dir "Release"\r
+# PROP Intermediate_Dir "Release"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
+# ADD CPP /nologo /W3 /GX /O2 /I "../src" /I "../.." /I "../../graph" /I "../../cdt" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /c\r
+# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
+# ADD RSC /l 0x409 /d "NDEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
+# ADD LINK32 graph.lib cdt.lib ingraphs.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"../../lib/lib/Release"\r
+# Begin Special Build Tool\r
+SOURCE="$(InputPath)"\r
+# End Special Build Tool\r
+\r
+!ELSEIF  "$(CFG)" == "Acyclic - Win32 Debug"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "Debug"\r
+# PROP BASE Intermediate_Dir "Debug"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "Debug"\r
+# PROP Intermediate_Dir "Debug"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../src" /I "../.." /I "../../graph" /I "../../cdt" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c\r
+# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
+# ADD RSC /l 0x409 /d "_DEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
+# ADD LINK32 graph.lib cdt.lib ingraphs.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../lib/lib/Debug"\r
+# Begin Special Build Tool\r
+SOURCE="$(InputPath)"\r
+# End Special Build Tool\r
+\r
+!ENDIF \r
+\r
+# Begin Target\r
+\r
+# Name "Acyclic - Win32 Release"\r
+# Name "Acyclic - Win32 Debug"\r
+# Begin Group "Source Files"\r
+\r
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
+# Begin Source File\r
+\r
+SOURCE=..\src\acyclic.c\r
+# End Source File\r
+# End Group\r
+# Begin Group "Header Files"\r
+\r
+# PROP Default_Filter "h;hpp;hxx;hm;inl"\r
+# End Group\r
+# Begin Group "Resource Files"\r
+\r
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r
+# End Group\r
+# End Target\r
+# End Project\r

diff --git a/windows/cmd/tools/Acyclic.mak b/windows/cmd/tools/Acyclic.mak
new file mode 100644 (file)
index 0000000..1c42b2a
--- /dev/null
+++ b/windows/cmd/tools/Acyclic.mak
@@ -0,0 +1,223 @@
+# Microsoft Developer Studio Generated NMAKE File, Based on Acyclic.dsp\r
+!IF "$(CFG)" == ""\r
+CFG=Acyclic - Win32 Debug\r
+!MESSAGE No configuration specified. Defaulting to Acyclic - Win32 Debug.\r
+!ENDIF \r
+\r
+!IF "$(CFG)" != "Acyclic - Win32 Release" && "$(CFG)" != "Acyclic - Win32 Debug"\r
+!MESSAGE Invalid configuration "$(CFG)" specified.\r
+!MESSAGE You can specify a configuration when running NMAKE\r
+!MESSAGE by defining the macro CFG on the command line. For example:\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "Acyclic.mak" CFG="Acyclic - Win32 Debug"\r
+!MESSAGE \r
+!MESSAGE Possible choices for configuration are:\r
+!MESSAGE \r
+!MESSAGE "Acyclic - Win32 Release" (based on "Win32 (x86) Console Application")\r
+!MESSAGE "Acyclic - Win32 Debug" (based on "Win32 (x86) Console Application")\r
+!MESSAGE \r
+!ERROR An invalid configuration is specified.\r
+!ENDIF \r
+\r
+!IF "$(OS)" == "Windows_NT"\r
+NULL=\r
+!ELSE \r
+NULL=nul\r
+!ENDIF \r
+\r
+CPP=cl.exe\r
+RSC=rc.exe\r
+\r
+!IF  "$(CFG)" == "Acyclic - Win32 Release"\r
+\r
+OUTDIR=.\Release\r
+INTDIR=.\Release\r
+# Begin Custom Macros\r
+OutDir=.\Release\r
+# End Custom Macros\r
+\r
+!IF "$(RECURSE)" == "0" \r
+\r
+ALL : "$(OUTDIR)\Acyclic.exe"\r
+\r
+!ELSE \r
+\r
+ALL : "ToolsSupport - Win32 Release" "$(OUTDIR)\Acyclic.exe"\r
+\r
+!ENDIF \r
+\r
+!IF "$(RECURSE)" == "1" \r
+CLEAN :"ToolsSupport - Win32 ReleaseCLEAN" \r
+!ELSE \r
+CLEAN :\r
+!ENDIF \r
+       -@erase "$(INTDIR)\acyclic.obj"\r
+       -@erase "$(INTDIR)\vc60.idb"\r
+       -@erase "$(OUTDIR)\Acyclic.exe"\r
+\r
+"$(OUTDIR)" :\r
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
+\r
+CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "." /I "../.." /I "../../lib/graph" /I "../../lib/cdt" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\Acyclic.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c \r
+BSC32=bscmake.exe\r
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\Acyclic.bsc" \r
+BSC32_SBRS= \\r
+       \r
+LINK32=link.exe\r
+LINK32_FLAGS=graph.lib cdt.lib ToolsSupport.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\Acyclic.pdb" /machine:I386 /out:"$(OUTDIR)\Acyclic.exe" /libpath:"../../lib/lib/Release" \r
+LINK32_OBJS= \\r
+       "$(INTDIR)\acyclic.obj" \\r
+       "$(OUTDIR)\ToolsSupport.lib"\r
+\r
+"$(OUTDIR)\Acyclic.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
+    $(LINK32) @<<\r
+  $(LINK32_FLAGS) $(LINK32_OBJS)\r
+<<\r
+\r
+SOURCE="$(InputPath)"\r
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep\r
+\r
+ALL : $(DS_POSTBUILD_DEP)\r
+\r
+# Begin Custom Macros\r
+OutDir=.\Release\r
+# End Custom Macros\r
+\r
+\r
+!ELSEIF  "$(CFG)" == "Acyclic - Win32 Debug"\r
+\r
+OUTDIR=.\Debug\r
+INTDIR=.\Debug\r
+# Begin Custom Macros\r
+OutDir=.\Debug\r
+# End Custom Macros\r
+\r
+!IF "$(RECURSE)" == "0" \r
+\r
+ALL : "$(OUTDIR)\Acyclic.exe"\r
+\r
+!ELSE \r
+\r
+ALL : "ToolsSupport - Win32 Debug" "$(OUTDIR)\Acyclic.exe"\r
+\r
+!ENDIF \r
+\r
+!IF "$(RECURSE)" == "1" \r
+CLEAN :"ToolsSupport - Win32 DebugCLEAN" \r
+!ELSE \r
+CLEAN :\r
+!ENDIF \r
+       -@erase "$(INTDIR)\acyclic.obj"\r
+       -@erase "$(INTDIR)\vc60.idb"\r
+       -@erase "$(INTDIR)\vc60.pdb"\r
+       -@erase "$(OUTDIR)\Acyclic.exe"\r
+       -@erase "$(OUTDIR)\Acyclic.ilk"\r
+       -@erase "$(OUTDIR)\Acyclic.pdb"\r
+\r
+"$(OUTDIR)" :\r
+    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"\r
+\r
+CPP_PROJ=/nologo /MLd /W3 /Gm /GX /ZI /Od /I "." /I "../.." /I "../../lib/graph" /I "../../lib/cdt" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /Fp"$(INTDIR)\Acyclic.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c \r
+BSC32=bscmake.exe\r
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\Acyclic.bsc" \r
+BSC32_SBRS= \\r
+       \r
+LINK32=link.exe\r
+LINK32_FLAGS=graph.lib cdt.lib ToolsSupport.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\Acyclic.pdb" /debug /machine:I386 /out:"$(OUTDIR)\Acyclic.exe" /pdbtype:sept /libpath:"../../lib/lib/Debug" \r
+LINK32_OBJS= \\r
+       "$(INTDIR)\acyclic.obj" \\r
+       "$(OUTDIR)\ToolsSupport.lib"\r
+\r
+"$(OUTDIR)\Acyclic.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
+    $(LINK32) @<<\r
+  $(LINK32_FLAGS) $(LINK32_OBJS)\r
+<<\r
+\r
+SOURCE="$(InputPath)"\r
+DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep\r
+\r
+ALL : $(DS_POSTBUILD_DEP)\r
+\r
+# Begin Custom Macros\r
+OutDir=.\Debug\r
+# End Custom Macros\r
+\r
+\r
+!ENDIF \r
+\r
+.c{$(INTDIR)}.obj::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cpp{$(INTDIR)}.obj::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cxx{$(INTDIR)}.obj::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.c{$(INTDIR)}.sbr::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cpp{$(INTDIR)}.sbr::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+.cxx{$(INTDIR)}.sbr::\r
+   $(CPP) @<<\r
+   $(CPP_PROJ) $< \r
+<<\r
+\r
+\r
+!IF "$(NO_EXTERNAL_DEPS)" != "1"\r
+!IF EXISTS("Acyclic.dep")\r
+!INCLUDE "Acyclic.dep"\r
+!ELSE \r
+!MESSAGE Warning: cannot find "Acyclic.dep"\r
+!ENDIF \r
+!ENDIF \r
+\r
+\r
+!IF "$(CFG)" == "Acyclic - Win32 Release" || "$(CFG)" == "Acyclic - Win32 Debug"\r
+SOURCE=..\src\acyclic.c\r
+\r
+"$(INTDIR)\acyclic.obj" : $(SOURCE) "$(INTDIR)"\r
+       $(CPP) $(CPP_PROJ) $(SOURCE)\r
+\r
+\r
+!IF  "$(CFG)" == "Acyclic - Win32 Release"\r
+\r
+"ToolsSupport - Win32 Release" : \r
+   cd "."\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\ToolsSupport.mak" CFG="ToolsSupport - Win32 Release" \r
+   cd "."\r
+\r
+"ToolsSupport - Win32 ReleaseCLEAN" : \r
+   cd "."\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\ToolsSupport.mak" CFG="ToolsSupport - Win32 Release" RECURSE=1 CLEAN \r
+   cd "."\r
+\r
+!ELSEIF  "$(CFG)" == "Acyclic - Win32 Debug"\r
+\r
+"ToolsSupport - Win32 Debug" : \r
+   cd "."\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\ToolsSupport.mak" CFG="ToolsSupport - Win32 Debug" \r
+   cd "."\r
+\r
+"ToolsSupport - Win32 DebugCLEAN" : \r
+   cd "."\r
+   $(MAKE) /$(MAKEFLAGS) /F ".\ToolsSupport.mak" CFG="ToolsSupport - Win32 Debug" RECURSE=1 CLEAN \r
+   cd "."\r
+\r
+!ENDIF \r
+\r
+\r
+!ENDIF \r
+\r

diff --git a/windows/cmd/tools/bcomps.dsp b/windows/cmd/tools/bcomps.dsp
index fa5e0fef3c9e01165dd63e1288ed5654b8630a80..90b2b263424240faac1bd152338018bf84b9bd48 100644 (file)
--- a/windows/cmd/tools/bcomps.dsp
+++ b/windows/cmd/tools/bcomps.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
-# ADD LINK32 raph.lib cdt.lib ingraphs.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
+# ADD LINK32 graph.lib cdt.lib ingraphs.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /libpath:"../../lib/lib/Release"\r
 # Begin Special Build Tool\r
 SOURCE="$(InputPath)"\r
 # End Special Build Tool\r
@@ -77,7 +77,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 raph.lib cdt.lib ingraphs.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
+# ADD LINK32 raph.lib cdt.lib ingraphs.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../../lib/lib/Debug"\r
 # Begin Special Build Tool\r
 SOURCE="$(InputPath)"\r
 # End Special Build Tool\r

diff --git a/windows/config.h b/windows/config.h
index 2d83b5a10a1ff87fc5bbe57777a395b93ba25986..5cd1f2e85d0ef435df2bdf7d3c1e2424cd604846 100644 (file)
--- a/windows/config.h
+++ b/windows/config.h
@@ -13,6 +13,8 @@
 *        Information and Software Systems Research        *
 *              AT&T Research, Florham Park NJ             *
 **********************************************************/
+#define VERSION "2.3.20050120.2005"
+#define BUILDDATE "Thu Jan 20 21:35:05 GMT 2005"
 
 #ifdef __cplusplus
 extern "C" {
@@ -231,6 +233,9 @@ extern "C" {
 # endif
 #endif
 
+/* No X display on Windows */
+#define X_DISPLAY_MISSING 1
+
 /* Define to 1 if you have the ANSI C header files. */
 /* <stdlib.h> <stdarg.h> <string.h> <float.h> */
 #define STDC_HEADERS 1

diff --git a/windows/ws/graphviz.dsw b/windows/ws/graphviz.dsw
index d8ead2066104b2ffd1505213358618bd010d242a..94351e36466717a42bf255a73e54beb9f838bf44 100755 (executable)
--- a/windows/ws/graphviz.dsw
+++ b/windows/ws/graphviz.dsw
@@ -87,7 +87,7 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "dotty"="..\cmddotty\dotty.dsp" - Package Owner=<4>\r
+Project: "dotty"="..\cmd\dotty\dotty.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
 {{{\r