Menu
▾
▴
halfs-cvs — History of CVS commits
You can subscribe to this list here.
| 2006 |
Jan
(4) |
Feb
(4) |
Mar
(12) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
|---|
|
From: <za...@us...> - 2006-12-24 23:11:32
|
Revision: 22
http://svn.sourceforge.net/halfs/?rev=22&view=rev
Author: zaufi
Date: 2006-12-24 15:11:30 -0800 (Sun, 24 Dec 2006)
Log Message:
-----------
fix externals
Property Changed:
----------------
halfs/trunk/
Property changes on: halfs/trunk
___________________________________________________________________
Name: svn:externals
- m4 https://svn.sourceforge.net/svnroot/libmage/m4/trunk
admin https://svn.sourceforge.net/svnroot/libmage/admin/trunk
+ m4 https://libmage.svn.sourceforge.net/svnroot/libmage/m4/trunk
admin https://libmage.svn.sourceforge.net/svnroot/libmage/admin/trunk
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <za...@us...> - 2006-08-16 08:37:47
|
Revision: 21 Author: zaufi Date: 2006-08-16 01:37:40 -0700 (Wed, 16 Aug 2006) ViewCVS: http://svn.sourceforge.net/halfs/?rev=21&view=rev Log Message: ----------- externals updated Property Changed: ---------------- halfs/trunk/ Property changes on: halfs/trunk ___________________________________________________________________ Name: svn:externals - m4 https://svn.sourceforge.net/svnroot/halfs/m4/trunk admin https://svn.sourceforge.net/svnroot/halfs/admin/trunk + m4 https://svn.sourceforge.net/svnroot/libmage/m4/trunk admin https://svn.sourceforge.net/svnroot/libmage/admin/trunk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <za...@us...> - 2006-04-19 23:18:44
|
Revision: 20 Author: zaufi Date: 2006-04-19 16:18:26 -0700 (Wed, 19 Apr 2006) ViewCVS: http://svn.sourceforge.net/halfs/?rev=20&view=rev Log Message: ----------- remove svn:executable Property Changed: ---------------- admin/trunk/devel.d/00-init-globals.sh admin/trunk/devel.d/01-echo.sh admin/trunk/devel.d/02-check-admindir.sh admin/trunk/devel.d/40-help-support.sh admin/trunk/devel.d/50-detect-vcs.sh admin/trunk/devel.d/99-registrator.sh admin/trunk/devel.d/bootstrap.tgt.sh admin/trunk/devel.d/change-log.tgt.sh admin/trunk/devel.d/code-stats.tgt.sh admin/trunk/devel.d/help.tgt.sh admin/trunk/devel.d/scan-includes.tgt.sh admin/trunk/devel.d/total-cleanup.tgt.sh admin/trunk/devel.d/vcs-cvs-support.sh admin/trunk/devel.d/vcs-subversion-support.sh admin/trunk/devel.d/versioning-support.tgt.sh Property changes on: admin/trunk/devel.d/00-init-globals.sh ___________________________________________________________________ Name: svn:executable - * Property changes on: admin/trunk/devel.d/01-echo.sh ___________________________________________________________________ Name: svn:executable - * Property changes on: admin/trunk/devel.d/02-check-admindir.sh ___________________________________________________________________ Name: svn:executable - * Property changes on: admin/trunk/devel.d/40-help-support.sh ___________________________________________________________________ Name: svn:executable - * Property changes on: admin/trunk/devel.d/50-detect-vcs.sh ___________________________________________________________________ Name: svn:executable - * Property changes on: admin/trunk/devel.d/99-registrator.sh ___________________________________________________________________ Name: svn:executable - * Property changes on: admin/trunk/devel.d/bootstrap.tgt.sh ___________________________________________________________________ Name: svn:executable - * Property changes on: admin/trunk/devel.d/change-log.tgt.sh ___________________________________________________________________ Name: svn:executable - * Property changes on: admin/trunk/devel.d/code-stats.tgt.sh ___________________________________________________________________ Name: svn:executable - * Property changes on: admin/trunk/devel.d/help.tgt.sh ___________________________________________________________________ Name: svn:executable - * Property changes on: admin/trunk/devel.d/scan-includes.tgt.sh ___________________________________________________________________ Name: svn:executable - * Property changes on: admin/trunk/devel.d/total-cleanup.tgt.sh ___________________________________________________________________ Name: svn:executable - * Property changes on: admin/trunk/devel.d/vcs-cvs-support.sh ___________________________________________________________________ Name: svn:executable - * Property changes on: admin/trunk/devel.d/vcs-subversion-support.sh ___________________________________________________________________ Name: svn:executable - * Property changes on: admin/trunk/devel.d/versioning-support.tgt.sh ___________________________________________________________________ Name: svn:executable - * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <za...@us...> - 2006-03-30 22:29:46
|
Revision: 19 Author: zaufi Date: 2006-03-30 14:29:39 -0800 (Thu, 30 Mar 2006) ViewCVS: http://svn.sourceforge.net/halfs/?rev=19&view=rev Log Message: ----------- make it more gentoo like Modified Paths: -------------- admin/trunk/devel.d/01-echo.sh Modified: admin/trunk/devel.d/01-echo.sh =================================================================== --- admin/trunk/devel.d/01-echo.sh 2006-03-30 22:26:46 UTC (rev 18) +++ admin/trunk/devel.d/01-echo.sh 2006-03-30 22:29:39 UTC (rev 19) @@ -89,19 +89,28 @@ function eerror() { inc_lines_printed - echo -e "*** Error: $1" | tee -a ${log} + set_color ${COLOR_SUCCESS} + echo -n " * " + set_color ${COLOR_FAILURE} + echo -e "Error: $1" | tee -a ${log} } function ewarning() { inc_lines_printed - echo -e "*** Warning: $1" | tee -a ${log} + set_color ${COLOR_SUCCESS} + echo -n " * " + set_color ${COLOR_WARNING} + echo -e "Warning: $1" | tee -a ${log} } function einfo() { inc_lines_printed - echo -e "*** $1" | tee -a ${log} + set_color ${COLOR_SUCCESS} + echo -n " * " + set_color ${COLOR_NORMAL} + echo -e "$1" | tee -a ${log} } function eecho() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <za...@us...> - 2006-03-30 22:26:54
|
Revision: 18 Author: zaufi Date: 2006-03-30 14:26:46 -0800 (Thu, 30 Mar 2006) ViewCVS: http://svn.sourceforge.net/halfs/?rev=18&view=rev Log Message: ----------- import from d4x project Added Paths: ----------- m4/trunk/d4xao.m4 Added: m4/trunk/d4xao.m4 =================================================================== --- m4/trunk/d4xao.m4 (rev 0) +++ m4/trunk/d4xao.m4 2006-03-30 22:26:46 UTC (rev 18) @@ -0,0 +1,13 @@ +## +## $Header$ +## +## d4xao.m4 +## configure defines for checking libao +## on RedHat-8.0 and other +## written by Maxim Koshelev + +AC_DEFUN([D4X_PATH_AO],[ + ifdef([XIPH_PATH_AO], + [XIPH_PATH_AO([$1],[$2])], + [AM_PATH_AO([$1],[$2])])] +) Property changes on: m4/trunk/d4xao.m4 ___________________________________________________________________ Name: svn:keywords + "Id HeadURL Revision Date Author" Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <za...@us...> - 2006-03-30 21:50:09
|
Revision: 17 Author: zaufi Date: 2006-03-30 13:49:56 -0800 (Thu, 30 Mar 2006) ViewCVS: http://svn.sourceforge.net/halfs/?rev=17&view=rev Log Message: ----------- make it more gentoo like Modified Paths: -------------- admin/trunk/devel.d/01-echo.sh Modified: admin/trunk/devel.d/01-echo.sh =================================================================== --- admin/trunk/devel.d/01-echo.sh 2006-03-28 00:17:17 UTC (rev 16) +++ admin/trunk/devel.d/01-echo.sh 2006-03-30 21:49:56 UTC (rev 17) @@ -39,9 +39,9 @@ function ebegin() { set_color ${COLOR_SUCCESS} - echo -n "*" + echo -n " * " set_color ${COLOR_NORMAL} - echo -n " $1" + echo -n "$1" ebegin_in_action='y' } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <za...@us...> - 2006-03-28 00:17:24
|
Revision: 16 Author: zaufi Date: 2006-03-27 16:17:17 -0800 (Mon, 27 Mar 2006) ViewCVS: http://svn.sourceforge.net/halfs/?rev=16&view=rev Log Message: ----------- update requirements Modified Paths: -------------- halfs/trunk/README Modified: halfs/trunk/README =================================================================== --- halfs/trunk/README 2006-03-27 22:42:13 UTC (rev 15) +++ halfs/trunk/README 2006-03-28 00:17:17 UTC (rev 16) @@ -5,10 +5,10 @@ Tools and libs needed to build this package ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - boost library >= 1.31.0 + boost library >= 1.33.0 http://boost.org - libMAGE >= 0.1.3 + libMAGE >= 0.1.4 http://libmage.sourceforge.net And of course a good compiler with STL support ;) @@ -19,10 +19,10 @@ autoconf >= 2.59 to produce configure script http://www.gnu.org/software/autoconf - automake >= 1.9.2 to create Makefile templates + automake >= 1.9.6 to create Makefile templates http://www.gnu.org/software/automake - libtool >= 1.5 for shared libs support + libtool >= 1.5.20 for shared libs support http://www.gnu.org/software/libtool autogen >= 5.4.6 to generate class skeleton files This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <za...@us...> - 2006-03-27 22:42:20
|
Revision: 15 Author: zaufi Date: 2006-03-27 14:42:13 -0800 (Mon, 27 Mar 2006) ViewCVS: http://svn.sourceforge.net/halfs/?rev=15&view=rev Log Message: ----------- sync Modified Paths: -------------- admin/trunk/devel.d/01-echo.sh admin/trunk/devel.d/total-cleanup.tgt.sh admin/trunk/devel.d/versioning-support.tgt.sh Modified: admin/trunk/devel.d/01-echo.sh =================================================================== --- admin/trunk/devel.d/01-echo.sh 2006-03-21 01:58:34 UTC (rev 14) +++ admin/trunk/devel.d/01-echo.sh 2006-03-27 22:42:13 UTC (rev 15) @@ -1,6 +1,6 @@ #!/bin/bash # -# $Id: 01-echo.sh,v 1.6 2006/03/20 16:29:14 alex Exp $ +# $Id: 01-echo.sh,v 1.7 2006/03/27 07:20:17 alex Exp $ # RES_COL=${COLUMNS:-0} @@ -38,7 +38,10 @@ function ebegin() { - echo -en "*** $1" + set_color ${COLOR_SUCCESS} + echo -n "*" + set_color ${COLOR_NORMAL} + echo -n " $1" ebegin_in_action='y' } Modified: admin/trunk/devel.d/total-cleanup.tgt.sh =================================================================== --- admin/trunk/devel.d/total-cleanup.tgt.sh 2006-03-21 01:58:34 UTC (rev 14) +++ admin/trunk/devel.d/total-cleanup.tgt.sh 2006-03-27 22:42:13 UTC (rev 15) @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: total-cleanup.tgt.sh,v 1.1 2006/03/17 13:04:03 alex Exp $ +# $Id: total-cleanup.tgt.sh,v 1.2 2006/03/21 11:13:58 alex Exp $ # # Remove files not registered in CVS # @@ -10,14 +10,32 @@ print_target_help 'total-cleanup' 'Remove all files and dirs not registered in VCS' } +function run_cleaner() +{ + cleaner=`which $1-clean 2>/dev/null` + if test -x "${cleaner}"; then + cur=`pwd` + cd "${top_srcdir}" + ${cleaner} + cd "${cur}" + else + eerror "Unable to find work copy cleaner: \`${1}-clean'" + eend 1 1 + fi +} + +# +# There is CVS and SVN cleaners already exists in KDE SDK -- +# I don't want to reinvent a bike :) +# function total_cleanup_impl() { detect_vcs case "${current_vcs}" in cvs) - perl $admindir/cvs-clean.pl ;; + run_cleaner "cvs" ;; subversion) - eerror "Sorry, this functionality is not implemented yet for subversion" ;; + run_cleaner "svn" ;; *) eerror "Unable to detect what VCS do u use" ;; esac Modified: admin/trunk/devel.d/versioning-support.tgt.sh =================================================================== --- admin/trunk/devel.d/versioning-support.tgt.sh 2006-03-21 01:58:34 UTC (rev 14) +++ admin/trunk/devel.d/versioning-support.tgt.sh 2006-03-27 22:42:13 UTC (rev 15) @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: versioning-support.tgt.sh,v 1.3 2006/03/16 23:53:01 alex Exp $ +# $Id: versioning-support.tgt.sh,v 1.4 2006/03/22 11:49:31 alex Exp $ # # Packege version management # @@ -30,7 +30,7 @@ fi # Get current versioninfo get_current_version - test -n "${MAJOR}" -o -n "${MINOR}" -o -n "${PATCH_LEVEL}" + test -n "${MAJOR}" -a -n "${MINOR}" -a -n "${PATCH_LEVEL}" eend $? 1 # Save previous version O_MAJOR=${MAJOR}; O_MINOR=${MINOR}; O_PATCH_LEVEL=${PATCH_LEVEL}; O_EXTRA_VERSION=${EXTRA_VERSION} @@ -206,15 +206,14 @@ # function make_a_branch() { - ebegin "*** Parse current version info..." + ebegin "Parse current version info..." if test ! -f ${top_srcdir}/support/version.m4; then - eend $? eerror "Version info file not found" - exit 1 + eend 1 1 fi # Get current versioninfo get_current_version - test -z "${MAJOR}" -o -z "${MINOR}" -o -z "${PATCH_LEVEL}" + test -n "${MAJOR}" -a -n "${MINOR}" -a -n "${PATCH_LEVEL}" eend $? 1 # Increment version number local major_increment=$1 @@ -264,39 +263,39 @@ function major_release_help { - print_target_help 'major_release' 'Start next major generation with release (x++.0.0)' + print_target_help 'major-release' 'Start next major generation with release (x++.0.0)' } function minor_release_help { - print_target_help 'minor_release' 'Start next minor generation with release (x.y++.0)' + print_target_help 'minor-release' 'Start next minor generation with release (x.y++.0)' } function patch_release_help { - print_target_help 'patch_release' 'Start next patch generation with release (x.y.z++)' + print_target_help 'patch-release' 'Start next patch generation with release (x.y.z++)' } function next_major_beta_help { - print_target_help 'next_major_beta' 'Start next major generation with beta1 version (x++.0.0-beta1)' + print_target_help 'next-major-beta' 'Start next major generation with beta1 version (x++.0.0-beta1)' } function next_minor_beta_help { - print_target_help 'next_minor_beta' 'Start next minor generation with beta1 version (x.y++.0-beta1)' + print_target_help 'next-minor-beta' 'Start next minor generation with beta1 version (x.y++.0-beta1)' } function next_patch_beta_help { - print_target_help 'next_patch_beta' 'Start next patch generation with beta1 version (x.y.z++-beta1)' + print_target_help 'next-patch-beta' 'Start next patch generation with beta1 version (x.y.z++-beta1)' } function next_major_rc_help { - print_target_help 'next_major_rc' 'Start next major generation with RC1 extra version (x++.0.0-rc1)' + print_target_help 'next-major-rc' 'Start next major generation with RC1 extra version (x++.0.0-rc1)' } function next_minor_rc_help { - print_target_help 'next_minor_rc' 'Start next minor generation with RC1 extra version (x.y++.0-rc1)' + print_target_help 'next-minor-rc' 'Start next minor generation with RC1 extra version (x.y++.0-rc1)' } function next_patch_rc_help { - print_target_help 'next_patch_rc' 'Start next patch generation with RC1 extra version (x.y.z++-rc1)' + print_target_help 'next-patch-rc' 'Start next patch generation with RC1 extra version (x.y.z++-rc1)' } function release_help { @@ -304,23 +303,23 @@ } function next_beta_help { - print_target_help 'next_beta' 'Increment current beta number (x.y.z-betaN++)' + print_target_help 'next-beta' 'Increment current beta number (x.y.z-betaN++)' } function next_rc_help { - print_target_help 'next_rc' 'Increment current RC number (x.y.z-betaN --> x.y.z-rc1 or x.y.z-rcN++)' + print_target_help 'next-rc' 'Increment current RC number (x.y.z-betaN --> x.y.z-rc1 or x.y.z-rcN++)' } function report_version_help { - print_target_help 'report_version' 'Just report current version' + print_target_help 'report-version' 'Just report current version' } function next_major_branch_help { - print_target_help 'next_major_branch' 'Make a branch for next major version (x++.0) /will not change current version/' + print_target_help 'next-major-branch' 'Make a branch for next major version (x++.0) /will not change current version/' } function next_minor_branch_help { - print_target_help 'next_minor_branch' 'Make a branch for next minor version (x.y++) /will not change current version/' + print_target_help 'next-minor-branch' 'Make a branch for next minor version (x.y++) /will not change current version/' } reg_tgt_impl major_release This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <za...@us...> - 2006-03-21 01:58:38
|
Revision: 14 Author: zaufi Date: 2006-03-20 17:58:34 -0800 (Mon, 20 Mar 2006) ViewCVS: http://svn.sourceforge.net/halfs/?rev=14&view=rev Log Message: ----------- Solaris workarounds for defected sed Modified Paths: -------------- halfs/trunk/Makefile.cvs Modified: halfs/trunk/Makefile.cvs =================================================================== --- halfs/trunk/Makefile.cvs 2006-03-21 01:57:21 UTC (rev 13) +++ halfs/trunk/Makefile.cvs 2006-03-21 01:58:34 UTC (rev 14) @@ -1,11 +1,11 @@ # -# $Header: /a/c-repository/session-builder/Makefile.cvs,v 1.5 2006/03/17 13:21:37 alex Exp $ +# $Header: /a/c-repository/session-builder/Makefile.cvs,v 1.6 2006/03/21 00:38:55 alex Exp $ # # This file for CVS version only. # admindir = admin -MAINTAINER_TARGETS = $(shell grep -h print_target_help $(admindir)/devel.d/*.tgt.sh | sed -e "s,^.*'\(.*\)'\s\+'.*$$,\1," -e 's,_,-,g') +MAINTAINER_TARGETS = $(shell grep -h print_target_help $(admindir)/devel.d/*.tgt.sh | sed -e "s,^.*'\(.*\)' *'.*$$,\1," -e 's,_,-,g') # # Set 'default' target to 'bootstrap' -- we know that such target exists ;) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <za...@us...> - 2006-03-21 01:57:28
|
Revision: 13 Author: zaufi Date: 2006-03-20 17:57:21 -0800 (Mon, 20 Mar 2006) ViewCVS: http://svn.sourceforge.net/halfs/?rev=13&view=rev Log Message: ----------- implement SVN support + Solaris workarounds for defected sed Modified Paths: -------------- m4/trunk/ac_choose_boost.m4 m4/trunk/ac_path_gengetopt.m4 m4/trunk/ac_pkg_info_header.m4 Modified: m4/trunk/ac_choose_boost.m4 =================================================================== --- m4/trunk/ac_choose_boost.m4 2006-03-21 01:56:14 UTC (rev 12) +++ m4/trunk/ac_choose_boost.m4 2006-03-21 01:57:21 UTC (rev 13) @@ -1,5 +1,5 @@ ## -## $Header$ +## $Header: /a/c-repository/m4/ac_choose_boost.m4,v 1.3 2006/03/21 00:38:55 alex Exp $ ## ## ## Copyright (c) 2003, 2004 by Zaufi @@ -57,8 +57,8 @@ AC_CACHE_CHECK([boost version], [ac_cv_boost_version], [ ac_cv_boost_version=`cat $ac_cv_boost_headers_installed_at/boost/version.hpp \ - | grep '^# *define *BOOST_VERSION *[0-9]\+$' \ - | sed 's,^# *define *BOOST_VERSION *\([0-9]\+\)$,\1,'` + | grep '^# *define *BOOST_VERSION *[0-9][0-9]*$' \ + | sed 's,^# *define *BOOST_VERSION *\([0-9][0-9]*\)$,\1,'` ]) am_required_boost_version=ifelse([$1], , $ac_cv_boost_version, $1) ## Try to compile simple program Modified: m4/trunk/ac_path_gengetopt.m4 =================================================================== --- m4/trunk/ac_path_gengetopt.m4 2006-03-21 01:56:14 UTC (rev 12) +++ m4/trunk/ac_path_gengetopt.m4 2006-03-21 01:57:21 UTC (rev 13) @@ -1,5 +1,5 @@ ## -## $Header$ +## $Header: /a/c-repository/m4/ac_path_gengetopt.m4,v 1.3 2006/03/21 00:38:55 alex Exp $ ## ## ## 20/03/2002 by Zaufi @@ -21,17 +21,17 @@ else ggo_min_version=ifelse([$1], , 2.5, $1) AC_MSG_CHECKING(for gengetopt vesion >= $ggo_min_version) - ggo_version=`$GENGETOPT --version | head -n 1 | sed 's/^GNU gengetopt \([[0-9]]\+\.[[0-9]]\+\.*[[0-9]]*\).*/\1/'` - ggo_major=`echo $ggo_version | sed 's/\([[0-9]]\+\)\.\([[0-9]]\+\)\.*\([[0-9]]*\)/\1/'` - ggo_minor=`echo $ggo_version | sed 's/\([[0-9]]\+\)\.\([[0-9]]\+\)\.*\([[0-9]]*\)/\2/'` - ggo_patch=`echo $ggo_version | sed 's/\([[0-9]]\+\)\.\([[0-9]]\+\)\.*\([[0-9]]*\)/\3/'` + ggo_version=`$GENGETOPT --version | head -n 1 | sed 's/^GNU gengetopt \([[0-9]][[0-9]]*\.[[0-9]][[0-9]]*\.*[[0-9]]*\).*/\1/'` + ggo_major=`echo $ggo_version | sed 's/\([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\)\.*\([[0-9]]*\)/\1/'` + ggo_minor=`echo $ggo_version | sed 's/\([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\)\.*\([[0-9]]*\)/\2/'` + ggo_patch=`echo $ggo_version | sed 's/\([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\)\.*\([[0-9]]*\)/\3/'` ggo_major=`test -z $ggo_major && echo 0 || echo $ggo_major` ggo_minor=`test -z $ggo_minor && echo 0 || echo $ggo_minor` ggo_patch=`test -z $ggo_patch && echo 0 || echo $ggo_patch` ## - ggo_min_major=`echo $ggo_min_version | sed 's/\([[0-9]]\+\)\.\([[0-9]]\+\)\.*\([[0-9]]*\)/\1/'` - ggo_min_minor=`echo $ggo_min_version | sed 's/\([[0-9]]\+\)\.\([[0-9]]\+\)\.*\([[0-9]]*\)/\2/'` - ggo_min_patch=`echo $ggo_min_version | sed 's/\([[0-9]]\+\)\.\([[0-9]]\+\)\.*\([[0-9]]*\)/\3/'` + ggo_min_major=`echo $ggo_min_version | sed 's/\([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\)\.*\([[0-9]]*\)/\1/'` + ggo_min_minor=`echo $ggo_min_version | sed 's/\([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\)\.*\([[0-9]]*\)/\2/'` + ggo_min_patch=`echo $ggo_min_version | sed 's/\([[0-9]][[0-9]]*\)\.\([[0-9]][[0-9]]*\)\.*\([[0-9]]*\)/\3/'` ggo_min_major=`test -z $ggo_min_major && echo 0 || echo $ggo_min_major` ggo_min_minor=`test -z $ggo_min_minor && echo 0 || echo $ggo_min_minor` ggo_min_patch=`test -z $ggo_min_patch && echo 0 || echo $ggo_min_patch` Modified: m4/trunk/ac_pkg_info_header.m4 =================================================================== --- m4/trunk/ac_pkg_info_header.m4 2006-03-21 01:56:14 UTC (rev 12) +++ m4/trunk/ac_pkg_info_header.m4 2006-03-21 01:57:21 UTC (rev 13) @@ -1,8 +1,9 @@ ## -## $Header$ +## $Id: ac_pkg_info_header.m4,v 1.6 2006/03/21 00:38:55 alex Exp $ ## ## Mon 24 Jun 2002 01:34:16 AM MSD by Zaufi -- initial implementation ## Tue 22 Mar 2005 02:56:18 AM MSK by Zaufi -- add macros to make cute configuration summary info block +## Mon Mar 20 17:55:28 MSK 2006 by Zaufi -- add SVN support ## ## @@ -48,21 +49,33 @@ AC_MSG_RESULT([]) fi - # Check CVS tag - if test -f $srcdir/CVS/Tag; then - ac_pih_cvs_tag='CVS Branch: '`cat $srcdir/CVS/Tag | sed 's,^T\(.*\)$,\1,'` - else if test -d $srcdir/CVS; then - ac_pih_cvs_tag='CVS Branch: HEAD' + # detect VSC used + if test -d $srcdir/CVS; then + # Check CVS tag + if test -f $srcdir/CVS/Tag; then + ac_pih_tag='CVS Branch: '`cat $srcdir/CVS/Tag | sed 's,^T\(.*\)$,\1,'` + else + ac_pih_tag='CVS Branch: HEAD' + fi + else if test -d $srcdir/.svn; then + ac_svn_rep_root=`svn info | grep '^Repository Root' | sed 's,.*: \(.*\),\1,'` + ac_svn_mod_root=`svn info | grep '^URL' | sed 's,.*: \(.*\),\1,'` + ac_is_trunk=`echo $ac_svn_mod_root | sed "s,$ac_svn_rep_root,," | grep '^/[[^/]][[^/]]*/trunk.*'` + if test -n "$ac_is_trunk"; then + ac_pih_tag='SVN Branch: HEAD' + else + ac_pih_tag='SVN Branch: '`echo $ac_svn_mod_root | sed -e "s,$ac_svn_rep_root,," -e 's,.*branches/\([[^/]][[^/]]*\).*,\1,'` + fi else - ac_pih_cvs_tag="$PACKAGE_BUGREPORT" + ac_pih_tag="$PACKAGE_BUGREPORT" fi fi ac_pih_version_tag=" Version: $PACKAGE_VERSION " - if test -n "$ac_pih_cvs_tag"; then + if test -n "$ac_pih_tag"; then ac_pih_space_line=$ac_pih_space_line_org - ac_pih_space_line=${ac_pih_space_line:0:$(( $ac_pih_length - ${#ac_pih_cvs_tag} - ${#ac_pih_version_tag} - 2))} + ac_pih_space_line=${ac_pih_space_line:0:$(( $ac_pih_length - ${#ac_pih_tag} - ${#ac_pih_version_tag} - 2))} fi - AC_MSG_RESULT([${ac_pih_version_tag}${ac_pih_space_line}${ac_pih_cvs_tag}]) + AC_MSG_RESULT([${ac_pih_version_tag}${ac_pih_space_line}${ac_pih_tag}]) AC_MSG_RESULT([$ac_pih_hdrline]) ]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <za...@us...> - 2006-03-21 01:56:20
|
Revision: 12 Author: zaufi Date: 2006-03-20 17:56:14 -0800 (Mon, 20 Mar 2006) ViewCVS: http://svn.sourceforge.net/halfs/?rev=12&view=rev Log Message: ----------- implement SVN support Modified Paths: -------------- admin/trunk/devel.d/01-echo.sh admin/trunk/devel.d/vcs-cvs-support.sh admin/trunk/devel.d/vcs-subversion-support.sh Modified: admin/trunk/devel.d/01-echo.sh =================================================================== --- admin/trunk/devel.d/01-echo.sh 2006-03-18 01:21:35 UTC (rev 11) +++ admin/trunk/devel.d/01-echo.sh 2006-03-21 01:56:14 UTC (rev 12) @@ -1,6 +1,6 @@ #!/bin/bash # -# $Id: 01-echo.sh,v 1.5 2006/03/17 14:31:00 alex Exp $ +# $Id: 01-echo.sh,v 1.6 2006/03/20 16:29:14 alex Exp $ # RES_COL=${COLUMNS:-0} @@ -79,7 +79,10 @@ spammed_lines=$((spammed_lines+1)) fi } - +# +# \todo It seems that we need to take care about line length we want to print +# to correct outputed lines counting... +# function eerror() { inc_lines_printed Modified: admin/trunk/devel.d/vcs-cvs-support.sh =================================================================== --- admin/trunk/devel.d/vcs-cvs-support.sh 2006-03-18 01:21:35 UTC (rev 11) +++ admin/trunk/devel.d/vcs-cvs-support.sh 2006-03-21 01:56:14 UTC (rev 12) @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: vcs-cvs-support.sh,v 1.3 2006/03/16 23:53:01 alex Exp $ +# $Id: vcs-cvs-support.sh,v 1.4 2006/03/20 16:29:14 alex Exp $ # # VCS support module for CVS # @@ -36,7 +36,7 @@ function vcs_tag() { tag=$1 - test -z "${tag}" && eerror "No tag given to VCS driver" + test -z "${tag}" && eerror "No tag given to VCS driver" && eend 1 1 cmd="cvs -q tag "${tag}" >> ${log} 2>&1" if test -n "${DEBUG_DEVEL_SH}"; then einfo "${cmd}" @@ -51,7 +51,7 @@ function vcs_branch() { tag=$1 - test -z "${tag}" && eerror "No tag given to VCS driver" + test -z "${tag}" && eerror "No tag given to VCS driver" && eend 1 1 cmd="cvs -q tag -b "${tag}" >> ${log} 2>&1" if test -n "${DEBUG_DEVEL_SH}"; then einfo "${cmd}" Modified: admin/trunk/devel.d/vcs-subversion-support.sh =================================================================== --- admin/trunk/devel.d/vcs-subversion-support.sh 2006-03-18 01:21:35 UTC (rev 11) +++ admin/trunk/devel.d/vcs-subversion-support.sh 2006-03-21 01:56:14 UTC (rev 12) @@ -1,6 +1,6 @@ #!/bin/sh # -# $Id: vcs-subversion-support.sh,v 1.3 2006/03/17 14:13:38 alex Exp $ +# $Id: vcs-subversion-support.sh,v 1.4 2006/03/20 16:29:14 alex Exp $ # # VCS support module for Subversion # @@ -15,14 +15,49 @@ current_vcs_message="$*" } +function svn_get_info() +{ + svn_rep_root=`svn info | grep '^Repository Root' | sed 's,.*: \(.*\),\1,'` + svn_mod_root=`svn info | grep '^URL' | sed 's,.*: \(.*\),\1,'` + svn_module_name=`echo "${svn_mod_root}" | sed -e "s,${svn_rep_root},," -e 's,^/\([^/]\+\)/.*,\1,'` +} + function vcs_commit() { + msg="${current_vcs_message}" + test -z "${msg}" && msg="<no message>" + cmd="svn commit -m '$msg' $* >> ${log} 2>&1" + if test -n "${DEBUG_DEVEL_SH}"; then + einfo "${cmd}" + else + eval ${cmd} + fi } function vcs_tag() { + tag=$1 + test -z "${tag}" && eerror "No tag given to VCS driver" eend 1 1 + svn_get_info + tag_url="${svn_rep_root}/${svn_module_name}/tags/${tag}" + cmd="svn copy "${svn_mod_root}" "${tag_url}" >> ${log} 2>&1" + if test -n "${DEBUG_DEVEL_SH}"; then + einfo "${cmd}" + else + eval ${cmd} + fi } function vcs_branch() { + tag=$1 + test -z "${tag}" && eerror "No tag given to VCS driver" eend 1 1 + svn_get_info + branch_url="${svn_rep_root}/${svn_module_name}/branches/${tag}" + cmd="svn copy "${svn_mod_root}" "${branch_url}" >> ${log} 2>&1" + if test -n "${DEBUG_DEVEL_SH}"; then + einfo "${cmd}" + else + eval ${cmd} + fi } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <za...@us...> - 2006-03-18 01:22:00
|
Revision: 11 Author: zaufi Date: 2006-03-17 17:21:35 -0800 (Fri, 17 Mar 2006) ViewCVS: http://svn.sourceforge.net/halfs/?rev=11&view=rev Log Message: ----------- refactoring configration support Added Paths: ----------- admin/trunk/devel.d/ admin/trunk/devel.d/00-init-globals.sh admin/trunk/devel.d/01-echo.sh admin/trunk/devel.d/02-check-admindir.sh admin/trunk/devel.d/40-help-support.sh admin/trunk/devel.d/50-detect-vcs.sh admin/trunk/devel.d/99-registrator.sh admin/trunk/devel.d/bootstrap.tgt.sh admin/trunk/devel.d/change-log.tgt.sh admin/trunk/devel.d/code-stats.tgt.sh admin/trunk/devel.d/help.tgt.sh admin/trunk/devel.d/scan-includes.tgt.sh admin/trunk/devel.d/total-cleanup.tgt.sh admin/trunk/devel.d/vcs-cvs-support.sh admin/trunk/devel.d/vcs-subversion-support.sh admin/trunk/devel.d/versioning-support.tgt.sh admin/trunk/devel.sh Removed Paths: ------------- admin/trunk/cvs.sh Deleted: admin/trunk/cvs.sh =================================================================== --- admin/trunk/cvs.sh 2006-03-18 01:15:50 UTC (rev 10) +++ admin/trunk/cvs.sh 2006-03-18 01:21:35 UTC (rev 11) @@ -1,659 +0,0 @@ -#!/bin/sh -# -# $Header$ -# - -# Most used strings :) -STR1="\n\n!Error: No working autoconf found." -STR2="\n\n!Error: No working automake found." -STR3="You can get it from http://www.gnu.org/software/autoconf" -STR4="You can get it from http://www.gnu.org/software/automake" -STR5="\n\n!Error: Can't run not in CVS repository!" - -RES_COL=${COLUMNS:-0} -(( RES_COL == 0 )) && RES_COL=$(stty size 2>/dev/null | cut -d' ' -f2) -(( RES_COL > 0 )) || (( RES_COL = 80 )) -(( RES_COL = RES_COL - 7 )) -MOVE_TO_COL="echo -en \\033[${RES_COL}G" -SETCOLOR_BRACKET="echo -en \\033[1;34m" -SETCOLOR_SUCCESS="echo -en \\033[1;32m" -SETCOLOR_FAILURE="echo -en \\033[1;31m" -SETCOLOR_WARNING="echo -en \\033[1;33m" -SETCOLOR_NORMAL="echo -en \\033[0;39m" - -function echo_success() -{ - if test "$tty" == "not a tty"; then - echo " OK" | tee -a $log - else - $MOVE_TO_COL - $SETCOLOR_BRACKET - echo -n "[" - $SETCOLOR_SUCCESS - echo -n " ok " - $SETCOLOR_BRACKET - echo "]" - $SETCOLOR_NORMAL - echo "OK" >> $log - fi -} - -function echo_failure() -{ - if test "$tty" == "not a tty"; then - echo " FAIL" | tee -a $log - else - $MOVE_TO_COL - $SETCOLOR_BRACKET - echo -n "[" - $SETCOLOR_FAILURE - echo -n " fail " - $SETCOLOR_BRACKET - echo "]" - $SETCOLOR_NORMAL - echo "FAIL" >> $log - fi -} -# -# Reconfigure request -# -function cvs_reconf() -{ - echo "Current tty is: `tty`" >> $log - echo "*** `date` Reconfiguration started *** " >> $log - # - echo "*** admindir set to '$admindir'" | tee -a $log - check_CVS - # Check than all requiered tools are present - echo -n "*** Looking whether needed tools are installed... " | tee -a $log - if test -d $top_srcdir/po; then - gt_version=`gettextize --version | head -n 1` - echo "Found gettext version: $gt_version" >> $log - case "$gt_version" in - *0.11.* | *0.12* | *0.13* | *0.14*) ;; - *) echo_failure - echo -e "\n\n!Error: GNU gettext >= 0.11.x not found." | tee -a $log - echo "You can get it from http://www.gnu.org/software/gettext" | tee -a $log - exit 1 ;; - esac - fi - # No special checking for autotools version needed -- all done in configure.ac - if ! `autoconf --version > /dev/null 2>&1`; then - echo_failure - echo -e "$STR1\n$STR3" | tee -a $log - exit 1 - fi - if ! `autoheader --version > /dev/null 2>&1`; then - echo_failure - echo -e "$STR1\n$STR3" | tee -a $log - exit 1 - fi - if ! `aclocal --version > /dev/null 2>&1`; then - echo_failure - echo -e "$STR2\n$STR4" | tee -a $log - exit 1 - fi - if ! `automake --version > /dev/null 2>&1`; then - echo_failure - echo -e "$STR2\n$STR4" | tee -a $log - exit 1 - fi - echo_success - echo "OK" >> $log - # Creating top level configure.ac file (if needed) - if test -f $top_srcdir/configure.ac.in; then - echo -n "*** Creating top level configuration files..." | tee -a $log - if test -d "$top_srcdir/tests"; then - sed_cmd='s,^#[ |\t]*maintmode:,,' - else - sed_cmd='/^#[ |\t]*maintmode:/d' - fi - cat "$top_srcdir/configure.ac.in" | sed "$sed_cmd" > "$top_srcdir/configure.ac" 2>> $log - if test "x$?" = "x0"; then - echo_success - else - echo_failure - fi - fi - if test -d $top_srcdir/po; then - # Prepeare to run gettextize - echo -n "*** Create po/POTFILES.in..." | tee -a $log - echo "# List of source files containing translatable strings." > $top_srcdir/po/POTFILES.in - for i in `find $top_srcdir/main -name *.cc | sort`; do - echo -n "Checking $i ... " >> $log - if `grep -q '_("' $i`; then - echo $i | sed "s,$top_srcdir/,," >> $top_srcdir/po/POTFILES.in - echo "Add" >> $log - else - echo "Skip" >> $log - fi - done - echo_success - echo -n "*** Create po/LINGUAS..." | tee -a $log - ALL_LINGUAS=`ls $top_srcdir/po/*.po | sed -e 's,\.po,,g' -e "s,$top_srcdir/po/,,g"` - echo $ALL_LINGUAS | tee -a $log > $top_srcdir/po/LINGUAS - echo_success - # Force gettext to install needed files - echo -n "*** Installing GNU gettext files..." | tee -a $log - rm -f $top_srcdir/Makefile.am~ $top_srcdir/configure.in~ - if ! `autopoint --force >> $log 2>&1`; then - echo_failure - exit 1 - fi - # GNU gettext 0.11.x have a buggy Makefile.am and configure.in patching procedure - # so to avoid using its hacked files here originals restored... - test -f $top_srcdir/Makefile.am~ && mv -f $top_srcdir/Makefile.am~ $top_srcdir/Makefile.am - test -f $top_srcdir/configure.in~ && mv -f $top_srcdir/configure.in~ $top_srcdir/configure.in - rm -f $top_srcdir/po/*~ >/dev/null 2>&1 - rm -f $top_srcdir/admin/*~ >/dev/null 2>&1 - echo_success - fi - # Run remaining autotools - echo -n "*** Creating aclocal.m4... " | tee -a $log - if `aclocal -I m4 >> $log 2>&1`; then - echo_success - else - echo_failure - exit 1 - fi - echo -n "*** Creating configure script... " | tee -a $log - if `autoconf >> $log 2>&1`; then - echo_success - else - echo_failure - exit 1 - fi - if `grep -q '^[^#]*AC_CONFIG_HEADERS' $top_srcdir/configure.ac`; then - echo -n "*** Creating config.h template... " | tee -a $log - if `autoheader >> $log 2>&1`; then - echo_success - else - echo_failure - exit 1 - fi - fi - echo -n "*** Creating Makefile templates... " | tee -a $log - if `automake -a >> $log 2>&1`; then - echo_success - else - echo_failure - exit 1 - fi - if test -f "$top_srcdir/support/am_edit"; then - echo -n "*** Postprocessing Makefile templates..." | tee -a $log - if `perl -w support/am_edit >> $log 2>&1`; then - echo_success - else - echo_failure - exit 1 - fi - fi - if test -f "$top_srcdir/support/post-bootstrap.sh"; then - . "$top_srcdir/support/post-bootstrap.sh" - test $(type -t "post_bootstrap") = "function" && post_bootstrap - fi - echo -n "*** Creating maintainer program links ... " | tee -a $log - test -f $top_srcdir/reconf || ln -s $admindir/cvs.sh $top_srcdir/reconf - # Misc - if test -f "$top_srcdir/support/directory"; then - icon=`ls -1 $top_srcdir/support/project-icon.* 2>/dev/null | head -n 1` - cat $top_srcdir/support/directory | sed "s,@icon@,$icon," > $top_srcdir/.directory - fi - echo_success -} -# -# Check if current directory is a CVS repository -# -function check_CVS() -{ - echo -n "*** Checking CVS repository... " | tee -a $log - cvsdir=$top_srcdir/CVS - if test -d $cvsdir; then - if test -f $cvsdir/Entries \ - -a -f $cvsdir/Root \ - -a -f $cvsdir/Entries; then - echo_success - echo "yes" >> $log - else - echo_failure - echo -e "$STR5" | tee -a $log - exit 1 - fi - else - echo -e "$STR5" | tee -a $log - exit 1 - fi -} -# -# Get current version -# -function get_current_version() -{ - local version_info=`cat $top_srcdir/support/version.m4 \ - | grep '^[ |\t]*m4_define.*$' \ - | grep -v 'VERSION_STR' \ - | sed -e 's/\(.*\)dnl.*/\1/' \ - -e 's/\(.*\)#.*/\1/' \ - -e 's/m4_define(\[\([A-Z_]\+\)\],[ |\t]*\[\(.*\)\])/\1="\2"/g'` - eval $version_info -} -# -# Get filename of maintainers README -# -function set_maintainer_README() -{ - if test -f "$top_srcdir/README.maint"; then - README="README.maint" - else - README="README" - fi -} -# -# Make Release -# -function make_release() -{ - echo "*** Parse current version info..." | tee -a $log - # Get current versioninfo - get_current_version - # Save previous version - O_MAJOR=$MAJOR; O_MINOR=$MINOR; O_PATCH_LEVEL=$PATCH_LEVEL; O_EXTRA_VERSION=$EXTRA_VERSION - # Increment version number - # Is current version already marked as beta or RC? - if test -z "$EXTRA_VERSION"; then - case "$1" in - release | beta | rc ) - echo "!Error: You can't make this target 'couse current version $MAJOR.$MINOR.$PATCH_LEVEL is not beta or RC" \ - | tee -a $log - echo " Targets you can make: (major | minor | patch)-release, next-(major | minor | patch)-(beta | rc)" \ - | tee -a $log - exit 1 ;; - esac - # No. - case "$1" in - major ) MAJOR=$((MAJOR+1)); MINOR=0; PATCH_LEVEL=0 ;; - minor ) MINOR=$((MINOR+1)); PATCH_LEVEL=0 ;; - patch ) PATCH_LEVEL=$((PATCH_LEVEL+1)) ;; - *) echo "Hmm... Smth wrong with arg to make_release()" | tee -a $log; exit 1 ;; - esac - # Should we start RC or beta branch? - if test -n "$2"; then - EXTRA_VERSION="${2}1" - fi - else - case "$1" in - major | minor | patch ) - echo "!Error: You can't make this target while $MAJOR.$MINOR.$PATCH_LEVEL version is not released" \ - | tee -a $log - echo " Maybe you need one of 'release', 'next-rc' or 'next-beta' ??" | tee -a $log - exit 1 ;; - esac - # If $2 == '' it will be release! :) - if test -z "$2"; then - # Yes. Just clear extra version mark and leave main digits as is... - EXTRA_VERSION="" - else - # Continue to make next beta or RC... - # Is current extra version will be the same? - local ce=`echo "$EXTRA_VERSION" | sed 's,\(.*\)[0-9]\+,\1,'` - if test "$2" == "$ce"; then - # Yes. Increment version number... - local cn=`echo "$EXTRA_VERSION" | sed 's,.*\([0-9]\+\),\1,'` - EXTRA_VERSION="${2}$((cn+1))" - else - # No. Only beta can become RC but not reverse... - if test "$2" == "rc" -a "$ce" == "beta"; then - EXTRA_VERSION="rc1" - else - echo "!Error: Can't make $MAJOR.$MINOR.$PATCH_LEVEL-${2}1' version from $MAJOR.$MINOR.$PATCH_LEVEL-$EXTRA_VERSION." \ - | tee -a $log - echo " You can make 'next-rc' or 'release' only." | tee -a $log - exit 1 - fi - fi - fi - fi - # Commit changes - post_increment_actions -} -# All functions below can be started only at release state... -function major_release() # Major Release -{ - echo "*** `date` -- Making 'major release' ***" | tee -a $log - make_release "major" -} -function minor_release() # Minor Release -{ - echo "*** `date` -- Making 'minor release' ***" | tee -a $log - make_release "minor" -} -function patch_release() # Next Patch Level -{ - echo "*** `date` -- Making 'patch release' ***" | tee -a $log - make_release "patch" -} -function next_major_beta() # Major Release (beta) -{ - echo "*** `date` -- Making 'major beta' ***" | tee -a $log - make_release "major" "beta" -} -function next_minor_beta() # Minor Release (beta) -{ - echo "*** `date` -- Making 'minor beta' ***" | tee -a $log - make_release "minor" "beta" -} -function next_patch_beta() # Patch Level Release (beta) -{ - echo "*** `date` -- Making 'patch beta' ***" | tee -a $log - make_release "patch" "beta" -} -function next_major_rc() # Major Release (RC) -{ - echo "*** `date` -- Making 'major release candidate' ***" | tee -a $log - make_release "major" "rc" -} -function next_minor_rc() # Minor Release (RC) -{ - echo "*** `date` -- Making 'minor release candidate' ***" | tee -a $log - make_release "minor" "rc" -} -function next_patch_rc() # Patch Level Release (RC) -{ - echo "*** `date` -- Making 'patch release candidate' ***" | tee -a $log - make_release "patch" "rc" -} -function release() # Make release of current version -{ - echo "*** `date` -- Making 'release' ***" | tee -a $log - make_release "release" -} -function next_beta() # Make next beta of current version -{ - echo "*** `date` -- Making 'next beta' ***" | tee -a $log - make_release "beta" "beta" -} -function next_rc() # Make next rc of current version -{ - echo "*** `date` -- Making 'next release candidate' ***" | tee -a $log - make_release "rc" "rc" -} -# -# -# -function post_increment_actions() -{ - set_maintainer_README - local old_version_str="$O_MAJOR.$O_MINOR.$O_PATCH_LEVEL"`test -n "$O_EXTRA_VERSION" && echo -$O_EXTRA_VERSION` - local new_version_str="$MAJOR.$MINOR.$PATCH_LEVEL"`test -n "$EXTRA_VERSION" && echo -$EXTRA_VERSION` - local new_version_tag=`echo $new_version_str | sed 's/\./-/g'` - local branch_prefix='rel' - - echo "*** Version info: $old_version_str ==> $new_version_str" | tee -a $log - echo "*** Patch version depended files..." | tee -a $log - - # Rewrite new versioninfo - VERSION_STR="$MAJOR.$MINOR.$PATCH_LEVEL"`test -n "$EXTRA_VERSION" && echo "-$EXTRA_VERSION"` - cat "$top_srcdir/support/version.m4" \ - | sed -e "s/\(m4_define(\[MAJOR\],[ |\t]*\[\).*\(\])\)/\1$MAJOR\2/g" \ - -e "s/\(m4_define(\[MINOR\],[ |\t]*\[\).*\(\])\)/\1$MINOR\2/g" \ - -e "s/\(m4_define(\[PATCH_LEVEL\],[ |\t]*\[\).*\(\])\)/\1$PATCH_LEVEL\2/g" \ - -e "s/\(m4_define(\[EXTRA_VERSION\],[ |\t]*\[\).*\(\])\)/\1$EXTRA_VERSION\2/g" \ - -e "s/\(m4_define(\[VERSION_STR\],[ |\t]*\[\).*\(\])\)/\1$VERSION_STR\2/g" \ - > "$top_srcdir/support/version.m4.new" - mv -f "$top_srcdir/support/version.m4.new" "$top_srcdir/support/version.m4" - - tr_new_version_str=`echo $new_version_str | sed 's,-,,'` - - # Append tag info in README - echo -e "\n`LC_ALL=en date +'%a %b %d %Y'` - release $new_version_str tagged." \ - " Tag: \"$branch_prefix-$new_version_tag\"" >> $README - # Commit changes - echo "*** Commit version depended files..." | tee -a $log - if test -z "$DEBUG_CVS_SH"; then - cvs commit -m "Release $new_version_str tagged" $README support/version.m4 >> $log || exit 1 - else - echo "cvs commit -m \"Release $new_version_str tagged\" $README support/version.m4" - fi - # Tag current sources - echo "*** Making CVS tag $branch_prefix-$new_version_tag" | tee -a $log - if test -z "$DEBUG_CVS_SH"; then - cvs -q tag $branch_prefix-$new_version_tag >> $log || exit 1 - else - echo "cvs -q tag $branch_prefix-$new_version_tag" - fi -} -# -# Spam current version -# -function report_version() -{ - # Get current versioninfo - get_current_version - echo "Current version info: $MAJOR.$MINOR.$PATCH_LEVEL"`test -n "$EXTRA_VERSION" && echo "-$EXTRA_VERSION"` -} -# -# -# -function make_a_branch() -{ - echo "*** Parse current version info..." | tee -a $log - # Get current versioninfo - get_current_version - # Increment version number - local major_increment=$1 - local minor_increment=$2 - local new_MAJOR=$((MAJOR+major_increment)) - local new_MINOR=`test "$major_increment" == '0' && echo "$((MINOR+minor_increment))" || echo '0'` - local new_version_str="$new_MAJOR.$new_MINOR" - local new_version_tag=`echo $new_version_str | sed 's/\./-/g'` - local branch_prefix='version' - - # Append tag info in README - set_maintainer_README - echo -e "\n`LC_ALL=en date +'%a %b %d %Y'` - made a branch for upcoming release ${new_version_str}." \ - " Tag: \"${branch_prefix}-${new_version_tag}\"" >> $README - # Commit changes - echo "*** Commit version depended files..." | tee -a $log - if test -z "$DEBUG_CVS_SH"; then - cvs commit -m "Made a branch for upcoming release $new_version_str" $README >> $log || exit 1 - else - echo "cvs commit -m \"Made a branch for upcoming release ${new_version_str}\" $README" - fi - # Tag current sources - echo "*** Making CVS branch ${branch_prefix}-${new_version_tag}" | tee -a $log - if test -z "$DEBUG_CVS_SH"; then - cvs -q tag -b ${branch_prefix}-${new_version_tag} >> $log || exit 1 - else - echo "cvs -q tag -b ${branch_prefix}-${new_version_tag}" - fi -} -# -# -# -function next_major_branch() -{ - make_a_branch 1 0 -} -function next_minor_branch() -{ - make_a_branch 0 1 -} -# -# -# -function code_stats() -{ - find_cmd=`echo find -name\ \'*.{c,h,cc,hh,icc,tcc,hxx,cpp,hpp}\'\ -o -false` - for i in `eval $find_cmd`; do - wc -l $i - done | awk ' \ - BEGIN \ - { \ - s=0; \ - f=0; \ - } \ - { \ - print $1"\t"$2; \ - s+=$1; \ - f++; \ - } \ - END \ - { \ - print "\n" s "\tTotal lines in " f " files"; \ - }' -} -# -# Update ChangeLog -# -function ChangeLog() -{ - cvs2cl=${CVS2CL:-`whereis cvs2cl | sed 's,cvs2cl: \(.*\),\1,' | awk '{print $1}'`} - test -z $cvs2cl && echo "Error: No cvs2cl tool found" && exit 1 - $cvs2cl -} - -# -# Remove files not registered in CVS -# -cvs_clean() -{ - check_CVS - perl $admindir/cvs-clean.pl -} - -# -# Simple reconfig -# -function simple_reconf() -{ - make -f Makefile.cvs cvs-clean - # - cvs_reconf - # Start configure with predefined args - ./configure --prefix=`pwd`/install -} - -# -# Full reconfig -# -function full_reconf() -{ - make -f Makefile.cvs cvs-clean - # - cvs_reconf - # - mkdir -p build - cd build - # Start configure with predefined args - ../configure --prefix=`pwd`/install -} - -# -# Scan source files for include files and show the result list -# -function scan_includes() -{ - list=`grep -r '^# *include *<.*>' * --include *.cc --include *.hh --include *.icc --include *.tcc --include *.hpp --include *.c --include *.h \ - | sed 's,^\(.*\):# *include *<\(.*\)>.*$,\1:\2,' \ - | grep -v '^test' \ - | sed 's,^.*:\(.*\)$,\1,' \ - | sort | uniq` - find_cmd=`echo find -name\ \'*.{c,h,cc,hh,icc,tcc,hxx,cpp,hpp}\'\ -o -false` - local_list=`eval $find_cmd` - final_list='' - for i in $list; do - if test -z "`echo $local_list | grep $i`"; then - final_list="$final_list $i" - fi - done - - header_printed='no' - for i in $final_list; do - if `echo $i | grep -q '^.*\.h$'`; then - if test "$header_printed" = 'no'; then - echo "C header files:" - header_printed='yes' - fi - echo $i | grep -v '.*cmdline\.h' - fi - done - - if test "$header_printed" = 'yes'; then - echo -ne '\n' - fi - header_printed='no' - for i in $final_list; do - if `echo $i | grep -v '\.' | grep -q '[a-z]'`; then - if test "$header_printed" = 'no'; then - echo -e "Std. C++ header files:" - header_printed='yes' - fi - echo $i - fi - done - - if test "$header_printed" = 'yes'; then - echo -ne '\n' - fi - header_printed='no' - for i in $final_list; do - if `echo $i | grep -q '^boost.*\.hpp$'`; then - if test "$header_printed" = 'no'; then - echo -e "Boost header files:" - header_printed='yes' - fi - echo $i - fi - done - - if test "$header_printed" = 'yes'; then - echo -ne '\n' - fi - header_printed='no' - for i in $final_list; do - if test -z "`echo $local_list | grep $i | grep -v '^boost.*\.hpp$' | grep -v '^.*\.h$' | grep -v '^[a-z]\+$'`"; then - if test "$header_printed" = 'no'; then - echo -e "Other headers:" - header_printed='yes' - fi - echo $i | grep -v '^boost.*\.hpp$' | grep -v '^.*\.h$' | grep -v '^[a-z]\+$' - fi - done -} - -# -# Main -# -top_srcdir=`pwd -P` -arg=`echo $1 | tr '\-.' __` -log="$admindir/maintainer.log" -tty=`tty` - -# Append blank lines after previous logged actions (if file exist) -if test -f $log; then - echo -e "\n\n" >> $log -fi - - -case $0 in - *reconf ) - make -f Makefile.cvs - ;; - * ) - # Check 1st argument for valid wrapped target name - case $arg in - major_release | minor_release | patch_release | \ - next_major_beta | next_minor_beta | next_patch_beta | \ - next_major_rc | next_minor_rc | next_patch_rc | release | \ - next_beta | next_rc | report_version | \ - next_major_branch | next_minor_branch | cvs_clean | \ - cvs_reconf | full_reconf | simple_reconf | \ - code_stats | scan_includes | ChangeLog ) - echo "*** Call to $arg" >> $log - $arg ;; - * ) echo "Incorrect parameters for $0" - exit 1 ;; - esac - ;; -esac -exit 0 Added: admin/trunk/devel.d/00-init-globals.sh =================================================================== --- admin/trunk/devel.d/00-init-globals.sh (rev 0) +++ admin/trunk/devel.d/00-init-globals.sh 2006-03-18 01:21:35 UTC (rev 11) @@ -0,0 +1,27 @@ +# +# $Id: 00-init-globals.sh,v 1.5 2006/03/16 19:06:02 alex Exp $ +# +# Initialize some global variables +# + +top_srcdir=${top_srcdir:-`pwd -P`} +log=${log:-$admindir/maintainer.log} + +# +# Indent of target name while print help +# +TGT_HELP_INDENT=5 +# +# Indent of help string for target while print help +# +DESCR_HELP_INDENT=25 + +# +# +# +BRANCH_PREFIX='version' + +# +# +# +TAG_PREFIX='rel' Property changes on: admin/trunk/devel.d/00-init-globals.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + "Id Date Revision Author HeadURL" Name: svn:eol-style + native Added: admin/trunk/devel.d/01-echo.sh =================================================================== --- admin/trunk/devel.d/01-echo.sh (rev 0) +++ admin/trunk/devel.d/01-echo.sh 2006-03-18 01:21:35 UTC (rev 11) @@ -0,0 +1,104 @@ +#!/bin/bash +# +# $Id: 01-echo.sh,v 1.5 2006/03/17 14:31:00 alex Exp $ +# + +RES_COL=${COLUMNS:-0} +(( RES_COL == 0 )) && RES_COL=$(stty size 2>/dev/null | cut -d' ' -f2) +(( RES_COL > 0 )) || (( RES_COL = 80 )) +(( RES_COL = RES_COL - 7 )) +MOVE_TO_COL="echo -en \\033[${RES_COL}G" +COLOR_BRACKET="1;34" +COLOR_SUCCESS="1;32" +COLOR_FAILURE="1;31" +COLOR_WARNING="1;33" +COLOR_NORMAL="0;39" +SPAMMED_LINES_DEFAULT=1 +my_tty=`tty` +ebegin_in_action='' +spammed_lines=${SPAMMED_LINES_DEFAULT} + +function move_to_col() +{ + test -n "$1" && echo -en "\\033[$1G" +} +function move_above() +{ + test -n "$1" && echo -en "\\033[$1A" +} +function move_below() +{ + test -n "$1" && echo -en "\\033[$1B" +} + +function set_color() +{ + test -n "$1" && echo -en "\\033[$1m" +} + +function ebegin() +{ + echo -en "*** $1" + ebegin_in_action='y' +} + +function eend() +{ + ebegin_in_action='' + if test ! "${spammed_lines}" == "${SPAMMED_LINES_DEFAULT}"; then + move_above ${spammed_lines} + fi + if test ! "${my_tty}" == "not a tty"; then + move_to_col ${RES_COL} + set_color ${COLOR_BRACKET} + echo -n "[" + if test "$1" = "0"; then + set_color ${COLOR_SUCCESS} + echo -n " ok " + else + set_color ${COLOR_FAILURE} + echo -n " fail " + fi + set_color ${COLOR_BRACKET} + echo "]" + set_color ${COLOR_NORMAL} + fi + if test ! "${spammed_lines}" == "${SPAMMED_LINES_DEFAULT}"; then + move_below ${spammed_lines} + fi + spammed_lines=${SPAMMED_LINES_DEFAULT} + test ! "$1" == "0" -a -n "$2" && exit 1 +} + +function inc_lines_printed() +{ + if test -n "${ebegin_in_action}"; then + if test "${spammed_lines}" == "${SPAMMED_LINES_DEFAULT}"; then + echo + fi + spammed_lines=$((spammed_lines+1)) + fi +} + +function eerror() +{ + inc_lines_printed + echo -e "*** Error: $1" | tee -a ${log} +} + +function ewarning() +{ + inc_lines_printed + echo -e "*** Warning: $1" | tee -a ${log} +} + +function einfo() +{ + inc_lines_printed + echo -e "*** $1" | tee -a ${log} +} +function eecho() +{ + inc_lines_printed + echo -e "$*" +} Property changes on: admin/trunk/devel.d/01-echo.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + "Id Date Revision Author HeadURL" Name: svn:eol-style + native Added: admin/trunk/devel.d/02-check-admindir.sh =================================================================== --- admin/trunk/devel.d/02-check-admindir.sh (rev 0) +++ admin/trunk/devel.d/02-check-admindir.sh 2006-03-18 01:21:35 UTC (rev 11) @@ -0,0 +1,15 @@ +#!/bin/sh +# +# $Id: 02-check-admindir.sh,v 1.3 2006/03/16 15:58:54 alex Exp $ +# +# Check calling correctness +# + +test -z "${admindir}" && eerror "admin/ directory is not set" && exit 1 + +# admin/ directory found -- it is OK to setup log file now ;) + +# Append blank lines after previous logged actions (if file exist) +if test -f $log; then + echo -e "\n\n" >> $log +fi Property changes on: admin/trunk/devel.d/02-check-admindir.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + "Id Date Revision Author HeadURL" Name: svn:eol-style + native Added: admin/trunk/devel.d/40-help-support.sh =================================================================== --- admin/trunk/devel.d/40-help-support.sh (rev 0) +++ admin/trunk/devel.d/40-help-support.sh 2006-03-18 01:21:35 UTC (rev 11) @@ -0,0 +1,20 @@ +#!/bin/sh +# +# $Id: 40-help-support.sh,v 1.1 2006/03/16 15:58:54 alex Exp $ +# +# Functions to check calling correctness +# + +# +# $1 = target name +# $2 = description string +# +function print_target_help +{ + if test -n "$1"; then + move_to_col ${TGT_HELP_INDENT} + echo -n "$1" + move_to_col ${DESCR_HELP_INDENT} + test -n "$2" && echo "$2" || echo "<no description available>" + fi +} Property changes on: admin/trunk/devel.d/40-help-support.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + "Id Date Revision Author HeadURL" Name: svn:eol-style + native Added: admin/trunk/devel.d/50-detect-vcs.sh =================================================================== --- admin/trunk/devel.d/50-detect-vcs.sh (rev 0) +++ admin/trunk/devel.d/50-detect-vcs.sh 2006-03-18 01:21:35 UTC (rev 11) @@ -0,0 +1,38 @@ +#!/bin/sh +# +# $Id: 50-detect-vcs.sh,v 1.3 2006/03/16 23:53:01 alex Exp $ +# + +# +# Current Version Control System used for given work copy +# +current_vcs="unknown" + +function detect_vcs() +{ + if test -d "${top_srcdir}/.svn"; then + current_vcs="subversion" + else if test -d "${top_srcdir}/CVS"; then + current_vcs="cvs" + fi fi + # import corresponding support module + test -f $admindir/devel.d/vcs-${current_vcs}-support.sh \ + && source $admindir/devel.d/vcs-${current_vcs}-support.sh +} + +# +# $1 - action name +# $* - other params +# +function call_vcs_action() +{ + if test -n "$1" -a "`type -t vcs_$1`" == 'function'; then + local fn=$1 + shift 1 + cmd="vcs_${fn} $*" + eval "$cmd" + else + eerror "Function '$1' not implemented for VCS currently used (${current_vcs})" + return 1 + fi +} Property changes on: admin/trunk/devel.d/50-detect-vcs.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + "Id Date Revision Author HeadURL" Name: svn:eol-style + native Added: admin/trunk/devel.d/99-registrator.sh =================================================================== --- admin/trunk/devel.d/99-registrator.sh (rev 0) +++ admin/trunk/devel.d/99-registrator.sh 2006-03-18 01:21:35 UTC (rev 11) @@ -0,0 +1,15 @@ +#!/bin/sh +# +# $Id: 99-registrator.sh,v 1.1 2006/03/16 15:58:54 alex Exp $ +# + +# +# Every target plugin should add all implemented targets to this variable +# +REGISTERED_TARGETS='' + + +function reg_tgt_impl() +{ + test -n "$1" && REGISTERED_TARGETS="${REGISTERED_TARGETS}:$1" +} Property changes on: admin/trunk/devel.d/99-registrator.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + "Id Date Revision Author HeadURL" Name: svn:eol-style + native Added: admin/trunk/devel.d/bootstrap.tgt.sh =================================================================== --- admin/trunk/devel.d/bootstrap.tgt.sh (rev 0) +++ admin/trunk/devel.d/bootstrap.tgt.sh 2006-03-18 01:21:35 UTC (rev 11) @@ -0,0 +1,123 @@ +#!/bin/sh +# +# $Id: bootstrap.tgt.sh,v 1.1 2006/03/17 13:21:37 alex Exp $ +# +# Work copy reconfigurator +# + +function bootstrap_help +{ + print_target_help 'bootstrap' 'Run autotools and friends (this is default target)' +} + +function bootstrap_impl() +{ + # Check than all requiered tools are present + ebegin "Looking whether needed tools are installed..." + if test -d $top_srcdir/po; then + gt_version=`gettextize --version | head -n 1` + einfo "Found gettext version: $gt_version" + case "$gt_version" in + *0.13* | *0.14*) ;; + *) + eerror "GNU gettext >= 0.13.x not found" + eend 1 1 + esac + fi + # No special checking for autotools version needed -- all done in configure.ac + if ! (`autoconf --version > /dev/null 2>&1` && `autoheader --version > /dev/null 2>&1`) ; then + eerror "No working autoconf found" + eend 1 1 + fi + if ! (`aclocal --version > /dev/null 2>&1` && `automake --version > /dev/null 2>&1`); then + eerror "No working automake found" + eend 1 1 + fi + eend 0 + + # Creating top level configure.ac file (if needed) + if test -f $top_srcdir/configure.ac.in; then + ebegin "Creating top level configuration files..." + if test -d "$top_srcdir/tests"; then + sed_cmd='s,^#[ |\t]*maintmode:,,' + else + sed_cmd='/^#[ |\t]*maintmode:/d' + fi + cat "$top_srcdir/configure.ac.in" | sed "$sed_cmd" > "$top_srcdir/configure.ac" 2>> $log + eend $? 1 + fi + + # Configure package to be ready for gettext + if test -d $top_srcdir/po; then + # Prepeare to run gettextize + ebegin "Create po/POTFILES.in..." + echo "# List of source files containing translatable strings." > $top_srcdir/po/POTFILES.in + # + # \todo Code below needs to be generalized!!! (i.e. w/o hardcoded path) + # + for i in `find $top_srcdir/main -name *.cc | sort`; do + echo -n "Checking $i ... " >> $log + if `grep -q '_("' $i`; then + echo $i | sed "s,$top_srcdir/,," >> $top_srcdir/po/POTFILES.in + echo "Add" >> $log + else + echo "Skip" >> $log + fi + done + eend 0 + ebegin "Create po/LINGUAS..." + ALL_LINGUAS=`ls $top_srcdir/po/*.po | sed -e 's,\.po,,g' -e "s,$top_srcdir/po/,,g"` + echo $ALL_LINGUAS | tee -a $log > $top_srcdir/po/LINGUAS + eend 0 + # Force gettext to install needed files + ebegin "Installing GNU gettext files..." + rm -f $top_srcdir/Makefile.am~ $top_srcdir/configure.in~ + if ! `autopoint --force >> $log 2>&1`; then + eend 1 1 + fi + # GNU gettext 0.11.x have a buggy Makefile.am and configure.in patching procedure + # so to avoid using its hacked files here originals restored... + test -f $top_srcdir/Makefile.am~ && mv -f $top_srcdir/Makefile.am~ $top_srcdir/Makefile.am + test -f $top_srcdir/configure.in~ && mv -f $top_srcdir/configure.in~ $top_srcdir/configure.in + rm -f $top_srcdir/po/*~ >/dev/null 2>&1 + rm -f $top_srcdir/admin/*~ >/dev/null 2>&1 + eend 0 + fi + + # Run remaining autotools + ebegin "Creating aclocal.m4... " + aclocal -I m4 >> $log 2>&1 + eend $? 1 + + ebegin "Creating configure script... " + autoconf >> $log 2>&1 + eend $? 1 + # Execute autoheader if needed (used) + if `grep -q '^[^#]*AC_CONFIG_HEADERS' $top_srcdir/configure.ac`; then + ebegin "Creating config.h template... " + autoheader >> $log 2>&1 + eend $? 1 + fi + ebegin "Creating Makefile templates... " + automake -a >> $log 2>&1 + eend $? 1 + if test -f "$top_srcdir/support/am_edit"; then + ebegin "Postprocessing Makefile templates..." + perl -w support/am_edit >> $log 2>&1 + eend $? 1 + fi + if test -f "$top_srcdir/support/post-bootstrap.sh"; then + source "$top_srcdir/support/post-bootstrap.sh" + test $(type -t "post_bootstrap") = "function" && post_bootstrap + fi + ebegin "Creating maintainer program links ... " + test -f $top_srcdir/reconf || ln -s $admindir/devel.sh $top_srcdir/reconf + # Misc + if test -f "$top_srcdir/support/directory"; then + icon=`ls -1 $top_srcdir/support/project-icon.* 2>/dev/null | head -n 1` + cat $top_srcdir/support/directory | sed "s,@icon@,$icon," > $top_srcdir/.directory + fi + eend 0 +} + +reg_tgt_impl 'bootstrap' Property changes on: admin/trunk/devel.d/bootstrap.tgt.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + "Id Date Revision Author HeadURL" Name: svn:eol-style + native Added: admin/trunk/devel.d/change-log.tgt.sh =================================================================== --- admin/trunk/devel.d/change-log.tgt.sh (rev 0) +++ admin/trunk/devel.d/change-log.tgt.sh 2006-03-18 01:21:35 UTC (rev 11) @@ -0,0 +1,28 @@ +#!/bin/sh +# +# $Id: change-log.tgt.sh,v 1.1 2006/03/17 13:04:03 alex Exp $ +# +# Very simple code staticstics ;) +# + +function change_log_help() +{ + print_target_help 'change-log' 'Update ChangeLog file and commit it to CVS' +} +function change_log_impl() +{ + detect_vcs + case "${current_vcs}" in + cvs) + cvs2cl=${CVS2CL:-`whereis cvs2cl | sed 's,cvs2cl: \(.*\),\1,' | awk '{print $1}'`} + test -z $cvs2cl && eerror "Error: No cvs2cl tool found" && exit 1 + $cvs2cl + ;; + subversion) + eerror "Sorry, this functionality is not implemented yet for subversion" ;; + *) + eerror "Unable to detect what VCS do u use" ;; + esac +} + +reg_tgt_impl 'change_log' Property changes on: admin/trunk/devel.d/change-log.tgt.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + "Id Date Revision Author HeadURL" Name: svn:eol-style + native Added: admin/trunk/devel.d/code-stats.tgt.sh =================================================================== --- admin/trunk/devel.d/code-stats.tgt.sh (rev 0) +++ admin/trunk/devel.d/code-stats.tgt.sh 2006-03-18 01:21:35 UTC (rev 11) @@ -0,0 +1,34 @@ +#!/bin/sh +# +# $Id: code-stats.tgt.sh,v 1.1 2006/03/16 15:58:54 alex Exp $ +# +# Very simple code staticstics ;) +# + +function code_stats_help() +{ + print_target_help 'code-stats' 'Collect some code statiscis (very simple ;)' +} +function code_stats_impl() +{ + find_cmd=`echo find -name\ \'*.{c,h,cc,hh,icc,tcc,hxx,cpp,hpp}\'\ -o -false` + for i in `eval $find_cmd`; do + wc -l $i + done | awk ' \ + BEGIN \ + { \ + s=0; \ + f=0; \ + } \ + { \ + print $1"\t"$2; \ + s+=$1; \ + f++; \ + } \ + END \ + { \ + print "\n" s "\tTotal lines in " f " files"; \ + }' +} + +reg_tgt_impl 'code_stats' Property changes on: admin/trunk/devel.d/code-stats.tgt.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + "Id Date Revision Author HeadURL" Name: svn:eol-style + native Added: admin/trunk/devel.d/help.tgt.sh =================================================================== --- admin/trunk/devel.d/help.tgt.sh (rev 0) +++ admin/trunk/devel.d/help.tgt.sh 2006-03-18 01:21:35 UTC (rev 11) @@ -0,0 +1,24 @@ +#!/bin/sh +# +# $Id: help.tgt.sh,v 1.1 2006/03/16 15:58:54 alex Exp $ +# +# Work copy reconfigurator +# + +function help_help +{ + print_target_help 'help' 'Print help on developer targets' +} + +function help_impl() +{ + list=`echo ${REGISTERED_TARGETS} | sed 's,:, ,g'` + for i in ${list}; do + local t=`type -t ${i}_help` + if test "${t}" = "function"; then + ${i}_help + fi + done +} + +reg_tgt_impl 'help' Property changes on: admin/trunk/devel.d/help.tgt.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + "Id Date Revision Author HeadURL" Name: svn:eol-style + native Added: admin/trunk/devel.d/scan-includes.tgt.sh =================================================================== --- admin/trunk/devel.d/scan-includes.tgt.sh (rev 0) +++ admin/trunk/devel.d/scan-includes.tgt.sh 2006-03-18 01:21:35 UTC (rev 11) @@ -0,0 +1,83 @@ +#!/bin/sh +# +# $Id: scan-includes.tgt.sh,v 1.1 2006/03/16 15:58:54 alex Exp $ +# +# Scan source files for include files and show the result list +# + +function scan_includes_help +{ + print_target_help 'scan-includes' 'Rescan source files and show list of external included files' +} + +function scan_includes_impl() +{ + list=`grep -r '^# *include *<.*>' * --include *.cc --include *.hh --include *.icc --include *.tcc --include *.hpp --include *.c --include *.h \ + | sed 's,^\(.*\):# *include *<\(.*\)>.*$,\1:\2,' \ + | grep -v '^test' \ + | sed 's,^.*:\(.*\)$,\1,' \ + | sort | uniq` + find_cmd=`echo find -name\ \'*.{c,h,cc,hh,icc,tcc,hxx,cpp,hpp}\'\ -o -false` + local_list=`eval $find_cmd` + final_list='' + for i in $list; do + if test -z "`echo $local_list | grep $i`"; then + final_list="$final_list $i" + fi + done + + header_printed='no' + for i in $final_list; do + if `echo $i | grep -q '^.*\.h$'`; then + if test "$header_printed" = 'no'; then + echo "C header files:" + header_printed='yes' + fi + echo $i | grep -v '.*cmdline\.h' + fi + done + + if test "$header_printed" = 'yes'; then + echo -ne '\n' + fi + header_printed='no' + for i in $final_list; do + if `echo $i | grep -v '\.' | grep -q '[a-z]'`; then + if test "$header_printed" = 'no'; then + echo -e "Std. C++ header files:" + header_printed='yes' + fi + echo $i + fi + done + + if test "$header_printed" = 'yes'; then + echo -ne '\n' + fi + header_printed='no' + for i in $final_list; do + if `echo $i | grep -q '^boost.*\.hpp$'`; then + if test "$header_printed" = 'no'; then + echo -e "Boost header files:" + header_printed='yes' + fi + echo $i + fi + done + + if test "$header_printed" = 'yes'; then + echo -ne '\n' + fi + header_printed='no' + for i in $final_list; do + if test -z "`echo $local_list | grep $i | grep -v '^boost.*\.hpp$' | grep -v '^.*\.h$' | grep -v '^[a-z]\+$'`"; then + if test "$header_printed" = 'no'; then + echo -e "Other headers:" + header_printed='yes' + fi + echo $i | grep -v '^boost.*\.hpp$' | grep -v '^.*\.h$' | grep -v '^[a-z]\+$' + fi + done +} + +reg_tgt_impl 'scan_includes' Property changes on: admin/trunk/devel.d/scan-includes.tgt.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + "Id Date Revision Author HeadURL" Name: svn:eol-style + native Added: admin/trunk/devel.d/total-cleanup.tgt.sh =================================================================== --- admin/trunk/devel.d/total-cleanup.tgt.sh (rev 0) +++ admin/trunk/devel.d/total-cleanup.tgt.sh 2006-03-18 01:21:35 UTC (rev 11) @@ -0,0 +1,26 @@ +#!/bin/sh +# +# $Id: total-cleanup.tgt.sh,v 1.1 2006/03/17 13:04:03 alex Exp $ +# +# Remove files not registered in CVS +# + +function total_cleanup_help() +{ + print_target_help 'total-cleanup' 'Remove all files and dirs not registered in VCS' +} + +function total_cleanup_impl() +{ + detect_vcs + case "${current_vcs}" in + cvs) + perl $admindir/cvs-clean.pl ;; + subversion) + eerror "Sorry, this functionality is not implemented yet for subversion" ;; + *) + eerror "Unable to detect what VCS do u use" ;; + esac +} + +reg_tgt_impl 'total_cleanup' Property changes on: admin/trunk/devel.d/total-cleanup.tgt.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + "Id Date Revision Author HeadURL" Name: svn:eol-style + native Added: admin/trunk/devel.d/vcs-cvs-support.sh =================================================================== --- admin/trunk/devel.d/vcs-cvs-support.sh (rev 0) +++ admin/trunk/devel.d/vcs-cvs-support.sh 2006-03-18 01:21:35 UTC (rev 11) @@ -0,0 +1,61 @@ +#!/bin/sh +# +# $Id: vcs-cvs-support.sh,v 1.3 2006/03/16 23:53:01 alex Exp $ +# +# VCS support module for CVS +# + +current_vcs_message='' + +# +# Set message which will be used for next operations +# +function vcs_message() +{ + current_vcs_message="$*" +} + +# +# $* = files to commit +# +function vcs_commit() +{ + msg="${current_vcs_message}" + test -z "${msg}" && msg="<no message>" + cmd="cvs commit -m '$msg' $* >> ${log} 2>&1" + if test -n "${DEBUG_DEVEL_SH}"; then + einfo "${cmd}" + else + eval ${cmd} + fi +} + +# +# $1 = tag name +# +function vcs_tag() +{ + tag=$1 + test -z "${tag}" && eerror "No tag given to VCS driver" + cmd="cvs -q tag "${tag}" >> ${log} 2>&1" + if test -n "${DEBUG_DEVEL_SH}"; then + einfo "${cmd}" + else + eval ${cmd} + fi +} + +# +# $1 = tag name +# +function vcs_branch() +{ + tag=$1 + test -z "${tag}" && eerror "No tag given to VCS driver" + cmd="cvs -q tag -b "${tag}" >> ${log} 2>&1" + if test -n "${DEBUG_DEVEL_SH}"; then + einfo "${cmd}" + else + eval ${cmd} + fi +} Property changes on: admin/trunk/devel.d/vcs-cvs-support.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + "Id Date Revision Author HeadURL" Name: svn:eol-style + native Added: admin/trunk/devel.d/vcs-subversion-support.sh =================================================================== --- admin/trunk/devel.d/vcs-subversion-support.sh (rev 0) +++ admin/trunk/devel.d/vcs-subversion-support.sh 2006-03-18 01:21:35 UTC (rev 11) @@ -0,0 +1,28 @@ +#!/bin/sh +# +# $Id: vcs-subversion-support.sh,v 1.3 2006/03/17 14:13:38 alex Exp $ +# +# VCS support module for Subversion +# + +current_vcs_message='' + +# +# Set message which will be used for next operations +# +function vcs_message() +{ + current_vcs_message="$*" +} + +function vcs_commit() +{ +} + +function vcs_tag() +{ +} + +function vcs_branch() +{ +} Property changes on: admin/trunk/devel.d/vcs-subversion-support.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + "Id Date Revision Author HeadURL" Name: svn:eol-style + native Added: admin/trunk/devel.d/versioning-support.tgt.sh =================================================================== --- admin/trunk/devel.d/versioning-support.tgt.sh (rev 0) +++ admin/trunk/devel.d/versioning-support.tgt.sh 2006-03-18 01:21:35 UTC (rev 11) @@ -0,0 +1,340 @@ +#!/bin/sh +# +# $Id: versioning-support.tgt.sh,v 1.3 2006/03/16 23:53:01 alex Exp $ +# +# Packege version management +# + +# +# Get current version +# +function get_current_version() +{ + local version_info=`cat ${top_srcdir}/support/version.m4 \ + | grep '^[ |\t]*m4_define.*$' \ + | grep -v 'VERSION_STR' \ + | sed -e 's/\(.*\)dnl.*/\1/' \ + -e 's/\(.*\)#.*/\1/' \ + -e 's/m4_define(\[\([A-Z_]\+\)\],[ |\t]*\[\(.*\)\])/\1="\2"/g'` + eval ${version_info} +} +# +# Make Release +# +function make_release() +{ + ebegin "Parse current version info..." + if test ! -f ${top_srcdir}/support/version.m4; then + eerror "Version info file not found" + eend 1 1 + fi + # Get current versioninfo + get_current_version + test -n "${MAJOR}" -o -n "${MINOR}" -o -n "${PATCH_LEVEL}" + eend $? 1 + # Save previous version + O_MAJOR=${MAJOR}; O_MINOR=${MINOR}; O_PATCH_LEVEL=${PATCH_LEVEL}; O_EXTRA_VERSION=${EXTRA_VERSION} + # Increment version number + # Is current version already marked as beta or RC? + if test -z "${EXTRA_VERSION}"; then + case "$1" in + release | beta | rc ) + eerror "You can't make this target because current version ${MAJOR}.${MINOR}.${PATCH_LEVEL} is not a beta or RC" + einfo "Targets you can make: (major|minor|patch)-release, next-(major|minor|patch)-(beta|rc)" + exit 1 ;; + esac + # No. + case "$1" in + major ) MAJOR=$((MAJOR+1)); MINOR=0; PATCH_LEVEL=0 ;; + minor ) MINOR=$((MINOR+1)); PATCH_LEVEL=0 ;; + patch ) PATCH_LEVEL=$((PATCH_LEVEL+1)) ;; + *) eerror "Hmm... Smth wrong with arg to make_release()"; exit 1 ;; + esac + # Should we start RC or beta branch? + if test -n "$2"; then + EXTRA_VERSION="${2}1" + fi + else + case "$1" in + major | minor | patch ) + eerror "You can't make this target while ${MAJOR}.${MINOR}.${PATCH_LEVEL} version is not released" + einfo "Maybe you need one of 'release', 'next-rc' or 'next-beta' ??" + exit 1 ;; + esac + # If $2 == '' it will be release! :) + if test -z "$2"; then + # Yes. Just clear extra version mark and leave main digits as is... + EXTRA_VERSION="" + else + # Continue to make next beta or RC... + # Is current extra version will be the same? + local ce=`echo "${EXTRA_VERSION}" | sed 's,[0-9]\+,,'` + if test "$2" == "${ce}"; then + # Yes. Increment version number... + local cn=`echo "${EXTRA_VERSION}" | sed 's,[a-z]\+,,'` + EXTRA_VERSION="${2}$((cn+1))" + else + # No. Only beta can become RC but not reverse... + if test "$2" == "rc" -a "${ce}" == "beta"; then + EXTRA_VERSION="rc1" + else + eerror "Can't make $MAJOR.$MINOR.$PATCH_LEVEL-${2}1' version from $MAJOR.$MINOR.$PATCH_LEVEL-$EXTRA_VERSION." + einfo "You can make 'next-rc' or 'release' only." + exit 1 + fi + fi + fi + fi + # Commit changes + post_increment_actions +} +# All functions below can be started only at release state... +function major_release_impl() # Major Release +{ + einfo "`date` -- Making 'major release'" + make_release "major" +} +function minor_release_impl() # Minor Release +{ + einfo "`date` -- Making 'minor release'" + make_release "minor" +} +function patch_release_impl() # Next Patch Level +{ + einfo "`date` -- Making 'patch release'" + make_release "patch" +} +function next_major_beta_impl() # Major Release (beta) +{ + einfo "`date` -- Making 'major beta'" + make_release "major" "beta" +} +function next_minor_beta_impl() # Minor Release (beta) +{ + einfo "`date` -- Making 'minor beta'" + make_release "minor" "beta" +} +function next_patch_beta_impl() # Patch Level Release (beta) +{ + einfo "`date` -- Making 'patch beta'" + make_release "patch" "beta" +} +function next_major_rc_impl() # Major Release (RC) +{ + einfo "`date` -- Making 'major release candidate'" + make_release "major" "rc" +} +function next_minor_rc_impl() # Minor Release (RC) +{ + einfo "`date` -- Making 'minor release candidate'" + make_release "minor" "rc" +} +function next_patch_rc_impl() # Patch Level Release (RC) +{ + einfo "`date` -- Making 'patch release candidate'" + make_release "patch" "rc" +} +function release_impl() # Make release of current version +{ + einfo "`date` -- Making 'release'" + make_release "release" +} +function next_beta_impl() # Make next beta of current version +{ + einfo "`date` -- Making 'next beta'" + make_release "beta" "beta" +} +function next_rc_impl() # Make next rc of current version +{ + einfo "`date` -- Making 'next release candidate'" + make_release "rc" "rc" +} +# +# Get filename of maintainers README +# +function set_maintainer_README() +{ + if test -f "${top_srcdir}/README.maint"; then + README="README.maint" + else + README="README" + fi +} +# +# +# +function post_increment_actions() +{ + set_maintainer_README + local old_version_str="${O_MAJOR}.${O_MINOR}.${O_PATCH_LEVEL}"`test -n "${O_EXTRA_VERSION}" && echo -${O_EXTRA_VERSION}` + local new_version_str="${MAJOR}.${MINOR}.${PATCH_LEVEL}"`test -n "${EXTRA_VERSION}" && echo -${EXTRA_VERSION}` + local new_version_tag=`echo ${new_version_str} | sed 's/\./-/g'` + local tag_prefix=${TAG_PREFIX} + + einfo "Version info: ${old_version_str} ==> ${new_version_str}" + ebegin "Patch version depended files..." + + # Rewrite new versioninfo + VERSION_STR="${MAJOR}.${MINOR}.${PATCH_LEVEL}"`test -n "${EXTRA_VERSION}" && echo "-${EXTRA_VERSION}"` + cat "${top_srcdir}/support/version.m4" \ + | sed -e "s/\(m4_define(\[MAJOR\],[ |\t]*\[\).*\(\])\)/\1${MAJOR}\2/g" \ + -e "s/\(m4_define(\[MINOR\],[ |\t]*\[\).*\(\])\)/\1${MINOR}\2/g" \ + -e "s/\(m4_define(\[PATCH_LEVEL\],[ |\t]*\[\).*\(\])\)/\1${PATCH_LEVEL}\2/g" \ + -e "s/\(m4_define(\[EXTRA_VERSION\],[ |\t]*\[\).*\(\])\)/\1${EXTRA_VERSION}\2/g" \ + -e "s/\(m4_define(\[VERSION_STR\],[ |\t]*\[\).*\(\])\)/\1${VERSION_STR}\2/g" \ + > "${top_srcdir}/support/version.m4.new" + mv -f "${top_srcdir}/support/version.m4.new" "${top_srcdir}/support/version.m4" 2>>$log + eend $? 1 + tr_new_version_str=`echo ${new_version_str} | sed 's,-,,'` + + # Append tag info in README + echo -e "\n`LC_ALL=en date +'%a %b %d %Y'` - release ${new_version_str} tagged." \ + " Tag: \"${tag_prefix}-${new_version_tag}\"" >> ${README} + detect_vcs + # Commit changes + ebegin "Commit version depended files..." + call_vcs_action message "'Release ${new_version_str} tagged'" + call_vcs_action commit ${README} support/version.m4 + eend $? 1 + # Tag current sources + ebegin "Making CVS tag ${tag_prefix}-${new_version_tag}" + call_vcs_action tag "'${tag_prefix}-${new_version_tag}'" + eend $? 1 +} +# +# +# +function make_a_branch() +{ + ebegin "*** Parse current version info..." + if test ! -f ${top_srcdir}/support/version.m4; then + eend $? + eerror "Version info file not found" + exit 1 + fi + # Get current versioninfo + get_current_version + test -z "${MAJOR}" -o -z "${MINOR}" -o -z "${PATCH_LEVEL}" + eend $? 1 + # Increment version number + local major_increment=$1 + local minor_increment=$2 + local new_MAJOR=$((MAJOR+major_increment)) + local new_MINOR=`test "${major_increment}" == '0' && echo "$((MINOR+minor_increment))" || echo '0'` + local new_version_str="${new_MAJOR}.${new_MINOR}" + local new_version_tag=`echo ${new_version_str} | sed 's/\./-/g'` + local tag_prefix=${BRANCH_PREFIX} + + # Append tag info in README + set_maintainer_README + echo -e "\n`LC_ALL=en date +'%a %b %d %Y'` - made a branch for upcoming release ${new_version_str}." \ + " Tag: \"${tag_prefix}-${new_version_tag}\"" >> ${README} + detect_vcs + # Commit changes + ebegin "Commit version depended files..." + call_vcs_action message "'Made a branch for upcoming release ${new_version_str}'" + call_vcs_action commit ${README} + eend $? 1 + # Tag current sources + ebegin "Making CVS branch ${tag_prefix}-${new_version_tag}" + call_vcs_action branch "${tag_prefix}-${new_version_tag}" + eend $? 1 +} +# +# +# +function next_major_branch_impl() +{ + make_a_branch 1 0 +} +function next_minor_branch_impl() +{ + make_a_branch 0 1 +} + +# +# Spam current version +# +function report_version_impl() +{ + # Get current versioninfo + get_current_version + echo "Current version info: ${MAJOR}.${MINOR}.${PATCH_LEVEL}"`test -n "${EXTRA_VERSION}" && echo "-${EXTRA_VERSION}"` +} + +function major_release_help +{ + print_target_help 'major_release' 'Start next major generation with release (x++.0.0)' +} +function minor_release_help +{ + print_target_help 'minor_release' 'Start next minor generation with release (x.y++.0)' +} +function patch_release_help +{ + print_target_help 'patch_release' 'Start next patch generation with release (x.y.z++)' +} +function next_major_beta_help +{ + print_target_help 'next_major_beta' 'Start next major generation with beta1 version (x++.0.0-beta1)' +} +function next_minor_beta_help +{ + print_target_help 'next_minor_beta' 'Start next minor generation with beta1 version (x.y++.0-beta1)' +} +function next_patch_beta_help +{ + print_target_help 'next_patch_beta' 'Start next patch generation with beta1 version (x.y.z++-beta1)' +} +function next_major_rc_help +{ + print_target_help 'next_major_rc' 'Start next major generation with RC1 extra version (x++.0.0-rc1)' +} +function next_minor_rc_help +{ + print_target_help 'next_minor_rc' 'Start next minor generation with RC1 extra version (x.y++.0-rc1)' +} +function next_patch_rc_help +{ + print_target_help 'next_patch_rc' 'Start next patch generation with RC1 extra version (x.y.z++-rc1)' +} +function release_help +{ + print_target_help 'release' 'Drop extra version info (i.e. x.y.z-[beta|rc]N --> x.y.z)' +} +function next_beta_help +{ + print_target_help 'next_beta' 'Increment current beta number (x.y.z-betaN++)' +} +function next_rc_help +{ + print_target_help 'next_rc' 'Increment current RC number (x.y.z-betaN --> x.y.z-rc1 or x.y.z-rcN++)' +} +function report_version_help +{ + print_target_help 'report_version' 'Just report current version' +} +function next_major_branch_help +{ + print_target_help 'next_major_branch' 'Make a branch for next major version (x++.0) /will not change current version/' +} +function next_minor_branch_help +{ + print_target_help 'next_minor_branch' 'Make a branch for next minor version (x.y++) /will not change current version/' +} + +reg_tgt_impl major_release +reg_tgt_impl minor_release +reg_tgt_impl patch_release +reg_tgt_impl next_major_beta +reg_tgt_impl next_minor_beta +reg_tgt_impl next_patch_beta +reg_tgt_impl next_major_rc +reg_tgt_impl next_minor_rc +reg_tgt_impl next_patch_rc +reg_tgt_impl release +reg_tgt_impl next_beta +reg_tgt_impl next_rc +reg_tgt_impl report_version +reg_tgt_impl next_major_branch +reg_tgt_impl next_minor_branch Property changes on: admin/trunk/devel.d/versioning-support.tgt.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + "Id Date Revision Author HeadURL" Name: svn:eol-style + native Added: admin/trunk/devel.sh =================================================================== --- admin/trunk/devel.sh (rev 0) +++ admin/trunk/devel.sh 2006-03-18 01:21:35 UTC (rev 11) @@ -0,0 +1,47 @@ +#!/bin/sh +# +# $Id: devel.sh,v 1.4 2006/03/17 13:21:37 alex Exp $ +# + +# +# Initialize core -- execute startup actions +# +self=$0 +list=`ls ${admindir}/devel.d/*.sh 2>/dev/null | sort | grep '[0-9]\+'` +for i in ${list}; do + source ${i} +done + +# +# Import Makefile.cvs target implementation plugins +# +list=`ls ${admindir}/devel.d/*.tgt.sh 2>/dev/null | sort` +for i in ${list}; do + source ${i} +done + +# +# Check that requested target registered and call it +# +req_target=`echo $1 | tr '\-.' '__'` +found=`echo ${REGISTERED_TARGETS} | grep "${req_target}"` +if test -n "${req_target}" -a -z "${found}"; then + # Print error if some target requested but not found + eerror "Unknown target ${req_target}" + exit 1 +fi +# Execute target implementation if found and exit +if test -n "${req_target}"; then + echo "*** `date` -- ${req_target} ***" >> ${log} + if test "`type -t ${req_target}_impl`" == "function"; then + ${req_target}_impl + exit 0 + else + eerror "Target defined ${req_target} but not implemented" + exit 1 + fi +fi + +if test -n "`echo ${self} | grep 'reconf'`"; then + make -f Makefile.cvs +fi Property changes on: admin/trunk/devel.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:keywords + "Id Date Revision Author HeadURL" Name: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <za...@us...> - 2006-03-18 01:15:55
|
Revision: 10 Author: zaufi Date: 2006-03-17 17:15:50 -0800 (Fri, 17 Mar 2006) ViewCVS: http://svn.sourceforge.net/halfs/?rev=10&view=rev Log Message: ----------- fix props Property Changed: ---------------- halfs/trunk/ Property changes on: halfs/trunk ___________________________________________________________________ Name: svn:externals - m4 file:///work/svnroot/m4/trunk admin file:///work/svnroot/admin/trunk + m4 https://svn.sourceforge.net/svnroot/halfs/m4/trunk admin https://svn.sourceforge.net/svnroot/halfs/admin/trunk This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <za...@us...> - 2006-03-17 22:52:15
|
Revision: 9 Author: zaufi Date: 2006-03-17 14:52:09 -0800 (Fri, 17 Mar 2006) ViewCVS: http://svn.sourceforge.net/halfs/?rev=9&view=rev Log Message: ----------- save Modified Paths: -------------- halfs/trunk/configure.ac Modified: halfs/trunk/configure.ac =================================================================== --- halfs/trunk/configure.ac 2006-03-17 22:51:28 UTC (rev 8) +++ halfs/trunk/configure.ac 2006-03-17 22:52:09 UTC (rev 9) @@ -1,6 +1,6 @@ # -*-m4-*- # -# $Header: /cvsroot/halfs/halfs/configure.ac,v 1.2 2006/02/04 02:05:04 zaufi Exp $ +# $Id: /cvsroot/halfs/halfs/configure.ac,v 1.2 2006/02/04 02:05:04 zaufi Exp $ # # DO NOT EDIT! This file generated from admin/configure.ac.in by bootstrap script # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <za...@us...> - 2006-03-17 22:51:33
|
Revision: 8 Author: zaufi Date: 2006-03-17 14:51:28 -0800 (Fri, 17 Mar 2006) ViewCVS: http://svn.sourceforge.net/halfs/?rev=8&view=rev Log Message: ----------- refactoring configration support Modified Paths: -------------- halfs/trunk/Makefile.cvs Modified: halfs/trunk/Makefile.cvs =================================================================== --- halfs/trunk/Makefile.cvs 2006-03-12 15:36:08 UTC (rev 7) +++ halfs/trunk/Makefile.cvs 2006-03-17 22:51:28 UTC (rev 8) @@ -1,19 +1,16 @@ # -# $Header: /cvsroot/halfs/halfs/Makefile.cvs,v 1.2 2006/01/17 00:18:19 zaufi Exp $ +# $Header: /a/c-repository/session-builder/Makefile.cvs,v 1.5 2006/03/17 13:21:37 alex Exp $ # # This file for CVS version only. # -MAINTAINER_TARGETS = major-release minor-release patch-release \ - next-major-beta next-minor-beta next-patch-beta \ - next-major-rc next-minor-rc next-patch-rc \ - release next-beta next-rc report-version \ - next-major-branch next-minor-branch \ - cvs-reconf full-reconf simple-reconf \ - cvs-clean code-stats scan-includes ChangeLog -admindir = admin +admindir = admin +MAINTAINER_TARGETS = $(shell grep -h print_target_help $(admindir)/devel.d/*.tgt.sh | sed -e "s,^.*'\(.*\)'\s\+'.*$$,\1," -e 's,_,-,g') -all: cvs-reconf ; +# +# Set 'default' target to 'bootstrap' -- we know that such target exists ;) +# +all: bootstrap ; # # Wrapped rules @@ -21,47 +18,23 @@ $(MAINTAINER_TARGETS): @admindir=$(admindir); \ if test "x$$admindir" = x; then \ - admindir=.; until test -f $$admindir/admin/cvs.sh; do \ + admindir=.; until test -f $$admindir/admin/devel.sh; do \ admindir=$$admindir/..; \ if test `cd $$admindir && pwd` = / ; then break; fi; \ done; \ admindir=$$admindir/admin; \ - if test ! -f $$admindir/cvs.sh; then \ + if test ! -f $$admindir/devel.sh; then \ echo "Can't find the admin/ directory in any parent of the current directory."; \ echo "Please set it with admindir=..."; \ exit 1; \ fi; \ fi; \ - echo "make[$(MAKELEVEL)]: $($(addsuffix _desc,$(subst -,_,$@)))"; \ - WANT_AUTOCONF_2_5=1 admindir=$$admindir $(SHELL) $$admindir/cvs.sh $@ + WANT_AUTOCONF_2_5=1 admindir=$$admindir $(SHELL) $$admindir/devel.sh $(@) -.DEFAULT help: +.DEFAULT: @test "$@" = "help" || \ echo -e "make: *** No rule to make target \`$@'. Stop." @echo "Use one of the following maintainer targets:" - @echo -e '$(foreach t,$(MAINTAINER_TARGETS),\t$(t)\033[28G$($(addsuffix _desc, $(subst -,_,$(t))))\n)' + @$(MAKE) -f $(MAKEFILE_LIST) help -major_release_desc = Start next major generation with release (x++.0.0) -minor_release_desc = Start next minor generation with release (x.y++.0) -patch_release_desc = Start next patch generation with release (x.y.z++) -next_major_beta_desc = Start next major generation with beta1 version (x++.0.0-beta1) -next_minor_beta_desc = Start next minor generation with beta1 version (x.y++.0-beta1) -next_patch_beta_desc = Start next patch generation with beta1 version (x.y.z++-beta1) -next_major_rc_desc = Start next major generation with RC1 extra version (x++.0.0-rc1) -next_minor_rc_desc = Start next minor generation with RC1 extra version (x.y++.0-rc1) -next_patch_rc_desc = Start next patch generation with RC1 extra version (x.y.z++-rc1) -release_desc = Drop extra version info (i.e. x.y.z-[beta|rc]N --> x.y.z) -next_beta_desc = Increment current beta number (x.y.z-betaN++) -next_rc_desc = Increment current RC number (x.y.z-betaN --> x.y.z-rc1 or x.y.z-rcN++) -report_version_desc = Just report current version -next_major_branch_desc = Make a branch for next major version (x++.0) /will not change current version/ -next_minor_branch_desc = Make a branch for next minor version (x.y++) /will not change current version/ -cvs_reconf_desc = Run autotools and friends (this is default goal) -full_reconf_desc = Like 'cvs-reconf' + run configure in $$(top_srcdir)/build -simple_reconf_desc = Like 'cvs-reconf' + run configure -cvs_clean_desc = Remove all files and dirs not registered in CVS -code_stats_desc = Collect some code statiscis (very simple ;) -scan_includes_desc = Rescan source files and show list of external included files -ChangeLog_desc = Update ChangeLog and commit it to CVS - -.PHONY: $(MAINTAINER_TARGETS) help +.PHONY: $(MAINTAINER_TARGETS) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <za...@us...> - 2006-02-13 19:51:33
|
Update of /cvsroot/halfs/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1239 Modified Files: cvs.sh Log Message: fix scan-includes Index: cvs.sh =================================================================== RCS file: /cvsroot/halfs/admin/cvs.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cvs.sh 17 Jan 2006 00:09:57 -0000 1.2 +++ cvs.sh 13 Feb 2006 19:51:22 -0000 1.3 @@ -611,7 +611,7 @@ fi header_printed='no' for i in $final_list; do - if test -n "`echo $local_list | grep $i | grep -v '^boost.*\.hpp$' | grep -v '^.*\.h$' | grep -v '^[a-z]\+$'`"; then + if test -z "`echo $local_list | grep $i | grep -v '^boost.*\.hpp$' | grep -v '^.*\.h$' | grep -v '^[a-z]\+$'`"; then if test "$header_printed" = 'no'; then echo -e "Other headers:" header_printed='yes' |
|
From: <za...@us...> - 2006-02-13 19:51:20
|
Update of /cvsroot/halfs/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1160 Modified Files: Makefile.gengetopt Log Message: fix gengetopt support Index: Makefile.gengetopt =================================================================== RCS file: /cvsroot/halfs/admin/Makefile.gengetopt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- Makefile.gengetopt 14 Jan 2006 00:07:09 -0000 1.1.1.1 +++ Makefile.gengetopt 13 Feb 2006 19:51:10 -0000 1.2 @@ -5,36 +5,40 @@ # %$(CMDLINE_PARSER_SUFFIX).c: %.ggo - so=`cat $(MAKEFILE_LIST) | grep '^$(*F)_GGOFLAGS[ ]*=' | sed 's,^$(*F)_GGOFLAGS[ ]*=[ ]*\(.*\),\1,'`; \ + so=`cat $(MAKEFILE_LIST) \ + | grep '^$(subst .,_,$(subst -,_,$(*F)))_GGOFLAGS[ ]*=' \ + | sed 's,^$(subst .,_,$(subst -,_,$(*F)))_GGOFLAGS[ ]*=[ ]*\(.*\),\1,'`; \ $(GENGETOPT) $(AM_GGOFLAGS) $$so -i $< -F $(*F)$(CMDLINE_PARSER_SUFFIX) + list="fix_ggo_autoconf_issue fix_arg0 $(GGO_POSTGEN_ACTIONS)"`cat $(MAKEFILE_LIST) \ + | grep '^$(subst .,_,$(subst -,_,$(*F)))_GGO_POSTGEN_ACTIONS[ ]*=' \ + | sed 's,.*=[ ]*\(.*\),\1,'`; \ + for i in $$list; do \ + $(MAKE) $(AM_MAKEFLAGS) $$i TGT_H_FILE=`basename $(@) .c`.h TGT_C_FILE=$(@) SRC_FILE=$(<); \ + done + +%$(CMDLINE_PARSER_SUFFIX).h: %$(CMDLINE_PARSER_SUFFIX).c + +fix_ggo_autoconf_issue: sed -e 's/HAVE_CONFIG_H/DONT_USE_CONFIG/' \ - < $(*F)$(CMDLINE_PARSER_SUFFIX).c > $(*F)$(CMDLINE_PARSER_SUFFIX).c.tmp - mv -f $(*F)$(CMDLINE_PARSER_SUFFIX).c.tmp $(*F)$(CMDLINE_PARSER_SUFFIX).c + < $(TGT_C_FILE) > $(TGT_C_FILE).tmp + mv -f $(TGT_C_FILE).tmp $(TGT_C_FILE) sed -e '/#ifndef PACKAGE/ {' -e 'i \' -e '#undef PACKAGE' -e '}' \ -e '/#ifndef VERSION/ {' -e 'i \' -e '#undef VERSION' -e '}' \ -e 's/HAVE_CONFIG_H/DONT_USE_CONFIG/' \ - < $(*F)$(CMDLINE_PARSER_SUFFIX).h > $(*F)$(CMDLINE_PARSER_SUFFIX).h.tmp - mv -f $(*F)$(CMDLINE_PARSER_SUFFIX).h.tmp $(*F)$(CMDLINE_PARSER_SUFFIX).h - $(MAKE) $(AM_MAKEFLAGS) fix_arg0 TGT_FILE=$(@) - list="$(GGO_POSTGEN_ACTIONS)"`cat $(MAKEFILE_LIST) \ - | grep '^$(*F)_GGO_POSTGEN_ACTIONS[ ]*=' \ - | sed 's,.*=[ ]*\(.*\),\1,'`; \ - for i in $$list; do \ - $(MAKE) $(AM_MAKEFLAGS) $$i TGT_FILE=$(@) SRC_FILE=$(<); \ - done - -%$(CMDLINE_PARSER_SUFFIX).h: %$(CMDLINE_PARSER_SUFFIX).c ; + < $(TGT_H_FILE) > $(TGT_H_FILE).tmp + mv -f $(TGT_H_FILE).tmp $(TGT_H_FILE) fix_arg0: - cat $(TGT_FILE) | sed \ + cat $(TGT_C_FILE) | sed \ -e 's,cmdline_parser_print_help[ ]*(void),cmdline_parser_print_help(const char* bin_prg_name),' \ - -e '/Usage:/ s,CMDLINE_PARSER_PACKAGE,bin_prg_name,' \ + -e '/Usage: %s/ s,CMDLINE_PARSER_PACKAGE,bin_prg_name,' \ + -e '/Usage: [^%]/ s,Usage: .* \[OPTIONS\]\(.*\)",Usage: %s [OPTIONS]\1"\, bin_prg_name,' \ -e 's,cmdline_parser_print_help[ ]*();,cmdline_parser_print_help(argv[0]);,' \ - > $(TGT_FILE).tmp - mv -f $(TGT_FILE).tmp $(TGT_FILE) - cat `basename $(TGT_FILE) .c`.h | sed \ + > $(TGT_C_FILE).tmp + mv -f $(TGT_C_FILE).tmp $(TGT_C_FILE) + cat $(TGT_H_FILE) | sed \ -e 's,cmdline_parser_print_help[ ]*(void),cmdline_parser_print_help(const char*),' \ - > `basename $(TGT_FILE) .c`.tmp - mv -f `basename $(TGT_FILE) .c`.tmp `basename $(TGT_FILE) .c`.h + > $(TGT_H_FILE).tmp + mv -f $(TGT_H_FILE).tmp $(TGT_H_FILE) .PHONY: fix_arg0 |
|
From: <za...@us...> - 2006-02-04 02:05:16
|
Update of /cvsroot/halfs/halfs/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13613/src Modified Files: hal_tree_monitor.cc Log Message: found unhandled exception... stiil need to investigate why it occured Index: hal_tree_monitor.cc =================================================================== RCS file: /cvsroot/halfs/halfs/src/hal_tree_monitor.cc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- hal_tree_monitor.cc 14 Jan 2006 00:36:08 -0000 1.1.1.1 +++ hal_tree_monitor.cc 4 Feb 2006 02:05:04 -0000 1.2 @@ -118,11 +118,18 @@ hal_tree_monitor::~hal_tree_monitor() { - // Stop monitor thread - if (m_monitor_thr.is_running()) + try { - m_monitor_thr.cancel(); - m_monitor_thr.join(); + // Stop monitor thread + if (m_monitor_thr.is_running()) + { + m_monitor_thr.cancel(); + m_monitor_thr.join(); + } + } + catch (...) + { + lout() << level::error << "Error on stop monitor thread\n"; } /// \todo Need to handle an errors libhal_ctx_shutdown(m_hal_ctx, &m_dbus_error); |
|
From: <za...@us...> - 2006-02-04 02:05:14
|
Update of /cvsroot/halfs/halfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13613 Modified Files: configure.ac Log Message: found unhandled exception... stiil need to investigate why it occured Index: configure.ac =================================================================== RCS file: /cvsroot/halfs/halfs/configure.ac,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- configure.ac 14 Jan 2006 00:35:11 -0000 1.1.1.1 +++ configure.ac 4 Feb 2006 02:05:04 -0000 1.2 @@ -47,7 +47,7 @@ AC_ARG_ENABLE(release, AS_HELP_STRING([--enable-release], [Compile release version with usual optimizations]), [if test "$enable_release" == "yes"; then - OPTFLAGS="-g -O3 -fexpensive-optimizations" + OPTFLAGS="-g -O3" fi]) AC_ARG_ENABLE(extra_optimized_release, @@ -189,6 +189,10 @@ if test "$enable_debug" = "yes"; then AC_DEFINE(_DEBUG,,[Enable debugging code]) fi +if test "$enable_extra_optimize" = "yes" -o "$enable_release" = "yes"; then + AC_DEFINE(NDEBUG,,[Disable debugging code]) +fi + AC_DEFINE(FUSE_USE_VERSION, 22, [Enable to use modern FUSE version]) # Prevent direct including of config.h + add gettext macros |
|
From: <za...@us...> - 2006-01-17 00:18:35
|
Update of /cvsroot/halfs/halfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30394 Modified Files: Makefile.cvs Log Message: update help Index: Makefile.cvs =================================================================== RCS file: /cvsroot/halfs/halfs/Makefile.cvs,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- Makefile.cvs 14 Jan 2006 00:35:11 -0000 1.1.1.1 +++ Makefile.cvs 17 Jan 2006 00:18:19 -0000 1.2 @@ -54,8 +54,8 @@ next_beta_desc = Increment current beta number (x.y.z-betaN++) next_rc_desc = Increment current RC number (x.y.z-betaN --> x.y.z-rc1 or x.y.z-rcN++) report_version_desc = Just report current version -next_major_branch_desc = Make a branch for next major version (x++.y) -next_minor_branch_desc = Make a branch for next minor version (x.y++) +next_major_branch_desc = Make a branch for next major version (x++.0) /will not change current version/ +next_minor_branch_desc = Make a branch for next minor version (x.y++) /will not change current version/ cvs_reconf_desc = Run autotools and friends (this is default goal) full_reconf_desc = Like 'cvs-reconf' + run configure in $$(top_srcdir)/build simple_reconf_desc = Like 'cvs-reconf' + run configure |
|
From: <za...@us...> - 2006-01-17 00:10:05
|
Update of /cvsroot/halfs/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27572 Modified Files: cvs.sh Log Message: fix next major target Index: cvs.sh =================================================================== RCS file: /cvsroot/halfs/admin/cvs.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -d -r1.1.1.1 -r1.2 --- cvs.sh 14 Jan 2006 00:07:09 -0000 1.1.1.1 +++ cvs.sh 17 Jan 2006 00:09:57 -0000 1.2 @@ -442,7 +442,9 @@ # Increment version number local major_increment=$1 local minor_increment=$2 - local new_version_str="$((MAJOR+major_increment)).$((MINOR+minor_increment))" + local new_MAJOR=$((MAJOR+major_increment)) + local new_MINOR=`test "$major_increment" == '0' && echo "$((MINOR+minor_increment))" || echo '0'` + local new_version_str="$new_MAJOR.$new_MINOR" local new_version_tag=`echo $new_version_str | sed 's/\./-/g'` local branch_prefix='version' |
|
From: <za...@us...> - 2006-01-14 00:42:01
|
Update of /cvsroot/halfs/CVSROOT In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4639 Modified Files: modules Log Message: fix module name Index: modules =================================================================== RCS file: /cvsroot/halfs/CVSROOT/modules,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- modules 14 Jan 2006 00:40:57 -0000 1.3 +++ modules 14 Jan 2006 00:41:54 -0000 1.4 @@ -25,7 +25,7 @@ # can be useful for creating a module that consists of many directories # spread out over the entire source repository. -admin -d admin -m4 -d m4 +admin -d admin admin +m4 -d m4 m4 halfs halfs &admin &m4 |
|
From: <za...@us...> - 2006-01-14 00:41:04
|
Update of /cvsroot/halfs/CVSROOT In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4405 Modified Files: modules Log Message: fix module name Index: modules =================================================================== RCS file: /cvsroot/halfs/CVSROOT/modules,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- modules 14 Jan 2006 00:38:59 -0000 1.2 +++ modules 14 Jan 2006 00:40:57 -0000 1.3 @@ -28,4 +28,4 @@ admin -d admin m4 -d m4 -halds halfs &admin &m4 +halfs halfs &admin &m4 |
