PyukiWiki CVS Commit
pyuki****@lists*****
2012年 1月 28日 (土) 00:44:57 JST
Index: PyukiWiki-Devel-UTF8/build/Jcode-convert.pl
diff -u PyukiWiki-Devel-UTF8/build/Jcode-convert.pl:1.238 PyukiWiki-Devel-UTF8/build/Jcode-convert.pl:1.239
--- PyukiWiki-Devel-UTF8/build/Jcode-convert.pl:1.238 Fri Jan 27 03:04:31 2012
+++ PyukiWiki-Devel-UTF8/build/Jcode-convert.pl Sat Jan 28 00:44:57 2012
@@ -1,6 +1,6 @@
#!/usr/bin/perl
# release file perl script for pyukiwiki
-# $Id: Jcode-convert.pl,v 1.238 2012/01/26 18:04:31 papu Exp $
+# $Id: Jcode-convert.pl,v 1.239 2012/01/27 15:44:57 papu Exp $
use Jcode;
Index: PyukiWiki-Devel-UTF8/build/build.mk
diff -u PyukiWiki-Devel-UTF8/build/build.mk:1.238 PyukiWiki-Devel-UTF8/build/build.mk:1.239
--- PyukiWiki-Devel-UTF8/build/build.mk:1.238 Fri Jan 27 03:04:31 2012
+++ PyukiWiki-Devel-UTF8/build/build.mk Sat Jan 28 00:44:57 2012
@@ -1,5 +1,5 @@
# release file makefile for pyukiwiki
-# $Id: build.mk,v 1.238 2012/01/26 18:04:31 papu Exp $
+# $Id: build.mk,v 1.239 2012/01/27 15:44:57 papu Exp $
all:
@echo "PyukiWIki ${VERSION} Release Builder"
@@ -10,6 +10,7 @@
pkg:
@${MAKE} -f ${BUILDDIR}/build.mk cvsclean
+ @${MAKE} -f ${BUILDDIR}/build.mk pkgclean
@${MAKE} -f ${BUILDDIR}/build.mk pkgziputf8 PKGTYPE=devel PKGPREFIX="-devel"
@${MAKE} -f ${BUILDDIR}/build.mk pkgziputf8update PKGTYPE=updatedevel PKGPREFIX="-update-devel"
@${MAKE} -f ${BUILDDIR}/build.mk pkgziputf8update PKGTYPE=updatecompact PKGPREFIX="-update-compact"
@@ -79,33 +80,48 @@
@echo "Building ${PKGNAME}-${VERSION}-compact-utf8"
@${PERL} ${BUILDDIR}/build.pl ${RELEASE}/ "compact" lf utf8 >/dev/null
+ @${SH} ${BUILDDIR}/makeinstaller.sh "${ZIP_7Z}" "${7Z_7Z}" ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}.tar.gz ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}_installer_gz_uu ${VERSION} ${PKGPREFIX} gz uu EUC
+ @${SH} ${BUILDDIR}/makeinstaller.sh "${ZIP_7Z}" "${7Z_7Z}" ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}.tar.bz2 ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}_installer_bz2_b64 ${VERSION} ${PKGPREFIX} bz2 b64 EUC
+ @${SH} ${BUILDDIR}/makeinstaller.sh "${ZIP_7Z}" "${7Z_7Z}" ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}.tar.xz ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}_installer_xz_b64 ${VERSION} ${PKGPREFIX} xz b64 EUC
+ @echo "Compress ${PKGNAME}-${VERSION}${PKGPREFIX}.zip"
pkgtgzutf8:
- @echo "Building ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar.gz"
+ @echo "Building ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8"
@rm -rf ${TEMP} ${RELEASE}
@mkdir ${TEMP} 2>/dev/null
@mkdir ${RELEASE} 2>/dev/null
@mkdir ${RELEASE}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8 2>/dev/null
@${PERL} ${BUILDDIR}/build.pl ${RELEASE}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8 ${PKGTYPE} lf utf8 >/dev/null
@cd ${RELEASE} && ${TAR} ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar * >/dev/null 2>/dev/null
-# @cd ${RELEASE} && ${GZIP} ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar >/dev/null 2>/dev/null
+ @echo "Compress ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar.gz"
@cd ${RELEASE} && ${GZIP_7Z} ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar.gz ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar >/dev/null 2>/dev/null
+ @echo "Compress ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar.bz2"
+ @cd ${RELEASE} && ${BZIP2_7Z} ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar.bz2 ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar >/dev/null 2>/dev/null
+ @echo "Compress ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar.xz"
+ @cd ${RELEASE} && ${XZ_7Z} ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar.xz ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar >/dev/null 2>/dev/null
@rm ${RELEASE}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar
@${PERL} -e 'mkdir("${ARCHIVEDIR}");' 2>/dev/null
@${PERL} -e 'mkdir("${ARCHIVEDIR}/${PKGNAME}-${VERSION}");' 2>/dev/null
@cp ${RELEASE}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar.gz ${ARCHIVEDIR}/${PKGNAME}-${VERSION}
+ @cp ${RELEASE}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar.bz2 ${ARCHIVEDIR}/${PKGNAME}-${VERSION}
+ @cp ${RELEASE}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar.xz ${ARCHIVEDIR}/${PKGNAME}-${VERSION}
@rm ${RELEASE}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar.gz
+ @rm ${RELEASE}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar.bz2
+ @rm ${RELEASE}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar.xz
+ @${SH} ${BUILDDIR}/makeinstaller.sh "${ZIP_7Z}" "${7Z_7Z}" ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar.gz ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8_installer_gz_uu ${VERSION} ${PKGPREFIX} gz uu UTF-8
+ @${SH} ${BUILDDIR}/makeinstaller.sh "${ZIP_7Z}" "${7Z_7Z}" ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar.bz2 ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8_installer_bz2_b64 ${VERSION} ${PKGPREFIX} bz2 b64 UTF-8
+ @${SH} ${BUILDDIR}/makeinstaller.sh "${ZIP_7Z}" "${7Z_7Z}" ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.tar.xz ${ARCHIVEDIR}/${PKGNAME}-${VERSION}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8_installer_xz_b64 ${VERSION} ${PKGPREFIX} xz b64 UTF-8
pkgziputf8:
- @echo "Building ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.zip"
+ @echo "Building ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8"
@rm -rf ${TEMP} ${RELEASE}
@mkdir ${TEMP} 2>/dev/null
@mkdir ${RELEASE} 2>/dev/null
@mkdir ${RELEASE}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8 2>/dev/null
@${PERL} ${BUILDDIR}/build.pl ${RELEASE}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8 ${PKGTYPE} crlf utf8>/dev/null
-# @cd ${RELEASE} && ${ZIP} zip.zip ${PKGNAME}-${VERSION}${PKGPREFIX}/* >/dev/null 2>/dev/null
+ @echo "Compress ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.zip"
@cd ${RELEASE} && ${ZIP_7Z} zip.zip ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8/* ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8/.htaccess >/dev/null 2>/dev/null
@${PERL} -e 'mkdir("${ARCHIVEDIR}");' 2>/dev/null
@${PERL} -e 'mkdir("${ARCHIVEDIR}/${PKGNAME}-${VERSION}");' 2>/dev/null
@@ -113,13 +129,13 @@
@rm ${RELEASE}/zip.zip
pkgziputf8update:
- @echo "Building ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.zip"
+ @echo "Building ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8"
@rm -rf ${TEMP} ${RELEASE}
@mkdir ${TEMP} 2>/dev/null
@mkdir ${RELEASE} 2>/dev/null
@mkdir ${RELEASE}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8 2>/dev/null
@${PERL} ${BUILDDIR}/build.pl ${RELEASE}/${PKGNAME}-${VERSION}${PKGPREFIX}-utf8 ${PKGTYPE} crlf utf8>/dev/null
-# @cd ${RELEASE} && ${ZIP} zip.zip ${PKGNAME}-${VERSION}${PKGPREFIX}/* >/dev/null 2>/dev/null
+ @echo "Compress ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8.zip"
@cd ${RELEASE} && ${ZIP_7Z} zip.zip ${PKGNAME}-${VERSION}${PKGPREFIX}-utf8/* >/dev/null 2>/dev/null
@${PERL} -e 'mkdir("${ARCHIVEDIR}");' 2>/dev/null
@${PERL} -e 'mkdir("${ARCHIVEDIR}/${PKGNAME}-${VERSION}");' 2>/dev/null
@@ -130,6 +146,11 @@
@echo "Cleaning work directorys"
@rm -rf ${TEMP} ${RELEASE}
+pkgclean:
+ @echo "Cleaning Arvhive directorys"
+ @rm -rf ${TEMP} ${RELEASE} ${ARCHIVEDIR}
+
+
cvsclean:
@echo "Cleaning CVS tags"
@for p in `find .|grep CVS`; do rm -rf $${p}; done
@@ -143,6 +164,10 @@
${BUILDDIR}/compactmagic.pl \
${BUILDDIR}/compressfile.pl \
${BUILDDIR}/text.pl \
+ ${BUILDDIR}/makeinstaller.sh \
+ ${BUILDDIR}/installer.sh \
+ ${BUILDDIR}/installer2.sh \
+ ${BUILDDIR}/installer_sub.sh \
Makefile
BUILDFILES=sample/pyukiwiki.ini.cgi \
Index: PyukiWiki-Devel-UTF8/build/build.pl
diff -u PyukiWiki-Devel-UTF8/build/build.pl:1.238 PyukiWiki-Devel-UTF8/build/build.pl:1.239
--- PyukiWiki-Devel-UTF8/build/build.pl:1.238 Fri Jan 27 03:04:31 2012
+++ PyukiWiki-Devel-UTF8/build/build.pl Sat Jan 28 00:44:57 2012
@@ -1,6 +1,6 @@
#!/usr/bin/perl
# release file perl script for pyukiwiki
-# $Id: build.pl,v 1.238 2012/01/26 18:04:31 papu Exp $
+# $Id: build.pl,v 1.239 2012/01/27 15:44:57 papu Exp $
$DIR=$ARGV[0];
$TYPE=$ARGV[1];
@@ -16,14 +16,14 @@
$releasepatch="./releasepatch";
-$binary_files='(\.(jpg|png|gif|dat|key|zip)$)|(^unicode\.pl|favicon\.ico$)';
+$binary_files='(\.(jpg|png|gif|dat|key|zip|sfx)$)|(^unicode\.pl|favicon\.ico$)';
$cvs_ignore='^3A|\.sum$|\.sign$|^cold|^line|^sfdev|74657374|setup.ini.cgi|\.bak$|\.lk$';
$all_ignore='\.sum$|\.sign$|setup.ini.cgi|\.bak$|\.lk$|^kanato';
-$common_ignore=$all_ignore . '|^qrcode|^cold|^line|^Google|^sitemaps\.|^xrea|^unicode\.pl|^3A|74657374|^counter2|^popular2|^bookmark|^clipcopy|^exdate|^ad\.|^ad\_edit|^v.cgi|^playvideo|setup.ini.cgi$';
+$common_ignore=$all_ignore . '|^qrcode|^cold|^line|^Google|^sitemaps\.|^xrea|^unicode\.pl|^3A|74657374|^counter2|^popular2|^bookmark|^clipcopy|^exdate|^ad\.|^ad\_edit|^v\.cgi|^playvideo|setup.ini.cgi$';
$release_ignore=$common_ignore . '|^debug|\.pod$|magic_compact\.txt|\.zip|\.src$|\.inc\.js$|\.inc.\.css';
$update_ignore=$common_ignore . '|\.pod$|magic_compact\.txt|\.zip$|\.src$|htaccess|htpasswd';
-$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';
+$compact_ignore='^aguse|^xframe|^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";
Index: PyukiWiki-Devel-UTF8/build/compactmagic.pl
diff -u PyukiWiki-Devel-UTF8/build/compactmagic.pl:1.238 PyukiWiki-Devel-UTF8/build/compactmagic.pl:1.239
--- PyukiWiki-Devel-UTF8/build/compactmagic.pl:1.238 Fri Jan 27 03:04:31 2012
+++ PyukiWiki-Devel-UTF8/build/compactmagic.pl Sat Jan 28 00:44:57 2012
@@ -1,6 +1,6 @@
#!/usr/bin/perl
# release file perl script for pyukiwiki
-# $Id: compactmagic.pl,v 1.238 2012/01/26 18:04:31 papu Exp $
+# $Id: compactmagic.pl,v 1.239 2012/01/27 15:44:57 papu Exp $
$header="#----------------------------------------------------------------------\n";
print $header;
Index: PyukiWiki-Devel-UTF8/build/compressfile.pl
diff -u PyukiWiki-Devel-UTF8/build/compressfile.pl:1.238 PyukiWiki-Devel-UTF8/build/compressfile.pl:1.239
--- PyukiWiki-Devel-UTF8/build/compressfile.pl:1.238 Fri Jan 27 03:04:31 2012
+++ PyukiWiki-Devel-UTF8/build/compressfile.pl Sat Jan 28 00:44:57 2012
@@ -1,6 +1,6 @@
#!/usr/bin/perl
# yuicompressor script
-# $Id: compressfile.pl,v 1.238 2012/01/26 18:04:31 papu Exp $
+# $Id: compressfile.pl,v 1.239 2012/01/27 15:44:57 papu Exp $
$mode=$ARGV[0];
$output=$ARGV[1];
Index: PyukiWiki-Devel-UTF8/build/getversion.pl
diff -u PyukiWiki-Devel-UTF8/build/getversion.pl:1.238 PyukiWiki-Devel-UTF8/build/getversion.pl:1.239
--- PyukiWiki-Devel-UTF8/build/getversion.pl:1.238 Fri Jan 27 03:04:31 2012
+++ PyukiWiki-Devel-UTF8/build/getversion.pl Sat Jan 28 00:44:57 2012
@@ -1,6 +1,6 @@
#!/usr/bin/perl
# release file perl script for pyukiwiki
-# $Id: getversion.pl,v 1.238 2012/01/26 18:04:31 papu Exp $
+# $Id: getversion.pl,v 1.239 2012/01/27 15:44:57 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.238 PyukiWiki-Devel-UTF8/build/lang.pl:1.239
--- PyukiWiki-Devel-UTF8/build/lang.pl:1.238 Fri Jan 27 03:04:31 2012
+++ PyukiWiki-Devel-UTF8/build/lang.pl Sat Jan 28 00:44:57 2012
@@ -1,5 +1,5 @@
# release file perl script for pyukiwiki
-# $Id: lang.pl,v 1.238 2012/01/26 18:04:31 papu Exp $
+# $Id: lang.pl,v 1.239 2012/01/27 15:44:57 papu Exp $
$lang=$ARGV[0];
$src=$ARGV[1];
Index: PyukiWiki-Devel-UTF8/build/makesampleini.pl
diff -u PyukiWiki-Devel-UTF8/build/makesampleini.pl:1.238 PyukiWiki-Devel-UTF8/build/makesampleini.pl:1.239
--- PyukiWiki-Devel-UTF8/build/makesampleini.pl:1.238 Fri Jan 27 03:04:31 2012
+++ PyukiWiki-Devel-UTF8/build/makesampleini.pl Sat Jan 28 00:44:57 2012
@@ -1,6 +1,6 @@
#!/usr/bin/perl
# release file perl script for pyukiwiki
-# $Id: makesampleini.pl,v 1.238 2012/01/26 18:04:31 papu Exp $
+# $Id: makesampleini.pl,v 1.239 2012/01/27 15:44:57 papu Exp $
@CHANGES=(
'\$::useExPlugin = 1; $::useExPlugin = 0;',
Index: PyukiWiki-Devel-UTF8/build/text.pl
diff -u PyukiWiki-Devel-UTF8/build/text.pl:1.238 PyukiWiki-Devel-UTF8/build/text.pl:1.239
--- PyukiWiki-Devel-UTF8/build/text.pl:1.238 Fri Jan 27 03:04:31 2012
+++ PyukiWiki-Devel-UTF8/build/text.pl Sat Jan 28 00:44:57 2012
@@ -1,5 +1,5 @@
# release file perl script for pyukiwiki
-# $Id: text.pl,v 1.238 2012/01/26 18:04:31 papu Exp $
+# $Id: text.pl,v 1.239 2012/01/27 15:44:57 papu Exp $
use Jcode;
@@ -331,21 +331,20 @@
$text{YASHIGANIMODOKI}='YashiganiModoki';
}
$text{NANAMI_URL}='http://nanakochi.daiba.cx/';
+$text{NANAMI_MAIL}='<nanami (at) daiba (dot) cx>';
$text{YASHIGANIMODOKI_URL}='http://hpcgi1.nifty.com/it2f/wikinger/pyukiwiki.cgi';
-
-#$text{PYUKI_URL}='http://pyukiwiki.sourceforge.jp/';
-$text{PYUKI_URL}='http://pyukiwiki.sfjp.jp/';
+$text{SOURCEFORGE_JP_DOMAIN}="sfjp.jp";
+$text{SOURCEFORGE_NET_DOMAIN}="sf.net";
+$text{PYUKI_URL}='http://pyukiwiki.$text{SOURCEFORGE_JP_DOMAIN}/';
$text{YUKIWIKI_URL}='http://www.hyuki.com/yukiwiki/';
-#$text{PUKIWIKI_URL}='http://pukiwiki.sourceforge.jp/';
-$text{PUKIWIKI_URL}='http://pukiwiki.sfjp.jp/';
+$text{PUKIWIKI_URL}='http://pukiwiki.$text{SOURCEFORGE_JP_DOMAIN}/';
+$text{PUKIWIKIDEV_URL}='http://pukiwiki.$text{SOURCEFORGE_JP_DOMAIN}/';
-$text{AWSTATS_URL}='http://awstats.sourceforge.net/';
+$text{AWSTATS_URL}='http://awstats.$text{SOURCEFORGE_NET_DOMAIN}/';
-#$text{BASEURL}='http://pyukiwiki.sourceforge.jp';
-$text{BASEURL}='http://pyukiwiki.sfjp.jp';
-#$text{CVSURL}='http://sourceforge.jp/cvs/view/pyukiwiki';
-$text{CVSURL}='http://sfjp.jp/cvs/view/pyukiwiki';
+$text{BASEURL}='http://pyukiwiki.$text{SOURCEFORGE_JP_DOMAIN}';
+$text{CVSURL}='http://$text{SOURCEFORGE_JP_DOMAIN}/cvs/view/pyukiwiki';
$text{RECENTDATE}=&date("Y-m-d (D)");