svn commit: r1655903 - /subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp

[br...@apache.org]

Author: brane
Date: Fri Jan 30 01:51:16 2015
New Revision: 1655903

URL: http://svn.apache.org/r1655903
Log:
Follow up to r1651565: make sure that the JavaHL native library has an
embedded version string like the core libraries do.

* subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp
  (javahl_version): New local function. Embeds the version string.
  (Java_org_apache_subversion_javahl_types_Version_getMajor,
   Java_org_apache_subversion_javahl_types_Version_getMinor,
   Java_org_apache_subversion_javahl_types_Version_getPatch):
   Use the version info returned by javahl_version; basically, to make
   it more likely that the linker doesn't remove the static version info.

Modified:
    subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp

Modified: subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp?rev=1655903&r1=1655902&r2=1655903&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_types_Version.cpp Fri Jan 30 01:51:16 2015
@@ -28,12 +28,19 @@
 #include "JNIStackElement.h"
 #include "svn_version.h"
 
+namespace {
+const svn_version_t* javahl_version()
+{
+  SVN_VERSION_BODY;
+}
+} //anonymous namespace
+
 JNIEXPORT jint JNICALL
 Java_org_apache_subversion_javahl_types_Version_getMajor(JNIEnv *env,
  jobject jthis)
 {
   JNIEntry(Version, getMajor);
-  return SVN_VER_MAJOR;
+  return javahl_version()->major;
 }
 
 JNIEXPORT jint JNICALL
@@ -41,7 +48,7 @@ Java_org_apache_subversion_javahl_types_
  jobject jthis)
 {
   JNIEntry(Version, getMinor);
-  return SVN_VER_MINOR;
+  return javahl_version()->minor;
 }
 
 JNIEXPORT jint JNICALL
@@ -49,7 +56,7 @@ Java_org_apache_subversion_javahl_types_
  jobject jthis)
 {
   JNIEntry(Version, getPatch);
-  return SVN_VER_PATCH;
+  return javahl_version()->patch;
 }
 
 JNIEXPORT jstring JNICALL