urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into templatemove 

Conflicts:
	doc/templates.mdwn
master
Joey Hess 2010-04-23 16:43:44 -04:00
parent 6486452e4c d822e37d0e
commit 7bba522545
10 changed files with 72 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.PL
View File

@ -35,8 +35,8 @@ scripts=ikiwiki-update-wikilist ikiwiki-makerepo
./pm_filter $(PREFIX) $(VER) $(PROBABLE_INST_LIB) < $< > $@
chmod +x $@
ikiwiki.setup: ikiwiki.out
HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -dumpsetup ikiwiki.setup
ikiwiki.setup:
HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -dumpsetup ikiwiki.setup
extra_build: $(outprogs) ikiwiki.setup docwiki
./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man
@ -49,11 +49,11 @@ extra_build: $(outprogs) ikiwiki.setup docwiki
sed -i.bkp "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" ikiwiki.spec
rm -f ikiwiki.spec.bkp
docwiki: ikiwiki.out
$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.out -libdir . -setup docwiki.setup -refresh
docwiki:
$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -refresh
extra_clean:
$(PERL) -I. $(extramodules) $(tflag) ikiwiki.in -libdir . -setup docwiki.setup -clean
$(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -clean
rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc
$(MAKE) -C po clean

4
debian/copyright vendored
View File

@ -1,11 +1,11 @@
Files: *
Copyright: © 2006-2008 Joey Hess <joey@ikiwiki.info>
Copyright: © 2006-2010 Joey Hess <joey@ikiwiki.info>
License: GPL-2+
The full text of the GPL is distributed as doc/GPL in ikiwiki's source,
and is distributed in /usr/share/common-licenses/GPL-2 on Debian systems.
Files: templates/*, underlays/basewiki/*, doc/ikiwiki/directive/*, ikiwiki.setup, po/underlay/*
Copyright: © 2006-2008 Joey Hess <joey@ikiwiki.info>
Copyright: © 2006-2010 Joey Hess <joey@ikiwiki.info>
License: other
Redistribution and use in source and compiled forms, with or without
modification, are permitted under any circumstances. No warranty.

31
doc/bugs/build_fails_oddly_when_older_ikiwiki_is_installed.mdwn 100644
View File

@ -0,0 +1,31 @@
I got this failure when trying to build ikiwiki version 3.20100403:
$ perl Makefile.PL INSTALL_BASE=/opt/ikiwiki PREFIX=
Writing Makefile for IkiWiki
$ make
*...snip...*
./pm_filter /opt/ikiwiki 3.20100403 /opt/ikiwiki/lib/perl5 < ikiwiki.in > ikiwiki.out
chmod +x ikiwiki.out
./pm_filter /opt/ikiwiki 3.20100403 /opt/ikiwiki/lib/perl5 < ikiwiki-transition.in > ikiwiki-transition.out
chmod +x ikiwiki-transition.out
./pm_filter /opt/ikiwiki 3.20100403 /opt/ikiwiki/lib/perl5 < ikiwiki-calendar.in > ikiwiki-calendar.out
chmod +x ikiwiki-calendar.out
HOME=/home/me /usr/bin/perl -Iblib/lib ikiwiki.out -libdir . -dumpsetup ikiwiki.setup
Use of uninitialized value $IkiWiki::Setup::config{"setuptype"} in concatenation (.) or string at IkiWiki/Setup.pm line 53.
Can't locate IkiWiki/Setup/.pm in @INC (@INC contains: . /opt/ikiwiki/lib/perl5/i486-linux-gnu-thread-multi /opt/ikiwiki/lib/perl5 blib/lib /etc/perl /usr/local/lib/perl/5.10.1 /usr/local/share/perl/5.10.1 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.10 /usr/share/perl/5.10 /usr/local/lib/site_perl .) at (eval 35) line 3.
make: *** [ikiwiki.setup] Error 2
Note that I had been trying to upgrade with an installed ikiwiki 3.20091114
already in place under /opt/ikiwiki. The build does not fail for me
if I first remove the old ikiwiki installation, nor does it fail with
3.20100403 or newer installed at /opt/ikiwiki. Hence this is not
really a critical bug, although it's somewhat perplexing to me why it
ought to make a difference.
> So, using INSTALL_BASE causes a 'use lib' to be hardcoded into the `.out`
> files; which overrides the -libdir and the -I, and so the old version
> of IkiWiki.pm is used.
> [[fixed|done]] --[[Joey]]

1
doc/git.mdwn
View File

@ -62,6 +62,7 @@ think about merging them. This is recommended. :-)
([browse](http://git.liegesta.at/?p=ikiwiki.git;a=summary))
* [[GustafThorslund]] `http://gustaf.thorslund.org/src/ikiwiki.git`
* [[peteg]] `git://git.hcoop.net/git/peteg/ikiwiki.git`
* [[privat]] `git://github.com/privat/ikiwiki.git`
## branches

12
doc/ikiwiki/directive/map/discussion.mdwn
View File

@ -83,3 +83,15 @@ Is there any way to do that? I don't mind mucking around with `\[[!meta]]` on e
>>> I think that the ideas and code in
>>> [[todo/tracking_bugs_with_dependencies]] might also handle this case.
>>> --[[Joey]]
----
I feel like this should be obvious, but I can't figure out how to sort numerically.
I have `map pages="./* and !*/Discussion and !*/sidebar"` and a bunch of pages with names like 1, 2, 3, 11, 12, 1/1.1, 12/12.3 etc. I want to sort them numerically. I see lots of conversation implying there's a simple way to do it, but not how.
> No, you can't: map can't currently use a non-default sort order. If it
> could, then you could use [[plugins/sortnaturally]]. There's a
> [[feature_request|todo/sort_parameter_for_map_plugin_and_directive]];
> [[a_bug_references_it|bugs/map_sorts_by_pagename_and_not_title_when_show=title_is_used]].
> --[[smcv]]

13
doc/setup/discussion.mdwn
View File

@ -245,3 +245,16 @@ Thank you! I'm not a Perl programmer, so what's your opinion: is this behavior a
I am experiencing the same problem "/etc/ikiwiki/custom: failed to set up the repository with ikiwiki-makerepo
" on Debian squeeze with perl5.10.0. Upgrading to ikiwiki 3.10 fixes it. -- [Albert](http://www.docunext.com/)
----
Just a note, perl 5.10 isn't packaged as part of RHEL or thus CentOS nor EPEL,
so it's not especially trivial to satisfy that requirement for ikiwiki on
those platforms, without backporting it from Fedora or building from source.
However, I have an ikiwiki 3.20100403 running on RHEL-4 supplied 5.8.8 without
(seemingly too much) complaint. How strong is the 5.10 requirement? what
precicely breaks without it? -- [[Jon]]
> I don't remember what was the specific problem with perl 5.8.8. All I can
> find is some taint checking bugs, which are currently worked around by
> taint checking being disabled. --[[Joey]]

3
doc/todo/auto_rebuild_on_template_change.mdwn
View File

@ -39,6 +39,9 @@ Note also that when using templates from "$srcdir/templates/", `no_includes`
needs to be set. Currently this is done by the two plugins that use
such templates, while includes are allowed in `templatedir`.
Have started working on this.
[[!template id=gitbranch branch=origin/templatemove author="[[Joey]]"]]
> But would this require that templates be parseable as wiki pages? Because that would be a nuisance. --[[KathrynAndersen]]
>> It would be better for them not to be rendered separately at all.

2
doc/todo/beef_up_sidebar_to_allow_for_multiple_sidebars.mdwn
View File

@ -15,6 +15,8 @@ those contents instead.
>> Here a simple [[patch]] for multiple sidebars. Not too fancy but better than having multiple copies of the sidebar plugin. --[[jeanprivat]]
>>> I made a [[git]] branch for it [[!template id=gitbranch branch="privat/multiple_sidebars" author="[[jeanprivat]]"]] --[[jeanprivat]]
<pre>
--- /usr/share/perl5/IkiWiki/Plugin/sidebar.pm 2010-02-11 22:53:17.000000000 -0500
+++ plugins/IkiWiki/Plugin/sidebar.pm 2010-02-27 09:54:12.524412391 -0500

2
doc/users/jon.mdwn
View File

@ -51,6 +51,8 @@ Penultimately, the following are merely half-formed thoughts:
unticking checkboxes next to a tag name (rather than entering the
directive into the text of the page directly)
* perhaps the same for meta
* I'd like to make profiling ikiwiki in action very easy for newcomers.
Perhaps even a plugin that created a file /profile or similar on build.
Finally, backlinks (since I have issues with the current backlinks
implementation, see [[bugs/backlinks onhover thing can go weird]]):

2
templates/autotag.tmpl
View File

@ -1,3 +1,3 @@
## Pages tagged <TMPL_VAR TAGNAME> ##
[[!meta title="tag <TMPL_VAR TAGNAME>"]]
[[!inline pages="tagged(<TMPL_VAR TAG>)" actions="no" archive="yes"]]