Repair an abstraction violation - OPAL components should refer to OPAL version numbers, not OMPI version numbers.

This now allows OPAL to be built separately.

This commit was SVN r12955.

opal/mca/maffinity/first_use/maffinity_first_use_component.c

@@ -26,7 +26,7 @@
  * Public string showing the maffinity ompi_first_use component version number
  */
 const char *opal_maffinity_first_use_component_version_string =
-    "OPAL first_use maffinity MCA component version " OMPI_VERSION;
+    "OPAL first_use maffinity MCA component version " OPAL_VERSION;
 
 /*
  * Local function
@@ -52,9 +52,9 @@ const opal_maffinity_base_component_1_0_0_t mca_maffinity_first_use_component =
         /* Component name and version */
 
         "first_use",
-        OMPI_MAJOR_VERSION,
+        OPAL_MAJOR_VERSION,
-        OMPI_MINOR_VERSION,
+        OPAL_MINOR_VERSION,
-        OMPI_RELEASE_VERSION,
+        OPAL_RELEASE_VERSION,
 
         /* Component open and close functions */
 

opal/mca/maffinity/libnuma/maffinity_libnuma_component.c

@@ -26,7 +26,7 @@
  * Public string showing the maffinity ompi_libnuma component version number
  */
 const char *opal_maffinity_libnuma_component_version_string =
-    "OPAL libnuma maffinity MCA component version " OMPI_VERSION;
+    "OPAL libnuma maffinity MCA component version " OPAL_VERSION;
 
 /*
  * Local function

opal/mca/paffinity/linux/paffinity_linux_component.c

@@ -32,7 +32,7 @@
  * Public string showing the paffinity ompi_linux component version number
  */
 const char *opal_paffinity_linux_component_version_string =
-    "OPAL linux paffinity MCA component version " OMPI_VERSION;
+    "OPAL linux paffinity MCA component version " OPAL_VERSION;
 
 /*
  * Local function
@@ -58,9 +58,9 @@ const opal_paffinity_base_component_1_0_0_t mca_paffinity_linux_component = {
         /* Component name and version */
 
         "linux",
-        OMPI_MAJOR_VERSION,
+        OPAL_MAJOR_VERSION,
-        OMPI_MINOR_VERSION,
+        OPAL_MINOR_VERSION,
-        OMPI_RELEASE_VERSION,
+        OPAL_RELEASE_VERSION,
 
         /* Component open and close functions */
 

opal/mca/paffinity/solaris/paffinity_solaris_component.c

@@ -32,7 +32,7 @@
  * Public string showing the paffinity ompi_solaris component version number
  */
 const char *opal_paffinity_solaris_component_version_string =
-    "OPAL solaris paffinity MCA component version " OMPI_VERSION;
+    "OPAL solaris paffinity MCA component version " OPAL_VERSION;
 
 /*
  * Local function
@@ -58,9 +58,9 @@ const opal_paffinity_base_component_1_0_0_t mca_paffinity_solaris_component = {
         /* Component name and version */
 
         "solaris",
-        OMPI_MAJOR_VERSION,
+        OPAL_MAJOR_VERSION,
-        OMPI_MINOR_VERSION,
+        OPAL_MINOR_VERSION,
-        OMPI_RELEASE_VERSION,
+        OPAL_RELEASE_VERSION,
 
         /* Component open and close functions */
 

opal/mca/paffinity/windows/paffinity_windows_component.c

@@ -32,7 +32,7 @@
  * Public string showing the paffinity ompi_windows component version number
  */
 const char *opal_paffinity_windows_component_version_string =
-    "OPAL windows paffinity MCA component version " OMPI_VERSION;
+    "OPAL windows paffinity MCA component version " OPAL_VERSION;
 
 /*
  * Local function
@@ -58,9 +58,9 @@ const opal_paffinity_base_component_1_0_0_t mca_paffinity_windows_component = {
         /* Component name and version */
 
         "windows",
-        OMPI_MAJOR_VERSION,
+        OPAL_MAJOR_VERSION,
-        OMPI_MINOR_VERSION,
+        OPAL_MINOR_VERSION,
-        OMPI_RELEASE_VERSION,
+        OPAL_RELEASE_VERSION,
 
         /* Component open and close functions */