experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

undefined DESTDIR

Browse source
This commit is contained in:
Olof hagsand 2017-11-20 23:01:49 +01:00
parent 3d3ecd4e4d
commit 496754f5c5
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
CHANGELOG.md
View file

@ -2,13 +2,16 @@
## 3.3.3 (Upcoming) ## 3.3.3 (Upcoming)
Thanks to Matthew Smith, Joe Loeliger at Netgate; Fredrik Pettai at
SUNET for support, requests, debugging, bugfixes and proposed solutions.
### Known issues ### Known issues
* None yet * None yet
### Major changes: ### Major changes:
* Performance improvements * Performance improvements
* Added xml hash lookup instead of linear search for better performance of large lists. To disable, undefine XML_CHILD_HASH in clixon_custom.h * Added xml hash lookup instead of linear search for better performance of large lists. To disable, undefine XML_CHILD_HASH in clixon_custom.h
* netconf client was limited to 8K byte messages. New limit is 2^32 bytes * Netconf client was limited to 8K byte messages. New limit is 2^32 bytes.
* XML and YANG-based configuration file. * XML and YANG-based configuration file.
* New configuration files have .xml suffix, old have .conf. Old config files till work for backward compatibility. * New configuration files have .xml suffix, old have .conf. Old config files till work for backward compatibility.
@ -27,7 +30,8 @@ clixon_cli -f /usr/local/etc/routing.conf -1x
* -CIr replace with -s "running" * -CIr replace with -s "running"
* (no-option) replace with -s "none" * (no-option) replace with -s "none"
* Backward compatibility is enabled by defining BACKEND_STARTUP_BACKWARD_COMPAT in include/clixon_custom.h * Backward compatibility is enabled by defining BACKEND_STARTUP_BACKWARD_COMPAT in include/clixon_custom.h
* Extra XML has been added along with the new startup modes.
* Extra XML has been added along with the new startup modes. Requested by Netgate.
* You can add extra XML with the -c option to the backend daemon on startup: * You can add extra XML with the -c option to the backend daemon on startup:
``` ```
clixon_backend ... -c extra.xml clixon_backend ... -c extra.xml
@ -35,7 +39,7 @@ clixon_cli -f /usr/local/etc/routing.conf -1x
* You can also add extra XML by programming the plugin_reset() in the backend * You can also add extra XML by programming the plugin_reset() in the backend
plugin. The example application shows how. plugin. The example application shows how.
* Clixon can now be compiled and run on Apple Darwin. * Clixon can now be compiled and run on Apple Darwin. Thanks SUNET.
### Minor changes: ### Minor changes:
* Disabled key-value datastore. Enable with --with-keyvalue * Disabled key-value datastore. Enable with --with-keyvalue
@ -51,8 +55,8 @@ plugin. The example application shows how.
cli_tree_active_set, cli_tree. cli_tree_active_set, cli_tree.
* Added a format parameter to clicon_rpc_generate_error() and changed error * Added a format parameter to clicon_rpc_generate_error() and changed error
printouts for backend errors, such as commit and validate. Example of the printouts for backend errors, such as commit and validate. (Thanks netgate).
new format: Example of the new format:
``` ```
> commit > commit
@ -62,13 +66,14 @@ protocol invalid-value Missing mandatory variable: type
* Added event_poll function. * Added event_poll function.
* Support for non-line scrolling in CLI, eg wrap lines. Set with: * Support for non-line scrolling in CLI, eg wrap lines. Thanks to Jon Loeliger for proposed solution. Set with:
CLICON_CLI_LINESCROLLING 0 CLICON_CLI_LINESCROLLING 0
### Corrected Bugs ### Corrected Bugs
* Added floating point and negative number support to JSON * Added floating point and negative number support to JSON
* When user callbacks such as statedata() call returns -1, clixon_backend no * When user callbacks such as statedata() call returns -1, clixon_backend no
longer silently exits. Instead a log is printed and an RPC error is returned. longer silently exits. Instead a log is printed and an RPC error is returned.
Cred to Matt, netgate for pointing this out.
## 3.3.2 (Aug 27 2017) ## 3.3.2 (Aug 27 2017)

4
Makefile.in
View file

@ -73,11 +73,11 @@ clixon.mk: clixon.mk.cpp
$(CPP) -P -traditional-cpp -x assembler-with-cpp -Dprefix=$(prefix) -Dlocalstatedir=$(localstatedir) -Dsysconfdir=$(sysconfdir) -Ddatadir=$(datadir) -Dlibdir=$(libdir) $< > $@ $(CPP) -P -traditional-cpp -x assembler-with-cpp -Dprefix=$(prefix) -Dlocalstatedir=$(localstatedir) -Dsysconfdir=$(sysconfdir) -Ddatadir=$(datadir) -Dlibdir=$(libdir) $< > $@
install: clixon.conf.cpp clixon.mk install: clixon.conf.cpp clixon.mk
install -m 755 clixon.conf.cpp $(DESTDIR)$(datadir)/clixon
install -m 755 clixon.mk $(DESTDIR)$(datadir)/clixon
for i in $(SUBDIRS) doc; \ for i in $(SUBDIRS) doc; \
do (cd $$i && $(MAKE) $(MFLAGS) $@); done; \ do (cd $$i && $(MAKE) $(MFLAGS) $@); done; \
install -d -m 755 $(DESTDIR)$(datadir)/clixon install -d -m 755 $(DESTDIR)$(datadir)/clixon
install -m 755 clixon.conf.cpp $(DESTDIR)$(datadir)/clixon
install -m 755 clixon.mk $(DESTDIR)$(datadir)/clixon
echo "Install for compilation by: make install-include" echo "Install for compilation by: make install-include"
install-include: install-include: