Windows: permit code signing without timestamps

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

diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k
index df662f5..8f01027 100644 (file)
--- a/src/config/NTMakefile.amd64_w2k
+++ b/src/config/NTMakefile.amd64_w2k
@@ -70,6 +70,7 @@ AFSDEV_BUILDTYPE = NONE
 !ENDIF
 INCLUDE = $(AFSDEV_INCLUDE)
 
+PATH = $(AFSDEV_BIN);$(PATH)
 
 !IFNDEF AFSDEV_LIB
 !ERROR Must define AFSDEV_LIB to be the default library directories.
@@ -89,7 +90,7 @@ AFSPRODUCT_VER_MAJOR=1
 AFSPRODUCT_VER_MINOR=5
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_PATCH)
-AFSPRODUCT_VER_PATCH=7300
+AFSPRODUCT_VER_PATCH=7600
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_BUILD)
 AFSPRODUCT_VER_BUILD=0
@@ -106,18 +107,27 @@ 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 +136,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
@@ -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
@@ -220,7 +230,7 @@ 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,18 +242,16 @@ 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 \
+       -DNTDDI_VERSION=0x05020000 \
        -DREGISTER_POWER_NOTIFICATIONS \
        -DAFS_FREELANCE_CLIENT \
         -DAFS_64BITPOINTER_ENV \
         -DAFS_64BITUSERPOINTER_ENV \
-       -DAFS_64BIT_ENV \
        -DAFS_64BIT_CLIENT \
        -D_USE_DECLSPECS_FOR_SAL=0 \
        -D_USE_ATTRIBUTES_FOR_SAL=0 \
@@ -326,13 +334,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)
@@ -392,6 +407,12 @@ CPP2OBJ = $(C2OBJ)
 .h.{$(DESTDIR)\include\rx}.h:
        $(COPY) $< $(DESTDIR)\include\rx
 
+.h.{$(DESTDIR)\include\des}.h:
+       $(COPY) $< $(DESTDIR)\include
+
+.h.{$(DESTDIR)\include\hcrypto}.h:
+       $(COPY) $< $(DESTDIR)\include\hcrypto
+
 .h.{$(DESTDIR)\include}.h:
        $(COPY) $< $(DESTDIR)\include
 
@@ -407,6 +428,12 @@ CPP2OBJ = $(C2OBJ)
 .h.{$(DESTDIR)\include\rx}.h:
        $(COPY) $(*B).h $(DESTDIR)\include\rx
 
+.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