Update windows build and package files to reflect file changes

diff --git a/windows/bin/graphviz.wse b/windows/bin/graphviz.wse
index 83510aa7aaeaad5ff471108fc0121d66b2113f99..7a9be4179c935910b8c9c33037e5ff2ecde65b70 100755 (executable)
--- a/windows/bin/graphviz.wse
+++ b/windows/bin/graphviz.wse
@@ -912,11 +912,6 @@ item: Install File
   Destination=%MAINDIR%\Graphviz\lib\ingraphs.lib\r
   Flags=0000000010000010\r
 end\r
-item: Install File\r
-  Source=c:\graphvizCVS\builddaemon\package\source\lib\dotneato.lib\r
-  Destination=%MAINDIR%\Graphviz\lib\dotneato.lib\r
-  Flags=0000000010000010\r
-end\r
 item: Install File\r
   Source=c:\graphvizCVS\builddaemon\package\source\lib\fdpgen.lib\r
   Destination=%MAINDIR%\Graphviz\lib\fdpgen.lib\r
@@ -1192,11 +1187,6 @@ item: Install File
   Destination=%MAINDIR%\Graphviz\include\dotprocs.h\r
   Flags=0000000010000010\r
 end\r
-item: Install File\r
-  Source=c:\graphvizCVS\builddaemon\package\source\include\dotneato.h\r
-  Destination=%MAINDIR%\Graphviz\include\dotneato.h\r
-  Flags=0000000010000010\r
-end\r
 item: Install File\r
   Source=c:\graphvizCVS\builddaemon\package\source\include\dot.h\r
   Destination=%MAINDIR%\Graphviz\include\dot.h\r

diff --git a/windows/bin/win.sh b/windows/bin/win.sh
index 2454b1ae2389a036d421229a1c2b9e7702c62bba..b35003644dbd7c907c855088557c7990e0d4a01b 100755 (executable)
--- 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 cb0741109659970d1a779aeb74687e3ab2425a83..29c1b49a493b786d49da48f67b41cfac881f2970 100644 (file)
--- 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"\r
 # Begin Source File\r
 \r
-SOURCE=args.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=dot.c\r
 # End Source File\r
 # End Group\r

diff --git a/windows/cmd/dot/dot.mak b/windows/cmd/dot/dot.mak
index 98a6d95e30a65f9e0be9945dbf689b88a22fabd5..d82b8e35ec5d4adbc3598e17b2f9475ca8e47f75 100755 (executable)
--- a/windows/cmd/dot/dot.mak
+++ b/windows/cmd/dot/dot.mak
@@ -37,7 +37,6 @@ ALL : "$(OUTDIR)\dot.exe"
 \r
 \r
 CLEAN :\r
-       -@erase "$(INTDIR)\args.obj"\r
        -@erase "$(INTDIR)\dot.obj"\r
        -@erase "$(INTDIR)\vc60.idb"\r
        -@erase "$(OUTDIR)\dot.exe"\r
@@ -88,7 +87,6 @@ BSC32_SBRS= \
 LINK32=link.exe\r
 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" \r
 LINK32_OBJS= \\r
-       "$(INTDIR)\args.obj" \\r
        "$(INTDIR)\dot.obj"\r
 \r
 "$(OUTDIR)\dot.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
@@ -108,7 +106,6 @@ ALL : "$(OUTDIR)\dot.exe"
 \r
 \r
 CLEAN :\r
-       -@erase "$(INTDIR)\args.obj"\r
        -@erase "$(INTDIR)\dot.obj"\r
        -@erase "$(INTDIR)\vc60.idb"\r
        -@erase "$(INTDIR)\vc60.pdb"\r
@@ -160,7 +157,6 @@ BSC32_SBRS= \
 LINK32=link.exe\r
 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" \r
 LINK32_OBJS= \\r
-       "$(INTDIR)\args.obj" \\r
        "$(INTDIR)\dot.obj"\r
 \r
 "$(OUTDIR)\dot.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)\r
@@ -181,11 +177,6 @@ LINK32_OBJS= \
 \r
 \r
 !IF "$(CFG)" == "dot - Win32 Release" || "$(CFG)" == "dot - Win32 Debug"\r
-SOURCE=args.c\r
-\r
-"$(INTDIR)\args.obj" : $(SOURCE) "$(INTDIR)"\r
-\r
-\r
 SOURCE=dot.c\r
 \r
 "$(INTDIR)\dot.obj" : $(SOURCE) "$(INTDIR)"\r

diff --git a/windows/wmake.sh b/windows/wmake.sh
index ed52805322fe179c8da23e2921ccf646dd59c116..9c9a827dac5276a33fa1c24374bc024c70684f00 100755 (executable)
--- 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)