From: lists.drrngrvy_at_[hidden]
Date: 2008-03-26 12:12:38
Author: drrngrvy
Date: 2008-03-26 12:12:38 EDT (Wed, 26 Mar 2008)
New Revision: 43869
URL: http://svn.boost.org/trac/boost/changeset/43869
Log:
Minor fix to project-root.jam
Text files modified:
sandbox/SOC/2007/cgi/trunk/project-root.jam | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
Modified: sandbox/SOC/2007/cgi/trunk/project-root.jam
==============================================================================
--- sandbox/SOC/2007/cgi/trunk/project-root.jam (original)
+++ sandbox/SOC/2007/cgi/trunk/project-root.jam 2008-03-26 12:12:38 EDT (Wed, 26 Mar 2008)
@@ -1,11 +1,8 @@
import os ;
import modules ;
-path-constant BOOST_ROOT : [ os.environ BOOST_ROOT ] ;
path-constant BOOST_BUILD_PATH : [ os.environ BOOST_BUILD_PATH ] ;
-path-constant PROJECT_ROOT : . ;
-
path-constant top : . ;
path-constant include-dir : /usr/local/include ;
path-constant boost-root : [ os.environ BOOST_ROOT ] ;
@@ -27,27 +24,30 @@
#
# Note that the command line will override the environment variable!
#############################################################################
-local rule get-bin-dir ( bin-name : envvar )
+local rule get-bin-dir ( protocol )
{
- local bin-dir = [ MATCH "^--$(bin-name)=(.*)" : [ modules.peek : ARGV ] ] ;
+ local bin-dir = [ MATCH "^--$(protocol:L)-bin=(.*)" : [ modules.peek : ARGV ] ] ;
if $(bin-dir)
{
return $(bin-dir) ;
}
else
{
- bin-dir = [ os.environ $(envvar) ] ;
+ bin-dir = [ os.environ "BOOST_$(protocol:U)_BIN_PATH" ] ;
if $(bin-dir)
{
return $(bin-dir) ;
}
- return $(top)/$(bin-name) ;
+ else
+ {
+ return $(top)/$(protocol:L)"-bin" ;
+ }
}
}
-path-constant cgi-bin : [ get-bin-dir "cgi-bin" : "BOOST_CGI_BIN_PATH" ] ;
-path-constant fcgi-bin : [ get-bin-dir "fcgi-bin" : "BOOST_FCGI_BIN_PATH" ] ;
-path-constant scgi-bin : [ get-bin-dir "scgi-bin" : "BOOST_SCGI_BIN_PATH" ] ;
+path-constant cgi-bin : [ get-bin-dir "cgi" ] ;
+path-constant fcgi-bin : [ get-bin-dir "fcgi" ] ;
+path-constant scgi-bin : [ get-bin-dir "scgi" ] ;
use-project /boost/ : $(boost-root) ;
@@ -60,7 +60,6 @@
: requirements
<include>$(boost-root)
<include>$(top)
- #<include>C:\cc\src\ctemplate\windows
<define>_CRT_SECURE_NO_WARNINGS
<define>_SCL_SECURE_NO_WARNINGS
;