Commit Graph

122 Commits

Author SHA1 Message Date
Jeffrey Altman
3fc7531a8b Windows: heimdal-command.wxs remove plugin dirs
Change-Id: I730ff26d353adb1f725ddcc38e3ae5332af1b39c
2013-09-15 11:17:54 -04:00
Jeffrey Altman
1154d5d080 Windows: installer package modifications
Remove third party plugins from installers now that they must be part
of the assemblies.

Add support for thirdparty heimdal-assemblies.wxs and heimdal-policy.wxs
files.

Change-Id: Idb29ebcf39b14ebcd2b01dc8c53b9bb7fbb8eaab
2013-09-15 01:33:31 -04:00
Jeffrey Altman
f8972159cd Windows: Assembly makefile modification
Note that the explanation of how to set CODESIGN_PKT is located
in windows/README.

Remove dead code.

Add an @arch@ substitution rule which is replaced by either "32" or "64"
depending upon $(CPU).

Change-Id: Ia009209aa7837109669172dcd841db846dcc9127
2013-09-15 00:48:49 -04:00
Jeffrey Altman
4bd3708e6f Windows: Add clean sdk include/gssapi rule
Change-Id: Iaf2d35857dd86cb4fba30daa3cd4152f3e14bd0f
2013-09-15 00:48:48 -04:00
Jeffrey Altman
5d0f3ee927 Windows: Extned Assembly name for version options
Windows file resources can be marked as Private, Special, Debug
and Pre-release.  Extend the Heimdal Assembly name to include
designations for these various build options to ensure that
private, special, debug and pre-release builds do not conflict
with the assembly name reserved for public releases.  This permits
a private, special, debug and pre-release build to be installed
side-by-side with the final release without interference.

Change-Id: I569ce2ff911ddbaebd81ba2e8b477ba6fb520502
2013-09-15 00:48:47 -04:00
Jeffrey Altman
60aa5eb1c5 Windows: multiplatform installer 32-bit command msm
The multiplatform installer must include the 32-bit command
merge module.  When Heimdal.Command was split out into a separate
merge module it was left out.

Change-Id: I07b06d6dfff66e61869f1d8c81bb0f1bce281501
2013-09-13 22:19:30 -04:00
Jeffrey Altman
3c3e2ad5e6 Windows: ktutil.exe requires libkadmsrv and libhdb
Include libkadmsrv.dll and libhdb.dll in the assembly which are
required for ktutil.exe to load.

Change-Id: Ic72d51e72daac71683a7f7000fe084197ee3c94a
2013-09-13 22:17:43 -04:00
Jeffrey Altman
6601c6b044 Windows: Remove Plugin Directory Installer
Heimdal plugins are not safe on windows.  Plugins are bound to a
specific assembly and if the plugin assembly is not the same as
the Heimdal DLL that is loading the plugin heap corruption will
occur.

Change-Id: Icf43a989684c4aacd3c4a225482a9bed9b60e29d
2013-09-13 22:17:42 -04:00
Jeffrey Altman
630c73b225 Windows: Wix3 use ForceDeleteOnUninstall
Patchset 1ad02ec31a removed the
createAndRemoveOnUninistall actions from a number of registry keys.
Get the same behavior with the ForceDeleteOnUninstall Wix 3.x Attribute.

Change-Id: I8c0623fa39055844d10035cbffb3870cc2d39ec6
2013-09-13 22:17:41 -04:00
Rod Widdowson
5930b387de Windows Installer: Build a Command line merge module
Build a merge module which installs all of the Heimdal command
line tools.

Change-Id: I42297ce6fe32eed77bffb1a982d56d7e024789cc
2013-08-14 13:32:22 -04:00
Rod Widdowson
1ad02ec31a Window Install: Tidy up for Wix V3
Remove now optional attributes in <RegistryKey>

Change-Id: I1be890072e5b2cb8279d8fe02f473b095d5a180f
2013-08-14 13:31:41 -04:00
Love Hornquist Astrand
71bd63639f use productbuild 2012-12-10 12:39:23 -08:00
Tony Acero
e2b6a449ce Windows: Visual Studio 10 support for installers
Change-Id: I845986247abf607694d2438afaffa6ea7d6fd5c4
2012-04-11 15:18:52 -04:00
Jeffrey Altman
48d255561e Windows: install heimtools not heimtool
Change-Id: Ie439dd6d2819d7a7088be19f7ecd49863df7ac79
2012-03-13 23:57:00 -04:00
Jelmer Vernooij
2b365b2327 Rename kcc to heimtools.
This should prevent naming clashes with other utilities named 'kcc'.

Signed-off-by: Love Hörnquist Åstrand <lha@h5l.org>
2012-03-06 00:06:26 -08:00
Jeffrey Altman
bad61548dd Windows: Version mgmt for assemblies and thirdparty
Breakout the version data from windows/NTMakefile.config
and move it to windows/NTMakefile.version.  This new file
contains only version data.  This permits version data to
be safely referenced by third party components.

In addition, add version range information for those versions
of Heimdal for which this release is a compatible upgrade.  If
there is a forward incompatible change to the assembly ABI, it
is not a compatible upgrade.  This version data is used to specify
the Windows assembly redirect range.

