Merge branch 'hackathonjune2012-brad' of https://github.com/luisibanez/fis-gtm into hackathonjune2012-brad

WIP : LC settings moved around for gtmgbldir setting

Conflicts:
	sr_unix/mumps.cmake

CMakeLists.txt

@@ -529,6 +529,51 @@ foreach(gtm_chset "" "UTF-8")
   endforeach()
 endforeach()
 
+#-----------------------------------------------------------------------------
+set(gtm_hlp mumps.hlp)
+set(gde_hlp gde.hlp)
+foreach(help gtm gde)
+  set(CMAKE_CONFIGURABLE_FILE_CONTENT
+    "Change -segment DEFAULT -block=2048 -file=\$gtm_dist/${help}help.dat
+Change -region DEFAULT -record=1020 -key=255
+exit")
+  configure_file(${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in
+                 ${GTM_BINARY_DIR}/${help}help.in1)
+  set(CMAKE_CONFIGURABLE_FILE_CONTENT
+    "Do ^GTMHLPLD
+${GTM_SOURCE_DIR}/sr_port/${${help}_hlp}
+Halt")
+  configure_file(${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in
+                 ${GTM_BINARY_DIR}/${help}help.in2)
+  set(env
+    -D gtm_dist=${GTM_BINARY_DIR}
+    -D gtmroutines=.
+    -D gtmgbldir=${GTM_BINARY_DIR}/${help}help
+    )
+  add_custom_command(
+    OUTPUT ${help}help.dat ${help}help.gld
+    DEPENDS ${GTM_SOURCE_DIR}/sr_unix/mumps.cmake mumps mupip
+            ${GTM_BINARY_DIR}/${help}help.in1
+            ${GTM_BINARY_DIR}/${help}help.in2
+    COMMAND ${CMAKE_COMMAND} -E remove ${help}help.dat ${help}help.gld
+    COMMAND ${CMAKE_COMMAND} ${env}
+      -D mumps=$<TARGET_FILE:mumps> -D "args=-run;GDE"
+      -D input_file=${GTM_BINARY_DIR}/${help}help.in1
+      -P ${GTM_SOURCE_DIR}/sr_unix/mumps.cmake
+    COMMAND ${CMAKE_COMMAND} ${env}
+      -D mumps=$<TARGET_FILE:mupip> -D "args=create"
+      -P ${GTM_SOURCE_DIR}/sr_unix/mumps.cmake
+    COMMAND ${CMAKE_COMMAND} ${env}
+      -D mumps=$<TARGET_FILE:mumps> -D "args=-direct"
+      -D input_file=${GTM_BINARY_DIR}/${help}help.in2
+      -P ${GTM_SOURCE_DIR}/sr_unix/mumps.cmake
+    VERBATIM
+    )
+  list(APPEND files_to_place ${help}help.dat)
+  install(FILES ${GTM_BINARY_DIR}/${help}help.dat DESTINATION ${GTM_INSTALL_DIR})
+endforeach()
+#-----------------------------------------------------------------------------
+
 set(GTM_TOP "${GTM_BINARY_DIR}")
 configure_file(sr_unix/gpgagent.tab.in plugin/gpgagent.tab @ONLY)
 set(GTM_TOP "${CMAKE_INSTALL_PREFIX}/${GTM_INSTALL_DIR}")

sr_unix/configure.gtc

@@ -673,6 +673,7 @@ export gtm_chset
 
 # Now work on UTF-8 mode
 if [ "$doutf8" -ne 0 ]; then
+	(
 	# Ensure we ARE in UTF-8 mode
 	utflocale=`locale -a | grep -i en_us | grep -i utf | grep '8$'`
 	if [ $arch = "zos" ]; then
@@ -704,8 +705,7 @@ if [ "$doutf8" -ne 0 ]; then
 	fi
 	(gtm_dist=$gtmdist/utf8; export gtm_dist; cd $gtm_dist; ./mumps -noignore *.m; $echo $?>>$gtmdist/compstat; \
 	if [ $is64bit_gtm -eq 1 -o "linux" != $arch ] ; then $ldcmd $ldflags -o libgtmutil$ext *.o ; fi )
-	gtm_chset="M"
-	export gtm_chset
+	)
 fi
 
 # Change mode to executable for the normal binaries
@@ -754,7 +754,7 @@ export gtmgbldir
 
 cat <<GDE.in1 | $gtmdist/mumps -direct
 Do ^GDE
-Change -segment DEFAULT	-block=2048	-file=$gtmdist/gtmhelp.dat
+Change -segment DEFAULT	-block=2048	-file=\$gtm_dist/gtmhelp.dat
 Change -region DEFAULT	-record=1020	-key=255
 Exit
 GDE.in1
@@ -764,7 +764,7 @@ export gtmgbldir
 
 cat <<GDE.in2 | $gtmdist/mumps -direct
 Do ^GDE
-Change -segment DEFAULT	-block=2048	-file=$gtmdist/gdehelp.dat
+Change -segment DEFAULT	-block=2048	-file=\$gtm_dist/gdehelp.dat
 Change -region DEFAULT	-record=1020	-key=255
 Exit
 GDE.in2

sr_unix/gtminstall.sh

@@ -419,8 +419,10 @@ fi
 tmp=`head -1 configure | cut -f 1`
 if [ "#!/bin/sh" != "$tmp" ] ; then
     echo "#!/bin/sh" >configure.sh
+    cat configure >>configure.sh
+else
+    cp configure configure.sh
 fi
-cat configure >>configure.sh
 chmod +x configure.sh
 
 # Stop here if this is a dry run

sr_unix/mumps.cmake

@@ -13,6 +13,7 @@ foreach(v
     gtmroutines
     gtm_chset
     gtm_icu_version
+    gtmgbldir
     LC_CTYPE
     LC_ALL
     )
@@ -20,10 +21,14 @@ foreach(v
     set("ENV{${v}}" "${${v}}")
   endif()
 endforeach()
+if(input_file)
+  set(input_file INPUT_FILE ${input_file})
+endif()
 if(output_file)
   set(output_file OUTPUT_FILE ${output_file})
 endif()
 execute_process(
   COMMAND ${mumps} ${args}
+  ${input_file}
   ${output_file}
   )