WIP cmake package

PX4 · Apr 14, 2018 · 3f8a59b · 3f8a59b
1 parent e9aa79e
commit 3f8a59b
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 4 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -75,7 +75,6 @@ pipeline {
             builds[node_name] = createBuildNode(docker_nuttx, "${node_name}_default")
           }
 
-          builds["sitl"] = createBuildNode(docker_base, 'posix_sitl_default')
           builds["sitl_rtps"] = createBuildNode(docker_base, 'posix_sitl_rtps')
           builds["sitl (GCC 7)"] = createBuildNode(docker_arch, 'posix_sitl_default')
 
@@ -88,6 +87,27 @@ pipeline {
           builds["eagle (linux)"] = createBuildNodeDockerLogin(docker_snapdragon, 'docker_hub_dagar', 'posix_eagle_default')
           builds["eagle (qurt)"] = createBuildNodeDockerLogin(docker_snapdragon, 'docker_hub_dagar', 'qurt_eagle_default')
 
+          // posix_sitl_default with package
+          builds["sitl"] = {
+            node {
+              stage("Build Test sitl") {
+                docker.image(docker_base).inside('-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw') {
+                  stage("sitl") {
+                    checkout scm
+                    sh "export"
+                    sh "make distclean"
+                    sh "ccache -z"
+                    sh "make posix_sitl_default"
+                    sh "ccache -s"
+                    sh "make posix_sitl_default package"
+                    stash name: "px4_sitl_package", includes: "build/**/*.zip"
+                    sh "make distclean"
+                  }
+                }
+              }
+            }
+          }
+
           // MAC OS posix_sitl_default
           builds["sitl (OSX)"] = {
             node('mac') {

diff --git a/platforms/posix/CMakeLists.txt b/platforms/posix/CMakeLists.txt
@@ -97,7 +97,19 @@ endif()
 #
 
 install(TARGETS px4 DESTINATION ${CMAKE_INSTALL_BINDIR})
-install(DIRECTORY ${PROJECT_SOURCE_DIR}/ROMFS DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME})
-install(DIRECTORY ${PROJECT_SOURCE_DIR}/posix-configs DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME})
-
 
+install(
+	DIRECTORY
+		${PROJECT_SOURCE_DIR}/ROMFS DESTINATION
+		${PROJECT_SOURCE_DIR}/posix-configs DESTINATION
+		${PROJECT_SOURCE_DIR}/launch DESTINATION
+		${PROJECT_SOURCE_DIR}/test DESTINATION
+		${PROJECT_SOURCE_DIR}/Tools/ecl_ekf
+	DESTINATION
+		${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}
+	)
+
+install(
+	FILES ${PROJECT_SOURCE_DIR}/Tools/jMAVSim/out/production/jmavsim_run.jar
+	DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}
+	)