Commit da0bfe47 by Nils Goroll

additional dbfiles DCS_DBFILE_PRE DCS_DBFILE_POST

parent 1ddf657e
...@@ -13,6 +13,8 @@ DISTCHECK_CONFIGURE_FLAGS = \ ...@@ -13,6 +13,8 @@ DISTCHECK_CONFIGURE_FLAGS = \
DCS_KEY='$(DCS_KEY)' \ DCS_KEY='$(DCS_KEY)' \
DCS_ACCOUNT='$(DCS_ACCOUNT)' \ DCS_ACCOUNT='$(DCS_ACCOUNT)' \
DCS_DBFILE='$(DCS_DBFILE)' \ DCS_DBFILE='$(DCS_DBFILE)' \
DCS_DBFILE_PRE='$(DCS_DBFILE_PRE)' \
DCS_DBFILE_POST='$(DCS_DBFILE_POST)' \
VMOD_DIR='$(VMOD_DIR)' \ VMOD_DIR='$(VMOD_DIR)' \
VARNISHSRC='$(VARNISHSRC)' \ VARNISHSRC='$(VARNISHSRC)' \
--disable-dependency-tracking --disable-dependency-tracking
......
...@@ -219,11 +219,26 @@ required: ...@@ -219,11 +219,26 @@ required:
.. _using_the_demo_db: .. _using_the_demo_db:
2c. Use the bundled demo Database. 2c. Use the bundled demo Database.
We provide a very simple database for demonstration purposes. We provide a very simple database for demonstration purposes.
:: ::
sh configure DCS_KEY=demo DCS_DBFILE=dcs_demo.db sh configure DCS_KEY=demo DCS_DBFILE=dcs_demo.db
2d. Optionally add dbfiles to prepend and append
To override / amend entries from the main ``DCS_DBFILE``,
additional files can be speficied as ``DCS_DBFILE_PRE`` (to
prepend / override) and ``DCS_DBFILE_POST``. These files should
not be encrypted, otherwise the same encryption key must be used.
::
sh configure DCS_KEY=demo DCS_DBFILE=dcs_demo.db \
DCS_DBFILE_PRE=/path/to/pre.db \
DCS_DBFILE_POST=/path/to/post.db
3. Run `make` 3. Run `make`
......
...@@ -227,7 +227,11 @@ if test "x$DCS_KEY" = x; then ...@@ -227,7 +227,11 @@ if test "x$DCS_KEY" = x; then
fi fi
AC_ARG_VAR([DCS_ACCOUNT], [your netbiscuits account - optional, for online update only]) AC_ARG_VAR([DCS_ACCOUNT], [your netbiscuits account - optional, for online update only])
AC_ARG_VAR([DCS_DBFILE], [path to your DCS database file]) AC_ARG_VAR([DCS_DBFILE], [path to your primary DCS database file])
AC_ARG_VAR([DCS_DBFILE_PRE],
[path to an additional DCS database file to prepend])
AC_ARG_VAR([DCS_DBFILE_POST],
[path to an additional DCS database file to append])
if test "x$DCS_DBFILE" = "xdcs_demo.db"; then if test "x$DCS_DBFILE" = "xdcs_demo.db"; then
AM_CONDITIONAL([DCS_DBFILE_ABS], [false]) AM_CONDITIONAL([DCS_DBFILE_ABS], [false])
......
...@@ -34,12 +34,12 @@ dcs_classifier.c: $(srcdir)/gen_dcs_classifier.pl dbfile $(srcdir)/../classes.co ...@@ -34,12 +34,12 @@ dcs_classifier.c: $(srcdir)/gen_dcs_classifier.pl dbfile $(srcdir)/../classes.co
--classes $(srcdir)/../classes.conf \ --classes $(srcdir)/../classes.conf \
--remove fixup.remove \ --remove fixup.remove \
--reorder fixup.reorder \ --reorder fixup.reorder \
dbfile ; \ @DCS_DBFILE_PRE@ dbfile @DCS_DBFILE_POST@ ; \
else \ else \
$(srcdir)/gen_dcs_classifier.pl \ $(srcdir)/gen_dcs_classifier.pl \
--key $(DCS_KEY) \ --key $(DCS_KEY) \
--classes $(srcdir)/../classes.conf \ --classes $(srcdir)/../classes.conf \
dbfile ; \ @DCS_DBFILE_PRE@ dbfile @DCS_DBFILE_POST@ ; \
fi fi
# -- gen_dcs_match_mem # -- gen_dcs_match_mem
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment