PyukiWiki CVS Commit
pyuki****@lists*****
2012年 1月 29日 (日) 07:35:14 JST
Index: PyukiWiki-Devel-UTF8/build/build.pl diff -u PyukiWiki-Devel-UTF8/build/build.pl:1.244 PyukiWiki-Devel-UTF8/build/build.pl:1.245 --- PyukiWiki-Devel-UTF8/build/build.pl:1.244 Sun Jan 29 07:31:08 2012 +++ PyukiWiki-Devel-UTF8/build/build.pl Sun Jan 29 07:35:14 2012 @@ -1,6 +1,6 @@ #!/usr/bin/perl # release file perl script for pyukiwiki -# $Id: build.pl,v 1.244 2012/01/28 22:31:08 papu Exp $ +# $Id: build.pl,v 1.245 2012/01/28 22:35:14 papu Exp $ $DIR=$ARGV[0]; $TYPE=$ARGV[1]; @@ -511,7 +511,7 @@ } } # for sorceforge url - s/L\<http://sfjp.jp/cvs/view/pyukiwiki(.*)\>/L\<http://sfjp.jp/cvs/view/pyukiwiki$1\?view\=log\>/g; + s/L\<\@\@CVSURL\@\@(.*)\>/L\<\@\@CVSURL\@\@$1\?view\=log\>/g; # for yuicompress direct source if(/\@\@yuicompressor\_(.+)\=\"(.+)\"\@\@/) { @@ -573,12 +573,12 @@ } s/([\s\t]+)?$//g; $s=$_; - if($s=~/http://sfjp.jp/cvs/view/pyukiwiki/) { + if($s=~/\@\@CVSURL\@\@/) { $tmps=$s; - $tmps=~s!http://sfjp.jp/cvs/view/pyukiwiki/PyukiWiki\-Devel/!http://sfjp.jp/cvs/view/pyukiwiki/PyukiWiki\-Devel\-UTF8/!g; + $tmps=~s!\@\@CVSURL\@\@/PyukiWiki\-Devel/!\@\@CVSURL\@\@/PyukiWiki\-Devel\-UTF8/!g; $s.="\n\n$tmps"; } - while($s=~//) { + while($s=~/\@\@(.+?)\@\@/) { $rep=$1; $s=~s/\@\@$rep\@\@/$text{$rep}/g; if($filemode eq 'crlf') { @@ -588,9 +588,9 @@ } last if($ii++>10); } - while($s=~/\\\@\\\@(.+?)\\\@\\\@/) { + while($s=~/\\\@\\\@\\\@(.+?)\\\@\\\@\\\@/) { $rep=$1; - $s=~s/\\\@\\\@$rep\\\@\\\@/$text{$rep}/g; + $s=~s/\\\@\\\@\\\@$rep\\\@\\\@\\\@/$text{$rep}/g; if($filemode eq 'crlf') { $s=~s/\x0D\x0A|\x0D|\x0A/\r\n/g; } else { Index: PyukiWiki-Devel-UTF8/build/compressfile.pl diff -u PyukiWiki-Devel-UTF8/build/compressfile.pl:1.244 PyukiWiki-Devel-UTF8/build/compressfile.pl:1.245 --- PyukiWiki-Devel-UTF8/build/compressfile.pl:1.244 Sun Jan 29 07:31:08 2012 +++ PyukiWiki-Devel-UTF8/build/compressfile.pl Sun Jan 29 07:35:14 2012 @@ -1,6 +1,6 @@ #!/usr/bin/perl # yuicompressor script -# $Id: compressfile.pl,v 1.244 2012/01/28 22:31:08 papu Exp $ +# $Id: compressfile.pl,v 1.245 2012/01/28 22:35:14 papu Exp $ $mode=$ARGV[0]; $output=$ARGV[1]; @@ -13,7 +13,7 @@ $convert{euc}="perl ./build/Jcode-convert.pl euc"; if($ARGV[3] eq '') { - $top="/* "PyukiWiki" version 0.2.0-p1-preview2-p2 $$ */\n/* \$Id\$ */\n\n"; + $top="/* \@\@PYUKIWIKIVERSION\@\@ */\n/* \$Id\$ */\n\n"; # $top="/* \@charset \"Shift_JIS\"; */\n/* If use japanese font, use @charset */\n" # . $top # if($mode eq "css"); Index: PyukiWiki-Devel-UTF8/build/text.pl diff -u PyukiWiki-Devel-UTF8/build/text.pl:1.245 PyukiWiki-Devel-UTF8/build/text.pl:1.246 --- PyukiWiki-Devel-UTF8/build/text.pl:1.245 Sun Jan 29 07:31:08 2012 +++ PyukiWiki-Devel-UTF8/build/text.pl Sun Jan 29 07:35:14 2012 @@ -1,5 +1,5 @@ # release file perl script for pyukiwiki -# $Id: text.pl,v 1.245 2012/01/28 22:31:08 papu Exp $ +# $Id: text.pl,v 1.246 2012/01/28 22:35:14 papu Exp $ use Jcode; @@ -15,11 +15,11 @@ $text{YEAR}=$year; if($TYPE=~/compact/) { $text{BASEHEAD1}=<<EOM; -text.pl - \$Id\$ +\@\@FILENAME\@\@ - \$Id\$ EOM } else { $text{BASEHEAD1}=<<EOM; -text.pl - This is PyukiWiki, yet another Wiki clone. +\@\@FILENAME\@\@ - This is PyukiWiki, yet another Wiki clone. # \$Id\$ EOM } @@ -27,223 +27,204 @@ if($TYPE=~/compact/) { $text{BASEHEAD2}=<<EOM; Copyright(C) 2005-$year PyukiWiki Developers Team/2004-$year Nekyo -# http://pyukiwiki.sfjp.jp/ http://nekyo.qp.land.to/ -# @\@CRLFCODE\@\@ 4Spaces GPL2 and/or Artistic License +# \@\@PYUKI_URL\@\@ \@\@NEKYO_URL\@\@ +# @\@CRLF\@\@ \@\@CODE\@\@ 4Spaces GPL2 and/or Artistic License EOM $text{BASEHEAD4}=<<EOM; Copyright(C)2000-$year - Laurent Destailleur - <eldy (at) users (dot) sourceforge (dot) net> -# http://awstats.sf.net/ +# \@\@AWSTATS_URL\@\@ Copyright(C) 2005-$year PyukiWiki Developers Team/2004-$year Nekyo -# http://pyukiwiki.sfjp.jp/ http://nekyo.qp.land.to/ -# @\@CRLFCODE\@\@ 4Spaces GPL2 and/or Artistic License +# \@\@PYUKI_URL\@\@ \@\@NEKYO_URL\@\@ +# @\@CRLF\@\@ \@\@CODE\@\@ 4Spaces GPL2 and/or Artistic License EOM } else { $text{BASEHEAD2}=<<EOM; Copyright (C) 2004-$year Nekyo -# http://nekyo.qp.land.to/ +# \@\@NEKYO_URL\@\@ # Copyright (C) 2005-$year PyukiWiki Developers Team -# http://pyukiwiki.sfjp.jp/ -# Based on YukiWiki http://www.hyuki.com/yukiwiki/ -# Powerd by PukiWiki http://pukiwiki.sfjp.jp/ +# \@\@PYUKI_URL\@\@ +# Based on YukiWiki \@\@YUKIWIKI_URL\@\@ +# Powerd by PukiWiki \@\@PUKIWIKI_URL\@\@ # License: GPL2 and/or Artistic or each later version # # This program is free software; you can redistribute it and/or # modify it under the same terms as Perl itself. -# Return:LF Code=UTF-8 1TAB=4Spaces +# Return:\@\@CRLF\@\@ Code=\@\@CODE\@\@ 1TAB=4Spaces EOM $text{BASEHEAD4}=<<EOM; Copyright (C) 2000-$year - Laurent Destailleur - <eldy (at) users (dot) sourceforge (dot) net> -# http://awstats.sf.net/ +# \@\@AWSTATS_URL\@\@ # Copyright (C) 2004-$year Nekyo -# http://nekyo.qp.land.to/ +# \@\@NEKYO_URL\@\@ # Copyright (C) 2005-$year PyukiWiki Developers Team -# http://pyukiwiki.sfjp.jp/ -# Based on YukiWiki http://www.hyuki.com/yukiwiki/ -# Powerd by PukiWiki http://pukiwiki.sfjp.jp/ +# \@\@PYUKI_URL\@\@ +# Based on YukiWiki \@\@YUKIWIKI_URL\@\@ +# Powerd by PukiWiki \@\@PUKIWIKI_URL\@\@ # License: GPL2 and/or Artistic or each later version # # This program is free software; you can redistribute it and/or # modify it under the same terms as Perl itself. -# Return:LF Code=UTF-8 1TAB=4Spaces +# Return:\@\@CRLF\@\@ Code=\@\@CODE\@\@ 1TAB=4Spaces EOM } $text{HEADER1}=<<EOM; -@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone. -# $Id: text.pl,v 1.245 2012/01/28 22:31:08 papu Exp $ +\@\@BASEHEAD1\@\@ # -# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$ +# \@\@PYUKIWIKIVERSION\@\@ # $text{BASEHEAD2} EOM if($TYPE=~/compact/) { $text{HEADER2_NEKYO}=<<EOM; -@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone. -# $Id: text.pl,v 1.245 2012/01/28 22:31:08 papu Exp $ +\@\@BASEHEAD1\@\@ # -# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$ -# Author: Nekyo +# \@\@PYUKIWIKIVERSION\@\@ +# Author: \@\@NEKYO\@\@ # $text{BASEHEAD2} EOM $text{HEADER2_NANAMI}=<<EOM; -@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone. -# $Id: text.pl,v 1.245 2012/01/28 22:31:08 papu Exp $ +\@\@BASEHEAD1\@\@ # -# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$ -# Author: Nanami +# \@\@PYUKIWIKIVERSION\@\@ +# Author: \@\@NANAMI\@\@ # $text{BASEHEAD2} EOM $text{HEADER2_YUKI}=<<EOM; -@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone. -# $Id: text.pl,v 1.245 2012/01/28 22:31:08 papu Exp $ +\@\@BASEHEAD1\@\@ # -# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$ -# Author: Hiroshi Yuki +# \@\@PYUKIWIKIVERSION\@\@ +# Author: \@\@YUKI\@\@ # $text{BASEHEAD2} EOM $text{HEADER2_JUNICHI}=<<EOM; -@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone. -# $Id: text.pl,v 1.245 2012/01/28 22:31:08 papu Exp $ +\@\@BASEHEAD1\@\@ # -# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$ -# Author: Junichi +# \@\@PYUKIWIKIVERSION\@\@ +# Author: \@\@JUNICHI\@\@ # $text{BASEHEAD2} EOM $text{HEADER2_YASHIGANIMODOKI}=<<EOM; -@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone. -# $Id: text.pl,v 1.245 2012/01/28 22:31:08 papu Exp $ +\@\@BASEHEAD1\@\@ # -# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$ -# Author: YashiganiModoki +# \@\@PYUKIWIKIVERSION\@\@ +# Author: \@\@YASHIGANIMODOKI\@\@ # $text{BASEHEAD2} EOM $text{HEADER3_NANAMI}=<<EOM; -@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone. -# $Id: text.pl,v 1.245 2012/01/28 22:31:08 papu Exp $ +\@\@BASEHEAD1\@\@ # -# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$ -# Author: Nanami +# \@\@MODULEVERSION\@\@ +# Author: \@\@NANAMI\@\@ # $text{BASEHEAD2} EOM $text{HEADER3_YUKI}=<<EOM; -@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone. -# $Id: text.pl,v 1.245 2012/01/28 22:31:08 papu Exp $ +\@\@BASEHEAD1\@\@ # -# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$ -# Author: Hiroshi Yuki +# \@\@MODULEVERSION\@\@ +# Author: \@\@YUKI\@\@ # $text{BASEHEAD2} EOM $text{HEADER4_AWS}=<<EOM; -@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone. -# $Id: text.pl,v 1.245 2012/01/28 22:31:08 papu Exp $ +\@\@BASEHEAD1\@\@ # -# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$ -# Author: Nanami +# \@\@PYUKIWIKIVERSION\@\@ +# Author: \@\@NANAMI\@\@ # $text{BASEHEAD4} EOM } else { $text{HEADER2_NEKYO}=<<EOM; -@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone. -# $Id: text.pl,v 1.245 2012/01/28 22:31:08 papu Exp $ +\@\@BASEHEAD1\@\@ # -# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$ -# Author: Nekyo http://nekyo.qp.land.to/ +# \@\@PYUKIWIKIVERSION\@\@ +# Author: \@\@NEKYO\@\@ \@\@NEKYO_URL\@\@ # $text{BASEHEAD2} EOM $text{HEADER2_NANAMI}=<<EOM; -@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone. -# $Id: text.pl,v 1.245 2012/01/28 22:31:08 papu Exp $ +\@\@BASEHEAD1\@\@ # -# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$ -# Author: Nanami http://nanakochi.daiba.cx/ +# \@\@PYUKIWIKIVERSION\@\@ +# Author: \@\@NANAMI\@\@ \@\@NANAMI_URL\@\@ # $text{BASEHEAD2} EOM $text{HEADER2_YUKI}=<<EOM; -@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone. -# $Id: text.pl,v 1.245 2012/01/28 22:31:08 papu Exp $ +\@\@BASEHEAD1\@\@ # -# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$ -# Author: Hiroshi Yuki http://www.hyuki.com/ +# \@\@PYUKIWIKIVERSION\@\@ +# Author: \@\@YUKI\@\@ \@\@YUKI_URL\@\@ # $text{BASEHEAD2} EOM $text{HEADER2_JUNICHI}=<<EOM; -@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone. -# $Id: text.pl,v 1.245 2012/01/28 22:31:08 papu Exp $ +\@\@BASEHEAD1\@\@ # -# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$ -# Author: Junichi http://www.re-birth.com/ +# \@\@PYUKIWIKIVERSION\@\@ +# Author: \@\@JUNICHI\@\@ \@\@JUNICHI_URL\@\@ # $text{BASEHEAD2} EOM $text{HEADER2_YASHIGANIMODOKI}=<<EOM; -@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone. -# $Id: text.pl,v 1.245 2012/01/28 22:31:08 papu Exp $ +\@\@BASEHEAD1\@\@ # -# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$ -# Author: YashiganiModoki -# http://hpcgi1.nifty.com/it2f/wikinger/pyukiwiki.cgi +# \@\@PYUKIWIKIVERSION\@\@ +# Author: \@\@YASHIGANIMODOKI\@\@ +# \@\@YASHIGANIMODOKI_URL\@\@ # $text{BASEHEAD2} EOM $text{HEADER3_NANAMI}=<<EOM; -@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone. -# $Id: text.pl,v 1.245 2012/01/28 22:31:08 papu Exp $ +\@\@BASEHEAD1\@\@ # -# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$ -# Author: Nanami -# http://nanakochi.daiba.cx/ +# \@\@MODULEVERSION\@\@ +# Author: \@\@NANAMI\@\@ +# \@\@NANAMI_URL\@\@ # $text{BASEHEAD2} EOM $text{HEADER3_YUKI}=<<EOM; -@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone. -# $Id: text.pl,v 1.245 2012/01/28 22:31:08 papu Exp $ +\@\@BASEHEAD1\@\@ # -# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$ -# Author: Hiroshi Yuki -# http://www.hyuki.com/ +# \@\@MODULEVERSION\@\@ +# Author: \@\@YUKI\@\@ +# \@\@YUKI_URL\@\@ # $text{BASEHEAD2} EOM $text{HEADER4_AWS}=<<EOM; -@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone. -# $Id: text.pl,v 1.245 2012/01/28 22:31:08 papu Exp $ +\@\@BASEHEAD1\@\@ # -# "PyukiWiki" version 0.2.0-p1-preview2-p2 $$ -# Author: Nanami http://nanakochi.daiba.cx/ +# \@\@PYUKIWIKIVERSION\@\@ +# Author: \@\@NANAMI\@\@ \@\@NANAMI_URL\@\@ # $text{BASEHEAD4} EOM } $text{HEADERPLUGIN_NANAMI}=<<EOM; -@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone. -# $Id: text.pl,v 1.245 2012/01/28 22:31:08 papu Exp $ +\@\@BASEHEAD1\@\@ # -# -# Author: Nanami http://nanakochi.daiba.cx/ +# \@\@PLUGINVERSION\@\@ +# Author: \@\@NANAMI\@\@ \@\@NANAMI_URL\@\@ # $text{BASEHEAD2} EOM $text{HEADEREXPLUGIN_NANAMI}=<<EOM; -@@FILENAME@@ - This is PyukiWiki, yet another Wiki clone. -# $Id: text.pl,v 1.245 2012/01/28 22:31:08 papu Exp $ +\@\@BASEHEAD1\@\@ # -# -# Author: Nanami http://nanakochi.daiba.cx/ +# \@\@PLUGINVERSION\@\@ +# Author: \@\@NANAMI\@\@ \@\@NANAMI_URL\@\@ # $text{BASEHEAD2} EOM @@ -260,60 +241,35 @@ EOM $text{LICENSE}=<<EOM; -Copyright (C) 2004-$year by Nekyo. +Copyright (C) 2004-$year by \@\@NEKYO\@\@. -Copyright (C) 2005-2012 by PyukiWiki Developers Team - -License is GNU GENERAL PUBLIC LICENSE 2 and/or Artistic 1 or each later version. - -This program is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. +\@\@LICENSE_BASE\@\@ EOM $text{LICENSE_NEKYO}=$text{LICENSE}; $text{LICENSE_NANAMI}=<<EOM; -Copyright (C) 2005-$year by Nanami. - -Copyright (C) 2005-2012 by PyukiWiki Developers Team +Copyright (C) 2005-$year by \@\@NANAMI\@\@. -License is GNU GENERAL PUBLIC LICENSE 2 and/or Artistic 1 or each later version. - -This program is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. +\@\@LICENSE_BASE\@\@ EOM $text{LICENSE_JUNICHI}=<<EOM; -Copyright (C) 2005-$year by Junichi. - -Copyright (C) 2005-2012 by PyukiWiki Developers Team - -License is GNU GENERAL PUBLIC LICENSE 2 and/or Artistic 1 or each later version. +Copyright (C) 2005-$year by \@\@JUNICHI\@\@. -This program is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. +\@\@LICENSE_BASE\@\@ EOM $text{LICENSE_YASHIGANIMODOKI}=<<EOM; -Copyright (C) 2004-$year by YashiganiModoki. - -Copyright (C) 2005-2012 by PyukiWiki Developers Team +Copyright (C) 2004-$year by \@\@YASHIGANIMODOKI\@\@. -License is GNU GENERAL PUBLIC LICENSE 2 and/or Artistic 1 or each later version. - -This program is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. +\@\@LICENSE_BASE\@\@ EOM $text{LICENSE_YUKI}=<<EOM; -Copyright (C) 2002-$year by Hiroshi Yuki. - -Copyright (C) 2005-2012 by PyukiWiki Developers Team - -License is GNU GENERAL PUBLIC LICENSE 2 and/or Artistic 1 or each later version. +Copyright (C) 2002-$year by \@\@YUKI\@\@. -This program is free software; you can redistribute it and/or -modify it under the same terms as Perl itself. +\@\@LICENSE_BASE\@\@ EOM ############################################################# @@ -321,37 +277,37 @@ $text{AUTHOR_PYUKI}=<<EOM; =item PyukiWiki Developers Team -L<http://pyukiwiki.sfjp.jp/> +L<\@\@PYUKI_URL\@\@> EOM $text{AUTHOR_NEKYO}=<<EOM; -=item Nekyo +=item \@\@NEKYO\@\@ -L<http://nekyo.qp.land.to/> +L<\@\@NEKYO_URL\@\@> EOM $text{AUTHOR_YUKI}=<<EOM; -=item Hiroshi Yuki +=item \@\@YUKI\@\@ -L<http://www.hyuki.com/> +L<\@\@YUKI_URL\@\@> EOM $text{AUTHOR_JUNICHI}=<<EOM; -=item Junichi +=item \@\@JUNICHI\@\@ -L<http://www.re-birth.com/> +L<\@\@JUNICHI_URL\@\@> EOM $text{AUTHOR_NANAMI}=<<EOM; -=item Nanami +=item \@\@NANAMI\@\@ -L<http://nanakochi.daiba.cx/> etc... +L<\@\@NANAMI_URL\@\@> etc... EOM $text{AUTHOR_YASHIGANIMODOKI}=<<EOM; -=item YashiganiModoki +=item \@\@YASHIGANIMODOKI\@\@ -L<http://hpcgi1.nifty.com/it2f/wikinger/pyukiwiki.cgi> +L<\@\@YASHIGANIMODOKI_URL\@\@> EOM
