From a627d3bf7eeeb98fd16fdc04ab820e1848ba3109 Mon Sep 17 00:00:00 2001 From: erg Date: Wed, 20 Jul 2005 16:53:40 +0000 Subject: [PATCH] Update windows build and package files to reflect file changes --- windows/bin/graphviz.wse | 10 ---------- windows/bin/win.sh | 6 ++---- windows/cmd/dot/dot.dsp | 4 ---- windows/cmd/dot/dot.mak | 9 --------- windows/wmake.sh | 2 +- 5 files changed, 3 insertions(+), 28 deletions(-) diff --git a/windows/bin/graphviz.wse b/windows/bin/graphviz.wse index 83510aa7a..7a9be4179 100755 --- a/windows/bin/graphviz.wse +++ b/windows/bin/graphviz.wse @@ -912,11 +912,6 @@ item: Install File Destination=%MAINDIR%\Graphviz\lib\ingraphs.lib Flags=0000000010000010 end -item: Install File - Source=c:\graphvizCVS\builddaemon\package\source\lib\dotneato.lib - Destination=%MAINDIR%\Graphviz\lib\dotneato.lib - Flags=0000000010000010 -end item: Install File Source=c:\graphvizCVS\builddaemon\package\source\lib\fdpgen.lib Destination=%MAINDIR%\Graphviz\lib\fdpgen.lib @@ -1192,11 +1187,6 @@ item: Install File Destination=%MAINDIR%\Graphviz\include\dotprocs.h Flags=0000000010000010 end -item: Install File - Source=c:\graphvizCVS\builddaemon\package\source\include\dotneato.h - Destination=%MAINDIR%\Graphviz\include\dotneato.h - Flags=0000000010000010 -end item: Install File Source=c:\graphvizCVS\builddaemon\package\source\include\dot.h Destination=%MAINDIR%\Graphviz\include\dot.h diff --git a/windows/bin/win.sh b/windows/bin/win.sh index 2454b1ae2..b35003644 100755 --- a/windows/bin/win.sh +++ b/windows/bin/win.sh @@ -240,7 +240,7 @@ function Install # install libraries echo "copying libraries" >> $LFILE - LIBS=(ingraphs agraph cdt circogen common dotgen dotneato fdpgen gd graph gvc neatogen pack pathplan twopigen) + LIBS=(ingraphs agraph cdt circogen common dotgen fdpgen gd graph gvc neatogen pack pathplan twopigen) if [[ ! -d $PACKAGE_HOME/source/lib ]] then mkdir $PACKAGE_HOME/source/lib @@ -295,8 +295,6 @@ function Package SRCDIR=$GVIZ_HOME/lib/cdt finstall ast_common.h finstall cdt.h - SRCDIR=$GVIZ_HOME/cmd/dot - finstall dotneato.h SRCDIR=$GVIZ_HOME/lib/circogen finstall circo.h SRCDIR=$GVIZ_HOME/lib/common @@ -317,7 +315,7 @@ function Package finstall gvplugin.h finstall gvplugin_layout.h finstall gvplugin_render.h - finstall gvplugin_text.h + finstall gvplugin_textlayout.h SRCDIR=$GVIZ_HOME/lib/neatogen finstall adjust.h finstall neato.h diff --git a/windows/cmd/dot/dot.dsp b/windows/cmd/dot/dot.dsp index cb0741109..29c1b49a4 100644 --- a/windows/cmd/dot/dot.dsp +++ b/windows/cmd/dot/dot.dsp @@ -93,10 +93,6 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # Begin Source File -SOURCE=args.c -# End Source File -# Begin Source File - SOURCE=dot.c # End Source File # End Group diff --git a/windows/cmd/dot/dot.mak b/windows/cmd/dot/dot.mak index 98a6d95e3..d82b8e35e 100755 --- a/windows/cmd/dot/dot.mak +++ b/windows/cmd/dot/dot.mak @@ -37,7 +37,6 @@ ALL : "$(OUTDIR)\dot.exe" CLEAN : - -@erase "$(INTDIR)\args.obj" -@erase "$(INTDIR)\dot.obj" -@erase "$(INTDIR)\vc60.idb" -@erase "$(OUTDIR)\dot.exe" @@ -88,7 +87,6 @@ BSC32_SBRS= \ LINK32=link.exe LINK32_FLAGS=pack.lib layout.lib pathplan.lib plugin.lib gd.lib graph.lib cdt.lib common.lib gvc.lib neatogen.lib twopigen.lib fdpgen.lib circogen.lib dotgen.lib libexpat.lib libexpatw.lib z.lib png.lib jpeg.lib ft.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)\dot.pdb" /machine:I386 /out:"$(OUTDIR)\dot.exe" /libpath:"..\..\plugin\Release" /libpath:"..\..\plugin\lib\Release" /libpath:"..\..\lib\lib\Release" /libpath:"..\..\third-party\lib" LINK32_OBJS= \ - "$(INTDIR)\args.obj" \ "$(INTDIR)\dot.obj" "$(OUTDIR)\dot.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -108,7 +106,6 @@ ALL : "$(OUTDIR)\dot.exe" CLEAN : - -@erase "$(INTDIR)\args.obj" -@erase "$(INTDIR)\dot.obj" -@erase "$(INTDIR)\vc60.idb" -@erase "$(INTDIR)\vc60.pdb" @@ -160,7 +157,6 @@ BSC32_SBRS= \ LINK32=link.exe LINK32_FLAGS=pack.lib layout.lib pathplan.lib plugin.lib gd.lib graph.lib cdt.lib common.lib gvc.lib neatogen.lib twopigen.lib fdpgen.lib circogen.lib dotgen.lib libexpat.lib libexpatw.lib z.lib png.lib jpeg.lib ft.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 /profile /debug /machine:I386 /out:"$(OUTDIR)\dot.exe" /libpath:"..\..\plugin\Debug" /libpath:"..\..\lib\lib\Debug" /libpath:"..\..\plugin\lib\Debug" /libpath:"..\..\third-party\lib" LINK32_OBJS= \ - "$(INTDIR)\args.obj" \ "$(INTDIR)\dot.obj" "$(OUTDIR)\dot.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) @@ -181,11 +177,6 @@ LINK32_OBJS= \ !IF "$(CFG)" == "dot - Win32 Release" || "$(CFG)" == "dot - Win32 Debug" -SOURCE=args.c - -"$(INTDIR)\args.obj" : $(SOURCE) "$(INTDIR)" - - SOURCE=dot.c "$(INTDIR)\dot.obj" : $(SOURCE) "$(INTDIR)" diff --git a/windows/wmake.sh b/windows/wmake.sh index ed5280532..9c9a827da 100755 --- a/windows/wmake.sh +++ b/windows/wmake.sh @@ -30,7 +30,7 @@ do done # libs to be built -LIBS=(cdt graph agraph gd pathplan common gvc pack neatogen dotgen twopigen circogen fdpgen dotneato ingraphs) +LIBS=(cdt graph agraph gd pathplan common gvc pack neatogen dotgen twopigen circogen fdpgen ingraphs) # plugins to be built PLUGINS=(layout) -- 2.40.0