oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Windows: Enable UI in installer

Browse Source
This commit is contained in:
Asanka C. Herath
2010-09-26 19:15:22 -04:00
parent 5a0c159a19
commit 0a14b10a23
5 changed files with 103 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/windows/installer/NTMakefile
View File

@@ -35,6 +35,7 @@ RELDIR=packages\windows\installer
VERSIOND=$(VER_PRODUCT_MAJOR)-$(VER_PRODUCT_MINOR)-$(VER_PRODUCT_AUX)-$(VER_PRODUCT_PATCH)
VERSION=$(VER_PRODUCT_MAJOR).$(VER_PRODUCT_MINOR).$(VER_PRODUCT_AUX).$(VER_PRODUCT_PATCH)
POLPREFIX=policy.$(VER_PRODUCT_MAJOR).$(VER_PRODUCT_MINOR)
!if "$(CPU)"=="AMD64"
PLATFORM=x64
@@ -63,16 +64,19 @@ clean::
!if exist($(SRC)\thirdparty)
THIRDPARTYOBJS=$(INSTDIR)\apicache.wixobj $(INSTDIR)\lsacache.wixobj
THIRDPARTYDEPS=$(INSTDIR)\Heimdal-krbcompat.msm
THIRDPARTYOPT=-dApiCache=1 -dLsaCache=1 -dKrbCompat=1
THIRDPARTYOPT=-dApiCache=1 -dLsaCache=1
!endif
INSTALLER=$(INSTDIR)\Heimdal.msi
RUNTIMEMODULE="$(MSSDK)\Redist\VC\microsoft.vcxx.crt.$(PLATFORM)_msm.msm"
$(INSTALLER): $(OBJ)\heimdal-installer.wixobj $(MERGEMOD) $(THIRDPARTYOBJS) $(THIRDPARTYDEPS)
$(LIGHT) -out $@ $(OBJ)\heimdal-installer.wixobj $(THIRDPARTYOBJS) -sval
$(INSTALLER): $(OBJ)\heimdal-installer.wixobj $(MERGEMOD) $(THIRDPARTYOBJS) \
$(THIRDPARTYDEPS) lang\en-us.wxl
$(LIGHT) -out $@ $(OBJ)\heimdal-installer.wixobj $(THIRDPARTYOBJS) \
-sval -cultures:en-us -loc lang\en-us.wxl \
-dWixUILicenseRtf=lang\license-en-us.rtf \
-ext WixUIExtension
$(_CODESIGN)
$(OBJ)\heimdal-installer.wixobj: heimdal-installer.wxs
@@ -83,9 +87,10 @@ $(OBJ)\heimdal-installer.wixobj: heimdal-installer.wxs
-dSrcDir=$(SRC) \
-dPlatform=$(PLATFORM) \
-dRuntimeModule=$(RUNTIMEMODULE) \
-dPolPrefix=$(POLPREFIX) \
$(THIRDPARTYOPT)
all:: $(INSTALLER)
clean::
-$(RM) $(INSTALLER)
-$(RM) $(INSTALLER)

2
packages/windows/installer/heimdal-assemblies.wxs
View File

@@ -19,7 +19,7 @@
<Package Id="A064012D-F3C3-4059-9AC0-00D8A5283D6D"
InstallerVersion="200"
Languages="1033" Manufacturer="Secure Endpoints Inc."
Languages="1033" Manufacturer="Heimdal"
SummaryCodepage="1252" AdminImage="no"
Platform="$(var.Platform)" />

92
packages/windows/installer/heimdal-installer.wxs
View File

