|
|
Boost-Commit : |
From: jurko.gospodnetic_at_[hidden]
Date: 2008-01-05 15:48:51
Author: jurko
Date: 2008-01-05 15:48:50 EST (Sat, 05 Jan 2008)
New Revision: 42498
URL: http://svn.boost.org/trac/boost/changeset/42498
Log:
Renamed some Jamfile and project-root.jam references to Jamfile.jam and Jamroot.jam respectively.
Text files modified:
trunk/tools/build/v2/build/project.jam | 2 +-
trunk/tools/build/v2/doc/src/extending.xml | 40 ++++++++++++++++++++++------------------
trunk/tools/build/v2/doc/src/faq.xml | 8 ++++----
trunk/tools/build/v2/test/project_test3.py | 2 +-
4 files changed, 28 insertions(+), 24 deletions(-)
Modified: trunk/tools/build/v2/build/project.jam
==============================================================================
--- trunk/tools/build/v2/build/project.jam (original)
+++ trunk/tools/build/v2/build/project.jam 2008-01-05 15:48:50 EST (Sat, 05 Jan 2008)
@@ -109,7 +109,7 @@
if ! $(found)
{
ECHO "error: Could not find parent for project at '$(location)'" ;
- ECHO "error: Did not find Jamfile or project-root.jam in any parent directory." ;
+ ECHO "error: Did not find Jamfile.jam or Jamroot.jam in any parent directory." ;
EXIT ;
}
Modified: trunk/tools/build/v2/doc/src/extending.xml
==============================================================================
--- trunk/tools/build/v2/doc/src/extending.xml (original)
+++ trunk/tools/build/v2/doc/src/extending.xml 2008-01-05 15:48:50 EST (Sat, 05 Jan 2008)
@@ -94,21 +94,24 @@
-->
</para>
- <para>Now, we're ready to tie it all together. Put all the code above in file
+ <para>
+ Now, we're ready to tie it all together. Put all the code above in file
<filename>verbatim.jam</filename>, add <code>import verbatim ;</code> to
- <filename>project-root.jam</filename>, and it's possible to write the
- following in Jamfile:
+ <filename>Jamroot.jam</filename>, and it's possible to write the following
+ in your Jamfile:
</para>
<programlisting>
exe codegen : codegen.cpp class_template.verbatim usage.verbatim ;
</programlisting>
- <para>The listed verbatim files will be automatically converted into C++,
- compiled and then linked to the codegen executable.
+ <para>
+ The listed verbatim files will be automatically converted into C++ source
+ files, compiled and then linked to the codegen executable.
</para>
- <para>In subsequent sections, we will extend this example, and review all the
+ <para>
+ In subsequent sections, we will extend this example, and review all the
mechanisms in detail. The complete code is available in the
<filename>example/customization</filename> directory.
</para>
@@ -721,22 +724,23 @@
in Jamfiles, which will convert source to the OBFUSCATED_CPP type.
</para>
- <para>The second way is to write a wrapper rule that calls
- any of the existing rules. For example, suppose you have only one library per
- directory and want all cpp files in the directory to be compiled into that library. You
- can achieve this effect with:
+ <para>
+ The second way is to write a wrapper rule that calls any of the existing
+ rules. For example, suppose you have only one library per directory and
+ want all cpp files in the directory to be compiled into that library. You
+ can achieve this effect using:
<programlisting>
lib codegen : [ glob *.cpp ] ;
</programlisting>
- but if you want to make it even simpler, you could add the following
- definition to the <filename>project-root.jam</filename> file:
+ If you want to make it even simpler, you could add the following
+ definition to the <filename>Jamroot.jam</filename> file:
<programlisting>
rule glib ( name : extra-sources * : requirements * )
{
lib $(name) : [ glob *.cpp ] $(extra-sources) : $(requirements) ;
}
</programlisting>
-which would allow you to reduce the Jamfile to
+ allowing you to reduce the Jamfile to just
<programlisting>
glib codegen ;
</programlisting>
@@ -755,11 +759,11 @@
<title>Toolset modules</title>
- <para>If your extensions will be used only on one project, they can be
- placed in a separate <filename>.jam</filename> file that will be
- imported by your <filename>project-root.jam</filename>. If the
- extensions will be used on many projects, users will thank you for
- a finishing touch.
+ <para>
+ If your extensions will be used only on one project, they can be placed in
+ a separate <filename>.jam</filename> file and imported by your
+ <filename>Jamroot.jam</filename>. If the extensions will be used on many
+ projects, users will thank you for a finishing touch.
</para>
<para>The <code>using</code> rule provides a standard mechanism
Modified: trunk/tools/build/v2/doc/src/faq.xml
==============================================================================
--- trunk/tools/build/v2/doc/src/faq.xml (original)
+++ trunk/tools/build/v2/doc/src/faq.xml 2008-01-05 15:48:50 EST (Sat, 05 Jan 2008)
@@ -216,12 +216,12 @@
</section>
<section>
- <title>How to get the project-root location?
+ <title>How to get the project root (a.k.a. Jamroot.jam) location?
</title>
- <para>You might want to use the location of the project-root in your
- Jamfiles. To do it, you'd need to declare path constant in your
- project-root.jam:
+ <para>
+ You might want to use your project's root location in your Jamfiles. To
+ access it just declare a path constant in your Jamroot.jam file using:
<programlisting>
path-constant TOP : . ;
</programlisting>
Modified: trunk/tools/build/v2/test/project_test3.py
==============================================================================
--- trunk/tools/build/v2/test/project_test3.py (original)
+++ trunk/tools/build/v2/test/project_test3.py 2008-01-05 15:48:50 EST (Sat, 05 Jan 2008)
@@ -16,7 +16,7 @@
os.remove("project-root.jam")
t.run_build_system(status=1, stdout=
"""error: Could not find parent for project at '.'
-error: Did not find Jamfile or project-root.jam in any parent directory.
+error: Did not find Jamfile.jam or Jamroot.jam in any parent directory.
""")
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk