Support parallel installations. The idea is that for CAD screener, we want
to be able to install this on the same machine as a standard AVOT setup
(most notably for John's laptop). To allow for the possibility of a second
application that might have the same requirements, we add the concept of
vendor-specific distributions. Thus we can have one distribution for CAD
screener and one for The Next Big Thing. It doesn't seem trivial to have
both CAD screener and AVOT under the same vendor tag so we'll have to have
AVOT under "City Occupational" and CAD screener under "City Occupational Ltd"
or some such kludge.
Most of this is done although we are very short of test cases (in particular
we don't test that it's actually possible to install CAD screener in parallel
with AVOT or to update either of them once installed, which is fundamental).
We also have a lot of baggage left over, including an intercept of razor_set.
The problem that this was introduced to debug has been fixed but it looks
like there are a number of memory leaks which it might be useful to help
track down so it has been left in place for now.
There is still a lot of confusion in plover between path-based and URI-based
API. We should review the API, decide what we want and have a general clear up.
There is also confusion as to the purpose of RAZOR_ROOT (and meaning; path or
URI). This is not used at all in librazor (although it is used in razor.exe).
Ideally we shouldn't use it in plover or plover-gtk either although again, we
might want to support it or an equivalent in (some of) the various executables.
Work that would still to nice to do for CAD screener:
- uninstall (ideally as an installed program that hooks into Add/Remove programs
but even re-running the installer would be acceptable).
- xz support (smaller packages).
- repomd.xml and xml:base (would be needed for an Internet installer).
- graphical installer.
1 SUBDIRS = . plover plover-gtk
3 EXTRA_DIST = zsh.spec zsh2.spec zip.spec zap.spec filesystem.spec zappy.spec \
4 zappy2.spec unsatisfiable.spec uninstallable.spec badpostun.spec comps.xml \
5 distribution-local-comps.xml glib.supp.in README xvfb-run
7 pkg_V_rpmbuild = $(pkg_v_rpmbuild_$(V))
8 pkg_v_rpmbuild_ = $(pkg_v_rpmbuild_$(AM_DEFAULT_VERBOSITY))
9 pkg_v_rpmbuild_0 = --quiet
11 BUILD_RPM = $(RPMBUILD) $(pkg_V_rpmbuild) --define "_topdir `pwd`/rpmbuild" -bb
15 noinst_DATA = glib.supp yum-repo-test-dir/repodata/primary.xml.gz \
16 distribution-local-test-dir/repodata/primary.xml.gz \
17 razor-test-dir/var/lib/razor/system.rzdb
24 grep -v '^ *match-leak-kinds: ' $< > $@
27 distribution-local-test-dir/repodata/primary.xml.gz: filesystem.spec \
29 rm -rf rpmbuild distribution-local-test-dir
30 mkdir -p rpmbuild/BUILD rpmbuild/RPMS
31 $(BUILD_RPM) $(srcdir)/filesystem.spec
32 $(BUILD_RPM) $(srcdir)/zappy.spec
33 mkdir -p distribution-local-test-dir/Packages
34 mv rpmbuild/RPMS/noarch/*.rpm distribution-local-test-dir/Packages
36 cp $(srcdir)/distribution-local-comps.xml \
37 distribution-local-test-dir/comps.xml
38 $(CREATEREPO) --simple-md-filenames -g comps.xml \
39 distribution-local-test-dir
40 mv distribution-local-test-dir/comps.xml \
41 distribution-local-test-dir/repodata
43 yum-repo-test-dir/repodata/primary.xml.gz: zsh.spec zsh2.spec zip.spec \
44 zap.spec filesystem.spec zappy.spec zappy2.spec unsatisfiable.spec \
45 uninstallable.spec badpostun.spec Makefile
46 rm -rf rpmbuild yum-repo-test-dir
47 mkdir -p rpmbuild/BUILD rpmbuild/RPMS
48 $(BUILD_RPM) $(srcdir)/zap.spec
49 $(BUILD_RPM) --define "_version 1" $(srcdir)/zip.spec
50 $(BUILD_RPM) $(srcdir)/zsh.spec
51 $(BUILD_RPM) $(srcdir)/zsh2.spec
52 $(BUILD_RPM) $(srcdir)/filesystem.spec
53 $(BUILD_RPM) $(srcdir)/zappy.spec
54 $(BUILD_RPM) $(srcdir)/zappy2.spec
55 $(BUILD_RPM) $(srcdir)/unsatisfiable.spec
56 $(BUILD_RPM) $(srcdir)/uninstallable.spec
57 $(BUILD_RPM) $(srcdir)/badpostun.spec
58 mkdir -p yum-repo-test-dir/Packages
59 mv rpmbuild/RPMS/noarch/*.rpm yum-repo-test-dir/Packages
61 cp $(srcdir)/comps.xml yum-repo-test-dir
62 $(CREATEREPO) --simple-md-filenames -g comps.xml yum-repo-test-dir
63 mv yum-repo-test-dir/comps.xml yum-repo-test-dir/repodata
65 razor-test-dir/var/lib/razor/system.rzdb: yum-repo-test-dir/repodata/primary.xml.gz
66 $(RM) -r razor-test-dir
67 $(RAZOR) --root=file:razor-test-dir init
68 $(RAZOR) --url=file://localhost`pwd`/yum-repo-test-dir \
69 --root=file:razor-test-dir import-yum
70 $(RAZOR) --url=file://localhost`pwd`/yum-repo-test-dir \
71 --root=file:razor-test-dir install zap zappy zappy2 zappy-tools
76 $(RM) test-suite-*.log
77 -(cd plover && $(MAKE) $(AM_MAKEFLAGS) check-valgrind)
78 -(cd plover-gtk && $(MAKE) $(AM_MAKEFLAGS) check-valgrind)
79 @for infile in plover/test-suite-*.log plover-gtk/test-suite-*.log; do \
80 outfile=`echo $$infile | sed -e 's:.*/::'`; \
81 cat $$infile >> $$outfile; \
85 rm -rf yum-repo-test-dir distribution-local-test-dir razor-test-dir
88 CLEANFILES = glib.supp