* Add support for PROFILE=1 to the Makefile, this turns on profiling of the

  wiki build using Devel::Profiler (Dprof can't handle ikiwiki).

diff --git a/Makefile.PL b/Makefile.PL
index 3c47e684e7c26ca5f40f781fe97e54efa38bf4de..5bd1d64937d9b1df7c1bf7ba9fcba9941dc887f6 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -23,12 +23,13 @@ PROBABLE_INST_LIB=$(shell \\
        fi \\
 )
 
        fi \\
 )
 

-tflag=$(shell if [ ! "$$NOTAINT" ]; then printf -- "-T"; fi)
+tflag=$(shell if [ "$$NOTAINT" != 0 ]; then printf -- "-T"; fi)
+extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-MDevel::Profiler"; fi)

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

-       LANG=C perl -I. $(tflag) ikiwiki.out doc html --templatedir=templates \
+       LANG=C perl -I. $(extramodules) $(tflag) ikiwiki.out doc html --templatedir=templates \

                --underlaydir=basewiki \
                --wikiname="ikiwiki" --verbose \
                --exclude=/discussion --no-discussion --userdir=users \
                --underlaydir=basewiki \
                --wikiname="ikiwiki" --verbose \
                --exclude=/discussion --no-discussion --userdir=users \


@@ -37,10 +38,11 @@ extra_build:
        ./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
        ./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man
        $(MAKE) -C po
        ./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
        ./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man
        $(MAKE) -C po

+       if [ "$$PROFILE" = 1 ]; then dprofpp; fi

 
 extra_clean:
        rm -rf html doc/.ikiwiki
 
 extra_clean:
        rm -rf html doc/.ikiwiki

-       rm -f ikiwiki.man ikiwiki-mass-rebuild.man ikiwiki.out
+       rm -f ikiwiki.man ikiwiki-mass-rebuild.man ikiwiki.out tmon.out

        $(MAKE) -C po clean
 
 extra_install:
        $(MAKE) -C po clean
 
 extra_install:

diff --git a/debian/changelog b/debian/changelog
index 9f631ae85a22424720df10eefb87c45ff7037706..1910dfc4ed1bca193c8253d2ec3ea511bd1253d3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,11 @@ ikiwiki (1.50) UNRELEASED; urgency=low
     information about available preprocessor directives.
   * Add myself as a co-maintainer, with Joey's approval.
 
     information about available preprocessor directives.
   * Add myself as a co-maintainer, with Joey's approval.
 

- -- Josh Triplett <josh@freedesktop.org>  Mon, 09 Apr 2007 16:35:18 -0700
+  [ Joey Hess ]
+  * Add support for PROFILE=1 to the Makefile, this turns on profiling of the
+    wiki build using Devel::Profiler (Dprof can't handle ikiwiki).
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 09 Apr 2007 20:22:44 -0400

 
 ikiwiki (1.49) unstable; urgency=low
 
 
 ikiwiki (1.49) unstable; urgency=low
 

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 1986963c0da59a1589ccb8cee30ff00b518fd210..f7d93e834d0f966fc6fe94d1ce357d01d8e4fea2 100644 (file)
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-04-09 01:55-0700\n"
+"POT-Creation-Date: 2007-04-09 20:10-0400\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"