Changeset 2143

Timestamp:

04/30/09 12:00:43 (3 years ago)

Author:

kjellm

Message:

Moved more build functionality to Module::Build. Some Makefile cleanup. Updated INSTALL.

Files:

• trunk/INSTALL (modified) (1 diff)
• trunk/Makefile (modified) (12 diffs)
• trunk/dev_scripts/install (modified) (1 diff)
• trunk/master/Build.PL (modified) (1 diff)
• trunk/master/_bin (added)
• trunk/master/_bin/munin-cgi-graph.in (moved) (moved from trunk/master/bin/munin-cgi-graph.in)
• trunk/master/_bin/munin-check.in (moved) (moved from trunk/master/bin/munin-check.in)
• trunk/master/_bin/munin-cron.in (moved) (moved from trunk/master/bin/munin-cron.in)
• trunk/master/_bin/munin-gather.in (moved) (moved from trunk/master/bin/munin-gather.in)
• trunk/master/_bin/munin-graph.in (moved) (moved from trunk/master/bin/munin-graph.in)
• trunk/master/_bin/munin-html.in (moved) (moved from trunk/master/bin/munin-html.in)
• trunk/master/_bin/munin-limits.in (moved) (moved from trunk/master/bin/munin-limits.in)
• trunk/master/_bin/munin-update (moved) (moved from trunk/master/bin/munin-update)
• trunk/plugins/Build.PL (added)
• trunk/plugins/PluginsBuilder.pm (added)

trunk/INSTALL

@@ -87 +87 @@
-        - Create the group "munin"
-        - make
-
-
+
+
+
-        - Decide which plugins to use.  The quick auto-plug-and-play
-          solution: 

trunk/Makefile

