Make OpenAFS 1.9.0

[openafs.git] / src / config / NTMakefile.i386_w2k

diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k
index c8c801c..193e618 100644 (file)
--- a/src/config/NTMakefile.i386_w2k
+++ b/src/config/NTMakefile.i386_w2k
@@ -74,7 +74,6 @@ AFSDEV_BUILDTYPE = NONE
 !ENDIF
 INCLUDE = $(AFSDEV_INCLUDE)
 
-
 !IFNDEF AFSDEV_LIB
 !ERROR Must define AFSDEV_LIB to be the default library directories.
 !ENDIF
@@ -90,10 +89,10 @@ LIB = $(AFSDEV_LIB)
 AFSPRODUCT_VER_MAJOR=1
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_MINOR)
-AFSPRODUCT_VER_MINOR=5
+AFSPRODUCT_VER_MINOR=9
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_PATCH)
-AFSPRODUCT_VER_PATCH=7600
+AFSPRODUCT_VER_PATCH=0000
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_BUILD)
 AFSPRODUCT_VER_BUILD=0
@@ -103,7 +102,7 @@ AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_
 AFSPRODUCT_FILE_VERSION=$(AFSPRODUCT_VER_MAJOR),$(AFSPRODUCT_VER_MINOR),$(AFSPRODUCT_VER_PATCH),$(AFSPRODUCT_VER_BUILD)
 # Set CELLNAME_DEFAULT to "your cell name"
 !IF !DEFINED(CELLNAME_DEFAULT)
-CELLNAME_DEFAULT=openafs.org
+CELLNAME_DEFAULT=grand.central.org
 !ENDIF
 CELLSERVDB_INSTALL=CellServDB.GrandCentral
 CELLSERVDB_WEB=http://grand.central.org/dl/cellservdb/CellServDB
@@ -199,7 +198,7 @@ OUT=$(OJT)\$(RELDIR)
 APPVER=5.0
 !ENDIF
 
-
+PATH = $(AFSDEV_BIN);$(DESTDIR)\lib;$(PATH)
 
 !INCLUDE <WIN32.MAK>
 
@@ -233,6 +232,9 @@ MAKECMD = nmake.exe
 !IF !DEFINED(MIDL)
 MIDL  = midl
 !ENDIF
+!IF !DEFINED(PERL)
+PERL  = perl
+!ENDIF
 
 COMPILE_ET = $(DESTDIR)\bin\compile_et
 RXGEN = $(DESTDIR)\bin\rxgen
@@ -340,17 +342,23 @@ _VC_MANIFEST_EMBED_DLL=
 SIGNTOOL=signtool.exe
 !ENDIF
 
-!IF DEFINED(CODESIGN_DESC) && DEFINED(CODESIGN_URL) && DEFINED(CODESIGN_TIMESTAMP)
-CODESIGN_USERLAND= $(SIGNTOOL) sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) \
-        /t $(CODESIGN_TIMESTAMP) /v $@
+!IF DEFINED(CODESIGN_TIMESTAMP)
+!IF DEFINED(CODESIGN_DESC) && DEFINED(CODESIGN_URL)
+CODESIGN_USERLAND= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /t $(CODESIGN_TIMESTAMP) /v $(CODESIGN_OTHER) $@
 !IF "$(CODESIGN_CROSS_CERT)" != ""
-CODESIGN_KERNEL= $(SIGNTOOL) sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) \
-        /t $(CODESIGN_TIMESTAMP) /ac "$(CODESIGN_CROSS_CERT)" /v
+CODESIGN_KERNEL= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /t $(CODESIGN_TIMESTAMP) $(CODESIGN_OTHER) /ac "$(CODESIGN_CROSS_CERT)" /v $@
+!ENDIF
 !ENDIF
 !ELSE
