[Rt-commit] rt branch, 3.999-trunk, updated. ab8111b9e718b732f3116fd8a3b3a63d384e55fa

sunnavy at bestpractical.com sunnavy at bestpractical.com
Wed Jul 8 03:20:56 EDT 2009


The branch, 3.999-trunk has been updated
       via  ab8111b9e718b732f3116fd8a3b3a63d384e55fa (commit)
       via  dee3d1cc79e02a6c1b870d93cf73decb6478a02f (commit)
       via  f08af4616d4eef87b4367d62815467ef4e095026 (commit)
       via  a378e98c3aa85f85b2f475d6263afe5d92e6f9ef (commit)
       via  a0a6bc66466c282ec05805b91e7f4265fc49d0c7 (commit)
       via  0ce676e6a64773ce16df1e2d897e32bd260bcd81 (commit)
      from  0c889e58ea5e04ba6747fe420dfb59c79dffedbe (commit)

Summary of changes:
 tools/shipwright-package |  158 ++++++++++++++++++++++++++-------------------
 1 files changed, 91 insertions(+), 67 deletions(-)

- Log -----------------------------------------------------------------
commit 0ce676e6a64773ce16df1e2d897e32bd260bcd81
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Jul 8 13:18:01 2009 +0800

    use git as shipwright backend, also a bit tidy

diff --git a/tools/shipwright-package b/tools/shipwright-package
index fe8457e..a8126c3 100644
--- a/tools/shipwright-package
+++ b/tools/shipwright-package
@@ -1,20 +1,40 @@
-export REPO=/tmp/shipwright-rt4
-export SVN_PATH="svn:file://$REPO"
+# sources
+export ZLIB=http://www.zlib.net/zlib-1.2.3.tar.gz 
+export LIBPNG=ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.2.37.tar.bz2
+export FREETYPE=http://ftp.twaren.net/Unix/NonGNU/freetype/freetype-2.3.9.tar.gz
+export FONTCONFIG=http://fontconfig.org/release/fontconfig-2.6.0.tar.gz
+export EXPAT=http://nchc.dl.sourceforge.net/sourceforge/expat/expat-2.0.1.tar.gz
+export LIBJPEG=ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz 
+export GD=http://www.libgd.org/releases/gd-2.0.35.tar.gz
+export GRAPHVIZ=http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.22.2.tar.gz
+export GNUPG=ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.9.tar.bz2
+export NCURSES=http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.7.tar.gz
+export READLINE=ftp://ftp.cwru.edu/pub/bash/readline-6.0.tar.gz
+export MYSQL=http://mysql.easynet.be/Downloads/MySQL-5.1/mysql-5.1.36.tar.gz
+export PG=http://ftp2.au.postgresql.org/pub/postgresql/source/v8.3.7/postgresql-8.3.7.tar.bz2
+export TEST_WWW_DECLARE=svn:http://svn.jifty.org/svn/jifty.org/Test-WWW-Declare
+export JIFTY_DBI=svn:http://svn.jifty.org/svn/jifty.org/Jifty-DBI/trunk
+export JIFTY=svn:http://svn.jifty.org/svn/jifty.org/jifty/trunk
+export LORZY=svn://svn.bestpractical.com/Lorzy/trunk
+export RT=svn://svn.bestpractical.com/rt/3.999/trunk
+
+
+export REPO=/tmp/shipwright-rt4.git
+export GIT_PATH="git:file://$REPO"
 export MIN_PERL=5.008006
 export SKIP="--skip=Module::Signature,Devel::Cover,Pod::Coverage,Test::Pod::Coverage,Test::Distribution,Pod::Readme,Archive::Tar,Test::Script::Run,HTML::Lint,Encode,Date::Calc,cpan-mod_perl,Apache2::Const,Apache::Request,Apache::DBI,Git,XML::SAX::Exception,DBD::Oracle,CGI::SpeedyCGI,Jifty,Jifty::DBI,Test::WWW::Declare,Lorzy,Class::C3::XS"
