Merge branch 'beta' of github.com:ggarra13/mrv2 into beta

cmake/documentation.cmake

@@ -18,6 +18,8 @@ endif()
 set(DOCUMENTATION_TARGETS )
 set(CLEAN_DOC_TARGETS )
 
+
+
 foreach( LANGUAGE ${LANGUAGES} )
 
     #
@@ -37,7 +39,6 @@ foreach( LANGUAGE ${LANGUAGES} )
     #
     # Replace variables in document.py script
     #
-
     set(DOCUMENT_IN  ${SPHINX_DIR}/document.py.in)
     set(DOCUMENT_OUT ${CMAKE_INSTALL_PREFIX}/sphinx/${LANGUAGE}/document.py)
 
@@ -53,23 +54,24 @@ foreach( LANGUAGE ${LANGUAGES} )
         OWNER_READ OWNER_WRITE OWNER_EXECUTE
         GROUP_READ GROUP_EXECUTE
         WORLD_READ WORLD_EXECUTE)
-
-    set(DOC_TARGET doc_${LANGUAGE} )
-    list( APPEND DOCUMENTATION_TARGETS ${DOC_TARGET} )
 
-    set(CLEAN_DOC_TARGET clean_doc_dir_${LANGUAGE})
-    add_custom_target(${CLEAN_DOC_TARGET}
-	COMMAND ${CMAKE_COMMAND} -E remove_directory
-	${ROOT_DIR}/mrv2/docs/${LANGUAGE}
+    if (MRV2_PYBIND11)
+	set(DOC_TARGET doc_${LANGUAGE} )
+	list(APPEND DOCUMENTATION_TARGETS ${DOC_TARGET} )
+
+	set(CLEAN_DOC_TARGET clean_doc_dir_${LANGUAGE})
+	add_custom_target(${CLEAN_DOC_TARGET}
+	    COMMAND ${CMAKE_COMMAND} -E remove_directory
+	    ${ROOT_DIR}/mrv2/docs/${LANGUAGE}
 	)
-    list( APPEND CLEAN_DOC_TARGETS ${CLEAN_DOC_TARGET} )
+	list( APPEND CLEAN_DOC_TARGETS ${CLEAN_DOC_TARGET} )
 
-    add_custom_target( ${DOC_TARGET}
-	COMMAND ${CMAKE_COMMAND} -E env LANGUAGE=${LANGUAGE} LANG=en_US.UTF-8 LANGUAGE_CODE=${LANGUAGE} ${CMAKE_INSTALL_PREFIX}/bin/${MRV2_COMMAND} -pythonScript ${CMAKE_INSTALL_PREFIX}/sphinx/${LANGUAGE}/document.py
-	COMMAND ${CMAKE_COMMAND} -E echo "Documented ${LANGUAGE} language."
-	DEPENDS ${DOCUMENT_OUT} ${CONFFILE_OUT}
+	add_custom_target( ${DOC_TARGET}
+	    COMMAND ${CMAKE_COMMAND} -E env LANGUAGE=${LANGUAGE} LANG=en_US.UTF-8 LANGUAGE_CODE=${LANGUAGE} ${CMAKE_INSTALL_PREFIX}/bin/${MRV2_COMMAND} -pythonScript ${CMAKE_INSTALL_PREFIX}/sphinx/${LANGUAGE}/document.py
+	    COMMAND ${CMAKE_COMMAND} -E echo "Documented ${LANGUAGE} language."
+	    DEPENDS ${DOCUMENT_OUT} ${CONFFILE_OUT}
 	)
-
+    endif()
 endforeach()
 
 add_custom_target( clean_doc

cmake/prepackage.cmake

@@ -99,8 +99,10 @@ if(UNIX)
     #
     # Grab the last version, in case there are several
     #
-    list(GET MRV2_PYTHON_LIB_DIRS -1 MRV2_PYTHON_LIB_DIR)
-
+    set(MRV2_PYTHON_LIBDIR "")
+    if (MRV2_PYTHON_LIB_DIR STREQUAL "")
+	list(GET MRV2_PYTHON_LIB_DIRS -1 MRV2_PYTHON_LIB_DIR)
+    endif()
 
     set(MRV2_PYTHON_SITE_PACKAGES_DIR "${MRV2_PYTHON_LIB_DIR}/site-packages")
 

etc/functions.sh

@@ -135,7 +135,7 @@ locate_python()
 	fi
     done
 
-    if [[ "$PYTHON" == "" ]]; then
+    if [[ "$PYTHONEXE" == "" ]]; then
 	echo "No python found!!! Please install it in your PATH"
     fi
 

etc/sphinx_install.sh

@@ -9,8 +9,9 @@
 
 locate_python
 
-export PYTHONPATH=$PYTHON_SITEDIR:$PYTHON_PATH
-if [[ ! -d ${SITE_DIR}/sphinx ]]; then
-    run_cmd $PYTHON -m pip install --upgrade pip
-    run_cmd $PYTHON -m pip install --upgrade sphinx sphinx_rtd_theme requests urllib3
+if [[ "$PYTHONEXE" != "" ]]; then
+    if [[ ! -d ${SITE_DIR}/sphinx ]]; then
+	run_cmd $PYTHON -m pip install --upgrade pip
+	run_cmd $PYTHON -m pip install --upgrade sphinx sphinx_rtd_theme requests urllib3
+    fi
 fi

mrv2/docs/HISTORY.md

@@ -20,6 +20,9 @@ v1.1.7
   on view.  This helps for large files like many big USD files on disk or with
   RAW files which are also slow to load.
 - Fixed mrv2's custom file requester thumbnails being too high.
+- Made mrv2's custom file requester display the name of the files below the
+  pictures, except on WideList view.
+- Changed Music icon in custom file requester to an .svg icon.
 - Added custom RAW and several image missing formats to mrv2's custom file
   requester.
 - Started cleaning up FLU's code (mrv2 custom file requester).