Modify build.bat to copy glut files into source tree for build;

fix packager to include smyrna

diff --git a/windows/build.bat b/windows/build.bat
index 5ef29dd0a6cdde06118ffdff1113f20bcce91fba..89ccddc4fd1988821b04883015efa7a6ced9d91c 100755 (executable)
--- a/windows/build.bat
+++ b/windows/build.bat
@@ -43,6 +43,8 @@ xcopy /Y %buildDir%windows\FEATURE %buildDir%\FEATURE\ /S
 xcopy /Y %sourceLibDir%GTS %buildDir%lib\GTS\ /S\r
 xcopy /Y %sourceLibDir%release %buildBaseDir%release\ /S\r
 xcopy /Y %sourceLibDir%gd %buildBaseDir%\graphviz2\lib\gd\\r
+xcopy /Y %sourceLibDir%GL %buildBaseDir%\graphviz2\cmd\smyrna\GL\\r
+\r
 del %buildDir%libltdl\config.h /q\r
 copy /Y %sourceLibDir%*.lib %targetDir%bin\\r
 \r

diff --git a/windows/graphviz-msi/setup/setup.vdproj b/windows/graphviz-msi/setup/setup.vdproj
index a60d1cadbddc4d0ae923e1b9b7e8063828924956..83935e469050d7b870a5a6dfc38fe8f0d5e2116f 100755 (executable)
--- a/windows/graphviz-msi/setup/setup.vdproj
+++ b/windows/graphviz-msi/setup/setup.vdproj
@@ -2817,6 +2817,12 @@
         }\r
         "Entry"\r
         {\r
+        "MsmKey" = "8:_AB28E1FC05DE4DDB86C3F1CC6FD0B0BB"\r
+        "OwnerKey" = "8:_UNDEFINED"\r
+        "MsmSig" = "8:_UNDEFINED"\r
+        }\r
+        "Entry"\r
+        {\r
         "MsmKey" = "8:_AB2C34354F134745BE862FFB81DC0434"\r
         "OwnerKey" = "8:_UNDEFINED"\r
         "MsmSig" = "8:_UNDEFINED"\r
@@ -13482,6 +13488,26 @@
             "IsDependency" = "11:FALSE"\r
             "IsolateTo" = "8:"\r
             }\r
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_AB28E1FC05DE4DDB86C3F1CC6FD0B0BB"\r
+            {\r
+            "SourcePath" = "8:..\\..\\release\\bin\\smyrna.exe"\r
+            "TargetName" = "8:smyrna.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}:_AB2C34354F134745BE862FFB81DC0434"\r
             {\r
             "SourcePath" = "8:..\\..\\release\\lib\\debug\\dll\\cdt.dll"\r