From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Thu, 1 Sep 2005 01:11:31 +0000 (+0000)
Subject: STABLE14-windows-version20050831
X-Git-Tag: openafs-stable-1_4_0-rc3~10
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=e374d932c584fd34404fe58b530a17e79eac8fc9;p=packages%2Fo%2Fopenafs.git

STABLE14-windows-version20050831


next version 1.4.0002
---

diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k
index 8d258b01b..4beb07629 100644
--- a/src/config/NTMakefile.amd64_w2k
+++ b/src/config/NTMakefile.amd64_w2k
@@ -79,8 +79,8 @@ LIB = $(AFSDEV_LIB)
 
 #define used in WinNT/2000 installation and program version display
 AFSPRODUCT_VER_MAJOR=1
-AFSPRODUCT_VER_MINOR=4
-AFSPRODUCT_VER_PATCH=0001
+AFSPRODUCT_VER_MINOR=5
+AFSPRODUCT_VER_PATCH=0000
 AFSPRODUCT_VER_BUILD=0
 
 # For MSI installer, each major release should have a different GUID
@@ -258,6 +258,10 @@ afscflags = $(afscflags) /G7
 !ENDIF
 !ENDIF
 
+!IF ("$(AFSIFS)" == "TRUE")
+afscdefs = $(afscdefs) -DAFSIFS
+!ENDIF
+
 !IF ("$(AFSDEV_BUILDTYPE)" == "FREE")
 
 afscflags = $(afscflags) /Ox /Zi
@@ -269,11 +273,9 @@ NODEBUG=1
 cdebug = $(cdebug:-Z7=-Zi)  # avoid annoying override warning (D4025)
 
 !IF ("$(AFSVER_CL)"=="1200")
-afscdefs = $(afscdefs) -DDEBUG
-afscflags = $(afscflags) /GZ
+afscdefs = $(afscdefs) -DDEBUG /GZ
 !ELSE 
-afscdefs = $(afscdefs) -DDEBUG
-afscflags = $(afscflags) /RTCs /RTCu
+afscdefs = $(afscdefs) -DDEBUG /RTCs /RTCu
 !ENDIF
 
 !IFDEF _CRTDBG_MAP_ALLOC
diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40
index 21136a2fe..3e3ca604a 100644
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -79,8 +79,8 @@ LIB = $(AFSDEV_LIB)
 
 #define used in WinNT/2000 installation and program version display
 AFSPRODUCT_VER_MAJOR=1
-AFSPRODUCT_VER_MINOR=4
-AFSPRODUCT_VER_PATCH=0001
+AFSPRODUCT_VER_MINOR=5
+AFSPRODUCT_VER_PATCH=0000
 AFSPRODUCT_VER_BUILD=0
 
 # For MSI installer, each major release should have a different GUID
@@ -249,13 +249,17 @@ afscflags = $(afscflags) /GX
 !ENDIF
 
 !IF ("$(AFSVER_CL)"!="1200")
-afscflags = $(afscflags) /GT /GS
+afscdefs = $(afscdefs) /GT /GS
 #/Wp64
 !IF ("$(AFSVER_CL)"!="1400")
-afscflags = $(afscflags) /G7
+afscdefs = $(afscdefs) /G7
 !ENDIF
 !ENDIF
 
+!IF ("$(AFSIFS)" == "TRUE")
+afscdefs = $(afscdefs) -DAFSIFS
+!ENDIF
+
 !IF ("$(AFSDEV_BUILDTYPE)" == "FREE")
 
 afscflags = $(afscflags) /Ox /Zi
@@ -267,15 +271,15 @@ NODEBUG=1
 cdebug = $(cdebug:-Z7=-Zi)  # avoid annoying override warning (D4025)
 
 !IF ("$(AFSVER_CL)"=="1200")
-afscdefs = $(afscdefs) -DDEBUG
+afscdefs = $(afscdefs) -DDEBUG 
 afscflags = $(afscflags) /GZ
 !ELSE 
