releasing version 3.20111229

[git.ikiwiki.info.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 4001c841b8f79c9a98870f526f2553db615602ca..b19636c60c90ad5fbc0db4bbb0b7c0ba0904fa5d 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -13,6 +13,18 @@ pure_install:: extra_install
 
 VER=$(shell perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)
 
 
 VER=$(shell perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)
 

+# Parameterized programs used by Makefile.
+FIND?=find
+SED?=sed
+
+# Additional configurable path variables.
+W3M_CGI_BIN?=$(PREFIX)/lib/w3m/cgi-bin
+
+tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
+extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi)
+outprogs=ikiwiki.out ikiwiki-transition.out ikiwiki-calendar.out
+scripts=ikiwiki-update-wikilist ikiwiki-makerepo
+

 PROBABLE_INST_LIB=$(shell \\
        if [ "$(INSTALLDIRS)" = "perl" ]; then \\
                echo $(INSTALLPRIVLIB); \\
 PROBABLE_INST_LIB=$(shell \\
        if [ "$(INSTALLDIRS)" = "perl" ]; then \\
                echo $(INSTALLPRIVLIB); \\


@@ -23,14 +35,6 @@ PROBABLE_INST_LIB=$(shell \\
        fi \\
 )
 
        fi \\
 )
 

-# Additional configurable path variables.
-W3M_CGI_BIN?=$(PREFIX)/lib/w3m/cgi-bin
-
-tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi)
-extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi)
-outprogs=ikiwiki.out ikiwiki-transition.out ikiwiki-calendar.out
-scripts=ikiwiki-update-wikilist ikiwiki-makerepo
-

 %.out: %.in
        ./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < $< > $@
        chmod +x $@
 %.out: %.in
        ./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < $< > $@
        chmod +x $@


@@ -46,7 +50,7 @@ extra_build: $(outprogs) ikiwiki.setup docwiki
        ./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
        ./mdwn2man ikiwiki-calendar 1 doc/ikiwiki-calendar.mdwn > ikiwiki-calendar.man
        $(MAKE) -C po
        ./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man
        ./mdwn2man ikiwiki-calendar 1 doc/ikiwiki-calendar.mdwn > ikiwiki-calendar.man
        $(MAKE) -C po

-       sed -i.bkp "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec
+       $(SED) -i.bkp "s/Version:.*/Version: $(VER)/" ikiwiki.spec

        rm -f ikiwiki.spec.bkp
        
 docwiki:
        rm -f ikiwiki.spec.bkp
        
 docwiki:


@@ -63,9 +67,9 @@ myclean: clean
 
 underlay_install:
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
 
 underlay_install:
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki

-       for dir in `cd underlays && find . -follow -type d ! -regex '.*\.svn.*'`; do \
+       for dir in `cd underlays && $(FIND) . -follow -type d`; do \

                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \

-               for file in `find underlays/$$dir -follow -maxdepth 1 -type f`; do \
+               for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f -not -name \\*.full.js -not -name \\*.full.css`; do \

                        cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \
                        install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
                done; \
                        cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \
                        install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
                done; \


@@ -75,32 +79,49 @@ underlay_install:
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive
        for file in doc/ikiwiki/directive/*; do \
                if [ -f "$$file" ]; then \
        install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive
        for file in doc/ikiwiki/directive/*; do \
                if [ -f "$$file" ]; then \

+                       cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive 2>/dev/null || \

                        install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive; \
                fi \
        done
                        install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive; \
                fi \
        done

-       
+
+       # Themes have their base.css (if present) and then
+       # style.css appended to the normal one.
+       for theme in themes/*; do \
+               install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$theme; \
+               for file in $$theme/*; do \
+                       if echo "$$file" | grep -q style.css; then \
+                               (cat doc/style.css; cat $$theme/base.css 2>/dev/null; cat $$file) >> $(DESTDIR)$(PREFIX)/share/ikiwiki/$$theme/style.css; \
+                       elif echo "$$file" | grep -q base.css; then \
+                               :; \
+                       elif [ -f "$$file" ]; then \
+                               cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file 2>/dev/null || \
+                               install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file; \
+                       fi \
+               done; \
+       done
+

 extra_install: underlay_install
        # Install example sites.
 extra_install: underlay_install
        # Install example sites.

-       for dir in `cd doc/examples; find . -type d ! -regex '.*\.svn.*'`; do \
+       for dir in `cd doc/examples; $(FIND) . -type d ! -regex '.*discussion.*'`; do \

                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \
        done
                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \
        done

-       for file in `cd doc/examples; find . -type f ! -regex '.*\.svn.*'`; do \
+       for file in `cd doc/examples; $(FIND) . -type f ! -regex '.*discussion.*'`; do \

                cp -aL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null || \
                install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \
        done
 
                cp -aL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null || \
                install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \
        done
 

-       for dir in `find templates -follow -type d ! -regex '.*\.svn.*'`; do \
+       for dir in `$(FIND) templates -follow -type d`; do \

                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \

-               for file in `find $$dir -follow -maxdepth 1 -type f`; do \
+               for file in `$(FIND) $$dir -follow -maxdepth 1 -type f`; do \

                        install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
                done; \
        done
        
        install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins
                        install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
                done; \
        done
        
        install -d $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins

-       for file in `find plugins -maxdepth 1 -type f ! -path plugins/.\* ! -name \*demo\* -name \*.py`; do \
+       for file in `$(FIND) plugins -maxdepth 1 -type f ! -path plugins/.\* ! -name \*demo\* -name \*.py`; do \

                install -m 644 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
        done
                install -m 644 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
        done

-       for file in `find plugins -maxdepth 1 -type f ! -path plugins/.\* ! -name \*demo\* ! -name \*.py ! -name \*.pyc`; do \
+       for file in `$(FIND) plugins -maxdepth 1 -type f ! -path plugins/.\* ! -name \*demo\* ! -name \*.py ! -name \*.pyc`; do \

                install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
        done
 
                install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \
        done
 


@@ -122,7 +143,7 @@ extra_install: underlay_install
 
        install -d $(DESTDIR)$(PREFIX)/bin
        for prog in $(outprogs) $(scripts); do \
 
        install -d $(DESTDIR)$(PREFIX)/bin
        for prog in $(outprogs) $(scripts); do \

-               install $$prog $(DESTDIR)$(PREFIX)/bin/$$(echo $$prog | sed 's/\.out//'); \
+               install $$prog $(DESTDIR)$(PREFIX)/bin/$$(echo $$prog | $(SED) 's/\.out//'); \

        done
 
        $(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX)
        done
 
        $(MAKE) -C po install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX)


@@ -133,6 +154,13 @@ extra_install: underlay_install
        -install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki
        -install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki
        -install -m 0644 auto-blog.setup $(DESTDIR)/etc/ikiwiki
        -install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki
        -install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki
        -install -m 0644 auto-blog.setup $(DESTDIR)/etc/ikiwiki

+
+# The git/hg plugins want to chdir; so does Devel::Cover. Skip those tests
+# to stop them hurting each other.
+coverage:
+       cover -delete
+       $(MAKE) test PERL5OPT=-MDevel::Cover PERL5LIB=. TEST_FILES="$(filter-out t/git.t t/mercurial.t,$(wildcard t/*.t))"
+       cover

 }
 }
 
 }
 }