PyukiWiki

[Pyukiwiki-cvs 0003063] CVS update: PyukiWiki-Devel-UTF8/build

PyukiWiki CVS Commit pyuki****@lists*****
2012年 1月 23日 (月) 18:17:08 JST

• 前の記事 [Pyukiwiki-cvs 0003082] CVS update: PyukiWiki-Devel-UTF8/backup
• 次の記事 [Pyukiwiki-cvs 0003075] CVS update: PyukiWiki-Devel-UTF8/cache
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Index: PyukiWiki-Devel-UTF8/build/Jcode-convert.pl
diff -u PyukiWiki-Devel-UTF8/build/Jcode-convert.pl:1.222 PyukiWiki-Devel-UTF8/build/Jcode-convert.pl:1.223
--- PyukiWiki-Devel-UTF8/build/Jcode-convert.pl:1.222	Mon Jan 23 14:51:45 2012
+++ PyukiWiki-Devel-UTF8/build/Jcode-convert.pl	Mon Jan 23 18:17:08 2012
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # release file perl script for pyukiwiki
-# $Id: Jcode-convert.pl,v 1.222 2012/01/23 05:51:45 papu Exp $
+# $Id: Jcode-convert.pl,v 1.223 2012/01/23 09:17:08 papu Exp $
 
 use Jcode;
 
Index: PyukiWiki-Devel-UTF8/build/build.mk
diff -u PyukiWiki-Devel-UTF8/build/build.mk:1.222 PyukiWiki-Devel-UTF8/build/build.mk:1.223
--- PyukiWiki-Devel-UTF8/build/build.mk:1.222	Mon Jan 23 14:51:45 2012
+++ PyukiWiki-Devel-UTF8/build/build.mk	Mon Jan 23 18:17:08 2012
@@ -1,5 +1,5 @@
 # release file makefile for pyukiwiki
-# $Id: build.mk,v 1.222 2012/01/23 05:51:45 papu Exp $
+# $Id: build.mk,v 1.223 2012/01/23 09:17:08 papu Exp $
 
 all:
 	@echo "PyukiWIki ${VERSION} Release Builder"
@@ -223,4 +223,4 @@
 
 ftp:
 	@echo "Uploading public file mirrorling"
-	perl ${BUILDDIR}/ftp.pl
+	${PERL} ${BUILDDIR}/ftp.pl
Index: PyukiWiki-Devel-UTF8/build/build.pl
diff -u PyukiWiki-Devel-UTF8/build/build.pl:1.222 PyukiWiki-Devel-UTF8/build/build.pl:1.223
--- PyukiWiki-Devel-UTF8/build/build.pl:1.222	Mon Jan 23 14:51:45 2012
+++ PyukiWiki-Devel-UTF8/build/build.pl	Mon Jan 23 18:17:08 2012
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # release file perl script for pyukiwiki
-# $Id: build.pl,v 1.222 2012/01/23 05:51:45 papu Exp $
+# $Id: build.pl,v 1.223 2012/01/23 09:17:08 papu Exp $
 
 $DIR=$ARGV[0];
 $TYPE=$ARGV[1];
@@ -26,6 +26,7 @@
 $compact_ignore='^aguse|^google\_analytics|^linktrack|^ck.inc.pl|^ipv6check|^backup|^pcomment|^back|^hr|^navi|^setlinebreak|^yetlist|^slashpage|^qrcode|^lang\.|^topicpath|^setting|^debug|^Jcode|^Jcode\.pm|magic\.txt|\.en\.(js|css|cgi|txt)|^bugtrack|^(fr|no).*\.inc\.pl|^servererror|^server|^sitemap|^showrss|^perlpod|^Pod|^versionlist|^listfrozen|^urlhack|^punyurl|^opml|^HTTP|^Lite\.pm|^OPML|^atom|^ATOM|^search\_fuzzy|^Search\.pm$|^login|^twitter|\.en\.txt$|GZIP|compressbackup|^logs|^smedia|^GZIP';
 $releasec_ignore=$common_ignore . $compact_ignore . '|^debug\.inc\.pl|\.pod$|magic\.txt|\.zip|\.src$';
 $updatec_ignore=$common_ignore . $compact_ignore. '|^debug\.inc\.pl|\.pod$|magic\.txt|\.zip$|\.src$|htaccess|htpasswd';
