Merge pull request #46 from lnls-fac/improve-install

Improve installation

Author: anacso17

Makefile

@@ -64,9 +64,15 @@ AUXFILES  = VERSION
 
 LIBS = -lgsl -lgslcblas -lpthread -lm
 INC  = -I./include
-BINDEST_DIR = /usr/local/bin
-LIBDEST_DIR = /usr/local/lib
-INCDEST_DIR = /usr/local/include
+
+ifeq ($(CONDA_PREFIX),)
+    PREFIX = /usr/local
+else
+    PREFIX = $(CONDA_PREFIX)
+endif
+BINDEST_DIR = $(PREFIX)/bin
+LIBDEST_DIR = $(PREFIX)/lib
+INCDEST_DIR = $(PREFIX)/include
 
 OBJDIR = build
 SRCDIR = src
@@ -127,17 +133,31 @@ $(BINOBJECTS): | $(OBJDIR)
 $(OBJDIR):
 	mkdir $(OBJDIR)
 
-install: uninstall all
+install-cpp: uninstall-cpp all
 	cp $(OBJDIR)/trackcpp $(BINDEST_DIR)
 	cp $(OBJDIR)/libtrackcpp.a $(LIBDEST_DIR)
 	cp -r $(INCDIR)/trackcpp $(INCDEST_DIR)
+
+uninstall-cpp:
+	-rm -rf $(BINDEST_DIR)/trackcpp
+	-rm -rf $(LIBDEST_DIR)/libtrackcpp.a
+	-rm -rf $(INCDEST_DIR)/trackcpp
+
+install-py: uninstall-py
 	$(MAKE) install -C $(PYTHON_PACKAGE_DIR)
 
-develop: uninstall all
-	ln -srf $(OBJDIR)/trackcpp $(BINDEST_DIR)
-	ln -srf $(OBJDIR)/libtrackcpp.a $(LIBDEST_DIR)
-	ln -srf $(INCDIR)/trackcpp $(INCDEST_DIR)
-	$(MAKE) develop -C $(PYTHON_PACKAGE_DIR)
+uninstall-py:
+	$(MAKE) uninstall -C $(PYTHON_PACKAGE_DIR)
+
+install: install-cpp install-py
+
+uninstall: uninstall-cpp uninstall-py
+
+develop-install-py: develop-uninstall-py all
+	$(MAKE) develop-install -C $(PYTHON_PACKAGE_DIR)
+
+develop-uninstall-py:
+	$(MAKE) develop-uninstall -C $(PYTHON_PACKAGE_DIR)
 
 $(BINDEST_DIR):
 	mkdir $(BINDEST_DIR)
@@ -152,11 +172,6 @@ clean:
 	-rm -rf $(OBJDIR) trackcpp trackcpp-debug .depend *.out *.dat *~ *.o *.a
 	$(MAKE) clean -C $(PYTHON_PACKAGE_DIR)
 
-uninstall:
-	-rm -rf $(BINDEST_DIR)/trackcpp
-	-rm -rf $(LIBDEST_DIR)/libtrackcpp.a
-	-rm -rf $(INCDEST_DIR)/trackcpp
-
 cleanall: clean
 	cd tracking_mp; make clean;
 

VERSION

@@ -0,0 +1 @@
+python_package/trackcpp/VERSION

VERSION

@@ -2,24 +2,32 @@
 #### COMPILATION OPTIONS ####
 C = gcc
 CXX = g++
-SWIG = swig3.0
+SWIG = swig
 MACHINE = -m64
 OPT_FLAG = -O3
 SOURCES_I =     trackcpp.i
 WRAPPEROBJS =   trackcpp_wrap.o
 INTERFACEOBJS = interface.o
 TRACKCPPLIB = ../build/libtrackcpp.a
-PYTHON_INCLUDES := $(shell python-sirius-config --includes)
-NUMPY_INCLUDE := -I$(shell python-sirius -c "import numpy; print(numpy.get_include())")
-NUMPY_VERSION := $(shell python-sirius -c "import numpy; print(numpy.__version__)")
+PACKAGE = trackcpp
+PREFIX =
+PIP = pip
+PYTHON = python3
+ifeq ($(CONDA_PREFIX),)
+	PREFIX = sudo -H
+	PIP = pip-sirius
+	PYTHON = python-sirius
+endif
+
+PYTHON_INCLUDES := $(shell $(PYTHON)-config --includes)
+NUMPY_INCLUDE := -I$(shell $(PYTHON) -c "import numpy; print(numpy.get_include())")
+NUMPY_VERSION := $(shell $(PYTHON) -c "import numpy; print(numpy.__version__)")
 
 OBJECTS = $(WRAPPEROBJS) $(INTERFACEOBJS)
 
 CPPFLAGS = -std=c++11 -fPIC $(OPT_FLAG)
 LIBS = -lgsl -lblas -L../build -ltrackcpp
 INC = -I../include $(PYTHON_INCLUDES) $(NUMPY_INCLUDE)
-PYTHON = python-sirius
-SETUPARGS =
 
 INTERFACESRCS = $(INTERFACEOBJS:.o=.cpp)
 INTERFACEHDRS = $(INTERFACEOBJS:.o=.h)
@@ -39,11 +47,19 @@ trackcpp_wrap.cxx: $(SOURCES_I) $(INTERFACESRCS) $(INTERFACEHDRS)
 	wget https://raw.githubusercontent.com/numpy/numpy/v$(NUMPY_VERSION)/tools/swig/numpy.i
 	$(SWIG) -c++ -python $(INC) trackcpp.i && cp -f trackcpp.py trackcpp
 
-install: all
-	$(PYTHON) setup.py install $(SETUPARGS)
+install: uninstall all
+	$(PREFIX) $(PIP) install --no-deps ./
+
+uninstall:
+	$(PREFIX) $(PIP) uninstall -y $(PACKAGE)
+
+develop-install: develop-uninstall all
+	$(PIP) install --no-deps -e ./
 
-develop: all
-	$(PYTHON) setup.py develop $(SETUPARGS)
+# known issue: It will fail to uninstall scripts
+#  if they were installed in develop mode
+develop-uninstall:
+	$(PIP) uninstall -y $(PACKAGE)
 
 clean:
 	-rm -rf *.o trackcpp/*.so *_wrap.cxx trackcpp/__pycache__ trackcpp/trackcpp.py build dist trackcpp.egg-info

python_package/Makefile

@@ -0,0 +1 @@
+4.5.0