diff --git a/.gitignore b/.gitignore index 8d77d400a3a339340216115f58f6cdf2a111f807..e5aec11937aaca6bf9c276382e02ed40798c87ab 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ test-reports/ coverage.xml .project .pydevproject +user_makefile diff --git a/Makefile b/Makefile index 7684d5c9996e2de04cf6daedfbdd77fc57b802df..4522ca3dc8dbd2bcac8d2dabaed59930c663df14 100644 --- a/Makefile +++ b/Makefile @@ -12,12 +12,17 @@ COVER_PACKAGES=hbp_nrp_music_xml hbp_nrp_music_interface ##### DO NOT MODIFY BELOW ##################### -CI_REPO?=ssh://bbpcode.epfl.ch/platform/ContinuousIntegration.git -CI_DIR?=ContinuousIntegration +ifeq ($(NRP_INSTALL_MODE),user) + include user_makefile +else + CI_REPO?=ssh://bbpcode.epfl.ch/platform/ContinuousIntegration.git + CI_DIR?=ContinuousIntegration -FETCH_CI := $(shell \ - if [ ! -d $(CI_DIR) ]; then \ - git clone $(CI_REPO) $(CI_DIR) > /dev/null ;\ - fi;\ - echo $(CI_DIR) ) -include $(FETCH_CI)/python/common_makefile + FETCH_CI := $(shell \ + if [ ! -d $(CI_DIR) ]; then \ + git clone $(CI_REPO) $(CI_DIR) > /dev/null ;\ + fi;\ + echo $(CI_DIR) ) + + include $(FETCH_CI)/python/common_makefile +endif diff --git a/hbp_nrp_music_interface/requirements.txt b/hbp_nrp_music_interface/requirements.txt index e4e1136226e558ad445b598339d50f6b47cc7429..b915898e0b74e4a64860e04e9121683842e66ebe 100644 --- a/hbp_nrp_music_interface/requirements.txt +++ b/hbp_nrp_music_interface/requirements.txt @@ -1,6 +1 @@ -# HBP requirements -hbp-nrp-cle==1.2.0 -hbp-nrp-commons==1.2.0 -hbp-nrp-music-xml==1.2.0 - # third party requirements