+#$compact_filter="./build/obfuscator.pl";
 
 if($ALLFLG eq 'all') {
 	$devel_ignore=$all_ignore . '|\.zip$';
@@ -548,6 +549,12 @@
 #		next if(/^#\t/ && $commentcut eq 1 && $old!~/\.ini/);
 #		next if(/^#\t/ && $commentcut eq 1 && $old!~/\.ini/);
 
+#		# 内部コード変換
+#		if($new=~/\.pl$|\.cgi$/ && $new!~/\.ini\.cgi$/) {
+#			s/([\x80-\xff])/'\\' . unpack('H2', $1)/eg
+#				if(!/#/);
+#		}
+
 		if(!/\#\s{0,3}debug/ || /\#([\s\t]+)?comment/ || $debug eq 1) {
 			$ii=0;
 			if($commentcut eq 1) {
@@ -591,6 +598,50 @@
 	}
 	close(W);
 	close(R);
+	# for compact
+	if(0) {
+	if($TYPE=~/compact/ && $new=~/\.pl$|\.cgi$/ && $new!~/\.ini\.cgi$/) {
+		open(R,"$new");
+		my $all;
+		my $head;
+		my $flg=0;
+		foreach(<R>) {
+			if(/^#/ && $flg eq 0) {
+				$head.=$_;
+			} else {
+				$flg++;
+				$all.=$_;
+			}
+		}
+		close(R);
+		open(W,">tmp");
+		print W $all;
+		close(W);
+		my $out;
+		my $path;
+		foreach(split(/:/,$ENV{PATH})) {
+			$path="$_/perl";
+			last if(-x $path && -r $path);
+			$path="not found";
+		}
+		open(PIPE,"$path $compact_filter tmp|");
+		foreach(<PIPE>) {
+			next if(/^#/ || $_ eq '');
+			$out.=$_;
+		}
+		close(PIPE);
+		unlink("tmp");
+		open(W,">$new");
+		print W $head;
+		$out=~s/\_\_DATA\_\_/\n\_\_DATA\_\_\n/g;
+		$out=~s/\_\_END\_\_/\n\_\_END\_\_\n/g;
+		while($out=~/\n\n/) {
+			$out=~s/\n\n/\n/g;
+		}
+		print W $out;
+		close(W);
+	}
+	}
 	chmod(oct($chmod),"$new");
 	unlink("utf8.tmp");
 }
Index: PyukiWiki-Devel-UTF8/build/compactmagic.pl
diff -u PyukiWiki-Devel-UTF8/build/compactmagic.pl:1.222 PyukiWiki-Devel-UTF8/build/compactmagic.pl:1.223
--- PyukiWiki-Devel-UTF8/build/compactmagic.pl:1.222	Mon Jan 23 14:51:45 2012
+++ PyukiWiki-Devel-UTF8/build/compactmagic.pl	Mon Jan 23 18:17:08 2012
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # release file perl script for pyukiwiki
-# $Id: compactmagic.pl,v 1.222 2012/01/23 05:51:45 papu Exp $
+# $Id: compactmagic.pl,v 1.223 2012/01/23 09:17:08 papu Exp $
 
 $header="#----------------------------------------------------------------------\n";
 print $header;
Index: PyukiWiki-Devel-UTF8/build/compressfile.pl
diff -u PyukiWiki-Devel-UTF8/build/compressfile.pl:1.222 PyukiWiki-Devel-UTF8/build/compressfile.pl:1.223
--- PyukiWiki-Devel-UTF8/build/compressfile.pl:1.222	Mon Jan 23 14:51:45 2012
+++ PyukiWiki-Devel-UTF8/build/compressfile.pl	Mon Jan 23 18:17:08 2012
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # yuicompressor script
-# $Id: compressfile.pl,v 1.222 2012/01/23 05:51:45 papu Exp $
+# $Id: compressfile.pl,v 1.223 2012/01/23 09:17:08 papu Exp $
 
 $mode=$ARGV[0];
 $output=$ARGV[1];
Index: PyukiWiki-Devel-UTF8/build/getversion.pl
diff -u PyukiWiki-Devel-UTF8/build/getversion.pl:1.222 PyukiWiki-Devel-UTF8/build/getversion.pl:1.223
--- PyukiWiki-Devel-UTF8/build/getversion.pl:1.222	Mon Jan 23 14:51:45 2012
+++ PyukiWiki-Devel-UTF8/build/getversion.pl	Mon Jan 23 18:17:08 2012
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # release file perl script for pyukiwiki
-# $Id: getversion.pl,v 1.222 2012/01/23 05:51:45 papu Exp $
+# $Id: getversion.pl,v 1.223 2012/01/23 09:17:08 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.222 PyukiWiki-Devel-UTF8/build/lang.pl:1.223
--- PyukiWiki-Devel-UTF8/build/lang.pl:1.222	Mon Jan 23 14:51:45 2012
+++ PyukiWiki-Devel-UTF8/build/lang.pl	Mon Jan 23 18:17:08 2012
@@ -1,5 +1,5 @@
 # release file perl script for pyukiwiki
-# $Id: lang.pl,v 1.222 2012/01/23 05:51:45 papu Exp $
+# $Id: lang.pl,v 1.223 2012/01/23 09:17:08 papu Exp $
 
 $lang=$ARGV[0];
 $src=$ARGV[1];
Index: PyukiWiki-Devel-UTF8/build/makesampleini.pl
diff -u PyukiWiki-Devel-UTF8/build/makesampleini.pl:1.222 PyukiWiki-Devel-UTF8/build/makesampleini.pl:1.223
--- PyukiWiki-Devel-UTF8/build/makesampleini.pl:1.222	Mon Jan 23 14:51:45 2012
+++ PyukiWiki-Devel-UTF8/build/makesampleini.pl	Mon Jan 23 18:17:08 2012
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # release file perl script for pyukiwiki
-# $Id: makesampleini.pl,v 1.222 2012/01/23 05:51:45 papu Exp $
+# $Id: makesampleini.pl,v 1.223 2012/01/23 09:17:08 papu Exp $
 
 @CHANGES=(
 	'\$::useExPlugin = 1;	$::useExPlugin = 0;',
Index: PyukiWiki-Devel-UTF8/build/text.pl
diff -u PyukiWiki-Devel-UTF8/build/text.pl:1.222 PyukiWiki-Devel-UTF8/build/text.pl:1.223
--- PyukiWiki-Devel-UTF8/build/text.pl:1.222	Mon Jan 23 14:51:45 2012
+++ PyukiWiki-Devel-UTF8/build/text.pl	Mon Jan 23 18:17:08 2012
@@ -1,5 +1,5 @@
 # release file perl script for pyukiwiki
-# $Id: text.pl,v 1.222 2012/01/23 05:51:45 papu Exp $
+# $Id: text.pl,v 1.223 2012/01/23 09:17:08 papu Exp $
 
 use Jcode;
 
@@ -13,31 +13,33 @@
 # ヘッダ
 
 $text{YEAR}=$year;
+if($TYPE=~/compact/) {
+$text{BASEHEAD1}=<<EOM;
+\@\@FILENAME\@\@ - \$Id\$
+EOM
+} else {
 $text{BASEHEAD1}=<<EOM;
 \@\@FILENAME\@\@ - This is PyukiWiki, yet another Wiki clone.
 # \$Id\$
 EOM
+}
 
 if($TYPE=~/compact/) {
 $text{BASEHEAD2}=<<EOM;
-Copyright (C) 2004-$year by Nekyo.
-# \@\@NEKYO_URL\@\@
-# Copyright (C) 2005-$year PyukiWiki Developers Team
-# \@\@PYUKI_URL\@\@
-# Return:\@\@CRLF\@\@ Code=\@\@CODE\@\@ 1TAB=4Spaces
+Copyright(C) 2005-$year PyukiWiki Developers Team/2004-$year Nekyo
+# \@\@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>
+Copyright(C)2000-$year - Laurent Destailleur - <eldy (at) users (dot) sourceforge (dot) net>
 # \@\@AWSTATS_URL\@\@
-# Copyright (C) 2004-$year by Nekyo.
-# \@\@NEKYO_URL\@\@
-# Copyright (C) 2005-$year PyukiWiki Developers Team
-# \@\@PYUKI_URL\@\@
-# Return:\@\@CRLF\@\@ Code=\@\@CODE\@\@ 1TAB=4Spaces
+Copyright(C) 2005-$year PyukiWiki Developers Team/2004-$year Nekyo
+# \@\@PYUKI_URL\@\@  \@\@NEKYO_URL\@\@
+# @\@CRLF\@\@ \@\@CODE\@\@ 4Spaces GPL2 and/or Artistic License
 EOM
 } else {
 $text{BASEHEAD2}=<<EOM;
-Copyright (C) 2004-$year by Nekyo.
+Copyright (C) 2004-$year Nekyo
 # \@\@NEKYO_URL\@\@
 # Copyright (C) 2005-$year PyukiWiki Developers Team
 # \@\@PYUKI_URL\@\@
@@ -52,7 +54,7 @@
 $text{BASEHEAD4}=<<EOM;
 Copyright (C) 2000-$year - Laurent Destailleur - <eldy (at) users (dot) sourceforge (dot) net>
 # \@\@AWSTATS_URL\@\@
-# Copyright (C) 2004-$year by Nekyo.
+# Copyright (C) 2004-$year Nekyo
 # \@\@NEKYO_URL\@\@
 # Copyright (C) 2005-$year PyukiWiki Developers Team
 # \@\@PYUKI_URL\@\@
@@ -73,6 +75,8 @@
 # $text{BASEHEAD2}
 EOM
 
+if($TYPE=~/compact/) {
+
 $text{HEADER2_NEKYO}=<<EOM;
 \@\@BASEHEAD1\@\@
 #
@@ -85,6 +89,72 @@
 \@\@BASEHEAD1\@\@
 #
 # \@\@PYUKIWIKIVERSION\@\@
+# Author: \@\@NANAMI\@\@
+# $text{BASEHEAD2}
+EOM
+
+$text{HEADER2_YUKI}=<<EOM;
+\@\@BASEHEAD1\@\@
+#
+# \@\@PYUKIWIKIVERSION\@\@
+# Author: \@\@YUKI\@\@
+# $text{BASEHEAD2}
+EOM
+
+$text{HEADER2_JUNICHI}=<<EOM;
+\@\@BASEHEAD1\@\@
+#
+# \@\@PYUKIWIKIVERSION\@\@
+# Author: \@\@JUNICHI\@\@
+# $text{BASEHEAD2}
+EOM
+
+$text{HEADER2_YASHIGANIMODOKI}=<<EOM;
+\@\@BASEHEAD1\@\@
+#
+# \@\@PYUKIWIKIVERSION\@\@
+# Author: \@\@YASHIGANIMODOKI\@\@
+# $text{BASEHEAD2}
+EOM
+
+$text{HEADER3_NANAMI}=<<EOM;
+\@\@BASEHEAD1\@\@
+#
+# \@\@MODULEVERSION\@\@
+# Author: \@\@NANAMI\@\@
+# $text{BASEHEAD2}
+EOM
+
+$text{HEADER3_YUKI}=<<EOM;
+\@\@BASEHEAD1\@\@
+#
+# \@\@MODULEVERSION\@\@
+# Author: \@\@YUKI\@\@
+# $text{BASEHEAD2}
+EOM
+
+$text{HEADER4_AWS}=<<EOM;
+\@\@BASEHEAD1\@\@
+#
+# \@\@PYUKIWIKIVERSION\@\@
+# Author: \@\@NANAMI\@\@
+# $text{BASEHEAD4}
+EOM
+
+} else {
+
+$text{HEADER2_NEKYO}=<<EOM;
+\@\@BASEHEAD1\@\@
+#
+# \@\@PYUKIWIKIVERSION\@\@
+# Author: \@\@NEKYO\@\@ \@\@NEKYO_URL\@\@
+# $text{BASEHEAD2}
+EOM
+
+$text{HEADER2_NANAMI}=<<EOM;
+\@\@BASEHEAD1\@\@
+#
+# \@\@PYUKIWIKIVERSION\@\@
 # Author: \@\@NANAMI\@\@ \@\@NANAMI_URL\@\@
 # $text{BASEHEAD2}
 EOM
@@ -140,6 +210,8 @@
 # $text{BASEHEAD4}
 EOM
 
+}
+
 #############################################################
 # podのライセンス
 

• 前の記事 [Pyukiwiki-cvs 0003082] CVS update: PyukiWiki-Devel-UTF8/backup
• 次の記事 [Pyukiwiki-cvs 0003075] CVS update: PyukiWiki-Devel-UTF8/cache
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]