OSDN -- Développer et télécharger des logiciels Open Source
Traduction statut du Français translation status for fr

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

Back to archive index

PyukiWiki CVS Commit pyuki****@lists*****
2012年 7月 31日 (火) 23:09:39 JST 

Index: PyukiWiki-Devel-UTF8/build/compressfile.pl
diff -u PyukiWiki-Devel-UTF8/build/compressfile.pl:1.386 PyukiWiki-Devel-UTF8/build/compressfile.pl:1.387
--- PyukiWiki-Devel-UTF8/build/compressfile.pl:1.386	Tue Jul 31 22:50:15 2012
+++ PyukiWiki-Devel-UTF8/build/compressfile.pl	Tue Jul 31 23:09:39 2012
@@ -1,7 +1,8 @@
 #!/usr/bin/perl
 # yuicompressor script
-# $Id: compressfile.pl,v 1.386 2012/07/31 13:50:15 papu Exp $
+# $Id: compressfile.pl,v 1.387 2012/07/31 14:09:39 papu Exp $
 
+use HTML::Packer;
 use JavaScript::Packer;
 use CSS::Packer;
 
@@ -147,6 +148,15 @@
 		open(W, ">$input.tmp2")||die("$input.tmp2 can't write");
 		print W $scalarref;
 	 	close(W);
+	} elsif($mode eq "html") {
+		my $packer=HTML::Packer->init();
+		open(R, "$input.tmp")||die("$input.tmp not found");
+		$scalarref=join('', <R>);
+		close(R);
+		$packer->minify( \$scalarref, { remove_comments=>1, remove_newlines=>1 });
+		open(W, ">$input.tmp2")||die("$input.tmp2 can't write");
+		print W $scalarref;
+	 	close(W);
 	}
 #	&shell("$compress{$mode} $input.tmp2 $input.tmp");
 }
Index: PyukiWiki-Devel-UTF8/build/installer.sh
diff -u PyukiWiki-Devel-UTF8/build/installer.sh:1.141 PyukiWiki-Devel-UTF8/build/installer.sh:1.142
--- PyukiWiki-Devel-UTF8/build/installer.sh:1.141	Tue Jul 31 20:19:21 2012
+++ PyukiWiki-Devel-UTF8/build/installer.sh	Tue Jul 31 23:09:39 2012
@@ -1,7 +1,7 @@
 #!/bin/sh
 ######################################################################
 # PyukiWiki Installer CGI version 0.3
-# $Id: installer.sh,v 1.141 2012/07/31 11:19:21 papu Exp $
+# $Id: installer.sh,v 1.142 2012/07/31 14:09:39 papu Exp $
 # PyukiWiki __PYUKIWIKIVERSION____BUILD__ (__CODE__)
 ######################################################################
 export PATH="/bin:/usr/bin:/usr/local/bin:/opt/bin:/usr/opt/bin:/usr/opt/sbin:/bin:/usr/sbin:/usr/local/sbin:/usr/games:/usr/games/bin:$PATH"
@@ -30,24 +30,14 @@
 			cat <<EOF
 $httpheader
 
-<html><head><title>PyukiWikiインストーラ</title></head>
-<body><h2>PyukiWikiインストーラ エラー</h2>
-<hr>
-PyukiWiki CGIインストーラは以下の理由で正常に起動できませんでした。
-手動でインストールして下さい。
-<hr>
+<html><head><title>PyukiWikiインストーラ</title></head><body><h2>PyukiWikiインストーラ エラー</h2><hr>PyukiWiki CGIインストーラは以下の理由で正常に起動できませんでした。<br>手動でインストールして下さい。<hr>
 $1
 EOF
 		else
 			cat <<EOF
 $httpheader
 
-<html><head><title>PyukiWiki Installer</title></head>
-<body><h2>PyukiWiki Installer</h2>
-<hr>
-Can't execute PyukiWiki CGI Installer<br>
-Prease manual install
-<hr>
+<html><head><title>PyukiWiki Installer</title></head><body><h2>PyukiWiki Installer</h2><hr>Can't execute PyukiWiki CGI Installer<br>Prease manual install<hr>
 $1
 EOF
 		fi
