Просмотр исходного кода

Added V2 Jamfiles for some libraries. Arranged to "bjam --v2" to invoke new
build system.


[SVN r15712]

Vladimir Prus 23 лет назад
Родитель
Сommit
545ab393a8
5 измененных файлов с 27 добавлено и 5 удалено
  1. 7 0
      Jamfile.v2
  2. 17 1
      boost-build.jam
  3. 1 1
      libs/date_time
  4. 1 1
      libs/test
  5. 1 2
      project-root.jam

+ 7 - 0
Jamfile.v2

@@ -0,0 +1,7 @@
+
+project boost
+    : requirements <include>.
+    ;
+    
+build-project libs/test/build ;
+build-project libs/date_time/build ;

+ 17 - 1
boost-build.jam

@@ -1,2 +1,18 @@
 BOOST_ROOT = $(.boost-build-file:D) ;
-boost-build tools/build ;
+if --v2 in $(ARGV)
+{
+    if $(JAM_VERSION:J="") < 030103
+    {
+	ECHO "error: Boost.Jam 3.1.3 or later required" ;
+	EXIT ;
+    }
+    else
+    {
+        JAMFILE = Jamfile.v2 ;
+	boost-build tools/build/new ;
+    }	
+}
+else
+{
+    boost-build tools/build ;
+}    

+ 1 - 1
libs/date_time

@@ -1 +1 @@
-Subproject commit 5cd11255f906cc3ae9dc910eff2e586fed148018
+Subproject commit f207d1672541f02465abb75cdc5b6b312cc010b0

+ 1 - 1
libs/test

@@ -1 +1 @@
-Subproject commit 8bcc3c40b04d35af33b999a1ecaed9eccf699282
+Subproject commit e927fc314f5158f7fe8fb9f9cdf49126cd4a1c3d

+ 1 - 2
project-root.jam

@@ -1,3 +1,2 @@
-# empty file for now, just to satisfy requirements for Boost.Build v2 testing
-
 
+import gcc ;

粤ICP备19079148号