Skip to content

Commit

Permalink
Merge pull request #1 from ajay1685/vips-8-10-6
Browse files Browse the repository at this point in the history
Vips 8.10.6 and NetVips 2.0.1
  • Loading branch information
ajay1685 authored Jun 26, 2021
2 parents 3e8389f + c7bbd62 commit 45ec5c8
Show file tree
Hide file tree
Showing 70 changed files with 1,064 additions and 311 deletions.
10 changes: 4 additions & 6 deletions SVS2TIFF-Setup/Common.wxl
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@

<String Id="ProductNameFolder">SVS2TIFF</String>

<String Id="Description">A tool to batch convert Aperio SVS files to flat TIFF files.</String>
<String Id="Comments">This program uses libvips, openslide and NetVips for reading, decompressing and writting TIFF files</String>
<String Id="Keywords">SVS to TIFF converter, SCN to TIFF converter, Batch convert Aperio SVS files to TIFF files, Aperio SVS files, Leica SCN files</String>
<String Id="Description">A tool to batch convert Aperio SVS files to TIFF or OME-TIFF files.</String>
<String Id="Comments">This program uses libvips, openslide, openJPEG and NetVips for reading, decompressing and writting TIFF files</String>
<String Id="Keywords">SVS to TIFF converter, SCN to TIFF converter, Batch convert Aperio SVS files to TIFF files, Aperio SVS to OME-TIF, Leica SCN files</String>

<String Id="DowngradeErrorMessage">A newer version of SVS2TIFF is already installed.</String>

<String Id="Language">1033</String>




</WixLocalization>
68 changes: 25 additions & 43 deletions SVS2TIFF-Setup/Components.wxs
Original file line number Diff line number Diff line change
@@ -1,51 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<!-- TODO: Put your code here. -->
<!-- Resource Tracker Components -->
<!-- Resource Tracker Components -->
<ComponentGroup Id="ProductComponents">

<ComponentRef Id ="ComponentAppFolder"/>
<ComponentGroupRef Id="AppFolderContent"/>
<ComponentRef Id="MainAppShortcut"/>
<ComponentGroup Id="ProductComponents">
<ComponentRef Id="MainAppShortcut"/>
</ComponentGroup>


</ComponentGroup>

<!-- Create directory for the application-->
<Component Id="ComponentAppFolder" Directory="APPLICATIONFOLDER" Guid="{E108C28F-875D-4AC8-A002-3C8CDFA2C1DD}" KeyPath="yes">
<CreateFolder Directory="APPFOLDER"/>
</Component>

<!-- Include files from the project output-->
<ComponentGroup Id="AppFolderContent">
<Component Id="SVS2TIFF.exe.config" Directory="APPFOLDER" Guid="{5E528743-B828-4287-A909-453D8C3DFFFC}">
<File Id="SVS2TIFF.exe.config" Name="SVS2TIFF.exe.config" Source="$(var.BasePath)\SVS2TIFF.exe.config" />
</Component>
<Component Id="SVS2TIFF.exe" Directory="APPFOLDER" Guid="{080806C1-0C51-4446-A3B4-51FAE820A044}">
<File Id="SVS2TIFF.exe" Name="SVS2TIFF.exe" Source="$(var.BasePath)\SVS2TIFF.exe" />
</Component>
</ComponentGroup>