@@ -11,6 +11,8 @@
<?define GuidKdestroy=289C2C0D-F41D-4E46-9819-6B9B63F83418 ?>
<?define GuidKtutil=28B09087-4731-41F4-B734-C71E84EC31FC ?>
<?define GuidKdigest=D13DA4C0-B1BB-4C02-8ED2-5DFC7D16B19D ?>
<?define GuidPolGSSAPI=2EB8472F-64DD-470B-AF65-FC8AAC185788 ?>
<?define GuidPolKerberos=9ED6B62C-13D0-43BB-BCD7-4737D3E6EC43 ?>
<?else?>
@@ -22,18 +24,20 @@
<?define GuidKdestroy=07D96FBC-2251-4EBC-AA68-12C6C52F44E6 ?>
<?define GuidKtutil=CE082458-E2C5-4744-A423-88C23AD3C81C ?>
<?define GuidKdigest=3FFBFAB0-FB37-411C-AF4E-53BCC468D7D1 ?>
<?define GuidPolGSSAPI=7B7D6813-8D9C-4647-8966-89A1CA24A08B ?>
<?define GuidPolKerberos=EF04F1AF-725B-4AF6-AE7B-18E2036C03B9 ?>
<?endif?>
<Product Name='Heimdal'
<Product Name='!(loc.ProductName) $(var.Version)'
Id='*' UpgradeCode='81E64C32-1D09-4E3D-9EA2-EECD9C4D16CE'
Language='1033' Codepage='1252' Version='$(var.Version)'
Manufacturer='Secure Endpoints Inc.'>
Language='!(loc.LanguageCode)' Codepage='1252' Version='$(var.Version)'
Manufacturer='!(loc.Manufacturer)'>
<Package Id='*' Description="Heimdal"
Comments='Heimdal Kerberos tools and libraries'
Manufacturer='Secure Endpoints Inc.'
InstallerVersion='300' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
<Package Id='*' Description='!(loc.Description)'
Manufacturer='!(loc.Manufacturer)'
InstallerVersion='300' Languages='!(loc.LanguageCode)'
Compressed='yes' SummaryCodepage='1252' />
<Directory Id='TARGETDIR' Name='SourceDir' DiskId='1'>
<Directory Id='$(var.PIProgramFilesFolder)' Name='PFiles'>
@@ -44,36 +48,42 @@
Guid='$(var.GuidKinit)'
Win64='$(var.Win64)'>
<File Name='kinit.exe' KeyPath='yes' />
<File Name='kinit.pdb' />
</Component>
<Component Id='comp.klist'
Guid='$(var.GuidKlist)'
Win64='$(var.Win64)'>
<File Name='klist.exe' KeyPath='yes' />
<File Name='klist.pdb' />
</Component>
<Component Id='comp.kswitch'
Guid='$(var.GuidKswitch)'
Win64='$(var.Win64)'>
<File Name='kswitch.exe' KeyPath='yes' />
<File Name='kswitch.pdb' />
</Component>
<Component Id='comp.ktutil'
Guid='$(var.GuidKtutil)'
Win64='$(var.Win64)'>
<File Name='ktutil.exe' KeyPath='yes' />
<File Name='ktutil.pdb' />
</Component>
<Component Id='comp.kdestroy'
Guid='$(var.GuidKdestroy)'
Win64='$(var.Win64)'>
<File Name='kdestroy.exe' KeyPath='yes' />
<File Name='kdestroy.pdb' />
</Component>
<Component Id='comp.kdigest'
Guid='$(var.GuidKdigest)'
Win64='$(var.Win64)'>
<File Name='kdigest.exe' KeyPath='yes' />
<File Name='kdigest.pdb' />
</Component>
<Merge Id='Heimdal.Assemblies' Language='0'
@@ -87,6 +97,40 @@
SourceFile='$(var.InstDir)\Heimdal-krbcompat.msm' />
<?endif?>
<!--
Publisher Configuration
The publisher configuration files are included in the
Heimdal installers, but not included in the Heimdal
assemblies.
-->
<Directory Id='dir.policy.Heimdal.GSSAPI'
Name='$(var.PolPrefix).Heimdal.GSSAPI'
FileSource='$(var.BinDir)\$(var.PolPrefix).Heimdal.GSSAPI'>
<Component Id='comp.policy.Heimdal.GSSAPI'
Guid='$(var.GuidPolGSSAPI)'
Win64='$(var.Win64)'>
<File Name='$(var.Version).pol' KeyPath='yes' Assembly='win32'
Id='policy.Kerberos' AssemblyManifest='policy.Kerberos' />
<File Name='$(var.Version).cat' Id='policy.Kerberos.cat' />
</Component>
</Directory>
<Directory Id='dir.policy.Heimdal.Kerberos'
Name='$(var.PolPrefix).Heimdal.Kerberos'
FileSource='$(var.BinDir)\$(var.PolPrefix).Heimdal.Kerberos'>
<Component Id='comp.policy.Heimdal.Kerberos'
Guid='$(var.GuidPolKerberos)'
Win64='$(var.Win64)'>
<File Name='$(var.Version).pol' KeyPath='yes' Assembly='win32'
Id='policy.GSSAPI' AssemblyManifest='policy.GSSAPI' />
<File Name='$(var.Version).cat' Id='policy.GSSAPI.cat' />
</Component>
</Directory>
<Directory Id='dirPlugin' Name='plugin'>
<Directory Id='PLUGINDIR' Name='krb5'>
@@ -119,9 +163,19 @@
<Media Id='1' Cabinet='Disk1' CompressionLevel='high' EmbedCab='yes' />
<Upgrade Id='81E64C32-1D09-4E3D-9EA2-EECD9C4D16CE'>
<UpgradeVersion IncludeMaximum='no' MigrateFeatures='yes' Maximum='$(var.Version)'
Property='PREVIOUSINSTALLATION' />
</Upgrade>
<InstallExecuteSequence>
<RemoveExistingProducts After='InstallFinalize' />
</InstallExecuteSequence>
<Condition Message='!(loc.AdminRequired)'>Installed OR Privileged</Condition>
<Feature Id='feature.Main' ConfigurableDirectory='INSTALLDIR'
Title='Heimdal'
Description='Command line tools and libraries for Heimdal Kerberos'
Title='!(loc.FeaMainTitle)'
Description='!(loc.FeaMainDesc)'
Level='1' TypicalDefault='install' InstallDefault='local'>
<ComponentRef Id='comp.kinit' />
@@ -139,11 +193,11 @@
<?endif?>
<ComponentRef Id='comp.Plugin.Reg' />
<ComponentRef Id='comp.policy.Heimdal.Kerberos' />
<ComponentRef Id='comp.policy.Heimdal.GSSAPI' />
<MergeRef Id='Heimdal.Assemblies' />
<MergeRef Id='Runtime' />
<?ifdef KrbCompat?>
<MergeRef Id='Heimdal.Compatibility' />
<?endif?>
<?ifdef Thirdparty ?>
<ComponentGroupRef Id='comp.Heimdal.Thirdparty' />
@@ -151,7 +205,21 @@
</Feature>
<!-- Properties for Add/Remove Programs -->
<Property Id='ARPHELPLINK' Value='http://www.h5l.org' />
<Property Id='ARPCONTACT' Value='heimdal@h5l.org' />
<Property Id='ARPURLINFOABOUT' Value='http://www.h5l.org' />
<!-- Other properties -->
<Property Id='ALLUSERS' Value='1' Secure='yes' />
<Property Id='WIXUI_INSTALLDIR' Value='INSTALLDIR' />
<UIRef Id='WixUI_InstallDir' />
</Product>
</Wix>

12
packages/windows/installer/lang/en-us.wxl Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
<String Id='LanguageCode'>1033</String>
<String Id='Codepage'>1252</String>
<String Id='ProductName'>Heimal</String>
<String Id='Manufacturer'>Heimdal Developers</String>
<String Id='Description'>Heimdal Kerberos tools and libraries</String>
<String Id='Comments'></String>
<String Id='FeaMainTitle'>Heimdal</String>
<String Id='FeaMainDesc'>Command line tools and libraries for Heimdal Kerberos</String>
<String Id='AdminRequired'>Installation of this package requires elevation.</String>
</WixLocalization>

BIN
packages/windows/installer/lang/license-en-us.rtf Normal file
View File

Binary file not shown.