Windows: Make Heimdal a single assembly

2010-11-18 00:50:29 -05:00
parent a4136a53af
commit 8432f850ed
11 changed files with 13 additions and 168 deletions
--- a/lib/com_err/NTMakefile
+++ b/lib/com_err/NTMakefile
@@ -54,7 +54,7 @@ $(COMERRDLL): $(libcomerr_OBJs) $(OBJ)\libcom_err-version.res
 	$(DLLGUILINK_C) -out:$(COMERRDLL) -implib:$(LIBCOMERR) $** \
 		$(LIBROKEN) \
 		-def:libcom_err-exports.def
-	$(DLLPREP_NODIST)
+	$(DLLPREP)

 !endif

--- a/lib/gssapi/NTMakefile
+++ b/lib/gssapi/NTMakefile
@@ -477,7 +477,7 @@ $(BINDIR)\gssapi.dll: $(libgssapi_OBJs) $(RES)
 $(libgssapi_OBJs: =
 )
 <<
-	$(DLLPREP_NODIST)
+	$(DLLPREP)

 $(LIBGSSAPI): $(BINDIR)\gssapi.dll

--- a/lib/heimdal/NTMakefile
+++ b/lib/heimdal/NTMakefile
@@ -73,7 +73,7 @@ $(DLL): $(DLLDEPS) $(DEF) $(RES)
 	$(DLLGUILINK_C) $(DLLDEPS) $(DLLSDKDEPS) $(RES) \
 		-def:$(DEF) -out:$(DLL) \
 		-implib:$(LIBHEIMDAL)
-	$(DLLPREP_NODIST)
+	$(DLLPREP)

 clean::
 	-$(RM) $(BINDIR)\heimdal.*
--- a/lib/ntlm/NTMakefile
+++ b/lib/ntlm/NTMakefile
@@ -50,7 +50,7 @@ $(LIBHEIMNTLM): $(BINDIR)\heimntlm.dll

 $(BINDIR)\heimntlm.dll: $(OBJ)\ntlm.obj $(LIBHEIMDAL) $(RES)
 	$(DLLGUILINK) -def:libheimntlm-exports.def -implib:$(LIBHEIMNTLM)
-	$(DLLPREP_NODIST)
+	$(DLLPREP)

 clean::
 	-$(RM) $(BINDIR)\heimntlm.*
--- a/packages/windows/assembly/Heimdal.Application.manifest.in
+++ b/packages/windows/assembly/Heimdal.Application.manifest.in
@@ -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>
--- a/packages/windows/assembly/Heimdal.GSSAPI.manifest.in
+++ b/packages/windows/assembly/Heimdal.GSSAPI.manifest.in
@@ -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>
--- a/packages/windows/assembly/Heimdal.Kerberos.manifest.in
+++ b/packages/windows/assembly/Heimdal.Kerberos.manifest.in
@@ -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>
--- a/packages/windows/assembly/NTMakefile
+++ b/packages/windows/assembly/NTMakefile
@@ -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
--- a/packages/windows/assembly/policy.Heimdal.GSSAPI.in
+++ b/packages/windows/assembly/policy.Heimdal.GSSAPI.in
@@ -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>
--- a/packages/windows/installer/heimdal-assemblies.wxs
+++ b/packages/windows/installer/heimdal-assemblies.wxs
@@ -33,27 +33,15 @@
                AssemblyManifest="id.Heimdal.Kerberos.manifest" />
          <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" />
          <File Name="Heimdal.Kerberos.cat" />
          <File Name="Heimdal.Kerberos.manifest" Id="id.Heimdal.Kerberos.manifest" />
        </Component>
      </Directory>
-
-      <Directory Id="dir.Heimdal.GSSAPI" Name="Heimdal.GSSAPI"
-                 FileSource="$(var.BinDir)\Heimdal.GSSAPI">
-        <Component Id="comp.Heimdal.GSSAPI"
-                   Guid="$(var.GuidGSSAPI)"
-                   Win64="$(var.Win64)">
-          <File Name="gssapi.dll" KeyPath="yes" Assembly="win32"
-                AssemblyManifest="id.Heimdal.GSSAPI.manifest" />
-          <File Name="gssapi.pdb" />
-          <File Name="Heimdal.GSSAPI.cat" />
-          <File Name="Heimdal.GSSAPI.manifest" Id="id.Heimdal.GSSAPI.manifest" />
-        </Component>
-
-      </Directory>
    </Directory>

  </Module>
--- a/packages/windows/installer/heimdal-installer.wxs
+++ b/packages/windows/installer/heimdal-installer.wxs
@@ -116,19 +116,6 @@
                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'>
@@ -314,7 +301,6 @@
      <ComponentRef Id='comp.Plugin.Reg' />

      <ComponentRef Id='comp.policy.Heimdal.Kerberos' />
-      <ComponentRef Id='comp.policy.Heimdal.GSSAPI' />

      <MergeRef Id='Heimdal.Assemblies' />
      <MergeRef Id='Runtime' />