Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Changed because of the new server change issues

Change-Id: I4badd28db6f50d06e24a1c99f66447a926f6e5e4
  • Loading branch information
john-henry1234 committed Jan 3, 2019
1 parent 65c9987 commit 8a384f9
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 28 deletions.
2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ Redistributions of source code must retain the above copyright notice, this list
Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Anyone who uses this software must notify the original authors through the form at <http://frc971.org/contact>.
Anyone who uses this software must notify the original authors through the form at <http://www.frc971.org/contact>.
42 changes: 21 additions & 21 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,14 @@ new_http_archive(
name = "python_repo",
build_file = "debian/python.BUILD",
sha256 = "4ff939f90cffd8c72f9992d7420481e361b6016b0ce5c6fa701be0691d4e20fa",
url = "http://frc971.org/Build-Dependencies/python-2.tar.gz",
url = "http://www.frc971.org/Build-Dependencies/python-2.tar.gz",
)

new_http_archive(
name = "clang_3p6_repo",
build_file = "tools/cpp/clang_3p6/clang_3p6.BUILD",
sha256 = "5ee9e04c55c2c99d0c0f83722102a49e98f485fc274f73111b33a7ac4e34e03e",
url = "http://frc971.org/Build-Dependencies/clang_3p6.tar.gz",
url = "http://www.frc971.org/Build-Dependencies/clang_3p6.tar.gz",
)

