s/-/_/g on repository names for newer Bazel
Change-Id: Ifc329f9913da2a97df5ab10fa288c7c2e7c1562d
diff --git a/WORKSPACE b/WORKSPACE
index 0a1c4b7..f106c00 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -17,14 +17,14 @@
)
new_http_archive(
- name = 'arm-frc-linux-gnueabi-repo',
+ name = 'arm_frc_linux_gnueabi_repo',
build_file = 'tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi.BUILD',
sha256 = '9d92b513b627c4aaa93d4d8049b4c6b96a532b64df11b27fde4dead58347a9f6',
url = 'http://frc971.org/Build-Dependencies/arm-frc-linux-gnueabi_4.9.3.tar.gz',
)
new_git_repository(
- name = 'python-gflags-repo',
+ name = 'python_gflags_repo',
remote = 'https://github.com/gflags/python-gflags.git',
build_file = 'debian/gflags.BUILD',
commit = '41c4571864f0db5823e07715317e7388e94faabc',
@@ -32,11 +32,11 @@
bind(
name = 'python-gflags',
- actual = '@python-gflags-repo//:gflags',
+ actual = '@python_gflags_repo//:gflags',
)
new_http_archive(
- name = 'python-glog-repo',
+ name = 'python_glog_repo',
build_file = 'debian/glog.BUILD',
sha256 = '953fd80122c48023d1148e6d1bda2763fcab59c8a81682bb298238a5935547b0',
url = 'https://pypi.python.org/packages/source/g/glog/glog-0.1.tar.gz',
@@ -45,11 +45,11 @@
bind(
name = 'python-glog',
- actual = '@python-glog-repo//:glog',
+ actual = '@python_glog_repo//:glog',
)
new_http_archive(
- name = 'allwpilib_ni-libraries_repo',
+ name = 'allwpilib_ni_libraries_repo',
build_file = 'debian/ni-libraries.BUILD',
sha256 = '821687afbee2d7531fb3e47d8d58ac10005695e59685be3ac3aa00b3179faf52',
url = 'http://frc971.org/Build-Dependencies/allwpilib_ni-libraries_20749ed.tar.gz',
@@ -58,5 +58,5 @@
bind(
name = 'ni-libraries',
- actual = '@allwpilib_ni-libraries_repo//:ni-libraries',
+ actual = '@allwpilib_ni_libraries_repo//:ni-libraries',
)
diff --git a/debian/BUILD b/debian/BUILD
index 29c47d7..dc45621 100644
--- a/debian/BUILD
+++ b/debian/BUILD
@@ -5,7 +5,7 @@
[ cc_library(
name = libname,
deps = cpu_select({
- "roborio": ['@arm-frc-linux-gnueabi-repo//:' + libname],
+ "roborio": ['@arm_frc_linux_gnueabi_repo//:' + libname],
"amd64": ['@usr_repo//:' + libname],
}),
) for libname in ['libpthread', 'libm', 'libdl', 'librt']]
diff --git a/tools/cpp/BUILD b/tools/cpp/BUILD
index 29ba1e1..1708a9f 100644
--- a/tools/cpp/BUILD
+++ b/tools/cpp/BUILD
@@ -38,7 +38,7 @@
srcs = [
':cc-compiler-k8',
':cc-compiler-roborio',
- '@arm-frc-linux-gnueabi-repo//:compiler_components',
+ '@arm_frc_linux_gnueabi_repo//:compiler_components',
':roborio-compiler-files',
':flags_compiler_inputs',
],
@@ -74,7 +74,7 @@
srcs = [
'//tools/cpp/arm-frc-linux-gnueabi:tool-wrappers',
'//tools/cpp/arm-frc-linux-gnueabi:as',
- '@arm-frc-linux-gnueabi-repo//:compiler_pieces',
+ '@arm_frc_linux_gnueabi_repo//:compiler_pieces',
':flags_compiler_inputs',
],
)
@@ -85,7 +85,7 @@
'//tools/cpp/arm-frc-linux-gnueabi:ld',
'//tools/cpp/arm-frc-linux-gnueabi:ar',
'//tools/cpp/arm-frc-linux-gnueabi:gcc',
- '@arm-frc-linux-gnueabi-repo//:compiler_pieces',
+ '@arm_frc_linux_gnueabi_repo//:compiler_pieces',
],
)
filegroup(
diff --git a/tools/cpp/CROSSTOOL b/tools/cpp/CROSSTOOL
index d76637c..e7c30c3 100644
--- a/tools/cpp/CROSSTOOL
+++ b/tools/cpp/CROSSTOOL
@@ -308,41 +308,41 @@
tool_path { name: "objdump" path: "arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-objdump" }
tool_path { name: "strip" path: "arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-strip" }
- compiler_flag: "--sysroot=external/arm-frc-linux-gnueabi-repo/usr/arm-frc-linux-gnueabi"
+ compiler_flag: "--sysroot=external/arm_frc_linux_gnueabi_repo/usr/arm-frc-linux-gnueabi"
compiler_flag: "-nostdinc"
compiler_flag: "-isystem"
- compiler_flag: "external/arm-frc-linux-gnueabi-repo/usr/lib/x86_64-linux-gnu/gcc/arm-frc-linux-gnueabi/4.9.3/include",
+ compiler_flag: "external/arm_frc_linux_gnueabi_repo/usr/lib/x86_64-linux-gnu/gcc/arm-frc-linux-gnueabi/4.9.3/include",
compiler_flag: "-isystem"
- compiler_flag: "external/arm-frc-linux-gnueabi-repo/usr/lib/x86_64-linux-gnu/gcc/arm-frc-linux-gnueabi/4.9.3/include-fixed"
+ compiler_flag: "external/arm_frc_linux_gnueabi_repo/usr/lib/x86_64-linux-gnu/gcc/arm-frc-linux-gnueabi/4.9.3/include-fixed"
compiler_flag: "-isystem"
- compiler_flag: "external/arm-frc-linux-gnueabi-repo/usr/arm-frc-linux-gnueabi/usr/include"
+ compiler_flag: "external/arm_frc_linux_gnueabi_repo/usr/arm-frc-linux-gnueabi/usr/include"
cxx_flag: "-isystem"
- cxx_flag: "external/arm-frc-linux-gnueabi-repo/usr/arm-frc-linux-gnueabi/include/c++/4.9.3"
+ cxx_flag: "external/arm_frc_linux_gnueabi_repo/usr/arm-frc-linux-gnueabi/include/c++/4.9.3"
cxx_flag: "-isystem"
- cxx_flag: "external/arm-frc-linux-gnueabi-repo/usr/arm-frc-linux-gnueabi/include/c++/4.9.3/arm-frc-linux-gnueabi"
+ cxx_flag: "external/arm_frc_linux_gnueabi_repo/usr/arm-frc-linux-gnueabi/include/c++/4.9.3/arm-frc-linux-gnueabi"
cxx_flag: "-isystem"
- cxx_flag: "external/arm-frc-linux-gnueabi-repo/usr/arm-frc-linux-gnueabi/include/c++/4.9.3/backward"
+ cxx_flag: "external/arm_frc_linux_gnueabi_repo/usr/arm-frc-linux-gnueabi/include/c++/4.9.3/backward"
cxx_flag: "-isystem"
- cxx_flag: "external/arm-frc-linux-gnueabi-repo/usr/lib/x86_64-linux-gnu/gcc/arm-frc-linux-gnueabi/4.9.3/include"
+ cxx_flag: "external/arm_frc_linux_gnueabi_repo/usr/lib/x86_64-linux-gnu/gcc/arm-frc-linux-gnueabi/4.9.3/include"
cxx_flag: "-isystem"
- cxx_flag: "external/arm-frc-linux-gnueabi-repo/usr/lib/x86_64-linux-gnu/gcc/arm-frc-linux-gnueabi/4.9.3/include-fixed"
+ cxx_flag: "external/arm_frc_linux_gnueabi_repo/usr/lib/x86_64-linux-gnu/gcc/arm-frc-linux-gnueabi/4.9.3/include-fixed"
cxx_flag: "-isystem"
- cxx_flag: "external/arm-frc-linux-gnueabi-repo/usr/arm-frc-linux-gnueabi/include"
+ cxx_flag: "external/arm_frc_linux_gnueabi_repo/usr/arm-frc-linux-gnueabi/include"
cxx_flag: "-isystem"
- cxx_flag: "external/arm-frc-linux-gnueabi-repo/usr/arm-frc-linux-gnueabi/usr/include"
+ cxx_flag: "external/arm_frc_linux_gnueabi_repo/usr/arm-frc-linux-gnueabi/usr/include"
# TODO(bazel-team): In theory, the path here ought to exactly match the path
# used by gcc. That works because bazel currently doesn't track files at
# absolute locations and has no remote execution, yet. However, this will need
# to be fixed, maybe with auto-detection?
- cxx_builtin_include_directory: "%package(@arm-frc-linux-gnueabi-repo//usr/arm-frc-linux-gnueabi/include)%/c++/4.9.3"
- cxx_builtin_include_directory: "%package(@arm-frc-linux-gnueabi-repo//usr/arm-frc-linux-gnueabi/include)%/c++/4.9.3/arm-frc-linux-gnueabi"
- cxx_builtin_include_directory: "%package(@arm-frc-linux-gnueabi-repo//usr/arm-frc-linux-gnueabi/include)%/c++/4.9.3/backward"
- cxx_builtin_include_directory: "%package(@arm-frc-linux-gnueabi-repo//usr/lib/x86_64-linux-gnu/gcc/arm-frc-linux-gnueabi/4.9.3/include)%"
- cxx_builtin_include_directory: "%package(@arm-frc-linux-gnueabi-repo//usr/lib/x86_64-linux-gnu/gcc/arm-frc-linux-gnueabi/4.9.3/include-fixed)%"
- cxx_builtin_include_directory: "%package(@arm-frc-linux-gnueabi-repo//usr/arm-frc-linux-gnueabi/include)%"
- cxx_builtin_include_directory: "%package(@arm-frc-linux-gnueabi-repo//usr/arm-frc-linux-gnueabi/usr/include)%"
+ cxx_builtin_include_directory: "%package(@arm_frc_linux_gnueabi_repo//usr/arm-frc-linux-gnueabi/include)%/c++/4.9.3"
+ cxx_builtin_include_directory: "%package(@arm_frc_linux_gnueabi_repo//usr/arm-frc-linux-gnueabi/include)%/c++/4.9.3/arm-frc-linux-gnueabi"
+ cxx_builtin_include_directory: "%package(@arm_frc_linux_gnueabi_repo//usr/arm-frc-linux-gnueabi/include)%/c++/4.9.3/backward"
+ cxx_builtin_include_directory: "%package(@arm_frc_linux_gnueabi_repo//usr/lib/x86_64-linux-gnu/gcc/arm-frc-linux-gnueabi/4.9.3/include)%"
+ cxx_builtin_include_directory: "%package(@arm_frc_linux_gnueabi_repo//usr/lib/x86_64-linux-gnu/gcc/arm-frc-linux-gnueabi/4.9.3/include-fixed)%"
+ cxx_builtin_include_directory: "%package(@arm_frc_linux_gnueabi_repo//usr/arm-frc-linux-gnueabi/include)%"
+ cxx_builtin_include_directory: "%package(@arm_frc_linux_gnueabi_repo//usr/arm-frc-linux-gnueabi/usr/include)%"
linker_flag: "-lstdc++"
#linker_flag: "-B/usr/bin/"
diff --git a/tools/cpp/arm-frc-linux-gnueabi/BUILD b/tools/cpp/arm-frc-linux-gnueabi/BUILD
index 64342a9..17a10c2 100644
--- a/tools/cpp/arm-frc-linux-gnueabi/BUILD
+++ b/tools/cpp/arm-frc-linux-gnueabi/BUILD
@@ -3,7 +3,7 @@
filegroup(
name = 'gcc',
srcs = [
- '@arm-frc-linux-gnueabi-repo//:gcc',
+ '@arm_frc_linux_gnueabi_repo//:gcc',
'arm-frc-linux-gnueabi-gcc',
],
)
@@ -11,7 +11,7 @@
filegroup(
name = 'ar',
srcs = [
- '@arm-frc-linux-gnueabi-repo//:ar',
+ '@arm_frc_linux_gnueabi_repo//:ar',
'arm-frc-linux-gnueabi-ar',
],
)
@@ -19,7 +19,7 @@
filegroup(
name = 'as',
srcs = [
- '@arm-frc-linux-gnueabi-repo//:as',
+ '@arm_frc_linux_gnueabi_repo//:as',
'arm-frc-linux-gnueabi-as',
],
)
@@ -27,7 +27,7 @@
filegroup(
name = 'ld',
srcs = [
- '@arm-frc-linux-gnueabi-repo//:ld',
+ '@arm_frc_linux_gnueabi_repo//:ld',
'arm-frc-linux-gnueabi-ld',
],
)
@@ -35,7 +35,7 @@
filegroup(
name = 'nm',
srcs = [
- '@arm-frc-linux-gnueabi-repo//:nm',
+ '@arm_frc_linux_gnueabi_repo//:nm',
'arm-frc-linux-gnueabi-nm',
],
)
@@ -43,7 +43,7 @@
filegroup(
name = 'objcopy',
srcs = [
- '@arm-frc-linux-gnueabi-repo//:objcopy',
+ '@arm_frc_linux_gnueabi_repo//:objcopy',
'arm-frc-linux-gnueabi-objcopy',
],
)
@@ -51,7 +51,7 @@
filegroup(
name = 'objdump',
srcs = [
- '@arm-frc-linux-gnueabi-repo//:objdump',
+ '@arm_frc_linux_gnueabi_repo//:objdump',
'arm-frc-linux-gnueabi-objdump',
],
)
@@ -59,7 +59,7 @@
filegroup(
name = 'strip',
srcs = [
- '@arm-frc-linux-gnueabi-repo//:strip',
+ '@arm_frc_linux_gnueabi_repo//:strip',
'arm-frc-linux-gnueabi-strip',
],
)
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-ar b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-ar
index 040a122..d70337f 100755
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-ar
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-ar
@@ -1,5 +1,5 @@
#!/bin/bash --norc
exec -a arm-frc-linux-gnueabi-ar \
- "${BAZEL_OUTPUT_ROOT}external/arm-frc-linux-gnueabi-repo/usr/bin/arm-frc-linux-gnueabi-ar" \
+ "${BAZEL_OUTPUT_ROOT}external/arm_frc_linux_gnueabi_repo/usr/bin/arm-frc-linux-gnueabi-ar" \
"$@"
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-as b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-as
index 84b49da..5f1a2fc 100755
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-as
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-as
@@ -1,5 +1,5 @@
#!/bin/bash --norc
exec -a arm-frc-linux-gnueabi-as \
- "${BAZEL_OUTPUT_ROOT}external/arm-frc-linux-gnueabi-repo/usr/bin/arm-frc-linux-gnueabi-as" \
+ "${BAZEL_OUTPUT_ROOT}external/arm_frc_linux_gnueabi_repo/usr/bin/arm-frc-linux-gnueabi-as" \
"$@"
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-cpp b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-cpp
index c04ad23..3262658 100755
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-cpp
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-cpp
@@ -1,5 +1,5 @@
#!/bin/bash --norc
exec -a arm-frc-linux-gnueabi-cpp \
- "${BAZEL_OUTPUT_ROOT}external/arm-frc-linux-gnueabi-repo/usr/bin/arm-frc-linux-gnueabi-cpp" \
+ "${BAZEL_OUTPUT_ROOT}external/arm_frc_linux_gnueabi_repo/usr/bin/arm-frc-linux-gnueabi-cpp" \
"$@"
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-dwp b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-dwp
index 04bfaa3..dbd074b 100755
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-dwp
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-dwp
@@ -1,5 +1,5 @@
#!/bin/bash --norc
exec -a arm-frc-linux-gnueabi-dwp \
- "${BAZEL_OUTPUT_ROOT}external/arm-frc-linux-gnueabi-repo/usr/bin/arm-frc-linux-gnueabi-dwp" \
+ "${BAZEL_OUTPUT_ROOT}external/arm_frc_linux_gnueabi_repo/usr/bin/arm-frc-linux-gnueabi-dwp" \
"$@"
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-gcc b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-gcc
index 0e306f1..aab008a 100755
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-gcc
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-gcc
@@ -1,5 +1,5 @@
#!/bin/bash --norc
exec \
- "${BAZEL_OUTPUT_ROOT}external/arm-frc-linux-gnueabi-repo/usr/bin/arm-frc-linux-gnueabi-gcc" \
+ "${BAZEL_OUTPUT_ROOT}external/arm_frc_linux_gnueabi_repo/usr/bin/arm-frc-linux-gnueabi-gcc" \
"$@"
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-gcov b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-gcov
index d220b95..a3c71c3 100755
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-gcov
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-gcov
@@ -1,5 +1,5 @@
#!/bin/bash --norc
exec -a arm-frc-linux-gnueabi-gcov \
- "${BAZEL_OUTPUT_ROOT}external/arm-frc-linux-gnueabi-repo/usr/bin/arm-frc-linux-gnueabi-gcov" \
+ "${BAZEL_OUTPUT_ROOT}external/arm_frc_linux_gnueabi_repo/usr/bin/arm-frc-linux-gnueabi-gcov" \
"$@"
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-ld b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-ld
index db762f3..d5dce71 100755
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-ld
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-ld
@@ -1,5 +1,5 @@
#!/bin/bash --norc
exec -a arm-frc-linux-gnueabi-ld \
- "${BAZEL_OUTPUT_ROOT}external/arm-frc-linux-gnueabi-repo/usr/bin/arm-frc-linux-gnueabi-ld" \
+ "${BAZEL_OUTPUT_ROOT}external/arm_frc_linux_gnueabi_repo/usr/bin/arm-frc-linux-gnueabi-ld" \
"$@"
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-nm b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-nm
index 6348eda..4163be0 100755
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-nm
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-nm
@@ -1,5 +1,5 @@
#!/bin/bash --norc
exec -a arm-frc-linux-gnueabi-nm \
- "${BAZEL_OUTPUT_ROOT}external/arm-frc-linux-gnueabi-repo/usr/bin/arm-frc-linux-gnueabi-nm" \
+ "${BAZEL_OUTPUT_ROOT}external/arm_frc_linux_gnueabi_repo/usr/bin/arm-frc-linux-gnueabi-nm" \
"$@"
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-objcopy b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-objcopy
index b126fc7..a77d3a9 100755
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-objcopy
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-objcopy
@@ -1,5 +1,5 @@
#!/bin/bash --norc
exec -a arm-frc-linux-gnueabi-objcopy \
- "${BAZEL_OUTPUT_ROOT}external/arm-frc-linux-gnueabi-repo/usr/bin/arm-frc-linux-gnueabi-objcopy" \
+ "${BAZEL_OUTPUT_ROOT}external/arm_frc_linux_gnueabi_repo/usr/bin/arm-frc-linux-gnueabi-objcopy" \
"$@"
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-objdump b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-objdump
index dacf923..0de0532 100755
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-objdump
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-objdump
@@ -1,5 +1,5 @@
#!/bin/bash --norc
exec -a arm-frc-linux-gnueabi-objdump \
- "${BAZEL_OUTPUT_ROOT}external/arm-frc-linux-gnueabi-repo/usr/bin/arm-frc-linux-gnueabi-objdump" \
+ "${BAZEL_OUTPUT_ROOT}external/arm_frc_linux_gnueabi_repo/usr/bin/arm-frc-linux-gnueabi-objdump" \
"$@"
diff --git a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-strip b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-strip
index 8469103..15cc2f9 100755
--- a/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-strip
+++ b/tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi-strip
@@ -1,5 +1,5 @@
#!/bin/bash --norc
exec -a arm-frc-linux-gnueabi-strip \
- "${BAZEL_OUTPUT_ROOT}external/arm-frc-linux-gnueabi-repo/usr/bin/arm-frc-linux-gnueabi-strip" \
+ "${BAZEL_OUTPUT_ROOT}external/arm_frc_linux_gnueabi_repo/usr/bin/arm-frc-linux-gnueabi-strip" \
"$@"