From: ftillier <ftillier@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Thu, 20 Oct 2005 04:34:17 +0000 (+0000)
Subject: Update to version information to allow vendor customization
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3da0f2804cbe2dea6eb77a6aae30f1845f2a9808;p=~shefty%2Frdma-win.git

Update to version information to allow vendor customization

Signed-off-by: Fab Tillier (ftillier@silverstorm.com)


git-svn-id: svn://openib.tc.cornell.edu/gen1@127 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---

diff --git a/trunk/inc/oib_ver.h b/trunk/inc/oib_ver.h
index 7d3caf2b..59a29d3f 100644
--- a/trunk/inc/oib_ver.h
+++ b/trunk/inc/oib_ver.h
@@ -33,22 +33,6 @@
 #include <windows.h>
 #include <ntverp.h>
 
-#ifndef VER_FILEMAJORVERSION
-#define VER_FILEMAJORVERSION		1
-#endif
-
-#ifndef VER_FILEMINORVERSION
-#define VER_FILEMINORVERSION		0
-#endif
-
-#ifndef VER_FILEBUILD
-#define VER_FILEBUILD				VER_OPENIB
-#endif
-
-#ifndef VER_FILEREV
-#define VER_FILEREV					0
-#endif
-
 #if		(VER_FILEBUILD < 10)
 #define VER_FILEBPAD "000"
 #elif	(VER_FILEBUILD < 100)
@@ -76,11 +60,11 @@
 #ifdef VER_COMPANYNAME_STR
 #undef VER_COMPANYNAME_STR
 #endif
-#define VER_COMPANYNAME_STR		"OpenIB Alliance"
+#define VER_COMPANYNAME_STR		IB_COMPANYNAME
 
 #ifdef VER_PRODUCTNAME_STR
 #undef VER_PRODUCTNAME_STR
 #endif
-#define VER_PRODUCTNAME_STR		"OpenIB Windows"
+#define VER_PRODUCTNAME_STR		IB_PRODUCTNAME
 
 #define VER_LEGALCOPYRIGHT_STR	"Copyright\xa9 2005 OpenIB Alliance"
diff --git a/trunk/inc/openib.def b/trunk/inc/openib.def
index 76cebece..58a14e23 100644
--- a/trunk/inc/openib.def
+++ b/trunk/inc/openib.def
@@ -1,3 +1,34 @@
 !INCLUDE $(NTMAKEENV)\makefile.def
 
-C_DEFINES=$(C_DEFINES) -DVER_OPENIB="$(VER_OPENIB)"
+# Allow overriding the company name.
+!IF !DEFINED(IB_COMPANYNAME)
+IB_COMPANYNAME="""OpenIB\x20Alliance"""
+!ENDIF
+
+# Allow overriding the product name.
+!IF !DEFINED(IB_PRODUCTNAME)
+IB_PRODUCTNAME="""OpenIB\x20Windows"""
+!ENDIF
+
+!IF !DEFINED(IB_MAJORVERSION)
+IB_MAJORVERSION=1
+!endif
+
+!IF !DEFINED(IB_MINORVERSION)
+IB_MINORVERSION=0
+!endif
+
+!IF !DEFINED(IB_FILEBUILD)
+IB_FILEBUILD=0
+!endif
+
+!IF !DEFINED(IB_FILEREV)
+IB_FILEREV=$(OPENIB_REV)
+!endif
+
+C_DEFINES=$(C_DEFINES) -DIB_COMPANYNAME=$(IB_COMPANYNAME) \
+    -DIB_PRODUCTNAME=$(IB_PRODUCTNAME) \
+    -DVER_FILEMAJORVERSION=$(IB_MAJORVERSION) \
+    -DVER_FILEMINORVERSION=$(IB_MINORVERSION) \
+    -DVER_FILEBUILD=$(IB_FILEBUILD) \
+    -DVER_FILEREV=$(IB_FILEREV)