From 60c800e788061b4b167a062f14e708f13dfb19db Mon Sep 17 00:00:00 2001 From: "Emden R. Gansner" Date: Tue, 25 Jun 2013 13:37:50 -0400 Subject: [PATCH] Modify build.bat to copy glut files into source tree for build; fix packager to include smyrna --- windows/build.bat | 2 ++ windows/graphviz-msi/setup/setup.vdproj | 26 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/windows/build.bat b/windows/build.bat index 5ef29dd0a..89ccddc4f 100755 --- 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 xcopy /Y %sourceLibDir%release %buildBaseDir%release\ /S xcopy /Y %sourceLibDir%gd %buildBaseDir%\graphviz2\lib\gd\ +xcopy /Y %sourceLibDir%GL %buildBaseDir%\graphviz2\cmd\smyrna\GL\ + del %buildDir%libltdl\config.h /q copy /Y %sourceLibDir%*.lib %targetDir%bin\ diff --git a/windows/graphviz-msi/setup/setup.vdproj b/windows/graphviz-msi/setup/setup.vdproj index a60d1cadb..83935e469 100755 --- a/windows/graphviz-msi/setup/setup.vdproj +++ b/windows/graphviz-msi/setup/setup.vdproj @@ -2817,6 +2817,12 @@ } "Entry" { + "MsmKey" = "8:_AB28E1FC05DE4DDB86C3F1CC6FD0B0BB" + "OwnerKey" = "8:_UNDEFINED" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_AB2C34354F134745BE862FFB81DC0434" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -13482,6 +13488,26 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_AB28E1FC05DE4DDB86C3F1CC6FD0B0BB" + { + "SourcePath" = "8:..\\..\\release\\bin\\smyrna.exe" + "TargetName" = "8:smyrna.exe" + "Tag" = "8:" + "Folder" = "8:_2CB80ACEA55C4CCD8EC8A66D0DE2ADA9" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:FALSE" + "IsolateTo" = "8:" + } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_AB2C34354F134745BE862FFB81DC0434" { "SourcePath" = "8:..\\..\\release\\lib\\debug\\dll\\cdt.dll" -- 2.40.0