diff options
| -rwxr-xr-x | bootstrap | 24 | ||||
| -rwxr-xr-x | stage | 20 | ||||
| -rwxr-xr-x | stage-queue | 7 | ||||
| -rwxr-xr-x | upgrade | 2 |
4 files changed, 29 insertions, 24 deletions
@@ -303,7 +303,7 @@ if [ "$clone" -o "$clean" ]; then run cd build2 run make -f bootstrap.gmake CXX="$cxx" CXXFLAGS=-O3 -j 8 run make -f bootstrap.gmake CXX="$cxx" CXXFLAGS=-O3 cleano # Cleanup objs. - run build2/b-boot --version + run b/b-boot --version run cd - fi @@ -402,13 +402,13 @@ if [ $def ]; then fi if [ $def ]; then - run b build2/build2/ bpkg/bpkg/ bdep/bdep/ - run build2/build2/b --version + run b build2/b/ bpkg/bpkg/ bdep/bdep/ + run build2/b/b --version run bpkg/bpkg/bpkg --version run bdep/bdep/bdep --version else - run b "$rd/build2/build2/" "$rd/bpkg/bpkg/" "$rd/bdep/bdep/" - run "$rd/build2/build2/b" --version + run b "$rd/build2/b/" "$rd/bpkg/bpkg/" "$rd/bdep/bdep/" + run "$rd/build2/b/b" --version run "$rd/bpkg/bpkg/bpkg" --version run "$rd/bdep/bdep/bdep" --version fi @@ -422,14 +422,14 @@ if [ "$sym" ]; then # backlinks). # run sudo mkdir -p /usr/local/bin - run sudo ln -s "$owd/build2/build2/b-boot" /usr/local/bin/b-boot - run sudo ln -s "$ad/build2/build2/b" /usr/local/bin/b - run sudo ln -s "$ad/bpkg/bpkg/bpkg" /usr/local/bin/bpkg - run sudo ln -s "$ad/bdep/bdep/bdep" /usr/local/bin/bdep + run sudo ln -s "$owd/build2/b/b-boot" /usr/local/bin/b-boot + run sudo ln -s "$ad/build2/b/b" /usr/local/bin/b + run sudo ln -s "$ad/bpkg/bpkg/bpkg" /usr/local/bin/bpkg + run sudo ln -s "$ad/bdep/bdep/bdep" /usr/local/bin/bdep run export PATH="/usr/local/bin:$PATH" else - run export PATH="$ad/build2/build2:$PATH" + run export PATH="$ad/build2/b:$PATH" run export PATH="$ad/bpkg/bpkg:$PATH" run export PATH="$ad/bdep/bdep:$PATH" fi @@ -440,9 +440,9 @@ run which b bpkg bdep # noop). # if [ $def ]; then - run b build2/build2/ bpkg/bpkg/ bdep/bdep/ + run b build2/b/ bpkg/bpkg/ bdep/bdep/ else - run b "$rd/build2/build2/" "$rd/bpkg/bpkg/" "$rd/bdep/bdep/" + run b "$rd/build2/b/" "$rd/bpkg/bpkg/" "$rd/bdep/bdep/" fi # Configure the modules. @@ -37,7 +37,7 @@ bdep --version >/dev/null # up to date since it depend on libbuild2. Update project manager for good # measure. # -b build2/build2/ bpkg/bpkg/ bdep/bdep/ +b build2/b/ bpkg/bpkg/ bdep/bdep/ b --version >/dev/null bpkg --version >/dev/null bdep --version >/dev/null @@ -319,15 +319,15 @@ etc/stage-pkg -c $mode -d hello hello/libhello-1.0 # # Note: cannot have libodb-mysql because don't have libmysqlclient (see above). # -etc/stage-pkg -c $mode -d odb \ - ../odb/odb/odb \ - ../odb/odb/libodb \ - ../odb/odb/libodb-sqlite \ - ../odb/odb/libodb-pgsql \ - ../odb/odb/libodb-oracle \ - ../odb/odb/libodb-mssql \ - ../odb/odb/libodb-boost \ - ../odb/odb/libodb-qt +#etc/stage-pkg -c $mode -d odb \ +# ../odb/odb/odb \ +# ../odb/odb/libodb \ +# ../odb/odb/libodb-sqlite \ +# ../odb/odb/libodb-pgsql \ +# ../odb/odb/libodb-oracle \ +# ../odb/odb/libodb-mssql \ +# ../odb/odb/libodb-boost \ +# ../odb/odb/libodb-qt # ../odb/odb/libodb-mysql # ../odb/odb/odb-tests diff --git a/stage-queue b/stage-queue index 04feb1e..4015dac 100755 --- a/stage-queue +++ b/stage-queue @@ -56,7 +56,12 @@ done # ../xsd/xsd/libxsd-tests \ # ../xsd/xsd/xsd \ # ../xsd/xsd/xsd-tests \ -# ../xsd/xsd/xsd-examples \ +# ../xsd/xsd/xsd-examples + +#etc/stage-pkg -Q alpha -c -d xsde ../xsd/xsde/libxsde \ +# ../xsd/xsde/xsde \ +# ../xsd/xsde/xsde-tests \ +# ../xsd/xsde/xsde-examples #etc/stage-pkg -Q alpha -c -d boost packaging/boost/boost/libboost-*/ @@ -151,7 +151,7 @@ else run export LD_LIBRARY_PATH="$ldpath$LD_LIBRARY_PATH" fi opath="$PATH" -run export PATH="$tcfg.bak/build2/build2:$tcfg.bak/bpkg/bpkg:$tcfg.bak/bdep/bdep:$PATH" +run export PATH="$tcfg.bak/build2/b:$tcfg.bak/bpkg/bpkg:$tcfg.bak/bdep/bdep:$PATH" # Make sure the backup toolchain is runnable. # |