[Valgrind-valkyrie-dev] valkyrie: r524 - in trunk: . src

[<sv...@va...>]

Author: sewardj
Date: 2010-10-20 13:21:31 +0100 (Wed, 20 Oct 2010)
New Revision: 524

Log:
Finalise for 2.0.0.


Modified:
   trunk/INSTALL
   trunk/README
   trunk/src/src.pro
   trunk/vk_config.pri


Modified: trunk/INSTALL
===================================================================
--- trunk/INSTALL	2010-10-20 11:54:25 UTC (rev 523)
+++ trunk/INSTALL	2010-10-20 12:21:31 UTC (rev 524)
@@ -1,8 +1,11 @@
 Introduction
 ============
 
-Valkyrie uses qmake to be built.
-qmake is part of a Qt distribution. 
+Valkyrie is a Qt4 application and uses qmake as part of the build
+process.  qmake is part of your Qt4 installation.  You should check
+that you have the correct qmake version, by running "qmake --version",
+because in some cases the installed "qmake" is actually a Qt3 version.
+It may be that the version you need is installed as "qmake-qt4".
 
 If you want to play around with the build config, check out:
 valyrie.pro    - main qmake project file
@@ -12,37 +15,36 @@
 In particular, you may want to edit the following:
 - src/src.pro:
   SOURCES += /usr/share/qtcreator/gdbmacros/gdbmacros.cpp
-Note: Qt want this in order to create lots of debug info. If you're not debugging, then you probably don't want this. Is also rather nasty to hardcode the path in like this, but I don't know of a good workaround...
 
+  Note: Qt wants this in order to create lots of debug info. If you're
+  not debugging, then you probably don't want this. Is also rather
+  nasty to hardcode the path in like this, but I don't know of a good
+  workaround...
+
 - vk_config.pri:
   CONFIG           += silent      # make --quiet
   CONFIG           += debug       # release/debug
 
 
 
-*) Build and run without "installing"
-=====================================
+Build and run without "installing"
+==================================
 
- qmake
- make
+qmake   # or qmake-qt4, see comments above
+make
 
-
 The valkyrie binary is put here: ./bin/valkyrie
 make clean to clean up and start again
-make distclean to _really_ clean up and start again.
+make distclean to also remove all the Makefiles created by qmake.
 
 
 
-*) Build and install
-=====================
+Build and install
+=================
 
- qmake PREFIX=<your_dir>
- make
- make install
+qmake PREFIX=/path/to/installation/tree
+make
+make install
 
 
 That's it!
-
-Note: you may come across INSTALL_ROOT in src.pro
- - it seems to be a qt special which can't easily(?) be set, hence the PREFIX solution.
-

Modified: trunk/README
===================================================================
--- trunk/README	2010-10-20 11:54:25 UTC (rev 523)
+++ trunk/README	2010-10-20 12:21:31 UTC (rev 524)
@@ -25,8 +25,8 @@
 
 Requirements
 ~~~~~~~~~~~~
-Qt (>= not_sure, perhaps 4.6) <http://www.trolltech.com>
-Valgrind (>=v3.6.0) <http://www.valgrind.org>
+Qt (version 4.6 or later, earlier 4.x might also work) <http://www.trolltech.com>
+Valgrind (3.6.x series) <http://www.valgrind.org>
 
 
 Executive Summary
@@ -43,7 +43,7 @@
 To get started, simply invoke valkyrie thusly:
   valkyrie ./myprog
 
-This will transparently call Valgrind and display it's output.
+This will transparently call Valgrind and display its output.
 For more help on Valkyrie, use the built-in Help->Handbook.
 
 

Modified: trunk/src/src.pro
===================================================================
--- trunk/src/src.pro	2010-10-20 11:54:25 UTC (rev 523)
+++ trunk/src/src.pro	2010-10-20 12:21:31 UTC (rev 524)
@@ -2,7 +2,7 @@
 # Valkyrie qmake project file: build application
 #
 # Note: By default PREFIX="/usr/local". To change this simply do:
-# qmake "PREFIX=<your_dir>"
+# qmake "PREFIX=/path/to/install/tree"
 ######################################################################
 
 

Modified: trunk/vk_config.pri
===================================================================
--- trunk/vk_config.pri	2010-10-20 11:54:25 UTC (rev 523)
+++ trunk/vk_config.pri	2010-10-20 12:21:31 UTC (rev 524)
@@ -6,7 +6,7 @@
 ######################################################################
 
 NAME    = valkyrie
-VERSION = 2.0.0-SVN
+VERSION = 2.0.0
 PACKAGE = $$NAME-$$VERSION
 
 ######################################################################
@@ -37,5 +37,5 @@
 CONFIG           += qt
 CONFIG           += warn_on     # compiler should issue max warnings
 CONFIG           += silent      # make --quiet
-CONFIG           += debug       # release/debug
+CONFIG           += release     # release/debug