afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

removed pip check, updated make files for using DESTDIR, removed usage of pip during make install

Browse source
This commit is contained in:
Blake J. Harnden 2017-08-21 12:55:51 -07:00
parent 3324735a28
commit f61c07c108
5 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.editorconfig
View file

@ -11,3 +11,7 @@ insert_final_newline = true
[*.py] [*.py]
indent_style = space indent_style = space
indent_size = 4 indent_size = 4
[*.am]
indent_style = tab
indent_size = 4

5
configure.ac
View file

@ -147,11 +147,6 @@ if test "x$enable_daemon" = "xyes" ; then
AC_CHECK_PROG(ovs_of_path, ovs-ofctl, $as_dir, no, $SEARCHPATH) AC_CHECK_PROG(ovs_of_path, ovs-ofctl, $as_dir, no, $SEARCHPATH)
fi fi
AC_CHECK_PROG(pip_installed, pip, yes, no, $SEARCHPATH)
if test "x$pip_installed" = "xno" ; then
AC_MSG_ERROR([Could not locate pip. Please install python-pip.])
fi
#AC_CHECK_PROG(dia, dia, yes, no) #AC_CHECK_PROG(dia, dia, yes, no)
AC_CHECK_PROG(help2man, help2man, yes, no, $SEARCHPATH) AC_CHECK_PROG(help2man, help2man, yes, no, $SEARCHPATH)
if test "x$convert" = "xno" ; then if test "x$convert" = "xno" ; then

9
daemon/Makefile.am
View file

@ -85,7 +85,12 @@ build:
# Python package install # Python package install
install-exec-hook: install-exec-hook:
pip install . $(MKDIR_P) ${DESTDIR}/${pythondir}
$(MKDIR_P) ${DESTDIR}/${pyexecdir}
PYTHONPATH=${DESTDIR}/${pythondir} $(PYTHON) $(SETUPPY) $(SETUPPYFLAGS) install \
--prefix=${DESTDIR}/${pyprefix} \
--install-purelib=${DESTDIR}/${pythondir} \
--install-platlib=${DESTDIR}/${pyexecdir}
install-data-local: install-data-local:
$(MKDIR_P) $(DESTDIR)$(LOGROTATE_DIR) $(MKDIR_P) $(DESTDIR)$(LOGROTATE_DIR)
@ -97,7 +102,7 @@ uninstall-local:
# Python package uninstall # Python package uninstall
uninstall-hook: uninstall-hook:
yes | pip uninstall core-python rm -rf ${pythondir}/core_python-${COREDPY_VERSION}-py${PYTHON_VERSION}.egg-info
rm -f ${pythondir}/core_python_netns-1.0-py${PYTHON_VERSION}.egg-info rm -f ${pythondir}/core_python_netns-1.0-py${PYTHON_VERSION}.egg-info
rm -rf ${pythondir}/core rm -rf ${pythondir}/core
rmdir -p $(coreexservicesdir) || true rmdir -p $(coreexservicesdir) || true

8
daemon/ns3/Makefile.am
View file

@ -26,7 +26,13 @@ build:
# Python package install # Python package install
install-exec-hook: install-exec-hook:
$(PYTHON) $(SETUPPY) $(SETUPPYFLAGS) install --prefix=${DESTDIR}/${pyprefix} --install-purelib=${DESTDIR}/${pythondir} --install-platlib=${DESTDIR}/${pyexecdir} --no-compile $(MKDIR_P) ${DESTDIR}/${pythondir}
$(MKDIR_P) ${DESTDIR}/${pyexecdir}
PYTHONPATH=${DESTDIR}/${pythondir} $(PYTHON) $(SETUPPY) $(SETUPPYFLAGS) install \
--prefix=${DESTDIR}/${pyprefix} \
--install-purelib=${DESTDIR}/${pythondir} \
--install-platlib=${DESTDIR}/${pyexecdir} \
--no-compile
# Python package uninstall # Python package uninstall
uninstall-hook: uninstall-hook:

11
daemon/src/Makefile.am
View file

@ -8,6 +8,8 @@
# #
AM_CFLAGS = -Wall -fno-strict-aliasing -O3 -g @libev_CFLAGS@ AM_CFLAGS = -Wall -fno-strict-aliasing -O3 -g @libev_CFLAGS@
SETUPPY = setup.py
SETUPPYFLAGS = -v
# -DDEBUG # -DDEBUG
SRC_COMMON = vnode_msg.c vnode_cmd.c vnode_chnl.c vnode_io.c \ SRC_COMMON = vnode_msg.c vnode_cmd.c vnode_chnl.c vnode_io.c \
@ -36,8 +38,13 @@ libnetns.a:
# Python libraries install # Python libraries install
install-exec-local: install-exec-local:
SBINDIR=${DESTDIR}/@SBINDIR@ $(PYTHON) setup.py install --prefix=${DESTDIR}/${pyprefix} --install-purelib=${DESTDIR}/${pythondir} --install-platlib=${DESTDIR}/${pyexecdir} --no-compile $(MKDIR_P) ${DESTDIR}/${pythondir}
#python setup.py install --prefix=${DESTDIR}${PYTHON_PREFIX} $(MKDIR_P) ${DESTDIR}/${pyexecdir}
SBINDIR=${DESTDIR}/@SBINDIR@ PYTHONPATH=${DESTDIR}/${pythondir} $(PYTHON) $(SETUPPY) $(SETUPPYFLAGS) install \
--prefix=${DESTDIR}/${pyprefix} \
--install-purelib=${DESTDIR}/${pythondir} \
--install-platlib=${DESTDIR}/${pyexecdir} \
--no-compile
# Python libraries uninstall # Python libraries uninstall
uninstall-hook: uninstall-hook: