From 780d147c01d127ce6e77835a86ad27cbb176f63e Mon Sep 17 00:00:00 2001 From: Anthony Lamping Date: Thu, 24 May 2018 17:11:08 -0400 Subject: [PATCH] cmake: package don't use bin and share dirs --- Jenkinsfile | 63 +++++++++++++++------------------- platforms/posix/CMakeLists.txt | 16 ++++----- 2 files changed, 35 insertions(+), 44 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ccd40e1fae..cf26ad62d9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -310,13 +310,12 @@ pipeline { sh 'make distclean; rm -rf .ros; rm -rf .gazebo' unstash 'px4_sitl_package' sh 'tar -xjpf build/posix_sitl_default/px4-posix_sitl_default*.bz2' - sh 'mv px4-posix_sitl_default*/bin/px4 px4-posix_sitl_default*/share/px4/' - sh 'px4-posix_sitl_default*/share/px4/test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=vtol_new_1 vehicle:=standard_vtol' - sh 'px4-posix_sitl_default*/share/px4/Tools/ecl_ekf/process_logdata_ekf.py `find . -name *.ulg -print -quit`' + sh 'px4-posix_sitl_default*/px4/test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=vtol_new_1 vehicle:=standard_vtol' + sh 'px4-posix_sitl_default*/px4/Tools/ecl_ekf/process_logdata_ekf.py `find . -name *.ulg -print -quit`' } post { always { - sh 'px4-posix_sitl_default*/share/px4/Tools/upload_log.py -q --description "${JOB_NAME}: ${STAGE_NAME}" --feedback "${JOB_NAME} ${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg' + sh 'px4-posix_sitl_default*/px4/Tools/upload_log.py -q --description "${JOB_NAME}: ${STAGE_NAME}" --feedback "${JOB_NAME} ${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg' archiveArtifacts '.ros/**/*.pdf' archiveArtifacts '.ros/**/*.csv' sh 'make distclean' @@ -341,13 +340,12 @@ pipeline { sh 'make distclean; rm -rf .ros; rm -rf .gazebo' unstash 'px4_sitl_package' sh 'tar -xjpf build/posix_sitl_default/px4-posix_sitl_default*.bz2' - sh 'mv px4-posix_sitl_default*/bin/px4 px4-posix_sitl_default*/share/px4/' - sh 'px4-posix_sitl_default*/share/px4/test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=vtol_new_1 vehicle:=tailsitter' - sh 'px4-posix_sitl_default*/share/px4/Tools/ecl_ekf/process_logdata_ekf.py `find . -name *.ulg -print -quit`' + sh 'px4-posix_sitl_default*/px4/test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=vtol_new_1 vehicle:=tailsitter' + sh 'px4-posix_sitl_default*/px4/Tools/ecl_ekf/process_logdata_ekf.py `find . -name *.ulg -print -quit`' } post { always { - sh 'px4-posix_sitl_default*/share/px4/Tools/upload_log.py -q --description "${JOB_NAME}: ${STAGE_NAME}" --feedback "${JOB_NAME} ${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg' + sh 'px4-posix_sitl_default*/px4/Tools/upload_log.py -q --description "${JOB_NAME}: ${STAGE_NAME}" --feedback "${JOB_NAME} ${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg' archiveArtifacts '.ros/**/*.pdf' archiveArtifacts '.ros/**/*.csv' sh 'make distclean' @@ -372,13 +370,12 @@ pipeline { sh 'make distclean; rm -rf .ros; rm -rf .gazebo' unstash 'px4_sitl_package' sh 'tar -xjpf build/posix_sitl_default/px4-posix_sitl_default*.bz2' - sh 'mv px4-posix_sitl_default*/bin/px4 px4-posix_sitl_default*/share/px4/' - sh 'px4-posix_sitl_default*/share/px4/test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=vtol_new_1 vehicle:=tiltrotor' - sh 'px4-posix_sitl_default*/share/px4/Tools/ecl_ekf/process_logdata_ekf.py `find . -name *.ulg -print -quit`' + sh 'px4-posix_sitl_default*/px4/test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=vtol_new_1 vehicle:=tiltrotor' + sh 'px4-posix_sitl_default*/px4/Tools/ecl_ekf/process_logdata_ekf.py `find . -name *.ulg -print -quit`' } post { always { - sh 'px4-posix_sitl_default*/share/px4/Tools/upload_log.py -q --description "${JOB_NAME}: ${STAGE_NAME}" --feedback "${JOB_NAME} ${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg' + sh 'px4-posix_sitl_default*/px4/Tools/upload_log.py -q --description "${JOB_NAME}: ${STAGE_NAME}" --feedback "${JOB_NAME} ${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg' archiveArtifacts '.ros/**/*.pdf' archiveArtifacts '.ros/**/*.csv' sh 'make distclean' @@ -403,13 +400,12 @@ pipeline { sh 'make distclean; rm -rf .ros; rm -rf .gazebo' unstash 'px4_sitl_package' sh 'tar -xjpf build/posix_sitl_default/px4-posix_sitl_default*.bz2' - sh 'mv px4-posix_sitl_default*/bin/px4 px4-posix_sitl_default*/share/px4/' - sh 'px4-posix_sitl_default*/share/px4/test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=vtol_new_2 vehicle:=standard_vtol' - sh 'px4-posix_sitl_default*/share/px4/Tools/ecl_ekf/process_logdata_ekf.py `find . -name *.ulg -print -quit`' + sh 'px4-posix_sitl_default*/px4/test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=vtol_new_2 vehicle:=standard_vtol' + sh 'px4-posix_sitl_default*/px4/Tools/ecl_ekf/process_logdata_ekf.py `find . -name *.ulg -print -quit`' } post { always { - sh 'px4-posix_sitl_default*/share/px4/Tools/upload_log.py -q --description "${JOB_NAME}: ${STAGE_NAME}" --feedback "${JOB_NAME} ${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg' + sh 'px4-posix_sitl_default*/px4/Tools/upload_log.py -q --description "${JOB_NAME}: ${STAGE_NAME}" --feedback "${JOB_NAME} ${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg' archiveArtifacts '.ros/**/*.pdf' archiveArtifacts '.ros/**/*.csv' sh 'make distclean' @@ -434,13 +430,12 @@ pipeline { sh 'make distclean; rm -rf .ros; rm -rf .gazebo' unstash 'px4_sitl_package' sh 'tar -xjpf build/posix_sitl_default/px4-posix_sitl_default*.bz2' - sh 'mv px4-posix_sitl_default*/bin/px4 px4-posix_sitl_default*/share/px4/' - sh 'px4-posix_sitl_default*/share/px4/test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=vtol_old_1 vehicle:=standard_vtol' - sh 'px4-posix_sitl_default*/share/px4/Tools/ecl_ekf/process_logdata_ekf.py `find . -name *.ulg -print -quit`' + sh 'px4-posix_sitl_default*/px4/test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=vtol_old_1 vehicle:=standard_vtol' + sh 'px4-posix_sitl_default*/px4/Tools/ecl_ekf/process_logdata_ekf.py `find . -name *.ulg -print -quit`' } post { always { - sh 'px4-posix_sitl_default*/share/px4/Tools/upload_log.py -q --description "${JOB_NAME}: ${STAGE_NAME}" --feedback "${JOB_NAME} ${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg' + sh 'px4-posix_sitl_default*/px4/Tools/upload_log.py -q --description "${JOB_NAME}: ${STAGE_NAME}" --feedback "${JOB_NAME} ${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg' archiveArtifacts '.ros/**/*.pdf' archiveArtifacts '.ros/**/*.csv' sh 'make distclean' @@ -465,13 +460,12 @@ pipeline { sh 'make distclean; rm -rf .ros; rm -rf .gazebo' unstash 'px4_sitl_package' sh 'tar -xjpf build/posix_sitl_default/px4-posix_sitl_default*.bz2' - sh 'mv px4-posix_sitl_default*/bin/px4 px4-posix_sitl_default*/share/px4/' - sh 'px4-posix_sitl_default*/share/px4/test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=vtol_old_2 vehicle:=standard_vtol' - sh 'px4-posix_sitl_default*/share/px4/Tools/ecl_ekf/process_logdata_ekf.py `find . -name *.ulg -print -quit`' + sh 'px4-posix_sitl_default*/px4/test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=vtol_old_2 vehicle:=standard_vtol' + sh 'px4-posix_sitl_default*/px4/Tools/ecl_ekf/process_logdata_ekf.py `find . -name *.ulg -print -quit`' } post { always { - sh 'px4-posix_sitl_default*/share/px4/Tools/upload_log.py -q --description "${JOB_NAME}: ${STAGE_NAME}" --feedback "${JOB_NAME} ${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg' + sh 'px4-posix_sitl_default*/px4/Tools/upload_log.py -q --description "${JOB_NAME}: ${STAGE_NAME}" --feedback "${JOB_NAME} ${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg' archiveArtifacts '.ros/**/*.pdf' archiveArtifacts '.ros/**/*.csv' sh 'make distclean' @@ -496,13 +490,12 @@ pipeline { sh 'make distclean; rm -rf .ros; rm -rf .gazebo' unstash 'px4_sitl_package' sh 'tar -xjpf build/posix_sitl_default/px4-posix_sitl_default*.bz2' - sh 'mv px4-posix_sitl_default*/bin/px4 px4-posix_sitl_default*/share/px4/' - sh 'px4-posix_sitl_default*/share/px4/test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=multirotor_box vehicle:=iris' - sh 'px4-posix_sitl_default*/share/px4/Tools/ecl_ekf/process_logdata_ekf.py `find . -name *.ulg -print -quit`' + sh 'px4-posix_sitl_default*/px4/test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=multirotor_box vehicle:=iris' + sh 'px4-posix_sitl_default*/px4/Tools/ecl_ekf/process_logdata_ekf.py `find . -name *.ulg -print -quit`' } post { always { - sh 'px4-posix_sitl_default*/share/px4/Tools/upload_log.py -q --description "${JOB_NAME}: ${STAGE_NAME}" --feedback "${JOB_NAME} ${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg' + sh 'px4-posix_sitl_default*/px4/Tools/upload_log.py -q --description "${JOB_NAME}: ${STAGE_NAME}" --feedback "${JOB_NAME} ${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg' archiveArtifacts '.ros/**/*.pdf' archiveArtifacts '.ros/**/*.csv' sh 'make distclean' @@ -527,13 +520,12 @@ pipeline { sh 'make distclean; rm -rf .ros; rm -rf .gazebo' unstash 'px4_sitl_package' sh 'tar -xjpf build/posix_sitl_default/px4-posix_sitl_default*.bz2' - sh 'mv px4-posix_sitl_default*/bin/px4 px4-posix_sitl_default*/share/px4/' - sh 'px4-posix_sitl_default*/share/px4/test/rostest_px4_run.sh mavros_posix_tests_offboard_attctl.test' - sh 'px4-posix_sitl_default*/share/px4/Tools/ecl_ekf/process_logdata_ekf.py `find . -name *.ulg -print -quit`' + sh 'px4-posix_sitl_default*/px4/test/rostest_px4_run.sh mavros_posix_tests_offboard_attctl.test' + sh 'px4-posix_sitl_default*/px4/Tools/ecl_ekf/process_logdata_ekf.py `find . -name *.ulg -print -quit`' } post { always { - sh 'px4-posix_sitl_default*/share/px4/Tools/upload_log.py -q --description "${JOB_NAME}: ${STAGE_NAME}" --feedback "${JOB_NAME} ${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg' + sh 'px4-posix_sitl_default*/px4/Tools/upload_log.py -q --description "${JOB_NAME}: ${STAGE_NAME}" --feedback "${JOB_NAME} ${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg' archiveArtifacts '.ros/**/*.pdf' archiveArtifacts '.ros/**/*.csv' sh 'make distclean' @@ -558,13 +550,12 @@ pipeline { sh 'make distclean; rm -rf .ros; rm -rf .gazebo' unstash 'px4_sitl_package' sh 'tar -xjpf build/posix_sitl_default/px4-posix_sitl_default*.bz2' - sh 'mv px4-posix_sitl_default*/bin/px4 px4-posix_sitl_default*/share/px4/' - sh 'px4-posix_sitl_default*/share/px4/test/rostest_px4_run.sh mavros_posix_tests_offboard_posctl.test' - sh 'px4-posix_sitl_default*/share/px4/Tools/ecl_ekf/process_logdata_ekf.py `find . -name *.ulg -print -quit`' + sh 'px4-posix_sitl_default*/px4/test/rostest_px4_run.sh mavros_posix_tests_offboard_posctl.test' + sh 'px4-posix_sitl_default*/px4/Tools/ecl_ekf/process_logdata_ekf.py `find . -name *.ulg -print -quit`' } post { always { - sh 'px4-posix_sitl_default*/share/px4/Tools/upload_log.py -q --description "${JOB_NAME}: ${STAGE_NAME}" --feedback "${JOB_NAME} ${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg' + sh 'px4-posix_sitl_default*/px4/Tools/upload_log.py -q --description "${JOB_NAME}: ${STAGE_NAME}" --feedback "${JOB_NAME} ${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/rootfs/fs/microsd/log/*/*.ulg' archiveArtifacts '.ros/**/*.pdf' archiveArtifacts '.ros/**/*.csv' sh 'make distclean' diff --git a/platforms/posix/CMakeLists.txt b/platforms/posix/CMakeLists.txt index 26405401c9..e845212494 100644 --- a/platforms/posix/CMakeLists.txt +++ b/platforms/posix/CMakeLists.txt @@ -97,7 +97,7 @@ install( TARGETS px4 DESTINATION - ${CMAKE_INSTALL_BINDIR} + ${PROJECT_NAME} ) # px4 dirs @@ -109,7 +109,7 @@ install( ${PROJECT_SOURCE_DIR}/ROMFS ${PROJECT_SOURCE_DIR}/test DESTINATION - ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME} + ${PROJECT_NAME} USE_SOURCE_PERMISSIONS ) @@ -119,7 +119,7 @@ install( ${PROJECT_SOURCE_DIR}/CMakeLists.txt ${PROJECT_SOURCE_DIR}/package.xml DESTINATION - ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME} + ${PROJECT_NAME} ) # px4 Tools dirs @@ -127,7 +127,7 @@ install( DIRECTORY ${PROJECT_SOURCE_DIR}/Tools/ecl_ekf DESTINATION - ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/Tools + ${PROJECT_NAME}/Tools USE_SOURCE_PERMISSIONS ) @@ -137,7 +137,7 @@ install( ${PROJECT_SOURCE_DIR}/Tools/setup_gazebo.bash ${PROJECT_SOURCE_DIR}/Tools/upload_log.py DESTINATION - ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/Tools + ${PROJECT_NAME}/Tools ) # sitl_gazebo built plugins @@ -145,7 +145,7 @@ install( DIRECTORY ${PROJECT_SOURCE_DIR}/build/posix_sitl_default/build_gazebo DESTINATION - ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/build/posix_sitl_default + ${PROJECT_NAME}/build/posix_sitl_default FILES_MATCHING PATTERN "CMakeFiles" EXCLUDE PATTERN "*.so" @@ -157,7 +157,7 @@ install( ${PROJECT_SOURCE_DIR}/Tools/sitl_gazebo/models ${PROJECT_SOURCE_DIR}/Tools/sitl_gazebo/worlds DESTINATION - ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/Tools/sitl_gazebo + ${PROJECT_NAME}/Tools/sitl_gazebo ) # sitl_gazebo files @@ -166,5 +166,5 @@ install( ${PROJECT_SOURCE_DIR}/Tools/sitl_gazebo/CMakeLists.txt ${PROJECT_SOURCE_DIR}/Tools/sitl_gazebo/package.xml DESTINATION - ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/Tools/sitl_gazebo + ${PROJECT_NAME}/Tools/sitl_gazebo ) \ No newline at end of file