From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Sun, 15 Nov 2009 20:48:00 +0000 (-0500)
Subject: Windows: Permit custom version numbers and default cellname
X-Git-Tag: openafs-devel-1_5_67~36
X-Git-Url: https://git.openafs.org/?p=openafs.git;a=commitdiff_plain;h=3f3a76c0ca2a6e098f337e28cdfcb39ee865446a

Windows: Permit custom version numbers and default cellname

Permit custom version numbers and default cellname to be
specified using environment variables.

LICENSE MIT

Change-Id: If72430a33d8317fcb59d2f83769193e79984046c
Reviewed-on: http://gerrit.openafs.org/829
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
---

diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k
index 554808b..e901ddb 100644
--- 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
+!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=6600
+!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
diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40
index dfaa419..d3f6c34 100644
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -82,15 +82,25 @@ INCLUDE = $(AFSDEV_INCLUDE)
 LIB = $(AFSDEV_LIB)
 
 #define used in WinNT/2000 installation and program version display
+!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=6600
+!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
diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k
index 47dbb92..4c919b0 100644
--- a/src/config/NTMakefile.i386_w2k
+++ b/src/config/NTMakefile.i386_w2k
@@ -86,15 +86,25 @@ INCLUDE = $(AFSDEV_INCLUDE)
 LIB = $(AFSDEV_LIB)
 
 #define used in WinNT/2000 installation and program version display
+!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=6600
+!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