From 48c6195024409df120d772c2dfe3f2a2edc0dd2d Mon Sep 17 00:00:00 2001 From: erg Date: Thu, 20 Jan 2005 23:35:35 +0000 Subject: [PATCH] Fix bugs in original windows build files --- windows/cmd/tools/Acyclic.dsp | 108 ++++++++++++++++ windows/cmd/tools/Acyclic.mak | 223 ++++++++++++++++++++++++++++++++++ windows/cmd/tools/bcomps.dsp | 4 +- windows/config.h | 5 + windows/ws/graphviz.dsw | 2 +- 5 files changed, 339 insertions(+), 3 deletions(-) create mode 100644 windows/cmd/tools/Acyclic.dsp create mode 100644 windows/cmd/tools/Acyclic.mak diff --git a/windows/cmd/tools/Acyclic.dsp b/windows/cmd/tools/Acyclic.dsp new file mode 100644 index 000000000..6eb19cab1 --- /dev/null +++ b/windows/cmd/tools/Acyclic.dsp @@ -0,0 +1,108 @@ +# Microsoft Developer Studio Project File - Name="Acyclic" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=Acyclic - 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 "Acyclic.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 "Acyclic.mak" CFG="Acyclic - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "Acyclic - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "Acyclic - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "Acyclic - 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 Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# 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 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# 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 +# 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" +# Begin Special Build Tool +SOURCE="$(InputPath)" +# End Special Build Tool + +!ELSEIF "$(CFG)" == "Acyclic - 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 Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# 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 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# 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 +# 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" +# Begin Special Build Tool +SOURCE="$(InputPath)" +# End Special Build Tool + +!ENDIF + +# Begin Target + +# Name "Acyclic - Win32 Release" +# Name "Acyclic - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=..\src\acyclic.c +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" +# End Group +# End Target +# End Project diff --git a/windows/cmd/tools/Acyclic.mak b/windows/cmd/tools/Acyclic.mak new file mode 100644 index 000000000..1c42b2aa8 --- /dev/null +++ b/windows/cmd/tools/Acyclic.mak @@ -0,0 +1,223 @@ +# Microsoft Developer Studio Generated NMAKE File, Based on Acyclic.dsp +!IF "$(CFG)" == "" +CFG=Acyclic - Win32 Debug +!MESSAGE No configuration specified. Defaulting to Acyclic - Win32 Debug. +!ENDIF + +!IF "$(CFG)" != "Acyclic - Win32 Release" && "$(CFG)" != "Acyclic - Win32 Debug" +!MESSAGE Invalid configuration "$(CFG)" specified. +!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 "Acyclic.mak" CFG="Acyclic - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "Acyclic - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "Acyclic - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE +!ERROR An invalid configuration is specified. +!ENDIF + +!IF "$(OS)" == "Windows_NT" +NULL= +!ELSE +NULL=nul +!ENDIF + +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "Acyclic - Win32 Release" + +OUTDIR=.\Release +INTDIR=.\Release +# Begin Custom Macros +OutDir=.\Release +# End Custom Macros + +!IF "$(RECURSE)" == "0" + +ALL : "$(OUTDIR)\Acyclic.exe" + +!ELSE + +ALL : "ToolsSupport - Win32 Release" "$(OUTDIR)\Acyclic.exe" + +!ENDIF + +!IF "$(RECURSE)" == "1" +CLEAN :"ToolsSupport - Win32 ReleaseCLEAN" +!ELSE +CLEAN : +!ENDIF + -@erase "$(INTDIR)\acyclic.obj" + -@erase "$(INTDIR)\vc60.idb" + -@erase "$(OUTDIR)\Acyclic.exe" + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +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 +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\Acyclic.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +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" +LINK32_OBJS= \ + "$(INTDIR)\acyclic.obj" \ + "$(OUTDIR)\ToolsSupport.lib" + +"$(OUTDIR)\Acyclic.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +SOURCE="$(InputPath)" +DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep + +ALL : $(DS_POSTBUILD_DEP) + +# Begin Custom Macros +OutDir=.\Release +# End Custom Macros + + +!ELSEIF "$(CFG)" == "Acyclic - Win32 Debug" + +OUTDIR=.\Debug +INTDIR=.\Debug +# Begin Custom Macros +OutDir=.\Debug +# End Custom Macros + +!IF "$(RECURSE)" == "0" + +ALL : "$(OUTDIR)\Acyclic.exe" + +!ELSE + +ALL : "ToolsSupport - Win32 Debug" "$(OUTDIR)\Acyclic.exe" + +!ENDIF + +!IF "$(RECURSE)" == "1" +CLEAN :"ToolsSupport - Win32 DebugCLEAN" +!ELSE +CLEAN : +!ENDIF + -@erase "$(INTDIR)\acyclic.obj" + -@erase "$(INTDIR)\vc60.idb" + -@erase "$(INTDIR)\vc60.pdb" + -@erase "$(OUTDIR)\Acyclic.exe" + -@erase "$(OUTDIR)\Acyclic.ilk" + -@erase "$(OUTDIR)\Acyclic.pdb" + +"$(OUTDIR)" : + if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" + +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 +BSC32=bscmake.exe +BSC32_FLAGS=/nologo /o"$(OUTDIR)\Acyclic.bsc" +BSC32_SBRS= \ + +LINK32=link.exe +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" +LINK32_OBJS= \ + "$(INTDIR)\acyclic.obj" \ + "$(OUTDIR)\ToolsSupport.lib" + +"$(OUTDIR)\Acyclic.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) + $(LINK32) @<< + $(LINK32_FLAGS) $(LINK32_OBJS) +<< + +SOURCE="$(InputPath)" +DS_POSTBUILD_DEP=$(INTDIR)\postbld.dep + +ALL : $(DS_POSTBUILD_DEP) + +# Begin Custom Macros +OutDir=.\Debug +# End Custom Macros + + +!ENDIF + +.c{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.obj:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.c{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cpp{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + +.cxx{$(INTDIR)}.sbr:: + $(CPP) @<< + $(CPP_PROJ) $< +<< + + +!IF "$(NO_EXTERNAL_DEPS)" != "1" +!IF EXISTS("Acyclic.dep") +!INCLUDE "Acyclic.dep" +!ELSE +!MESSAGE Warning: cannot find "Acyclic.dep" +!ENDIF +!ENDIF + + +!IF "$(CFG)" == "Acyclic - Win32 Release" || "$(CFG)" == "Acyclic - Win32 Debug" +SOURCE=..\src\acyclic.c + +"$(INTDIR)\acyclic.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +!IF "$(CFG)" == "Acyclic - Win32 Release" + +"ToolsSupport - Win32 Release" : + cd "." + $(MAKE) /$(MAKEFLAGS) /F ".\ToolsSupport.mak" CFG="ToolsSupport - Win32 Release" + cd "." + +"ToolsSupport - Win32 ReleaseCLEAN" : + cd "." + $(MAKE) /$(MAKEFLAGS) /F ".\ToolsSupport.mak" CFG="ToolsSupport - Win32 Release" RECURSE=1 CLEAN + cd "." + +!ELSEIF "$(CFG)" == "Acyclic - Win32 Debug" + +"ToolsSupport - Win32 Debug" : + cd "." + $(MAKE) /$(MAKEFLAGS) /F ".\ToolsSupport.mak" CFG="ToolsSupport - Win32 Debug" + cd "." + +"ToolsSupport - Win32 DebugCLEAN" : + cd "." + $(MAKE) /$(MAKEFLAGS) /F ".\ToolsSupport.mak" CFG="ToolsSupport - Win32 Debug" RECURSE=1 CLEAN + cd "." + +!ENDIF + + +!ENDIF + diff --git a/windows/cmd/tools/bcomps.dsp b/windows/cmd/tools/bcomps.dsp index fa5e0fef3..90b2b2634 100644 --- a/windows/cmd/tools/bcomps.dsp +++ b/windows/cmd/tools/bcomps.dsp @@ -50,7 +50,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # 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 -# 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 +# 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" # Begin Special Build Tool SOURCE="$(InputPath)" # End Special Build Tool @@ -77,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # 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 -# 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 +# 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" # Begin Special Build Tool SOURCE="$(InputPath)" # End Special Build Tool diff --git a/windows/config.h b/windows/config.h index 2d83b5a10..5cd1f2e85 100644 --- 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. */ /* */ #define STDC_HEADERS 1 diff --git a/windows/ws/graphviz.dsw b/windows/ws/graphviz.dsw index d8ead2066..94351e364 100755 --- a/windows/ws/graphviz.dsw +++ b/windows/ws/graphviz.dsw @@ -87,7 +87,7 @@ Package=<4> ############################################################################### -Project: "dotty"="..\cmddotty\dotty.dsp" - Package Owner=<4> +Project: "dotty"="..\cmd\dotty\dotty.dsp" - Package Owner=<4> Package=<5> {{{ -- 2.40.0