-export IMPORT="shipwright import --min-perl-version=$MIN_PERL $SKIP -r $SVN_PATH --log-file - --log-level info"
-rm -rf $REPO
-svnadmin create $REPO
+export IMPORT="shipwright import --min-perl-version=$MIN_PERL $SKIP -r $GIT_PATH --log-file - --log-level info"
 
-shipwright create -r $SVN_PATH
+rm -rf $REPO
+shipwright create -r $GIT_PATH
 
 # import gd related stuff
-$IMPORT http://www.zlib.net/zlib-1.2.3.tar.gz 
-$IMPORT ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.2.35.tar.bz2
-$IMPORT http://ftp.twaren.net/Unix/NonGNU/freetype/freetype-2.3.9.tar.gz
-$IMPORT http://fontconfig.org/release/fontconfig-2.6.0.tar.gz
-$IMPORT http://nchc.dl.sourceforge.net/sourceforge/expat/expat-2.0.1.tar.gz
-$IMPORT ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v6b.tar.gz --name libjpeg
+$IMPORT $ZLIB
+$IMPORT $LIBPNG
+$IMPORT $FREETYPE
+$IMPORT $FONTCONFIG
+$IMPORT $EXPAT
+$IMPORT $LIBJPEG --name libjpeg
 
 echo 'configure: LDFLAGS="-L%%INSTALL_BASE%%/lib" CPPFLAGS="-I%%INSTALL_BASE%%/include" ./configure --prefix=%%INSTALL_BASE%% --with-png=%%INSTALL_BASE%% --with-jpeg=%%INSTALL_BASE%% --with-fontconfig=%%INSTALL_BASE%% --with-freetype=%%INSTALL_BASE%%
 make: %%MAKE%%
@@ -22,7 +42,7 @@ install: %%MAKE%% install
 clean: %%MAKE%% clean
 ' > /tmp/shipwright_gd_build
 
-$IMPORT http://www.libgd.org/releases/gd-2.0.35.tar.gz --build-script=/tmp/shipwright_gd_build
+$IMPORT $GD --build-script=/tmp/shipwright_gd_build
 
 # import graphviz
 
@@ -32,15 +52,15 @@ echo 'configure: cp configure configure.old && ./configure --prefix=%%INSTALL_BA
 make: %%MAKE%% || cp configure.old configure && %%MAKE%%
 install: %%MAKE%% install
 ' > /tmp/shipwright_graphviz_build
-$IMPORT http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.22.2.tar.gz
+$IMPORT $GRAPHVIZ --build-script=/tmp/shipwright_graphviz_build
 
 # import gnupg
-$IMPORT ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.9.tar.bz2
+$IMPORT $GNUPG
 
 # import ncurses
-$IMPORT http://ftp.gnu.org/pub/gnu/ncurses/ncurses-5.7.tar.gz
+$IMPORT $NCURSES
 
-$IMPORT ftp://ftp.cwru.edu/pub/bash/readline-6.0.tar.gz
+$IMPORT $READLINE
 
 # import mysql and Pg
 echo 'configure: ./configure --prefix=%%INSTALL_BASE%% --without-server --without-docs --without-man
@@ -48,14 +68,14 @@ make: %%MAKE%%
 install: %%MAKE%% install
 clean: %%MAKE%% clean
 ' > /tmp/shipwright_mysql_build
-$IMPORT http://mysql.easynet.be/Downloads/MySQL-5.1/mysql-5.1.33.tar.gz --build-script=/tmp/shipwright_mysql_build
+$IMPORT $MYSQL --build-script=/tmp/shipwright_mysql_build
 
 echo 'configure: ./configure --prefix=%%INSTALL_BASE%% 
 make: %%MAKE%%
 install: %%MAKE%% -C src/bin install && %%MAKE%% -C src/include install && %%MAKE%% -C src/interfaces install
 clean: %%MAKE%% clean
 ' > /tmp/shipwright_postgresql_build
-$IMPORT http://ftp2.au.postgresql.org/pub/postgresql/source/v8.3.7/postgresql-8.3.7.tar.bz2 --build-script=/tmp/shipwright_postgresql_build
+$IMPORT $PG --build-script=/tmp/shipwright_postgresql_build
 
 
 # newer Text-Balanced requires version.pm, which is not in core
