From eca1aa81ecdf0407544b5f717837fe382dc52563 Mon Sep 17 00:00:00 2001 From: Benedikt Boehm Date: Fri, 15 Sep 2006 08:31:53 +0000 Subject: [PATCH] cleanup old cvs cruft; add mkrelease script; use svn2cl instead of cvs2cl git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2313 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- ChangeLog.sed | 1 - Makefile.svn | 10 ++++++ configure.ac | 2 +- contrib/.cvsignore | 2 -- cvsusers.map | 1 - distrib/.cvsignore | 2 -- doc/.cvsignore | 2 -- ensc_fmt/.cvsignore | 4 --- ensc_vector/.cvsignore | 2 -- ensc_vector/testsuite/.cvsignore | 5 --- lib/.cvsignore | 7 ----- lib/apidoc/.cvsignore | 5 --- lib/testsuite/.cvsignore | 9 ------ lib_internal/.cvsignore | 2 -- lib_internal/testsuite/.cvsignore | 12 ------- m4/changelog.am | 13 ++------ m4/ensc_changelog.m4 | 13 ++------ mkrelease | 35 +++++++++++++++++++++ scripts/.cvsignore | 4 --- scripts/legacy/.cvsignore | 2 -- src/.cvsignore | 66 --------------------------------------- src/testsuite/.cvsignore | 9 ------ sysv/.cvsignore | 10 ------ tests/.cvsignore | 12 ------- vserver-start/.cvsignore | 4 --- 25 files changed, 52 insertions(+), 182 deletions(-) delete mode 100644 ChangeLog.sed create mode 100644 Makefile.svn delete mode 100644 contrib/.cvsignore delete mode 100644 cvsusers.map delete mode 100644 distrib/.cvsignore delete mode 100644 doc/.cvsignore delete mode 100644 ensc_fmt/.cvsignore delete mode 100644 ensc_vector/.cvsignore delete mode 100644 ensc_vector/testsuite/.cvsignore delete mode 100644 lib/.cvsignore delete mode 100644 lib/apidoc/.cvsignore delete mode 100644 lib/testsuite/.cvsignore delete mode 100644 lib_internal/.cvsignore delete mode 100644 lib_internal/testsuite/.cvsignore create mode 100755 mkrelease delete mode 100644 scripts/.cvsignore delete mode 100644 scripts/legacy/.cvsignore delete mode 100644 src/.cvsignore delete mode 100644 src/testsuite/.cvsignore delete mode 100644 sysv/.cvsignore delete mode 100644 tests/.cvsignore delete mode 100644 vserver-start/.cvsignore diff --git a/ChangeLog.sed b/ChangeLog.sed deleted file mode 100644 index dea67bc..0000000 --- a/ChangeLog.sed +++ /dev/null @@ -1 +0,0 @@ -s!ensc@kosh.ultra.csn.tu-chemnitz.de!enrico.scholz@informatik.tu-chemnitz.de!g diff --git a/Makefile.svn b/Makefile.svn new file mode 100644 index 0000000..36e6a18 --- /dev/null +++ b/Makefile.svn @@ -0,0 +1,10 @@ +default: all + +all: + aclocal -I m4 + autoheader + libtoolize --force --copy --automake + automake -afc + autoconf + rm -rf autom4te.cache/ + diff --git a/configure.ac b/configure.ac index e8d901e..8077a96 100644 --- a/configure.ac +++ b/configure.ac @@ -183,7 +183,7 @@ dnl ########################## ENSC_UV_VROOTDIR(vserverdir) -ENSC_CHANGELOG([trunk]) +ENSC_CHANGELOG dnl ########################## diff --git a/contrib/.cvsignore b/contrib/.cvsignore deleted file mode 100644 index 55b480f..0000000 --- a/contrib/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -.manifest.dat.pathsubst.stamp -manifest.dat diff --git a/cvsusers.map b/cvsusers.map deleted file mode 100644 index 1e18434..0000000 --- a/cvsusers.map +++ /dev/null @@ -1 +0,0 @@ -ensc:Enrico Scholz diff --git a/distrib/.cvsignore b/distrib/.cvsignore deleted file mode 100644 index 282522d..0000000 --- a/distrib/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/doc/.cvsignore b/doc/.cvsignore deleted file mode 100644 index a5790aa..0000000 --- a/doc/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -compatibility.html -configuration.html diff --git a/ensc_fmt/.cvsignore b/ensc_fmt/.cvsignore deleted file mode 100644 index 74e8a83..0000000 --- a/ensc_fmt/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -.deps -.dirstamp -.libs -*.lo diff --git a/ensc_vector/.cvsignore b/ensc_vector/.cvsignore deleted file mode 100644 index ec96903..0000000 --- a/ensc_vector/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -.deps -.dirstamp diff --git a/ensc_vector/testsuite/.cvsignore b/ensc_vector/testsuite/.cvsignore deleted file mode 100644 index 6143293..0000000 --- a/ensc_vector/testsuite/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -.deps -.dirstamp -.libs -test1 -test2 diff --git a/lib/.cvsignore b/lib/.cvsignore deleted file mode 100644 index 5b3dc3a..0000000 --- a/lib/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -*.la -*.lo -.buexcl -.deps -.dirstamp -.libs -util-vserver.pc diff --git a/lib/apidoc/.cvsignore b/lib/apidoc/.cvsignore deleted file mode 100644 index d8dfac7..0000000 --- a/lib/apidoc/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -.apidoc -Doxyfile -html -latex -man diff --git a/lib/testsuite/.cvsignore b/lib/testsuite/.cvsignore deleted file mode 100644 index 773489c..0000000 --- a/lib/testsuite/.cvsignore +++ /dev/null @@ -1,9 +0,0 @@ -.deps -.dirstamp -.gdb_history -.libs -cflags -flags -fmt -parselimit -personality diff --git a/lib_internal/.cvsignore b/lib_internal/.cvsignore deleted file mode 100644 index ec96903..0000000 --- a/lib_internal/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -.deps -.dirstamp diff --git a/lib_internal/testsuite/.cvsignore b/lib_internal/testsuite/.cvsignore deleted file mode 100644 index 5e9285d..0000000 --- a/lib_internal/testsuite/.cvsignore +++ /dev/null @@ -1,12 +0,0 @@ -.deps -.dirstamp -.libs -.libs -.nfs0* -command -copy -filecfg-ml -isnumber -isnumber-gnu -sigbus -sigbus-gnu diff --git a/m4/changelog.am b/m4/changelog.am index 9afdf54..ec6140a 100644 --- a/m4/changelog.am +++ b/m4/changelog.am @@ -19,18 +19,11 @@ ChangeLog.sed: test "$(srcdir)" != "." -if HAVE_CVS2CL +if HAVE_SVN2CL ChangeLog: Makefile - if test "$(srcdir)" = "." -a -d CVS; then \ - $(CVS2CL) $(CVS2CL_ALLFLAGS) -f $@; \ + if test "$(srcdir)" = "." -a -d .svn; then \ + $(SVN2CL) -o $@; \ fi -else -if HAVE_RCS2LOG -ChangeLog: ChangeLog.sed Makefile - if test "$(srcdir)" = "." -a -d CVS; then \ - $(RCS2LOG) -l 0 -c /dev/stdout | sed -f $< >$@; \ - fi -endif endif .PHONY: ChangeLog diff --git a/m4/ensc_changelog.m4 b/m4/ensc_changelog.m4 index 6944781..be20da0 100644 --- a/m4/ensc_changelog.m4 +++ b/m4/ensc_changelog.m4 @@ -15,17 +15,10 @@ dnl You should have received a copy of the GNU General Public License dnl along with this program; if not, write to the Free Software dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -dnl Usage: ENSC_CHANGELOG() +dnl Usage: ENSC_CHANGELOG() AC_DEFUN([ENSC_CHANGELOG], [ - if test x"$1" != x; then - AC_SUBST(CVS2CL_TAG, ['-F $1']) - fi - - AC_CHECK_PROGS(CVS2CL, [cvs2cl]) - AM_CONDITIONAL(HAVE_CVS2CL, [test x"$CVS2CL" != x]) - - AC_CHECK_PROGS(RCS2LOG, [rcs2log]) - AM_CONDITIONAL(HAVE_RCS2LOG, [test x"$RCS2LOG" != x]) + AC_CHECK_PROGS(SVN2CL, [svn2cl]) + AM_CONDITIONAL(HAVE_SVN2CL, [test x"$SVN2CL" != x]) ]) diff --git a/mkrelease b/mkrelease new file mode 100755 index 0000000..90ead29 --- /dev/null +++ b/mkrelease @@ -0,0 +1,35 @@ +#!/bin/bash + +proj="util-vserver" +svnroot="http://svn.linux-vserver.org/svn/${proj}" + +usage() { + echo "Usage: mkrelease" +} + +die() { + echo $1 + exit ${2:-1} +} + +ver=`grep AC_INIT configure.ac | awk '{ print $2 }'` +ver=${ver/,} + +echo ">>> create release tag" + +#svn copy ${svnroot}/trunk ${svnroot}/tags/release-${ver} \ +# -m "Tagging the ${ver} release of the ${proj} project" || die "svn copy failed" + + +echo ">>> bootstrap sources" + +make -f Makefile.svn || die "make failed" + +echo ">>> create release tarball" + +./configure || die "configure failed" +make dist || die "make dist failed" + +for i in *.tar.bz2 *.tar.gz; do + md5sum $i > $i.md5 +done diff --git a/scripts/.cvsignore b/scripts/.cvsignore deleted file mode 100644 index 75cb4ff..0000000 --- a/scripts/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -.gdb_history -.*.stamp -util-vserver-vars -vps diff --git a/scripts/legacy/.cvsignore b/scripts/legacy/.cvsignore deleted file mode 100644 index 9acb2e2..0000000 --- a/scripts/legacy/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -.vps.pathsubst.stamp -vps diff --git a/src/.cvsignore b/src/.cvsignore deleted file mode 100644 index 220c033..0000000 --- a/src/.cvsignore +++ /dev/null @@ -1,66 +0,0 @@ -.buexcl -.deps -.dirstamp -.gdb_history -.libs -capchroot -chain-echo -chbind -chcontext -chcontext-compat -check-unixfile -chroot-cat -chroot-rm -chroot-sh -chxid -clearenv -enter-namespace -exec-cd -exec-ulimit -fakerunlevel -filetime -ifspec -keep-ctx-alive -listdevip -lockfile -lsxid -mask2prefix -new-namespace -parserpmdump -pipe-sync -readlink -rebootmgr -reducecap -rpm-fake-resolver -rpm-fake.la -save_ctxinfo -secure-mount -setattr -setctxlimit -showattr -showperm -sigexec -src_rpm_fake_la-rpm-fake.lo -vattribute -vbuild -vcheck -vcontext -vcopy -vdlimit -vdu -vfiles -vhashify -vkill -vlimit -vnamespace -vps -vreboot -vrsetup -vsched -vschedule -vserver-info -vserver-stat -vshelper-sync -vuname -vunify -vwait diff --git a/src/testsuite/.cvsignore b/src/testsuite/.cvsignore deleted file mode 100644 index 15735eb..0000000 --- a/src/testsuite/.cvsignore +++ /dev/null @@ -1,9 +0,0 @@ -.deps -.dirstamp -.libs -chbind-test -chcontext-test -hashcalc -hashcalc-plain -rpm-fake-test -vunify-functest diff --git a/sysv/.cvsignore b/sysv/.cvsignore deleted file mode 100644 index 80bab4b..0000000 --- a/sysv/.cvsignore +++ /dev/null @@ -1,10 +0,0 @@ -rebootmgr -v_gated -v_httpd -v_named -v_portmap -v_sendmail -v_smb -v_sshd -v_xinetd -vservers diff --git a/tests/.cvsignore b/tests/.cvsignore deleted file mode 100644 index 5abb7b1..0000000 --- a/tests/.cvsignore +++ /dev/null @@ -1,12 +0,0 @@ -.deps -.dirstamp -.libs -chrootsafe -escaperoot -forkbomb -getctx -getinitpid -testipc -testlimit -testopenf -vserver-info diff --git a/vserver-start/.cvsignore b/vserver-start/.cvsignore deleted file mode 100644 index 4cf7f81..0000000 --- a/vserver-start/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -.deps -.dirstamp -.libs -vserver.start.bin -- 1.8.1.5