[Vm-dev] [commit][2782] broaden search for . svn when checking whether sources are from repo or archive

[commits at squeakvm.org]

Revision: 2782
Author:   piumarta
Date:     2013-09-09 13:31:49 -0700 (Mon, 09 Sep 2013)
Log Message:
-----------
broaden search for .svn when checking whether sources are from repo or archive

Modified Paths:
--------------
    trunk/platforms/unix/ChangeLog
    trunk/platforms/unix/cmake/configure

Modified: trunk/platforms/unix/ChangeLog
===================================================================
--- trunk/platforms/unix/ChangeLog	2013-08-30 03:47:23 UTC (rev 2781)
+++ trunk/platforms/unix/ChangeLog	2013-09-09 20:31:49 UTC (rev 2782)
@@ -1,3 +1,8 @@
+2013-09-09  Ian Piumarta  <com -dot- gmail -at- piumarta (backwards)>
+
+	* cmake/configure (svnversion): Look for evidence of checked out
+	sources in both "squeak/trunk/platforms" and "squeak/trunk".
+
 2013-08-19  Ian Piumarta  <com -dot- gmail -at- piumarta (backwards)>
 
 	* doc/README.FastBitBlt: Added instructions for compiling on ARM

Modified: trunk/platforms/unix/cmake/configure
===================================================================
--- trunk/platforms/unix/cmake/configure	2013-08-30 03:47:23 UTC (rev 2781)
+++ trunk/platforms/unix/cmake/configure	2013-09-09 20:31:49 UTC (rev 2782)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Last edited: 2013-08-11 23:16:05 by piumarta on emilia
+# Last edited: 2013-09-09 13:29:13 by piumarta on emilia
 
 RELEASE_TAG=""
 
@@ -91,7 +91,7 @@
 
 vmmversion="`tr '\015 ' '\012\012' < \"${interp_h}\" | sed '1,/VMMaker/d;q'`"
 
-if test -d "${unix}/../.svn"; then
+if test -d "${unix}/../.svn" -o -d "${unix}/../../.svn"; then
     svnversion=`svn info "${unix}/ChangeLog" | fgrep Revision: | awk '{print $2}'`
     echo "${svnversion}" > "${unix}/svnversion"
 else