@@ -72,63 +92,63 @@ install: %%MAKE%% install
 clean: %%MAKE%% clean' > /tmp/shipwright_cpan_xml_parser_build
 $IMPORT cpan:XML::Parser --build-script /tmp/shipwright_cpan_xml_parser_build
 
-$IMPORT svn:http://svn.jifty.org/svn/jifty.org/Test-WWW-Declare --name Test-WWW-Declare
-$IMPORT svn:http://svn.jifty.org/svn/jifty.org/Jifty-DBI/trunk --name Jifty-DBI
-$IMPORT svn:http://svn.jifty.org/svn/jifty.org/jifty/trunk --name Jifty
+$IMPORT $TEST_WWW_DECLARE  --name Test-WWW-Declare
+$IMPORT $JIFTY_DBI --name Jifty-DBI
+$IMPORT $JIFTY --name Jifty
 
-$IMPORT svn://svn.bestpractical.com/Lorzy/trunk --name Lorzy
+$IMPORT $LORZY --name Lorzy
 
 echo 'install: cp -rf * %%INSTALL_BASE%%' > /tmp/shipwright_rt_build
-$IMPORT svn://svn.bestpractical.com/rt/3.999/trunk --name RT --build-script /tmp/shipwright_rt_build
-
-shipwright update -r $SVN_PATH cpan-Data-Dump-Streamer --add-deps cpan-Text-Balanced
-shipwright update -r $SVN_PATH cpan-Text-Balanced --add-deps cpan-version
-shipwright update -r $SVN_PATH Jifty --add-deps Jifty-DBI,Test-WWW-Declare
-shipwright update -r $SVN_PATH cpan-DBD-SQLite --add-deps cpan-DBI
-shipwright update -r $SVN_PATH cpan-DBD-mysql --add-deps mysql,cpan-DBI
-shipwright update -r $SVN_PATH cpan-DBD-Pg --add-deps postgresql,cpan-DBI
-shipwright update -r $SVN_PATH mysql --add-deps ncurses,readline
-shipwright update -r $SVN_PATH postgresql --add-deps zlib,readline
-shipwright update -r $SVN_PATH fontconfig --add-deps freetype,expat
-shipwright update -r $SVN_PATH libpng --add-deps zlib
-shipwright update -r $SVN_PATH gd --add-deps libpng,libjpeg,freetype,fontconfig
-shipwright update -r $SVN_PATH graphviz --add-deps gd,freetype,fontconfig,zlib
-shipwright update -r $SVN_PATH cpan-GD --add-deps gd
-shipwright update -r $SVN_PATH cpan-GraphViz --add-deps graphviz
-shipwright update -r $SVN_PATH cpan-GnuPG-Interface --add-deps gnupg
-shipwright maintain -r $SVN_PATH --update-order
-
-shipwright flags -r $SVN_PATH mysql --add mysql
-shipwright flags -r $SVN_PATH cpan-DBD-mysql --add mysql
-shipwright flags -r $SVN_PATH postgresql --add Pg
-shipwright flags -r $SVN_PATH cpan-DBD-Pg --add Pg
+$IMPORT $RT --name RT --build-script /tmp/shipwright_rt_build
+
+shipwright update -r $GIT_PATH cpan-Data-Dump-Streamer --add-deps cpan-Text-Balanced
+shipwright update -r $GIT_PATH cpan-Text-Balanced --add-deps cpan-version
+shipwright update -r $GIT_PATH Jifty --add-deps Jifty-DBI,Test-WWW-Declare
+shipwright update -r $GIT_PATH cpan-DBD-SQLite --add-deps cpan-DBI
+shipwright update -r $GIT_PATH cpan-DBD-mysql --add-deps mysql,cpan-DBI
+shipwright update -r $GIT_PATH cpan-DBD-Pg --add-deps postgresql,cpan-DBI
+shipwright update -r $GIT_PATH mysql --add-deps ncurses,readline
+shipwright update -r $GIT_PATH postgresql --add-deps zlib,readline
+shipwright update -r $GIT_PATH fontconfig --add-deps freetype,expat
+shipwright update -r $GIT_PATH libpng --add-deps zlib
+shipwright update -r $GIT_PATH gd --add-deps libpng,libjpeg,freetype,fontconfig
+shipwright update -r $GIT_PATH graphviz --add-deps gd,freetype,fontconfig,zlib
+shipwright update -r $GIT_PATH cpan-GD --add-deps gd
+shipwright update -r $GIT_PATH cpan-GraphViz --add-deps graphviz
+shipwright update -r $GIT_PATH cpan-GnuPG-Interface --add-deps gnupg
+shipwright maintain -r $GIT_PATH --update-order
+
+shipwright flags -r $GIT_PATH mysql --add mysql
+shipwright flags -r $GIT_PATH cpan-DBD-mysql --add mysql
+shipwright flags -r $GIT_PATH postgresql --add Pg
+shipwright flags -r $GIT_PATH cpan-DBD-Pg --add Pg
 
 # set known test failures
