Merge branch 'master' into rel/5.0
This commit is contained in:
commit
fe0329da25
13 changed files with 17 additions and 14 deletions
|
@ -34,8 +34,11 @@ Building CORE
|
||||||
To build this software you should use:
|
To build this software you should use:
|
||||||
|
|
||||||
./bootstrap.sh
|
./bootstrap.sh
|
||||||
|
|
||||||
./configure
|
./configure
|
||||||
|
|
||||||
make
|
make
|
||||||
|
|
||||||
sudo make install
|
sudo make install
|
||||||
|
|
||||||
Note: You may need to pass the proxy settings to sudo make install:
|
Note: You may need to pass the proxy settings to sudo make install:
|
||||||
|
@ -91,7 +94,7 @@ If you have questions, comments, or trouble, please use the CORE mailing lists:
|
||||||
- `core-dev`_ for bugs, compile errors, and other development issues
|
- `core-dev`_ for bugs, compile errors, and other development issues
|
||||||
|
|
||||||
|
|
||||||
.. _core-users: https://pf.itd.nrl.navy.mil/mailman/listinfo/core-users
|
.. _core-users: https://publists.nrl.navy.mil/mailman/listinfo/core-users
|
||||||
.. _core-dev: https://pf.itd.nrl.navy.mil/mailman/listinfo/core-dev
|
.. _core-dev: https://publists.nrl.navy.mil/mailman/listinfo/core-dev
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -115,7 +115,7 @@ AC_SUBST(CORE_STATE_DIR)
|
||||||
|
|
||||||
# default compiler flags
|
# default compiler flags
|
||||||
# _GNU_SOURCE is defined to get c99 defines for lrint()
|
# _GNU_SOURCE is defined to get c99 defines for lrint()
|
||||||
CFLAGS="$CFLAGS -O3 -Werror -Wall -D_GNU_SOURCE"
|
CFLAGS="$CFLAGS -O3 -Werror -Wall -Wno-int-in-bool-context -D_GNU_SOURCE"
|
||||||
# debug flags
|
# debug flags
|
||||||
#CFLAGS="$CFLAGS -g -Werror -Wall -D_GNU_SOURCE"
|
#CFLAGS="$CFLAGS -g -Werror -Wall -D_GNU_SOURCE"
|
||||||
|
|
||||||
|
|
|
@ -25,6 +25,6 @@ remove the core-daemon.log file
|
||||||
.BR vnoded(1)
|
.BR vnoded(1)
|
||||||
.SH BUGS
|
.SH BUGS
|
||||||
Report bugs to
|
Report bugs to
|
||||||
.BI core-dev@pf.itd.nrl.navy.mil.
|
.BI core-dev@nrl.navy.mil.
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -48,5 +48,5 @@ enable debug logging; default = False
|
||||||
.BR vnoded(1)
|
.BR vnoded(1)
|
||||||
.SH BUGS
|
.SH BUGS
|
||||||
Report bugs to
|
Report bugs to
|
||||||
.BI core-dev@pf.itd.nrl.navy.mil.
|
.BI core-dev@nrl.navy.mil.
|
||||||
|
|
||||||
|
|
|
@ -40,5 +40,5 @@ With no parameters, starts the GUI in edit mode with a blank canvas.
|
||||||
.BR vnoded(1)
|
.BR vnoded(1)
|
||||||
.SH BUGS
|
.SH BUGS
|
||||||
Report bugs to
|
Report bugs to
|
||||||
.BI core-dev@pf.itd.nrl.navy.mil.
|
.BI core-dev@nrl.navy.mil.
|
||||||
|
|
||||||
|
|
|
@ -23,6 +23,6 @@ also kill the Python daemon
|
||||||
.SH BUGS
|
.SH BUGS
|
||||||
Warning! This script will remove logical volumes that match the name "/dev/vg*/c*-n*-" on all volume groups. Use with care.
|
Warning! This script will remove logical volumes that match the name "/dev/vg*/c*-n*-" on all volume groups. Use with care.
|
||||||
Report bugs to
|
Report bugs to
|
||||||
.BI core-dev@pf.itd.nrl.navy.mil.
|
.BI core-dev@nrl.navy.mil.
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -82,4 +82,4 @@ coresendmsg \-H
|
||||||
.BR vnoded(1)
|
.BR vnoded(1)
|
||||||
.SH BUGS
|
.SH BUGS
|
||||||
Report bugs to
|
Report bugs to
|
||||||
.BI core-dev@pf.itd.nrl.navy.mil.
|
.BI core-dev@nrl.navy.mil.
|
||||||
|
|
|
@ -26,5 +26,5 @@ wait for command to complete (useful for interactive commands)
|
||||||
.BR vnoded(1)
|
.BR vnoded(1)
|
||||||
.SH BUGS
|
.SH BUGS
|
||||||
Report bugs to
|
Report bugs to
|
||||||
.BI core-dev@pf.itd.nrl.navy.mil.
|
.BI core-dev@nrl.navy.mil.
|
||||||
|
|
||||||
|
|
|
@ -38,5 +38,5 @@ control channel name (e.g. '/tmp/pycore.45647/n3')
|
||||||
.BR vnoded(1),
|
.BR vnoded(1),
|
||||||
.SH BUGS
|
.SH BUGS
|
||||||
Report bugs to
|
Report bugs to
|
||||||
.BI core-dev@pf.itd.nrl.navy.mil.
|
.BI core-dev@nrl.navy.mil.
|
||||||
|
|
||||||
|
|
|
@ -40,5 +40,5 @@ establish the specified <control channel> for receiving control commands
|
||||||
.BR vcmd(1),
|
.BR vcmd(1),
|
||||||
.SH BUGS
|
.SH BUGS
|
||||||
Report bugs to
|
Report bugs to
|
||||||
.BI core-dev@pf.itd.nrl.navy.mil.
|
.BI core-dev@nrl.navy.mil.
|
||||||
|
|
||||||
|
|
|
@ -604,7 +604,7 @@ menu .menubar.help -tearoff 0
|
||||||
.menubar.help add command -label "CORE website (www)" -command \
|
.menubar.help add command -label "CORE website (www)" -command \
|
||||||
"_launchBrowser http://www.nrl.navy.mil/itd/ncs/products/core"
|
"_launchBrowser http://www.nrl.navy.mil/itd/ncs/products/core"
|
||||||
.menubar.help add command -label "Mailing list (www)" -command \
|
.menubar.help add command -label "Mailing list (www)" -command \
|
||||||
"_launchBrowser http://pf.itd.nrl.navy.mil/mailman/listinfo/core-users"
|
"_launchBrowser https://publists.nrl.navy.mil/mailman/listinfo/core-users"
|
||||||
.menubar.help add command -label "About" -command popupAbout
|
.menubar.help add command -label "About" -command popupAbout
|
||||||
|
|
||||||
#
|
#
|
||||||
|
|
|
@ -20,7 +20,7 @@ build: changelog
|
||||||
changelog: debian
|
changelog: debian
|
||||||
echo "core ($(CORE_VERSION)-1) unstable; urgency=low" > $(COREBUILD)/debian/changelog.generated
|
echo "core ($(CORE_VERSION)-1) unstable; urgency=low" > $(COREBUILD)/debian/changelog.generated
|
||||||
echo " * interim package generated from source" >> $(COREBUILD)/debian/changelog.generated
|
echo " * interim package generated from source" >> $(COREBUILD)/debian/changelog.generated
|
||||||
echo " -- CORE Developers <core-dev@pf.itd.nrl.navy.mil> $$(date -R)" >> $(COREBUILD)/debian/changelog.generated
|
echo " -- CORE Developers <core-dev@nrl.navy.mil> $$(date -R)" >> $(COREBUILD)/debian/changelog.generated
|
||||||
cd $(COREBUILD)/debian && \
|
cd $(COREBUILD)/debian && \
|
||||||
{ test ! -L changelog && mv -f changelog changelog.save; } && \
|
{ test ! -L changelog && mv -f changelog changelog.save; } && \
|
||||||
{ test "$$(readlink changelog)" = "changelog.generated" || \
|
{ test "$$(readlink changelog)" = "changelog.generated" || \
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
Source: core
|
Source: core
|
||||||
Section: net
|
Section: net
|
||||||
Priority: optional
|
Priority: optional
|
||||||
Maintainer: CORE Developers <core-dev@pf.itd.nrl.navy.mil>
|
Maintainer: CORE Developers <core-dev@nrl.navy.mil>
|
||||||
Standards-Version: 3.8.4
|
Standards-Version: 3.8.4
|
||||||
Build-Depends: debhelper (>= 9), cdbs, dh-autoreconf, autoconf, automake, gcc, libev-dev, make, python-dev, libreadline-dev, bridge-utils, ebtables, iproute2 | iproute, imagemagick, pkg-config, help2man
|
Build-Depends: debhelper (>= 9), cdbs, dh-autoreconf, autoconf, automake, gcc, libev-dev, make, python-dev, libreadline-dev, bridge-utils, ebtables, iproute2 | iproute, imagemagick, pkg-config, help2man
|
||||||
# python-sphinx
|
# python-sphinx
|
||||||
|
|
Loading…
Add table
Reference in a new issue