Author: piumarta Date: 2009-09-16 14:45:44 -0700 (Wed, 16 Sep 2009) New Revision: 2135

Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/cmake/configure Log: save repo version in unix/svnversion to be read during configure of non-repo build

Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-09-16 21:22:43 UTC (rev 2134) +++ trunk/platforms/unix/ChangeLog 2009-09-16 21:45:44 UTC (rev 2135) @@ -1,5 +1,9 @@ 2009-09-16 piumarta@ubuntu.piumarta.com

+ * cmake/configure: Read svnversion from unix/svnversion if not + building from a repo, otherwise generate via svn info and update + unix/svnversion. + * src/vm/interp.h: Defines VMMAKER_VERSION as per VMM-138.

2009-09-16 Ian Piumarta <com -dot- gmail -at- piumarta (backwards)>

Modified: trunk/platforms/unix/cmake/configure =================================================================== --- trunk/platforms/unix/cmake/configure 2009-09-16 21:22:43 UTC (rev 2134) +++ trunk/platforms/unix/cmake/configure 2009-09-16 21:45:44 UTC (rev 2135) @@ -1,6 +1,6 @@ #!/bin/sh

-# Last edited: 2009-09-16 14:06:55 by piumarta on emilia-2.local +# Last edited: 2009-09-16 14:37:45 by piumarta on ubuntu.piumarta.com

RELEASE_TAG=""

@@ -88,8 +88,14 @@ fi

vmmversion="`tr '\015 ' '\012\012' < "${interp_h}" | sed '1,/VMMaker/d;q'`" -svnversion=`svn info "${unix}/ChangeLog" | fgrep Revision: | awk '{print $2}'`

+if test -d ${unix}/.svn; then + svnversion=`svn info "${unix}/ChangeLog" | fgrep Revision: | awk '{print $2}'` + echo "${svnversion}" > "${unix}/svnversion" +else + svnversion=`cat "${unix}/svnversion"` +fi + VM_VERSION="${vmmversion}-${svnversion}${RELEASE_TAG}"

if ${stop}; then