always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update bazel and flatzinc (#4879)

Browse Source
This commit is contained in:
Guillaume Chatelet
2025-10-16 14:05:15 +02:00
committed by Corentin Le Molgat
parent 0ecd0b6535
commit ed397541f4
6 changed files with 6 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
BUILD.bazel
View File

@@ -14,6 +14,8 @@
load("@gazelle//:def.bzl", "gazelle") load("@gazelle//:def.bzl", "gazelle")
load("@rules_license//rules:license.bzl", "license") load("@rules_license//rules:license.bzl", "license")
package(default_applicable_licenses = [":license"])
# Expose license for external usage through bazel. # Expose license for external usage through bazel.
licenses(["notice"]) licenses(["notice"])
@@ -26,10 +28,6 @@ license(
license_text = ":LICENSE", license_text = ":LICENSE",
) )
package(
default_applicable_licenses = [":license"],
)
# gazelle:build_file_name BUILD,BUILD.bazel # gazelle:build_file_name BUILD,BUILD.bazel
# gazelle:prefix github.com/google/or-tools # gazelle:prefix github.com/google/or-tools
# gazelle:proto disable # gazelle:proto disable

4
MODULE.bazel
View File

@@ -63,7 +63,7 @@ git_override(
module_name = "pybind11_bazel", module_name = "pybind11_bazel",
commit = "2b6082a4d9d163a52299718113fa41e4b7978db5", commit = "2b6082a4d9d163a52299718113fa41e4b7978db5",
patch_strip = 1, patch_strip = 1,
patches = ["//patches:pybind11_bazel.patch"], patches = ["//:patches/pybind11_bazel.patch"],
remote = "https://github.com/pybind/pybind11_bazel.git", remote = "https://github.com/pybind/pybind11_bazel.git",
) )
@@ -71,7 +71,7 @@ git_override(
module_name = "pybind11_abseil", module_name = "pybind11_abseil",
commit = "70f8b693b3b70573ca785ef62d9f48054f45d786", commit = "70f8b693b3b70573ca785ef62d9f48054f45d786",
patch_strip = 1, patch_strip = 1,
patches = ["//patches:pybind11_abseil.patch"], patches = ["//:patches/pybind11_abseil.patch"],
remote = "https://github.com/pybind/pybind11_abseil.git", remote = "https://github.com/pybind/pybind11_abseil.git",
) )

2
ortools/flatzinc/parser.tab.cc
View File

@@ -2520,7 +2520,7 @@ yyreduce:
#line 2549 "parser.tab.cc" #line 2549 "parser.tab.cc"
break; break;
#line 2553 "parser.tab.cc" #line 2555 "parser.tab.cc"
default: default:
break; break;

2
ortools/graph/BUILD.bazel
View File

@@ -470,7 +470,7 @@ cc_library(
cc_test( cc_test(
name = "max_flow_test", name = "max_flow_test",
srcs = ["max_flow_test.cc"], srcs = ["max_flow_test.cc"],
data = ["//ortools/graph/testdata:max_flow_test1.pb.txt"], data = ["//ortools/graph:testdata/max_flow_test1.pb.txt"],
deps = [ deps = [
":flow_problem_cc_proto", ":flow_problem_cc_proto",
":max_flow", ":max_flow",

16
ortools/graph/testdata/BUILD.bazel vendored
View File

@@ -1,16 +0,0 @@
# Copyright 2010-2025 Google LLC
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
exports_files([
"max_flow_test1.pb.txt",
])

17
patches/BUILD.bazel
View File

@@ -1,17 +0,0 @@
# Copyright 2010-2025 Google LLC
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
exports_files([
"pybind11_bazel.patch",
"pybind11_abseil.patch",
])