]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
explore use of nuget for wix build dependency
authorJeff Lenk <jeff@jefflenk.com>
Mon, 7 Sep 2015 23:14:42 +0000 (18:14 -0500)
committerJeff Lenk <jeff@jefflenk.com>
Mon, 7 Sep 2015 23:14:42 +0000 (18:14 -0500)
w32/Setup/Setup.2015.wixproj
w32/Setup/packages.config [new file with mode: 0644]

index 7dcf416bf7e51e78eca9ddf8332903d507780fdc..1d8563b35340e06d515af9f1acf2a075c7230f33 100644 (file)
   </ItemGroup>\r
   <ItemGroup>\r
     <Content Include="filter.xslt" />\r
+    <Content Include="packages.config" />\r
   </ItemGroup>\r
+  <PropertyGroup>\r
+    <WixToolPath>$(SolutionDir)packages\WiX.Toolset.2015.3.10.0.1503\tools\wix\</WixToolPath>\r
+    <WixTargetsPath>$(WixToolPath)wix.targets</WixTargetsPath>\r
+    <WixTasksPath>$(WixToolPath)WixTasks.dll</WixTasksPath>\r
+  </PropertyGroup>\r
   <Import Project="$(WixTargetsPath)" />\r
   <PropertyGroup>\r
     <PreBuildEvent>"$(WixToolPath)\heat.exe" dir "$(ProjectDir)..\..\conf\vanilla" -cg FreeSWITCHConfFiles -gg -scom -sreg -sfrag -srd -dr CONFLOCATION -var var.FreeSWITCHConfFilesDir -out "$(ProjectDir)Fragments\FreeSWITCHConfFiles.wxs"\r
@@ -76,4 +82,4 @@
        <Target Name="AfterBuild">\r
        </Target>\r
        -->\r
-</Project>\r
+</Project>
\ No newline at end of file
diff --git a/w32/Setup/packages.config b/w32/Setup/packages.config
new file mode 100644 (file)
index 0000000..1479e99
--- /dev/null
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<packages>\r
+  <package id="WiX.Toolset.2015" version="3.10.0.1503" />\r
+</packages>
\ No newline at end of file