Reland "Move package_versions.bzl to defines/"

Change-Id: I6a2480c0c34f9f1e374ea944d37adee14ffceefe
Checkmk · Oct 27, 2023 · f9b0f79 · f9b0f79
1 parent a9bf30b
commit f9b0f79
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -55,7 +55,7 @@ rules_pkg_dependencies()
 #   |                                                                      |
 #   '----------------------------------------------------------------------'
 load(
-    "//:package_versions.bzl",
+    "//:defines/package_versions.bzl",
     "CRYPT_SSL_SHA256",
     "CRYPT_SSL_VERSION",
     "FREETDS_SHA256",

diff --git a/defines.make b/defines.make
@@ -76,7 +76,7 @@ GCC_VERSION	       := ${GCC_VERSION_MAJOR}.${GCC_VERSION_MINOR}.${GCC_VERSION_PA
 # * update test_03_pip_interpreter_version
 # * update omd/Licenses.csv, too.
 # * you may need to regenerate the Pipfile.lock with "make --what-if Pipfile Pipfile.lock"
-PYTHON_VERSION  := $(shell sed -n 's|^PYTHON_VERSION = \"\(\S*\)\"$$|\1|p' $(REPO_PATH)/package_versions.bzl)
+PYTHON_VERSION  := $(shell sed -n 's|^PYTHON_VERSION = \"\(\S*\)\"$$|\1|p' $(REPO_PATH)/defines/package_versions.bzl)
 
 # convenience stuff derived from PYTHON_VERSION
 PY_ARRAY	       := $(subst ., ,$(PYTHON_VERSION))

diff --git a/package_versions.bzl → defines/package_versions.bzl b/package_versions.bzl → defines/package_versions.bzl
diff --git a/omd/packages/Python/BUILD.Python.bazel b/omd/packages/Python/BUILD.Python.bazel
@@ -1,5 +1,5 @@
 load("@rules_foreign_cc//foreign_cc:defs.bzl", "configure_make")
-load("@omd_packages//:package_versions.bzl", "PYTHON_MAJOR_DOT_MINOR", "PYTHON_VERSION_MAJOR")
+load("@omd_packages//:defines/package_versions.bzl", "PYTHON_MAJOR_DOT_MINOR", "PYTHON_VERSION_MAJOR")
 
 package(default_visibility = ["//visibility:public"])
 

diff --git a/omd/packages/mod_wsgi/BUILD.mod_wsgi.bazel b/omd/packages/mod_wsgi/BUILD.mod_wsgi.bazel
@@ -1,5 +1,5 @@
 load("@rules_foreign_cc//foreign_cc:defs.bzl", "configure_make")
-load("@omd_packages//:package_versions.bzl", "PYTHON_MAJOR_DOT_MINOR")
+load("@omd_packages//:defines/package_versions.bzl", "PYTHON_MAJOR_DOT_MINOR")
 
 filegroup(
     name = "all_srcs",

diff --git a/omd/packages/net-snmp/BUILD.net-snmp.bazel b/omd/packages/net-snmp/BUILD.net-snmp.bazel
@@ -1,5 +1,5 @@
 load("@rules_foreign_cc//foreign_cc:defs.bzl", "configure_make")
-load("@omd_packages//:package_versions.bzl", "PYTHON_MAJOR_DOT_MINOR")
+load("@omd_packages//:defines/package_versions.bzl", "PYTHON_MAJOR_DOT_MINOR")
 
 filegroup(
     name = "all_srcs",

diff --git a/omd/packages/python3-modules/BUILD b/omd/packages/python3-modules/BUILD
@@ -1,6 +1,6 @@
 load(":build-python3-modules.bzl", "build_cmd", "build_python_module", "create_requirements_file")
 load("@python_modules//:requirements.bzl", "all_requirements")
-load("@omd_packages//:package_versions.bzl", "PYTHON_MAJOR_DOT_MINOR")
+load("@omd_packages//:defines/package_versions.bzl", "PYTHON_MAJOR_DOT_MINOR")
 load("@omd_packages//:static_variables.bzl", "INTERNAL_PYPI_MIRROR")
 
 config_setting(