Merge remote-tracking branch 'origin/fix-quotes-updated' into release

aashish24 · aashish24 · commit fdb9e30360a8 · 2015-01-14T14:15:41.000-05:00
diff --git a/CMake/cdat_modules_extra/ESMP_install_step.cmake.in b/CMake/cdat_modules_extra/ESMP_install_step.cmake.in
@@ -10,7 +10,7 @@ foreach( item ${ESMP_esmfmkfile})
 endforeach( item ${ESMP_esmfmkfile})
 
 execute_process(
-  COMMAND @PYTHON_EXECUTABLE@ generateESMP_Config.py
+  COMMAND "@PYTHON_EXECUTABLE@" generateESMP_Config.py
   WORKING_DIRECTORY @ESMP_source@
   OUTPUT_VARIABLE CDAT_OUT
   ERROR_VARIABLE CDAT_ERR
diff --git a/CMake/cdat_modules_extra/cdat_common_environment.cmake.in b/CMake/cdat_modules_extra/cdat_common_environment.cmake.in
@@ -7,7 +7,7 @@ set(ENV{CFLAGS} "-I@cdat_EXTERNALS@/include @cdat_osx_flags@ @cdat_external_incl
 set(ENV{CPPFLAGS} "-I@cdat_EXTERNALS@/include @cdat_osx_cppflags@ @cdat_external_include_directories@ ${ADDITIONAL_CPPFLAGS}")
 set(ENV{CXXFLAGS} "-I@cdat_EXTERNALS@/include @cdat_osx_cxxflags@ ${ADDITIONAL_CXXFLAGS}")
 set(ENV{PKG_CONFIG_PATH} "@cdat_EXTERNALS@/lib/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig:$ENV{PKG_CONFIG_PATH}")
-set(ENV{PKG_CONFIG} @cdat_PKG_CONFIG_EXECUTABLE@)
+set(ENV{PKG_CONFIG} "@cdat_PKG_CONFIG_EXECUTABLE@")
 set(ENV{FC} "")
 set(ENV{FCFLAGS} "")
 set(ENV{FCLIBS} "")
diff --git a/CMake/cdat_modules_extra/cdat_configure_step.cmake.in b/CMake/cdat_modules_extra/cdat_configure_step.cmake.in
@@ -1,5 +1,5 @@
 set(ENV{PKG_CONFIG_PATH} "@cdat_EXTERNALS@/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:$ENV{PKG_CONFIG_PATH}")
-set(ENV{PKG_CONFIG} @cdat_PKG_CONFIG_EXECUTABLE@)
+set(ENV{PKG_CONFIG} "@cdat_PKG_CONFIG_EXECUTABLE@")
 
 include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
 
diff --git a/CMake/cdat_modules_extra/cdat_python_install_step.cmake.in b/CMake/cdat_modules_extra/cdat_python_install_step.cmake.in
@@ -9,7 +9,7 @@ set(ENV{CFLAGS} "-w -I@cdat_EXTERNALS@/include -I@cdat_EXTERNALS@/include/cairo
 set(ENV{LOCNCCONFIG} "@cdat_EXTERNALS@/bin/nc-config")
 set(ENV{EXTERNALS} "@cdat_EXTERNALS@")
 set(ENV{PKG_CONFIG_PATH} "@cdat_EXTERNALS@/lib/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/share/pkgconfig:$ENV{PKG_CONFIG_PATH}")
-set(ENV{PKG_CONFIG} @cdat_PKG_CONFIG_EXECUTABLE@)
+set(ENV{PKG_CONFIG} "@cdat_PKG_CONFIG_EXECUTABLE@")
 
 message("Running cdat install with path: " $ENV{PATH})
 
@@ -18,7 +18,7 @@ if(APPLE)
 endif()
 
 execute_process(
-    COMMAND  @PYTHON_EXECUTABLE@ @cdat_CMAKE_SOURCE_DIR@/install.py @cdat_xtra_flags@ --enable-pp @SAMPLE_DATA@ @PYTHON_EXTRA_PREFIX@ @CDMS_ONLY@
+    COMMAND  "@PYTHON_EXECUTABLE@" @cdat_CMAKE_SOURCE_DIR@/install.py @cdat_xtra_flags@ --enable-pp @SAMPLE_DATA@ @PYTHON_EXTRA_PREFIX@ @CDMS_ONLY@
   WORKING_DIRECTORY "@WORKING_DIR@"
   RESULT_VARIABLE res)
 
diff --git a/CMake/cdat_modules_extra/cleanenv_configure_step.cmake.in b/CMake/cdat_modules_extra/cleanenv_configure_step.cmake.in
@@ -1,5 +1,5 @@
 #set(ENV{PKG_CONFIG_PATH} "@cdat_EXTERNALS@/lib/pkgconfig:/usr/lib64/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:$ENV{PKG_CONFIG_PATH}")
-#set(ENV{PKG_CONFIG} @cdat_PKG_CONFIG_EXECUTABLE@)
+#set(ENV{PKG_CONFIG} "@cdat_PKG_CONFIG_EXECUTABLE@")
 
 #include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
 
diff --git a/CMake/cdat_modules_extra/git_clone.sh.in b/CMake/cdat_modules_extra/git_clone.sh.in
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd @CMAKE_INSTALL_PREFIX@
-@GIT_EXECUTABLE@ clone --depth 1 -b @BRANCH@ @GIT_URL@ @GIT_TARGET@
+"@GIT_EXECUTABLE@" clone --depth 1 -b @BRANCH@ @GIT_URL@ @GIT_TARGET@
diff --git a/CMake/cdat_modules_extra/hdf5_patch_step.cmake.in b/CMake/cdat_modules_extra/hdf5_patch_step.cmake.in
@@ -1,5 +1,10 @@
 execute_process(
   COMMAND
-  @CMAKE_COMMAND@ -E copy_if_different @cdat_SOURCE_DIR@/exsrc/src/h5diff_correct_ansi.c ${WORKING_DIR}/tools/lib/h5diff.c
+  "@CMAKE_COMMAND@" -E copy_if_different @cdat_SOURCE_DIR@/exsrc/src/h5diff_correct_ansi.c ${WORKING_DIR}/tools/lib/h5diff.c
+  RESULT_VARIABLE errcode
 )
-
+if("${errcode}" STREQUAL "0")
+    message(STATUS "h5diff.c replaced")
+else()
+    message(FATAL_ERROR "Replacing h5diff.c failed: ${errcode}")
+endif()
diff --git a/CMake/cdat_modules_extra/libcf_install_step.cmake.in b/CMake/cdat_modules_extra/libcf_install_step.cmake.in
@@ -2,7 +2,7 @@
 include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
 
 execute_process(
-  COMMAND @PYTHON_EXECUTABLE@ setup.py install @PYTHON_EXTRA_PREFIX@
+  COMMAND "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
   WORKING_DIRECTORY @libcf_source@
   RESULT_VARIABLE res)
 
diff --git a/CMake/cdat_modules_extra/libcf_make_step.cmake.in b/CMake/cdat_modules_extra/libcf_make_step.cmake.in
@@ -2,7 +2,7 @@
 include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
 
 execute_process(
-  COMMAND @PYTHON_EXECUTABLE@ setup.py build
+  COMMAND "@PYTHON_EXECUTABLE@" setup.py build
   WORKING_DIRECTORY @libcf_source@
   OUTPUT_VARIABLE CDAT_OUT
   ERROR_VARIABLE CDAT_ERR
diff --git a/CMake/cdat_modules_extra/matplotlib_build_step.cmake.in b/CMake/cdat_modules_extra/matplotlib_build_step.cmake.in
@@ -1,6 +1,6 @@
 include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
 
 execute_process(
-  COMMAND @PYTHON_EXECUTABLE@ setup.py install @PYTHON_EXTRA_PREFIX@
+  COMMAND "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
   WORKING_DIRECTORY "@matplotlib_source_dir@"
 )
diff --git a/CMake/cdat_modules_extra/paraview_download.sh.in b/CMake/cdat_modules_extra/paraview_download.sh.in
@@ -2,12 +2,10 @@
 
 cd @CMAKE_CURRENT_BINARY_DIR@/build/
 
-@GIT_EXECUTABLE@ clone @PARAVIEW_SOURCE@
+"@GIT_EXECUTABLE@" clone @PARAVIEW_SOURCE@
 cd ParaView
-@GIT_EXECUTABLE@ checkout @paraview_branch@ 
-
-
-@GIT_EXECUTABLE@ submodule init
+"@GIT_EXECUTABLE@" checkout @paraview_branch@
+"@GIT_EXECUTABLE@" submodule init
 
 SUBMODULES=`git submodule status | sed 's/.* //' | sed ':a;N;$!ba;s/\n/ /g'`
 
@@ -18,4 +16,4 @@ do
   git config "submodule.$SUBMODULE.url" $tmp
 done
 
-@GIT_EXECUTABLE@ submodule update --recursive
+"@GIT_EXECUTABLE@" submodule update --recursive
diff --git a/CMake/cdat_modules_extra/paraview_install_python_module.cmake.in b/CMake/cdat_modules_extra/paraview_install_python_module.cmake.in
@@ -12,7 +12,7 @@ set(ENV{CXXFLAGS} "-I@cdat_EXTERNALS@/include @cdat_osx_cxxflags@")
 set(ENV{EXTERNALS} "@cdat_EXTERNALS@")
 
 execute_process(
-  COMMAND env PYTHONPATH=@PYTHONPATH@ @PYTHON_EXECUTABLE@ setup.py install @PYTHON_EXTRA_PREFIX@
+  COMMAND env PYTHONPATH=@PYTHONPATH@ "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
   WORKING_DIRECTORY @ParaView_binary@/Utilities/VTKPythonWrapping
   RESULT_VARIABLE res)
 
diff --git a/CMake/cdat_modules_extra/pmw_install_step.cmake.in b/CMake/cdat_modules_extra/pmw_install_step.cmake.in
@@ -2,7 +2,7 @@
 include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
 
 execute_process(
-  COMMAND @PYTHON_EXECUTABLE@ setup.py install @PYTHON_EXTRA_PREFIX@
+  COMMAND "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
   WORKING_DIRECTORY @Pmw_source@/src
   RESULT_VARIABLE res)
 
diff --git a/CMake/cdat_modules_extra/pmw_make_step.cmake.in b/CMake/cdat_modules_extra/pmw_make_step.cmake.in
@@ -2,7 +2,7 @@
 include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
 
 execute_process(
-  COMMAND @PYTHON_EXECUTABLE@ setup.py build
+  COMMAND "@PYTHON_EXECUTABLE@" setup.py build
   WORKING_DIRECTORY @Pmw_source@/src
   OUTPUT_VARIABLE CDAT_OUT
   ERROR_VARIABLE CDAT_ERR
diff --git a/CMake/cdat_modules_extra/pyopengl_install_step.cmake.in b/CMake/cdat_modules_extra/pyopengl_install_step.cmake.in
@@ -2,7 +2,7 @@
 include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
 
 execute_process(
-  COMMAND @PYTHON_EXECUTABLE@ setup.py install @PYTHON_EXTRA_PREFIX@
+  COMMAND "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
   WORKING_DIRECTORY @PyOpenGL_source@
   RESULT_VARIABLE res)
 
diff --git a/CMake/cdat_modules_extra/pyopengl_make_step.cmake.in b/CMake/cdat_modules_extra/pyopengl_make_step.cmake.in
@@ -2,7 +2,7 @@
 include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
 
 execute_process(
-  COMMAND @PYTHON_EXECUTABLE@ setup.py build
+  COMMAND "@PYTHON_EXECUTABLE@" setup.py build
   WORKING_DIRECTORY @PyOpenGL_source@
   RESULT_VARIABLE res)
 
diff --git a/CMake/cdat_modules_extra/runpytest.in b/CMake/cdat_modules_extra/runpytest.in
@@ -10,7 +10,7 @@
 . @CMAKE_INSTALL_PREFIX@/bin/setup_runtime.sh
 
 # play back the requested vistrail and make an image
-@PYTHON_EXECUTABLE@ \
+"@PYTHON_EXECUTABLE@" \
   @CMAKE_INSTALL_PREFIX@/vistrails/vistrails/uvcdat.py \
  -R \
  -S $1\
@@ -19,7 +19,7 @@
  -e @CMAKE_BINARY_DIR@/Testing/Temporary
 
 # compare that image with the baseline(s) for it
-@PYTHON_EXECUTABLE@ \
+"@PYTHON_EXECUTABLE@" \
  @cdat_SOURCE_DIR@/testing/checkimage.py \
  @CMAKE_BINARY_DIR@/Testing/Temporary/$4 \
  $5/$4 \
diff --git a/CMake/cdat_modules_extra/setuptools_install_step.cmake.in b/CMake/cdat_modules_extra/setuptools_install_step.cmake.in
@@ -2,7 +2,7 @@
 include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
 
 execute_process(
-  COMMAND env PYTHONPATH=@PYTHONPATH@ LD_LIBRARY_PATH=@LD_LIBRARY_PATH@ @PYTHON_EXECUTABLE@ setup.py install @PYTHON_EXTRA_PREFIX@
+  COMMAND env PYTHONPATH=@PYTHONPATH@ LD_LIBRARY_PATH=@LD_LIBRARY_PATH@ "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
   WORKING_DIRECTORY @setuptools_source@
   RESULT_VARIABLE res)
 
diff --git a/CMake/cdat_modules_extra/setuptools_make_step.cmake.in b/CMake/cdat_modules_extra/setuptools_make_step.cmake.in
@@ -2,7 +2,7 @@
 include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
 
 execute_process(
-  COMMAND env PYTHONPATH=@PYTHONPATH@ LD_LIBRARY_PATH=@LD_LIBRARY_PATH@ @PYTHON_EXECUTABLE@ setup.py build
+  COMMAND env PYTHONPATH=@PYTHONPATH@ LD_LIBRARY_PATH=@LD_LIBRARY_PATH@ "@PYTHON_EXECUTABLE@" setup.py build
   WORKING_DIRECTORY @setuptools_source@
   RESULT_VARIABLE res)
 
diff --git a/CMake/cdat_modules_extra/vtk_install_python_module.cmake.in b/CMake/cdat_modules_extra/vtk_install_python_module.cmake.in
@@ -12,7 +12,7 @@ set(ENV{CXXFLAGS} "@cdat_osx_cxxflags@ -I@cdat_EXTERNALS@/include -I@cdat_EXTERN
 set(ENV{EXTERNALS} "@cdat_EXTERNALS@")
 
 execute_process(
-  COMMAND env PYTHONPATH=@PYTHONPATH@ @PYTHON_EXECUTABLE@ setup.py install @PYTHON_EXTRA_PREFIX@
+  COMMAND env PYTHONPATH=@PYTHONPATH@ "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@
   WORKING_DIRECTORY @cdat_BINARY_DIR@/build/ParaView-build/VTK/Wrapping/Python
   RESULT_VARIABLE res)
 
@@ -24,7 +24,7 @@ endif()
 if (APPLE)
  message("We are on a Mac, need to relink all libraries")
  execute_process(
-  COMMAND env PYTHONPATH=@PYTHONPATH@ @PYTHON_EXECUTABLE@ @cdat_CMAKE_SOURCE_DIR@/fixlink.py
+  COMMAND env PYTHONPATH=@PYTHONPATH@ "@PYTHON_EXECUTABLE@" @cdat_CMAKE_SOURCE_DIR@/fixlink.py
   WORKING_DIRECTORY @cdat_BINARY_DIR@
   OUTPUT_VARIABLE out
   ERROR_VARIABLE err
diff --git a/CMake/cmake_modules/CDATLogger.cmake.in b/CMake/cmake_modules/CDATLogger.cmake.in
@@ -1,5 +1,5 @@
 execute_process(
-  COMMAND @GIT_EXECUTABLE@ log -n 1 --pretty=format:%H
+  COMMAND "@GIT_EXECUTABLE@" log -n 1 --pretty=format:%H
   WORKING_DIRECTORY @cdat_SOURCE_DIR@
   OUTPUT_VARIABLE git_log_output
   OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -9,7 +9,7 @@ include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
 
 
 execute_process(
-  COMMAND @PYTHON_EXECUTABLE@ -c "import cdat_info;cdat_info.pingPCMDIdb('CMAKE','install','${git_log_output}')"
+  COMMAND "@PYTHON_EXECUTABLE@" -c "import cdat_info;cdat_info.pingPCMDIdb('CMAKE','install','${git_log_output}')"
   WORKING_DIRECTORY "${WORKING_DIR}"
   RESULT_VARIABLE res)
 
diff --git a/CMake/cmake_modules/FindGdal.cmake b/CMake/cmake_modules/FindGdal.cmake
@@ -4,7 +4,7 @@ if ( NOT ${res} EQUAL 0 )
  message("Could not detect osgeo, ${PYTHON_EXECUTABLE}")
  set( Gdal_FOUND 0 )
 else ( NOT ${res} EQUAL 0 )
- execute_process(COMMAND @PYTHON_EXECUTABLE@ -c "import osgeo;print osgeo.__version__" RESULT_VARIABLE res OUTPUT_VARIABLE out ERROR_VARIABLE err)
+ execute_process(COMMAND "@PYTHON_EXECUTABLE@" -c "import osgeo;print osgeo.__version__" RESULT_VARIABLE res OUTPUT_VARIABLE out ERROR_VARIABLE err)
  if ( ${out} VERSION_LESS ${GDAL_MAJOR_MIN}.${GDAL_MINOR_MIN} )
    message("You need GDAL version ${GDAL_MAJOR_MIN}.${GDAL_MINOR_MIN} at minimum")
    set( Gdal_FOUND 0 )
diff --git a/CMake/cmake_modules/FindMatplotlib.cmake b/CMake/cmake_modules/FindMatplotlib.cmake
@@ -4,7 +4,7 @@ if ( NOT ${res} EQUAL 0 )
  message("Could not detect matplotlib, ${PYTHON_EXECUTABLE}")
  set( Matplotlib_FOUND 0 )
 else ( NOT ${res} EQUAL 0 )
- execute_process(COMMAND @PYTHON_EXECUTABLE@ -c "import matplotlib;print matplotlib.__version__" RESULT_VARIABLE res OUTPUT_VARIABLE out ERROR_VARIABLE err)
+ execute_process(COMMAND "@PYTHON_EXECUTABLE@" -c "import matplotlib;print matplotlib.__version__" RESULT_VARIABLE res OUTPUT_VARIABLE out ERROR_VARIABLE err)
  if ( ${out} VERSION_LESS ${MATPLOTLIB_MAJOR_MIN}.${MATPLOTLIB_MINOR_MIN}.${MATPLOTLIB_PATCH_MIN} )
    message("You need matplotlib version ${MATPLOTLIB_MAJOR_MIN}.${MATPLOTLIB_MINOR_MIN}.${MATPLOTLIB_PATCH_MIN} at minimum")
    set( Matplotlib_FOUND 0 )
diff --git a/CMake/cmake_modules/FindMpi4py.cmake b/CMake/cmake_modules/FindMpi4py.cmake
@@ -4,7 +4,7 @@ if ( NOT ${res} EQUAL 0 )
  message("[INFO] Could not system mpi4py, ${PYTHON_EXECUTABLE}")
  set( Mpi4py_FOUND 0 )
 else ( NOT ${res} EQUAL 0 )
- execute_process(COMMAND @PYTHON_EXECUTABLE@ -c "import mpi4py;print mpi4py.__version__" RESULT_VARIABLE res OUTPUT_VARIABLE out ERROR_VARIABLE err)
+ execute_process(COMMAND "@PYTHON_EXECUTABLE@" -c "import mpi4py;print mpi4py.__version__" RESULT_VARIABLE res OUTPUT_VARIABLE out ERROR_VARIABLE err)
  if ( ${out} VERSION_LESS ${MPI4PY_MAJOR_MIN}.${MPI4PY_MINOR_MIN} )
    message("You need mpi4py version ${MPI4PY_MAJOR_MIN}.${MPI4PY_MINOR_MIN} at minimum")
    set( Mpi4py_FOUND 0 )
diff --git a/CMake/cmake_modules/FindShapely.cmake b/CMake/cmake_modules/FindShapely.cmake
@@ -4,7 +4,7 @@ if ( NOT ${res} EQUAL 0 )
  message("Could not detect shapely, ${PYTHON_EXECUTABLE}")
  set( Shapely_FOUND 0 )
 else ( NOT ${res} EQUAL 0 )
- execute_process(COMMAND @PYTHON_EXECUTABLE@ -c "import shapely;print shapely.__version__" RESULT_VARIABLE res OUTPUT_VARIABLE out ERROR_VARIABLE err)
+ execute_process(COMMAND "@PYTHON_EXECUTABLE@" -c "import shapely;print shapely.__version__" RESULT_VARIABLE res OUTPUT_VARIABLE out ERROR_VARIABLE err)
  if ( ${out} VERSION_LESS ${SHAPELY_MAJOR_MIN}.${SHAPELY_MINOR_MIN} )
    message("You need shapely version ${SHAPELY_MAJOR_MIN}.${SHAPELY_MINOR_MIN} at minimum")
    set( Shapely_FOUND 0 )
diff --git a/CMake/python_patch_step.cmake.in b/CMake/python_patch_step.cmake.in
@@ -1,6 +1,6 @@
 execute_process(
   COMMAND
-  @CMAKE_COMMAND@ -E copy_if_different @cdat_SOURCE_DIR@/pysrc/src/setup-@PYTHON_VERSION@.py @python_SOURCE_DIR@/setup.py
+  "@CMAKE_COMMAND@" -E copy_if_different @cdat_SOURCE_DIR@/pysrc/src/setup-@PYTHON_VERSION@.py @python_SOURCE_DIR@/setup.py
 )
 
 # Refer: http://bugs.python.org/issue14572

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)`
`2`	`2`
`3`	`3`	`execute_process(`
`4`		`- COMMAND @PYTHON_EXECUTABLE@ setup.py install @PYTHON_EXTRA_PREFIX@`
	`4`	`+ COMMAND "@PYTHON_EXECUTABLE@" setup.py install @PYTHON_EXTRA_PREFIX@`
`5`	`5`	`WORKING_DIRECTORY "@matplotlib_source_dir@"`
`6`	`6`	`)`