浏览代码

Add variant/compiler part to the names of installed targets.

[SVN r26419]
Vladimir Prus 21 年之前
父节点
当前提交
043e30799e
共有 2 个文件被更改,包括 17 次插入2 次删除
  1. 16 1
      Jamfile.v2
  2. 1 1
      tools/build

+ 16 - 1
Jamfile.v2

@@ -66,6 +66,11 @@ rule libraries-to-install ( existing-libraries * )
 
 ARGV = [ modules.peek : ARGV ] ;
 
+# what kind of layout are we doing?
+local layout = [ MATCH "^--layout=(.*)" : $(ARGV) ] ;
+layout ?= versioned ;
+layout-$(layout) = true ;
+
 # possible stage only location
 local stage-locate = [ MATCH "^--stagedir=(.*)" : $(ARGV) ] ;
 stage-locate ?= stage ;
@@ -109,9 +114,19 @@ PYTHON_ROOT ?= $(python-root) ;
 libraries = [ MATCH .*libs/(.*)/build/.* : [ glob libs/*/build/Jamfile.v2 ] ] ;
 libraries = [ libraries-to-install $(libraries) ] ;
 
+local rename-rule ;
+if $(layout) = versioned
+{
+    rename-rule = stage.add-variant-and-compiler ;
+}
+else
+{
+    rename-rule = stage.add-variant ;
+}
+
 stage install : libs/$(libraries)/build 
   : <so-version>1.32.0 
-    <location>$(lib-locate)
+    <location>$(lib-locate) <tag>@$(rename-rule)
   ;
         
     

+ 1 - 1
tools/build

@@ -1 +1 @@
-Subproject commit 27c7ab37fac9e84ca84857464b95af11885220f4
+Subproject commit 7d8f3051b8908ac698642a58a17c50fc0627fe25

粤ICP备19079148号