Commit Graph

137 Commits (d8a550e7de083aae074418f76152d918793dc41e)

Author SHA1 Message Date
Simon McVittie a1fda0b516 Standardize on --long-option instead of -long-option
[[forum/refresh_and_setup]] indicates some confusion between --setup
and -setup. Both work, but it's clearer if we stick to one in
documentation and code.

A 2012 commit to [[plugins/theme]] claims that "-setup" is required
and "--setup" won't work, but I cannot find any evidence in ikiwiki's
source code that this has ever been the case.
2015-03-01 16:15:01 +00:00
Amitai Schlair 2e9992568f Add ikiwiki-comment to shebang_scripts. 2014-10-20 14:20:41 -04:00
Joey Hess 82a4fb49ae add ikiwiki-comment program 2014-10-20 12:08:07 -04:00
Amitai Schlair 9f04f8ccc5 Match word boundary (think "/usr/bin/perl5.18"). 2014-10-19 13:07:34 -04:00
Amitai Schlair 67e778f461 Replace shebang paths with the build-time $(PERL).
On non-Debian systems, /usr/bin/perl might not be the best available
Perl interpreter. Use whichever perl was used to run Makefile.PL,
unless it was "/usr/bin/perl", in which case there's nothing to do.
2014-10-12 11:08:13 -04:00
Amitai Schlair 053de5489b Anchor subst to opening ", avoiding side effects.
SYSCONFDIR might be overridden to a value containing "etc/ikiwiki",
in which case we might overzealously substitute more than once,
especially if SYSCONFDIR is overridden to different values at build
and install time. Avoid this by matching only the instances we meant
to match.
2014-09-19 00:53:16 -04:00
Joey Hess ff3c38fa2b rename so linitian can find the unminified versions 2014-08-15 13:11:32 -04:00
Joey Hess 0c3f1204fd add YAML::XS dep to Makefile.PL 2013-12-03 14:58:16 -04:00
Mikko Rapeli 76dcff6760 Makefile.PL: overwrite theme style.css instead of appending
Appending causes problems when upgrading existing installation.
2013-03-30 13:44:03 -04:00
Amitai Schlair 0c2841349b Avoid a GNUism in find(1).
(cherry picked from commit 9659272e25fac37f896991dab01a05b4f4c85ccb)
2012-02-21 13:32:07 -04:00
Amitai Schlair 1dc565c9ae Portability fixes:
* Define overridable defaults for SYSCONFDIR and MANDIR.
* Avoid GNUisms in sed(1) and cp(1).
2012-01-08 12:11:36 -05:00
Simon McVittie 7179ddce82 Add test coverage analysis (make coverage) 2011-11-09 22:49:36 +00:00
Joey Hess 73eb892ba2 jquery source cleanup
* Add unminified jquery js and css files to source.
* Update to jquery 1.6.2, and jquery-ui 1.8.14.

The full files are included in the source but not the binary.

I'm not minifying the files as part of build because I don't want ikiwiki
to build depend on a javascript minifier. (Let alone need one at runtime).
Nor do I want to deal with any breakage caused by the minifier. These
files were taken from the debian packages.

The jquery-tmpl full file was taken from revision
66bb852217c49ae8c9a8f2522150354ae80463de of its git repository, which
matches the minified file I already had. I did not want to deal with possible
breakage in newer versions; this thing claims to need an ancient version of
jquery (1.4.2), and is perhaps only working by luck with the newer versions
as it is.
2011-08-24 16:25:03 -04:00
Joey Hess 2eec7fdd43 don't install discussion pages for example sites
also dropped old .svn excludes
2011-06-03 11:37:13 -04:00
Joey Hess e837a226d6 remove reundant chengelog version parse 2011-03-19 14:03:50 -04:00
Joey Hess 44231a052f prepend base.css to theme's style.css
this allows a theme to be built based on another
2010-12-11 14:36:06 -04:00
Joey Hess 16dd9c4fc6 parameterize FIND and SED 2010-09-27 16:10:13 -04:00
Joey Hess 3789bce105 preserve timestamps for directive and theme underlays 2010-06-16 15:48:50 -04:00
Joey Hess 062ed44f47 add theme plugin 2010-06-16 15:43:42 -04:00
Joey Hess 7bba522545 Merge branch 'master' into templatemove
Conflicts:
	doc/templates.mdwn
