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

Final modifications

This commit is contained in:
Maxime Gimeno 2021-02-16 09:21:30 +01:00
parent 7b23a8f8f1
commit f4c049ba1e
2 changed files with 24 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Scripts/developer_scripts/autotest_cgal
View File

@ -624,9 +624,9 @@ if [ -f '${LIST_TEST_PACKAGES}' ]; then
mkdir '${CGAL_BINARY_DIR}/test' mkdir '${CGAL_BINARY_DIR}/test'
cp '${CGAL_TEST_DIR}/collect_cgal_testresults_from_cmake' '${CGAL_BINARY_DIR}/test' cp '${CGAL_TEST_DIR}/collect_cgal_testresults_from_cmake' '${CGAL_BINARY_DIR}/test'
cp '${CGAL_TEST_DIR}/makefile2' '${CGAL_BINARY_DIR}/test' cp '${CGAL_TEST_DIR}/makefile2' '${CGAL_BINARY_DIR}/test'
cp '${CGAL_TEST_DIR}/run_testsuite_with_cmake' '${CGAL_BINARY_DIR}/test' cp '${CGAL_TEST_DIR}/run_testsuite_with_cmake' '${CGAL_BINARY_DIR}/test'
for PACKAGE in \`source '${LIST_TEST_PACKAGES}' '${CGAL_ROOT}'\`; do for PACKAGE in \`source '${LIST_TEST_PACKAGES}' '${CGAL_ROOT}'\`; do
@ -649,39 +649,27 @@ 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';
echo "cp ${CGAL_TEST_DIR}/../developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh ${CGAL_BINARY_DIR}/test" 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" cp "${CGAL_TEST_DIR}/../developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh" "${CGAL_BINARY_DIR}/test"
EOF EOF
cat >> "$file" <<'EOF' cat >> "$file" <<'EOF'
for demo_dir in *_Demo; do for demo_dir in *_Demo; do
echo "pushd ${demo_dir}" echo "pushd ${demo_dir}"
pushd "${demo_dir}" pushd "${demo_dir}"
bash ../cgal_demo_copy_all_dlls_cygwin.sh "${demo_dir}_with_dlls" bash ../cgal_demo_copy_all_dlls_cygwin.sh "${demo_dir}_with_dlls"
mv "${demo_dir}_with_dlls" .. mv "${demo_dir}_with_dlls" ..
popd popd
done done
EOF EOF
cat >> "$file" <<EOF cat >> "$file" <<EOF
tar czvf "${CGAL_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar.gz" *_Demo_with_dlls/* 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 ..;

14
Scripts/developer_scripts/cgal_demo_copy_all_dlls_cygwin.sh
View File

@ -4,10 +4,10 @@
#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
#No config : in autotest_cgal we use NMake as generator #No config : in autotest_cgal we use NMake as generator
#If you are using Visual as Generator, declare config="Release" #If using MSVC Generator, declare config="Release"
declare config="$PWD" declare config=""
declare target_directory="$1" declare target_directory="$1"
if [[ ! -d "$target_directory" ]] if [[ ! -d "$target_directory" ]]
@ -23,9 +23,9 @@ copy_dll()
} }
files=($config/*.exe) files=($PWD/$config/*.exe)
files+=($config/*.dll) files+=($PWD/$config/*.dll)
files+=(Plugins/*/$config/*.dll) files+=($PWD/Plugins/*/$config/*.dll)
for file in "${files[@]}"; do for file in "${files[@]}"; do
@ -38,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"