diff --git a/CMakeLists.txt b/CMakeLists.txt index f3b7d54d827c443dd939173979ca7f1928efef1d..78f590d61eb3eaa7e70fb142d6f2b8374efc3585 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,21 +41,22 @@ add_custom_command( OUTPUT ${OUTPUT_MOOSEBIN} ) # Now build moose-gui and moose-examples. +# Make sure each script is compilable. Else report an error. add_custom_target( gui ALL - COMMAND ${CMAKE_COMMAND} -E copy_directory - ${MOOSE_GUI_DIR} ${MOOSE_GUI_INSTALL_DIR} + COMMAND ${CMAKE_COMMAND} -E copy_directory ${MOOSE_GUI_DIR} ${MOOSE_GUI_INSTALL_DIR} + COMMAND ${PYTHON_EXECUTABLE} -m compileall -q ${MOOSE_GUI_INSTALL_DIR} COMMENT "Building moose-gui" VERBATIM ) -# Now copy moose-examples. -add_custom_command( TARGET gui POST_BUILD - COMAMND ${CMAKE_COMMAND} -E copy_directory - ${MOOSE_EXAMPLE_DIR} ${MOOSE_EXAMPLE_INSTALL_DIR} +add_custom_target( examples ALL + COMMAND ${CMAKE_COMMAND} -E copy_directory ${MOOSE_EXAMPLE_DIR} ${MOOSE_EXAMPLE_INSTALL_DIR} + COMMAND ${PYTHON_EXECUTABLE} -m compileall -q ${MOOSE_EXAMPLE_INSTALL_DIR} VERBATIM ) -add_dependencies(moose moose-core gui) +add_dependencies(moose moose-core gui examples) +add_dependencies(examples gui) ## moose-gui @@ -65,11 +66,13 @@ set(MOOSE_GUI_DIR ${CMAKE_SOURCE_DIR}/moose-gui) install(DIRECTORY ${PYMOOSE_INSTALL_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX} PATTERN ".git" EXCLUDE + PATTERN "*.pyc" EXCLUDE ) install(DIRECTORY ${MOOSE_GUI_INSTALL_DIR}/ DESTINATION lib/moose/gui PATTERN ".git*" EXCLUDE + PATTERN "*.pyc" EXCLUDE ) install(DIRECTORY ${MOOSE_EXAMPLE_DIR}/ @@ -77,6 +80,7 @@ install(DIRECTORY ${MOOSE_EXAMPLE_DIR}/ PATTERN ".git*" EXCLUDE PATTERN "_travis*" EXCLUDE PATTERN ".travis*" EXCLUDE + PATTERN "*.pyc" EXCLUDE ) configure_file( ${CMAKE_SOURCE_DIR}/cmake/moose.in ${CMAKE_BINARY_DIR}/moose ) diff --git a/moose-core/VERSION b/moose-core/VERSION index 50e47c89cafc3ec95774b3110a3dba45256d0b24..11e8934cc31397c9d5ecb572fd9669c161ea8b2e 100644 --- a/moose-core/VERSION +++ b/moose-core/VERSION @@ -1 +1 @@ -3.1.1 \ No newline at end of file +3.1.1-71-g67012a1 \ No newline at end of file diff --git a/moose-examples/paper-2015/Fig6_NetMultiscale/Fig6BCDE.py b/moose-examples/paper-2015/Fig6_NetMultiscale/Fig6BCDE.py index 8211d73da0faa01c797626359164b32a61366488..82a9ece3a68a9665c0615a17480a06df9ce8a35b 100644 --- a/moose-examples/paper-2015/Fig6_NetMultiscale/Fig6BCDE.py +++ b/moose-examples/paper-2015/Fig6_NetMultiscale/Fig6BCDE.py @@ -1,3 +1,4 @@ +from __future__ import print_function #/********************************************************************** #** This program is part of 'MOOSE', the @@ -33,11 +34,9 @@ from PyQt4 import Qt, QtCore, QtGui from numpy import random as nprand from moose.neuroml.NeuroML import NeuroML import sys -sys.path.append( "/home/bhalla/moose/trunk/Demos/util" ) import rdesigneur as rd import moogli cellname = "./cells_channels/CA1_nochans.morph.xml" -#cellname = "./ca1_minimal.p" fname = "fig6bcde" #############################################