2010-04-23 16:43:44 -04:00
Joey Hess 8d72e3dc09 add myclean 2010-04-23 16:40:42 -04:00
Joey Hess aaf1d98ebe better fix for use lib issue
PER5LIB does not override fully, so need to run .in versions
2010-04-22 23:14:57 -04:00
Joey Hess 5bc7efab7c switch to PERL5LIB so that use lib inserted for INSTALL_BASE is overridden during build 2010-04-22 23:00:33 -04:00
Joey Hess b66f902617 fix buggy program installation code 2010-04-03 15:09:04 -04:00
Joey Hess 1273f1de52 Add preprocessed 'use lib' line to ikiwiki-transition and ikiwiki-calendar if necessary for unusual install. 2010-03-26 13:11:02 -04:00
Joey Hess 60d2dd318f Add new --clean option; this makes ikiwiki remove all built files in the destdir, as well as wrappers and the .ikiwiki directory. 2010-02-28 00:12:47 -05:00
Joey Hess 76d72e9bdd more portable use of sed -i
Apparently OS X requires the extension be specified. But this
turns on backup in GNU sed, so have to remove that.
2009-11-09 13:47:37 -05:00
Joey Hess f4c4b3b45f add spec file
Modify makefile to update spec file version number.
2009-10-29 11:38:08 -04:00
Joey Hess 7adb471ff4 install ikiwiki-calendar 2009-10-11 19:56:40 -04:00
Joey Hess fed73d8d92 change PROFILE to use Devel::NYTProf 2009-08-13 21:05:07 -04:00
Joey Hess 29a3334d59 quote version numbers to avoid them being interpreted as unicode characters 2009-07-23 15:25:47 +02:00
Joey Hess 5efda4da29 split out underlay_install target 2009-07-21 13:16:46 +02:00
Joey Hess a7b813182d build translated underlays for use with non-English wikis 2009-07-20 07:20:13 +02:00
Joey Hess 741c33576e create translated underlays in mdwn format
These are for use by wikis where the primary language is not English.
On such a wiki, it makes sense to use an underlay has the source for pages
in the native language.
2009-07-20 06:23:33 +02:00
Joey Hess 08254c7220 use empty underlay dirs when building po underlays 2009-07-20 00:06:41 +02:00
Joey Hess 33e93cd5e9 speed up incremental underlaypo runs 2009-07-19 22:46:53 +02:00
Joey Hess 73682cefec move source removal back to underlaypo rule 2009-07-19 16:43:21 +02:00
Joey Hess a60e4ef4ee move clean code to clean rule 2009-07-19 15:17:38 +02:00
Joey Hess f08bd11f42 rename 2009-07-19 14:54:15 +02:00
Joey Hess 9a61f3050a don't run basewikipo by default yet, comment out all languages 2009-07-19 14:17:31 +02:00
Joey Hess ae4837bb3d add basewikipo po file generation thing 2009-07-19 14:16:21 +02:00
Joey Hess 862caff2a9 debhelper v7; rules file minimisation. 2009-02-15 20:12:16 -05:00
Joey Hess cc055d2c95 makefile portability patch
from Thomas Keller, who explains:

1) find -wholename is not available on BSD / OSX (a nice rant about this
issue is here: http://fuhm.livejournal.com/1848.html)

2) cp -a is not available on BSD / OSX, there is an alternative install
call, but it might be cool to just shut up cp complaining about it... ;)

3) Two find calls have been missing the path argument.
2009-02-04 21:08:03 -05:00
Joey Hess 6d785d6401 Add auto-blog.setup
It will set up an ikiwiki instance tuned for use in blogging.

As part of this change, move the example sites into /usr/share/ikiwiki so
they are available even if docs are not installed.
2009-01-12 19:04:24 -05:00
Joey Hess 30360b3f53 add W3M_CGI_BIN setting 1997-08-14 08:26:03 -04:00
Joey Hess 4413307afa preserve underlay file times
I'd like to preserve the mtime and ctime of files in the underlay if
possible, to avoid ikiwiki thinking they've changed and refreshing them
each time it's upgraded.

But, fall back to the old install command for systems that lack cp -a.
2008-10-19 19:25:23 -04:00
Joey Hess bc7381c4f9 listdirectives: Enable use of the directives underlay. 2008-09-11 18:46:32 -04:00
Joey Hess 981d0474a1 Ignore failure to install files into /etc, in case install is running as non-root. 2008-08-29 15:53:46 -04:00
Joey Hess 8709ec2482 avoid installing .pyc files 2008-08-27 15:25:26 -04:00
Joey Hess af17ff4de5 add target to aid benchmarking 2008-08-23 15:58:59 -04:00