Merge branch 'master' of https://github.com/BhallaLab/moose

moose-core/CMakeLists.txt

@@ -474,6 +474,7 @@ install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/moose
     DESTINATION bin
     )
 
+# This target is built by pymoose/CMakeLists.txt file.
 if(WITH_PYTHON)
     install(CODE 
         "

moose-core/VERSION

-3.1.0-120-g343cb02
\ No newline at end of file
+3.1.1-29-g7143a53
\ No newline at end of file

moose-core/pymoose/CMakeLists.txt

@@ -82,9 +82,11 @@ endif(MACOSX)
 # Make this target dependant on all python files in python folder.
 add_custom_target(copy_python_files ALL
     COMMAND ${CMAKE_COMMAND} -E copy_directory
-    ${CMAKE_SOURCE_DIR}/python
-    ${CMAKE_BINARY_DIR}/python
-    COMMENT "Copying python files to build directory"
+        ${CMAKE_SOURCE_DIR}/python ${CMAKE_BINARY_DIR}/python
+    COMMAND ${CMAKE_COMMAND} -E copy 
+        ${CMAKE_SOURCE_DIR}/VERSION ${CMAKE_BINARY_DIR}/VERSION 
+    COMMENT "Copying required python files and other files to build directory"
     VERBATIM
     )
+
 add_dependencies(_moose copy_python_files)

moose-core/python/setup.py

@@ -31,10 +31,15 @@ __status__           = "Development"
 import os
 from distutils.core import setup
 
-script_dir = os.path.dirname( os.path.abspath( __FILE__ ) )
+script_dir = os.path.dirname( os.path.abspath( __file__ ) )
 
-with open( os.path.join( script_dir, '../../VERSION'), 'r' ) as f:
-    version = f.read( )
+version = '3.1'
+try:
+    with open( os.path.join( script_dir, '..', 'VERSION'), 'r' ) as f:
+        version = f.read( )
+except Exception as e:
+    print( 'Failed to read VERSION %s' % e )
+    print( 'Using default 3.1' )
 
 try:
     import importlib.machinery