bazel: cleanup

bazel/scip.BUILD.bazel

@@ -49,7 +49,7 @@ PLATFORM_FLAGS = select({
         "/DSYM=none",
         "/DSCIP_NO_SIGACTION",
         "/DSCIP_NO_STRTOK_R",
-        ],
+    ],
     "//conditions:default": [],
 })
 
@@ -99,11 +99,12 @@ cc_library(
             "src/scip/sorttpl.c",
         ],
         exclude =
-        [
-            #"src/scip/prop_symmetry.h",
-            "src/scip/*_xyz.h",
-        ]),
-        copts = [
+            [
+                #"src/scip/prop_symmetry.h",
+                "src/scip/*_xyz.h",
+            ],
+    ),
+    copts = [
         "$(STACK_FRAME_UNLIMITED)",  # src/scip/reader_cnf.c
         #"-DTPI_TNY",  # src/tpi/type_tpi_tnycthrd.h
         "-DTPI_NONE",  # src/tpi/type_tpi_none.h

ortools/algorithms/BUILD.bazel

@@ -12,8 +12,9 @@
 # limitations under the License.
 
 load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
-load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library")
-load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_python//python:proto.bzl", "py_proto_library")
 
 package(default_visibility = ["//visibility:public"])

ortools/bop/BUILD.bazel

@@ -11,8 +11,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library")
-load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_python//python:proto.bzl", "py_proto_library")
 
 package(default_visibility = ["//visibility:public"])

ortools/glop/BUILD.bazel

@@ -11,8 +11,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library")
-load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_python//python:proto.bzl", "py_proto_library")
 
 package(

ortools/graph/BUILD.bazel

@@ -11,8 +11,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library")
-load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_cc//cc:defs.bzl", "cc_library")
 
 package(default_visibility = ["//visibility:public"])
 

ortools/gscip/BUILD.bazel

@@ -11,7 +11,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@rules_cc//cc:defs.bzl", "cc_proto_library")
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_python//python:proto.bzl", "py_proto_library")
 
 package(

ortools/linear_solver/BUILD.bazel

@@ -13,8 +13,9 @@
 
 load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
 load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
-load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library")
-load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_python//python:proto.bzl", "py_proto_library")
 
 package(default_visibility = ["//visibility:public"])

ortools/math_opt/solvers/BUILD.bazel

@@ -11,7 +11,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@rules_cc//cc:defs.bzl", "cc_proto_library")
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_python//python:proto.bzl", "py_proto_library")
 
 package(default_visibility = ["//ortools/math_opt:__subpackages__"])
@@ -311,9 +312,9 @@ cc_test(
 
 cc_test(
     name = "cp_sat_solver_test",
+    timeout = "eternal",
     srcs = ["cp_sat_solver_test.cc"],
     shard_count = 10,
-    timeout = "eternal",
     deps = [
         ":cp_sat_solver",
         "//ortools/base:gmock_main",
@@ -660,10 +661,12 @@ py_proto_library(
 proto_library(
     name = "highs_proto",
     srcs = ["highs.proto"],
+    visibility = ["//visibility:public"],
 )
 
 cc_proto_library(
     name = "highs_cc_proto",
+    visibility = ["//visibility:public"],
     deps = [":highs_proto"],
 )
 

ortools/scheduling/BUILD.bazel

@@ -11,8 +11,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@rules_cc//cc:defs.bzl", "cc_proto_library")
-load("@rules_proto//proto:defs.bzl", "proto_library")
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_python//python:proto.bzl", "py_proto_library")
 
 package(default_visibility = ["//visibility:public"])

ortools/util/BUILD.bazel

@@ -11,7 +11,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@rules_cc//cc:defs.bzl", "cc_proto_library")
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_python//python:proto.bzl", "py_proto_library")
 
 package(default_visibility = ["//visibility:public"])
@@ -126,6 +128,12 @@ cc_library(
     name = "piecewise_linear_function",
     srcs = ["piecewise_linear_function.cc"],
     hdrs = ["piecewise_linear_function.h"],
+    copts = select({
+        "on_linux": [],
+        "on_macos": [],
+        "on_windows": ["/Zc:preprocessor"],
+        "//conditions:default": [],
+    }),
     deps = [
         ":saturated_arithmetic",
         "//ortools/base",

patches/BUILD.bazel

@@ -13,11 +13,12 @@
 
 exports_files([
     "abseil-cpp-20240722.0.patch",
-    "highs.patch",
+    "highs-v1.8.0.patch",
     "protobuf-v26.1.patch",
     "protobuf-v28.3.patch",
     "pybind11_abseil.patch",
     "pybind11_bazel.patch",
     "pybind11_protobuf.patch",
     "pybind11.patch",
+    "scip-v900.patch",
 ])