Fix windows build - include missing binaries osage, sfdp, patchwork, circo;

create simple zip file of build

diff --git a/windows/build.bat b/windows/build.bat
index 64b7af5091c82f3bbbf41be2f2b4703b1657092d..236b0e27949ede8e9b7ea3336e5e7cbf554f5352 100755 (executable)
--- a/windows/build.bat
+++ b/windows/build.bat
@@ -63,10 +63,12 @@ REM *****************************************************
 copy /Y %sourceLibDir%*.*  %targetDir%bin\r
 copy /Y %outputDir%*.exe  %targetDir%bin\r
 copy /Y %outputDir%dot.exe %targetDir%bin\circo.exe\r
-copy /Y %outputDir%dot.exe %targetDir%bin\neato.exe\r
 copy /Y %outputDir%dot.exe %targetDir%bin\fdp.exe\r
-copy /Y %outputDir%dot.exe %targetDir%bin\twopi.exe\r
+copy /Y %outputDir%dot.exe %targetDir%bin\neato.exe\r
+copy /Y %outputDir%dot.exe %targetDir%bin\osage.exe\r
+copy /Y %outputDir%dot.exe %targetDir%bin\patchwork.exe\r
 copy /Y %outputDir%dot.exe %targetDir%bin\sfdp.exe\r
+copy /Y %outputDir%dot.exe %targetDir%bin\twopi.exe\r
 copy /Y %outputDir%gv2gml.exe %targetDir%bin\gml2gv.exe\r
 copy /Y %outputDir%*.dll  %targetDir%bin\r
 copy /Y %outputDir%*.lib  %targetDir%lib\release\lib\r
@@ -94,5 +96,9 @@ devenv %setupProjectFile% -Build release -Out %buildDir%packagingLog.txt
 COPY /Y %setupProjectDir%Release\%setupProjectName%.msi %buildBaseDir%graphviz-2.31.%date:~10,4%%date:~4,2%%date:~7,2%.msi\r
 pscp -q *.msi graphviz-web://data/pub/graphviz/development/windows > pscpLog.txt 2>&1\r
 \r
+7z a -tzip c:\graphviz-ms\graphviz.zip c:\graphviz-ms\release\r
+move /Y c:\graphviz-ms\graphviz.zip %buildBaseDir%graphviz-2.31.%date:~10,4%%date:~4,2%%date:~7,2%.zip\r
+pscp -q *.zip graphviz-web://data/pub/graphviz/development/windows >> pscpLog.txt 2>&1\r
+\r
 \r
 \r

diff --git a/windows/build_stable.bat b/windows/build_stable.bat
index 10122e50bd332db390b1959e3da385c398f093b9..6f770f2a61e4a30ca7b2f8a546271ce4e82ce9e5 100755 (executable)
--- a/windows/build_stable.bat
+++ b/windows/build_stable.bat
@@ -63,10 +63,12 @@ REM *****************************************************
 copy /Y %sourceLibDir%*.*  %targetDir%bin\r
 copy /Y %outputDir%*.exe  %targetDir%bin\r
 copy /Y %outputDir%dot.exe %targetDir%bin\circo.exe\r
-copy /Y %outputDir%dot.exe %targetDir%bin\neato.exe\r
 copy /Y %outputDir%dot.exe %targetDir%bin\fdp.exe\r
-copy /Y %outputDir%dot.exe %targetDir%bin\twopi.exe\r
+copy /Y %outputDir%dot.exe %targetDir%bin\neato.exe\r
+copy /Y %outputDir%dot.exe %targetDir%bin\osage.exe\r
+copy /Y %outputDir%dot.exe %targetDir%bin\patchwork.exe\r
 copy /Y %outputDir%dot.exe %targetDir%bin\sfdp.exe\r
+copy /Y %outputDir%dot.exe %targetDir%bin\twopi.exe\r
 copy /Y %outputDir%gv2gml.exe %targetDir%bin\gml2gv.exe\r
 copy /Y %outputDir%*.dll  %targetDir%bin\r
 copy /Y %outputDir%*.lib  %targetDir%lib\release\lib\r
