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

Windows: Make Heimdal a single assembly

Browse Source
This commit is contained in:
Asanka C. Herath
2010-11-18 00:50:29 -05:00
parent a4136a53af
commit 8432f850ed
11 changed files with 13 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/windows/assembly/Heimdal.Application.manifest.in
View File

@@ -9,13 +9,4 @@
publicKeyToken="@pkt@" />
</dependentAssembly>
</dependency>
<dependency>
<dependentAssembly>
<assemblyIdentity type="win32" name="@gssname@"
language="*"
processorArchitecture="@cpu@"
version="@gssversion@"
publicKeyToken="@pkt@" />
</dependentAssembly>
</dependency>
</assembly>

18
packages/windows/assembly/Heimdal.GSSAPI.manifest.in
View File

@@ -1,18 +0,0 @@
<?xml version="1" encoding="UTF-8" standalone="yes" ?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity type="win32" name="@name@"
processorArchitecture="@cpu@"
version="@version@"
publicKeyToken="@pkt@" />
<file name="gssapi.dll" />
<file name="gssapi.pdb" />
<dependency>
<dependentAssembly>
<assemblyIdentity type="win32" name="@krbname@"
language="*"
processorArchitecture="@cpu@"
version="@krbversion@"
publicKeyToken="@pkt@" />
</dependentAssembly>
</dependency>
</assembly>

2
packages/windows/assembly/Heimdal.Kerberos.manifest.in
View File

@@ -7,7 +7,9 @@
<file name="heimdal.dll" />
<file name="com_err.dll" />
<file name="heimntlm.dll" />
<file name="gssapi.dll" />
<file name="heimdal.pdb" />
<file name="com_err.pdb" />
<file name="heimntlm.pdb" />
<file name="gssapi.pdb" />
</assembly>

95
packages/windows/assembly/NTMakefile
View File

