PyukiWiki CVS Commit
pyuki****@lists*****
2012年 1月 26日 (木) 12:06:44 JST
Index: PyukiWiki-Devel-UTF8/build/Jcode-convert.pl
diff -u PyukiWiki-Devel-UTF8/build/Jcode-convert.pl:1.225 PyukiWiki-Devel-UTF8/build/Jcode-convert.pl:1.226
--- PyukiWiki-Devel-UTF8/build/Jcode-convert.pl:1.225 Tue Jan 24 18:44:35 2012
+++ PyukiWiki-Devel-UTF8/build/Jcode-convert.pl Thu Jan 26 12:06:44 2012
@@ -1,6 +1,6 @@
#!/usr/bin/perl
# release file perl script for pyukiwiki
-# $Id: Jcode-convert.pl,v 1.225 2012/01/24 09:44:35 papu Exp $
+# $Id: Jcode-convert.pl,v 1.226 2012/01/26 03:06:44 papu Exp $
use Jcode;
Index: PyukiWiki-Devel-UTF8/build/build.mk
diff -u PyukiWiki-Devel-UTF8/build/build.mk:1.225 PyukiWiki-Devel-UTF8/build/build.mk:1.226
--- PyukiWiki-Devel-UTF8/build/build.mk:1.225 Tue Jan 24 18:44:35 2012
+++ PyukiWiki-Devel-UTF8/build/build.mk Thu Jan 26 12:06:44 2012
@@ -1,5 +1,5 @@
# release file makefile for pyukiwiki
-# $Id: build.mk,v 1.225 2012/01/24 09:44:35 papu Exp $
+# $Id: build.mk,v 1.226 2012/01/26 03:06:44 papu Exp $
all:
@echo "PyukiWIki ${VERSION} Release Builder"
Index: PyukiWiki-Devel-UTF8/build/build.pl
diff -u PyukiWiki-Devel-UTF8/build/build.pl:1.225 PyukiWiki-Devel-UTF8/build/build.pl:1.226
--- PyukiWiki-Devel-UTF8/build/build.pl:1.225 Tue Jan 24 18:44:35 2012
+++ PyukiWiki-Devel-UTF8/build/build.pl Thu Jan 26 12:06:44 2012
@@ -1,6 +1,6 @@
#!/usr/bin/perl
# release file perl script for pyukiwiki
-# $Id: build.pl,v 1.225 2012/01/24 09:44:35 papu Exp $
+# $Id: build.pl,v 1.226 2012/01/26 03:06:44 papu Exp $
$DIR=$ARGV[0];
$TYPE=$ARGV[1];
@@ -573,6 +573,11 @@
}
s/([\s\t]+)?$//g;
$s=$_;
+ if($s=~/\@\@CVSURL\@\@/) {
+ $tmps=$s;
+ $tmps=~s!\@\@CVSURL\@\@/PyukiWiki\-Devel/!\@\@CVSURL\@\@/PyukiWiki\-Devel\-UTF8/!g;
+ $s.="\n\n$tmps";
+ }
while($s=~/\@\@(.+?)\@\@/) {
$rep=$1;
$s=~s/\@\@$rep\@\@/$text{$rep}/g;
Index: PyukiWiki-Devel-UTF8/build/compactmagic.pl
diff -u PyukiWiki-Devel-UTF8/build/compactmagic.pl:1.225 PyukiWiki-Devel-UTF8/build/compactmagic.pl:1.226
--- PyukiWiki-Devel-UTF8/build/compactmagic.pl:1.225 Tue Jan 24 18:44:35 2012
+++ PyukiWiki-Devel-UTF8/build/compactmagic.pl Thu Jan 26 12:06:44 2012
@@ -1,6 +1,6 @@
#!/usr/bin/perl
# release file perl script for pyukiwiki
-# $Id: compactmagic.pl,v 1.225 2012/01/24 09:44:35 papu Exp $
+# $Id: compactmagic.pl,v 1.226 2012/01/26 03:06:44 papu Exp $
$header="#----------------------------------------------------------------------\n";
print $header;
Index: PyukiWiki-Devel-UTF8/build/compressfile.pl
diff -u PyukiWiki-Devel-UTF8/build/compressfile.pl:1.225 PyukiWiki-Devel-UTF8/build/compressfile.pl:1.226
--- PyukiWiki-Devel-UTF8/build/compressfile.pl:1.225 Tue Jan 24 18:44:35 2012
+++ PyukiWiki-Devel-UTF8/build/compressfile.pl Thu Jan 26 12:06:44 2012
@@ -1,6 +1,6 @@
#!/usr/bin/perl
# yuicompressor script
-# $Id: compressfile.pl,v 1.225 2012/01/24 09:44:35 papu Exp $
+# $Id: compressfile.pl,v 1.226 2012/01/26 03:06:44 papu Exp $
$mode=$ARGV[0];
$output=$ARGV[1];
Index: PyukiWiki-Devel-UTF8/build/getversion.pl
diff -u PyukiWiki-Devel-UTF8/build/getversion.pl:1.225 PyukiWiki-Devel-UTF8/build/getversion.pl:1.226
--- PyukiWiki-Devel-UTF8/build/getversion.pl:1.225 Tue Jan 24 18:44:35 2012
+++ PyukiWiki-Devel-UTF8/build/getversion.pl Thu Jan 26 12:06:44 2012
@@ -1,6 +1,6 @@
#!/usr/bin/perl
# release file perl script for pyukiwiki
-# $Id: getversion.pl,v 1.225 2012/01/24 09:44:35 papu Exp $
+# $Id: getversion.pl,v 1.226 2012/01/26 03:06:44 papu Exp $
open(R,"lib/wiki.cgi");
foreach(<R>) {
Index: PyukiWiki-Devel-UTF8/build/lang.pl
diff -u PyukiWiki-Devel-UTF8/build/lang.pl:1.225 PyukiWiki-Devel-UTF8/build/lang.pl:1.226
--- PyukiWiki-Devel-UTF8/build/lang.pl:1.225 Tue Jan 24 18:44:35 2012
+++ PyukiWiki-Devel-UTF8/build/lang.pl Thu Jan 26 12:06:44 2012
@@ -1,5 +1,5 @@
# release file perl script for pyukiwiki
-# $Id: lang.pl,v 1.225 2012/01/24 09:44:35 papu Exp $
+# $Id: lang.pl,v 1.226 2012/01/26 03:06:44 papu Exp $
$lang=$ARGV[0];
$src=$ARGV[1];
Index: PyukiWiki-Devel-UTF8/build/makesampleini.pl
diff -u PyukiWiki-Devel-UTF8/build/makesampleini.pl:1.225 PyukiWiki-Devel-UTF8/build/makesampleini.pl:1.226
--- PyukiWiki-Devel-UTF8/build/makesampleini.pl:1.225 Tue Jan 24 18:44:35 2012
+++ PyukiWiki-Devel-UTF8/build/makesampleini.pl Thu Jan 26 12:06:44 2012
@@ -1,6 +1,6 @@
#!/usr/bin/perl
# release file perl script for pyukiwiki
-# $Id: makesampleini.pl,v 1.225 2012/01/24 09:44:35 papu Exp $
+# $Id: makesampleini.pl,v 1.226 2012/01/26 03:06:44 papu Exp $
@CHANGES=(
'\$::useExPlugin = 1; $::useExPlugin = 0;',
Index: PyukiWiki-Devel-UTF8/build/text.pl
diff -u PyukiWiki-Devel-UTF8/build/text.pl:1.225 PyukiWiki-Devel-UTF8/build/text.pl:1.226
--- PyukiWiki-Devel-UTF8/build/text.pl:1.225 Tue Jan 24 18:44:35 2012
+++ PyukiWiki-Devel-UTF8/build/text.pl Thu Jan 26 12:06:44 2012
@@ -1,5 +1,5 @@
# release file perl script for pyukiwiki
-# $Id: text.pl,v 1.225 2012/01/24 09:44:35 papu Exp $
+# $Id: text.pl,v 1.226 2012/01/26 03:06:44 papu Exp $
use Jcode;
@@ -212,6 +212,22 @@
}
+$text{HEADERPLUGIN_NANAMI}=<<EOM;
+\@\@BASEHEAD1\@\@
+#
+# \@\@PLUGINVERSION\@\@
+# Author: \@\@NANAMI\@\@ \@\@NANAMI_URL\@\@
+# $text{BASEHEAD2}
+EOM
+
+$text{HEADEREXPLUGIN_NANAMI}=<<EOM;
+\@\@BASEHEAD1\@\@
+#
+# \@\@PLUGINVERSION\@\@
+# Author: \@\@NANAMI\@\@ \@\@NANAMI_URL\@\@
+# $text{BASEHEAD2}
+EOM
+
#############################################################
# podã®ãƒ©ã‚¤ã‚»ãƒ³ã‚¹
@@ -342,14 +358,20 @@
$text{PYUKIWIKIVERSION}=qq("PyukiWiki" version $pyukiversion \$\$);
$VERSION="";
$pkg="";
+ $PLUGIN="";
+ $EXPLUGIN="";
$chkbuf="";
open(R,"$fn");
foreach(<R>) {
$chkbuf.=$_;
if(/^\$VERSION/) {
eval $_ ;
- }elsif(/^package\s?(.*?);/) {
+ } elsif(/^package\s?(.*?);/) {
$pkg=$1;
+ } elsif(/^\$PLUGIN/) {
+ eval $_;
+ } elsif(/^\$EXPLUGIN/) {
+ eval $_;
}
}
close(R);
@@ -367,7 +389,11 @@
$text{CODE}="EUC-JP";
}
}
- if($VERSION ne '' && $pkg ne '') {
+ if($VERSION ne '' && $PLUGIN ne '') {
+ $text{PLUGINVERSION}=qq("$PLUGIN" version $VERSION \$\$);
+ } elsif($VERSION ne '' && $EXPLUGIN ne '') {
+ $text{PLUGINVERSION}=qq("$EXPLUGIN" version $VERSION \$\$);
+ } elsif($VERSION ne '' && $pkg ne '') {
$text{MODULEVERSION}=qq("$pkg" version $VERSION \$\$);
} else {
$text{MODULEVERSION}=$text{PYUKIWIKIVERSION};