diff options
| author |   Simon Rozman <simon@rozman.si> | 2020-10-17 15:44:47 +0200 |
|---|---|---|
| committer |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-10-30 16:51:01 +0100 |
| commit | 52738e17b18d83c015d9cbd5f2096e73e32a96f9 (patch) | |
| tree | 5f7f3f584cc8cdb1811e85fc90f007e45c29810c /wintun.proj | |
| parent | api: use standard C void (diff) | |
| download | wintun-52738e17b18d83c015d9cbd5f2096e73e32a96f9.tar.xz wintun-52738e17b18d83c015d9cbd5f2096e73e32a96f9.zip | |
api: installer: switch from MSM to ZIP distribution
Signed-off-by: Simon Rozman <simon@rozman.si>
Diffstat (limited to 'wintun.proj')
| -rw-r--r-- | wintun.proj | 53 |
1 files changed, 42 insertions, 11 deletions
diff --git a/wintun.proj b/wintun.proj index 1cae706..de38711 100644 --- a/wintun.proj +++ b/wintun.proj @@ -13,7 +13,6 @@ <Import Project="wintun.vcxproj.user" Condition="exists('wintun.vcxproj.user')" /> <Target Name="Build" DependsOnTargets="Driver-x86;Driver-amd64;Driver-arm64" /> - <Target Name="MSM" DependsOnTargets="MSM-x86;MSM-amd64;MSM-arm64" /> <Target Name="Clean"> <RemoveDir Directories="Release\amd64\" /> <RemoveDir Directories="Release\arm\" /> @@ -68,18 +67,50 @@ </Target> <!-- - MSM Building + wintun.dll Building --> - <Target Name="MSM-x86" - Outputs="$(DistributionDir)wintun-x86-$(WintunVersionStr).msm"> - <MSBuild Projects="installer\installer.vcxproj" Targets="MSM" Properties="Configuration=Release;Platform=Win32" /> + <Target Name="Dll-x86" + Outputs="Release\x86\wintun.dll" + DependsOnTargets="Dll-amd64;Dll-arm64"> + <MSBuild Projects="api\api.vcxproj" Targets="Build" Properties="Configuration=Release;Platform=Win32" /> </Target> - <Target Name="MSM-amd64" - Outputs="$(DistributionDir)wintun-amd64-$(WintunVersionStr).msm"> - <MSBuild Projects="installer\installer.vcxproj" Targets="MSM" Properties="Configuration=Release;Platform=x64" /> + <Target Name="Dll-amd64" + Outputs="Release\amd64\wintun.dll"> + <MSBuild Projects="api\api.vcxproj" Targets="Build" Properties="Configuration=Release;Platform=x64" /> </Target> - <Target Name="MSM-arm64" - Outputs="$(DistributionDir)wintun-arm64-$(WintunVersionStr).msm"> - <MSBuild Projects="installer\installer.vcxproj" Targets="MSM" Properties="Configuration=Release;Platform=ARM64" /> + <Target Name="Dll-arm" + Outputs="Release\arm\wintun.dll" + DependsOnTargets="Dll-arm64"> + <MSBuild Projects="api\api.vcxproj" Targets="Build" Properties="Configuration=Release;Platform=ARM" /> + </Target> + <Target Name="Dll-arm64" + Outputs="Release\arm64\wintun.dll"> + <MSBuild Projects="api\api.vcxproj" Targets="Build" Properties="Configuration=Release;Platform=ARM64" /> + </Target> + + <!-- + Zip Building + --> + <PropertyGroup> + <ZipTargetPath>$(DistributionDir)wintun-$(WintunVersionStr).zip</ZipTargetPath> + <ZipIntDir>$(DistributionDir).tmp\</ZipIntDir> + </PropertyGroup> + <ItemGroup> + <ZipFilesSrc Include="COPYING" /><ZipFilesDst Include="$(ZipIntDir)COPYING" /> + <ZipFilesSrc Include="README.md" /><ZipFilesDst Include="$(ZipIntDir)README.md" /> + <ZipFilesSrc Include="api\wintun.h" /><ZipFilesDst Include="$(ZipIntDir)include\wintun.h" /> + <ZipFilesSrc Include="Release\amd64\wintun.dll" /><ZipFilesDst Include="$(ZipIntDir)bin\amd64\wintun.dll" /> + <ZipFilesSrc Include="Release\arm\wintun.dll" /><ZipFilesDst Include="$(ZipIntDir)bin\arm\wintun.dll" /> + <ZipFilesSrc Include="Release\arm64\wintun.dll" /><ZipFilesDst Include="$(ZipIntDir)bin\arm64\wintun.dll" /> + <ZipFilesSrc Include="Release\x86\wintun.dll" /><ZipFilesDst Include="$(ZipIntDir)bin\x86\wintun.dll" /> + </ItemGroup> + <Target Name="Zip" + Inputs="@(ZipFilesSrc)" + Outputs="$(ZipTargetPath)" + DependsOnTargets="Dll-x86;Dll-amd64;Dll-arm;Dll-arm64"> + <RemoveDir Directories="$(ZipIntDir)" /> + <Copy SourceFiles="@(ZipFilesSrc)" DestinationFiles="@(ZipFilesDst)" /> + <ZipDirectory DestinationFile="$(ZipTargetPath)" Overwrite="true" SourceDirectory="$(ZipIntDir)" /> + <RemoveDir Directories="$(ZipIntDir)" /> </Target> </Project> |