[Boost-commit] svn:boost r74324 - trunk/libs/spirit/example/qi/compiler_tutorial

Subject: [Boost-commit] svn:boost r74324 - trunk/libs/spirit/example/qi/compiler_tutorial
From: joel_at_[hidden]
Date: 2011-09-08 21:25:34

Author: djowel
Date: 2011-09-08 21:25:33 EDT (Thu, 08 Sep 2011)
New Revision: 74324
URL: http://svn.boost.org/trac/boost/changeset/74324

Log:
adding the target location in the project requirements to generate the exe in the same directory.
Text files modified: 
   trunk/libs/spirit/example/qi/compiler_tutorial/Jamfile |    59 ++++++++------------------------------- 
   1 files changed, 12 insertions(+), 47 deletions(-)

Modified: trunk/libs/spirit/example/qi/compiler_tutorial/Jamfile
==============================================================================
--- trunk/libs/spirit/example/qi/compiler_tutorial/Jamfile	(original)
+++ trunk/libs/spirit/example/qi/compiler_tutorial/Jamfile	2011-09-08 21:25:33 EDT (Thu, 08 Sep 2011)
@@ -8,41 +8,19 @@
     : requirements
         <toolset>gcc:<c++-template-depth>300
         <toolset>darwin:<cxxflags>-ftemplate-depth-300
-    :
+        <variant>release:<location>"bin/release"
+        <variant>debug:<location>"bin/debug"
     :
     ;
 
 import modules ;
 
-exe calc1 : calc1.cpp
-:   <variant>release:<location>"bin/release"
-    <variant>debug:<location>"bin/debug"
-;
-
-exe calc2 : calc2.cpp
-:   <variant>release:<location>"bin/release"
-    <variant>debug:<location>"bin/debug"
-;
-
-exe calc3 : calc3.cpp
-:   <variant>release:<location>"bin/release"
-    <variant>debug:<location>"bin/debug"
-;
-
-exe calc4 : calc4.cpp
-:   <variant>release:<location>"bin/release"
-    <variant>debug:<location>"bin/debug"
-;
-
-exe calc5 : calc5.cpp
-:   <variant>release:<location>"bin/release"
-    <variant>debug:<location>"bin/debug"
-;
-
-exe calc6 : calc6.cpp
-:   <variant>release:<location>"bin/release"
-    <variant>debug:<location>"bin/debug"
-;
+exe calc1 : calc1.cpp ;
+exe calc2 : calc2.cpp ;
+exe calc3 : calc3.cpp ;
+exe calc4 : calc4.cpp ;
+exe calc5 : calc5.cpp ;
+exe calc6 : calc6.cpp ;
 
 exe calc7 :
     calc7/vm.cpp
@@ -50,8 +28,6 @@
     calc7/expression.cpp
     calc7/statement.cpp
     calc7/main.cpp
-:   <variant>release:<location>"bin/release"
-    <variant>debug:<location>"bin/debug"
 ;
 
 exe calc8 :
@@ -60,8 +36,6 @@
     calc8/expression.cpp
     calc8/statement.cpp
     calc8/main.cpp
-:   <variant>release:<location>"bin/release"
-    <variant>debug:<location>"bin/debug"
 ;
 
 exe mini_c :
@@ -71,8 +45,6 @@
     mini_c/statement.cpp
     mini_c/function.cpp
     mini_c/main.cpp
-:   <variant>release:<location>"bin/release"
-    <variant>debug:<location>"bin/debug"
 ;
 
 exe conjure1 :
@@ -82,8 +54,6 @@
     conjure1/statement.cpp
     conjure1/function.cpp
     conjure1/main.cpp
-:   <variant>release:<location>"bin/release"
-    <variant>debug:<location>"bin/debug"
 ;
 
 exe conjure2 :
@@ -94,15 +64,13 @@
     conjure2/main.cpp
     conjure2/statement.cpp
     conjure2/vm.cpp
-:   <variant>release:<location>"bin/release"
-    <variant>debug:<location>"bin/debug"
-    ;
+;
 
 #==============================================================================
 # conjure3 and above require LLVM. Make sure you provide the
 # LLVM_PATH in your bjam invocation. E.g.:
 #
-#     bjam msvc -sLLVM_PATH=C:/dev/llvm conjure3
+#     bjam -sLLVM_PATH=C:/dev/llvm conjure3
 #
 #==============================================================================
 
@@ -127,25 +95,22 @@
     rule build_exe_1 ( target-name : sources + : requirements * )
     {
         local llvm_lib ;
-        local target_location ;
         if <variant>debug in $(requirements)
         {
             llvm_lib = $(llvm_debug_libs) ;
-            target_location = "bin/debug" ;
         }
         else
         {
             llvm_lib = $(llvm_release_libs) ;
-            target_location = "bin/release" ;
         }
 
         exe $(target-name)
-        :   $(sources) $(llvm_lib)
+        :   $(sources)
+            $(llvm_lib)
         :   $(requirements)
             <toolset>msvc
             <include>$(LLVM_PATH)/include
             <linkflags>$(llvm_linker_flags)
-            <location>$(target_location)
         ;
     }