Răsfoiți Sursa

Add dist-lib and dist-bin targets to put results in a convenient place.
All tools compile except for inspect.


[SVN r28462]

Rene Rivera 21 ani în urmă
părinte
comite
01391a0a56
6 a modificat fișierele cu 66 adăugiri și 31 ștergeri
  1. 1 1
      libs/wave
  2. 31 8
      tools/Jamfile.v2
  3. 1 1
      tools/bcp
  4. 1 1
      tools/inspect
  5. 1 1
      tools/quickbook
  6. 31 19
      tools/regression/build/Jamfile.v2

+ 1 - 1
libs/wave

@@ -1 +1 @@
-Subproject commit a98ae6300044a2f58f546aad5c8383a052add6cd
+Subproject commit c7b3a91544b967d59e42cc56768b997e8d62a9c3

+ 31 - 8
tools/Jamfile.v2

@@ -2,15 +2,38 @@
 # Jamfile which builds all the tools.
 
 project 
-    : requirements <hardcode-dll-paths>true
+    :
+    requirements
+    <link>static
+    <link-runtime>static
+    <threading>single
+    ;
+
+TOOLS =
+    bcp//bcp
+    inspect/build//inspect
+    quickbook//quickbook
+    regression/build//compiler_status
+    regression/build//process_jam_log
+    wave/build//wave
+    ;
+
+install dist-bin
+    :
+    $(TOOLS)
+    :
+    <install-type>EXE
+    <location>../dist/bin
+    :
+    release
     ;
 
-stage tools
-    : bcp//bcp
-      inspect/build//inspect
-      regression/build//process_jam_log
-      regression/build//compiler_status
-      wave/build//wave
+install dist-lib
+    :
+    $(TOOLS)
+    :
+    <install-type>LIB
+    <location>../dist/lib
     :
-    : release      
+    release
     ;

+ 1 - 1
tools/bcp

@@ -1 +1 @@
-Subproject commit ebe5222bfc6d96e4f5b8d89da6b79419ace99240
+Subproject commit 8fed9c06a5bc60f5c41cae5e5ba324083d818fc2

+ 1 - 1
tools/inspect

@@ -1 +1 @@
-Subproject commit 89b362e233cd613751b8770dbf3b3bc66bfba143
+Subproject commit d4a746a365ac175533c24b36053c549ac8baf150

+ 1 - 1
tools/quickbook

@@ -1 +1 @@
-Subproject commit a8392a50a64a286c171b6367ca88c2077ca57e2f
+Subproject commit e269ee260c88e39729f416791301d94074196310

+ 31 - 19
tools/regression/build/Jamfile.v2

@@ -1,29 +1,41 @@
 # Regression test status reporting tools build Jamfile
 
 exe process_jam_log
-	:
-	../process_jam_log.cpp ../detail/tiny_xml.cpp
-	../../../libs/filesystem/build//boost_filesystem
-	:	
-	:
-        release
-	;
+    :
+    ../process_jam_log.cpp ../detail/tiny_xml.cpp
+    /boost/filesystem//boost_filesystem
+    :
+    :
+    release
+    ;
 
 exe compiler_status
-	:
-	../compiler_status.cpp ../detail/tiny_xml.cpp
-	../../../libs/filesystem/build//boost_filesystem
-	:	
-	:
-        release
-	;
+    :
+    ../compiler_status.cpp ../detail/tiny_xml.cpp
+    /boost/filesystem//boost_filesystem
+    :
+    :
+    release
+    ;
+
+install dist-bin
+    :
+    process_jam_log
+    compiler_status
+    :
+    <install-type>EXE
+    <location>../../../dist/bin
+    :
+    release
+    ;
 
-stage run
+install dist-lib
     :
-        process_jam_log
-        compiler_status
+    process_jam_log
+    compiler_status
     :
+    <install-type>LIB
+    <location>../../../dist/lib
     :
-        release
+    release
     ;
-explicit run ;    

粤ICP备19079148号