Update windows build.bat files to create a .zip file, copy all necessary files,

and put graphviz in the PATH.

diff --git a/windows/addtopath.mst b/windows/addtopath.mst
new file mode 100644 (file)
index 0000000..61d7400
Binary files /dev/null and b/windows/addtopath.mst differ

diff --git a/windows/build.bat b/windows/build.bat
index 236b0e27949ede8e9b7ea3336e5e7cbf554f5352..778e4ddcf6e69e3b929efccd0978cec5225048c2 100755 (executable)
--- a/windows/build.bat
+++ b/windows/build.bat
@@ -14,7 +14,9 @@ set sourceUrl=http://www.graphviz.org/pub/graphviz/development/SOURCES/graphviz-
 set wgetPath=C:\wget\bin\r
 set SevenzPath="C:\Program Files\7-Zip"\r
 set pscpPath="C:\Program Files\PuTTY"\r
-PATH=%PATH%;%VS2008DIR%;%wgetPath%;%SevenzPath%;%pscpPath%;\r
+set sdkPath="C:\Program Files\Microsoft SDKs\Windows\v7.0\Bin"\r
+PATH=%PATH%;%VS2008DIR%;%wgetPath%;%SevenzPath%;%pscpPath%;%sdkPath%;\r
+\r
 REM *****************************************************\r
 REM 84716ny\r
 REM clean up code , if you rpvode source manually comment out this section\r
@@ -94,6 +96,7 @@ del %setupProjectDir%Release\*.msi
 devenv %setupProjectFile% -Clean release -Out %buildDir%packagingLog.txt\r
 devenv %setupProjectFile% -Build release -Out %buildDir%packagingLog.txt\r
 COPY /Y %setupProjectDir%Release\%setupProjectName%.msi %buildBaseDir%graphviz-2.31.%date:~10,4%%date:~4,2%%date:~7,2%.msi\r
+msitran -a c:\graphviz-ms\addtopath.mst %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

diff --git a/windows/build_stable.bat b/windows/build_stable.bat
index 6f770f2a61e4a30ca7b2f8a546271ce4e82ce9e5..d5bce06c4f3de8b4f114627fba1fba67cb20b09d 100755 (executable)
--- a/windows/build_stable.bat
+++ b/windows/build_stable.bat
@@ -14,7 +14,9 @@ set sourceUrl=http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-worki
 set wgetPath=C:\wget\bin\r
 set SevenzPath="C:\Program Files\7-Zip"\r
 set pscpPath="C:\Program Files\PuTTY"\r
-PATH=%PATH%;%VS2008DIR%;%wgetPath%;%SevenzPath%;%pscpPath%;\r
+set sdkPath="C:\Program Files\Microsoft SDKs\Windows\v7.0\Bin"\r
+PATH=%PATH%;%VS2008DIR%;%wgetPath%;%SevenzPath%;%pscpPath%;%sdkPath%;\r
+\r
 REM *****************************************************\r
 REM 84716ny\r
 REM clean up code , if you provide source manually comment out this section\r
@@ -24,7 +26,7 @@ rmdir /S /Q %targetDir%
 del %buildBaseDir%*.msi\r
 del %buildBaseDir%*.tar\r
 del %buildBaseDir%*.gz\r
-del %buildBaseDir%*.gz\r
+del %buildBaseDir%*.zip\r
 del %outputDir%*.exe\r
 del %outputDir%*.dll\r
 REM *****************************************************\r
@@ -77,7 +79,7 @@ REM *****************************************************
 \r
 REM Run dot -c to generate config6 file. condig6 is shipped in the package\r
 REM *****************************************************\r
-%targetDir%\bin\dot -c\r
+%targetDir%bin\dot -c\r
 REM *****************************************************\r
 \r
 \r
@@ -93,10 +95,11 @@ del %setupProjectDir%Release\%setupProjectName%.msi
 del %setupProjectDir%Release\*.msi\r
 devenv %setupProjectFile% -Clean release -Out %buildDir%packagingLog.txt\r
 devenv %setupProjectFile% -Build release -Out %buildDir%packagingLog.txt\r
-COPY /Y %setupProjectDir%Release\%setupProjectName%.msi %buildBaseDir%graphviz-2.30.msi\r
+COPY /Y %setupProjectDir%Release\%setupProjectName%.msi %buildBaseDir%graphviz-2.30.1.msi\r
+msitran -a c:\graphviz-ms\addtopath.mst %buildBaseDir%graphviz-2.30.1.msi\r
 pscp -q *.msi graphviz-web://data/pub/graphviz/stable/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.30.1.zip\r
-pscp -q *.zip graphviz-web://data/pub/graphviz/development/windows >> pscpLog.txt 2>&1\r
+pscp -q *.zip graphviz-web://data/pub/graphviz/stable/windows >> pscpLog.txt 2>&1\r
 \r