diff --git a/.gitignore b/.gitignore index a5d7382..a3ec8bf 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ build/ install/ +log/ +*.log diff --git a/boost/build.sh b/boost/build.sh index 86f1692..053f4c7 100755 --- a/boost/build.sh +++ b/boost/build.sh @@ -10,7 +10,7 @@ MINGW*) machineArch=Windows ;; esac echo ${machineArch} -libVer=1_70_0 +libVer=1_74_0 echo libVer=$libVer @@ -18,6 +18,7 @@ scriptDir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" originalPath=$scriptDir/original buildPath=$scriptDir/build installPath=$scriptDir/install +logPath=$scriptDir/log libFilePath=$originalPath/boost_$libVer.tar.gz libBuildPath=$buildPath/$libVer @@ -29,19 +30,21 @@ echo libFilePath=$libFilePath echo libBuildPath=$libBuildPath echo libInstallPath=$libInstallPath echo libSrcPath=$libSrcPath +echo logPath=$logPath echo -rm -rf $buildPath $installPath +rm -rf $buildPath $installPath $logPath mkdir -p $libBuildPath mkdir -p $libInstallPath mkdir -p $libSrcPath +mkdir -p $logPath -tar zxvpf $libFilePath -C $buildPath +tar zxvpf $libFilePath -C $buildPath > $logPath/untar.log if [ "${machineArch}" = "Linux" ]; then (cd $libSrcPath && - ./bootstrap.sh --prefix=$libInstallPath && + ./bootstrap.sh --prefix=$libInstallPath > $logPath/configure.log && ./b2 \ --build-dir=$libBuildPath \ --prefix=$libInstallPath \ @@ -54,11 +57,11 @@ if [ "${machineArch}" = "Linux" ]; then threading=multi \ runtime-link=shared \ address-model=64 \ - install) + install > $logPath/build.log) elif [ "${machineArch}" = "MacOS" ]; then (cd $libSrcPath && ./bootstrap.sh --prefix=$libInstallPath \ - --with-toolset=clang && + --with-toolset=clang > $logPath/configure.log && ./b2 \ --build-dir=$libBuildPath \ --prefix=$libInstallPath \ @@ -69,10 +72,10 @@ elif [ "${machineArch}" = "MacOS" ]; then threading=multi \ runtime-link=shared \ address-model=64 \ - install) + install > $logPath/build.log) elif [ "${machineArch}" = "Windows" ]; then (cd $libSrcPath && - ./bootstrap.bat --prefix=$libInstallPath && + ./bootstrap.bat --prefix=$libInstallPath > $logPath/configure.log && ./b2 \ --build-dir=$libBuildPath \ --prefix=$libInstallPath \ @@ -83,7 +86,7 @@ elif [ "${machineArch}" = "Windows" ]; then threading=multi \ runtime-link=shared \ address-model=64 \ - install) + install > $logPath/build.log) else echo "unknown architecture" exit 1 diff --git a/boost/original/boost_1_70_0.tar.gz b/boost/original/boost_1_74_0.tar.gz similarity index 81% rename from boost/original/boost_1_70_0.tar.gz rename to boost/original/boost_1_74_0.tar.gz index 9e2136a..353a9f6 100644 Binary files a/boost/original/boost_1_70_0.tar.gz and b/boost/original/boost_1_74_0.tar.gz differ diff --git a/google/test/original/googletest-release-1.8.1.tar.gz b/google/test/original/googletest-release-1.8.1.tar.gz deleted file mode 100644 index 570390f..0000000 Binary files a/google/test/original/googletest-release-1.8.1.tar.gz and /dev/null differ