-afscdefs = $(afscdefs) -DDEBUG
+afscdefs = $(afscdefs) -DDEBUG 
 afscflags = $(afscflags) /RTCs /RTCu
 !ENDIF
 
 !IFDEF _CRTDBG_MAP_ALLOC
-afscflags = $(afscflags) -D_DEBUG -D_CRTDBG_MAP_ALLOC
+afscdefs = $(afscdefs) -D_DEBUG -D_CRTDBG_MAP_ALLOC
 !ENDIF
 
 !UNDEF NODEBUG
@@ -298,7 +302,7 @@ AFSDEV_WARNLEVEL = 3
 afscflags = $(afscflags) /W$(AFSDEV_WARNLEVEL)
 
 # C/C++ compilation macros
-C2OBJ   = $(cc) /Fo$@ /Fd$*.pdb $(cflags) $(cdebug) $(cvarsdll) $(afscflags) $(afscdefs) /c  
+C2OBJ   = $(cc) /Fo$@ /Fd$*.pdb $(cflags) $(cdebug) $(dafsifs) $(cvarsdll) $(afscflags) $(afscdefs) /c  
 CPP2OBJ = $(C2OBJ)
 # Inference rules for building and installing targets
 # Compile .c files, from current directory to defined by OUT
diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k
index 21136a2fe..3c2bdd4f9 100644
--- a/src/config/NTMakefile.i386_w2k
+++ b/src/config/NTMakefile.i386_w2k
@@ -79,8 +79,8 @@ LIB = $(AFSDEV_LIB)
 
 #define used in WinNT/2000 installation and program version display
 AFSPRODUCT_VER_MAJOR=1
-AFSPRODUCT_VER_MINOR=4
-AFSPRODUCT_VER_PATCH=0001
+AFSPRODUCT_VER_MINOR=5
+AFSPRODUCT_VER_PATCH=0000
 AFSPRODUCT_VER_BUILD=0
 
 # For MSI installer, each major release should have a different GUID
@@ -256,6 +256,10 @@ afscflags = $(afscflags) /G7
 !ENDIF
 !ENDIF
 
+!IF ("$(AFSIFS)" == "TRUE")
+afscdefs = $(afscdefs) -DAFSIFS
+!ENDIF
+
 !IF ("$(AFSDEV_BUILDTYPE)" == "FREE")
 
 afscflags = $(afscflags) /Ox /Zi
@@ -267,11 +271,9 @@ NODEBUG=1
 cdebug = $(cdebug:-Z7=-Zi)  # avoid annoying override warning (D4025)
 
 !IF ("$(AFSVER_CL)"=="1200")
-afscdefs = $(afscdefs) -DDEBUG
-afscflags = $(afscflags) /GZ
+afscdefs = $(afscdefs) -DDEBUG /GZ
 !ELSE 
-afscdefs = $(afscdefs) -DDEBUG
-afscflags = $(afscflags) /RTCs /RTCu
+afscdefs = $(afscdefs) -DDEBUG /RTCs /RTCu
 !ENDIF
 
 !IFDEF _CRTDBG_MAP_ALLOC
diff --git a/src/config/NTMakefile.i386_win95 b/src/config/NTMakefile.i386_win95
index 9b81d2ca8..16dc95df1 100644
--- a/src/config/NTMakefile.i386_win95
+++ b/src/config/NTMakefile.i386_win95
@@ -36,7 +36,7 @@ APPVER = 4.0
 !ENDIF
 
 #define used in Win9x installation and program version display
-AFSPRODUCT_VERSION=1.3.60
+AFSPRODUCT_VERSION=0.0.00
 CELLNAME_DEFAULT=Your Cell Name
 CELLSERVDB_INSTALL=CellServDB.GrandCentral
 CELLSERVDB_WEB=http://grand.central.org/dl/cellservdb/CellServDB