-shipwright ktf -r $SVN_PATH cpan-Regexp-Common --set 1
-shipwright ktf -r $SVN_PATH cpan-URI --set 1
-shipwright ktf -r $SVN_PATH cpan-Time-Duration --set 1
-shipwright ktf -r $SVN_PATH cpan-Data-Dump-Streamer --set 1
-shipwright ktf -r $SVN_PATH cpan-Storable --set 1
-shipwright ktf -r $SVN_PATH cpan-PAR-Dist --set 1
-shipwright ktf -r $SVN_PATH cpan-WWW-Mechanize --set 1
-shipwright ktf -r $SVN_PATH cpan-Test-WWW-Mechanize --set 1
-shipwright ktf -r $SVN_PATH cpan-MIME-tools --set 1
+shipwright ktf -r $GIT_PATH cpan-Regexp-Common --set 1
+shipwright ktf -r $GIT_PATH cpan-URI --set 1
+shipwright ktf -r $GIT_PATH cpan-Time-Duration --set 1
+shipwright ktf -r $GIT_PATH cpan-Data-Dump-Streamer --set 1
+shipwright ktf -r $GIT_PATH cpan-Storable --set 1
+shipwright ktf -r $GIT_PATH cpan-PAR-Dist --set 1
+shipwright ktf -r $GIT_PATH cpan-WWW-Mechanize --set 1
+shipwright ktf -r $GIT_PATH cpan-Test-WWW-Mechanize --set 1
+shipwright ktf -r $GIT_PATH cpan-MIME-tools --set 1
 
 # DBD-... will try to connect server, which may result in test failure
-shipwright ktf -r $SVN_PATH cpan-DBD-mysql --set 1
-shipwright ktf -r $SVN_PATH cpan-DBD-Pg --set 1
+shipwright ktf -r $GIT_PATH cpan-DBD-mysql --set 1
+shipwright ktf -r $GIT_PATH cpan-DBD-Pg --set 1
 
 # pod stuff
-shipwright ktf -r $SVN_PATH cpan-XML-SAX-Expat --set 1
-shipwright ktf -r $SVN_PATH cpan-Compress-PPMd --set 1
+shipwright ktf -r $GIT_PATH cpan-XML-SAX-Expat --set 1
+shipwright ktf -r $GIT_PATH cpan-Compress-PPMd --set 1
 # temp jifty failure
-shipwright ktf -r $SVN_PATH Jifty --set 1
+shipwright ktf -r $GIT_PATH Jifty --set 1
 
 echo 'RT: cd %%INSTALL_BASE%% && PERL5LIB=lib:lib/perl5 bin/prove -r t' > /tmp/shipwright_test
-shipwright import -r $SVN_PATH --test-script /tmp/shipwright_test
+shipwright import -r $GIT_PATH --test-script /tmp/shipwright_test
 
 cd /tmp
 rm -rf rtex-$$
