From 0e48825a468063b79e0d1645c81a8b5966764fdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 12 Oct 2006 16:27:13 +0000 Subject: [PATCH] Finalise SVN migration. --- .cvsignore | 11 -- ChangeLog | 14 +++ Documentation.html | 23 ++-- INSTALL | 0 LICENSE | 0 README | 0 TODO | 0 css/.cvsignore | 1 - js/.cvsignore | 1 - lang/.cvsignore | 3 - lang/add_message.sh | 0 libraries/.cvsignore | 1 - libraries/auth/.cvsignore | 1 - libraries/compat/.cvsignore | 1 - libraries/dbg/.cvsignore | 1 - libraries/dbi/.cvsignore | 1 - libraries/engines/.cvsignore | 1 - libraries/export/.cvsignore | 1 - libraries/fpdf/.cvsignore | 1 - libraries/fpdf/font/.cvsignore | 1 - libraries/import/.cvsignore | 1 - libraries/transformations/.cvsignore | 1 - libraries/transformations/generator.sh | 0 .../transformations/template_generator.sh | 0 .../template_generator_mimetype.sh | 0 scripts/.cvsignore | 1 - scripts/create-release.sh | 116 +++++------------- test/.cvsignore | 1 - themes/.cvsignore | 19 --- themes/darkblue_orange/.cvsignore | 1 - themes/darkblue_orange/css/.cvsignore | 1 - themes/darkblue_orange/img/.cvsignore | 1 - themes/original/.cvsignore | 1 - themes/original/css/.cvsignore | 1 - themes/original/img/.cvsignore | 1 - 35 files changed, 57 insertions(+), 150 deletions(-) delete mode 100644 .cvsignore mode change 100755 => 100644 ChangeLog mode change 100755 => 100644 Documentation.html mode change 100755 => 100644 INSTALL mode change 100755 => 100644 LICENSE mode change 100755 => 100644 README mode change 100755 => 100644 TODO delete mode 100644 css/.cvsignore delete mode 100644 js/.cvsignore delete mode 100644 lang/.cvsignore mode change 100644 => 100755 lang/add_message.sh delete mode 100644 libraries/.cvsignore delete mode 100644 libraries/auth/.cvsignore delete mode 100644 libraries/compat/.cvsignore delete mode 100644 libraries/dbg/.cvsignore delete mode 100644 libraries/dbi/.cvsignore delete mode 100644 libraries/engines/.cvsignore delete mode 100644 libraries/export/.cvsignore delete mode 100644 libraries/fpdf/.cvsignore delete mode 100644 libraries/fpdf/font/.cvsignore delete mode 100644 libraries/import/.cvsignore delete mode 100644 libraries/transformations/.cvsignore mode change 100644 => 100755 libraries/transformations/generator.sh mode change 100644 => 100755 libraries/transformations/template_generator.sh mode change 100644 => 100755 libraries/transformations/template_generator_mimetype.sh delete mode 100644 scripts/.cvsignore delete mode 100644 test/.cvsignore delete mode 100644 themes/.cvsignore delete mode 100644 themes/darkblue_orange/.cvsignore delete mode 100644 themes/darkblue_orange/css/.cvsignore delete mode 100644 themes/darkblue_orange/img/.cvsignore delete mode 100644 themes/original/.cvsignore delete mode 100644 themes/original/css/.cvsignore delete mode 100644 themes/original/img/.cvsignore diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index a71b981a7..000000000 --- a/.cvsignore +++ /dev/null @@ -1,11 +0,0 @@ -config.inc.php -config.header.inc.php -config.footer.inc.php -phpmyadmin.wpj -*.swp -upload -save -.vimrc -.project -.settings -config diff --git a/ChangeLog b/ChangeLog old mode 100755 new mode 100644 index 34ce5da89..3972f5f42 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,20 @@ phpMyAdmin - ChangeLog $Id$ $Source$ +2006-10-12 Michal Čihař + * Documentation.html: Change CVS instructions to SVN. + * scripts/create-release.sh: Switch to SVN: + - use svn instead of cvs + - remove chmod (we can have correct permissions in svn) + - some cleanup + - use export and thus remove need for removing files + - fix help instructions to contain correct version + - CHANGE: you have to prepend "tags" or "branches" to tag or branch + specification + * */.cvsignore: Removed, this is now stored in svn:ignore property (use + svn propget/propset to work with them). + * many files: Fix permissions. + 2006-10-11 Marc Delisle ### Migration to Subversion diff --git a/Documentation.html b/Documentation.html old mode 100755 new mode 100644 index 2a747abf8..044b0f29d --- a/Documentation.html +++ b/Documentation.html @@ -3777,9 +3777,9 @@ chmod o+rwx tmp 7.2 I want to translate the messages to a new language or upgrade an existing language, where do I start? -