Index: PyukiWiki-Devel-UTF8/build/installer_sub.sh
diff -u PyukiWiki-Devel-UTF8/build/installer_sub.sh:1.42 PyukiWiki-Devel-UTF8/build/installer_sub.sh:1.43
--- PyukiWiki-Devel-UTF8/build/installer_sub.sh:1.42	Tue Jul 31 21:49:50 2012
+++ PyukiWiki-Devel-UTF8/build/installer_sub.sh	Tue Jul 31 23:09:39 2012
@@ -34,8 +34,8 @@
 HEADEN="<html><head><title>PyukiWiki $NAMEEN</title>"
 BODYJA="<body><h2>PyukiWiki$NAMEJA</h2>"
 BODYEN="<body><h2>PyukiWiki $NAMEEN</h2>"
-FOOTJA='<hr><div id="footer"><strong><a href="http://pyukiwiki.info/" class="link" title="PyukiWiki 0.2.1-alpha2-dev3">PyukiWiki 0.2.1-alpha2-dev3</a></strong>Copyright&copy; 2004-2012 by <a href="" class="link" title="Nekyo">Nekyo</a>, <a href="http://pyukiwiki.info/" class="link" title="PyukiWiki Developers Team">PyukiWiki Developers Team</a>License is <a href="http://sfjp.jp/projects/opensource/wiki/GPLv3_Info" class="link" title="GPL">GPL</a>, <a href="http://www.opensource.jp/artistic/ja/Artistic-ja.html" class="link" title="Artistic">Artistic</a><br>Based on &quot;<a href="http://www.hyuki.com/yukiwiki/" class="link" title="YukiWiki">YukiWiki</a>&quot; 2.1.0 by <a href="http://www.hyuki.com/" class="link" title="yuki">yuki</a>and <a href="http://pukiwiki.sfjp.jp/" class="link" title="PukiWiki">PukiWiki</a> by <a href="http://pukiwiki.sfjp.jp/" class="link" title="PukiWiki Developers Term">PukiWiki Developers Term</a><br><a href="http://pyukiwiki.info/" class="link" tit
 le="PyukiWiki Installer version $IVER">PyukiWiki Installer version $IVER</a></div></div></div></body></html>'
-FOOTEN='<hr><div id="footer"><strong><a href="http://pyukiwiki.info/" class="link" title="PyukiWiki Installer 0.2.1-alpha2-dev3">PyukiWiki Installer 0.2.1-alpha2-dev3</a></strong>Copyright&copy; 2004-2012 by <a href="" class="link" title="Nekyo">Nekyo</a>, <a href="http://pyukiwiki.info/" class="link" title="PyukiWiki Developers Team">PyukiWiki Developers Team</a>License is <a href="http://www.gnu.org/licenses/gpl.html" class="link" title="GPL">GPL</a>, <a href="http://www.perl.com/language/misc/Artistic.html" class="link" title="Artistic">Artistic</a><br>Based on &quot;<a href="http://www.hyuki.com/yukiwiki/" class="link" title="YukiWiki">YukiWiki</a>&quot; 2.1.0 by <a href="http://www.hyuki.com/" class="link" title="yuki">yuki</a>and <a href="http://pukiwiki.sfjp.jp/" class="link" title="PukiWiki">PukiWiki</a> by <a href="http://pukiwiki.sfjp.jp/" class="link" title="PukiWiki Developers Term">PukiWiki Developers Term</a><br><a href="http://pyukiwiki.info/" class="link" tit
 le="PyukiWiki Installer version $IVER">PyukiWiki Installer version $IVER</a></div></div></div></body></html>'
