Boost logo

Boost-Commit :

From: ghost_at_[hidden]
Date: 2008-08-25 15:05:39


Author: vladimir_prus
Date: 2008-08-25 15:05:39 EDT (Mon, 25 Aug 2008)
New Revision: 48388
URL: http://svn.boost.org/trac/boost/changeset/48388

Log:
Actually unbreak the 'make' test
Added:
   trunk/tools/build/v2/example/make/foo.py (contents, props changed)
Text files modified:
   trunk/tools/build/v2/example/make/Jamroot | 20 ++++----------------
   trunk/tools/build/v2/test/example_make.py | 2 +-
   2 files changed, 5 insertions(+), 17 deletions(-)

Modified: trunk/tools/build/v2/example/make/Jamroot
==============================================================================
--- trunk/tools/build/v2/example/make/Jamroot (original)
+++ trunk/tools/build/v2/example/make/Jamroot 2008-08-25 15:05:39 EDT (Mon, 25 Aug 2008)
@@ -1,23 +1,11 @@
 
-import notfile ;
-import common ;
+import toolset : flags ;
 
-exe main : main.cpp ;
-
-# Create 'main.cpp' from 'main.cpp.pro' using action
-# 'do-something' defined below.
-#
+path-constant HERE : . ;
 make main.cpp : main_cpp.pro : @do-something ;
 
-# In this example, we'll just copy a file.
-# Need to find out the name of a command to copy a file.
-CP = [ common.copy-command ] ;
-
-# The action itself.
-# The 'CP' variable is defined below
-# $(>) is source
-# $(<) is target
+flags do-something PYTHON : <python.interpreter> ;
 actions do-something
 {
- $(CP) $(>) $(<)
+ $(PYTHON:E=python) $(HERE)/foo.py $(>) $(<)
 }

Added: trunk/tools/build/v2/example/make/foo.py
==============================================================================
--- (empty file)
+++ trunk/tools/build/v2/example/make/foo.py 2008-08-25 15:05:39 EDT (Mon, 25 Aug 2008)
@@ -0,0 +1,3 @@
+
+import sys
+open(sys.argv[2], "w").write(open(sys.argv[1]).read())
\ No newline at end of file

Modified: trunk/tools/build/v2/test/example_make.py
==============================================================================
--- trunk/tools/build/v2/test/example_make.py (original)
+++ trunk/tools/build/v2/test/example_make.py 2008-08-25 15:05:39 EDT (Mon, 25 Aug 2008)
@@ -15,6 +15,6 @@
 
 t.run_build_system()
 
-t.expect_addition(["bin/$toolset/debug/main.exe"])
+t.expect_addition(["bin/$toolset/debug/main.cpp"])
                    
 t.cleanup()


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