songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WIP

This commit is contained in:
Maxime Gimeno 2021-02-15 14:42:13 +01:00
parent 5bbc5f0d6f
commit 7b23a8f8f1
2 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Scripts/developer_scripts/autotest_cgal
View File

@ -649,14 +649,39 @@ else
fi fi
nice ${NICE_OPTIONS} make ${MAKE_OPTS} -k -fmakefile2; nice ${NICE_OPTIONS} make ${MAKE_OPTS} -k -fmakefile2;
EOF EOF
for file in "${CGAL_BINARY_DIR}/localtestscript" "${CGAL_BINARY_DIR}/localtestscript-redo-results-collection"; do for file in "${CGAL_BINARY_DIR}/localtestscript" "${CGAL_BINARY_DIR}/localtestscript-redo-results-collection"; do
cat >> "$file" <<EOF cat >> "$file" <<EOF
echo 'COLLECTING RESULTS'; echo 'COLLECTING RESULTS';
./collect_cgal_testresults_from_cmake; ./collect_cgal_testresults_from_cmake;
if [ -n "\$COLLECT_DEMOS_BINARIES" ]; then if [ -n "\$COLLECT_DEMOS_BINARIES" ]; then
echo 'COLLECTING DEMOS BINARIES'; echo 'COLLECTING DEMOS BINARIES';
tar czvf '${CGAL_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar.gz' *_Demo/*.exe *_Demo/*.dll *_Demo/*/*.dll *_Demo/*/*/*.dll echo "cp ${CGAL_TEST_DIR}/../developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh ${CGAL_BINARY_DIR}/test"
cp "${CGAL_TEST_DIR}/../developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh" "${CGAL_BINARY_DIR}/test"
EOF
cat >> "$file" <<'EOF'
for demo_dir in *_Demo; do
echo "pushd ${demo_dir}"
pushd "${demo_dir}"
bash ../cgal_demo_copy_all_dlls_cygwin.sh "${demo_dir}_with_dlls"
mv "${demo_dir}_with_dlls" ..
popd
done
EOF
cat >> "$file" <<EOF
tar czvf "${CGAL_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar.gz" *_Demo_with_dlls/*
fi fi
echo 'COPYING RESULTS';
cp "results_${CGAL_TESTER}_${PLATFORM}.tar.gz" "results_${CGAL_TESTER}_${PLATFORM}.txt" "${CGAL_TEST_DIR}";
cd ..;
EOF
done
if [ -z "${KEEP_TESTS}" ]; then
cat >> "${CGAL_BINARY_DIR}/localtestscript" <<EOF
echo 'REMOVING LOCAL_TEST_DIR';
rm -rf '${CGAL_BINARY_DIR}/test'
EOF
fi
echo 'COPYING RESULTS'; echo 'COPYING RESULTS';
cp 'results_${CGAL_TESTER}_${PLATFORM}.tar.gz' 'results_${CGAL_TESTER}_${PLATFORM}.txt' '${CGAL_TEST_DIR}'; cp 'results_${CGAL_TESTER}_${PLATFORM}.tar.gz' 'results_${CGAL_TESTER}_${PLATFORM}.txt' '${CGAL_TEST_DIR}';
cd ..; cd ..;

12
Scripts/developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh
View File

@ -3,9 +3,13 @@
#use this script from inside the build directory of the Polyhedron demo #use this script from inside the build directory of the Polyhedron demo
#Needs the Qt5_DIR env variable set to <Qt5_ROOT>/lib/cmake/Qt5 #Needs the Qt5_DIR env variable set to <Qt5_ROOT>/lib/cmake/Qt5
declare config="Release" #No config : in autotest_cgal we use NMake as generator
#If you are using Visual as Generator, declare config="Release"
declare config="$PWD"
declare target_directory="$1"
declare target_directory="CGAL_demo_with_dlls"
if [[ ! -d "$target_directory" ]] if [[ ! -d "$target_directory" ]]
then then
mkdir $target_directory mkdir $target_directory
@ -34,6 +38,6 @@ for file in "${files[@]}"; do
copy_dll "$dll" "$target_directory" copy_dll "$dll" "$target_directory"
done; #check dependencies done; #check dependencies
mkdir -p "$target_directory/platforms"
cp "$Qt5_DIR/../../../plugins/platforms/qwindows.dll" "$target_directory/platforms"
done #loop over directories done #loop over directories
mkdir -p "$target_directory/platforms"
cp "$Qt5_DIR/../../../plugins/platforms/qwindows.dll" "$target_directory/platforms"