@@ -13 +13 @@
-DIR              := $(shell /bin/pwd | sed 's/^.*\///')
-INFILES          := $(shell find . -name '*.in' | sed 's/\.\/\(.*\)\.in$$/build\/\1/')
+INFILES_MASTER   := $(shell find master -name '*.in' | sed 's/\(.*\)\.in$$/build\/\1/')
-PLUGINS          := $(wildcard plugins/node.d.$(OSTYPE)/* plugins/node.d/*)
-MANCENTER        := "Munin Documentation"
-bin/munin-graph master/
-bin/munin-limits master/
-
+_bin/munin-graph master/_
+_bin/munin-limits master/_
+_
-PODMAN8          := master/doc/munin-cron master/doc/munin
-PODMAN5          := master/doc/munin.conf node/doc/munin-node.conf
-
-
+-prime
-        build build-common-prime build-common-pre build-doc \
-        deb source_dist \
@@ -40 +41 @@
-######################################################################
-
- install-common-prime install-node-prime install-node-plugins
+-prime install-common-prime install-node-prime install-plugins-prime
-
-install-pre: Makefile Makefile.config
@@ -47 +48 @@
-        mkdir -p $(STATEDIR)
-        mkdir -p $(CONFDIR)
-
-
+
+
+
-        mkdir -p $(CONFDIR)/templates
-        mkdir -p $(LIBDIR)
@@ -54 +56 @@
-        mkdir -p $(PERLLIB)
-        mkdir -p $(PERLLIB)/Munin/Master
-
-        mkdir -p $(HTMLDIR)
-        mkdir -p $(DBDIR)
-        mkdir -p $(CGIDIR)
-
-LOGDIR) $(STATEDIR) $(RUNDIR) $(
+
-
-        for p in build/master/www/*.tmpl; do                     \
@@ -69 +70 @@
-        $(INSTALL) -m 0755 master/VeraMono.ttf $(LIBDIR)/
-        $(INSTALL) -m 0644 resources/favicon.ico $(HTMLDIR)/
+
-        test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
-        test -f "$(CONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-# ALWAYS DO THE OS SPECIFIC PLUGINS LAST! THAT WAY THEY OVERWRITE THE
@@ -96 +87 @@
-
-# Some HP-UX plugins needs *.adv support files in LIBDIR
-node-plugins:
+plugins-prime: install-plugins
-        $(CHECKGROUP)
-
@@ -102 +93 @@
-        mkdir -p $(CONFDIR)/plugin-conf.d
-        mkdir -p $(LIBDIR)/plugins
-        mkdir -p $(PERLLIB)/Munin/Plugin
-
-        mkdir -p $(PLUGSTATE)
-
@@ -122 +111 @@
-        done
-        -mv $(LIBDIR)/plugins/*.adv $(LIBDIR)
-        -mkdir -p $(PLUGSTATE)
-        $(CHOWN) $(PLUGINUSER):$(GROUP) $(PLUGSTATE)
-        $(CHMOD) 0775 $(PLUGSTATE)
-        $(INSTALL) -m 0644 build/plugins/plugins.history $(LIBDIR)/plugins/
-        $(INSTALL) -m 0644 build/plugins/plugin.sh $(LIBDIR)/plugins/
-        mkdir -p $(PERLLIB)/Munin/Plugin
-        $(INSTALL) -m 0644 plugins/lib/Munin/Plugin.pm $(PERLLIB)/Munin/
-        $(INSTALL) -m 0644 plugins/lib/Munin/Plugin/SNMP.pm $(PERLLIB)/Munin/Plugin/
-
-#TODO:
-# configure plugins.  Or not. Better done under the direction of the installer
-# or the packager.
+
+install-node-prime: install-node-pre install-node
+
+install-node-pre: build/node/munin-node.conf install-pre
+        test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/
+
+
+install-common-prime: build-common install-common
+
-
-install-man: build-man Makefile Makefile.config
@@ -156 +148 @@
-######################################################################
-
-common-prime build-node
+master build-common-prime build-node build-plugins
-
-build/%: %.in
@@ -191 +183 @@
-
-
-build-doc: build-doc-stamp Makefile Makefile.config
-
-build-doc-stamp:
-        touch build-doc-stamp
-        mkdir -p build/doc
-
-build-man: build-man-stamp 
-
-build-man-stamp: build Makefile Makefile.config
-        touch build-man-stamp
-        mkdir -p build/doc
-        for f in $(MAN8); do \
-           pod2man --section=8 --release=$(RELEASE) --center=$(MANCENTER) build/"$$f" > build/doc/`basename $$f`.8; \
-        done
-        for f in $(PODMAN8); do \
-           pod2man --section=8 --release=$(RELEASE) --center=$(MANCENTER) "$$f".pod > build/doc/`basename $$f .pod`.8; \
-        done
-        for f in $(PODMAN5); do \
-           pod2man --section=5 --release=$(RELEASE) --center=$(MANCENTER) "$$f".pod > build/doc/`basename $$f .pod`.5; \
-        done
-
-######################################################################
-# DIST RULES
-
-deb:
-        (! grep MAINTAINER Makefile.config)
-        -rm debian
-        -ln -s dists/debian
-        fakeroot debian/rules binary
-
-tar-pre:
-        (! grep MAINTAINER Makefile.config)
-        find . -name '*~' -exec rm -fv {} \;
-        PWD=`pwd`
-        -rm -f ../munin-$(VERSION)
-        (cd ..; ln -s $(PWD) munin-$(VERSION))
-
-tar: tar-pre
-        GZIP=-9 tar -C .. --dereference --exclude .svn -cvzf ../munin_$(RELEASE).tar.gz munin-$(VERSION)/
-
-rpm-pre:
-        (! grep MAINTAINER Makefile.config)
-        @for file in `find dists/redhat/ -type f -name '*.in'`; do                      \
-                destname=`echo $$file | sed 's/.in$$//'`;               \
-                echo Generating $$destname..;                           \
-                sed -e 's|@@VERSION@@|$(VERSION)|g'                     \
-                    $$file > $$destname;                                \
-        done
-        -cp dists/tarball/plugins.conf .
-#       (cd ..; ln -s munin munin-$(VERSION))
-
-rpm: rpm-pre
-        tar -C .. --dereference --exclude .svn -cvzf ../munin_$(RELEASE).tar.gz munin-$(VERSION)/
-        (cd ..; rpmbuild -tb munin_$(RELEASE).tar.gz)
-
-rpm-src: rpm-pre
-        tar -C .. --dereference --exclude .svn -cvzf ../munin-$(RELEASE).tar.gz munin-$(VERSION)/
-        (cd ..; rpmbuild -ts munin-$(RELEASE).tar.gz)
-
-suse-pre:
-        (! grep MAINTAINER Makefile.config)
-        @for file in `find dists/suse/ -type f -name '*.in'`; do                \
-                destname=`echo $$file | sed 's/.in$$//'`;               \
-                echo Generating $$destname..;                           \
-                sed -e 's|@@VERSION@@|$(VERSION)|g'                     \
-                $$file > $$destname;                                \
-        done
-        -cp dists/tarball/plugins.conf .
-#       (cd ..; ln -s munin munin-$(VERSION))
-
-suse: suse-pre
-        tar -C .. --dereference --exclude .svn -cvzf ../munin_$(RELEASE).tar.gz munin-$(VERSION)/
-        (cd ..; rpmbuild -tb munin-$(RELEASE).tar.gz)
-
-suse-src: suse-pre
-        tar -C .. --dereference --exclude .svn -cvzf ../munin_$(RELEASE).tar.gz munin-$(VERSION)/
-        (cd ..; rpmbuild -ts munin-$(RELEASE).tar.gz)
-
-source_dist: clean
-        (! grep MAINTAINER Makefile.config)
-        (cd .. && ln -s $(DIR) munin-$(VERSION))
-        tar -C .. --dereference --exclude .svn -cvzf ../munin_$(RELEASE).tar.gz munin-$(VERSION)/
-        (cd .. && rm munin-$(VERSION))
-
-######################################################################
-
-ifeq ($(MAKELEVEL),0)
-clean: clean-common clean-node clean-master
-        -rm -f debian
-        -ln -sf dists/debian
-        -fakeroot debian/rules clean
-        -rm -f debian
-else
-clean:
-endif
-        -rm -rf build
-        -rm -f build-stamp
-        -rm -f build-doc-stamp
-        -rm -f build-man-stamp
-        -rm -rf t/install
-
-        -rm -f dists/redhat/munin.spec
-        -rm -f dists/suse/munin.spec
-
-
-######################################################################
-
-test: test-node test-common test-master
-
-ifeq ($(MAKELEVEL),0)
-# Re-exec make with the test config
-old-test: t/*.t
-        $(MAKE) $@ CONFIG=t/Makefile.config
-else
-test_plugins = id_default id_root env
-old-test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins))
-        @for test in t/*.t; do \
-                echo -n "$$test: "; \
-                PERL5LIB=$(PERLLIB) $(PERL) $$test;\
-        done
-endif
-
-node-monkeywrench: install-node
-        rm -rf $(CONFDIR)/plugins
-        rm -rf $(LIBDIR)/plugins
-        mkdir -p $(LIBDIR)/plugins
-        mkdir -p $(CONFDIR)/plugins
-        cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/
-        $(SBINDIR)/munin-node-configure --suggest
-        echo 'Done?'
-
-t/install: 
-        $(MAKE) clean install-node-prime install-node-plugins CONFIG=t/Makefile.config INSTALL_PLUGINS=test
-
-
-######################################################################
-
-install-node-prime: install-node-pre install-node
-
-install-node-pre: build/node/munin-node.conf install-pre
-        test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/
-
-
-install-common-prime: build-common install-common
-
-
-build-common-prime: build-common-pre common/blib/lib/Munin/Common/Defaults.pm build-common
-
@@ -373 +219 @@
-                  $< > $@
-
+build-doc: build-doc-stamp Makefile Makefile.config
+
+build-doc-stamp:
+        touch build-doc-stamp
+        mkdir -p build/doc
+
+build-man: build-man-stamp 
+
+build-man-stamp: build Makefile Makefile.config
+        touch build-man-stamp
+        mkdir -p build/doc
+        for f in $(MAN8); do \
+           pod2man --section=8 --release=$(RELEASE) --center=$(MANCENTER) build/"$$f" > build/doc/`basename $$f`.8; \
+        done
+        for f in $(PODMAN8); do \
+           pod2man --section=8 --release=$(RELEASE) --center=$(MANCENTER) "$$f".pod > build/doc/`basename $$f .pod`.8; \
+        done
+        for f in $(PODMAN5); do \
+           pod2man --section=5 --release=$(RELEASE) --center=$(MANCENTER) "$$f".pod > build/doc/`basename $$f .pod`.5; \
+        done
+
+######################################################################
+# DIST RULES
+
+deb:
+        (! grep MAINTAINER Makefile.config)
+        -rm debian
+        -ln -s dists/debian
+        fakeroot debian/rules binary
+
+tar-pre:
+        (! grep MAINTAINER Makefile.config)
+        find . -name '*~' -exec rm -fv {} \;
+        PWD=`pwd`
+        -rm -f ../munin-$(VERSION)
+        (cd ..; ln -s $(PWD) munin-$(VERSION))
+
+tar: tar-pre
+        GZIP=-9 tar -C .. --dereference --exclude .svn -cvzf ../munin_$(RELEASE).tar.gz munin-$(VERSION)/
+
+rpm-pre:
+        (! grep MAINTAINER Makefile.config)
+        @for file in `find dists/redhat/ -type f -name '*.in'`; do                      \
+                destname=`echo $$file | sed 's/.in$$//'`;               \
+                echo Generating $$destname..;                           \
+                sed -e 's|@@VERSION@@|$(VERSION)|g'                     \
+                    $$file > $$destname;                                \
+        done
+        -cp dists/tarball/plugins.conf .
+#       (cd ..; ln -s munin munin-$(VERSION))
+
+rpm: rpm-pre
+        tar -C .. --dereference --exclude .svn -cvzf ../munin_$(RELEASE).tar.gz munin-$(VERSION)/
+        (cd ..; rpmbuild -tb munin_$(RELEASE).tar.gz)
+
+rpm-src: rpm-pre
+        tar -C .. --dereference --exclude .svn -cvzf ../munin-$(RELEASE).tar.gz munin-$(VERSION)/
+        (cd ..; rpmbuild -ts munin-$(RELEASE).tar.gz)
+
+suse-pre:
+        (! grep MAINTAINER Makefile.config)
+        @for file in `find dists/suse/ -type f -name '*.in'`; do                \
+                destname=`echo $$file | sed 's/.in$$//'`;               \
+                echo Generating $$destname..;                           \
+                sed -e 's|@@VERSION@@|$(VERSION)|g'                     \
+                $$file > $$destname;                                \
+        done
+        -cp dists/tarball/plugins.conf .
+#       (cd ..; ln -s munin munin-$(VERSION))
+
+suse: suse-pre
+        tar -C .. --dereference --exclude .svn -cvzf ../munin_$(RELEASE).tar.gz munin-$(VERSION)/
+        (cd ..; rpmbuild -tb munin-$(RELEASE).tar.gz)
+
+suse-src: suse-pre
+        tar -C .. --dereference --exclude .svn -cvzf ../munin_$(RELEASE).tar.gz munin-$(VERSION)/
+        (cd ..; rpmbuild -ts munin-$(RELEASE).tar.gz)
+
+source_dist: clean
+        (! grep MAINTAINER Makefile.config)
+        (cd .. && ln -s $(DIR) munin-$(VERSION))
+        tar -C .. --dereference --exclude .svn -cvzf ../munin_$(RELEASE).tar.gz munin-$(VERSION)/
+        (cd .. && rm munin-$(VERSION))
+
+######################################################################
+
+ifeq ($(MAKELEVEL),0)
+clean: clean-common clean-node clean-master clean-plugins
+        -rm -f debian
+        -ln -sf dists/debian
+        -fakeroot debian/rules clean
+        -rm -f debian
+else
+clean:
+endif
+        -rm -rf build
+        -rm -f build-stamp
+        -rm -f build-doc-stamp
+        -rm -f build-man-stamp
+        -rm -rf t/install
+
+        -rm -f dists/redhat/munin.spec
+        -rm -f dists/suse/munin.spec
+
+
+######################################################################
+
+test: test-node test-common test-master test-plugins
+
+ifeq ($(MAKELEVEL),0)
+# Re-exec make with the test config
+old-test: t/*.t
+        $(MAKE) $@ CONFIG=t/Makefile.config
+else
+test_plugins = id_default id_root env
+old-test: t/*.t t/install $(addprefix $(CONFDIR)/plugins/,$(test_plugins))
+        @for test in t/*.t; do \
+                echo -n "$$test: "; \
+                PERL5LIB=$(PERLLIB) $(PERL) $$test;\
+        done
+endif
+
+node-monkeywrench: install-node
+        rm -rf $(CONFDIR)/plugins
+        rm -rf $(LIBDIR)/plugins
+        mkdir -p $(LIBDIR)/plugins
+        mkdir -p $(CONFDIR)/plugins
+        cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/
+        $(SBINDIR)/munin-node-configure --suggest
+        echo 'Done?'
+
+t/install: 
+        $(MAKE) clean install-node-prime install-node-plugins CONFIG=t/Makefile.config INSTALL_PLUGINS=test
+
+
-######################################################################
-
@@ -392 +373 @@
-        cd $* && $(PERL) Build test || true
-
-
-
-
-
-
-
+
+
+
+

trunk/dev_scripts/install

@@ -14 +14 @@
-
-make DESTDIR=$DESTDIR HTMLDIR=$DESTDIR/www || exit
-
+-prime
-
-
-if [ $1 ]; then
-    echo "**********************************************************************"
-node-plugins
+plugins-prime
-    echo "**********************************************************************"
-    perl -pi -e "s/port 4949/port 4948/; 

trunk/master/Build.PL

@@ -23 +23 @@
-    recommends     => {
-        #'Net::SSLeay' => 0, In Munin::Common?
-
+,
-);
-$build->create_build_script;