Finalise SVN migration.
This commit is contained in:
Michal Čihař
11
.cvsignore
11
.cvsignore
@@ -1,11 +0,0 @@
|
||||
config.inc.php
|
||||
config.header.inc.php
|
||||
config.footer.inc.php
|
||||
phpmyadmin.wpj
|
||||
*.swp
|
||||
upload
|
||||
save
|
||||
.vimrc
|
||||
.project
|
||||
.settings
|
||||
config
|
||||
14
ChangeLog
Executable file → Normal file
14
ChangeLog
Executable file → Normal file
@@ -5,6 +5,20 @@ phpMyAdmin - ChangeLog
|
||||
$Id$
|
||||
$Source$
|
||||
|
||||
2006-10-12 Michal Čihař <michal@cihar.com>
|
||||
* 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 <lem9@users.sourceforge.net>
|
||||
### Migration to Subversion
|
||||
|
||||
|
||||
23
Documentation.html
Executable file → Normal file
23
Documentation.html
Executable file → Normal file
@@ -3777,9 +3777,9 @@ chmod o+rwx tmp
|
||||
<a href="#faq7_2">7.2 I want to translate the messages to a new language or upgrade an
|
||||
existing language, where do I start?</a></h4>
|
||||
|
||||
<p> Always use the current CVS version of your language file.
|
||||
<p> Always use the current SVN version of your language file.
|
||||
For a new language, start from <i>english-iso-8859-1.inc.php</i>. 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.
|
||||
<br />
|
||||
Please note that we try not to use HTML entities like &eacute; in
|
||||
the translations, since we define the right character set in the file.
|
||||
@@ -3798,19 +3798,20 @@ chmod o+rwx tmp
|
||||
|
||||
<p> The following method is preferred for new developers:</p>
|
||||
|
||||
<ol><li>fetch the current CVS tree over anonymous CVS:<br />
|
||||
<tt>cvs -d:pserver:anonymous@phpmyadmin.cvs.sourceforge.net:/cvsroot/phpmyadmin login</tt><br />
|
||||
[Password: simply press the Enter key]<br />
|
||||
<tt>cvs -z3 -d:pserver:anonymous@phpmyadmin.cvs.sourceforge.net:/cvsroot/phpmyadmin checkout phpMyAdmin</tt><br />
|
||||
[This will create a new sub-directory named phpMyAdmin]</li>
|
||||
<ol><li>fetch the current SVN tree over anonymous SVN:<br />
|
||||
<tt>svn co https://svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin</tt><br />
|
||||
</li>
|
||||
<li>add your stuff</li>
|
||||
<li>put the modified files (tar'ed and gzip'ed) inside the patch tracker of
|
||||
the
|
||||
<a href="http://sf.net/projects/phpmyadmin/">phpMyAdmin SourceForge account</a>.
|
||||
<li>generate patch with your changes:
|
||||
<tt>svn diff</tt><br />
|
||||
</li>
|
||||
<li>put the patch inside the <a
|
||||
href="https://sourceforge.net/tracker/?group_id=23067&atid=377410">patch
|
||||
tracker of the phpMyAdmin project</a>.
|
||||
</li>
|
||||
</ol>
|
||||
|
||||
<p> Write access to the CVS tree is granted only to experienced developers who
|
||||
<p> Write access to the SVN tree is granted only to experienced developers who
|
||||
have already contributed something useful to phpMyAdmin.<br />
|
||||
Also, have a look at the <a href="#developers">Developers section</a>.</p>
|
||||
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
*.swp
|
||||
@@ -1 +0,0 @@
|
||||
*.swp
|
||||
@@ -1,3 +0,0 @@
|
||||
tmp-check
|
||||
added_messages.php
|
||||
*.swp
|
||||
0
lang/add_message.sh
Normal file → Executable file
0
lang/add_message.sh
Normal file → Executable file
@@ -1 +0,0 @@
|
||||
*.swp
|
||||
@@ -1 +0,0 @@
|
||||
*.swp
|
||||
@@ -1 +0,0 @@
|
||||
*.swp
|
||||
@@ -1 +0,0 @@
|
||||
*.swp
|
||||
@@ -1 +0,0 @@
|
||||
*.swp
|
||||
@@ -1 +0,0 @@
|
||||
*.swp
|
||||
@@ -1 +0,0 @@
|
||||
*.swp
|
||||
@@ -1 +0,0 @@
|
||||
*.swp
|
||||
@@ -1 +0,0 @@
|
||||
*.swp
|
||||
@@ -1 +0,0 @@
|
||||
*.swp
|
||||
@@ -1 +0,0 @@
|
||||
*.swp
|
||||
0
libraries/transformations/generator.sh
Normal file → Executable file
0
libraries/transformations/generator.sh
Normal file → Executable file
0
libraries/transformations/template_generator.sh
Normal file → Executable file
0
libraries/transformations/template_generator.sh
Normal file → Executable file
0
libraries/transformations/template_generator_mimetype.sh
Normal file → Executable file
0
libraries/transformations/template_generator_mimetype.sh
Normal file → Executable file
@@ -1 +0,0 @@
|
||||
*.swp
|
||||
@@ -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
|
||||
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
|
||||
else
|
||||
target=$date_snapshot
|
||||
else
|
||||
if [ "$#" -ge 2 ] ; then
|
||||
branch="$2"
|
||||
fi
|
||||
|
||||
|
||||
if [ "$mode" != "snapshot" ]
|
||||
then
|
||||
|
||||
target="$1"
|
||||
cat <<END
|
||||
|
||||
Please ensure you have:
|
||||
1. incremented rc count or version in CVS :
|
||||
1. incremented rc count or version in subversion :
|
||||
- in libraries/Config.class.php PMA_Config::__constructor() the line
|
||||
" $this->set( 'PMA_VERSION', '2.7.1-dev' ); "
|
||||
" \$this->set( 'PMA_VERSION', '$1' ); "
|
||||
- in Documentation.html the 2 lines
|
||||
" <title>phpMyAdmin $1 - Documentation</title> "
|
||||
" <h1>phpMyAdmin $1 Documentation</h1> "
|
||||
@@ -136,7 +116,6 @@ Please ensure you have:
|
||||
|
||||
Continue (y/n)?
|
||||
END
|
||||
printf "\a"
|
||||
read do_release
|
||||
|
||||
if [ "$do_release" != 'y' ]; then
|
||||
@@ -144,6 +123,7 @@ END
|
||||
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 <<END
|
||||
|
||||
Todo now:
|
||||
---------
|
||||
1. tag the cvs tree with the new revision number for a plain release or a
|
||||
release candidate:
|
||||
1. tag the subversion tree with the new revision number for a plain release
|
||||
or a release candidate:
|
||||
version 2.7.0 gets two tags: RELEASE_2_7_0 and STABLE
|
||||
version 2.7.1-rc1 gets RELEASE_2_7_1RC1 and TESTING
|
||||
|
||||
@@ -305,7 +257,7 @@ Todo now:
|
||||
ftp upload.sourceforge.net
|
||||
cd incoming
|
||||
binary
|
||||
mput cvs/*.gz *.zip *.bz2
|
||||
mput svn/*.gz *.zip *.bz2
|
||||
3. add files to SF files page (cut and paste changelog since last release)
|
||||
4. add SF news item to phpMyAdmin project
|
||||
5. update web page:
|
||||
@@ -320,7 +272,7 @@ Todo now:
|
||||
Don't forget to update the Description section in the announcement,
|
||||
based on Documentation.html.
|
||||
|
||||
8. increment rc count or version in CVS :
|
||||
8. increment rc count or version in subversion :
|
||||
- in libraries/Config.class.php PMA_Config::__constructor() the line
|
||||
" $this->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
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
*.swp
|
||||
@@ -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
|
||||
@@ -1 +0,0 @@
|
||||
*.swp
|
||||
@@ -1 +0,0 @@
|
||||
*.swp
|
||||
@@ -1 +0,0 @@
|
||||
*.swp
|
||||
@@ -1 +0,0 @@
|
||||
*.swp
|
||||
@@ -1 +0,0 @@
|
||||
*.swp
|
||||
@@ -1 +0,0 @@
|
||||
*.swp
|
||||
Reference in New Issue
Block a user