-CODESIGN_USERLAND=
+!IF DEFINED(CODESIGN_DESC) && DEFINED(CODESIGN_URL)
+CODESIGN_USERLAND= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /v $(CODESIGN_OTHER) $@
+!IF "$(CODESIGN_CROSS_CERT)" != ""
+CODESIGN_KERNEL= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /v $(CODESIGN_OTHER) /ac "$(CODESIGN_CROSS_CERT)" $@
+!ENDIF
+!ENDIF
 !ENDIF
 
+
 !IF DEFINED(SYMSTORE_EXE) && DEFINED(SYMSTORE_ROOT)
 !IF "$(SYMSTORE_COMMENT)" != ""
 SYMSTORE_COMMENT = |$(SYMSTORE_COMMENT)
@@ -409,6 +417,9 @@ CPP2OBJ = $(C2OBJ)
 .h.{$(DESTDIR)\include\rx}.h:
        $(COPY) $< $(DESTDIR)\include\rx
 
+.h.{$(DESTDIR)\include\opr}.h:
+       $(COPY) $< $(DESTDIR)\include\opr
+
 .h.{$(DESTDIR)\include\des}.h:
        $(COPY) $< $(DESTDIR)\include
 
@@ -427,6 +438,9 @@ CPP2OBJ = $(C2OBJ)
 .h.{$(DESTDIR)\include\afs}.h:
        $(COPY) $(*B).h $(DESTDIR)\include\afs
 
+.h.{$(DESTDIR)\include\opr}.h:
+       $(COPY) $(*B).h $(DESTDIR)\include\opr
+
 .h.{$(DESTDIR)\include\rx}.h:
        $(COPY) $(*B).h $(DESTDIR)\include\rx
 
@@ -511,7 +525,7 @@ DLLPREP = rebase -i $(DESTDIR)\NTDllmap.txt -q $@
 
 
 # EXE link macro for console applications
-EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) Advapi32.lib user32.lib  version.lib $**
+EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) user32.lib  version.lib $**
 
 # EXE link macro for GUI applications
 EXEGUILINK = $(link) /OUT:$@ $(ldebug) $(guilflags) $(afslflags) $(guilibsdll) $**
@@ -524,7 +538,7 @@ DLLCONLINK = $(link) /OUT:$@ $(ldebug) $(dlllflags) $(afslflags) $(conlibsdll) $
 
 # DLL link macro for GUI applications
 DLLGUILINK = $(link) /OUT:$@ $(ldebug) $(dlllflags) $(afslflags) $(guilibsdll)  $**
-EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) Advapi32.lib user32.lib version.lib $**
+EXECONLINK = $(link) /OUT:$@ $(ldebug) $(conlflags) $(afslflags) $(conlibsdll) user32.lib version.lib $**
 DLLMFCLINK = $(link) /OUT:$@ $(ldebug) $(mfcdlllflags) $(afslflags) $(mfclibsdll) $**
 
 # DLL link macro for resource-only DLLs
@@ -555,3 +569,21 @@ MAKECYGLIB=\
 !ELSE
 MAKECYGLIB=echo Skipping Cygwin archive
 !ENDIF
+
+######### Heimdal compatibility support
+
+!IFNDEF HEIMDALSDKDIR
+!IFDEF KERBEROSCOMPATSDKROOT
+HEIMDALSDKDIR=$(KERBEROSCOMPATSDKROOT)\1.0
+!ELSE
+!ERROR HEIMDALSDKDIR or KERBEROSCOMPATSDKROOT needs to be defined
+!ENDIF
+!ENDIF
+
+HEIMINC=$(HEIMDALSDKDIR)\inc
+HEIMLIB=$(HEIMDALSDKDIR)\lib\$(CPU)
+
+afscdefs=$(afscdefs) -I$(HEIMINC) -I$(HEIMINC)\krb5
+
+HEIMDEPS=$(HEIMLIB)\heimdal.lib $(DESTDIR)\lib\krbcompat_delayload.obj
+HEIMLINKOPTS=/DELAYLOAD:heimdal.dll