Browse Source

增加检测CPU平台信息功能,修复第二次编译时,创建软链接时失败致编译失败的问题,增加将LuxCore中bin目录加入环境变量的功能

master
yuanjiajia 2 years ago
parent
commit
3405a68ec6
  1. 1
      build
  2. 7
      first_run.sh
  3. 2
      installLib/cblosc-install.sh
  4. 2
      installLib/embree-install.sh
  5. 2
      installLib/oidn-install.sh
  6. 2
      installLib/qt-install.sh
  7. 2
      installLib/tbb-install.sh

1
build

@ -208,6 +208,7 @@ if [[ $STAGE && $STAGE < $NEXT ]] ; then
echo $BOUNDARYSTART echo $BOUNDARYSTART
${SHELLROOT}/compileing/compile-LuxCore.sh "$TARGET" ${SHELLROOT}/compileing/compile-LuxCore.sh "$TARGET"
complete_stage $NEXT $? complete_stage $NEXT $?
echo -n "export PATH=${SHELLROOT}/LuxCore/bin" | sudo tee -a /etc/profile
echo $BOUNDARYEND echo $BOUNDARYEND
fi fi

7
first_run.sh

@ -29,6 +29,7 @@ export BOUNDARYEND="<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
# patchelf 是一个用来修改elf格式的动态库和可执行程序的小工具,可以修改动态链接库的库名字,以及链接库的RPATH。 # patchelf 是一个用来修改elf格式的动态库和可执行程序的小工具,可以修改动态链接库的库名字,以及链接库的RPATH。
# RPATH规定了可执行文件在寻找.so文件时的第一优先位置。另外,elf文件中还规定了runpath。它与rpath # RPATH规定了可执行文件在寻找.so文件时的第一优先位置。另外,elf文件中还规定了runpath。它与rpath
# 相同,只是优先级低一些 # 相同,只是优先级低一些
# ocl-icd-opencl-dev 当 CPU平台 为 Intel 系列时,需要安装 libOpenCL.so 库
echo $BOUNDARYSTART echo $BOUNDARYSTART
echo -e "\n运行脚本需要使用下列工具,如果没有将会被安装,按回车键继 ……" echo -e "\n运行脚本需要使用下列工具,如果没有将会被安装,按回车键继 ……"
echo -e "\n\n[ libtool-bin cmake flex bison libgtk-3-dev libgl1-mesa-dev python3-dev python3-numpy git patchelf ]\n\n" echo -e "\n\n[ libtool-bin cmake flex bison libgtk-3-dev libgl1-mesa-dev python3-dev python3-numpy git patchelf ]\n\n"
@ -37,9 +38,9 @@ sudo apt update
sudo apt install -y libtool-bin cmake flex bison libgtk-3-dev libgl1-mesa-dev python3-dev python3-numpy git patchelf sudo apt install -y libtool-bin cmake flex bison libgtk-3-dev libgl1-mesa-dev python3-dev python3-numpy git patchelf
echo -e "\n\n正在检查 CPU 平台 ……\n" echo -e "\n\n正在检查 CPU 平台 ……\n"
sleep 1 sleep 1
CPU=`cat /proc/cpuinfo | grep "model name"`
echo -e "$CPU\n\n"
if [ `echo $CPU | grep "Intel(R)"` ] ; then
CPUINFO=`cat /proc/cpuinfo | grep "model name"`
echo -e "$CPUINFO\n\n"
if [ `echo $CPUINFO | grep "Intel(R)"` ] ; then
sudo apt install ocl-icd-opencl-dev sudo apt install ocl-icd-opencl-dev
fi fi
echo -e "\n\n已经安装完成 运行脚本需要的工具 ……\n" echo -e "\n\n已经安装完成 运行脚本需要的工具 ……\n"

2
installLib/cblosc-install.sh

@ -12,3 +12,5 @@ mkdir -p $LIBRARY_INSTALL_DIR
cp -vr include/*.h $INCLUDE_INSTALL_DIR cp -vr include/*.h $INCLUDE_INSTALL_DIR
cp -vr lib/lib*.a $LIBRARY_INSTALL_DIR cp -vr lib/lib*.a $LIBRARY_INSTALL_DIR
exit 0;

2
installLib/embree-install.sh

@ -19,3 +19,5 @@ cp $LIBRARY_INSTALL_DIR/libtbb.so.12.1 $LIBRARY_INSTALL_DIR/libtbb.so.12
sudo cp $LIBRARY_INSTALL_DIR/libembree3.so.3 /usr/local/lib sudo cp $LIBRARY_INSTALL_DIR/libembree3.so.3 /usr/local/lib
sudo cp $LIBRARY_INSTALL_DIR/libembree3.so /usr/local/lib sudo cp $LIBRARY_INSTALL_DIR/libembree3.so /usr/local/lib
exit 0;

2
installLib/oidn-install.sh

@ -19,3 +19,5 @@ cp $LIBRARY_INSTALL_DIR/libtbb.so.12.1 $LIBRARY_INSTALL_DIR/libtbb.so.12
sudo ln -s ${LIBRARY_INSTALL_DIR}/libOpenImageDenoise.so /usr/local/lib/libOpenImageDenoise.so sudo ln -s ${LIBRARY_INSTALL_DIR}/libOpenImageDenoise.so /usr/local/lib/libOpenImageDenoise.so
sudo ln -s ${LIBRARY_INSTALL_DIR}/libOpenImageDenoise.so.1 /usr/local/lib/libOpenImageDenoise.so.1 sudo ln -s ${LIBRARY_INSTALL_DIR}/libOpenImageDenoise.so.1 /usr/local/lib/libOpenImageDenoise.so.1
sudo ln -s ${LIBRARY_INSTALL_DIR}/libOpenImageDenoise.so.1.4.0 /usr/local/lib/libOpenImageDenoise.so.1.4.0 sudo ln -s ${LIBRARY_INSTALL_DIR}/libOpenImageDenoise.so.1.4.0 /usr/local/lib/libOpenImageDenoise.so.1.4.0
exit 0;

2
installLib/qt-install.sh

@ -6,3 +6,5 @@ cp -av 5.12.2/gcc_64/include $1/qt5-v5.12.2
cp -av 5.12.2/gcc_64/lib $1/qt5-v5.12.2 cp -av 5.12.2/gcc_64/lib $1/qt5-v5.12.2
cp -av 5.12.2/gcc_64/mkspecs $1/qt5-v5.12.2 cp -av 5.12.2/gcc_64/mkspecs $1/qt5-v5.12.2
cp -av 5.12.2/gcc_64/plugins $1/qt5-v5.12.2 cp -av 5.12.2/gcc_64/plugins $1/qt5-v5.12.2
exit 0;

2
installLib/tbb-install.sh

@ -15,3 +15,5 @@ cp -vr ../tbb2019_20191006oss/lib/intel64/gcc4.8/lib* $LIBRARY_INSTALL_DIR
sudo ln -s ${LIBRARY_INSTALL_DIR}/libtbb.so.2 /usr/local/lib/libtbb.so.2 sudo ln -s ${LIBRARY_INSTALL_DIR}/libtbb.so.2 /usr/local/lib/libtbb.so.2
sudo ln -s ${LIBRARY_INSTALL_DIR}/libtbb.so.12 /usr/local/lib/libtbb.so.12 sudo ln -s ${LIBRARY_INSTALL_DIR}/libtbb.so.12 /usr/local/lib/libtbb.so.12
exit 0;
Loading…
Cancel
Save