make openafs 1.5.73.3

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

diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k
index 61b6dc9..48142ad 100644 (file)
--- a/src/config/NTMakefile.i386_w2k
+++ b/src/config/NTMakefile.i386_w2k
@@ -37,7 +37,7 @@
 
 #sanity checks 
 
-!IF ("$(CPU)" != "x86")
+!IF ("$(CPU)" == "x86")
 CPU=i386
 !ENDIF
 
@@ -86,15 +86,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=7303
+!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
@@ -187,18 +197,36 @@ APPVER=5.0
 # Extend and/or supplement definitions in WIN32.MAK.
 
 # Command macros.
+!IF !DEFINED(COPY)
 COPY = -copy
+!ENDIF
+!IF !DEFINED(DEL)
 DEL = -del
-MKDIR = -mkdir
+!ENDIF
+!IF !DEFINED(MKDIR)
+MKDIR = -md
+!ENDIF
+!IF !DEFINED(REN)
 REN = ren
+!ENDIF
+!IF !DEFINED(ECHO)
 ECHO = echo
+!ENDIF
+!IF !DEFINED(CD)
 CD = cd
+!ENDIF
+!IF !DEFINED(MC)
 MC = mc -vcsU
+!ENDIF
+!IF !DEFINED(MAKECMD)
 MAKECMD = nmake.exe
+!ENDIF
+!IF !DEFINED(MIDL)
+MIDL  = midl
+!ENDIF
 
 COMPILE_ET = $(DESTDIR)\bin\compile_et
 RXGEN = $(DESTDIR)\bin\rxgen
-MIDL  = midl
 
 # Common clean target.
 clean::
@@ -222,12 +250,9 @@ afscdefs =\
        -D_WIN32_WINNT=0x0500 \
        -DWINVER=0x0500 \
        -DREGISTER_POWER_NOTIFICATIONS \
-       -DAFS_AFSDB_ENV \
        -DAFS_FREELANCE_CLIENT \
        -DAFS_64BIT_ENV \
        -DAFS_64BIT_CLIENT \
-       -DAFS_LARGEFILE_ENV \
-        -DAFS_OLD_COM_ERR \
         $(AFSDEV_AUXCDEFINES)
 
 # Compiler switches (except include paths and preprocessor defines)
@@ -250,7 +275,7 @@ afscflags =\
        /Gy \
        /Os
 
-!IF ("$(AFSVER_CL)"=="1400")
+!IF ("$(AFSVER_CL)"=="1400" || "$(AFSVER_CL)"=="1500")
 afscflags = $(afscflags) /EHsc /wd4996
 !ELSE
 afscflags = $(afscflags) /GX
@@ -259,7 +284,7 @@ afscflags = $(afscflags) /GX
 !IF ("$(AFSVER_CL)"!="1200")
 afscflags = $(afscflags) /GT /GS
 #/Wp64
-!IF ("$(AFSVER_CL)"!="1400")
+!IF ("$(AFSVER_CL)"!="1400" && "$(AFSVER_CL)"!="1500")
 afscflags = $(afscflags) /G7
 !ENDIF
 !ENDIF
@@ -293,7 +318,7 @@ afscflags = $(afscflags) -D_DEBUG -D_CRTDBG_MAP_ALLOC
 _VC_MANIFEST_BASENAME = __OAFW.Debug
 !ENDIF
 
-!IF ("$(AFSVER_CL)"=="1400" || "$(AFSVER_CL)" == "1310")
+!IF ("$(AFSVER_CL)"=="1500"|| "$(AFSVER_CL)"=="1400" || "$(AFSVER_CL)" == "1310")
 _VC_MANIFEST_EMBED_EXE= \
 if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
 
@@ -304,13 +329,31 @@ _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) \
+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
@@ -385,7 +428,7 @@ RC = $(rc) $(rcvars) $(rcflags) $(AFSDEV_AUXRCFLAGS) /d "AFSPRODUCT_VERSION=\"$(
 afslflags =\
        /FIXED:NO /VERBOSE:LIB /MACHINE:I386
 
-!IF ("$(AFSVER_CL)"=="1400" || "$(AFSVER_CL)"=="1310")
+!IF ("$(AFSVER_CL)"=="1500" || "$(AFSVER_CL)"=="1400" || "$(AFSVER_CL)"=="1310")
 afslflags = $(afslflags) /MANIFEST
 !ENDIF
 
@@ -482,3 +525,14 @@ AFSDEV_AUXMIDLFLAGS=/env win32 /win32 /no_robust /Oicf
 LEX = flex -l
 YACC = bison
 
+
+######### Create Cygwin .a files
+# This macro should be invoked as a build step for a DLL target.
+!IFNDEF NOCYGWIN
+MAKECYGLIB=\
+       for %%C in (as.exe) do \
+       if exist %%~$$PATH:C \
+       dlltool --dllname $(@B).dll --output-lib $(@R).a --temp-prefix $(OUT) -S %%~$$PATH:C
+!ELSE
+MAKECYGLIB=echo Skipping Cygwin archive
+!ENDIF