-svn export file://$REPO /tmp/rtex-$$
+git clone file://$REPO /tmp/rtex-$$
 #rsync -rvp /tmp/rtex/ jesse at fsck.com:/tmp/rtex-$$
 echo "cd /tmp/rtex-$$; ./bin/shipwright-builder --flags mysql,postgresql; ./bin/shipwright-builder --only-test" 

commit a0a6bc66466c282ec05805b91e7f4265fc49d0c7
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Jul 8 14:38:22 2009 +0800

    combine ktf cmds

diff --git a/tools/shipwright-package b/tools/shipwright-package
index a8126c3..59dcef9 100644
--- a/tools/shipwright-package
+++ b/tools/shipwright-package
@@ -124,25 +124,7 @@ shipwright flags -r $GIT_PATH postgresql --add Pg
 shipwright flags -r $GIT_PATH cpan-DBD-Pg --add Pg
 
 # set known test failures
-shipwright ktf -r $GIT_PATH cpan-Regexp-Common --set 1
-shipwright ktf -r $GIT_PATH cpan-URI --set 1
-shipwright ktf -r $GIT_PATH cpan-Time-Duration --set 1
-shipwright ktf -r $GIT_PATH cpan-Data-Dump-Streamer --set 1
-shipwright ktf -r $GIT_PATH cpan-Storable --set 1
-shipwright ktf -r $GIT_PATH cpan-PAR-Dist --set 1
-shipwright ktf -r $GIT_PATH cpan-WWW-Mechanize --set 1
-shipwright ktf -r $GIT_PATH cpan-Test-WWW-Mechanize --set 1
-shipwright ktf -r $GIT_PATH cpan-MIME-tools --set 1
-
-# DBD-... will try to connect server, which may result in test failure
-shipwright ktf -r $GIT_PATH cpan-DBD-mysql --set 1
-shipwright ktf -r $GIT_PATH cpan-DBD-Pg --set 1
-
-# pod stuff
-shipwright ktf -r $GIT_PATH cpan-XML-SAX-Expat --set 1
-shipwright ktf -r $GIT_PATH cpan-Compress-PPMd --set 1
-# temp jifty failure
-shipwright ktf -r $GIT_PATH Jifty --set 1
+shipwright ktf -r $GIT_PATH --set 1 cpan-Regexp-Common cpan-URI cpan-Time-Duration cpan-Data-Dump-Streamer cpan-Storable cpan-PAR-Dist cpan-WWW-Mechanize cpan-Test-WWW-Mechanize  cpan-MIME-tools cpan-DBD-mysql cpan-DBD-Pg cpan-XML-SAX-Expat cpan-Compress-PPMd Jifty
 
 echo 'RT: cd %%INSTALL_BASE%% && PERL5LIB=lib:lib/perl5 bin/prove -r t' > /tmp/shipwright_test
 shipwright import -r $GIT_PATH --test-script /tmp/shipwright_test

commit a378e98c3aa85f85b2f475d6263afe5d92e6f9ef
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Jul 8 14:50:06 2009 +0800

    add tools/shipwright-update

diff --git a/tools/shipwright-update b/tools/shipwright-update
new file mode 100755
index 0000000..8457532
--- /dev/null
+++ b/tools/shipwright-update
@@ -0,0 +1,6 @@
+# e.g.
+# shipwright-update cpan-version
+# shipwright-update RT
+export REPO=/tmp/shipwright-rt4.git
+export GIT_PATH="git:file://$REPO"
+shipwright update -r $GIT_PATH --only-sources $1

commit f08af4616d4eef87b4367d62815467ef4e095026
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Jul 8 15:03:12 2009 +0800

    remove shipwrigt-update

diff --git a/tools/shipwright-update b/tools/shipwright-update
deleted file mode 100755
index 8457532..0000000
--- a/tools/shipwright-update
+++ /dev/null
@@ -1,6 +0,0 @@
-# e.g.
-# shipwright-update cpan-version
-# shipwright-update RT
-export REPO=/tmp/shipwright-rt4.git
-export GIT_PATH="git:file://$REPO"
-shipwright update -r $GIT_PATH --only-sources $1