@@ -57,9 +57,11 @@ ASMKRBBINS=\
$(ASMKRBDIR)\heimdal.dll \
$(ASMKRBDIR)\com_err.dll \
$(ASMKRBDIR)\heimntlm.dll \
$(ASMKRBDIR)\gssapi.dll \
$(ASMKRBDIR)\heimdal.pdb \
$(ASMKRBDIR)\com_err.pdb \
$(ASMKRBDIR)\heimntlm.pdb
$(ASMKRBDIR)\heimntlm.pdb \
$(ASMKRBDIR)\gssapi.pdb
$(ASMKRBDIR)\$(ASMKRBMAN).nohash: Heimdal.Kerberos.manifest.in
$(SED) -e "s,[@]name[@],$(ASMKRBNAME),g" \
@@ -97,66 +99,10 @@ test::
{$(BINDIR)}.dll{$(ASMKRBDIR)}.dll:
$(CP) $< $@
$(DLLPREP_MERGE)
{$(BINDIR)}.pdb{$(ASMKRBDIR)}.pdb:
$(CP) $< $@
# ----------------------------------------------------------------------
# Heimdal.GSSAPI Assembly
ASMGSSDIR=$(ASMDIR)\Heimdal.GSSAPI
ASMGSSVER=$(VER_PRODUCT_MAJOR).$(VER_PRODUCT_MINOR).$(VER_PRODUCT_AUX).$(VER_PRODUCT_PATCH)
ASMGSSMAN=$(ASMGSSNAME).manifest
ASMGSSBINS=\
$(ASMGSSDIR)\gssapi.dll \
$(ASMGSSDIR)\gssapi.pdb
$(ASMGSSDIR)\$(ASMGSSMAN).nohash: Heimdal.GSSAPI.manifest.in
$(SED) -e "s,[@]name[@],$(ASMGSSNAME),g" \
-e "s,[@]version[@],$(ASMGSSVER),g" \
-e "s,[@]krbname[@],$(ASMKRBNAME),g" \
-e "s,[@]krbversion[@],$(ASMKRBVER),g" \
-e "s,[@]cpu[@],$(MCPU),g" \
-e "s,[@]pkt[@],$(CODESIGN_PKT),g" < $** > $@
$(ASMGSSDIR)\$(ASMGSSMAN) $(ASMGSSDIR)\$(ASMGSSMAN).cdf: \
$(ASMGSSDIR)\$(ASMGSSMAN).nohash $(ASMGSSBINS)
-$(RM) $(ASMGSSDIR)\$(ASMGSSMAN)
-$(RM) $(ASMGSSDIR)\$(ASMGSSMAN).cdf
$(MT) -manifest $(ASMGSSDIR)\$(ASMGSSMAN).nohash -out:$@ -hashupdate -makecdfs
$(ASMGSSDIR)\$(ASMGSSNAME).cat: $(ASMGSSDIR)\$(ASMGSSMAN).cdf
cd $(ASMGSSDIR)
$(MAKECAT) $**
$(_CODESIGN)
# $(RM) $(ASMGSSMAN).cdf
# $(RM) $(ASMGSSMAN).nohash
cd $(SRCDIR)
asm-gss: \
$(APPMANIFEST) \
$(ASMGSSBINS) \
$(ASMGSSDIR)\$(ASMGSSMAN) \
$(ASMGSSDIR)\$(ASMGSSNAME).cat \
all:: asm-gss
clean::
-$(RM) $(ASMGSSDIR)\*.*
{$(BINDIR)}.dll{$(ASMGSSDIR)}.dll:
$(CP) $< $@
$(DLLPREP_MERGE)
{$(BINDIR)}.pdb{$(ASMGSSDIR)}.pdb:
$(CP) $< $@
test::
$(MT) -manifest $(ASMGSSDIR)\$(ASMGSSMAN) -validate_manifest
# ----------------------------------------------------------------------
# Application manifests
@@ -166,9 +112,7 @@ clean::
-$(RM) $(APPMANIFEST)
$(APPMANIFEST): Heimdal.Application.manifest.in
$(SED) -e "s,[@]gssname[@],$(ASMGSSNAME),g" \
-e "s,[@]gssversion[@],$(ASMGSSVER),g" \
-e "s,[@]krbname[@],$(ASMKRBNAME),g" \
$(SED) -e "s,[@]krbname[@],$(ASMKRBNAME),g" \
-e "s,[@]krbversion[@],$(ASMKRBVER),g" \
-e "s,[@]cpu[@],$(MCPU),g" \
-e "s,[@]pkt[@],$(CODESIGN_PKT),g" < $** > $@
@@ -201,33 +145,10 @@ $(POLKRBCAT): $(POLKRBFILE).cdf
$(_CODESIGN)
cd $(SRCDIR)
POLGSS=policy.$(VER_PRODUCT_MAJOR).$(VER_PRODUCT_MINOR).Heimdal.GSSAPI
POLGSSDIR=$(ASMDIR)\$(POLGSS)
POLGSSFILE=$(POLGSSDIR)\$(ASMGSSVER).pol
POLGSSCAT=$(POLGSSDIR)\$(ASMGSSVER).cat
$(POLGSSFILE): policy.Heimdal.GSSAPI.in
$(SED) -e "s,[@]gssname[@],$(ASMGSSNAME),g" \
-e "s,[@]gssversion[@],$(ASMGSSVER),g" \
-e "s,[@]gssverfrom[@],$(VER_PRODUCT_MAJOR).$(VER_PRODUCT_MINOR),g" \
-e "s,[@]gsspolname[@],$(POLGSS),g" \
-e "s,[@]cpu[@],$(MCPU),g" \
-e "s,[@]pkt[@],$(CODESIGN_PKT),g" < $** > $@
$(POLGSSFILE).cdf: $(POLGSSFILE)
$(MT) -manifest $(POLGSSFILE) -makecdfs
$(POLGSSCAT): $(POLGSSFILE).cdf
cd $(POLGSSDIR)
$(MAKECAT) $**
$(_CODESIGN)
cd $(SRCDIR)
all:: $(POLKRBFILE) $(POLGSSFILE) $(POLKRBCAT) $(POLGSSCAT)
all:: $(POLKRBFILE) $(POLKRBCAT)
clean::
-$(RM) $(POLKRBDIR)\*.*
-$(RM) $(POLGSSDIR)\*.*
# ----------------------------------------------------------------------
@@ -237,12 +158,6 @@ mk-asm-dirs:
! if !exist($(ASMKRBDIR))
$(MKDIR) $(ASMKRBDIR)
! endif
! if !exist($(ASMGSSDIR))
$(MKDIR) $(ASMGSSDIR)
! endif
! if !exist($(POLKRBDIR))
$(MKDIR) $(POLKRBDIR)
! endif
! if !exist($(POLGSSDIR))
$(MKDIR) $(POLGSSDIR)
! endif

19
packages/windows/assembly/policy.Heimdal.GSSAPI.in
View File

@@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity type="win32-policy"
publicKeyToken="@pkt@"
name="@gsspolname@"
version="@gssversion@"
processorArchitecture="@cpu@"/>
<dependency>
<dependentAssembly>
<assemblyIdentity type="win32"
publicKeyToken="@pkt@"
name="@gssname@"
language="*"
processorArchitecture="@cpu@"/>
<bindingRedirect oldVersion="@gssverfrom@.0.0-@gssversion@"
newVersion="@gssversion@"/>
</dependentAssembly>
</dependency>
</assembly>