From dce3d0c496d1674b64230486b70693d9f99ab149 Mon Sep 17 00:00:00 2001
From: Axel von Arnim <axel.vonarnim@fortiss.org>
Date: Tue, 20 Jun 2017 13:41:23 +0200
Subject: [PATCH] [NRRPLT-5052] Install from bitbucket without EPFL VPN

Change-Id: Ie85485b9e5d42a0b66b8b73c8e0be71b2eb98e89
---
 .gitignore                               |  1 +
 Makefile                                 | 21 +++++++++++++--------
 hbp_nrp_music_interface/requirements.txt |  5 -----
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8d77d40..e5aec11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ test-reports/
 coverage.xml
 .project
 .pydevproject
+user_makefile
diff --git a/Makefile b/Makefile
index 7684d5c..4522ca3 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 e4e1136..b915898 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
-- 
GitLab