git://git.openafs.org / openafs.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
Make OpenAFS 1.9.0
[openafs.git] / src / config / NTMakefile.amd64_w2k
diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k
index 590bc8e..820df56 100644 (file)
--- a/src/config/NTMakefile.amd64_w2k
+++ b/src/config/NTMakefile.amd64_w2k
@@ -70,7 +70,6 @@ AFSDEV_BUILDTYPE = NONE
 !ENDIF
 INCLUDE = $(AFSDEV_INCLUDE)
 
-
 !IFNDEF AFSDEV_LIB
 !ERROR Must define AFSDEV_LIB to be the default library directories.
 !ENDIF
@@ -86,10 +85,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=6700
+AFSPRODUCT_VER_PATCH=0000
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_BUILD)
 AFSPRODUCT_VER_BUILD=0
@@ -99,25 +98,34 @@ 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
 TARGETOS = WINNT
 
 # Define defaults folder locations
-DEST=dest
-SRC=src
-OBJ=obj
+!if !defined(DEST)
+DEST=$(AFSROOT)\dest
+!endif
+!if !defined(SRC)
+SRC=$(AFSROOT)\src
+!endif
+!if !defined(OBJ)
+OBJ=$(AFSROOT)\obj
+!endif
+!if !defined(DOC)
+DOC=$(AFSROOT)\doc
+!endif
 
 !IF ("$(AFS_OBJDIR)"=="") 
 #########  AFS_OBJDIR is NOT used use default locations
 !  IF ("$(AFSDEV_BUILDTYPE)" == "CHECKED")
-DESTDIR=$(AFSROOT)\$(DEST)\$(SYS_NAME)\checked
-OJT=$(AFSROOT)\$(OBJ)\$(SYS_NAME)\checked
+DESTDIR=$(DEST)\$(SYS_NAME)\checked
+OJT=$(OBJ)\$(SYS_NAME)\checked
 !  ELSE
-DESTDIR=$(AFSROOT)\$(DEST)\$(SYS_NAME)\free
-OJT=$(AFSROOT)\$(OBJ)\$(SYS_NAME)\free
+DESTDIR=$(DEST)\$(SYS_NAME)\free
+OJT=$(OBJ)\$(SYS_NAME)\free
 !  ENDIF
 UTIL_CR = $(DESTDIR)\bin\util_cr.exe
 !ELSE
@@ -126,20 +134,20 @@ UTIL_CR = $(DESTDIR)\bin\util_cr.exe
 !  IF (EXIST($(AFSROOT)\$(AFS_OBJDIR)))
 #  AFS_OBJDIR is relative path
 !    IF ("$(AFSDEV_BUILDTYPE)" == "CHECKED")
-DESTDIR=$(AFSROOT)\$(AFS_OBJDIR)\$(DEST)\$(SYS_NAME)\checked
+DESTDIR=$(AFSROOT)\$(AFS_OBJDIR)\dest\$(SYS_NAME)\checked
 OJT=$(AFSROOT)\$(AFS_OBJDIR)\$(SYS_NAME)\checked\config
 !    ELSE
 OJT=$(AFSROOT)\$(AFS_OBJDIR)\$(SYS_NAME)\free\config
-DESTDIR=$(AFSROOT)\$(AFS_OBJDIR)\$(DEST)\$(SYS_NAME)\free
+DESTDIR=$(AFSROOT)\$(AFS_OBJDIR)\dest\$(SYS_NAME)\free
 !    ENDIF
 !  ELSE
 !    IF (EXIST($(AFS_OBJDIR)))
 #   AFS_OBJDIR is full path
 !    IF ("$(AFSDEV_BUILDTYPE)" == "CHECKED")
-DESTDIR=$(AFS_OBJDIR)\$(DEST)\$(SYS_NAME)\checked
+DESTDIR=$(AFS_OBJDIR)\dest\$(SYS_NAME)\checked
 OJT=$(AFS_OBJDIR)\$(SYS_NAME)\checked\config
 !      ELSE
-DESTDIR=$(AFS_OBJDIR)\$(DEST)\$(SYS_NAME)\free
+DESTDIR=$(AFS_OBJDIR)\dest\$(SYS_NAME)\free
 OJT=$(AFS_OBJDIR)\$(SYS_NAME)\free\config
 !      ENDIF
 !    ELSE
