<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][17147] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=17147">17147</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2010-03-30 18:19:57 -0500 (Tue, 30 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rewrote the release tagging script so as to work usefully with git.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkscriptstagscriptsh">freeswitch/trunk/scripts/tagscript.sh</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkscriptstagscriptsh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/scripts/tagscript.sh (17146 => 17147)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/scripts/tagscript.sh 2010-03-30 23:19:52 UTC (rev 17146)
+++ freeswitch/trunk/scripts/tagscript.sh 2010-03-30 23:19:57 UTC (rev 17147)
</span><span class="lines">@@ -1,34 +1,67 @@
</span><del>-NEW_MICRO=4
-rm -rf freeswitch.tag.working
-svn co http://svn.freeswitch.org/svn/freeswitch/trunk freeswitch.tag.working
-cd freeswitch.tag.working
-SWITCH_VERSION_MAJOR=`grep SWITCH_VERSION_MAJOR configure.in | sed "s|.*\[||" | sed "s|\].*||"`
-SWITCH_VERSION_MINOR=`grep SWITCH_VERSION_MINOR configure.in | sed "s|.*\[||" | sed "s|\].*||"`
-SWITCH_VERSION_MICRO=`grep SWITCH_VERSION_MICRO configure.in | sed "s|.*\[||" | sed "s|\].*||"`
-FREESWITCH_VERSION=$((`svnversion .` + 1))
-cat configure.in | sed "s|$SWITCH_VERSION_MICRO|$NEW_MICRO|" | sed "s|svn-revision-here|$FREESWITCH_VERSION|" | sed "s|#AC_SUBST(SWITCH_VERSION_REVISION|AC_SUBST(SWITCH_VERSION_REVISION|" > configure.tmp
-cp -f configure.tmp configure.in
-rm -f configure.tmp
-cd libs/openzap/
-OPENZAP_VERSION=$((`svnversion .` + 1))
-svn copy . http://svn.openzap.org:81/svn/openzap/tags/v$OPENZAP_VERSION -m"tag"
-cd ../..
-echo 'cat $1 | sed "s|openzap/trunk|openzap/tags/v'$OPENZAP_VERSION'|" > svn-temp-working' > externaleditor.sh
-echo 'cp -f svn-temp-working $1' >> externaleditor.sh
-echo 'rm -f svn-temp-working' >> externaleditor.sh
-chmod a+x externaleditor.sh
-svn propedit svn:externals . --editor-cmd=./externaleditor.sh
-svn copy . http://svn.freeswitch.org/svn/freeswitch/tags/$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO -m"tag"
-cd ..
-rm -rf freeswitch.tag.working
-svn co http://svn.freeswitch.org/svn/freeswitch/tags/$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO
-cd freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO
</del><ins>+#!/bin/bash
+
+src_repo="$(pwd)"
+
+if [ ! -d .git ]; then
+ echo "error: must be run from within the top level of a FreeSWITCH git tree." 1>&2
+ exit 1;
+fi
+
+if [ -z "$1" ]; then
+ echo "usage: ./scripts/tagscript.sh MAJOR.MINOR.MICRO[.REVISION]" 1>&2
+ exit 1;
+fi
+
+ver="$1"
+major=$(echo "$ver" | cut -d. -f1)
+minor=$(echo "$ver" | cut -d. -f2)
+micro=$(echo "$ver" | cut -d. -f3)
+rev=$(echo "$ver" | cut -d. -f4)
+
+dst_name="freeswitch-$major.$minor.$micro"
+dst_dir="$src_repo/../$dst_name"
+
+if [ -d "$dst_dir" ]; then
+ echo "error: destination directory $dst_dir already exists." 1>&2
+ exit 1;
+fi
+
+# save local changes
+ret=$(git stash save "Save uncommitted changes before tagging.")
+if echo $ret | grep "^Saved"; then
+ stash_saved=1
+fi
+
+sed -e "s|\(AC_SUBST(SWITCH_VERSION_MAJOR, \[\).*\(\])\)|\1$major\2|" \
+ -e "s|\(AC_SUBST(SWITCH_VERSION_MINOR, \[\).*\(\])\)|\1$minor\2|" \
+ -e "s|\(AC_SUBST(SWITCH_VERSION_MICRO, \[\).*\(\])\)|\1$micro\2|" \
+ -e "s|\(AC_SUBST(SWITCH_VERSION_REVISION, \[\).*\(\])\)|\1$rev\2|" \
+ -i configure.in
+
+if [ -n "$rev" ]; then
+ sed -e "s|#\(AC_SUBST(SWITCH_VERSION_REVISION\)|\1|" \
+ -i configure.in
+fi
+
+git add configure.in
+git commit -m "Release freeswitch-$ver"
+git tag -a -m "freeswitch-$ver release" v$ver
+
+git clone $src_repo $dst_dir
+if [ -n "$stash_saved" ]; then
+ git stash pop
+fi
+
+cd $dst_dir
+
</ins><span class="cx"> ./bootstrap.sh
</span><del>-rm -rf `find . -name .svn`
</del><span class="cx"> mv bootstrap.sh rebootstrap.sh
</span><span class="cx"> rm -f docs/AUTHORS
</span><span class="cx"> rm -f docs/COPYING
</span><span class="cx"> rm -f docs/ChangeLog
</span><ins>+rm -rf .git
</ins><span class="cx"> cd ..
</span><del>-tar -czvf freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO.tar.gz freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO/
-tar -cjvf freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO.tar.bz2 freeswitch-$SWITCH_VERSION_MAJOR.$SWITCH_VERSION_MINOR.$NEW_MICRO/
</del><ins>+tar -czvf $dst_name.tar.gz $dst_dir
+tar -cjvf $dst_name.tar.bz2 $dst_dir
+rm -rf $dst_dir
+
</ins></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>