Skip to content

Commit

Permalink
Merge remote-tracking branch 'apollo_1.5' into apollo
Browse files Browse the repository at this point in the history
  • Loading branch information
@startcode
startcode committed Sep 19, 2017
2 parents 77b6045 + 797c855 commit 9503421
Show file tree
Hide file tree
Showing 1,443 changed files with 493,187 additions and 32,847 deletions.
25 changes: 25 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
# Bazel
bazel-apollo
bazel-apollo_dev
bazel-bin
bazel-genfiles
bazel-out
bazel-testlogs
/Debug/
*.pyc
WORKSPACE
# temporary files
*.swp

# javascript
*bundle.js
Expand All @@ -15,6 +18,7 @@ node_modules
# generated files
generatedViews
generatedScripts
modules/common/data/ssl_keys
# database/log files
*.sqlite
dreamview.log
Expand All @@ -26,6 +30,9 @@ npm-debug.log
.settings
.classpath

# Vscode files
.vscode

# atom.io files
*.gch

Expand Down Expand Up @@ -54,6 +61,24 @@ data/log
data/core
data/bag
data/cov
data/pcd

# Doxygen
docs/doxygen

# Esd can lib
third_party/can_card_library/esd_can/include
third_party/can_card_library/esd_can/lib

# Map data files
modules/map/data

# python proto
py_proto

# gnss conf files
modules/drivers/gnss/conf/conf_beijing
modules/drivers/gnss/conf/conf_us

# calibration files
modules/calibration/data/mkz056
2 changes: 1 addition & 1 deletion FAQ.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Many build problems are related to the environment settings.
1. Run the script to get your environment: `bash scripts/env.sh >& env.txt`
2. Provide the content of env.txt in your post.

## Which ports need be white list to run Apollo in public cloud instance?
## Which ports must be whitelisted to run Apollo in a public cloud instance?
Use these ports for HMI and Dreamview:
- 8887: HMI
- 8888: Dreamview
Expand Down
181 changes: 89 additions & 92 deletions WORKSPACE.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,97 +40,6 @@ new_http_archive(
url = "https://github.com/google/benchmark/archive/v1.1.0.tar.gz",
)

# proto rules (Protobuf and GRPC)
http_archive(
name = "org_pubref_rules_protobuf",
sha256 = "646b39438d8eeba02d9af890dee444c7e4e9d08ae8611bc0e0621257010162db",
strip_prefix = "rules_protobuf-0.7.1",
url = "https://github.com/pubref/rules_protobuf/archive/v0.7.1.tar.gz",
)

load("@org_pubref_rules_protobuf//cpp:rules.bzl", "cpp_proto_repositories")

cpp_proto_repositories(
lang_deps = {
# Grpc repo is required by multiple languages but we put it here.
"com_github_grpc_grpc": {
"rule": "git_repository",
"remote": "https://github.com/grpc/grpc.git",
"init_submodules": True,
"commit": "3808b6efe66b87269d43847bc113e94e2d3d28fb",
#"tag": "v1.0.1",
},

# Hooray! The boringssl team provides a "chromium-stable-with-bazel" branch
# with all BUILD files ready to go.
"boringssl": {
"rule": "http_archive",
"url": "https://github.com/wanglei828/third-party/raw/master/chromium-stable-with-bazel.zip",
},

# libssl is required for c++ grpc where it is expected in
# //external:libssl. This can be either boringssl or openssl.
"libssl": {
"rule": "bind",
"actual": "@boringssl//boringssl-chromium-stable-with-bazel:ssl",
},

# C-library for zlib
"com_github_madler_zlib": {
"rule": "new_git_repository",
"remote": "https://github.com/madler/zlib",
"tag": "v1.2.8",
"build_file": "third_party/com_github_madler_zlib.BUILD",
},

# grpc++ expects //external:zlib
"zlib": {
"rule": "bind",
"actual": "@com_github_madler_zlib//:zlib",
},

# grpc++ expects "//external:protobuf_clib"
"protobuf_clib": {
"rule": "bind",
"actual": "@com_github_google_protobuf//:protobuf",
},

# grpc++ expects //external:nanopb
"nanopb": {
"rule": "bind",
"actual": "@com_github_grpc_grpc//third_party/nanopb",
},

# Bind the executable cc_binary grpc plugin into
# //external:protoc_gen_grpc_cpp. Expects
# //external:protobuf_compiler. TODO: is it really necessary to
# bind it in external?
"protoc_gen_grpc_cpp": {
"rule": "bind",
"actual": "@com_github_grpc_grpc//:grpc_cpp_plugin",
},

# Bind the protobuf proto_lib into //external. Required for
# compiling the protoc_gen_grpc plugin
"protobuf_compiler": {
"rule": "bind",
"actual": "@com_github_google_protobuf//:protoc_lib",
},

# GTest is for our own internal cc tests.
"gtest": {
"rule": "new_git_repository",
"remote": "https://github.com/google/googletest.git",
"commit": "ed9d1e1ff92ce199de5ca2667a667cd0a368482a",
"build_file": "third_party/protobuf_gtest.BUILD",
},
},
)

load("@org_pubref_rules_protobuf//python:rules.bzl", "py_proto_repositories")

py_proto_repositories()

# cpplint from google style guide
new_git_repository(
name = "google_styleguide",
Expand Down Expand Up @@ -171,5 +80,93 @@ new_http_archive(
name = "ros",
build_file = "third_party/ros.BUILD",
strip_prefix = "ros",
url = "https://github.com/ApolloAuto/apollo-platform/releases/download/1.0.0/ros-indigo-apollo-1.0.0.MACHINE_ARCH.tar.gz",
url = "https://github.com/ApolloAuto/apollo-platform/releases/download/1.5.0/ros-indigo-apollo-1.5.0-MACHINE_ARCH.tar.gz",
)

# OpenCV 2.4.13.2
new_http_archive(
name = "opencv2",
build_file = "third_party/opencv2.BUILD",
strip_prefix = "opencv-2.4.13.2",
url = "https://github.com/opencv/opencv/archive/2.4.13.2.zip",
)

# PCL 1.7
# =======
# This requires libpcl-dev to be installed in your Ubuntu/Debian.
new_local_repository(
name = "pcl",
build_file = "third_party/pcl.BUILD",
path = "/usr/local/include/pcl-1.7",
)

new_local_repository(
name = "glew",
build_file = "third_party/glew.BUILD",
path = "/usr/include",
)

new_local_repository(
name = "opengl",
build_file = "third_party/opengl.BUILD",
path = "/usr/include",
)

new_local_repository(
name = "glfw",
build_file = "third_party/glfw.BUILD",
path = "/usr/include",
)

new_local_repository(
name = "vtk",
build_file = "third_party/vtk.BUILD",
path = "/usr/include/vtk-5.8",
)

# Caffe
new_local_repository(
name = "caffe",
build_file = "third_party/caffe.BUILD",
path = "/usr/include/caffe",
)

# YAML-CPP
new_http_archive(
name = "yaml_cpp",
build_file = "third_party/yaml_cpp.BUILD",
strip_prefix = "yaml-cpp-yaml-cpp-0.5.3",
url = "https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-0.5.3.zip",
)

# qpOASES
new_http_archive(
name = "qp_oases",
build_file = "third_party/qp_oases.BUILD",
sha256 = "ae15eee80455c26d0c26078498893582b67b1d71df18f14f12591023561e5f88",
strip_prefix = "qpOASES-3.2.1",
url = "https://www.coin-or.org/download/source/qpOASES/qpOASES-3.2.1.zip",
)

# Proj.4
new_http_archive(
name = "proj4",
build_file = "third_party/proj4.BUILD",
strip_prefix = "proj.4-4.9.3",
url = "https://github.com/OSGeo/proj.4/archive/4.9.3.zip",
)

# tinyxml2
new_http_archive(
name = "tinyxml2",
build_file = "third_party/tinyxml2.BUILD",
strip_prefix = "tinyxml2-5.0.1",
url = "https://github.com/leethomason/tinyxml2/archive/5.0.1.zip",
)

#protobuf 3.3
http_archive(
name = "com_google_protobuf",
strip_prefix = "protobuf-3.3.0",
url = "https://github.com/google/protobuf/releases/download/v3.3.0/protobuf-cpp-3.3.0.tar.gz",
)
Loading

0 comments on commit 9503421

Please sign in to comment.