Merge pull request #7312 from SaillantNicolas/Windows_precompiled_CGAL_3D_demos

Windows Precompiled CGAL 3D Demos
This commit is contained in:
Laurent Rineau 2023-06-07 15:15:51 +02:00
commit 7c0619b0d1
3 changed files with 44 additions and 2 deletions

View File

@ -16,6 +16,7 @@ export CURL="curl"
export CURL_OPTS="-k --remote-name --silent --location-trusted"
export CGAL_URL="https://cgal.geometryfactory.com/CGAL/Releases"
export UPLOAD_RESULT_DESTINATION="cgaltest@cgaltest.geometryfactory.com:incoming"
export UPLOAD_DEMOS_DESTINATION="cgaltest@cgaltest.geometryfactory.com:public_html/incoming"
export LATEST_LOCATION="${CGAL_URL}/LATEST"
export TAR="tar"
export GUNZIP="gunzip"

View File

@ -43,4 +43,4 @@ for file in "${files[@]}"; do
done; #check dependencies
done #loop over directories
mkdir -p "$target_directory/platforms"
cp "$Qt5_DIR/../../../plugins/platforms/qwindows.dll" "$target_directory/platforms"
cp "$Qt5_INSTALLATION_DIR/plugins/platforms/qwindows.dll" "$target_directory/platforms"

View File

@ -203,7 +203,45 @@ put_on_web()
"$SCP" "${1}" "$UPLOAD_RESULT_DESTINATION/$2" >> "${ACTUAL_LOGFILE}"
}
put_demos_on_web()
{
log "${ACTUAL_LOGFILE}" "Uploading demos ${1} to $UPLOAD_DEMOS_DESTINATION/$2"
"$SCP" "${1}" "$UPLOAD_DEMOS_DESTINATION/$2" >> "${ACTUAL_LOGFILE}"
}
collect_demos_binaries()
{
PLATFORM=${1}
cd "${CGAL_TEST_DIR}"
echo "COLLECT_DEMOS_BINARIES=$COLLECT_DEMOS_BINARIES"
if [ -n "$COLLECT_DEMOS_BINARIES" ]; then
echo 'COLLECTING DEMOS BINARIES'
DEMOS_TEST_DIR="${CGAL_DIR}/cmake/platforms/${PLATFORM}/test"
cp "${CGAL_DIR}/${SCRIPTS_DIR}developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh" "${DEMOS_TEST_DIR}"
cd ${DEMOS_TEST_DIR}
for demo_dir in *_Demo; do
echo "pushd ${demo_dir}"
pushd "${demo_dir}"
bash ${DEMOS_TEST_DIR}/cgal_demo_copy_all_dlls_cygwin.sh "${demo_dir}_with_dlls" "${CONFIG_TYPE}"
mv "${demo_dir}_with_dlls" ${DEMOS_TEST_DIR}
popd
done
${TAR} cf "demos_${CGAL_TESTER}_${PLATFORM}.tar" *_Demo_with_dlls/*;
${COMPRESSOR} -9f "demos_${CGAL_TESTER}_${PLATFORM}.tar"
mv "demos_${CGAL_TESTER}_${PLATFORM}.tar.gz" ${CGAL_TEST_DIR}
else
echo "Don't collect demos binaries for platform $PLATFORM";
fi
}
publish_results()
{
@ -241,7 +279,7 @@ publish_results()
log "${ACTUAL_LOGFILE}.test.${PLATFORM}" "PUTTING RESULTS ON THE WEB"
put_on_web "test_results-${HOST}_${PLATFORM}.tar.gz" "${FILENAME}"
if [ -e "demos_${CGAL_TESTER}_${PLATFORM}.tar.gz" ]; then
put_on_web "demos_${CGAL_TESTER}_${PLATFORM}.tar.gz" "demos-${FILENAME}"
put_demos_on_web "demos_${CGAL_TESTER}_${PLATFORM}.tar.gz" "demos-${FILENAME}"
fi
log_done "${ACTUAL_LOGFILE}"
fi
@ -304,6 +342,7 @@ run_test_on_platform()
else
ctest ${TO_TEST:+-L ${TO_TEST} } ${CTEST_OPTS} -j${NUMBER_OF_PROCESSORS} ${KEEP_TESTS:+-FC .}|tee tmp.txt
fi
#####################
## GET RESULTS ##
#####################
@ -369,7 +408,9 @@ run_test_on_host()
for PLATFORM in ${PLATFORMS}; do
run_test_on_platform "${PLATFORM}"
collect_demos_binaries "${PLATFORM}"
publish_results "${PLATFORM}"
if [ -z "${KEEP_TESTS}" ]; then
rm -rf $CGAL_DIR/cmake/platforms/${PLATFORM}
fi