<!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][17183] </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=17183">17183</a></dd>
<dt>Author</dt> <dd>mike</dd>
<dt>Date</dt> <dd>2010-04-01 23:07:02 -0500 (Thu, 01 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>update makefile and version generation to work with git working copy too</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkMakefileam">freeswitch/trunk/Makefile.am</a></li>
<li><a href="#freeswitchtrunkconfigurein">freeswitch/trunk/configure.in</a></li>
<li><a href="#freeswitchtrunkscriptstagscriptsh">freeswitch/trunk/scripts/tagscript.sh</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#freeswitchtrunkscriptstagscriptsh">freeswitch/trunk/scripts/tagscript.sh</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/Makefile.am (17182 => 17183)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/Makefile.am 2010-04-02 02:19:15 UTC (rev 17182)
+++ freeswitch/trunk/Makefile.am 2010-04-02 04:07:02 UTC (rev 17183)
</span><span class="lines">@@ -349,7 +349,21 @@
</span><span class="cx"> cat src/include/switch_version.h.in > src/include/switch_version.h ; \
</span><span class="cx"> touch .version ; \
</span><span class="cx"> else \
</span><del>- version=`svnversion . -n || echo hacked` ; \
</del><ins>+ if [ -d .git ] ; then \
+ version=`git log --format="%h %ci" -1 HEAD | head -1 || echo hacked` ; \
+ if [ "x$$version" == "xhacked" ] ; then \
+ version="hacked-`date -u +%Y%m%dT%H%M%SZ`" ; \
+ else \
+ version="git-$$version" ; \
+ fi ;\
+ else \
+ version=`svnversion . -n || echo hacked` ; \
+ if [ "x$$version" == "xhacked" ] ; then \
+ version="hacked-`date -u +%Y%m%dT%H%M%SZ`" ; \
+ else \
+ version="svn-$$version" ; \
+ fi ;\
+ fi ; \
</ins><span class="cx"> oldversion=`cat .version 2>/dev/null || echo "0"` ; \
</span><span class="cx"> if test "$$oldversion" != "$$version" || test $$force = 1 ; then \
</span><span class="cx"> cat src/include/switch_version.h.in | sed "s/@SWITCH_VERSION_REVISION@/$$version/g" > src/include/switch_version.h ; \
</span><span class="lines">@@ -437,23 +451,29 @@
</span><span class="cx"> test -d $(DESTDIR)$(sysconfdir) || $(MAKE) samples-conf
</span><span class="cx"> test -d $(DESTDIR)$(htdocsdir) || $(MAKE) samples-htdocs
</span><span class="cx">
</span><del>-is-svn:
- @if [ ! -d .svn ] ; then \
</del><ins>+is-scm:
+ @if [ ! -d .svn -a ! -d .git ] ; then \
</ins><span class="cx"> echo ; echo ; \
</span><del>- echo "**************************************************************************************************" ; \
- echo "You can not update a release tarball or without a svn working copy, please checkout fresh from svn" ; \
- echo "**************************************************************************************************" ; \
</del><ins>+ echo "*****************************************************************************************************" ; \
+ echo "You can not update a release tarball or without a git or svn working copy please clone our git tree: " ; \
+ echo "git clone git://git.freeswitch.org/freeswitch.git " ; \
+ echo "or check out our read only svn mirror: " ; \
+ echo "svn checkout http://svn.freeswitch.org/svn/freeswitch/trunk " ; \
+ echo "*****************************************************************************************************" ; \
</ins><span class="cx"> echo ; echo ; \
</span><span class="cx"> exit 1; \
</span><span class="cx"> fi
</span><span class="cx">
</span><del>-update: is-svn
</del><ins>+update: is-scm
</ins><span class="cx"> @if test -d .svn ; then \
</span><span class="cx"> test ! -f .version || rm -f .version ; \
</span><span class="cx"> echo Updating... ; \
</span><span class="cx"> svn update ; \
</span><ins>+ elif test -d .git ; then \
+ echo "Pulling updates..." ; \
+ git pull ; \
</ins><span class="cx"> else \
</span><del>- echo "This source directory is not an svn working copy" ; \
</del><ins>+ echo "This source directory is not a git tree or svn working copy" ; \
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> .nodepends:
</span><span class="lines">@@ -483,18 +503,18 @@
</span><span class="cx">
</span><span class="cx"> everything: install
</span><span class="cx">
</span><del>-up: is-svn clean
- svn update
</del><ins>+up: is-scm clean
+ $(MAKE) update
</ins><span class="cx"> $(MAKE) -j core
</span><span class="cx"> $(MAKE) -j modules
</span><span class="cx"> $(MAKE) install
</span><span class="cx">
</span><del>-sync: is-svn
- svn update
</del><ins>+sync: is-scm
+ $(MAKE) update
</ins><span class="cx"> $(MAKE) install
</span><span class="cx">
</span><del>-speedy-sync: is-svn
- svn update
</del><ins>+speedy-sync: is-scm
+ $(MAKE) update
</ins><span class="cx"> $(MAKE) -j install
</span><span class="cx">
</span><span class="cx"> libs/openzap/Makefile:
</span><span class="lines">@@ -570,15 +590,15 @@
</span><span class="cx"> @echo
</span><span class="cx"> @echo http://www.cluecon.com
</span><span class="cx"> @sleep 5
</span><del>-current: cluecon is-svn update-clean
- svn update
</del><ins>+current: cluecon update-clean is-scm
+ $(MAKE) update
</ins><span class="cx"> $(MAKE) all
</span><span class="cx"> $(MAKE) install
</span><span class="cx">
</span><span class="cx"> installall: current
</span><span class="cx">
</span><del>-speedy-current: is-svn update-clean
- svn update
</del><ins>+speedy-current: update-clean is-scm
+ $(MAKE) update
</ins><span class="cx"> $(MAKE) speedy-sure
</span><span class="cx"> $(MAKE) install
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkconfigurein"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/configure.in (17182 => 17183)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/configure.in 2010-04-02 02:19:15 UTC (rev 17182)
+++ freeswitch/trunk/configure.in 2010-04-02 04:07:02 UTC (rev 17183)
</span><span class="lines">@@ -3,11 +3,11 @@
</span><span class="cx">
</span><span class="cx"> # Must change all of the below together
</span><span class="cx"> # For a release, set revision for that tagged release as well and uncomment
</span><del>-AC_INIT([freeswitch], [1.0.trunk], BUG-REPORT-ADDRESS)
</del><ins>+AC_INIT([freeswitch], [1.0.head], BUG-REPORT-ADDRESS)
</ins><span class="cx"> AC_SUBST(SWITCH_VERSION_MAJOR, [1])
</span><span class="cx"> AC_SUBST(SWITCH_VERSION_MINOR, [0])
</span><del>-AC_SUBST(SWITCH_VERSION_MICRO, [trunk])
-#AC_SUBST(SWITCH_VERSION_REVISION, [svn-revision-here])
</del><ins>+AC_SUBST(SWITCH_VERSION_MICRO, [head])
+#AC_SUBST(SWITCH_VERSION_REVISION, [])
</ins><span class="cx">
</span><span class="cx"> AC_CONFIG_FILES([src/include/switch_version.h.in:src/include/switch_version.h.template])
</span><span class="cx"> AC_CONFIG_FILES([.version:.version.in])
</span></span></pre></div>
<a id="freeswitchtrunkscriptstagscriptsh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/scripts/tagscript.sh (17182 => 17183)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/scripts/tagscript.sh 2010-04-02 02:19:15 UTC (rev 17182)
+++ freeswitch/trunk/scripts/tagscript.sh 2010-04-02 04:07:02 UTC (rev 17183)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> sed -e "s|\(AC_SUBST(SWITCH_VERSION_MAJOR, \[\).*\(\])\)|\1$major\2|" \
</span><span class="cx"> -e "s|\(AC_SUBST(SWITCH_VERSION_MINOR, \[\).*\(\])\)|\1$minor\2|" \
</span><span class="cx"> -e "s|\(AC_SUBST(SWITCH_VERSION_MICRO, \[\).*\(\])\)|\1$micro\2|" \
</span><ins>+ -e "s|\(AC_INIT(\[freeswitch\], \[\).*\(\], BUG-REPORT-ADDRESS)\)|\1$major.$minor.$micro\2|" \
</ins><span class="cx"> -i configure.in
</span><span class="cx">
</span><span class="cx"> if [ -n "$rev" ]; then
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>