Menu
▾
▴
[Halfs-cvs] SF.net SVN: halfs: [15] admin/trunk/devel.d
|
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. |