[ofw] RE: [PATCH] fix file version fields

[Reuven Amitai]

Hi Stan,
 
I changed it to be like the rest of the fields (
IB_{MAJOR/MINOR/BUILD}VERSION )
To avoid changes in other scripts that already use OPENIB_REV, I return
it and change the last section
of C_DEFINES in openib.def.
 
Thanks, Reuven.
 
>>>>>>>>>>>>>>>>>>>>>>>>>>
 
Index: mod_ver.def

===================================================================

--- mod_ver.def   (revision 1351)

+++ mod_ver.def   (working copy)

@@ -14,7 +14,7 @@

 IB_MINORVERSION=0

 !ENDIF

 

-# unused File version Field 3

-!IF !DEFINED(IB_F3VERSION)

-IB_F3VERSION=0

+# unused build version field

+!IF !DEFINED(IB_BUILDVERSION)

+IB_BUILDVERSION=0

 !ENDIF

\ No newline at end of file

Index: openib.def

===================================================================

--- openib.def    (revision 1351)

+++ openib.def    (working copy)

@@ -11,15 +11,11 @@

 IB_PRODUCTNAME="""OpenFabrics\x20Windows"""

 !ENDIF

 

-# get module version: major, minor & svn.ver

+# get module version: major, minor & build version

 !include mod_ver.def

 

-!IF !DEFINED(IB_FILEBUILD)

-IB_FILEBUILD=0

-!endif

-

-!IF !DEFINED(IB_FILEREV)

-IB_FILEREV=$(OPENIB_REV)

+!IF !DEFINED(OPENIB_REV)

+OPENIB_REV=0

 !ENDIF

 

 !IFNDEF VER_PROVIDER

@@ -30,6 +26,6 @@

     -DIB_PRODUCTNAME=$(IB_PRODUCTNAME) \

     -DVER_FILEMAJORVERSION=$(IB_MAJORVERSION) \

     -DVER_FILEMINORVERSION=$(IB_MINORVERSION) \

-    -DVER_FILEBUILD=$(IB_FILEBUILD) \

-     -DVER_FILEREV=$(IB_FILEREV) \

-     -DVER_PROVIDER=$(VER_PROVIDER)

+    -DVER_FILEBUILD=$(IB_BUILDVERSION) \

+    -DVER_FILEREV=$(OPENIB_REV) \

+    -DVER_PROVIDER=$(VER_PROVIDER)

 

 


________________________________

From: Smith, Stan [mailto:stan.smith at intel.com] 
Sent: Tuesday, July 08, 2008 8:04 PM
To: Reuven Amitai
Cc: ofw at lists.openfabrics.org
Subject: RE: [PATCH] fix file version fields


-!IF !DEFINED(IB_FILEREV)

-IB_FILEREV=$(OPENIB_REV)

+!IF !DEFINED(IB_REV)

+IB_REV=0

 

The above doesn't make sense to me?

Are you saying that OPENIB_REV is no longer set to the svn version # and
IB_REV now replaces OPENIB_REV?

 

Otherwise, the rest looks good.

 

stan.


________________________________

From: Reuven Amitai [mailto:reuven at mellanox.co.il] 
Sent: Tuesday, July 08, 2008 8:49 AM
To: Smith, Stan
Cc: ofw at lists.openfabrics.org
Subject: [PATCH] fix file version fields


Hi,
 
The following patch fix the file version fields.
1. remove unused IB_FILEBUILD from openib.def  (its location moved to
mod_ver.def)
    and sync with the definitions of VER_FILEXXX at the end of
openib.def
    which needed by oib_ver.h file in order to define the file version
string.
2. change OPENIB_REV to be like the rest of the version fields (If it's
not defined, It's zero) 
 
 
 
Thanks, Reuven.
 
>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 
Index: mod_ver.def

===================================================================

--- mod_ver.def   (revision 1340)

+++ mod_ver.def   (working copy)

@@ -14,7 +14,7 @@

 IB_MINORVERSION=0

 !ENDIF

 

-# unused File version Field 3

-!IF !DEFINED(IB_F3VERSION)

-IB_F3VERSION=0

+# unused build version field

+!IF !DEFINED(IB_BUILDVERSION)

+IB_BUILDVERSION=0

 !ENDIF

\ No newline at end of file

Index: openib.def

===================================================================

--- openib.def    (revision 1340)

+++ openib.def    (working copy)

@@ -11,15 +11,11 @@

 IB_PRODUCTNAME="""OpenFabrics\x20Windows"""

 !ENDIF

 

-# get module version: major, minor & svn.ver

+# get module version: major, minor & build version

 !include mod_ver.def

 

-!IF !DEFINED(IB_FILEBUILD)

-IB_FILEBUILD=0

-!endif

-

-!IF !DEFINED(IB_FILEREV)

-IB_FILEREV=$(OPENIB_REV)

+!IF !DEFINED(IB_REV)

+IB_REV=0

 !ENDIF

 

 !IFNDEF VER_PROVIDER

@@ -30,6 +26,6 @@

     -DIB_PRODUCTNAME=$(IB_PRODUCTNAME) \

     -DVER_FILEMAJORVERSION=$(IB_MAJORVERSION) \

     -DVER_FILEMINORVERSION=$(IB_MINORVERSION) \

-    -DVER_FILEBUILD=$(IB_FILEBUILD) \

-     -DVER_FILEREV=$(IB_FILEREV) \

+    -DVER_FILEBUILD=$(IB_BUILDVERSION) \

+     -DVER_FILEREV=$(IB_REV) \

      -DVER_PROVIDER=$(VER_PROVIDER)

 

 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20080709/ed02d60b/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: version2.patch
Type: application/octet-stream
Size: 1334 bytes
Desc: version2.patch
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20080709/ed02d60b/attachment.obj>