<!-- Shortcut to main application -->
<Component Id="MainAppShortcut" Directory="InstallProgramMenuFolder" Guid="{9C156396-0D99-44FD-ADC1-2385E7C94407}">
<Shortcut Id="MainAppShortcut"
Name="!(loc.ProductName_$(var.Platform))"
Target="[APPFOLDER]SVS2TIFF.exe"
Directory="InstallProgramMenuFolder"
WorkingDirectory="APPFOLDER"
Icon="icon.ico"/>
<!-- Our unique key for this application shortcut -->
<RegistryValue Id="RegShortcutKey"
Root="HKCU"
Key="SOFTWARE\!(loc.Company)\!(loc.ProductNameFolder)"
Name="StartMenuShortcut"
Value="1" Type="integer"
KeyPath="yes" />
<!--Remove start menu items -->
<RemoveFolder Id="RemoveStartMenu" Directory="InstallProgramMenuFolder" On="uninstall" />
</Component>
<DirectoryRef Id="INSTALLFOLDER" FileSource="..\SVS2TIFF\bin\$(var.Configuration)\win-$(var.Platform)">
<!-- Shortcut to main application -->
<Component Id="MainAppShortcut" Guid="{9C156396-0D99-44FD-ADC1-2385E7C94407}">
<Shortcut Id="MainAppShortcut"
Name="!(loc.ProductName_$(var.Platform))"
Target="[INSTALLFOLDER]SVS2TIFF.exe"
Directory="InstallProgramMenuFolder"
WorkingDirectory="APPFOLDER"
Icon="icon.ico"/>
<!-- Unique key for this shortcut -->
<RegistryValue Id="RegShortcutKey"
Root="HKCU"
Key="SOFTWARE\!(loc.Company)\!(loc.ProductNameFolder)"
Name="StartMenuShortcut"
Value="1" Type="integer"
KeyPath="yes" />
<!--Remove start menu items -->
<RemoveFolder Id="RemoveStartMenu" Directory="InstallProgramMenuFolder" On="uninstall" />
</Component>
</DirectoryRef>

<!-- TODO: Create desktop shortcut -->

</Fragment>
</Wix>
43 changes: 43 additions & 0 deletions SVS2TIFF-Setup/ComponentsGenerated.wxs
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="INSTALLFOLDER">
<Component Id="NetVips.dll" Guid="{2AF74E14-137C-4984-9A34-E6DA32BE241D}">
<File Id="NetVips.dll" KeyPath="yes" Source="$(var.BasePath)\NetVips.dll" />
</Component>
<Component Id="NetVips.xml" Guid="{547B5C1C-DBCE-4A6C-B43C-81E05FD98B7B}">
<File Id="NetVips.xml" KeyPath="yes" Source="$(var.BasePath)\NetVips.xml" />
</Component>
<Component Id="SVS2TIFF.exe" Guid="{DCD9D887-DB77-4BC1-A013-797A4A5BE015}">
<File Id="SVS2TIFF.exe" KeyPath="yes" Source="$(var.BasePath)\SVS2TIFF.exe" />
</Component>
<Component Id="SVS2TIFF.exe.config" Guid="{27B36C36-87CB-4999-8D28-4C0B1114312D}">
<File Id="SVS2TIFF.exe.config" KeyPath="yes" Source="$(var.BasePath)\SVS2TIFF.exe.config" />
</Component>
<Component Id="SVS2TIFF.pdb" Guid="{5971CA1D-E115-4014-AF20-0C0DE620AA39}">
<File Id="SVS2TIFF.pdb" KeyPath="yes" Source="$(var.BasePath)\SVS2TIFF.pdb" />
</Component>
<Component Id="SVS2TIFF.xml" Guid="{2CC2CB20-CE99-4EB7-93C3-0A9EADCE8A04}">
<File Id="SVS2TIFF.xml" KeyPath="yes" Source="$(var.BasePath)\SVS2TIFF.xml" />
</Component>
<Component Id="System.Buffers.dll" Guid="{2FD0FC0D-C6ED-4C5D-8920-97C88556601B}">
<File Id="System.Buffers.dll" KeyPath="yes" Source="$(var.BasePath)\System.Buffers.dll" />
</Component>
<Component Id="System.Buffers.xml" Guid="{10380FFE-5C69-4E25-A8D3-6E4B061DE9FE}">
<File Id="System.Buffers.xml" KeyPath="yes" Source="$(var.BasePath)\System.Buffers.xml" />
</Component>
</DirectoryRef>
</Fragment>
<Fragment>
<ComponentGroup Id="PublishedComponents">
<ComponentRef Id="NetVips.dll" />
<ComponentRef Id="NetVips.xml" />
<ComponentRef Id="SVS2TIFF.exe" />
<ComponentRef Id="SVS2TIFF.exe.config" />
<ComponentRef Id="SVS2TIFF.pdb" />
<ComponentRef Id="SVS2TIFF.xml" />
<ComponentRef Id="System.Buffers.dll" />
<ComponentRef Id="System.Buffers.xml" />
</ComponentGroup>
</Fragment>
</Wix>
Loading

0 comments on commit 45ec5c8

Please sign in to comment.