From 5d0f3ee927465cfe1e70b791a8ef35e4c4aafbdd Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Sat, 14 Sep 2013 20:26:50 -0400
Subject: [PATCH] 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
---
 packages/windows/assembly/NTMakefile             |  4 ++--
 packages/windows/installer/NTMakefile            |  2 ++
 .../windows/installer/heimdal-assemblies.wxs     |  8 ++++----
 packages/windows/installer/heimdal-policy.wxs    |  4 ++--
 windows/NTMakefile.version                       |  6 +++++-
 windows/NTMakefile.w32                           | 16 ++++++++++++++--
 6 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/packages/windows/assembly/NTMakefile b/packages/windows/assembly/NTMakefile
index 954e767a5..dbde3c93d 100644
--- a/packages/windows/assembly/NTMakefile
+++ b/packages/windows/assembly/NTMakefile
@@ -49,7 +49,7 @@ prep:: mk-asm-dirs
 # ----------------------------------------------------------------------
 # Heimdal.Kerberos Assembly
 
-ASMKRBDIR=$(ASMDIR)\Heimdal.Kerberos
+ASMKRBDIR=$(ASMDIR)\$(ASMKRBNAME)
 ASMKRBVER=$(VER_PRODUCT_MAJOR).$(VER_PRODUCT_MINOR).$(VER_PRODUCT_AUX).$(VER_PRODUCT_PATCH)
 ASMKRBVER_OLD_BEGIN=$(VER_OLD_BEGIN_MAJOR).$(VER_OLD_BEGIN_MINOR).$(VER_OLD_BEGIN_AUX).$(VER_OLD_BEGIN_PATCH)
 ASMKRBVER_OLD_END=$(VER_OLD_END_MAJOR).$(VER_OLD_END_MINOR).$(VER_OLD_END_AUX).$(VER_OLD_END_PATCH)
@@ -130,7 +130,7 @@ test::
 # ----------------------------------------------------------------------
 # Publisher configuration files
 
-POLKRB=policy.$(VER_PRODUCT_MAJOR).$(VER_PRODUCT_MINOR).Heimdal.Kerberos
+POLKRB=policy.$(VER_PRODUCT_MAJOR).$(VER_PRODUCT_MINOR).$(ASMKRBNAME)
 POLKRBDIR=$(ASMDIR)\$(POLKRB)
 POLKRBFILE=$(POLKRBDIR)\$(ASMKRBVER).pol
 POLKRBCAT=$(POLKRBDIR)\$(ASMKRBVER).cat
diff --git a/packages/windows/installer/NTMakefile b/packages/windows/installer/NTMakefile
index 403832062..c63ae06d4 100644
--- a/packages/windows/installer/NTMakefile
+++ b/packages/windows/installer/NTMakefile
@@ -63,6 +63,7 @@ $(OBJ)\heimdal-assemblies.wixobj: heimdal-assemblies.wxs
 	$(CANDLE) -arch $(PLATFORM) -o $@ $**	\
 		-dVersion=$(VERSION)		\
 		-dBinDir=$(BINDIR)		\
+		-dAsmKrbName=$(ASMKRBNAME)		\
 		-dPlatform=$(PLATFORM)
 
 $(SDKREDISTDIR)\Heimdal.msm: $(ASSEMBLYMODULE)
@@ -77,6 +78,7 @@ $(OBJ)\heimdal-policy.wixobj: heimdal-policy.wxs
 	$(CANDLE) -arch $(PLATFORM) -o $@ $**	\
 		-dVersion=$(VERSION)		\
 		-dBinDir=$(BINDIR)		\
+		-dAsmKrbName=$(ASMKRBNAME)		\
 		-dPlatform=$(PLATFORM)		\
 		-dPolPrefix=$(POLPREFIX)
 
