Windows: Version number update for 1.5.69

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

diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k
index 549b7b6..094c82e 100644 (file)
--- a/src/config/NTMakefile.amd64_w2k
+++ b/src/config/NTMakefile.amd64_w2k
@@ -82,15 +82,25 @@ INCLUDE = $(AFSDEV_INCLUDE)
 LIB = $(AFSDEV_LIB)
 
 #define used in WinNT/2000 installation and program version display
-AFSPRODUCT_VER_MAJOR=0
-AFSPRODUCT_VER_MINOR=0
-AFSPRODUCT_VER_PATCH=0
+!IF !DEFINED(AFSPRODUCT_VER_MAJOR)
+AFSPRODUCT_VER_MAJOR=1
+!ENDIF
+!IF !DEFINED(AFSPRODUCT_VER_MINOR)
+AFSPRODUCT_VER_MINOR=5
+!ENDIF
+!IF !DEFINED(AFSPRODUCT_VER_PATCH)
+AFSPRODUCT_VER_PATCH=6900
+!ENDIF
+!IF !DEFINED(AFSPRODUCT_VER_BUILD)
 AFSPRODUCT_VER_BUILD=0
+!ENDIF
 
 AFSPRODUCT_VERSION=$(AFSPRODUCT_VER_MAJOR).$(AFSPRODUCT_VER_MINOR).$(AFSPRODUCT_VER_PATCH)
 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
+!ENDIF
 CELLSERVDB_INSTALL=CellServDB.GrandCentral
 CELLSERVDB_WEB=http://grand.central.org/dl/cellservdb/CellServDB
 TARGETOS = WINNT
@@ -230,12 +240,11 @@ afscdefs =\
        -D_WIN32_WINNT=0x0502 \
        -DWINVER=0x0502 \
        -DREGISTER_POWER_NOTIFICATIONS \
-       -DAFS_AFSDB_ENV \
        -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 \
@@ -313,13 +322,29 @@ _VC_MANIFEST_EMBED_EXE=
 _VC_MANIFEST_EMBED_DLL=
 !ENDIF
 
+!IF "$(SIGNTOOL)" == ""
+SIGNTOOL=signtool.exe
+!ENDIF
+
 !IF DEFINED(CODESIGN_DESC) && DEFINED(CODESIGN_URL) && DEFINED(CODESIGN_TIMESTAMP)
-CODESIGN_USERLAND= signtool.exe sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) \
-        /t $(CODESIGN_TIMESTAMP) /v $@
+CODESIGN_USERLAND= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /t $(CODESIGN_TIMESTAMP) /v $@
+!IF "$(CODESIGN_CROSS_CERT)" != ""
+CODESIGN_KERNEL= "$(SIGNTOOL)" sign /a /d "$(CODESIGN_DESC)" /du $(CODESIGN_URL) /t $(CODESIGN_TIMESTAMP) /ac "$(CODESIGN_CROSS_CERT)" /v
+!ENDIF
 !ELSE
 CODESIGN_USERLAND=
 !ENDIF
 
+!IF DEFINED(SYMSTORE_EXE) && DEFINED(SYMSTORE_ROOT)
+!IF "$(SYMSTORE_COMMENT)" != ""
+SYMSTORE_COMMENT = |$(SYMSTORE_COMMENT)
+!ENDIF
+SYMSTORE_IMPORT= \
+$(SYMSTORE_EXE) add /s $(SYMSTORE_ROOT) /t "OpenAFS for Windows" /v "$(AFSBLD_TYPE)-$(CPU)-$(AFSPRODUCT_VERSION)" /c "$(@F)$(SYMSTORE_COMMENT)" /f $*.*
+!ELSE
+SYMSTORE_IMPORT=
+!ENDIF
+
 # Set compiler warning level
 
 !IFNDEF AFSDEV_WARNLEVEL