Index: bootstrap.bat =================================================================== --- bootstrap.bat (revision 63788) +++ bootstrap.bat (working copy) @@ -6,20 +6,20 @@ REM (See accompanying file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt) ECHO Building Boost.Jam build engine -if exist ".\tools\jam\src\bin.ntx86\bjam.exe" del tools\jam\src\bin.ntx86\bjam.exe -if exist ".\tools\jam\src\bin.ntx86_64\bjam.exe" del tools\jam\src\bin.ntx86_64\bjam.exe -cd tools\jam\src +if exist ".\tools\build\v2\engine\src\bin.ntx86\bjam.exe" del tools\build\v2\engine\src\bin.ntx86\bjam.exe +if exist ".\tools\build\v2\engine\src\bin.ntx86_64\bjam.exe" del tools\build\v2\engine\src\bin.ntx86_64\bjam.exe +cd tools\build\v2\engine\src call .\build.bat > ..\..\..\bjam.log @ECHO OFF -cd ..\..\.. +cd ..\..\..\..\.. -if exist ".\tools\jam\src\bin.ntx86\bjam.exe" ( - copy .\tools\jam\src\bin.ntx86\bjam.exe . > nul +if exist ".\tools\build\v2\engine\src\bin.ntx86\bjam.exe" ( + copy .\tools\build\v2\engine\src\bin.ntx86\bjam.exe . > nul goto :bjam_built) -if exist ".\tools\jam\src\bin.ntx86_64\bjam.exe" ( - copy .\tools\jam\src\bin.ntx86_64\bjam.exe . > nul +if exist ".\tools\build\v2\engine\src\bin.ntx86_64\bjam.exe" ( + copy .\tools\build\v2\engine\src\bin.ntx86_64\bjam.exe . > nul goto :bjam_built) goto :bjam_failure Index: bootstrap.sh =================================================================== --- bootstrap.sh (revision 63788) +++ bootstrap.sh (working copy) @@ -185,7 +185,7 @@ # Determine the toolset, if not already decided if test "x$TOOLSET" = x; then - guessed_toolset=`$my_dir/tools/jam/src/build.sh --guess-toolset` + guessed_toolset=`$my_dir/tools/build/v2/engine/src/build.sh --guess-toolset` case $guessed_toolset in acc | darwin | gcc | como | mipspro | pathscale | pgi | qcc | vacpp ) TOOLSET=$guessed_toolset @@ -215,7 +215,7 @@ if test "x$BJAM" = x; then echo -n "Building Boost.Jam with toolset $TOOLSET... " pwd=`pwd` - (cd "$my_dir/tools/jam/src" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1 + (cd "$my_dir/tools/build/v2/engine/src" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1 if [ $? -ne 0 ]; then echo echo "Failed to build Boost.Jam" @@ -223,9 +223,9 @@ exit 1 fi cd "$pwd" - arch=`cd $my_dir/tools/jam/src && ./bootstrap/jam0 -d0 -f build.jam --toolset=$TOOLSET --toolset-root= --show-locate-target && cd ..` - BJAM="$my_dir/tools/jam/src/$arch/bjam" - echo "tools/jam/src/$arch/bjam" + arch=`cd $my_dir/tools/build/v2/engine/src && ./bootstrap/jam0 -d0 -f build.jam --toolset=$TOOLSET --toolset-root= --show-locate-target && cd ..` + BJAM="$my_dir/tools/build/v2/engine/src/$arch/bjam" + echo "tools/build/v2/engine/src/$arch/bjam" cp "$BJAM" . fi Index: tools/release/snapshot_posix.sh =================================================================== --- tools/release/snapshot_posix.sh (revision 63788) +++ tools/release/snapshot_posix.sh (working copy) @@ -20,13 +20,13 @@ #echo "Building bjam..." # failure to use an up-to-date copy of bjam has caused much wasted effort. -#pushd posix/tools/jam/src +#pushd posix/tools/build/v2/engine/src #./build.sh gcc #popd # #echo "Building docs..." #pushd posix/doc -#../tools/jam/src/bin.cygwinx86/bjam --toolset=gcc &>../../posix-bjam.log +#../tools/build/v2/engine/src/bin.cygwinx86/bjam --toolset=gcc &>../../posix-bjam.log #popd echo "Cleaning up and renaming..." Index: tools/regression/src/run_tests.sh =================================================================== --- tools/regression/src/run_tests.sh (revision 63788) +++ tools/regression/src/run_tests.sh (working copy) @@ -75,7 +75,7 @@ # The location of the binary for running bjam. The default should work # under most circumstances. # -bjam="$boost_root/tools/jam/src/bin/bjam$exe_suffix" +bjam="$boost_root/tools/build/v2/engine/src/bin/bjam$exe_suffix" # # "process_jam_log", and "compiler_status" paths to built helper programs: @@ -133,7 +133,7 @@ # rebuild bjam if required: # echo building bjam: -cd "$boost_root/tools/jam/src" && \ +cd "$boost_root/tools/build/v2/engine/src" && \ LOCATE_TARGET=bin sh ./build.sh if test $? != 0 ; then echo "bjam build failed." Index: tools/regression/src/regression.py =================================================================== --- tools/regression/src/regression.py (revision 63788) +++ tools/regression/src/regression.py (working copy) @@ -26,7 +26,7 @@ 'trunk' : 'trunk', 'release' : 'branches/release', 'build' : 'trunk/tools/build/v2', - 'jam' : 'tags/tools/jam/Boost_Jam_3_1_18/src', + 'jam' : 'trunk/tools/build/v2/engine', 'regression' : 'trunk/tools/regression', 'boost-build.jam' : 'trunk/boost-build.jam' Index: tools/inspect/inspect.cpp =================================================================== --- tools/inspect/inspect.cpp (revision 63918) +++ tools/inspect/inspect.cpp (working copy) @@ -153,6 +153,7 @@ && leaf != "bin.v2" // this really out of our hands && local.find("tools/jam/src") != 0 + && local.find("tools/build/v2/engine") != 0 // too many issues with generated HTML files && leaf != "status" // no point in checking doxygen xml output Index: tools/jam/test/actions_quietly.jam (deleted) =================================================================== Index: tools/jam/test/parallel_actions.jam (deleted) =================================================================== Index: tools/jam/test/test.bat (deleted) =================================================================== Index: tools/jam/test/test.jam (deleted) =================================================================== Index: tools/jam/test/action_status.jam (deleted) =================================================================== Index: tools/jam/test/test.sh (deleted) =================================================================== Index: tools/jam/test/builtin_w32_getregnames.jam (deleted) =================================================================== Index: tools/jam/test/option_l.jam (deleted) =================================================================== Index: tools/jam/test/option_n.jam (deleted) =================================================================== Index: tools/jam/test/rule_param.jam (deleted) =================================================================== Index: tools/jam/test/var_expand.jam (deleted) =================================================================== Index: tools/jam/test/stress_var_expand.jam (deleted) =================================================================== Index: tools/jam/test/option_d2.jam (deleted) =================================================================== Index: tools/jam/test/builtin_shell.jam (deleted) =================================================================== Index: tools/jam/test/target_var.jam (deleted) =================================================================== Index: tools/jam/test/builtin_normalize_path.jam (deleted) =================================================================== Index: tools/jam/test/parallel_multifile_actions_1.jam (deleted) =================================================================== Index: tools/jam/test/parallel_multifile_actions_2.jam (deleted) =================================================================== Index: tools/jam/doc/bjam.qbk (deleted) =================================================================== Index: tools/jam/doc/build.jam (deleted) =================================================================== Index: tools/jam/doc/history.qbk (deleted) =================================================================== Index: tools/jam/src/subst.c (deleted) =================================================================== Index: tools/jam/src/debian/control (deleted) =================================================================== Index: tools/jam/src/debian/jam.man.sgml (deleted) =================================================================== Index: tools/jam/src/debian/changelog (deleted) =================================================================== Index: tools/jam/src/debian/copyright (deleted) =================================================================== Index: tools/jam/src/debian/rules (deleted) =================================================================== Index: tools/jam/src/class.c (deleted) =================================================================== Index: tools/jam/src/jamgramtab.h (deleted) =================================================================== Index: tools/jam/src/class.h (deleted) =================================================================== Index: tools/jam/src/execvms.c (deleted) =================================================================== Index: tools/jam/src/filent.c (deleted) =================================================================== Index: tools/jam/src/hash.c (deleted) =================================================================== Index: tools/jam/src/md5.c (deleted) =================================================================== Index: tools/jam/src/debug.c (deleted) =================================================================== Index: tools/jam/src/execnt.c (deleted) =================================================================== Index: tools/jam/src/modules/sequence.c (deleted) =================================================================== Index: tools/jam/src/modules/readme.txt (deleted) =================================================================== Index: tools/jam/src/modules/regex.c (deleted) =================================================================== Index: tools/jam/src/modules/order.c (deleted) =================================================================== Index: tools/jam/src/modules/set.c (deleted) =================================================================== Index: tools/jam/src/modules/path.c (deleted) =================================================================== Index: tools/jam/src/modules/property-set.c (deleted) =================================================================== Index: tools/jam/src/build.sh (deleted) =================================================================== Index: tools/jam/src/hash.h (deleted) =================================================================== Index: tools/jam/src/md5.h (deleted) =================================================================== Index: tools/jam/src/debug.h (deleted) =================================================================== Index: tools/jam/src/jamgram.yy (deleted) =================================================================== Index: tools/jam/src/make1.c (deleted) =================================================================== Index: tools/jam/src/fileos2.c (deleted) =================================================================== Index: tools/jam/src/jam.c (deleted) =================================================================== Index: tools/jam/src/modules.c (deleted) =================================================================== Index: tools/jam/src/option.c (deleted) =================================================================== Index: tools/jam/src/w32_getreg.c (deleted) =================================================================== Index: tools/jam/src/yyacc.c (deleted) =================================================================== Index: tools/jam/src/jam.h (deleted) =================================================================== Index: tools/jam/src/modules.h (deleted) =================================================================== Index: tools/jam/src/execcmd.h (deleted) =================================================================== Index: tools/jam/src/option.h (deleted) =================================================================== Index: tools/jam/src/pathmac.c (deleted) =================================================================== Index: tools/jam/src/mem.c (deleted) =================================================================== Index: tools/jam/src/bump_version.py (deleted) =================================================================== Index: tools/jam/src/Jambase (deleted) =================================================================== Index: tools/jam/src/mem.h (deleted) =================================================================== Index: tools/jam/src/fileunix.c (deleted) =================================================================== Index: tools/jam/src/scan.c (deleted) =================================================================== Index: tools/jam/src/variable.c (deleted) =================================================================== Index: tools/jam/src/scan.h (deleted) =================================================================== Index: tools/jam/src/pwd.c (deleted) =================================================================== Index: tools/jam/src/regexp.c (deleted) =================================================================== Index: tools/jam/src/rules.c (deleted) =================================================================== Index: tools/jam/src/variable.h (deleted) =================================================================== Index: tools/jam/src/patchlevel.h (deleted) =================================================================== Index: tools/jam/src/hdrmacro.c (deleted) =================================================================== Index: tools/jam/src/pwd.h (deleted) =================================================================== Index: tools/jam/src/regexp.h (deleted) =================================================================== Index: tools/jam/src/rules.h (deleted) =================================================================== Index: tools/jam/src/filemac.c (deleted) =================================================================== Index: tools/jam/src/output.c (deleted) =================================================================== Index: tools/jam/src/pathunix.c (deleted) =================================================================== Index: tools/jam/src/timestamp.c (deleted) =================================================================== Index: tools/jam/src/hdrmacro.h (deleted) =================================================================== Index: tools/jam/src/output.h (deleted) =================================================================== Index: tools/jam/src/timestamp.h (deleted) =================================================================== Index: tools/jam/src/headers.c (deleted) =================================================================== Index: tools/jam/src/hcache.c (deleted) =================================================================== Index: tools/jam/src/frames.c (deleted) =================================================================== Index: tools/jam/src/jamgram.c (deleted) =================================================================== Index: tools/jam/src/headers.h (deleted) =================================================================== Index: tools/jam/src/hcache.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/stubborn.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/gc_cpp.cc (deleted) =================================================================== Index: tools/jam/src/boehm_gc/blacklst.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/darwin_stop_world.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/mach_dep.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/callprocs (deleted) =================================================================== Index: tools/jam/src/boehm_gc/Makefile.in (deleted) =================================================================== Index: tools/jam/src/boehm_gc/Mac_files/dataend.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/Mac_files/datastart.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/Mac_files/MacOS_Test_config.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/Mac_files/MacOS_config.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/libtool.m4 (deleted) =================================================================== Index: tools/jam/src/boehm_gc/if_not_there.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/depcomp (deleted) =================================================================== Index: tools/jam/src/boehm_gc/sparc_mach_dep.S (deleted) =================================================================== Index: tools/jam/src/boehm_gc/mips_sgi_mach_dep.s (deleted) =================================================================== Index: tools/jam/src/boehm_gc/ltmain.sh (deleted) =================================================================== Index: tools/jam/src/boehm_gc/configure.host (deleted) =================================================================== Index: tools/jam/src/boehm_gc/win32_threads.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/NT_STATIC_THREADS_MAKEFILE (deleted) =================================================================== Index: tools/jam/src/boehm_gc/add_gc_prefix.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/NT_X64_STATIC_THREADS_MAKEFILE (deleted) =================================================================== Index: tools/jam/src/boehm_gc/OS2_MAKEFILE (deleted) =================================================================== Index: tools/jam/src/boehm_gc/threadlibs.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/configure.ac (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README.macros (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README.darwin (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/porting.html (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README.rs6000 (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README.MacOSX (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/barrett_diagram (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README.solaris2 (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README.linux (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README.Mac (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/debugging.html (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README.win32 (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README.OS2 (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/tree.html (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README.arm.cross (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README.DGUX386 (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README.changes (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README.cords (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README.ews4800 (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README.amiga (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/gcdescr.html (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/leak.html (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README.contributors (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README.dj (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/scale.html (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README.environment (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/doc.am (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/gc.man (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README.win64 (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README.hp (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README.uts (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/simple_example.html (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/overview.html (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README.autoconf (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/gcinterface.html (deleted) =================================================================== Index: tools/jam/src/boehm_gc/doc/README.sgi (deleted) =================================================================== Index: tools/jam/src/boehm_gc/msvc_dbg.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/mark.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/gc_cpp.cpp (deleted) =================================================================== Index: tools/jam/src/boehm_gc/SMakefile.amiga (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/gc.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/gc_allocator.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/include.am (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/gc_amiga_redirects.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/gc_cpp.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/gc_typed.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/gc_backptr.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/gc_mark.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/gc_pthread_redirects.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/leak_detector.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/new_gc_alloc.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/gc_gcj.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/gc_tiny_fl.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/javaxfc.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/gc_config_macros.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/private/gc_hdrs.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/private/gc_priv.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/private/thread_local_alloc.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/private/gcconfig.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/private/darwin_stop_world.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/private/gc_pmark.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/private/pthread_stop_world.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/private/pthread_support.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/private/gc_locks.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/private/msvc_dbg.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/private/specific.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/private/darwin_semaphore.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/private/dbg_mlc.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/private/cord_pos.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/gc_inline.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/ec.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/cord.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/include/weakpointer.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/pcr_interface.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/EMX_MAKEFILE (deleted) =================================================================== Index: tools/jam/src/boehm_gc/ChangeLog (deleted) =================================================================== Index: tools/jam/src/boehm_gc/obj_map.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/NT_THREADS_MAKEFILE (deleted) =================================================================== Index: tools/jam/src/boehm_gc/allchblk.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/PCR-Makefile (deleted) =================================================================== Index: tools/jam/src/boehm_gc/gc.mak (deleted) =================================================================== Index: tools/jam/src/boehm_gc/AmigaOS.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/backgraph.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/bdw-gc.pc (deleted) =================================================================== Index: tools/jam/src/boehm_gc/checksums.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/MacProjects.sit.hqx (deleted) =================================================================== Index: tools/jam/src/boehm_gc/dbg_mlc.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/bdw-gc.pc.in (deleted) =================================================================== Index: tools/jam/src/boehm_gc/WCC_MAKEFILE (deleted) =================================================================== Index: tools/jam/src/boehm_gc/version.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/NT_MAKEFILE (deleted) =================================================================== Index: tools/jam/src/boehm_gc/mallocx.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/configure (deleted) =================================================================== Index: tools/jam/src/boehm_gc/MacOS.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/pthread_stop_world.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/BCC_MAKEFILE (deleted) =================================================================== Index: tools/jam/src/boehm_gc/cord/cord.am (deleted) =================================================================== Index: tools/jam/src/boehm_gc/cord/cordbscs.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/cord/de_cmds.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/cord/de_win.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/cord/cordxtra.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/cord/cordtest.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/cord/de_win.RC (deleted) =================================================================== Index: tools/jam/src/boehm_gc/cord/de.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/cord/de_win.h (deleted) =================================================================== Index: tools/jam/src/boehm_gc/cord/cordprnt.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/cord/de_win.ICO (deleted) =================================================================== Index: tools/jam/src/boehm_gc/malloc.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/compile (deleted) =================================================================== Index: tools/jam/src/boehm_gc/config.guess (deleted) =================================================================== Index: tools/jam/src/boehm_gc/typd_mlc.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/headers.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/config.sub (deleted) =================================================================== Index: tools/jam/src/boehm_gc/tests/middle.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/tests/test.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/tests/thread_leak_test.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/tests/test_cpp.cc (deleted) =================================================================== Index: tools/jam/src/boehm_gc/tests/leak_test.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/tests/tests.am (deleted) =================================================================== Index: tools/jam/src/boehm_gc/pthread_support.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/setjmp_t.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/alpha_mach_dep.S (deleted) =================================================================== Index: tools/jam/src/boehm_gc/digimars.mak (deleted) =================================================================== Index: tools/jam/src/boehm_gc/specific.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/if_mach.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/configure_atomic_ops.sh (deleted) =================================================================== Index: tools/jam/src/boehm_gc/README.QUICK (deleted) =================================================================== Index: tools/jam/src/boehm_gc/Makefile.dj (deleted) =================================================================== Index: tools/jam/src/boehm_gc/Makefile.DLLs (deleted) =================================================================== Index: tools/jam/src/boehm_gc/gc_dlopen.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/thread_local_alloc.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/ia64_save_regs_in_stack.s (deleted) =================================================================== Index: tools/jam/src/boehm_gc/ptr_chck.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/gcj_mlc.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/mkinstalldirs (deleted) =================================================================== Index: tools/jam/src/boehm_gc/finalize.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/Makefile.direct (deleted) =================================================================== Index: tools/jam/src/boehm_gc/sparc_netbsd_mach_dep.s (deleted) =================================================================== Index: tools/jam/src/boehm_gc/os_dep.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/real_malloc.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/reclaim.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/mips_ultrix_mach_dep.s (deleted) =================================================================== Index: tools/jam/src/boehm_gc/mark_rts.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/sparc_sunos4_mach_dep.s (deleted) =================================================================== Index: tools/jam/src/boehm_gc/acinclude.m4 (deleted) =================================================================== Index: tools/jam/src/boehm_gc/Makefile.am (deleted) =================================================================== Index: tools/jam/src/boehm_gc/missing (deleted) =================================================================== Index: tools/jam/src/boehm_gc/dyn_load.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/new_hblk.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/gcname.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/alloc.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/rs6000_mach_dep.s (deleted) =================================================================== Index: tools/jam/src/boehm_gc/hpux_test_and_clear.s (deleted) =================================================================== Index: tools/jam/src/boehm_gc/misc.c (deleted) =================================================================== Index: tools/jam/src/boehm_gc/aclocal.m4 (deleted) =================================================================== Index: tools/jam/src/boehm_gc/install-sh (deleted) =================================================================== Index: tools/jam/src/frames.h (deleted) =================================================================== Index: tools/jam/src/newstr.c (deleted) =================================================================== Index: tools/jam/src/pathvms.c (deleted) =================================================================== Index: tools/jam/src/jamgram.h (deleted) =================================================================== Index: tools/jam/src/native.c (deleted) =================================================================== Index: tools/jam/src/newstr.h (deleted) =================================================================== Index: tools/jam/src/compile.c (deleted) =================================================================== Index: tools/jam/src/builtins.c (deleted) =================================================================== Index: tools/jam/src/strings.c (deleted) =================================================================== Index: tools/jam/src/mkjambase.c (deleted) =================================================================== Index: tools/jam/src/native.h (deleted) =================================================================== Index: tools/jam/src/compile.h (deleted) =================================================================== Index: tools/jam/src/lists.c (deleted) =================================================================== Index: tools/jam/src/builtins.h (deleted) =================================================================== Index: tools/jam/src/strings.h (deleted) =================================================================== Index: tools/jam/src/pathsys.h (deleted) =================================================================== Index: tools/jam/src/jambase.c (deleted) =================================================================== Index: tools/jam/src/lists.h (deleted) =================================================================== Index: tools/jam/src/boost-jam.spec (deleted) =================================================================== Index: tools/jam/src/jamgram.y (deleted) =================================================================== Index: tools/jam/src/execmac.c (deleted) =================================================================== Index: tools/jam/src/filevms.c (deleted) =================================================================== Index: tools/jam/src/search.c (deleted) =================================================================== Index: tools/jam/src/jambase.h (deleted) =================================================================== Index: tools/jam/src/parse.c (deleted) =================================================================== Index: tools/jam/src/search.h (deleted) =================================================================== Index: tools/jam/src/make.c (deleted) =================================================================== Index: tools/jam/src/command.c (deleted) =================================================================== Index: tools/jam/src/filesys.c (deleted) =================================================================== Index: tools/jam/src/expand.c (deleted) =================================================================== Index: tools/jam/src/parse.h (deleted) =================================================================== Index: tools/jam/src/build_vms.com (deleted) =================================================================== Index: tools/jam/src/make.h (deleted) =================================================================== Index: tools/jam/src/glob.c (deleted) =================================================================== Index: tools/jam/src/command.h (deleted) =================================================================== Index: tools/jam/src/build.bat (deleted) =================================================================== Index: tools/jam/src/filesys.h (deleted) =================================================================== Index: tools/jam/src/build.jam (deleted) =================================================================== Index: tools/jam/src/expand.h (deleted) =================================================================== Index: tools/jam/src/execunix.c (deleted) =================================================================== Index: tools/jam/build_dist.bat (deleted) =================================================================== Index: tools/jam/index.html (deleted) =================================================================== Index: tools/jam/build_dist.sh (deleted) =================================================================== Index: more/getting_started/detail/build-from-source-head.rst =================================================================== --- more/getting_started/detail/build-from-source-head.rst (revision 63788) +++ more/getting_started/detail/build-from-source-head.rst (working copy) @@ -12,7 +12,7 @@ .. _precompiled-bjam: http://sourceforge.net/project/showfiles.php?group_id=7586&package_id=72941 .. .. _Boost.Jam documentation: Boost.Jam_ .. _Boost.Build: ../../tools/build/index.html -.. _Boost.Jam: ../../tools/jam/index.html +.. _Boost.Jam: ../../tools/build/v2/engine/index.html .. _Boost.Build documentation: Boost.Build_ Get ``bjam`` Index: doc/pdf/Jamfile.v2 =================================================================== --- doc/pdf/Jamfile.v2 (revision 63788) +++ doc/pdf/Jamfile.v2 (working copy) @@ -79,7 +79,7 @@ ../../libs/xpressive/doc//standalone ../../tools/boostbook/doc//boostbook - ../../tools/jam/doc//standalone + ../../tools/build/v2/engine/doc//standalone ../../tools/quickbook/doc//standalone ../../tools/bcp/doc//standalone : Index: doc/Jamfile.v2 =================================================================== --- doc/Jamfile.v2 (revision 63788) +++ doc/Jamfile.v2 (working copy) @@ -39,7 +39,7 @@ ../libs/date_time/xmldoc//gregorian_autodoc.xml ../libs/date_time/xmldoc//posix_time_autodoc.xml ../libs/date_time/xmldoc//local_time_autodoc.xml - ../tools/jam/doc//bjam + ../tools/build/v2/engine/doc//bjam ../tools/quickbook/doc//quickbook ../libs/interprocess/doc//autodoc.xml ../libs/interprocess/doc//interprocess @@ -63,7 +63,7 @@ ../libs/proto/doc//proto ../libs/typeof/doc//typeof ../libs/xpressive/doc//xpressive - ../tools/jam/doc//bjam + ../tools/build/v2/engine/doc//bjam ../tools/quickbook/doc//quickbook ../libs/mpi/doc//mpi ../libs/interprocess/doc//interprocess