new_local_repository(
Expand All @@ -100,14 +100,14 @@ new_http_archive(
name = "ruby_repo",
build_file = "debian/ruby.BUILD",
sha256 = "d3e21cca0abcad933de0d4095da35344a60475d1f5828ee99283ed4250ee1320",
url = "http://frc971.org/Build-Dependencies/ruby.tar.gz",
url = "http://www.frc971.org/Build-Dependencies/ruby.tar.gz",
)

new_http_archive(
name = "arm_frc_linux_gnueabi_repo",
build_file = "tools/cpp/arm-frc-linux-gnueabi/arm-frc-linux-gnueabi.BUILD",
sha256 = "875b23bec5138e09e3d21cc1ff2727ea3ecbec57509c37589514ba50f92979c7",
url = "http://frc971.org/Build-Dependencies/roborio-compiler-2018.tar.xz",
url = "http://www.frc971.org/Build-Dependencies/roborio-compiler-2018.tar.xz",
)

# Recompressed version of the one downloaded from Linaro at
Expand All @@ -118,7 +118,7 @@ new_http_archive(
name = "linaro_linux_gcc_4_9_repo",
build_file = "compilers/linaro_linux_gcc_4.9.BUILD",
sha256 = "25e97bcb0af4fd7cd626d5bb1b303c7d2cb13acf2474e335e3d431d1a53fbb52",
url = "http://frc971.org/Build-Dependencies/gcc-linaro-4.9-2015.05-x86_64_arm-linux-gnueabihf.tar.gz",
url = "http://www.frc971.org/Build-Dependencies/gcc-linaro-4.9-2015.05-x86_64_arm-linux-gnueabihf.tar.gz",
)

new_git_repository(
Expand Down Expand Up @@ -156,7 +156,7 @@ new_http_archive(
build_file = "debian/ni-libraries-2018.BUILD",
sha256 = "05ef6701c77b83163b443aa956d151028861cc3fa29fdf2b6b77431b4a91bfb9",
strip_prefix = "ni-libraries",
url = "http://frc971.org/Build-Dependencies/allwpilib_ni-libraries_57e9fb3.tar.gz",
url = "http://www.frc971.org/Build-Dependencies/allwpilib_ni-libraries_57e9fb3.tar.gz",
)

# Downloaded from:
Expand All @@ -166,7 +166,7 @@ new_http_archive(
build_file = "debian/six.BUILD",
sha256 = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a",
strip_prefix = "six-1.10.0",
url = "http://frc971.org/Build-Dependencies/six-1.10.0.tar.gz",
url = "http://www.frc971.org/Build-Dependencies/six-1.10.0.tar.gz",
)

# For protobuf. Don't use these.
Expand All @@ -189,15 +189,15 @@ bind(
http_file(
name = "libusb_1_0_windows",
sha256 = "fc2ba03992f343aabbaf9eb90559c6e00cdc6a2bd914d7cebea85857d5244015",
url = "http://frc971.org/Build-Dependencies/libusb-1.0.21-windows.tar.xz",
url = "http://www.frc971.org/Build-Dependencies/libusb-1.0.21-windows.tar.xz",
)

# The data tarball of the same-named Debian package.
new_http_archive(
name = "f2c",
build_file = "debian/f2c.BUILD",
sha256 = "2c677437f8217a2e2b23e41b33995d0571644fc1bea46de858f8913a5053e3f4",
url = "http://frc971.org/Build-Dependencies/f2c_20100827-1_amd64.xz.tar.xz",
url = "http://www.frc971.org/Build-Dependencies/f2c_20100827-1_amd64.xz.tar.xz",
)

# Downloaded from http://www.netlib.org/clapack/.
Expand All @@ -206,63 +206,63 @@ new_http_archive(
build_file = "debian/clapack.BUILD",
sha256 = "6dc4c382164beec8aaed8fd2acc36ad24232c406eda6db462bd4c41d5e455fac",
strip_prefix = "CLAPACK-3.2.1/",
url = "http://frc971.org/Build-Dependencies/clapack-3.2.1.tgz",
url = "http://www.frc971.org/Build-Dependencies/clapack-3.2.1.tgz",
)

new_http_archive(
name = "patch",
build_file = "debian/patch.BUILD",
sha256 = "b5ce139648a2e04f5585948ddad2fdae24dd4ee7976ac5a22d6ae7bd5674631e",
url = "http://frc971.org/Build-Dependencies/patch.tar.gz",
url = "http://www.frc971.org/Build-Dependencies/patch.tar.gz",
)

new_http_archive(
name = "pandoc",
build_file = "debian/pandoc.BUILD",
sha256 = "9f7a7adb3974a1f14715054c349ff3edc2909e920dbe3438fca437a83845f3c4",
url = "http://frc971.org/Build-Dependencies/pandoc.tar.gz",
url = "http://www.frc971.org/Build-Dependencies/pandoc.tar.gz",
)

new_http_archive(
name = "libusb",
build_file = "debian/libusb.BUILD",
sha256 = "3ca5cc2d317226f6646866ff9e8c443db3b0f6c82f828e800240982727531590",
url = "http://frc971.org/Build-Dependencies/libusb.tar.gz",
url = "http://www.frc971.org/Build-Dependencies/libusb.tar.gz",
)

new_http_archive(
name = "mingw_compiler",
build_file = "debian/mingw_compiler.BUILD",
sha256 = "45e86a8460f2151a4f0306e7ae7b06761029d2412ee16f63d1e8d2d29354e378",
url = "http://frc971.org/Build-Dependencies/mingw_compiler.tar.gz",
url = "http://www.frc971.org/Build-Dependencies/mingw_compiler.tar.gz",
)

new_http_archive(
name = "matplotlib",
build_file = "debian/matplotlib.BUILD",
sha256 = "dc8e04123a93180bf89727bf6b5a5a0f6d210b6c1c5eaec148f7f8183abbce24",
url = "http://frc971.org/Build-Dependencies/matplotlib-2.tar.gz",
url = "http://www.frc971.org/Build-Dependencies/matplotlib-2.tar.gz",
)

new_http_archive(
name = "patchelf",
build_file = "debian/patchelf.BUILD",
sha256 = "bf8b709909d7d9e30815dd228eeded7dc282e3ce3919d0589ccbb56ac8632abc",
url = "http://frc971.org/Build-Dependencies/patchelf.tar.gz",
url = "http://www.frc971.org/Build-Dependencies/patchelf.tar.gz",
)

new_http_archive(
name = "arm_frc_gnueabi_deps",
build_file = "debian/arm_frc_gnueabi_deps.BUILD",
sha256 = "4b26fe45010817dc136488ee1604ade21bd7c264c29f17d864fc6eba9d7442c4",
url = "http://frc971.org/Build-Dependencies/arm_frc_gnueabi_deps.tar.gz",
url = "http://www.frc971.org/Build-Dependencies/arm_frc_gnueabi_deps.tar.gz",
)

new_http_archive(
name = "python_gtk",
build_file = "debian/python_gtk.BUILD",
sha256 = "850f5c1521b94c5c049c44d9107cd8ae9110696fbf054d2cb48bae9620fd4d23",
url = "http://frc971.org/Build-Dependencies/python_gtk.tar.gz",
url = "http://www.frc971.org/Build-Dependencies/python_gtk.tar.gz",
)

# Downloaded from
Expand All @@ -272,14 +272,14 @@ new_http_archive(
build_file = "compilers/gcc_arm_none_eabi.BUILD",
sha256 = "bb17109f0ee697254a5d4ae6e5e01440e3ea8f0277f2e8169bf95d07c7d5fe69",
strip_prefix = "gcc-arm-none-eabi-7-2018-q2-update/",
url = "http://frc971.org/Build-Dependencies/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2",
url = "http://www.frc971.org/Build-Dependencies/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2",
)

new_http_archive(
name = "cgal_repo",
build_file = "debian/cgal.BUILD",
sha256 = "d564dda558570344b4caa66c5bae2cdae9ef68e07829d64f5651b25f2c6a0e9e",
url = "http://frc971.org/Build-Dependencies/cgal-dev-4.5-2.tar.gz",
url = "http://www.frc971.org/Build-Dependencies/cgal-dev-4.5-2.tar.gz",
)

# Java9 JDK.
Expand All @@ -295,7 +295,7 @@ java_runtime(
sha256 = "f27cb933de4f9e7fe9a703486cf44c84bc8e9f138be0c270c9e5716a32367e87",
strip_prefix = "zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules",
urls = [
"http://frc971.org/Build-Dependencies/zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz",
"http://www.frc971.org/Build-Dependencies/zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz",
],
)

Expand Down
8 changes: 4 additions & 4 deletions debian/packages.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
# folder.
# 2. The "download_packages" steps prints the location of the deb packages
# after it prints the "_files" dictionary. Take the deb packages from there
# and upload them to http://frc971.org/Build-Dependencies/.
# and upload them to http://www.frc971.org/Build-Dependencies/.
# 3. Add the newly uploaded deb packages as WORKSPACE entries using the
# "generate_repositories_for_debs" helper. Load the "_files" dictionary
# created earlier and the "generate_repositories_for_debs" helper and call
# them together in the WORKSPACE file.
# 4. Add a "generate_deb_tarball" target to //debian/BUILD. Pass in the
# "_files" dictionary created earlier by loading it from the .bzl file.
# 5. Invoke "bazel build" on the "generate_deb_tarball" target you just created
# and upload the resulting tarball to http://frc971.org/Build-Dependencies.
# and upload the resulting tarball to http://www.frc971.org/Build-Dependencies.
# 6. Add a new "new_http_archive" entry to the WORKSPACE file for the tarball
# you just uploaded.

Expand All @@ -31,7 +31,7 @@ def download_packages(name, packages, excludes=[], force_includes=[]):
Use "bazel run" on these targets to download the packages and generate the
list to use in a .bzl file. Once you have the packages on
http://frc971.org/Build-Dependencies/ you can add them to a to
http://www.frc971.org/Build-Dependencies/ you can add them to a to
combine_packages rule.
"""
package_list = " ".join(packages)
Expand Down Expand Up @@ -73,7 +73,7 @@ def generate_repositories_for_debs(files):
if name not in native.existing_rules():
native.http_file(
name = name,
url = 'http://frc971.org/Build-Dependencies/%s' % f,
url = 'http://www.frc971.org/Build-Dependencies/%s' % f,
sha256 = files[f],
)

Expand Down
2 changes: 1 addition & 1 deletion third_party/gperftools/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ common_copts = [
"-DSTDC_HEADERS=1",
"-DSTL_NAMESPACE=std",
"-DPACKAGE_STRING=\\\"gperftools\ 2.4\\\"",
"-DPACKAGE_BUGREPORT=\\\"http://frc971.org/contact\\\"",
"-DPACKAGE_BUGREPORT=\\\"http://www.frc971.org/contact\\\"",
"-DPACKAGE_VERSION=\\\"2.4\\\"",
] + cpu_select({
"amd64": [
Expand Down
2 changes: 1 addition & 1 deletion tools/bazel
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ if [[ ! -d "${DOWNLOAD_DIR}" ]]; then
fi

readonly INSTALLER_NAME="bazel_${VERSION}.xz"
readonly DOWNLOAD_URL="http://frc971.org/Build-Dependencies/${INSTALLER_NAME}"
readonly DOWNLOAD_URL="http://www.frc971.org/Build-Dependencies/${INSTALLER_NAME}"

if [[ ! -d "${VERSION_DIR}" ]]; then
echo "Downloading Bazel version ${VERSION} from ${DOWNLOAD_URL}..." >&2
Expand Down

0 comments on commit 8a384f9

Please sign in to comment.