@@ -94,5 +96,7 @@ devenv %setupProjectFile% -Build release -Out %buildDir%packagingLog.txt
 COPY /Y %setupProjectDir%Release\%setupProjectName%.msi %buildBaseDir%graphviz-2.30.msi\r
 pscp -q *.msi graphviz-web://data/pub/graphviz/stable/windows > pscpLog.txt 2>&1\r
 \r
-\r
+7z a -tzip c:\graphviz-ms\graphviz.zip c:\graphviz-ms\release\r
+move /Y c:\graphviz-ms\graphviz.zip %buildBaseDir%graphviz-2.30.1.zip\r
+pscp -q *.zip graphviz-web://data/pub/graphviz/development/windows >> pscpLog.txt 2>&1\r
 \r

diff --git a/windows/graphviz-msi/setup/setup.vdproj b/windows/graphviz-msi/setup/setup.vdproj
index 72b4cce68c4e8d818e1e9d553f96c15654efb108..a60d1cadbddc4d0ae923e1b9b7e8063828924956 100755 (executable)
--- a/windows/graphviz-msi/setup/setup.vdproj
+++ b/windows/graphviz-msi/setup/setup.vdproj
@@ -573,6 +573,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_2493D07BE9EF448D87DEF1C6EB0100B2"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_24C1745F20D349009EEF72BA9288A7E5"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -1197,6 +1203,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_47F2431DAC064B6285B23746884F4463"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_490207A227DE4E958CFB6A43288EF375"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -2061,6 +2073,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_7D32B174E5C6409CB6D4B9EAF62B06EF"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_7D47E42723DE43388EDA9BCEDE7437E7"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -2487,6 +2505,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_9A34B75639794B7EA4B99F695A048449"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_9AFC4F2F68A84D58AEB7DD28C8BAE137"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -5978,6 +6002,26 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2493D07BE9EF448D87DEF1C6EB0100B2"\r
+            {\r
+            "SourcePath" = "8:..\\..\\release\\bin\\osage.exe"\r
+            "TargetName" = "8:osage.exe"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_2CB80ACEA55C4CCD8EC8A66D0DE2ADA9"\r
+            "Condition" = "8:"\r
+            "Transitive" = "11:FALSE"\r
+            "Vital" = "11:TRUE"\r
+            "ReadOnly" = "11:FALSE"\r
+            "Hidden" = "11:FALSE"\r
+            "System" = "11:FALSE"\r
+            "Permanent" = "11:FALSE"\r
+            "SharedLegacy" = "11:FALSE"\r
+            "PackageAs" = "3:1"\r
+            "Register" = "3:1"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:FALSE"\r
+            "IsolateTo" = "8:"\r
+            }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_24C1745F20D349009EEF72BA9288A7E5"\r
             {\r
             "SourcePath" = "8:..\\..\\release\\etc\\gtk-2.0\\gdk-pixbuf.loaders"\r
@@ -8058,6 +8102,26 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_47F2431DAC064B6285B23746884F4463"\r
+            {\r
+            "SourcePath" = "8:..\\..\\release\\bin\\circo.exe"\r
+            "TargetName" = "8:circo.exe"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_2CB80ACEA55C4CCD8EC8A66D0DE2ADA9"\r
+            "Condition" = "8:"\r
+            "Transitive" = "11:FALSE"\r
+            "Vital" = "11:TRUE"\r
+            "ReadOnly" = "11:FALSE"\r
+            "Hidden" = "11:FALSE"\r
+            "System" = "11:FALSE"\r
+            "Permanent" = "11:FALSE"\r
+            "SharedLegacy" = "11:FALSE"\r
+            "PackageAs" = "3:1"\r
+            "Register" = "3:1"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:FALSE"\r
+            "IsolateTo" = "8:"\r
+            }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_490207A227DE4E958CFB6A43288EF375"\r
             {\r
             "SourcePath" = "8:..\\..\\release\\share\\graphviz\\doc\\html\\winbuild.html"\r
@@ -10938,6 +11002,26 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7D32B174E5C6409CB6D4B9EAF62B06EF"\r
+            {\r
+            "SourcePath" = "8:..\\..\\release\\bin\\sfdp.exe"\r
+            "TargetName" = "8:sfdp.exe"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_2CB80ACEA55C4CCD8EC8A66D0DE2ADA9"\r
+            "Condition" = "8:"\r
+            "Transitive" = "11:FALSE"\r
+            "Vital" = "11:TRUE"\r
+            "ReadOnly" = "11:FALSE"\r
+            "Hidden" = "11:FALSE"\r
+            "System" = "11:FALSE"\r
+            "Permanent" = "11:FALSE"\r
+            "SharedLegacy" = "11:FALSE"\r
+            "PackageAs" = "3:1"\r
+            "Register" = "3:1"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:FALSE"\r
+            "IsolateTo" = "8:"\r
+            }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7D47E42723DE43388EDA9BCEDE7437E7"\r
             {\r
             "SourcePath" = "8:..\\..\\release\\share\\graphviz\\smyrna\\Thumbs.db"\r
@@ -12358,6 +12442,26 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9A34B75639794B7EA4B99F695A048449"\r
+            {\r
+            "SourcePath" = "8:..\\..\\release\\bin\\patchwork.exe"\r
+            "TargetName" = "8:patchwork.exe"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_2CB80ACEA55C4CCD8EC8A66D0DE2ADA9"\r
+            "Condition" = "8:"\r
+            "Transitive" = "11:FALSE"\r
+            "Vital" = "11:TRUE"\r
+            "ReadOnly" = "11:FALSE"\r
+            "Hidden" = "11:FALSE"\r
+            "System" = "11:FALSE"\r
+            "Permanent" = "11:FALSE"\r
+            "SharedLegacy" = "11:FALSE"\r
+            "PackageAs" = "3:1"\r
+            "Register" = "3:1"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:FALSE"\r
+            "IsolateTo" = "8:"\r
+            }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9AFC4F2F68A84D58AEB7DD28C8BAE137"\r
             {\r
             "SourcePath" = "8:..\\..\\release\\bin\\libpangocairo-1.0-0.dll"\r

diff --git a/windows/graphviz-msi/setup/setup_stable.vdproj b/windows/graphviz-msi/setup/setup_stable.vdproj
index d61497b0d58e34b575157acb4fd4a0c7928b5f89..73dc26783f0355494c528d6299ceac86b6956cd3 100755 (executable)
--- a/windows/graphviz-msi/setup/setup_stable.vdproj
+++ b/windows/graphviz-msi/setup/setup_stable.vdproj
@@ -573,6 +573,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_2493D07BE9EF448D87DEF1C6EB0100B2"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_24C1745F20D349009EEF72BA9288A7E5"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -1197,6 +1203,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_47F2431DAC064B6285B23746884F4463"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_490207A227DE4E958CFB6A43288EF375"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -2061,6 +2073,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_7D32B174E5C6409CB6D4B9EAF62B06EF"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_7D47E42723DE43388EDA9BCEDE7437E7"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -2487,6 +2505,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_9A34B75639794B7EA4B99F695A048449"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_9AFC4F2F68A84D58AEB7DD28C8BAE137"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -5978,6 +6002,26 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2493D07BE9EF448D87DEF1C6EB0100B2"\r
+            {\r
+            "SourcePath" = "8:..\\..\\release\\bin\\osage.exe"\r
+            "TargetName" = "8:osage.exe"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_2CB80ACEA55C4CCD8EC8A66D0DE2ADA9"\r
+            "Condition" = "8:"\r
+            "Transitive" = "11:FALSE"\r
+            "Vital" = "11:TRUE"\r
+            "ReadOnly" = "11:FALSE"\r
+            "Hidden" = "11:FALSE"\r
+            "System" = "11:FALSE"\r
+            "Permanent" = "11:FALSE"\r
+            "SharedLegacy" = "11:FALSE"\r
+            "PackageAs" = "3:1"\r
+            "Register" = "3:1"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:FALSE"\r
+            "IsolateTo" = "8:"\r
+            }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_24C1745F20D349009EEF72BA9288A7E5"\r
             {\r
             "SourcePath" = "8:..\\..\\release\\etc\\gtk-2.0\\gdk-pixbuf.loaders"\r
@@ -8058,6 +8102,26 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_47F2431DAC064B6285B23746884F4463"\r
+            {\r
+            "SourcePath" = "8:..\\..\\release\\bin\\circo.exe"\r
+            "TargetName" = "8:circo.exe"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_2CB80ACEA55C4CCD8EC8A66D0DE2ADA9"\r
+            "Condition" = "8:"\r
+            "Transitive" = "11:FALSE"\r
+            "Vital" = "11:TRUE"\r
+            "ReadOnly" = "11:FALSE"\r
+            "Hidden" = "11:FALSE"\r
+            "System" = "11:FALSE"\r
+            "Permanent" = "11:FALSE"\r
+            "SharedLegacy" = "11:FALSE"\r
+            "PackageAs" = "3:1"\r
+            "Register" = "3:1"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:FALSE"\r
+            "IsolateTo" = "8:"\r
+            }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_490207A227DE4E958CFB6A43288EF375"\r
             {\r
             "SourcePath" = "8:..\\..\\release\\share\\graphviz\\doc\\html\\winbuild.html"\r
@@ -10938,6 +11002,26 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7D32B174E5C6409CB6D4B9EAF62B06EF"\r
+            {\r
+            "SourcePath" = "8:..\\..\\release\\bin\\sfdp.exe"\r
+            "TargetName" = "8:sfdp.exe"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_2CB80ACEA55C4CCD8EC8A66D0DE2ADA9"\r
+            "Condition" = "8:"\r
+            "Transitive" = "11:FALSE"\r
+            "Vital" = "11:TRUE"\r
+            "ReadOnly" = "11:FALSE"\r
+            "Hidden" = "11:FALSE"\r
+            "System" = "11:FALSE"\r
+            "Permanent" = "11:FALSE"\r
+            "SharedLegacy" = "11:FALSE"\r
+            "PackageAs" = "3:1"\r
+            "Register" = "3:1"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:FALSE"\r
+            "IsolateTo" = "8:"\r
+            }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_7D47E42723DE43388EDA9BCEDE7437E7"\r
             {\r
             "SourcePath" = "8:..\\..\\release\\share\\graphviz\\smyrna\\Thumbs.db"\r
@@ -12358,6 +12442,26 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9A34B75639794B7EA4B99F695A048449"\r
+            {\r
+            "SourcePath" = "8:..\\..\\release\\bin\\patchwork.exe"\r
+            "TargetName" = "8:patchwork.exe"\r
+            "Tag" = "8:"\r
+            "Folder" = "8:_2CB80ACEA55C4CCD8EC8A66D0DE2ADA9"\r
+            "Condition" = "8:"\r
+            "Transitive" = "11:FALSE"\r
+            "Vital" = "11:TRUE"\r
+            "ReadOnly" = "11:FALSE"\r
+            "Hidden" = "11:FALSE"\r
+            "System" = "11:FALSE"\r
+            "Permanent" = "11:FALSE"\r
+            "SharedLegacy" = "11:FALSE"\r
+            "PackageAs" = "3:1"\r
+            "Register" = "3:1"\r
+            "Exclude" = "11:FALSE"\r
+            "IsDependency" = "11:FALSE"\r
+            "IsolateTo" = "8:"\r
+            }\r
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_9AFC4F2F68A84D58AEB7DD28C8BAE137"\r
             {\r
             "SourcePath" = "8:..\\..\\release\\bin\\libpangocairo-1.0-0.dll"\r