Add MSI installer for win32 virtualsmartcard.
Also ignore temporary VS artifacts and removes conflicting snprintf definition with standard definition
This commit is contained in:
Nick Russler
committed by
Frank Morgner
Frank Morgner
parent
77eb263212
commit
de515d80d2
5
virtualsmartcard/win32/BixVReaderInstaller/.gitignore
vendored
Normal file
5
virtualsmartcard/win32/BixVReaderInstaller/.gitignore
vendored
Normal file
@@ -0,0 +1,5 @@
|
||||
/.vs
|
||||
/obj
|
||||
/bin
|
||||
|
||||
*.sdf
|
||||
@@ -0,0 +1,9 @@
|
||||
[Driver]
|
||||
NumReaders=1
|
||||
|
||||
[Reader0]
|
||||
RPC_TYPE=2
|
||||
VENDOR_NAME=Virtual Smart Card Architecture
|
||||
VENDOR_IFD_TYPE=Virtual PCD
|
||||
TCP_PORT=35963
|
||||
DECIVE_UNIT=0
|
||||
@@ -0,0 +1,28 @@
|
||||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 14
|
||||
VisualStudioVersion = 14.0.23107.0
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "BixVReaderInstaller", "BixVReaderInstaller.wixproj", "{9C30A09E-1A74-4091-93B7-6296F94CE77C}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|x64 = Debug|x64
|
||||
Debug|x86 = Debug|x86
|
||||
Release|x64 = Release|x64
|
||||
Release|x86 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{9C30A09E-1A74-4091-93B7-6296F94CE77C}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{9C30A09E-1A74-4091-93B7-6296F94CE77C}.Debug|x64.Build.0 = Debug|x64
|
||||
{9C30A09E-1A74-4091-93B7-6296F94CE77C}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{9C30A09E-1A74-4091-93B7-6296F94CE77C}.Debug|x86.Build.0 = Debug|x86
|
||||
{9C30A09E-1A74-4091-93B7-6296F94CE77C}.Release|x64.ActiveCfg = Release|x64
|
||||
{9C30A09E-1A74-4091-93B7-6296F94CE77C}.Release|x64.Build.0 = Release|x64
|
||||
{9C30A09E-1A74-4091-93B7-6296F94CE77C}.Release|x86.ActiveCfg = Release|x86
|
||||
{9C30A09E-1A74-4091-93B7-6296F94CE77C}.Release|x86.Build.0 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
@@ -0,0 +1,65 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
|
||||
<ProductVersion>3.10</ProductVersion>
|
||||
<ProjectGuid>9c30a09e-1a74-4091-93b7-6296f94ce77c</ProjectGuid>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<OutputName>BixVReaderInstaller</OutputName>
|
||||
<OutputType>Package</OutputType>
|
||||
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
|
||||
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
|
||||
<OutputPath>bin\$(Configuration)\</OutputPath>
|
||||
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
|
||||
<DefineConstants>Debug</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
|
||||
<OutputPath>bin\$(Configuration)\</OutputPath>
|
||||
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
|
||||
<DefineConstants>Debug</DefineConstants>
|
||||
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
|
||||
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
|
||||
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
|
||||
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Product.wxs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\BixVReader\BixVReader.vcxproj">
|
||||
<Name>BixVReader</Name>
|
||||
<Project>{1d286e48-de79-41ff-844b-56ed3764d4da}</Project>
|
||||
<Private>True</Private>
|
||||
<DoNotHarvest>True</DoNotHarvest>
|
||||
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
|
||||
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\DevMsi\src\DevMsi\DevMsi.vcxproj">
|
||||
<Name>DevMsi</Name>
|
||||
<Project>{42c4f882-2757-4c0d-90d9-bc096810163e}</Project>
|
||||
<Private>True</Private>
|
||||
<DoNotHarvest>True</DoNotHarvest>
|
||||
<RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
|
||||
<RefTargetDir>INSTALLFOLDER</RefTargetDir>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="BixVReader.ini.template" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(WixTargetsPath)" />
|
||||
<!--
|
||||
To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Wix.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
</Project>
|
||||
64
virtualsmartcard/win32/BixVReaderInstaller/Product.wxs
Normal file
64
virtualsmartcard/win32/BixVReaderInstaller/Product.wxs
Normal file
@@ -0,0 +1,64 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<?define BinaryFolder="../binaries"?>
|
||||
|
||||
<?if $(sys.BUILDARCH)="x86"?>
|
||||
<?define ProgramFilesARCHFolder="ProgramFilesFolder"?>
|
||||
<?define DriverFolderARCH="Win8.1Debug_win32"?>
|
||||
<?elseif $(sys.BUILDARCH)="x64"?>
|
||||
<?define ProgramFilesARCHFolder="ProgramFiles64Folder"?>
|
||||
<?define DriverFolderARCH="Win8.1Debug_x64"?>
|
||||
<?else?>
|
||||
<?error Unsupported value of sys.BUILDARCH=$(sys.BUILDARCH)?>
|
||||
<?endif?>
|
||||
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
|
||||
<Product Id="*" Name="BixVReaderInstaller-$(sys.BUILDARCH)" Language="1033" Version="1.0.0.0" Manufacturer="FrankMorgner" UpgradeCode="6d60b0e4-c325-4d3b-b727-2f3e0b0a8afa">
|
||||
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
|
||||
|
||||
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
|
||||
<MediaTemplate EmbedCab="yes" />
|
||||
|
||||
<Directory Id="TARGETDIR" Name="SourceDir">
|
||||
<Directory Id="$(var.ProgramFilesARCHFolder)">
|
||||
<Directory Id="INSTALLDIR" Name="BixVReader">
|
||||
<Component Id="BixVReaderDriver" Guid="60FF3BFF-E235-4F84-8A25-E22CB3164FB1">
|
||||
<File Id="BixVReader.dll" Source="$(var.BixVReader.TargetDir)BixVReader\BixVReader.dll" />
|
||||
<File Id="BixVReader.inf" Source="$(var.BixVReader.TargetDir)BixVReader\BixVReader.inf" />
|
||||
<File Id="WudfUpdate_01009.dll" Source="$(var.BixVReader.TargetDir)BixVReader\WudfUpdate_01011.dll" />
|
||||
<File Id="wudf.cat" Source="$(var.BixVReader.TargetDir)BixVReader\bixvreader.cat" />
|
||||
</Component>
|
||||
</Directory>
|
||||
</Directory>
|
||||
|
||||
<Directory Id="WindowsFolder">
|
||||
<Component Id="BixVReaderConfiguration">
|
||||
<File Id="BixVReader.ini" Source="BixVReader.ini.template" Name="BixVReader.ini" />
|
||||
</Component>
|
||||
</Directory>
|
||||
</Directory>
|
||||
|
||||
<Binary Id="DevMsi" SourceFile="$(var.DevMsi.TargetPath)" />
|
||||
|
||||
<CustomAction Id="AddDevice" BinaryKey="DevMsi" DllEntry="CreateDevnode" Execute="deferred" Impersonate="no" />
|
||||
<CustomAction Id="AddDevice.SetParam" Return="check" Property="AddDevice" Value='"[INSTALLDIR]BixVReader.inf" root\BixVirtualReader' />
|
||||
|
||||
<CustomAction Id="DelDevice" Return="ignore" BinaryKey="DevMsi" DllEntry="RemoveDevnode" Execute="deferred" Impersonate="no" />
|
||||
<CustomAction Id="DelDevice.SetParam" Return="check" Property="DelDevice" Value="root\BixVirtualReader" />
|
||||
|
||||
<Feature Id="ProductFeature" Title="BixVReader" Level="1">
|
||||
<ComponentRef Id="BixVReaderDriver" />
|
||||
<ComponentRef Id="BixVReaderConfiguration" />
|
||||
</Feature>
|
||||
|
||||
<InstallExecuteSequence>
|
||||
<!-- Custom Actions that will be executed if "Installed" -->
|
||||
<Custom Action ="DelDevice.SetParam" After="InstallFiles">Installed</Custom>
|
||||
<Custom Action='DelDevice' After="DelDevice.SetParam">Installed</Custom>
|
||||
|
||||
<!-- Custom Actions that will be executed if "NOT Installed" -->
|
||||
<Custom Action ="AddDevice.SetParam" After="DelDevice">NOT REMOVE</Custom>
|
||||
<Custom Action='AddDevice' After="AddDevice.SetParam">NOT REMOVE</Custom>
|
||||
</InstallExecuteSequence>
|
||||
</Product>
|
||||
</Wix>
|
||||
Reference in New Issue
Block a user