Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,11 @@ lib/dotnet/SIL.*.pdb
.nuget/NuGet.exe
build/Palaso.BuildTasks.dll
lib/dotnet/NAudio.dll
BuildDir/*
WixInstaller/libs/*
build.number
msbuild.log
WixInstaller/CustomActions/CustomActions/bin/*
WixInstaller/CustomActions/CustomActions/obj/*
WixInstaller/resources/*.ttf
lib/dotnet/Palaso*.dll
1 change: 1 addition & 0 deletions BuildBase.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
NAnt.exe -buildfile:Saymore.build BuildRelease
1 change: 1 addition & 0 deletions BuildPatch.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
NAnt.exe -buildfile:Saymore.build BuildPatch
324 changes: 324 additions & 0 deletions Saymore.build

Large diffs are not rendered by default.

31 changes: 31 additions & 0 deletions WiXInstaller/BaseInstallerBuild/CustomAction.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup useLegacyV2RuntimeActivationPolicy="true">

<!--
Use supportedRuntime tags to explicitly specify the version(s) of the .NET Framework runtime that
the custom action should run on. If no versions are specified, the chosen version of the runtime
will be the "best" match to what Microsoft.Deployment.WindowsInstaller.dll was built against.

WARNING: leaving the version unspecified is dangerous as it introduces a risk of compatibility
problems with future versions of the .NET Framework runtime. It is highly recommended that you specify
only the version(s) of the .NET Framework runtime that you have tested against.

Note for .NET Framework v3.0 and v3.5, the runtime version is still v2.0.

In order to enable .NET Framework version 2.0 runtime activation policy, which is to load all assemblies
by using the latest supported runtime, @useLegacyV2RuntimeActivationPolicy="true".

For more information, see http://msdn.microsoft.com/en-us/library/bbx34a2h.aspx
-->

<supportedRuntime version="v4.0" />

</startup>

<!--
Add additional configuration settings here. For more information on application config files,
see http://msdn.microsoft.com/en-us/library/kza1yk3a.aspx
-->

</configuration>
17 changes: 17 additions & 0 deletions WiXInstaller/BaseInstallerBuild/KeyPathFix.xsl
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:my="http://schema.infor.com/InforOAGIS/2">
<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" />

<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()"/>
</xsl:copy>
</xsl:template>


<xsl:template match="@KeyPath[.='yes']">
<xsl:attribute name="KeyPath">
<xsl:value-of select="'no'"/>
</xsl:attribute>
</xsl:template>

</xsl:stylesheet>
176 changes: 176 additions & 0 deletions WiXInstaller/BaseInstallerBuild/TemplateBundle.wxs
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
<?xml version="1.0"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:bal="http://schemas.microsoft.com/wix/BalExtension"
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension"
xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension">
<Bundle
Name='$(var.ApplicationName) $(var.TruncatedVersion)'
Version='$(var.VersionNumber)'
UpgradeCode='$(var.UpgradeCode)'
Tag='$(var.ApplicationName)'
IconSourceFile='..\resources\Installer.ico'
Copyright='Copyright© $(var.Year), $(var.Manufacturer)'
Manufacturer='$(var.Manufacturer)'>

<bal:Condition Message="XP is no longer supported."> (VersionNT &gt;= v6.0) </bal:Condition>

<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
<Payload SourceFile="TemplateLicense.htm" />
</BootstrapperApplicationRef>

<!--<RelatedBundle Id='$(var.UpgradeCode)' Action='Detect'/>-->

<WixVariable Id="WixStdbaLicenseUrl" Value="TemplateLicense.htm" />
<WixVariable Id="WixStdbaLogo" Value="..\resources\bundle_background.bmp" />
<WixVariable Id="WixStdbaThemeXml" Value="TemplateBundleTheme.xml" />
<WixVariable Id="WixStdbaThemeWxl" Value="TemplateBundleTheme.wxl" />

<Chain>
<!--<PackageGroupRef Id="NetFx451Webz" />
<PackageGroupRef Id="redist_vc10" />
<PackageGroupRef Id="redist_vc11" />
<PackageGroupRef Id="redist_vc12" />
<RollbackBoundary /> -->
<PackageGroupRef Id='AppPackageGroup'/>
</Chain>
</Bundle>

<Fragment Id='AppFragment'>
<PackageGroup Id='AppPackageGroup'>
<MsiPackage Id='AppMsiPackage'
DisplayName='$(var.ApplicationName) $(var.VersionNumber)'
DisplayInternalUI='yes'
ForcePerMachine='yes'
InstallCondition='1'
SourceFile='$(var.ApplicationName)_$(var.VersionNumber).msi'
Visible='yes'
Vital='yes'>
</MsiPackage>
</PackageGroup>
</Fragment>

<!--
<?define NetFx451MinRelease = 378675?>
<?define NetFx451WebLink = http://go.microsoft.com/fwlink/?LinkId=322115 ?>
<?define NetFx451RedistLink = http://go.microsoft.com/fwlink/?LinkId=322116 ?>
<?define NetFx451EulaLink = http://go.microsoft.com/fwlink/?LinkID=260867 ?>

<Fragment>
<util:RegistrySearch Root="HKLM" Key="SOFTWARE\Microsoft\Net Framework Setup\NDP\v4\Full" Value="Version" Variable="Netfx45FullVersion" />
<util:RegistrySearch Root="HKLM" Key="SOFTWARE\Microsoft\Net Framework Setup\NDP\v4\Full" Value="Version" Variable="Netfx45x64FullVersion" Win64="yes" />

<Property Id="PACKAGEPROP" Value="NetFx451Web" />
<Property Id="PREREQPROP" Value="$(var.NetFx451EulaLink)" />
<WixVariable Id="WixMbaPrereqPackageId" Value="[PACKAGEPROP]" Overridable="yes"/>
<WixVariable Id="WixMbaPrereqLicenseUrl" Value="[PREREQPROP]" Overridable="yes"/>

<PackageGroup Id="NetFx451Webz">
<ExePackage
InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log [NetFx451FullWebLog].html"
RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log [NetFx451FullWebLog].html"
UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log [NetFx451FullWebLog].html"
PerMachine="yes"
DetectCondition="(Netfx45FullVersion=&quot;4.5.50938&quot;) AND (NOT VersionNT64 OR (Netfx45x64FullVersion=&quot;4.5.50938&quot;))"
InstallCondition="(VersionNT >= v6.0 OR VersionNT64 >= v6.0) AND (NOT (Netfx45FullVersion &gt;= &quot;4.5.50938&quot; OR Netfx45x64FullVersion &gt;= &quot;4.5.50938&quot;))"
Id="NetFx451Web"
Vital="yes"
Permanent="yes"
Protocol="netfx4"
DownloadUrl="$(var.NetFx451WebLink)"
LogPathVariable="NetFx451FullWebLog"
Compressed="no"
Name="redist\NDP451-KB2859818-Web.exe">
<RemotePayload
Size="1021432"
Version="4.5.50938.18408"
ProductName="Microsoft .NET Framework 4.5.1"
Description="Microsoft .NET Framework 4.5.1 Setup"
CertificatePublicKey="A260A870BE1145ED71E2BB5AA19463A4FE9DCC41"
CertificateThumbprint="108E2BA23632620C427C570B6D9DB51AC31387FE"
Hash="4CBEA1E408DB5B423E130931B9478972E6798431"/>
<ExitCode Behavior="forceReboot" Value="1641" />
<ExitCode Behavior="forceReboot" Value="3010" />
<ExitCode Behavior="error" Value="5100" />
<ExitCode Behavior="error" Value="1603" />
<ExitCode Behavior="success" Value="0" />
</ExePackage>
</PackageGroup>
</Fragment>
-->

<!--
<?define VC10RedistWebLink = https://download.microsoft.com/download/5/B/C/5BC5DBB3-652D-4DCE-B14A-475AB85EEF6E/vcredist_x86.exe ?>
<?define VC11RedistWebLink = https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x86.exe ?>
<?define VC12RedistWebLink = http://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe ?>

<Fragment>
<util:RegistrySearch Root="HKLM"
Key="SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86"
Variable="CPP2010Redist"
Value="Installed"
Result="value"/>

<PackageGroup Id="redist_vc10">
<ExePackage Id="vc10" Cache="no" PerMachine="yes" Vital="yes" Compressed="no" Permanent="yes"
Name="vcredist_x86.exe"
DownloadUrl="$(var.VC10RedistWebLink)"
InstallCommand="/quiet /norestart"
DetectCondition="CPP2010Redist">
<RemotePayload
Size="5073240"
Version="10.0.30319.01"
ProductName="Microsoft Visual C++ 2010 x86 Redistributable Setup"
Description="Microsoft Visual C++ 2010 x86 Redistributable Setup"
Hash="372d9c1670343d3fb252209ba210d4dc4d67d358"/>
</ExePackage>
</PackageGroup>
</Fragment>

<Fragment>
<util:RegistrySearch Root="HKLM"
Key="SOFTWARE\Microsoft\VisualStudio\11.0\VC\Runtimes\x86"
Variable="CPP2011Redist"
Value="Installed"
Result="value"/>

<PackageGroup Id="redist_vc11">
<ExePackage Id="vc11" Cache="no" PerMachine="yes" Vital="yes" Compressed="no" Permanent="yes"
Name="vcredist_x86.exe"
DownloadUrl="$(var.VC11RedistWebLink)"
InstallCommand="/quiet /norestart"
DetectCondition="CPP2011Redist">
<RemotePayload
Size="6554576"
Version="11.0.61030.0"
ProductName="Microsoft Visual C++ 2012 Redistributable (x86) - 11.0.61030"
Description="Microsoft Visual C++ 2012 Redistributable (x86) - 11.0.61030"
Hash="96b377a27ac5445328cbaae210fc4f0aaa750d3f"/>
</ExePackage>
</PackageGroup>
</Fragment>

<Fragment>
<util:RegistrySearch Root="HKLM"
Key="SOFTWARE\Microsoft\VisualStudio\12.0\VC\Runtimes\x86"
Variable="CPP2012Redist"
Value="Installed"
Result="value"/>

<PackageGroup Id="redist_vc12">
<ExePackage Id="vc12" Cache="no" PerMachine="yes" Vital="yes" Compressed="no" Permanent="yes"
Name="vcredist_x86.exe"
DownloadUrl="$(var.VC12RedistWebLink)"
InstallCommand="/quiet /norestart"
DetectCondition="CPP2012Redist">
<RemotePayload
Size="6510544"
Version="12.0.40660.0"
ProductName="Microsoft Visual C++ 2013 Redistributable (x86) - 12.0.40660"
Description="Microsoft Visual C++ 2013 Redistributable (x86) - 12.0.40660"
Hash="2a07a32330d5131665378836d542478d3e7bd137"/>
</ExePackage>
</PackageGroup>
</Fragment>
-->
</Wix>
51 changes: 51 additions & 0 deletions WiXInstaller/BaseInstallerBuild/TemplateBundleTheme.wxl
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<WixLocalization Culture="en-us" Language="1033" xmlns="http://schemas.microsoft.com/wix/2006/localization">
<String Id="Caption">[WixBundleName]</String>
<String Id="Title">[WixBundleName]</String>
<String Id="ConfirmCancelMessage">Are you sure you want to cancel?</String>
<String Id="HelpHeader">Installer Help</String>
<String Id="HelpText">/install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or
creates a complete local copy of the bundle in directory. Install is the default.

/passive | /quiet - displays minimal UI with no prompts or displays no UI and
no prompts. By default UI and all prompts are displayed.

/norestart - suppress any attempts to restart. By default UI will prompt before restart.
/log log.txt - logs to a specific file. By default a log file is created in %TEMP%.</String>
<String Id="HelpCloseButton">&amp;Close</String>
<String Id="InstallHeader">Welcome</String>
<String Id="InstallMessage">To install [WixBundleTag], agree to the license terms, and then click Install.</String>
<String Id="InstallVersion">Version [WixBundleVersion]</String>
<String Id="InstallLicenseLinkText">To install [WixBundleTag], agree to the &lt;a href="#"&gt;license terms&lt;/a&gt;, and then click Install.</String>
<String Id="InstallLicenseTextA">To install [WixBundleTag], agree to the </String>
<String Id="InstallLicenseHyperText">license terms</String>
<String Id="InstallLicenseTextB">, and then click Install.</String>
<String Id="InstallAcceptCheckbox">I agree to the license terms.</String>
<String Id="InstallOptionsButton">&amp;Options</String>
<String Id="InstallInstallButton">&amp;Install</String>
<String Id="InstallCloseButton">&amp;Close</String>
<String Id="OptionsHeader">Installer Options</String>
<String Id="OptionsLocationLabel">Install location:</String>
<String Id="OptionsBrowseButton">&amp;Browse</String>
<String Id="OptionsOkButton">&amp;OK</String>
<String Id="OptionsCancelButton">&amp;Cancel</String>
<String Id="ProgressHeader">Progress</String>
<String Id="ProgressLabel">Processing:</String>
<String Id="OverallProgressPackageText">Initializing...</String>
<String Id="ProgressCancelButton">&amp;Cancel</String>
<String Id="ModifyHeader">Repair or Uninstall</String>
<String Id="ModifyRepairButton">&amp;Repair</String>
<String Id="ModifyUninstallButton">&amp;Uninstall</String>
<String Id="ModifyCloseButton">&amp;Close</String>
<String Id="SuccessHeader">Operation Completed</String>
<String Id="SuccessLaunchButton">&amp;Launch</String>
<String Id="SuccessRestartText">You must restart your computer before you can use the software.</String>
<String Id="SuccessRestartButton">&amp;Restart</String>
<String Id="SuccessCloseButton">&amp;Close</String>
<String Id="FailureHeader">Failed</String>
<String Id="FailureHyperlinkLogText"><![CDATA[One or more issues caused the install to fail. Contact your support person for help fixing the issues and then retry.
Tech support persons can open the log file here: ]]>&lt;a href="#"&gt;log file&lt;/a&gt;.</String>
<String Id="FailureRestartText">You must restart your computer to complete the rollback of the software.</String>
<String Id="FailureRestartButton">&amp;Restart</String>
<String Id="FailureCloseButton">&amp;Close</String>
</WixLocalization>
Loading