提交: 1b53817b96711f46311deb741f51a8c92f25f8ff - pukiwiki_original (git)

Commit MetaInfo

• 修订版: 1b53817b96711f46311deb741f51a8c92f25f8ff (tree)
• 时间: 2005-07-04 00:16:28
• 作者: pukiwikiadmin <pukiwikiadmin>
• Commiter: pukiwikiadmin

Log Message

This commit was manufactured by cvs2svn to create tag 'r1_4_6_rc'.

更改概述

• delete: devel/make_funclist.sh
• delete: devel/release.sh
• delete: devel/release_update.sh
• delete: devel/tdiary-demogen.sh
• delete: wiki.ko/.cvsignore
• delete: wiki.ko/.htaccess
• delete: wiki.ko/index.html

差异

--- a/devel/make_funclist.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-grep -B1 "^function" ../*.php | sed -e "s/^\.\.\///" | sed "s/[a-z]*\.php\:function[ \t]*//"  

--- a/devel/release.sh
+++ /dev/null
@@ -1,211 +0,0 @@
-#!/bin/sh
-# $Id: release.sh,v 1.21 2005-04-18 13:30:05 henoheno Exp $
-# $CVSKNIT_Id: release.sh,v 1.11 2004/05/28 14:26:24 henoheno Exp $
-#  Release automation script for PukiWiki
-#  ==========================================================
-   Copyright='(C) 2002-2004 minix-up project, All Rights Reserved'
-   Homepage='http://cvsknit.sourceforge.net/'
-   License='BSD Licnese, NO WARRANTY'
-#
-
-# Name and Usage --------------------------------------------
-_name="` basename $0 `"
-
-usage(){
-  trace 'usage()' || return  # (DEBUG)
-  warn  "Usage: $_name [options] VERSION_TAG (1.4.3_rc1 like)"
-  warn  "  Options:"
-  warn  "    --nopkg     Suppress creating archive (Extract and chmod only)"
-  warn  "    --norm      --nopkg, and remove nothing (.cvsignore etc)"
-  warn  "    --co        --norm, and use 'checkout' command instead of 'export'"
-  warn  "    -z|--zip    Create *.zip archive"
-  warn  "    --move-dist Move *.ini.php => *.ini-dist.php"
-  warn  "    --copy-dist Move, and Copy *.ini.php <= *.ini-dist.php"
-  return 1
-}
-
-# Common functions ------------------------------------------
-warn(){  echo "$*" 1>&2 ; }
-err() {  warn "Error: $*" ; exit 1 ; }
-
-quote(){
-  test    $# -gt 0  && {  echo -n  "\"$1\"" ; shift ; }
-  while [ $# -gt 0 ] ; do echo -n " \"$1\"" ; shift ; done ; echo
-}
-
-trace(){
-  test "$__debug" || return 0  # (DEBUG)
-  _msg="$1" ; test $# -gt 0 && shift ; warn "  $_msg	: ` quote "$@" `"
-}
-
-check_versiontag(){
-  case "$1" in
-    [1-9].[0-9]              | [1-9].[0-9]                   ) tag="r$1" ;;
-    [1-9].[0-9]_rc[1-9]      | [1-9].[0-9]_rc[1-9]           ) tag="r$1" ;;
-    [1-9].[0-9].[0-9]        | [1-9].[0-9].[0-9][0-9]        ) tag="r$1" ;;
-    [1-9].[0-9].[0-9]_[a-z]* | [1-9].[0-9].[0-9][0-9]_[a-z]* ) tag="r$1" ;;
-    [1-9].[0-9].[0-9]_[1-9]  | [1-9].[0-9].[0-9][0-9]_[1-9]  ) tag="r$1" ;;
-    HEAD | r1_3_3_branch ) tag="$rel" ;;
-    '' ) usage ; return 1 ;;
-     * ) warn "Error: Invalid string: $1" ; usage ; return 1 ;;
-  esac
-  echo "$tag" | tr '.' '_'
-}
-
-chmod_pkg(){
-  ( cd "$1"
-    # ALL: Read only
-    find . -type d | while read line; do chmod 755 "$line"; done
-    find . -type f | while read line; do chmod 644 "$line"; done
-    # Add write permission for PukiWiki
-    chmod 777 attach backup cache counter diff trackback wiki* 2>/dev/null
-    chmod 666 wiki*/*.txt cache/*.dat cache/*.ref cache/*.rel  2>/dev/null
-  )
-}
-
-# Default variables -----------------------------------------
-
-mod=pukiwiki
-
-CVSROOT=":pserver:[e-mail]:/cvsroot/$mod"
-
-# Function verifying arguments ------------------------------
-
-getopt(){ _arg=noarg
-  trace 'getopt()' "$@"  # (DEBUG)
-
-  case "$1" in
-  ''  )  echo 1 ;;
-  -[hH]|--help ) echo _help _exit ;;
-  --debug      ) echo _debug 1    ;;
-  --nopkg      ) echo _nopkg 1    ;;
-  --norm|--noremove ) echo _nopkg _noremove 1 ;;
-  --co|--checkout   ) echo _nopkg _noremove _checkout 1 ;;
-  -z|--zip     ) echo _zip 1      ;;
-  --copy-dist  ) echo _copy_dist 1 ;;
-  --move-dist  ) echo _move_dist 1 ;;
-  -d  ) echo _CVSROOT 2 ; _arg="$2" ;;
-  -*  ) warn "Error: Unknown option \"$1\"" ; return 1 ;;
-   *  ) echo OTHER ;;
-  esac
-
-  test 'x' != "x$_arg"
-}
-
-# Working start ---------------------------------------------
-
-# Show arguments in one line (DEBUG)
-case '--debug' in "$1"|"$3") false ;; * ) true ;; esac || {
-  test 'x--debug' = "x$1" && shift ; __debug=on ; trace 'Args  ' "$@"
-}
-
-# Parsing
-while [ $# -gt 0 ] ; do
-  chs="` getopt "$@" `" || err "Syntax error with '$1'"
-  trace '$chs  ' "$chs"  # (DEBUG)
-
-  for ch in $chs ; do
-    case "$ch" in
-     [1-3]   ) shift $ch ;;
-     _exit   ) exit      ;;
-     _help   ) usage     ;;
-
-     _CVSROOT) CVSROOT="$2" ;;
-
-     _*      ) eval "_$ch"=on ;;
-      *      ) break 2   ;;
-    esac
-  done
-done
-
-# No argument
-if [ $# -eq 0 ] ; then usage ; exit ; fi
-
-# Archiver check --------------------------------------------
-
-if [ -z "$__zip" ]
-then
-  which tar  || err "tar not found"
-  which gzip || err "gzip not found"
-else
-  which zip  || err "zip not found"
-fi > /dev/null
-
-# Argument check --------------------------------------------
-
-rel="$1"
-tag="` check_versiontag "$rel" `"
-pkg_dir="${mod}-${rel}"
-
-# Export the module -----------------------------------------
-
-test ! -d "$pkg_dir" || err "There's already a directory: $pkg_dir"
-
-if [ -z "$__checkout" ]
-then cmd="export"
-else cmd="checkout"
-fi
-
-echo cvs -z3 -d "$CVSROOT" -q "$cmd" -r "$tag" -d "$pkg_dir" "$mod"
-     cvs -z3 -d "$CVSROOT" -q "$cmd" -r "$tag" -d "$pkg_dir" "$mod"
-
-test   -d "$pkg_dir" || err "There isn't a directory: $pkg_dir"
-
-# Remove '.cvsignore' if exists -----------------------------
-test -z "$__noremove" && {
-  echo find "$pkg_dir" -type f -name '.cvsignore' "| xargs rm -f"
-       find "$pkg_dir" -type f -name '.cvsignore' | xargs rm -f
-}
-
-# chmod -----------------------------------------------------
-
-chmod_pkg "$pkg_dir"
-
-# Create a package ------------------------------------------
-
-test ! -z "$__nopkg" && exit 0
-
-( cd "$pkg_dir"
-
-  # wiki.en/
-  target="wiki.en"
-  if [ -z "$__zip" ]
-  then tar cf - "$target" | gzip -9 > "$target".tgz
-  else zip -r9 "$target.zip" "$target"
-  fi
-  rm -Rf "$target"
-
-  # en documents
-  if [ -z "$__zip" ]
-  then gzip -9 *.en.txt
-  else
-    for list in *.en.txt ; do
-      zip  -9 "$list".zip "$list"
-      rm -f "$list"
-    done
-  fi
-)
-
-# Move / Copy *.ini.php files
-if [ 'x' != "x$__copy_dist$__move_dist" ] ; then
-( cd "$pkg_dir"
-
-  find . -type f -name "*.ini.php" | while read file; do
-    dist_file="` echo "$file" | sed 's/ini\.php$/ini-dist.php/' `"
-    mv -f "$file" "$dist_file"
-    test "$__copy_dist" && cp -f "$dist_file" "$file"
-  done
-)
-fi
-
-if [ -z "$__zip" ]
-then
-  # Tar + gzip
-  echo tar cf - "$pkg_dir" \| gzip -9 \> "$pkg_dir.tar.gz"
-       tar cf - "$pkg_dir"  | gzip -9  > "$pkg_dir.tar.gz"
-else
-  # Zip
-  echo zip -r9 "$pkg_dir.zip" "$pkg_dir"
-       zip -r9 "$pkg_dir.zip" "$pkg_dir"
-fi
-

--- a/devel/release_update.sh
+++ /dev/null
@@ -1,197 +0,0 @@
-#!/bin/sh
-# $Id: release_update.sh,v 1.11 2005-03-21 14:08:50 henoheno Exp $
-# $CVSKNIT_Id: release.sh,v 1.11 2004/05/28 14:26:24 henoheno Exp $
-#  Release automation script for PukiWiki
-#  ==========================================================
-   Copyright='(C) 2002-2004 minix-up project, All Rights Reserved'
-   Homepage='http://cvsknit.sourceforge.net/'
-   License='BSD Licnese, NO WARRANTY'
-#
-
-# Name and Usage --------------------------------------------
-_name="` basename $0 `"
-
-usage(){
-  warn "USAGE: $_name [options] VERSION_FROM VERSION_TO (VERSION = '1.4.3_rc1' like)"
-  warn "  Options:"
-  warn  "    -z|--zip    Create *.zip archive"
-  warn  "    --move-dist Move *.ini.php => *.ini-dist.php"
-  warn  "    --copy-dist Move, and Copy *.ini.php <= *.ini-dist.php"
-  return 1
-}
-
-# Common functions ------------------------------------------
-warn(){  echo "$*" 1>&2 ; }
-err() {  warn "Error: $*" ; exit 1 ; }
-
-quote(){
-  test    $# -gt 0  && {  echo -n  "\"$1\"" ; shift ; }
-  while [ $# -gt 0 ] ; do echo -n " \"$1\"" ; shift ; done ; echo
-}
-
-trace(){
-  test "$__debug" || return 0  # (DEBUG)
-  _msg="$1" ; test $# -gt 0 && shift ; warn "  $_msg	: ` quote "$@" `"
-}
-
-check_versiontag(){
-  case "$1" in
-    [1-9].[0-9]              | [1-9].[0-9]                   ) tag="r$1" ;;
-    [1-9].[0-9]_rc[1-9]      | [1-9].[0-9]_rc[1-9]           ) tag="r$1" ;;
-    [1-9].[0-9].[0-9]        | [1-9].[0-9].[0-9][0-9]        ) tag="r$1" ;;
-    [1-9].[0-9].[0-9]_[a-z]* | [1-9].[0-9].[0-9][0-9]_[a-z]* ) tag="r$1" ;;
-    [1-9].[0-9].[0-9]_[1-9]  | [1-9].[0-9].[0-9][0-9]_[1-9]  ) tag="r$1" ;;
-    HEAD | r1_3_3_branch ) tag="$rel" ;;
-    '' ) usage ; return 1 ;;
-     * ) warn "Error: Invalid string: $1" ; usage ; return 1 ;;
-  esac
-  echo "$tag" | tr '.' '_'
-}
-
-chmod_pkg(){
-  ( cd "$1"
-    # ALL: Read only
-    find . -type d | while read line; do chmod 755 "$line"; done
-    find . -type f | while read line; do chmod 644 "$line"; done
-    # Add write permission for PukiWiki
-    chmod 777 attach backup cache counter diff trackback wiki* 2>/dev/null
-    chmod 666 wiki*/*.txt cache/*.dat cache/*.ref cache/*.rel  2>/dev/null
-  )
-}
-
-# Default variables -----------------------------------------
-
-mod=pukiwiki
-CVSROOT=":pserver:[e-mail]:/cvsroot/$mod"
-
-pkg_dir="$mod"
-
-# Function verifying arguments ------------------------------
-
-getopt(){ _arg=noarg
-  trace 'getopt()' "$@"  # (DEBUG)
-
-  case "$1" in
-  ''  )  echo 1 ;;
-  -[hH]|--help ) echo _help _exit ;;
-  --debug      ) echo _debug      ;;
-  -z|--zip     ) echo _zip        ;;
-  --copy-dist  ) echo _copy_dist  ;;
-  --move-dist  ) echo _move_dist  ;;
-  -d  ) echo _CVSROOT 2 ; _arg="$2" ;;
-  -*  ) warn "Error: Unknown option \"$1\"" ; return 1 ;;
-   *  ) echo OTHER ;;
-  esac
-
-  test 'x' != "x$_arg"
-}
-
-# Working start ---------------------------------------------
-
-# Show arguments in one line (DEBUG)
-case '--debug' in "$1"|"$3") false ;; * ) true ;; esac || {
-  test 'x--debug' = "x$1" && shift ; __debug=on ; trace 'Args  ' "$@"
-}
-
-# Parsing
-while [ $# -gt 0 ] ; do
-  chs="` getopt "$@" `" || err "Syntax error with '$1'"
-  trace '$chs  ' "$chs"  # (DEBUG)
-
-  for ch in $chs ; do
-    case "$ch" in
-     [1-3]   ) shift $ch ;;
-     _exit   ) exit      ;;
-     _help   ) usage     ;;
-     _CVSROOT) CVSROOT="$2" ;;
-     _*      ) shift ; eval "_$ch"=on ;;
-      *      ) break 2   ;;
-    esac
-  done
-done
-
-# No argument
-if [ $# -eq 0 ] ; then usage ; exit ; fi
-
-# Argument check --------------------------------------------
-
-rel_from="$1"
-rel_to="$2"
-if [ "x$rel_from" = "x$rel_to" ] ; then
-  warn "Error: VERSION_FROM and VERSION_TO is equivalent"
-  usage ; exit
-fi
-
-tag_from="` check_versiontag "$rel_from" `" || exit
-tag_to="`   check_versiontag "$rel_to"   `" || exit
-
-# -----------------------------------------------------------
-
-# Checkout the module with VERSION_FROM
-test ! -d "$pkg_dir" || err "There's already a directory: $pkg_dir"
-echo cvs -z3 -d "$CVSROOT" co -r "$tag_from" -d "$pkg_dir" "$mod"
-     cvs -z3 -d "$CVSROOT" co -r "$tag_from" -d "$pkg_dir" "$mod"
-test   -d "$pkg_dir" || err "There isn't a directory: $pkg_dir"
-
-# Merge VERSION_FROM to VERSION_TO
-( cd "$pkg_dir"
-  echo cvs up -dP -j "$tag_from" -j "$tag_to"
-       cvs up -dP -j "$tag_from" -j "$tag_to"
-
-  # Cleanup backup files by cvs
-  find . -type f -name ".#*" | xargs rm -f
-)
-
-# Remove files those are not Added or Modified
-echo -n "Remove files those are not Added or Modified ..."
-( cd "$pkg_dir"
-
-  find . -type f | grep -v /CVS/ | while read line ; do
-    result="` cvs -nq up "$line" 2>/dev/null | grep '^[AM] ' | cut -b 3- `"
-    test "x$result" != "x" || rm -f "$line"
-    echo -n "."
-  done
-  echo
-)
-
-# Remove CVS directories
-echo "Remove CVS directories ..."
-find "$pkg_dir" -type d -name "CVS" | xargs rm -Rf
-
-# Remove '.cvsignore' if exists
-echo find "$pkg_dir" -type f -name '.cvsignore' -delete
-     find "$pkg_dir" -type f -name '.cvsignore' -delete
-
-# Remove emptied directories (twice)
-find "$pkg_dir" -type d -empty | xargs rmdir
-find "$pkg_dir" -type d -empty | xargs rmdir
-
-# Move / Copy *.ini.php files
-if [ 'x' != "x$__copy_dist$__move_dist" ] ; then
-( cd "$pkg_dir"
-
-  find . -type f -name "*.ini.php" | while read file; do
-    dist_file="` echo "$file" | sed 's/ini\.php$/ini-dist.php/' `"
-    mv -f "$file" "$dist_file"
-    test "$__copy_dist" && cp -f "$dist_file" "$file"
-  done
-)
-fi
-
-# chmod
-chmod_pkg "$pkg_dir"
-
-if [ -z "$__zip" ]
-then
-  # Tar
-  echo tar cf - "$pkg_dir" \| gzip -9 \> "update_$rel_to.tar.gz"
-       tar cf - "$pkg_dir"  | gzip -9  > "update_$rel_to.tar.gz"
-else
-  # Zip
-  echo zip -r9 "update_$rel_to.zip" "$pkg_dir"
-       zip -r9 "update_$rel_to.zip" "$pkg_dir"
-fi
-
-#echo rm -Rf   "$pkg_dir"
-#     rm -Rf   "$pkg_dir"
-

--- a/devel/tdiary-demogen.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-# $Id: tdiary-demogen.sh,v 1.7 2005-01-25 12:47:11 henoheno Exp $
-#
-# tDiary demonstration generator: generates many [theme].php
-# License: GPL
-
-warn(){ echo "$*" 1>&2; }
-err(){ warn "$*"; exit 1; }
-
-usage(){
-  base="`basename $0`";
-  warn "  $base [-d path/to/theme-directory] list"
-  warn "  $base [-d path/to/theme-directory] interwiki"
-  warn "  $base [-d path/to/theme-directory] touch"
-  warn "  $base [-d path/to/theme-directory] untouch"
-  warn "    Command:"
-  warn "      lis|list      - List themes"
-  warn "      int|interwiki - Publish interwiki definition and setting for each theme"
-  warn "      tou|touch     - Generate \$theme.php that includes index.php"
-  warn "      unt|untouch   - Remove \$theme.php(s) listed in theme directory"
-  exit 1
-}
-
-theme_list(){
-  cd "$dir" || err "Error: directory '$dir' not found"
-  ls -1 | while read theme; do
-    test -f "$theme/$theme.css" && echo "$theme"
-  done
-}
-
-# ---- Argument check ----
-dir="skin/theme"
-if [ "x-d" = "x$1" ] ; then
-  dir="$2"
-  shift 2
-fi
-cmd="$1"
-
-# ----
-
-case "$cmd" in
-''|-h|hel|help ) usage ;;
-lis|list       ) theme_list ;;
-
-int|inte|inter|interw|interwi|interwik|interwiki)
-  echo '--------'
-  echo '- [./$1.php theme] raw tDiary theme selector'
-  echo '--------'
-  echo '- (s) = sidebar CSS exists in this theme'
-  theme_list | while read theme; do
-    echo -n "+ [[theme:$theme]]"
-    grep -q div.sidebar "$dir/$theme/$theme.css" && echo -n " (s)"
-    echo
-  done
-  ;;
-
-tou|touc|touch )
-  theme_list | while read theme; do
-    if [ -f "$theme.php" ]
-    then echo "Warning: '$theme.php' is already available. Ignoreing..."
-    else
-      cat <<EOF  > "$theme.php"
-<?php
-	define('TDIARY_THEME', '$theme');
-	require('./index.php')
-?>
-EOF
-    fi
-  done
-  ;;
-
-unt|unto|untou|untouc|untouch )
-  echo -n "  Remove theme(s).php ? [y/N]: "
-  read answer
-  case "$answer" in
-  [yY] | [yY][eE][sS] )
-    theme_list | while read theme ; do
-      test -f "$theme.php" && grep -q "define('TDIARY_THEME', '$theme');" "$theme.php" && rm -f "$theme.php"
-    done
-    ;;
-  * )
-    echo "  Stopped."
-  esac
-  ;;
-esac
-

--- a/wiki.ko/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.txt

--- a/wiki.ko/.htaccess
+++ /dev/null
@@ -1,2 +0,0 @@
-Order allow,deny
-Deny from all

--- a/wiki.ko/index.html
+++ /dev/null
@@ -1 +0,0 @@
-Data files are placed here.