[Vm-dev] Notes from compiling on ARM / Fedora 18 (OLPC XO-4)

Bert Freudenberg bert at freudenbergs.de
Thu Nov 8 14:50:43 UTC 2012


On 2012-11-08, at 02:43, "David T. Lewis" <lewis at mail.msen.com> wrote:

> 
> On Wed, Nov 07, 2012 at 02:02:37PM -0500, David T. Lewis wrote:
>> On Wed, Nov 07, 2012 at 05:07:41PM +0100, Bert Freudenberg wrote:
>>> 
>>> * please fix punctuation in "4.10.2-"
>> 
>> It's not missing punctuation, it's a missing Subversion rev number that should
>> be getting generated during the cmake/configure phase.
>> 
>> 
>>> ==================
>>> 
>>> Why is it installing in 
>>> 
>>> 	/usr/local/lib/squeak/4.10.2-/
>>> 
>>> instead of
>>> 
>>> 	/usr/local/lib/squeak/4.10-2/
>>> 
>>> ?
>>> 
>>> ===================
>> 
>> 
>> It should be installing in something like /usr/local/lib/squeak/4.10.2-nnnn/
>> where nnnn is the Subversion rev number. This gets figured out during the
>> build based on the SVN control files, and it's stored in a file somewhere (in
>> platforms/unix/cmake I think). If the platforms source tree does not have either
>> the SVN control files or the generated file, it will not have the "nnnn" part
>> of the version name.
> 
> Following up on this, the missing "nnnn" version number comes from the file
> platforms/unix/svnversion. This file is not itself under version control, but
> is created and used by platforms/unix/cmake/configure. If the svnversion
> file is not present, and if the .svn control files are also not present, then
> you would end up with a version tag such as "4.10.2-" when something like
> "4.10.2-2616" was expected.
> 
> Conclusion: platforms/unix/cmake/configure must be run at least one time
> on a platforms tree that has the ./svn control files. Once that has been
> done, the platforms/unix/svnversion file will be present.
> 
> Dave

Thanks for the correction. I did of course run configure. The file was not created. Going to figure out why ...

I see. It tests for "${unix}/../.svn" which I don't have because I only check out the unix and cross platform trees, not all. I pasted my patches below.

Works fine now.

- Bert -


Index: ../platforms/unix/cmake/configure
===================================================================
--- ../platforms/unix/cmake/configure	(revision 2619)
+++ ../platforms/unix/cmake/configure	(working copy)
@@ -90,7 +90,7 @@
 
 vmmversion="`tr '\015 ' '\012\012' < \"${interp_h}\" | sed '1,/VMMaker/d;q'`"
 
-if test -d "${unix}/../.svn"; then
+if test -d "${unix}/.svn"; then
     svnversion=`svn info "${unix}/ChangeLog" | fgrep Revision: | awk '{print $2}'`
     echo "${svnversion}" > "${unix}/svnversion"
 else
Index: ../platforms/unix/CMakeLists.txt
===================================================================
--- ../platforms/unix/CMakeLists.txt	(revision 2619)
+++ ../platforms/unix/CMakeLists.txt	(working copy)
@@ -2,7 +2,7 @@
 # 
 # Last edited: 2012-09-16 21:19:57 by piumarta on linux64
 
-PROJECT (squeak)
+PROJECT (squeak C)
 
 CMAKE_MINIMUM_REQUIRED (VERSION 2.6.2)
 



More information about the Vm-dev mailing list