commit dee3d1cc79e02a6c1b870d93cf73decb6478a02f
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Jul 8 15:04:16 2009 +0800

    add bin/shipwright-update to created git repo

diff --git a/tools/shipwright-package b/tools/shipwright-package
index 59dcef9..72fada0 100644
--- a/tools/shipwright-package
+++ b/tools/shipwright-package
@@ -129,8 +129,25 @@ shipwright ktf -r $GIT_PATH --set 1 cpan-Regexp-Common cpan-URI cpan-Time-Durati
 echo 'RT: cd %%INSTALL_BASE%% && PERL5LIB=lib:lib/perl5 bin/prove -r t' > /tmp/shipwright_test
 shipwright import -r $GIT_PATH --test-script /tmp/shipwright_test
 
+# add trivial wrapper for update
+echo "# e.g.
+# ./bin/shipwright-update cpan-version
+# ./bin/shipwright-update RT
+shipwright update -r $GIT_PATH --only-sources \$1" > /tmp/shipwright-update
+chmod +x /tmp/shipwright-update
+git clone file://$REPO /tmp/shipwright-tmp.git
+cp /tmp/shipwright-update /tmp/shipwright-tmp.git/bin/
+cd /tmp/shipwright-tmp.git/bin/
+git add shipwright-update
+git commit -m 'add bin/shipwright-update' shipwright-update
+git push
+rm -rf /tmp/shipwright-tmp.git
+
+
 cd /tmp
 rm -rf rtex-$$
 git clone file://$REPO /tmp/rtex-$$
 #rsync -rvp /tmp/rtex/ jesse at fsck.com:/tmp/rtex-$$
 echo "cd /tmp/rtex-$$; ./bin/shipwright-builder --flags mysql,postgresql; ./bin/shipwright-builder --only-test" 
+
+

commit ab8111b9e718b732f3116fd8a3b3a63d384e55fa
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Jul 8 15:20:33 2009 +0800

    use rt.git in shipwright-package

diff --git a/tools/shipwright-package b/tools/shipwright-package
index 72fada0..51d9061 100644
--- a/tools/shipwright-package
+++ b/tools/shipwright-package
@@ -16,7 +16,8 @@ export TEST_WWW_DECLARE=svn:http://svn.jifty.org/svn/jifty.org/Test-WWW-Declare
 export JIFTY_DBI=svn:http://svn.jifty.org/svn/jifty.org/Jifty-DBI/trunk
 export JIFTY=svn:http://svn.jifty.org/svn/jifty.org/jifty/trunk
 export LORZY=svn://svn.bestpractical.com/Lorzy/trunk
-export RT=svn://svn.bestpractical.com/rt/3.999/trunk
+#export RT=svn://svn.bestpractical.com/rt/3.999/trunk
+export RT=git://github.com/bestpractical/rt.git
 
 
 export REPO=/tmp/shipwright-rt4.git
@@ -99,7 +100,12 @@ $IMPORT $JIFTY --name Jifty
 $IMPORT $LORZY --name Lorzy
 
 echo 'install: cp -rf * %%INSTALL_BASE%%' > /tmp/shipwright_rt_build
-$IMPORT $RT --name RT --build-script /tmp/shipwright_rt_build
+export RT_GIT=/tmp/shipwright_rt.git
+git clone $RT $RT_GIT
+cd $RT_GIT
+git checkout origin/3.999-trunk
+rm -rf .git
+$IMPORT $RT_GIT --name RT --build-script /tmp/shipwright_rt_build
 
 shipwright update -r $GIT_PATH cpan-Data-Dump-Streamer --add-deps cpan-Text-Balanced
 shipwright update -r $GIT_PATH cpan-Text-Balanced --add-deps cpan-version
@@ -150,4 +156,3 @@ git clone file://$REPO /tmp/rtex-$$
 #rsync -rvp /tmp/rtex/ jesse at fsck.com:/tmp/rtex-$$
 echo "cd /tmp/rtex-$$; ./bin/shipwright-builder --flags mysql,postgresql; ./bin/shipwright-builder --only-test" 
 
-

-----------------------------------------------------------------------


More information about the Rt-commit mailing list