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

small tweak to building python2/3 and install.md documentation

Browse source
This commit is contained in:
Blake Harnden 2019-06-10 12:26:44 -07:00
parent fc654a31a8
commit 43627805ee
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.ac
View file

@ -110,7 +110,7 @@ if test "x$enable_daemon" = "xyes"; then
AC_CHECK_FUNCS([atexit dup2 gettimeofday memset socket strerror uname]) AC_CHECK_FUNCS([atexit dup2 gettimeofday memset socket strerror uname])
AM_PATH_PYTHON(2.7) AM_PATH_PYTHON(2.7)
AM_CONDITIONAL([PYTHON3], [test "$PYTHON" == "python3"]) AM_CONDITIONAL([PYTHON3], [test "x$PYTHON" == "xpython3"])
AC_CHECK_PROG(brctl_path, brctl, $as_dir, no, $SEARCHPATH) AC_CHECK_PROG(brctl_path, brctl, $as_dir, no, $SEARCHPATH)
if test "x$brctl_path" = "xno" ; then if test "x$brctl_path" = "xno" ; then
@ -266,7 +266,6 @@ Daemon:
Daemon path: ${bindir} Daemon path: ${bindir}
Daemon config: ${CORE_CONF_DIR} Daemon config: ${CORE_CONF_DIR}
Python: ${PYTHON} Python: ${PYTHON}
Python modules: ${pythondir}
Logs: ${CORE_STATE_DIR}/log Logs: ${CORE_STATE_DIR}/log
Startup: ${with_startup} Startup: ${with_startup}

29
docs/install.md
View file

@ -1,4 +1,3 @@
# CORE Installation # CORE Installation
* Table of Contents * Table of Contents
@ -35,7 +34,7 @@ Install Path | Description
/usr/bin/core-daemon|Daemon startup command /usr/bin/core-daemon|Daemon startup command
/usr/bin/{core-cleanup, coresendmsg, core-manage}|Misc. helper commands/scripts /usr/bin/{core-cleanup, coresendmsg, core-manage}|Misc. helper commands/scripts
/usr/lib/core|GUI files /usr/lib/core|GUI files
/usr/lib/python{2.7,3.X}/dist-packages/core|Python modules for daemon/scripts /usr/lib/python{2.7,3}/dist-packages/core|Python modules for daemon/scripts
/etc/core/|Daemon and log configuration files /etc/core/|Daemon and log configuration files
~/.core/|User-specific GUI preferences and scenario files ~/.core/|User-specific GUI preferences and scenario files
/usr/share/core/|Example scripts and scenarios /usr/share/core/|Example scripts and scenarios
@ -195,8 +194,10 @@ sudo yum -y install automake gcc python-devel libev-devel tk
```shell ```shell
./bootstrap.sh ./bootstrap.sh
# point at desired python version binary for use # for python2
PYTHON=python ./configure PYTHON=python2 ./configure
# for python3
PYTHON=python3 ./configure
make make
sudo make install sudo make install
``` ```
@ -206,12 +207,18 @@ sudo make install
Building documentation requires python-sphinx not noted above. Building documentation requires python-sphinx not noted above.
```shell ```shell
# install python sphinx # install python2 sphinx
sudo apt install python(3)-sphinx sudo apt install python-sphinx
sudo yum install python(3)-sphinx sudo yum install python-sphinx
# install python3 sphinx
sudo apt install python3-sphinx
sudo yum install python3-sphinx
./bootstrap.sh ./bootstrap.sh
./configure # for python2
PYTHON=python2 ./configure
# for python3
PYTHON=python3 ./configure
make doc make doc
``` ```
@ -222,8 +229,10 @@ Build package commands, DESTDIR is used for gui packaging only
```shell ```shell
./bootstrap.sh ./bootstrap.sh
# point at desired python version binary for use # for python2
PYTHON=python ./configure PYTHON=python2 ./configure
# for python3
PYTHON=python3 ./configure
make make
mkdir /tmp/core-build mkdir /tmp/core-build
make fpm DESTDIR=/tmp/core-build make fpm DESTDIR=/tmp/core-build