diff --git a/Jamfile.v2 b/Jamfile.v2 new file mode 100644 index 0000000000..7ad606f78e --- /dev/null +++ b/Jamfile.v2 @@ -0,0 +1,7 @@ + +project boost + : requirements . + ; + +build-project libs/test/build ; +build-project libs/date_time/build ; \ No newline at end of file diff --git a/boost-build.jam b/boost-build.jam index 0a2b927770..75542e4d71 100644 --- a/boost-build.jam +++ b/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 ; +} diff --git a/libs/date_time b/libs/date_time index 5cd11255f9..f207d16725 160000 --- a/libs/date_time +++ b/libs/date_time @@ -1 +1 @@ -Subproject commit 5cd11255f906cc3ae9dc910eff2e586fed148018 +Subproject commit f207d1672541f02465abb75cdc5b6b312cc010b0 diff --git a/libs/test b/libs/test index 8bcc3c40b0..e927fc314f 160000 --- a/libs/test +++ b/libs/test @@ -1 +1 @@ -Subproject commit 8bcc3c40b04d35af33b999a1ecaed9eccf699282 +Subproject commit e927fc314f5158f7fe8fb9f9cdf49126cd4a1c3d diff --git a/project-root.jam b/project-root.jam index 14ae62a597..487eef9803 100644 --- a/project-root.jam +++ b/project-root.jam @@ -1,3 +1,2 @@ -# empty file for now, just to satisfy requirements for Boost.Build v2 testing - +import gcc ;