update lib
This commit is contained in:
Luc Vandenbroucke
parent
ef5ab74270
commit
d84bdf03f9
4 changed files with 115 additions and 4 deletions
|
|
@ -2,15 +2,16 @@
|
|||
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
|
||||
<?define eDosStation_TargetDir=$(var.eDosStation.TargetDir)?>
|
||||
<?define eDosSync_TargetDir=$(var.syncEdosLocal.TargetDir)?>
|
||||
<?define syncEdosLocal_TargetDir=$(var.syncEdosLocal.TargetDir)?>
|
||||
<Product Id="*" Name="eDosStation" Language="1033" Version="1.0.2.0" Manufacturer="SCK CEN Luc" UpgradeCode="24e037ca-edbb-49d5-85d4-3a93dd7d10d8">
|
||||
<Product Id="*" Name="eDosStation" Language="1033" Version="1.0.3.0" Manufacturer="SCK CEN Luc Vandenbroucke" UpgradeCode="24e037ca-edbb-49d5-85d4-3a93dd7d10d8">
|
||||
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Comments="EPD lees software en synchronisatie tussen local en remote database" InstallPrivileges="elevated" Platform="x86" />
|
||||
<Media Id="1" EmbedCab="yes" Cabinet="cab" />
|
||||
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
|
||||
<Feature Id="eDosStationFeature" Title="eDosStation" Level="1">
|
||||
<ComponentGroupRef Id="eDosStation" />
|
||||
<ComponentRef Id="eDosStationShortcut" />
|
||||
<ComponentRef Id="regDesfire" />
|
||||
<ComponentRef Id="regDesfireb" />
|
||||
</Feature>
|
||||
<Feature Id="eDosSyncFeature" Title="eDosSync" Level="1">
|
||||
<ComponentGroupRef Id="eDosSync" />
|
||||
|
|
@ -34,6 +35,23 @@
|
|||
</Directory>
|
||||
</Fragment>
|
||||
|
||||
<Fragment>
|
||||
<DirectoryRef Id="TARGETDIR">
|
||||
<Component Id="regDesfireb" Guid="224D6E1F-115A-4572-A3FB-73B9AB6123AB" KeyPath="yes">
|
||||
<RegistryKey Key="SOFTWARE\Microsoft\Cryptography\Calais\SmartCards\NXP Mifare DESFire (2)" Root="HKLM">
|
||||
<RegistryValue Name="ATR" Value="3BF79100FF918171FE40004120001177818040" Type="binary" />
|
||||
<RegistryValue Name="Crypto Provider" Value="$$DisableSCPnP$$" Type="string" />
|
||||
</RegistryKey>
|
||||
</Component>
|
||||
<Component Id="regDesfire" Guid="C8DCEEFC-5494-4434-87BC-829EA06347BE" KeyPath="yes">
|
||||
<RegistryKey Key="SOFTWARE\Microsoft\Cryptography\Calais\SmartCards\NXP Mifare DESFire" Root="HKLM">
|
||||
<RegistryValue Name="ATR" Value="3B8180018080" Type="binary" />
|
||||
<RegistryValue Name="Crypto Provider" Value="$$DisableSCPnP$$" Type="string" />
|
||||
</RegistryKey>
|
||||
</Component>
|
||||
</DirectoryRef>
|
||||
</Fragment>
|
||||
|
||||
<Fragment>
|
||||
<SetDirectory Id="LogFolder" Value="[WindowsVolume]Logs" />
|
||||
</Fragment>
|
||||
|
|
@ -126,10 +144,11 @@
|
|||
<CustomAction Id="DeleteScheduledTask" Return="check" Directory="eDosSyncFolder" Execute="deferred" Impersonate="no" ExeCommand=""[SystemFolder]SCHTASKS.EXE" /DELETE /TN "EDos Sync" /F" />
|
||||
|
||||
<InstallExecuteSequence>
|
||||
<Custom Action="CreateScheduledTask" After="InstallFiles" />
|
||||
<Custom Action="DeleteScheduledTask" Before="RemoveFiles" />
|
||||
<Custom Action="CreateScheduledTask" After='InstallFinalize'>NOT Installed</Custom>
|
||||
<Custom Action="DeleteScheduledTask" Before="RemoveFiles" >Installed</Custom>
|
||||
</InstallExecuteSequence>
|
||||
|
||||
|
||||
</Fragment>
|
||||
|
||||
</Wix>
|
||||
|
|
|
|||
41
SetupProjectTestSched/Product.wxs
Normal file
41
SetupProjectTestSched/Product.wxs
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
|
||||
<Product Id="*" Name="TestSched" Language="1033" Version="1.0.0.0" Manufacturer="LSW" UpgradeCode="61436dd3-dc9f-498e-bffa-403d8ed6b0ba">
|
||||
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
|
||||
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
|
||||
<MediaTemplate />
|
||||
<Feature Id="ProductFeature" Title="SetupProjectTestSched" Level="1">
|
||||
<ComponentGroupRef Id="ProductComponents" />
|
||||
</Feature>
|
||||
</Product>
|
||||
|
||||
<Fragment>
|
||||
<Directory Id="TARGETDIR" Name="SourceDir">
|
||||
<Directory Id="ProgramFilesFolder">
|
||||
<Directory Id="INSTALLFOLDER" Name="SetupProjectTestSched" />
|
||||
</Directory>
|
||||
</Directory>
|
||||
</Fragment>
|
||||
|
||||
<Fragment>
|
||||
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
|
||||
<!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->
|
||||
<!-- <Component Id="ProductComponent"> -->
|
||||
<!-- TODO: Insert files, registry keys, and other resources here. -->
|
||||
<!-- </Component> -->
|
||||
</ComponentGroup>
|
||||
</Fragment>
|
||||
|
||||
<Fragment>
|
||||
<CustomAction Id="CreateScheduledTask" Return="check" Directory="eDosSyncFolder" Execute="deferred" Impersonate="no" ExeCommand=""[SystemFolder]SCHTASKS.EXE" /CREATE /TN "EDos Sync" /RU "eDosStation"/RP "Infopla+8" " />
|
||||
<CustomAction Id="DeleteScheduledTask" Return="check" Directory="eDosSyncFolder" Execute="deferred" Impersonate="no" ExeCommand=""[SystemFolder]SCHTASKS.EXE" /DELETE /TN "EDos Sync" /F" />
|
||||
|
||||
<InstallExecuteSequence>
|
||||
<Custom Action="CreateScheduledTask" After="InstallFiles" />
|
||||
<Custom Action="DeleteScheduledTask" Before="RemoveFiles" />
|
||||
</InstallExecuteSequence>
|
||||
|
||||
|
||||
</Fragment>
|
||||
|
||||
</Wix>
|
||||
37
SetupProjectTestSched/SetupProjectTestSched.wixproj
Normal file
37
SetupProjectTestSched/SetupProjectTestSched.wixproj
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
|
||||
<ProductVersion>3.10</ProductVersion>
|
||||
<ProjectGuid>bcf97910-cf22-486a-8d27-0a685fe83e4e</ProjectGuid>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<OutputName>SetupProjectTestSched</OutputName>
|
||||
<OutputType>Package</OutputType>
|
||||
</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>
|
||||
<ItemGroup>
|
||||
<Compile Include="Product.wxs" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
|
||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
|
||||
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
|
||||
<Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
|
||||
</Target>
|
||||
<!--
|
||||
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>
|
||||
|
|
@ -21,6 +21,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "syncEdosLocal", "syncEdosLo
|
|||
EndProject
|
||||
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "eDosSetup", "SetupProject1\eDosSetup.wixproj", "{D24E8510-81C4-4F32-B48D-38BA67AEFB0A}"
|
||||
EndProject
|
||||
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupProjectTestSched", "SetupProjectTestSched\SetupProjectTestSched.wixproj", "{BCF97910-CF22-486A-8D27-0A685FE83E4E}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
|
|
@ -175,6 +177,18 @@ Global
|
|||
{D24E8510-81C4-4F32-B48D-38BA67AEFB0A}.Release|x64.ActiveCfg = Release|x86
|
||||
{D24E8510-81C4-4F32-B48D-38BA67AEFB0A}.Release|x86.ActiveCfg = Release|x86
|
||||
{D24E8510-81C4-4F32-B48D-38BA67AEFB0A}.Release|x86.Build.0 = Release|x86
|
||||
{BCF97910-CF22-486A-8D27-0A685FE83E4E}.Debug|Any CPU.ActiveCfg = Debug|x86
|
||||
{BCF97910-CF22-486A-8D27-0A685FE83E4E}.Debug|ARM.ActiveCfg = Debug|x86
|
||||
{BCF97910-CF22-486A-8D27-0A685FE83E4E}.Debug|ARM64.ActiveCfg = Debug|x86
|
||||
{BCF97910-CF22-486A-8D27-0A685FE83E4E}.Debug|x64.ActiveCfg = Debug|x86
|
||||
{BCF97910-CF22-486A-8D27-0A685FE83E4E}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{BCF97910-CF22-486A-8D27-0A685FE83E4E}.Debug|x86.Build.0 = Debug|x86
|
||||
{BCF97910-CF22-486A-8D27-0A685FE83E4E}.Release|Any CPU.ActiveCfg = Release|x86
|
||||
{BCF97910-CF22-486A-8D27-0A685FE83E4E}.Release|ARM.ActiveCfg = Release|x86
|
||||
{BCF97910-CF22-486A-8D27-0A685FE83E4E}.Release|ARM64.ActiveCfg = Release|x86
|
||||
{BCF97910-CF22-486A-8D27-0A685FE83E4E}.Release|x64.ActiveCfg = Release|x86
|
||||
{BCF97910-CF22-486A-8D27-0A685FE83E4E}.Release|x86.ActiveCfg = Release|x86
|
||||
{BCF97910-CF22-486A-8D27-0A685FE83E4E}.Release|x86.Build.0 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue