Skip to content

Commit

Permalink
Docker: add local_integ, nlopt and google-perftools package. (ApolloA…
Browse files Browse the repository at this point in the history
  • Loading branch information
wanglei828 authored and xiaoxq committed Dec 7, 2017
1 parent 44f4a8f commit 878c8b9
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ before_script:
- if [ ! -d "${HOME}/.cache" ]; then mkdir ${HOME}/.cache; fi
- cp scripts/AGREEMENT.txt ${HOME}/.cache/.apollo_agreement.txt
script:
- ./docker/scripts/dev_start.sh dev-x86_64-20171204_1625-ci
- ./docker/scripts/dev_start.sh dev-x86_64-20171206_1627-ci
- ./apollo_docker.sh ${JOB}
- rm -rf "${HOME}/.cache/bazel/_bazel_${USER}/install"
notifications:
Expand Down
9 changes: 8 additions & 1 deletion WORKSPACE.in
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,20 @@ new_http_archive(
url = "https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.5.3.zip",
)

#IpOpt
# IpOpt
new_local_repository(
name = "ipopt",
build_file = "third_party/ipopt.BUILD",
path = "/usr/local/ipopt/include/coin",
)

# Local-integ
new_local_repository(
name = "local_integ",
build_file = "third_party/local_integ.BUILD",
path = "/usr/local/local_integ",
)

# Proj.4
new_http_archive(
name = "proj4",
Expand Down
2 changes: 1 addition & 1 deletion apollo_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function start_build_docker() {
}

function gen_docker() {
IMG="apolloauto/apollo:run-${MACHINE_ARCH}-20171129_1427"
IMG="apolloauto/apollo:run-${MACHINE_ARCH}-20171206_1627"
RELEASE_DIR=${HOME}/.cache/release
RELEASE_NAME="${DOCKER_REPO}:release-${MACHINE_ARCH}-${TIME}"
DEFAULT_NAME="${DOCKER_REPO}:release-${MACHINE_ARCH}-latest"
Expand Down
2 changes: 1 addition & 1 deletion docker/scripts/dev_start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

VERSION=""
ARCH=$(uname -m)
VERSION_X86_64="dev-x86_64-20171204_1625"
VERSION_X86_64="dev-x86_64-20171206_1627"
VERSION_AARCH64="dev-aarch64-20170927_1111"
if [[ $# == 1 ]];then
VERSION=$1
Expand Down
13 changes: 13 additions & 0 deletions third_party/local_integ.BUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package(default_visibility = ["//visibility:public"])

licenses(["notice"])

cc_library(
name = "local_integ",
srcs = [
"lib/liblocalization_msf_local_integ.so",
],
hdrs = [
"include/localization_integ.h",
],
)

0 comments on commit 878c8b9

Please sign in to comment.