diff --git a/packages/windows/installer/heimdal-assemblies.wxs b/packages/windows/installer/heimdal-assemblies.wxs
index c4403f61c..dcd617465 100644
--- a/packages/windows/installer/heimdal-assemblies.wxs
+++ b/packages/windows/installer/heimdal-assemblies.wxs
@@ -24,8 +24,8 @@
              Platform="$(var.Platform)" />
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
-      <Directory Id="dir.Heimdal.Kerberos" Name="Heimdal.Kerberos"
-                 FileSource="$(var.BinDir)\Heimdal.Kerberos">
+      <Directory Id="dir.Heimdal.Kerberos" Name="$(var.AsmKrbName)"
+		 FileSource="$(var.BinDir)\$(var.AsmKrbName)">
         <Component Id="comp.Heimdal.Kerberos"
                    Guid="$(var.GuidKerberos)"
                    Win64="$(var.Win64)">
@@ -38,8 +38,8 @@
           <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" />
+	  <File Name="$(var.AsmKrbName).cat" />
+	  <File Name="$(var.AsmKrbName).manifest" Id="id.Heimdal.Kerberos.manifest" />
         </Component>
       </Directory>
     </Directory>
diff --git a/packages/windows/installer/heimdal-policy.wxs b/packages/windows/installer/heimdal-policy.wxs
index 1ef0d965e..bd9cd7c31 100644
--- a/packages/windows/installer/heimdal-policy.wxs
+++ b/packages/windows/installer/heimdal-policy.wxs
@@ -32,8 +32,8 @@
 
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='dir.policy.Heimdal.Kerberos'
-                 Name='$(var.PolPrefix).Heimdal.Kerberos'
-                 FileSource='$(var.BinDir)\$(var.PolPrefix).Heimdal.Kerberos'>
+		 Name='$(var.PolPrefix).$(var.AsmKrbName)'
+		 FileSource='$(var.BinDir)\$(var.PolPrefix).$(var.AsmKrbName)'>
 
         <Component Id='comp.policy.Heimdal.Kerberos'
                    Guid='$(var.GuidPolKerberos)'
diff --git a/windows/NTMakefile.version b/windows/NTMakefile.version
index 5ee3c051f..8ed244dc8 100644
--- a/windows/NTMakefile.version
+++ b/windows/NTMakefile.version
@@ -30,6 +30,11 @@ VER_OLD_END_PATCH=65535
 
 VER_PACKAGE_VERSION=$(VER_PRODUCT_MAJOR).$(VER_PRODUCT_MINOR).$(VER_PRODUCT_AUX)
 
+# Debug build flag
+!ifndef NODEBUG
+VER_DEBUG=1
+!endif
+
 # Define to 1 if this is a pre-release build.  Undefine otherwise
 VER_PRERELEASE=1
 
@@ -44,4 +49,3 @@ VER_PRERELEASE=1
 # version numbers.
 
 #VER_SPECIAL=Special build for testing ticket 12345
-
diff --git a/windows/NTMakefile.w32 b/windows/NTMakefile.w32
index bcac8554a..e9f7b05d1 100644
--- a/windows/NTMakefile.w32
+++ b/windows/NTMakefile.w32
@@ -561,7 +561,19 @@ LIBSQLITE   =$(LIBDIR)\libsqlite.lib
 LIBVERS	    =$(LIBDIR)\libvers.lib
 LIBWIND	    =$(LIBDIR)\libwind.lib
 
-ASMKRBNAME  =Heimdal.Kerberos
-ASMGSSNAME  =Heimdal.GSSAPI
+!ifdef VER_DEBUG
+ASM_DBG=.Debug
+!endif
+!ifdef VER_PRERELEASE
+ASM_PRE=.Pre
+!endif
+!ifdef VER_PRIVATE
+ASM_PVT=.Private
+!endif
+!ifdef VER_SPECIAL
+ASM_SPC=.Special
+!endif
+
+ASMKRBNAME  =Heimdal.Kerberos$(ASM_SPC)$(ASM_PVT)$(ASM_PRE)$(ASM_DBG)
 APPMANIFEST =$(INCDIR)\Heimdal.Application.$(MCPU).manifest