+FOOTJA='<hr><div id="footer"><strong><a href="http://pyukiwiki.info/" class="link" title="PyukiWiki 0.2.1-alpha2-dev3">PyukiWiki 0.2.1-alpha2-dev3</a></strong>Copyright&copy; 2004-2007 by Nekyo, <a href="http://pyukiwiki.info/" class="link" title="PyukiWiki Developers Team">PyukiWiki Developers Team</a>License is <a href="http://sfjp.jp/projects/opensource/wiki/GPLv3_Info" class="link" title="GPL">GPL</a>, <a href="http://www.opensource.jp/artistic/ja/Artistic-ja.html" class="link" title="Artistic">Artistic</a><br>Based on &quot;<a href="http://www.hyuki.com/yukiwiki/" class="link" title="YukiWiki">YukiWiki</a>&quot; 2.1.0 by <a href="http://www.hyuki.com/" class="link" title="yuki">yuki</a>and <a href="http://pukiwiki.sfjp.jp/" class="link" title="PukiWiki">PukiWiki</a> by <a href="http://pukiwiki.sfjp.jp/" class="link" title="PukiWiki Developers Term">PukiWiki Developers Term</a><br><a href="http://pyukiwiki.info/" class="link" title="PyukiWiki Installer version $IVER">Pyu
 kiWiki Installer version $IVER</a></div></div></div></body></html>'
+FOOTEN='<hr><div id="footer"><strong><a href="http://pyukiwiki.info/" class="link" title="PyukiWiki Installer 0.2.1-alpha2-dev3">PyukiWiki Installer 0.2.1-alpha2-dev3</a></strong>Copyright&copy; 2004-2007 by Nekyo, <a href="http://pyukiwiki.info/" class="link" title="PyukiWiki Developers Team">PyukiWiki Developers Team</a>License is <a href="http://www.gnu.org/licenses/gpl.html" class="link" title="GPL">GPL</a>, <a href="http://www.perl.com/language/misc/Artistic.html" class="link" title="Artistic">Artistic</a><br>Based on &quot;<a href="http://www.hyuki.com/yukiwiki/" class="link" title="YukiWiki">YukiWiki</a>&quot; 2.1.0 by <a href="http://www.hyuki.com/" class="link" title="yuki">yuki</a>and <a href="http://pukiwiki.sfjp.jp/" class="link" title="PukiWiki">PukiWiki</a> by <a href="http://pukiwiki.sfjp.jp/" class="link" title="PukiWiki Developers Term">PukiWiki Developers Term</a><br><a href="http://pyukiwiki.info/" class="link" title="PyukiWiki Installer version $IVER">Pyu
 kiWiki Installer version $IVER</a></div></div></div></body></html>'
 
 getversion() {
 	# pyukiwiki
@@ -208,7 +208,7 @@
 fi
 
 if [ "$CMD" = "license" ]; then
-	cat $QS.html
+	cat $QS.htm
 	exit
 fi
 
Index: PyukiWiki-Devel-UTF8/build/makeinstaller.sh
diff -u PyukiWiki-Devel-UTF8/build/makeinstaller.sh:1.140 PyukiWiki-Devel-UTF8/build/makeinstaller.sh:1.141
--- PyukiWiki-Devel-UTF8/build/makeinstaller.sh:1.140	Tue Jul 31 20:19:21 2012
+++ PyukiWiki-Devel-UTF8/build/makeinstaller.sh	Tue Jul 31 23:09:39 2012
@@ -1,7 +1,7 @@
 #!/bin/sh
 #--------------------------------------------------------------
 # PyukiWiki Installer CGI Maker
-# $Id: makeinstaller.sh,v 1.140 2012/07/31 11:19:21 papu Exp $
+# $Id: makeinstaller.sh,v 1.141 2012/07/31 14:09:39 papu Exp $
 #--------------------------------------------------------------
 ZIPCMD=$1
 P7ZCMD=$2
@@ -39,7 +39,12 @@
 	fi
 #	echo cp ./build/installer_sub.sh $TEMP1
 	cd build
-	tar cvf $TEMP1 installer_sub.sh *.html >/dev/null 2>/dev/null
+	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
+
+	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


Pyukiwiki-cvs メーリングリストの案内
Back to archive index