From bd655cccfd13358884cf0e8ab2f5d1f9a36be44d Mon Sep 17 00:00:00 2001 From: Reinhard Resch <mbdyn-user@a1.net> Date: Sat, 3 Aug 2024 16:06:38 +0200 Subject: [PATCH 1/2] Fix "make dist" --- libraries/libmbmath/Makefile.am | 1 - manual/Makefile.am | 1 - modules/Makefile.am | 2 -- testsuite/mbdyn-build-job.yml | 2 ++ testsuite/mbdyn_build_job.sh | 6 ++++++ 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libraries/libmbmath/Makefile.am b/libraries/libmbmath/Makefile.am index 3c02fbe20..d6d2debe1 100644 --- a/libraries/libmbmath/Makefile.am +++ b/libraries/libmbmath/Makefile.am @@ -31,7 +31,6 @@ matvec3n.cc \ matvec3n.h \ matvec6.cc \ matvec6.h \ -matvecass.h \ matvecexp.cc \ matvecexp.h \ mbcomm.h \ diff --git a/manual/Makefile.am b/manual/Makefile.am index 3b8f85c31..c2583707b 100644 --- a/manual/Makefile.am +++ b/manual/Makefile.am @@ -57,7 +57,6 @@ tecman/invdyn.tex \ tecman/tecman-aero.tex \ tecman/tecman-modal.tex \ tecman/tecman-vb.tex \ -s11044-021-09806-9.pdf \ tecman/shellPic.eps \ tecman/tecman-aero-unsteady.tex \ tecman/Screw_sketch_2D.eps \ diff --git a/modules/Makefile.am b/modules/Makefile.am index 8c01aba7b..fae4bc161 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -174,7 +174,6 @@ module-autodiff_test/examples/deformable_joint_ad.nod \ module-autodiff_test/examples/deformable_joint_ad.ref \ module-autodiff_test/examples/deformable_joint_ad.set \ module-autodiff_test/examples/deformable_joint_ad_f77.mbdyn \ -module-autodiff_test/examples/deformable_joint_ad_tmp.mbdyn \ module-autodiff_test/examples/deformable_joint_ad_trad.mbdyn \ module-autodiff_test/examples/inline_joint_ad.mbdyn \ module-autodiff_test/examples/inline_joint_ad_2.mbdyn \ @@ -386,7 +385,6 @@ module-multi_step_drive/module-multi_step_drive.h \ module-multi_step_drive/multi_step.mbdyn EXTRA_DIST += \ -module-muscles/muscle_test \ module-muscles/module-muscles.cc EXTRA_DIST += \ diff --git a/testsuite/mbdyn-build-job.yml b/testsuite/mbdyn-build-job.yml index 552a4c1c5..42f15c899 100644 --- a/testsuite/mbdyn-build-job.yml +++ b/testsuite/mbdyn-build-job.yml @@ -79,6 +79,7 @@ mbdyn-build-job: # This job runs in the build stage, which runs first. paths: - $MBD_INSTALL_PREFIX - $MBD_BUILD_DIR/**/config.log + - $MBD_BUILD_DIR/**/mbdyn-*.tar.gz - $MBD_TEST_PROGS_OUTPUT_DIR/**/*.xml - $OCT_PKG_INSTALL_PREFIX ## Because mbdyn_util_oct will be installed there! when: always @@ -186,6 +187,7 @@ mbdyn-build-job-gcov: # This job runs in the build stage, which runs first name: ${CI_JOB_NAME_SLUG}-${CI_COMMIT_REF_SLUG} paths: - $MBD_BUILD_DIR_GCOV/**/config.log + - $MBD_BUILD_DIR_GCOV/**/mbdyn-*.tar.gz - $MBD_BUILD_DIR_GCOV/**/*.cc ## Source files of modules are needed for gcovr - $MBD_BUILD_DIR_GCOV/**/*.h - $MBD_BUILD_DIR_GCOV/**/*.hc diff --git a/testsuite/mbdyn_build_job.sh b/testsuite/mbdyn_build_job.sh index ed412ab52..a0437d1f3 100755 --- a/testsuite/mbdyn_build_job.sh +++ b/testsuite/mbdyn_build_job.sh @@ -435,6 +435,12 @@ if ! make install; then exit 1 fi +printf "Build mbdyn-*.tar.gz" +if ! make dist; then + echo "make dist failed" + exit 1 +fi + echo "MBDyn version:" if ! ${MBD_INSTALL_PREFIX}/bin/mbdyn --version; then echo "MBDyn's binary is not executable" -- GitLab From a00bd75ed03a7184fdb350c3322195f12f71305f Mon Sep 17 00:00:00 2001 From: Reinhard Resch <mbdyn-user@a1.net> Date: Sat, 3 Aug 2024 16:08:54 +0200 Subject: [PATCH 2/2] Cleanup white-space --- testsuite/mbdyn-build-job.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testsuite/mbdyn-build-job.yml b/testsuite/mbdyn-build-job.yml index 42f15c899..66e065e90 100644 --- a/testsuite/mbdyn-build-job.yml +++ b/testsuite/mbdyn-build-job.yml @@ -187,7 +187,7 @@ mbdyn-build-job-gcov: # This job runs in the build stage, which runs first name: ${CI_JOB_NAME_SLUG}-${CI_COMMIT_REF_SLUG} paths: - $MBD_BUILD_DIR_GCOV/**/config.log - - $MBD_BUILD_DIR_GCOV/**/mbdyn-*.tar.gz + - $MBD_BUILD_DIR_GCOV/**/mbdyn-*.tar.gz - $MBD_BUILD_DIR_GCOV/**/*.cc ## Source files of modules are needed for gcovr - $MBD_BUILD_DIR_GCOV/**/*.h - $MBD_BUILD_DIR_GCOV/**/*.hc -- GitLab