@@ -182,6 +190,8 @@ OUT=$(OJT)\$(RELDIR)
 APPVER=5.02
 !ENDIF
 
+PATH = $(AFSDEV_BIN);$(DESTDIR)\lib;$(PATH)
+
 !INCLUDE <WIN32.MAK>
 
 # Extend and/or supplement definitions in WIN32.MAK.
@@ -206,7 +216,7 @@ ECHO = echo
 CD = cd
 !ENDIF
 !IF !DEFINED(MC)
-MC = mc -vcsU
+MC = mc -vcU
 !ENDIF
 !IF !DEFINED(MAKECMD)
 MAKECMD = nmake.exe
@@ -214,13 +224,16 @@ 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
 
 # Common clean target.
 clean::
-       $(DEL) /q $(OUT)\*.obj $(OUT)\*.lib $(OUT)\*.dll $(OUT)\*.exe $(OUT)\*.pdb
+       $(DEL) /q $(OUT)\*.obj $(OUT)\*.lib $(OUT)\*.dll $(OUT)\*.exe $(OUT)\*.pdb $(OUT)\*.res $(OUT)\*.manifest $(OUT)\*.exp
        $(DEL) /q $(OUT)\*_component_version_number.* *_component_version_number.*
 
 # Common lang target.
@@ -232,21 +245,17 @@ lang::
 afscdefs =\
        -I. \
        -I$(DESTDIR)\include \
-       -I$(DESTDIR)\include\afs \
-       -I$(DESTDIR)\include\rx \
        -DWIN32_LEAN_AND_MEAN \
        -DSTRICT \
        -D_WIN32_IE=0x0502 \
        -D_WIN32_WINNT=0x0502 \
-       -DWINVER=0x0502 \
-       -DREGISTER_POWER_NOTIFICATIONS \
-       -DAFS_AFSDB_ENV \
-       -DAFS_FREELANCE_CLIENT \
+       -DWINVER=0x0502 \
+       -DNTDDI_VERSION=0x05020000 \
+       -DREGISTER_POWER_NOTIFICATIONS \
+       -DAFS_FREELANCE_CLIENT \
         -DAFS_64BITPOINTER_ENV \
         -DAFS_64BITUSERPOINTER_ENV \
-       -DAFS_64BIT_ENV \
        -DAFS_64BIT_CLIENT \
-       -DAFS_LARGEFILE_ENV \
        -D_USE_DECLSPECS_FOR_SAL=0 \
        -D_USE_ATTRIBUTES_FOR_SAL=0 \
        -D_ATL_SECURE_NO_DEPRECATE \
@@ -328,13 +337,20 @@ _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)
@@ -394,6 +410,15 @@ 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
+
+.h.{$(DESTDIR)\include\hcrypto}.h:
+       $(COPY) $< $(DESTDIR)\include\hcrypto
+
 .h.{$(DESTDIR)\include}.h:
        $(COPY) $< $(DESTDIR)\include
 
@@ -409,6 +434,15 @@ CPP2OBJ = $(C2OBJ)
 .h.{$(DESTDIR)\include\rx}.h:
        $(COPY) $(*B).h $(DESTDIR)\include\rx
 
+.h.{$(DESTDIR)\include\opr}.h:
+       $(COPY) $(*B).h $(DESTDIR)\include\opr
+
+.h.{$(DESTDIR)\include\des}.h:
+       $(COPY) $(*B).h $(DESTDIR)\include
+
+.h.{$(DESTDIR)\include\hcrypto}.h:
+       $(COPY) $(*B).h $(DESTDIR)\include\hcrypto
+
 .h.{$(DESTDIR)\include\WINNT}.h:
        $(COPY) $(*B).h $(DESTDIR)\include\WINNT
 
@@ -488,7 +522,7 @@ DLLPREP = rebase -i $(DESTDIR)\NTDllmap.txt -q $@
 !ENDIF #CHECKED BUILD
 
 # 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) $**
@@ -502,7 +536,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) $**
 
@@ -533,3 +567,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
OpenAFS Master Repository