diff --git a/build b/build index 4d0dcd8..5b03e71 100755 --- a/build +++ b/build @@ -55,87 +55,87 @@ echo " * 使用 GCC 编译器" -# STAGE 0.1 -- zlib -NEXT=0.2 -if [[ $STAGE && $STAGE < $NEXT ]] ; then - echo $BOUNDARYSTART - ${SHELLROOT}/compileing/compile-zlib.sh "$TARGET" - complete_stage $NEXT $? - echo $BOUNDARYEND -fi - -# STAGE 0.2 -- bzip2 -NEXT=0.3 -if [[ $STAGE && $STAGE < $NEXT ]] ; then - echo $BOUNDARYSTART - ${SHELLROOT}/compileing/compile-bzip2.sh "$TARGET" - complete_stage $NEXT $? - echo $BOUNDARYEND -fi - - -# STAGE 0.3 -- lzma -NEXT=0.4 -if [[ $STAGE && $STAGE < $NEXT ]] ; then - echo $BOUNDARYSTART - ${SHELLROOT}/compileing/compile-lzma.sh "$TARGET" "$CONFIGOPTS" - complete_stage $NEXT $? - echo $BOUNDARYEND -fi - -# STAGE 1.1 -- Boost -NEXT=1.2 -if [[ $STAGE && $STAGE < $NEXT ]] ; then - echo $BOUNDARYSTART - ${SHELLROOT}/compileing/compile-boost.sh "$TARGET" "$CONFIGOPTS" - complete_stage $NEXT $? - echo $BOUNDARYEND -fi - -# STAGE 1.2 -- Jpeg -NEXT=1.3 -if [[ $STAGE && $STAGE < $NEXT ]] ; then - echo $BOUNDARYSTART - ${SHELLROOT}/compileing/compile-Jpeg.sh "$TARGET" "$CONFIGOPTS" - complete_stage $NEXT $? - echo $BOUNDARYEND -fi - -# STAGE 1.3 -- Tiff -NEXT=1.4 -if [[ $STAGE && $STAGE < $NEXT ]] ; then - echo $BOUNDARYSTART - ${SHELLROOT}/compileing/compile-Tiff.sh "$TARGET" "$CONFIGOPTS" - complete_stage $NEXT $? - echo $BOUNDARYEND -fi - -# STAGE 1.4 -- PNG -NEXT=1.5 -if [[ $STAGE && $STAGE < $NEXT ]] ; then - echo $BOUNDARYSTART - ${SHELLROOT}/compileing/compile-PNG.sh "$TARGET" "$CONFIGOPTS" - complete_stage $NEXT $? - echo $BOUNDARYEND -fi - -# STAGE 1.5 -- FreeType -NEXT=1.6 -if [[ $STAGE && $STAGE < $NEXT ]] ; then - echo $BOUNDARYSTART - ${SHELLROOT}/compileing/compile-FreeType.sh "$TARGET" "$CONFIGOPTS" - complete_stage $NEXT $? - echo $BOUNDARYEND -fi - -# STAGE 1.6 -- OpenEXR -NEXT=2.1 -if [[ $STAGE && $STAGE < $NEXT ]] ; then - echo $BOUNDARYSTART - ${SHELLROOT}/compileing/compile-OpenEXR.sh "$TARGET" "$CONFIGOPTS" - complete_stage $NEXT $? - echo $BOUNDARYEND -fi +# # STAGE 0.1 -- zlib +# NEXT=0.2 +# if [[ $STAGE && $STAGE < $NEXT ]] ; then +# echo $BOUNDARYSTART +# ${SHELLROOT}/compileing/compile-zlib.sh "$TARGET" +# complete_stage $NEXT $? +# echo $BOUNDARYEND +# fi + +# # STAGE 0.2 -- bzip2 +# NEXT=0.3 +# if [[ $STAGE && $STAGE < $NEXT ]] ; then +# echo $BOUNDARYSTART +# ${SHELLROOT}/compileing/compile-bzip2.sh "$TARGET" +# complete_stage $NEXT $? +# echo $BOUNDARYEND +# fi + + +# # STAGE 0.3 -- lzma +# NEXT=0.4 +# if [[ $STAGE && $STAGE < $NEXT ]] ; then +# echo $BOUNDARYSTART +# ${SHELLROOT}/compileing/compile-lzma.sh "$TARGET" "$CONFIGOPTS" +# complete_stage $NEXT $? +# echo $BOUNDARYEND +# fi + +# # STAGE 1.1 -- Boost +# NEXT=1.2 +# if [[ $STAGE && $STAGE < $NEXT ]] ; then +# echo $BOUNDARYSTART +# ${SHELLROOT}/compileing/compile-boost.sh "$TARGET" "$CONFIGOPTS" +# complete_stage $NEXT $? +# echo $BOUNDARYEND +# fi + +# # STAGE 1.2 -- Jpeg +# NEXT=1.3 +# if [[ $STAGE && $STAGE < $NEXT ]] ; then +# echo $BOUNDARYSTART +# ${SHELLROOT}/compileing/compile-Jpeg.sh "$TARGET" "$CONFIGOPTS" +# complete_stage $NEXT $? +# echo $BOUNDARYEND +# fi + +# # STAGE 1.3 -- Tiff +# NEXT=1.4 +# if [[ $STAGE && $STAGE < $NEXT ]] ; then +# echo $BOUNDARYSTART +# ${SHELLROOT}/compileing/compile-Tiff.sh "$TARGET" "$CONFIGOPTS" +# complete_stage $NEXT $? +# echo $BOUNDARYEND +# fi + +# # STAGE 1.4 -- PNG +# NEXT=1.5 +# if [[ $STAGE && $STAGE < $NEXT ]] ; then +# echo $BOUNDARYSTART +# ${SHELLROOT}/compileing/compile-PNG.sh "$TARGET" "$CONFIGOPTS" +# complete_stage $NEXT $? +# echo $BOUNDARYEND +# fi + +# # STAGE 1.5 -- FreeType +# NEXT=1.6 +# if [[ $STAGE && $STAGE < $NEXT ]] ; then +# echo $BOUNDARYSTART +# ${SHELLROOT}/compileing/compile-FreeType.sh "$TARGET" "$CONFIGOPTS" +# complete_stage $NEXT $? +# echo $BOUNDARYEND +# fi + +# # STAGE 1.6 -- OpenEXR +# NEXT=2.1 +# if [[ $STAGE && $STAGE < $NEXT ]] ; then +# echo $BOUNDARYSTART +# ${SHELLROOT}/compileing/compile-OpenEXR.sh "$TARGET" "$CONFIGOPTS" +# complete_stage $NEXT $? +# echo $BOUNDARYEND +# fi # STAGE 2.1 -- OpenImageIO NEXT=2.2 @@ -146,92 +146,92 @@ if [[ $STAGE && $STAGE < $NEXT ]] ; then echo $BOUNDARYEND fi -# STAGE 3 -- Qt -NEXT=4.1 -if [[ $STAGE && $STAGE < $NEXT ]] ; then - echo $BOUNDARYSTART - ${SHELLROOT}/compileing/compile-qt.sh "$TARGET" "$CONFIGOPTS" - complete_stage $NEXT $? - echo $BOUNDARYEND -fi - -# STAGE 4.1 -- Embree -NEXT=4.2 -if [[ $STAGE && $STAGE < $NEXT ]] ; then - echo $BOUNDARYSTART - ${SHELLROOT}/compileing/compile-Embree.sh "$TARGET" - complete_stage $NEXT $? - echo $BOUNDARYEND -fi - -# STAGE 4.2 -- Oidn -NEXT=4.3 -if [[ $STAGE && $STAGE < $NEXT ]] ; then - echo $BOUNDARYSTART - ${SHELLROOT}/compileing/compile-Oidn.sh "$TARGET" - complete_stage $NEXT $? - echo $BOUNDARYEND -fi - -# STAGE 4.3 -- C-blosc -NEXT=4.4 -if [[ $STAGE && $STAGE < $NEXT ]] ; then - echo $BOUNDARYSTART - ${SHELLROOT}/compileing/compile-CBlosc.sh "$TARGET" - complete_stage $NEXT $? - echo $BOUNDARYEND -fi - -# STAGE 4.4 -- TBB -NEXT=4.5 -if [[ $STAGE && $STAGE < $NEXT ]] ; then - echo $BOUNDARYSTART - ${SHELLROOT}/compileing/compile-TBB.sh "$TARGET" - complete_stage $NEXT $? - echo $BOUNDARYEND -fi - -# STAGE 4.5 -- NVRTC -NEXT=5 -if [[ $STAGE && $STAGE < $NEXT ]] ; then - echo $BOUNDARYSTART - ${SHELLROOT}/compileing/compile-NVRTC.sh "$TARGET" - complete_stage $NEXT $? - echo $BOUNDARYEND -fi - - - -# STAGE 5 -- LuxCore -NEXT=6 -if [[ $STAGE && $STAGE < $NEXT ]] ; then - echo $BOUNDARYSTART - ${SHELLROOT}/compileing/compile-LuxCore.sh "$TARGET" - complete_stage $NEXT $? - echo -n "export PATH=${SHELLROOT}/LuxCore/bin:\$PATH" | sudo tee -a /etc/profile - echo -e "\n\n" - echo $BOUNDARYEND -fi - -# STAGE 6 -- LuxMark -NEXT=7 -if [[ $STAGE && $STAGE < $NEXT ]] ; then - echo $BOUNDARYSTART - ${SHELLROOT}/compileing/compile-LuxMark.sh - complete_stage $NEXT $? - echo $BOUNDARYEND -fi - -# 编译已经完成,执行 install脚本,完成最后的安装部署 -echo $BOUNDARYSTART -echo -e "\n 正在完成最后的安装部署\n" -if ! ${SHELLROOT}/utils/install "$TARGET" "LuxCore" "${SHELLROOT}/distfiles" ; then - echo " * 安装失败" -else - echo -e "\n * 安装成功 $TARGET/$LUX_TAG" - echo -e " * 恭喜你,LuxCore已经编译安装成功\n" -fi -echo $BOUNDARYEND +# # STAGE 3 -- Qt +# NEXT=4.1 +# if [[ $STAGE && $STAGE < $NEXT ]] ; then +# echo $BOUNDARYSTART +# ${SHELLROOT}/compileing/compile-qt.sh "$TARGET" "$CONFIGOPTS" +# complete_stage $NEXT $? +# echo $BOUNDARYEND +# fi + +# # STAGE 4.1 -- Embree +# NEXT=4.2 +# if [[ $STAGE && $STAGE < $NEXT ]] ; then +# echo $BOUNDARYSTART +# ${SHELLROOT}/compileing/compile-Embree.sh "$TARGET" +# complete_stage $NEXT $? +# echo $BOUNDARYEND +# fi + +# # STAGE 4.2 -- Oidn +# NEXT=4.3 +# if [[ $STAGE && $STAGE < $NEXT ]] ; then +# echo $BOUNDARYSTART +# ${SHELLROOT}/compileing/compile-Oidn.sh "$TARGET" +# complete_stage $NEXT $? +# echo $BOUNDARYEND +# fi + +# # STAGE 4.3 -- C-blosc +# NEXT=4.4 +# if [[ $STAGE && $STAGE < $NEXT ]] ; then +# echo $BOUNDARYSTART +# ${SHELLROOT}/compileing/compile-CBlosc.sh "$TARGET" +# complete_stage $NEXT $? +# echo $BOUNDARYEND +# fi + +# # STAGE 4.4 -- TBB +# NEXT=4.5 +# if [[ $STAGE && $STAGE < $NEXT ]] ; then +# echo $BOUNDARYSTART +# ${SHELLROOT}/compileing/compile-TBB.sh "$TARGET" +# complete_stage $NEXT $? +# echo $BOUNDARYEND +# fi + +# # STAGE 4.5 -- NVRTC +# NEXT=5 +# if [[ $STAGE && $STAGE < $NEXT ]] ; then +# echo $BOUNDARYSTART +# ${SHELLROOT}/compileing/compile-NVRTC.sh "$TARGET" +# complete_stage $NEXT $? +# echo $BOUNDARYEND +# fi + + + +# # STAGE 5 -- LuxCore +# NEXT=6 +# if [[ $STAGE && $STAGE < $NEXT ]] ; then +# echo $BOUNDARYSTART +# ${SHELLROOT}/compileing/compile-LuxCore.sh "$TARGET" +# complete_stage $NEXT $? +# echo -n "export PATH=${SHELLROOT}/LuxCore/bin:\$PATH" | sudo tee -a /etc/profile +# echo -e "\n\n" +# echo $BOUNDARYEND +# fi + +# # STAGE 6 -- LuxMark +# NEXT=7 +# if [[ $STAGE && $STAGE < $NEXT ]] ; then +# echo $BOUNDARYSTART +# ${SHELLROOT}/compileing/compile-LuxMark.sh +# complete_stage $NEXT $? +# echo $BOUNDARYEND +# fi + +# # 编译已经完成,执行 install脚本,完成最后的安装部署 +# echo $BOUNDARYSTART +# echo -e "\n 正在完成最后的安装部署\n" +# if ! ${SHELLROOT}/utils/install "$TARGET" "LuxCore" "${SHELLROOT}/distfiles" ; then +# echo " * 安装失败" +# else +# echo -e "\n * 安装成功 $TARGET/$LUX_TAG" +# echo -e " * 恭喜你,LuxCore已经编译安装成功\n" +# fi +# echo $BOUNDARYEND sleep 2 diff --git a/build-64-sse2 b/build-64-sse2 index 11a85d0..1695967 100755 --- a/build-64-sse2 +++ b/build-64-sse2 @@ -56,9 +56,9 @@ echo $BOUNDARYEND -# # 执行 build构建脚本,如果脚本执行错误,将终止脚本运行 -# if ! $ROOT/build "$ROOT" "$TARGET" "$WORK" "$DIST" "$LUX_TAG" "$GENERIC_FLAGS" "$LUX_FLAGS" "$CHOST" "$STAGE" -# then -# exit 1 -# fi -# exit 0 +# 执行 build构建脚本,如果脚本执行错误,将终止脚本运行 +if ! $ROOT/build "$ROOT" "$TARGET" "$WORK" "$DIST" "$LUX_TAG" "$GENERIC_FLAGS" "$LUX_FLAGS" "$CHOST" "$STAGE" +then + exit 1 +fi +exit 0