Always use the current CVS version of your language file. +

Always use the current SVN version of your language file. For a new language, start from english-iso-8859-1.inc.php. If you - don't know how to get the CVS version, please ask one of the developers. + don't know how to get the SVN version, please ask one of the developers.
Please note that we try not to use HTML entities like é in the translations, since we define the right character set in the file. @@ -3798,19 +3798,20 @@ chmod o+rwx tmp

The following method is preferred for new developers:

-
  1. fetch the current CVS tree over anonymous CVS:
    - cvs -d:pserver:anonymous@phpmyadmin.cvs.sourceforge.net:/cvsroot/phpmyadmin login
    - [Password: simply press the Enter key]
    - cvs -z3 -d:pserver:anonymous@phpmyadmin.cvs.sourceforge.net:/cvsroot/phpmyadmin checkout phpMyAdmin
    - [This will create a new sub-directory named phpMyAdmin]
    2. +
    1. fetch the current SVN tree over anonymous SVN:
      + svn co https://svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin
      +
    2. add your stuff
      3. -
    3. put the modified files (tar'ed and gzip'ed) inside the patch tracker of - the - phpMyAdmin SourceForge account. +
    4. generate patch with your changes: + svn diff
      +
      5. +
    5. put the patch inside the patch + tracker of the phpMyAdmin project.
    -

    Write access to the CVS tree is granted only to experienced developers who +

    Write access to the SVN tree is granted only to experienced developers who have already contributed something useful to phpMyAdmin.
    Also, have a look at the Developers section.

    diff --git a/INSTALL b/INSTALL old mode 100755 new mode 100644 diff --git a/LICENSE b/LICENSE old mode 100755 new mode 100644 diff --git a/README b/README old mode 100755 new mode 100644 diff --git a/TODO b/TODO old mode 100755 new mode 100644 diff --git a/css/.cvsignore b/css/.cvsignore deleted file mode 100644 index 1377554eb..000000000 --- a/css/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.swp diff --git a/js/.cvsignore b/js/.cvsignore deleted file mode 100644 index 1377554eb..000000000 --- a/js/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.swp diff --git a/lang/.cvsignore b/lang/.cvsignore deleted file mode 100644 index e6c1258e5..000000000 --- a/lang/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -tmp-check -added_messages.php -*.swp diff --git a/lang/add_message.sh b/lang/add_message.sh old mode 100644 new mode 100755 diff --git a/libraries/.cvsignore b/libraries/.cvsignore deleted file mode 100644 index 1377554eb..000000000 --- a/libraries/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.swp diff --git a/libraries/auth/.cvsignore b/libraries/auth/.cvsignore deleted file mode 100644 index 1377554eb..000000000 --- a/libraries/auth/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.swp diff --git a/libraries/compat/.cvsignore b/libraries/compat/.cvsignore deleted file mode 100644 index 1377554eb..000000000 --- a/libraries/compat/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.swp diff --git a/libraries/dbg/.cvsignore b/libraries/dbg/.cvsignore deleted file mode 100644 index 1377554eb..000000000 --- a/libraries/dbg/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.swp diff --git a/libraries/dbi/.cvsignore b/libraries/dbi/.cvsignore deleted file mode 100644 index 1377554eb..000000000 --- a/libraries/dbi/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.swp diff --git a/libraries/engines/.cvsignore b/libraries/engines/.cvsignore deleted file mode 100644 index 1377554eb..000000000 --- a/libraries/engines/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.swp diff --git a/libraries/export/.cvsignore b/libraries/export/.cvsignore deleted file mode 100644 index 1377554eb..000000000 --- a/libraries/export/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.swp diff --git a/libraries/fpdf/.cvsignore b/libraries/fpdf/.cvsignore deleted file mode 100644 index 1377554eb..000000000 --- a/libraries/fpdf/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.swp diff --git a/libraries/fpdf/font/.cvsignore b/libraries/fpdf/font/.cvsignore deleted file mode 100644 index 1377554eb..000000000 --- a/libraries/fpdf/font/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.swp diff --git a/libraries/import/.cvsignore b/libraries/import/.cvsignore deleted file mode 100644 index 1377554eb..000000000 --- a/libraries/import/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.swp diff --git a/libraries/transformations/.cvsignore b/libraries/transformations/.cvsignore deleted file mode 100644 index 1377554eb..000000000 --- a/libraries/transformations/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.swp diff --git a/libraries/transformations/generator.sh b/libraries/transformations/generator.sh old mode 100644 new mode 100755 diff --git a/libraries/transformations/template_generator.sh b/libraries/transformations/template_generator.sh old mode 100644 new mode 100755 diff --git a/libraries/transformations/template_generator_mimetype.sh b/libraries/transformations/template_generator_mimetype.sh old mode 100644 new mode 100755 diff --git a/scripts/.cvsignore b/scripts/.cvsignore deleted file mode 100644 index 1377554eb..000000000 --- a/scripts/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.swp diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 1879339f1..95d054df5 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -77,52 +77,32 @@ COMPRESSIONS="zip-7z tbz tgz 7z" if [ $# = 0 ] then - echo "Usage: create-release.sh version from_branch devname" + echo "Usage: create-release.sh version from_branch" echo " (no spaces allowed!)" echo "" - echo "Example: create-release.sh 2.9.0-rc1 QA_2_9 lem9" + echo "Examples:" + echo " create-release.sh 2.9.0-rc1 branches/QA_2_9" + echo " create-release.sh 2.9.0 tags/RELEASE_2_9_0" exit 65 fi -if [ "$1" = "snapshot" ] -then - branch='' -elif [ "$#" -ge 2 ] -then - branch="-r $2" -fi +branch='trunk' -user="anonymous" -if [ "$#" -eq 3 ] -then - user=$3 -fi - - -if [ $1 = "snapshot" ] -then - mode="snapshot" - date_snapshot=`date +%Y%m%d-%H%M%S` -fi - -# Set target name -if [ "$mode" != "snapshot" ] -then - target=$1 +if [ "$1" = "snapshot" ] ; then + mode="snapshot" + date_snapshot=`date +%Y%m%d-%H%M%S` + target=$date_snapshot else - target=$date_snapshot -fi - - -if [ "$mode" != "snapshot" ] -then - - cat <set( 'PMA_VERSION', '2.7.1-dev' ); " + " \$this->set( 'PMA_VERSION', '$1' ); " - in Documentation.html the 2 lines " phpMyAdmin $1 - Documentation " "

    phpMyAdmin $1 Documentation

    " @@ -136,14 +116,14 @@ Please ensure you have: Continue (y/n)? END - printf "\a" - read do_release + read do_release - if [ "$do_release" != 'y' ]; then - exit - fi + if [ "$do_release" != 'y' ]; then + exit + fi fi +# FIXME: this was kept, but actually this is not used if [ "$mode" = "snapshot" -a "$2" != "local" ] ; then # Goto project dir cd /home/groups/p/ph/phpmyadmin/htdocs @@ -162,50 +142,22 @@ if [ "$mode" = "snapshot" -a "$2" != "local" ] ; then mv cvs cvs-prev fi -# Do CVS checkout -mkdir cvs -cd cvs +# Do SVNcheckout +mkdir -p ./svn +cd svn -if [ "$mode" != "snapshot" ] ; then - if grep -Fq ':pserver:anonymous@phpmyadmin.cvs.sourceforge.net:2401/cvsroot/phpmyadmin' ~/.cvspass ; then - echo "You seem to be already logged into phpMyAdmin CVS, skipping that" - else - if [ $user = "anonymous" ] ; then - echo "Press [ENTER]!" - cvs -q -d:pserver:anonymous@$cvsserver:/cvsroot/phpmyadmin login - if [ $? -ne 0 ] ; then - echo "CVS login failed, bailing out" - exit 1 - fi - fi - fi -fi +echo "Exporting repository from subversion" -if [ $user = "anonymous" ] ; then - cvs -q -z3 -d:pserver:anonymous@$cvsserver:/cvsroot/phpmyadmin co -P $branch phpMyAdmin -else - cvs -q -z3 -d:ext:$user@$cvsserver:/cvsroot/phpmyadmin co -P $branch phpMyAdmin -fi +svn export -q https://svn.sourceforge.net/svnroot/phpmyadmin/$branch/phpMyAdmin if [ $? -ne 0 ] ; then - echo "CVS checkout failed, bailing out" + echo "Subversion checkout failed, bailing out" exit 2 fi # Cleanup release dir LC_ALL=C date -u > phpMyAdmin/RELEASE-DATE-${target} -# Olivier asked to keep those in the cvs release, to allow testers to use -# cvs update on it -if [ "$mode" != "snapshot" ] -then - find phpMyAdmin \( -name .cvsignore -o -name CVS \) -print0 | xargs -0 rm -rf -fi - -find phpMyAdmin -type d -print0 | xargs -0 chmod 755 -find phpMyAdmin -type f -print0 | xargs -0 chmod 644 -find phpMyAdmin \( -name '*.sh' -o -name '*.pl' \) -print0 | xargs -0 chmod 755 - # Building Documentation.txt LC_ALL=C w3m -dump phpMyAdmin/Documentation.html > phpMyAdmin/Documentation.txt @@ -296,8 +248,8 @@ cat <set( 'PMA_VERSION', '2.7.1-dev' ); " - in Documentation.html the 2 lines @@ -339,12 +291,6 @@ END fi -if [ "$mode" = "snapshot" -a "$2" != "local" ] ; then - cd .. - find cvs -type d -print0 | xargs -0 chmod 775 - find cvs -type f -print0 | xargs -0 chmod 664 -fi - # Removed due to not needed thanks to clever scripting by Robbat2 # 9. update the demo subdirectory: # - in htdocs, cvs update phpMyAdmin diff --git a/test/.cvsignore b/test/.cvsignore deleted file mode 100644 index 1377554eb..000000000 --- a/test/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.swp diff --git a/themes/.cvsignore b/themes/.cvsignore deleted file mode 100644 index 181c47d02..000000000 --- a/themes/.cvsignore +++ /dev/null @@ -1,19 +0,0 @@ -*.7z -*.zip -simple -arctic_ocean -xp_dirty -xp_green -xp_silver -aqua -aqua_brushed -cactica_blues -darkblue_gray -garvblue -green_orange -openphpnuke -paradice -xampp -xp_basic -xp_blue -*.swp diff --git a/themes/darkblue_orange/.cvsignore b/themes/darkblue_orange/.cvsignore deleted file mode 100644 index 1377554eb..000000000 --- a/themes/darkblue_orange/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.swp diff --git a/themes/darkblue_orange/css/.cvsignore b/themes/darkblue_orange/css/.cvsignore deleted file mode 100644 index 1377554eb..000000000 --- a/themes/darkblue_orange/css/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.swp diff --git a/themes/darkblue_orange/img/.cvsignore b/themes/darkblue_orange/img/.cvsignore deleted file mode 100644 index 1377554eb..000000000 --- a/themes/darkblue_orange/img/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.swp diff --git a/themes/original/.cvsignore b/themes/original/.cvsignore deleted file mode 100644 index 1377554eb..000000000 --- a/themes/original/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.swp diff --git a/themes/original/css/.cvsignore b/themes/original/css/.cvsignore deleted file mode 100644 index 1377554eb..000000000 --- a/themes/original/css/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.swp diff --git a/themes/original/img/.cvsignore b/themes/original/img/.cvsignore deleted file mode 100644 index 1377554eb..000000000 --- a/themes/original/img/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -*.swp