Changeset 37389 for main

Timestamp:

2023-03-02T20:25:57+13:00 (14 months ago)

Author:

anupama

Message:

Make configure script for mg/mgpp choose between which Java framework to set as part of the JNILDFlAGS variable on a Mac, depending on version of xcode compile tools installed. Tested in separate bash script. Committing now in order to test with release-kit.

Location:

main/trunk/greenstone2/common-src/indexers

Files:

• mg/configure (modified) (1 diff)
• mg/configure.in (modified) (1 diff)
• mgpp/configure (modified) (1 diff)
• mgpp/configure.in (modified) (1 diff)

main/trunk/greenstone2/common-src/indexers/mg/configure

@@ -5813 +5813 @@
   JNIINC="-I\$(JAVA_HOME)/include/darwin -I\$(JAVA_HOME)/include "
   JNISUFFIX="jnilib"
-  JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaNativeFoundation"
+  knownMinXcodeVersionForNewJavaFramework=2395
+  xcodeVersion=`(xcode-select --version) 2> /dev/null`
+  if test "$?" -eq 127 || test "${xcodeVersion//[!0-9]/}" -lt $knownMinXcodeVersionForNewJavaFramework; then
+    JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM"
+  else
+    JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaNativeFoundation"
+  fi
 fi
 if test "`(uname -s) 2> /dev/null`" = 'SunOS'; then

main/trunk/greenstone2/common-src/indexers/mg/configure.in

@@ -130 +130 @@
 JNILDFLAGS="-shared"
 
+# Boolean operators with if test: https://www.shell-tips.com/bash/if-statement/#gsc.tab=0
+# Shell regex to get number from sentence: https://linuxconfig.org/how-to-extract-number-from-a-string-using-bash-example
 if test "`(uname -s) 2> /dev/null`" = 'Darwin'; then
   AC_MSG_RESULT(Darwin)
   JNIINC="-I\$(JAVA_HOME)/include/darwin -I\$(JAVA_HOME)/include "  
   JNISUFFIX="jnilib"
-  JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaNativeFoundation"
+  knownMinXcodeVersionForNewJavaFramework=2395
+  xcodeVersion=`(xcode-select --version) 2> /dev/null`
+  if test "$?" -eq 127 || test "${xcodeVersion//[!0-9]/}" -lt $knownMinXcodeVersionForNewJavaFramework; then
+    JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM"
+  else
+    JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaNativeFoundation"
+  fi
 fi
 if test "`(uname -s) 2> /dev/null`" = 'SunOS'; then

main/trunk/greenstone2/common-src/indexers/mgpp/configure

@@ -6112 +6112 @@
   JNIINC="-I\$(JAVA_HOME)/include/darwin -I\$(JAVA_HOME)/include "
   JNISUFFIX="jnilib"
-  JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaNativeFoundation"
+  knownMinXcodeVersionForNewJavaFramework=2395
+  xcodeVersion=`(xcode-select --version) 2> /dev/null`
+  if test "$?" -eq 127 || test "${xcodeVersion//[!0-9]/}" -lt $knownMinXcodeVersionForNewJavaFramework; then
+    JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM"
+  else
+    JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaNativeFoundation"
+  fi
 fi
 if test "`(uname -s) 2> /dev/null`" = 'SunOS'; then

main/trunk/greenstone2/common-src/indexers/mgpp/configure.in

@@ -174 +174 @@
   JNIINC="-I\$(JAVA_HOME)/include/darwin -I\$(JAVA_HOME)/include "    
   JNISUFFIX="jnilib"
-  JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaNativeFoundation"
+  knownMinXcodeVersionForNewJavaFramework=2395
+  xcodeVersion=`(xcode-select --version) 2> /dev/null`
+  if test "$?" -eq 127 || test "${xcodeVersion//[!0-9]/}" -lt $knownMinXcodeVersionForNewJavaFramework; then
+    JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaVM"
+  else
+    JNILDFLAGS="-dynamiclib -fno-common -single_module -framework JavaNativeFoundation"
+  fi
 fi
 if test "`(uname -s) 2> /dev/null`" = 'SunOS'; then