Change-Id: Ic9f156212599cc4277e2be812f29a6497801046c
2011-09-23 09:48:42 -04:00
Luke Howard
46d89ed0f4 small build fix for 2010 VC compiler 2011-09-12 20:41:29 +10:00
Jeffrey Altman
c2426d56c1 Windows: install kswitch.exe and klist.exe
kswitch.exe and klist.exe are kcc.exe installed and copied
under the alternate names.  The installer script was missing
the required DestinationProperty to specify where the
destination files were to be placed.

Change-Id: Ia1e826a038459b1631f8452f8d7ef6f7ca02abac
2011-07-27 19:55:28 -04:00
Love Hörnquist Åstrand
7aaba443bc add NTMakefile and windows directories 2011-07-17 12:16:59 -07:00
Asanka C. Herath
8f51d5a8dc Windows: Use WixUI_FeatureTree for installer. 2011-06-15 01:55:21 -04:00
Asanka C. Herath
7236505bf0 Windows: Multiplatform installer should have a different name. 2011-06-15 01:55:21 -04:00
Asanka C. Herath
8aaf3183ca Windows: Make the 32-bit tools install directory customizable. 2011-06-15 01:55:20 -04:00
Asanka C. Herath
3048545de3 Windows: Use Software/Heimdal registry key for Heimdal specific configuration
The 'plugin_dir' value is Heimdal specific.  So keep it in the
Software/Heimdal registry key.  The Software/Kerberos registry key
will also be loaded and will contain generic Kerberos configuration.
2011-06-15 01:55:19 -04:00
Love Hörnquist Åstrand
40a53bae5f Don't build ppc any more, don't have a compiler for that any more 2011-06-13 21:23:23 -07:00
Jeffrey Altman
c591fb466f windows: merge module directory selection
permit an alternative location for the merge module
directory to be specified.

Change-Id: I911aca232132111c8378a75ff1f4ed63c59e9044
2011-05-19 00:32:53 -04:00
Asanka C. Herath
dd6d5a0e2c Windows: Build multiplatform installer
When building the x64 installer, we can optionally include 32-bit
components as well.  This requires that the 32-bit build to be already
completed.  The resulting multiplatform installer will install
both sets of components.

This is enabled by the environment variable MULTIPLATFORM_INSTALLER.
2010-12-03 01:12:30 -05:00
Asanka C. Herath
3f6b4c9fdd Windows: Include shim from thirdparty/MKShim directory 2010-12-02 13:19:21 -05:00
Asanka C. Herath
a664e81217 Windows: Fix typo in installer 2010-11-30 12:41:37 -05:00
Asanka C. Herath
523dcaf08e Windows: 64-bit installer should also include 32-bit assemblies 2010-11-29 20:44:49 -05:00
Asanka C. Herath
4a6a5d59a5 Windows: Build policy assembly as a merge module 2010-11-29 18:21:56 -05:00
Asanka C. Herath
0e0fba8866 Windows: Detect VC version instead of hardcoding it 2010-11-29 10:41:44 -05:00
Asanka C. Herath
6fe4372d17 Windows: Install kcc 2010-11-29 10:41:44 -05:00
Love Hornquist Astrand
5471d166e5 include gssapi\gssapi_oid.h 2010-11-27 19:02:21 -08:00
Asanka C. Herath
20e2e17a85 Windows: Remove remnants of older KfW shim
This code is now obsolete.
2010-11-24 15:33:20 -05:00
Asanka C. Herath
29383b4cd0 Windows: Merge in application manifest when building assemblies 2010-11-24 15:33:17 -05:00
Asanka C. Herath
604b554b23 Windows: Older manifest tools require the hashalg parameter 2010-11-24 15:33:15 -05:00
Asanka C. Herath
82a200bfa2 Windows: Installers are optional 2010-11-24 15:33:10 -05:00
Asanka C. Herath
a07036a11c Windows: Build and install kdeltkt 2010-11-24 15:33:03 -05:00
Asanka C. Herath
7eac4fd821 Windows: Build and install kcpytkt 2010-11-24 15:33:02 -05:00
Asanka C. Herath
a82a93cef8 Windows: Build and install kvno 2010-11-24 15:33:01 -05:00
Asanka C. Herath
cb712170ff Windows: Build and install kpasswd 2010-11-24 15:33:00 -05:00
Asanka C. Herath
8432f850ed Windows: Make Heimdal a single assembly 2010-11-24 15:32:59 -05:00
Asanka C. Herath
a4136a53af Windows: Set system PATH and not just the user PATH 2010-11-24 15:32:58 -05:00
Asanka C. Herath
3564ec0ebb Windows: Fix typos in makefiles 2010-11-24 15:32:57 -05:00
Asanka C. Herath
0ea880bdeb Windows: Add Heimdal to the global PATH 2010-11-24 15:32:55 -05:00
Asanka C. Herath
ce056c4a40 Windows: Place gkrb5_err.h in Heimdal directory in SDK 2010-11-24 15:32:54 -05:00
Asanka C. Herath
c0d56cf47e Windows: Use new configuration key for setting plugin directory 2010-11-24 15:32:54 -05:00
Asanka C. Herath
5e7d970774 Windows: Optionally include Kerberos shim library into installer 2010-11-24 15:32:53 -05:00
Asanka C. Herath
80211ca0c8 Windows: Add application manifest file to SDK 2010-11-24 15:32:52 -05:00
Asanka C. Herath
117b0b487a Windows: Add missing files to SDK 2010-11-24 15:32:51 -05:00