PyukiWiki CVS Commit
pyuki****@lists*****
2012年 7月 31日 (火) 23:55:04 JST
Index: PyukiWiki-Devel-UTF8/build/CGI_INSTALLER.ja.txt diff -u PyukiWiki-Devel-UTF8/build/CGI_INSTALLER.ja.txt:1.151 PyukiWiki-Devel-UTF8/build/CGI_INSTALLER.ja.txt:1.152 --- PyukiWiki-Devel-UTF8/build/CGI_INSTALLER.ja.txt:1.151 Tue Jul 31 20:19:21 2012 +++ PyukiWiki-Devel-UTF8/build/CGI_INSTALLER.ja.txt Tue Jul 31 23:55:04 2012 @@ -3,20 +3,19 @@ "PyukiWiki" ver 0.2.1-alpha2-dev3 $$ CGIインストーラ版　追記マニュアル Copyright (C) 2005-2012 PukiWiki Developers Team - 2004-2012 Nekyo (Based on PukiWiki, YukiWiki) + 2004-2007 Nekyo (Based on PukiWiki, YukiWiki) License: GPL version 3 or (at your option) any later version and/or Artistic version 1 or later version. Based on YukiWiki http://www.hyuki.com/yukiwiki/ and PukiWiki http://pukiwiki.sfjp.jp/ URL: - http://pyukiwiki.info/ MAIL: - ãªãªã¿ <nanami (at) daiba (dot) cx> (注：ãƒãƒ¼ãƒãƒ£ãƒ«å¥³ã®åã§ã™) + ãªãªã¿ <nanami (at) daiba (dot) cx> (注：ãƒãƒ¼ãƒãƒ£ãƒ«å¥³ã®åã§ã™) - $Id: CGI_INSTALLER.ja.txt,v 1.151 2012/07/31 11:19:21 papu Exp $ + $Id: CGI_INSTALLER.ja.txt,v 1.152 2012/07/31 14:55:04 papu Exp $ ã“ã®ãƒ†ã‚ストファイルã¯UTF-8ã€TAB4ã§è¨˜è¿°ã•ã‚Œã¦ã„ã¾ã™ã€‚ @@ -50,7 +49,6 @@ â– æœ€æ–°æƒ…å ± ------------------------------------------------- 以下ã®URLã§æœ€æ–°æƒ…å ±ã‚’å…¥æ‰‹ã—ã¦ãã ã•ã„。 - http://pyukiwiki.info/ ------------------------------------------------- @@ -336,7 +334,7 @@ 　PyukiWikiã®ãƒ™ãƒ¼ã‚¹ã¨ã—ã¦ã€YukiWikiã¯ãªãã¦ã¯ãªã‚‰ãªã„ã‚‚ã®ã§ã—ãŸã€‚ ・PukiWiki (PHP) -　http://pukiwiki.sourceforge.jp/ +　http://pukiwiki.sfjp.jp/ 　デザインをã¯ã˜ã‚ã€å¤šãã®æ›¸å¼ç‰ã‚’å‚考ã«ã—ã¾ã—ãŸã€‚ ・PukiWiki Plus! (PHP) @@ -357,15 +355,16 @@ ------------------------------------------------- ■作者 ------------------------------------------------- -Copyright (C) 2004-2012 by Nekyo +Copyright (C) 2004-2007 by Nekyo http://nekyo.qp.land.to/ +（リンク切れ） Copyright (C) 2002-2007 by Hiroshi Yuki http://www.hyuki.com/ Copyright (C) 2005-2012 by ãªãªã¿ (ãªãªã“ã£ã¡â˜…) http://nanakochi.daiba.cx/ http://www.daiba.cx/ http://chat.daiba.cx/ -http://pyu.be/ +http://vpsinfo.jp/ http://eat.jp.net/ http://pyu.be/ http://power.daiba.cx/ http://twitter.com/nanakochi123456/ http://ja.wikipedia.org/wiki/%e5%88%a9%e7%94%a8%e8%80%85%3aPapu Index: PyukiWiki-Devel-UTF8/build/compressfile.pl diff -u PyukiWiki-Devel-UTF8/build/compressfile.pl:1.387 PyukiWiki-Devel-UTF8/build/compressfile.pl:1.388 --- PyukiWiki-Devel-UTF8/build/compressfile.pl:1.387 Tue Jul 31 23:09:39 2012 +++ PyukiWiki-Devel-UTF8/build/compressfile.pl Tue Jul 31 23:55:04 2012 @@ -1,6 +1,6 @@ #!/usr/bin/perl # yuicompressor script -# $Id: compressfile.pl,v 1.387 2012/07/31 14:09:39 papu Exp $ +# $Id: compressfile.pl,v 1.388 2012/07/31 14:55:04 papu Exp $ use HTML::Packer; use JavaScript::Packer; @@ -19,8 +19,10 @@ $compress{css}="yuicompressor --type css --charset utf8 -o"; $convert{utf8}="perl ./build/Jcode-convert.pl utf8"; $convert{euc}="perl ./build/Jcode-convert.pl euc"; +$convert2{utf8}="perl Jcode-convert.pl utf8"; +$convert2{euc}="perl Jcode-convert.pl euc"; -if($ARGV[3] eq '') { +if($ARGV[3] eq '' && $mode ne "html") { $top="/* \@\@PYUKIWIKIVERSION\@\@\n"; $top.=" * \$Id\$\n"; @@ -101,7 +103,11 @@ close(W); close(R); -&shell("$convert{utf8} $input.tmp $input.commentcut"); +if($mode ne "html") { + &shell("$convert{utf8} $input.tmp $input.commentcut"); +} else { + &shell("cp $input.commentcut $input.tmp"); +} if($mode eq "js2") { # my $packer=JavaScript::Packer->init(); # open(R, "$input.tmp")||die("$input.tmp not found"); @@ -160,7 +166,12 @@ } # &shell("$compress{$mode} $input.tmp2 $input.tmp"); } -&shell("$convert{euc} $input.tmp $input.tmp2"); + +if($mode ne "html") { + &shell("$convert{euc} $input.tmp $input.tmp2"); +} else { + &shell("cp $input.tmp2 $input.tmp"); +} open(R,"$input.tmp")||exit 1; open(W,">$output")||exit 1; @@ -179,7 +190,7 @@ my($shell)=@_; my $buf; print "$shell\n"; - open(PIPE,"$shell|")||exit 1; + open(PIPE,"$shell 2>/dev/null|")||exit 1; foreach(<PIPE>) { chomp; $buf.="$_\n"; Index: PyukiWiki-Devel-UTF8/build/makeinstaller.sh diff -u PyukiWiki-Devel-UTF8/build/makeinstaller.sh:1.141 PyukiWiki-Devel-UTF8/build/makeinstaller.sh:1.142 --- PyukiWiki-Devel-UTF8/build/makeinstaller.sh:1.141 Tue Jul 31 23:09:39 2012 +++ PyukiWiki-Devel-UTF8/build/makeinstaller.sh Tue Jul 31 23:55:04 2012 @@ -1,7 +1,7 @@ #!/bin/sh #-------------------------------------------------------------- # PyukiWiki Installer CGI Maker -# $Id: makeinstaller.sh,v 1.141 2012/07/31 14:09:39 papu Exp $ +# $Id: makeinstaller.sh,v 1.142 2012/07/31 14:55:04 papu Exp $ #-------------------------------------------------------------- ZIPCMD=$1 P7ZCMD=$2 @@ -37,17 +37,14 @@ ARCCMD="7za a -txz -mx9" EXTCMD="unxz" fi -# echo cp ./build/installer_sub.sh $TEMP1 cd build - perl build/compressfile.pl html license_art_en.htm license_art_en.html - perl build/compressfile.pl html license_art_ja.htm license_art_ja.html - perl build/compressfile.pl html license_gpl_en.htm license_gpl_en.html - perl build/compressfile.pl html license_gpl_ja.htm license_gpl_ja.html + perl compressfile.pl html license_art_en.htm license_art_en.html + perl compressfile.pl html license_art_ja.htm license_art_ja.html + perl compressfile.pl html license_gpl_en.htm license_gpl_en.html + perl compressfile.pl html license_gpl_ja.htm license_gpl_ja.html tar cvf $TEMP1 installer_sub.sh *.htm >/dev/null 2>/dev/null cd .. -# cp ./build/installer_sub.sh $TEMP1 >/dev/null 2>/dev/null -# echo $ARCCMD $TEMP1.$ARCMETHOD $TEMP1 $ARCCMD $TEMP1.$ARCMETHOD $TEMP1 >/dev/null 2>/dev/null if [ "$TXTMETHOD" = "b64" ]; then @@ -65,7 +62,6 @@ if [ "$TXTMETHOD" = "shar" ]; then perl ./build/base64.pl b64encode < $TEMP1.$ARCMETHOD > $TEMP2 -# cp $TEMP1.$ARCMETHOD $TEMP2 else $TXTENCCMD -o $TEMP2 $TEMP1.$ARCMETHOD a >/dev/null 2>/dev/null fi @@ -86,7 +82,6 @@ fi if [ "$TXTMETHOD" = "shar" ]; then perl ./build/base64.pl b64encode < $ORGFILE > $TEMP3 -# cp $ORGFILE $TEMP3 else $TXTENCCMD -o $TEMP3 $ORGFILE a >/dev/null 2>/dev/null fi @@ -106,59 +101,39 @@ | sed -e "s/__CODE__/$CODE/g"> $TOFILE if [ "$TXTMETHOD" = "shar" ]; then -# echo sed \'s/^X//\'\>\$S\<\<\'aaaaaaaa\'>>$TOFILE -# sed 's/^/X/' $TEMP2>>$TOFILE - echo cat\>\$S\<\<\'aaaaaaaa\'>>$TOFILE + echo cat\>\$S\<\<\'aaaaaa\'>>$TOFILE cat $TEMP2>>$TOFILE - echo aaaaaaaa>>$TOFILE + echo aaaaaa>>$TOFILE else - #echo sed \'s/^X//\'\>\$S\<\<\'aaaaaaaa\'>>$TOFILE - echo cat\>\$S\<\<\'aaaaaaaa\'>>$TOFILE + echo cat\>\$S\<\<\'aaaaaa\'>>$TOFILE cat>$TEMPDIR/tmp.pl<<EOF open(R,"$TEMP2"); foreach(<R>){ -#print "X\$_"; print "\$_"; } close(R); EOF perl $TEMPDIR/tmp.pl>>$TOFILE - echo aaaaaaaa>>$TOFILE + echo aaaaaa>>$TOFILE fi -# hexencode -#perl -e 'while(<STDIN>){chomp;$z.="$_\r";}foreach my $i (0x00 .. 0xFF) {$x{chr($i)} = sprintf("%02X", $i); }$z =~ s/(.)/$x{$1}/g; print $z;' - -# hexdecode -#perl -e 'while(<STDIN>){$z.=$_;}$i=~s/0D/0A/g;foreach my $i (0x00 .. 0xFF) {$x{sprintf("%02X", $i)}=chr($i);}$z=~s/([0-9A-F][0-9A-F])/$x{$1}/g; print $z;' - -#if [ "$TXTMETHOD" = "shar" ]; then -# echo cat \<\<EOF\|perl -e \'while\(<STDIN>\){chomp;$z.=$_;}$z=~s/\r/\n/g;print $z;\'\>\$TMPPL >>$TOFILE -# perl -e 'while(<STDIN>){chomp;$z.="$_\r";}foreach my $i (0x00 .. 0xFF) {$x{chr($i)} = sprintf("\\%02X", $i); }$z =~ s/(.)/$x{$1}/g; print $z;' < ./build/b64decode.pl >>$TOFILE -# echo EOF >>$TOFILE -#fi - - if [ "$TXTMETHOD" = "shar" ]; then -# echo sed \'s/^X//\'\>\$S\<\<\'bbbbbbbb\'>>$TOFILE -# sed 's/^/X/' $TEMP3>>$TOFILE - echo cat\>\$I\<\<\'bbbbbbbb\'>>$TOFILE + echo cat\>\$I\<\<\'bbbbbb\'>>$TOFILE cat $TEMP3>>$TOFILE - echo aaaaaaaa>>$TOFILE - echo bbbbbbbb>>$TOFILE + echo aaaaaa>>$TOFILE + echo bbbbbb>>$TOFILE else - #echo sed \'s/^X//\'\>\$I\<\<\'bbbbbbbb\'>>$TOFILE - echo cat\>\$I\<\<\'bbbbbbbb\'>>$TOFILE + #echo sed \'s/^X//\'\>\$I\<\<\'bbbbbb\'>>$TOFILE + echo cat\>\$I\<\<\'bbbbbb\'>>$TOFILE cat>$TEMPDIR/tmp.pl<<EOF open(R,"$TEMP3"); foreach(<R>){ -#print "X\$_"; print "\$_"; } close(R); EOF perl $TEMPDIR/tmp.pl>>$TOFILE - echo bbbbbbbb>>$TOFILE + echo bbbbbb>>$TOFILE fi rm $TEMP1.$ARCMETHOD Index: PyukiWiki-Devel-UTF8/build/utf16.pl diff -u PyukiWiki-Devel-UTF8/build/utf16.pl:1.10 PyukiWiki-Devel-UTF8/build/utf16.pl:1.11 --- PyukiWiki-Devel-UTF8/build/utf16.pl:1.10 Tue Jul 31 20:19:21 2012 +++ PyukiWiki-Devel-UTF8/build/utf16.pl Tue Jul 31 23:55:04 2012 @@ -1,6 +1,6 @@ #!/usr/bin/perl # release file perl script for pyukiwiki -# $Id: utf16.pl,v 1.10 2012/07/31 11:19:21 papu Exp $ +# $Id: utf16.pl,v 1.11 2012/07/31 14:55:04 papu Exp $ use utf8; use encoding ("utf-8"); @@ -10,27 +10,20 @@ $out=$ARGV[1]; open(R,"<:utf8",$in)||die; -#binmode(R,":utf8"); open(W, ">$out")||die; foreach(<R>) { for($i=0; $i<length($_); $i++) { $c=substr($_, $i, 1); -#print ord($c) , "\n"; if(utf8::is_utf8($c) && ord($c) > 0x7f) { utf8::encode($c); -# $c = utf8::encode("utf16le", $c); from_to($c, "utf8", "utf16"); $c=~s/(.)/unpack('H2',$1)/eg; $c=~s/(feff)/\\u/g; -# $c=~s/\\u(..)(..)/\\u$2$1 -#'\\u'/eg;# . unpack('H2', $2) . unpack('H2', $1)/eg; - print W $c; } else { print W $c; } } -# print W "\n"; } close(W); close(R);
