ScriptCollection 4.4.22__py3-none-any.whl → 4.4.24__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1147,7 +1147,7 @@ def CleanToolsCache()->int:
1147
1147
 
1148
1148
 
1149
1149
  def DownloadCachableTools()->int:
1150
- parser = argparse.ArgumentParser(description="Downloads all tools that are stored in the global ScriptCollection-cache (for example CycloneDX-CLI, PlantUML, MediaMTX, TruffleHog, OpenAPIGenerator and AndroidAppBundleTool). Running this - for example in a build-image - lets repeated pipeline-runs avoid rate-limits and run faster because the tools are already present.")
1150
+ parser = argparse.ArgumentParser(description="Downloads all tools that are stored in the global ScriptCollection-cache (for example CycloneDX-CLI, MediaMTX, TruffleHog, OpenAPIGenerator and AndroidAppBundleTool). Running this - for example in a build-image - lets repeated pipeline-runs avoid rate-limits and run faster because the tools are already present.")
1151
1151
  parser.add_argument('-v', '--verbose', action='store_true', required=False, default=False, help="Enables verbose (debug) output.")
1152
1152
  parser.add_argument('-e', '--enforceupdate', action='store_true', required=False, default=False, help="Re-download the tools even if they are already present in the cache.")
1153
1153
  #TODO for each tool which will be installed allow to specify a specific version number
@@ -1214,7 +1214,6 @@ def ReclaimSpaceFromDocker()->int:
1214
1214
 
1215
1215
 
1216
1216
  def AddImageToCustomRegistry()->int:
1217
- sc = ScriptCollectionCore()
1218
1217
  parser = argparse.ArgumentParser()
1219
1218
  parser.add_argument('-r', '--remotehub', required=True)
1220
1219
  parser.add_argument('-i', '--imagenameonremotehub', required=True)
@@ -1225,7 +1224,6 @@ def AddImageToCustomRegistry()->int:
1225
1224
  parser.add_argument('-p', '--password', required=False,default=None)
1226
1225
  verbosity_values = ", ".join(f"{lvl.value}={lvl.name}" for lvl in LogLevel)
1227
1226
  parser.add_argument('-v', '--verbosity', required=False, default=3, help=f"Sets the loglevel. Possible values: {verbosity_values}")
1228
- parser.add_argument('-r', '--removeimagelocally', action='store_true', default=False)
1229
1227
  args = parser.parse_args()
1230
1228
  sc:ScriptCollectionCore=ScriptCollectionCore()
1231
1229
  verbosity=int(args.verbosity)
@@ -22,6 +22,7 @@ from pathlib import Path
22
22
  from subprocess import Popen
23
23
  import re
24
24
  import shutil
25
+ import socket
25
26
  from typing import IO
26
27
  import fnmatch
27
28
  import uuid
@@ -39,7 +40,7 @@ from .ProgramRunnerBase import ProgramRunnerBase
39
40
  from .ProgramRunnerPopen import ProgramRunnerPopen
40
41
  from .SCLog import SCLog, LogLevel
41
42
 
42
- version = "4.4.22"
43
+ version = "4.4.24"
43
44
  __version__ = version
44
45
 
45
46
  class VSCodeWorkspaceShellTask:
@@ -2135,6 +2136,45 @@ resolving a name requires fontconfig, which does not exist on every system ffmpe
2135
2136
  sorted_versions = sorted(versions, key=cmp_to_key(my_comparer))
2136
2137
  return sorted_versions[-1]
2137
2138
 
2139
+ @GeneralUtilities.check_arguments
2140
+ def get_latest_apk_package_version_in_alpine(self, image: str, package: str) -> str:
2141
+ # docker run --rm <image> sh -c "apk update && apk policy <package>"
2142
+ # "apk policy" prints one block per package: a headline "<package> policy:", then for each available version
2143
+ # a line "<version>:" followed by the repositories which provide that version.
2144
+ image_address, image_tag = ScriptCollectionCore.split_image_address_and_tag(image)
2145
+ self.docker_pull(image_address, image_tag)
2146
+ output = self.run_with_epew("docker", f"run --rm {image} sh -c \"apk update && apk policy {package}\"", os.getcwd(), encode_argument_in_base64=True)
2147
+ stdout = output[1]
2148
+ lines = GeneralUtilities.string_to_lines(stdout)
2149
+ headline = f"{package} policy:"
2150
+ GeneralUtilities.assert_condition(headline in lines, f"No policy for package '{package}' found in image '{image}'.")
2151
+ # After the headline of the package each available version is one line "<version>:" followed by one line per
2152
+ # repository which provides that version. Only the version-lines end with a colon and contain no whitespace.
2153
+ lines_of_package = lines[lines.index(headline)+1:]
2154
+ version_matches = [re.fullmatch(r"(\S+):", line) for line in lines_of_package]
2155
+ versions = [version_match.group(1) for version_match in version_matches if version_match is not None]
2156
+ GeneralUtilities.assert_condition(0 < len(versions), f"No version found for package '{package}' in image '{image}'.")
2157
+
2158
+ def my_comparer(a: str, b: str) -> int:
2159
+ # return:
2160
+ # -1 → a < b
2161
+ # 0 → a = b
2162
+ # 1 → a > b
2163
+ # apk version -t <a> <b> → prints the relation of a to b as "<", "=" or ">"
2164
+ result = self.run_program_argsasarray("docker", ["run", "--rm", image, "apk", "version", "-t", a, b])
2165
+ relation = result[1].strip()
2166
+ if relation == "<":
2167
+ return -1
2168
+ elif relation == ">":
2169
+ return 1
2170
+ elif relation == "=":
2171
+ return 0
2172
+ else:
2173
+ raise ValueError(f"Unexpected output of \"apk version -t {a} {b}\": \"{relation}\"")
2174
+
2175
+ sorted_versions = sorted(versions, key=cmp_to_key(my_comparer))
2176
+ return sorted_versions[-1]
2177
+
2138
2178
  @GeneralUtilities.check_arguments
2139
2179
  def run_testcases_for_python_project(self, repository_folder: str):
2140
2180
  self.assert_is_git_repository(repository_folder)
@@ -4575,6 +4615,35 @@ OCR-content:
4575
4615
  def is_running_in_build_container(self) ->bool:
4576
4616
  """this function is based on a convention and does not do a real check."""
4577
4617
  return os.environ.get("ISRUNNINGINBUILDCONTAINER") == "true"
4618
+
4619
+ @GeneralUtilities.check_arguments
4620
+ def get_own_container_id(self) -> str:
4621
+ """Returns the id of the container this process runs in, so its volumes can be shared with sibling-containers
4622
+ via "docker run --volumes-from". That is required whenever this process runs in a container whose docker-socket
4623
+ is forwarded to the daemon of the host: a bind-mount of a path of this process would be resolved by that
4624
+ daemon, where the path does not exist."""
4625
+ # In mountinfo the own container-id only appears reliably in the source-path of the
4626
+ # "/etc/hostname"/"/etc/hosts"/"/etc/resolv.conf"-mounts (".../containers/<id>/..."). A plain
4627
+ # 64-hex-match there would also hit overlay-layer-hashes (which are not containers), so the
4628
+ # "containers/"-prefix must be matched explicitly.
4629
+ try:
4630
+ with open("/proc/self/mountinfo", "r", encoding="utf-8") as file_handle:
4631
+ match = re.search(r"/containers/([0-9a-f]{64})/", file_handle.read())
4632
+ if match is not None:
4633
+ return match.group(1)
4634
+ except Exception:
4635
+ pass
4636
+ # cgroup (v1): the container-id is part of the cgroup-path; here a plain 64-hex-match is safe.
4637
+ try:
4638
+ with open("/proc/self/cgroup", "r", encoding="utf-8") as file_handle:
4639
+ match = re.search(r"[0-9a-f]{64}", file_handle.read())
4640
+ if match is not None:
4641
+ return match.group(0)
4642
+ except Exception:
4643
+ pass
4644
+ # Fallback: the hostname equals the short container-id for containers started without an
4645
+ # explicit hostname.
4646
+ return socket.gethostname()
4578
4647
 
4579
4648
  def prepare_build_pipeline_for_gitlab(self):
4580
4649
  repository_folder:str=os.getcwd()
@@ -152,9 +152,8 @@ class TFCPS_CodeUnitSpecific_Flutter_Functions(TFCPS_CodeUnitSpecific_Base):
152
152
  # which can be installed directly, is generated from it with Google's bundletool.
153
153
  bundletool = self.tfcps_Tools_General.ensure_androidappbundletool_is_available(None, not self.use_cache())
154
154
  # The pinned JRE from the global cache is used instead of a "java" of the machine, because a
155
- # java-runtime is not part of every machine which builds a codeunit. It is the same JRE ScriptCollection
156
- # already uses to render the plantuml-diagrams, so this step needs nothing which a build does not need
157
- # anyway.
155
+ # java-runtime is not part of every machine which builds a codeunit. Pinning it also keeps this step
156
+ # independent of which java-version a machine happens to have.
158
157
  java_executable = self.tfcps_Tools_General.ensure_jre_is_available(not self.use_cache(), self.get_repository_folder())
159
158
  apk_folder = os.path.join(artifacts_folder, "BuildResult_APK")
160
159
  GeneralUtilities.ensure_directory_does_not_exist(apk_folder)
@@ -0,0 +1,162 @@
1
+ import os
2
+ from pathlib import Path
3
+ from ..GeneralUtilities import GeneralUtilities
4
+ from ..ScriptCollectionCore import ScriptCollectionCore
5
+ from ..OCIImages.OCIImageManager import OCIImageManager
6
+
7
+
8
+ class PlantUMLContainerCall:
9
+ """Describes how the container which renders a diagram has to be started: which mount-arguments it gets and under
10
+ which path the folder with the diagram-sources is visible inside it. Which of the two possible shapes is used is
11
+ decided by PlantUMLRenderer.get_container_call_configuration."""
12
+
13
+ mount_arguments: list[str] = None
14
+ work_folder: str = None
15
+
16
+ def __init__(self, mount_arguments: list[str], work_folder: str):
17
+ self.mount_arguments = mount_arguments
18
+ self.work_folder = work_folder
19
+
20
+
21
+ class PlantUMLRenderer:
22
+ """Renders '*.plantuml'-files into svg-files.
23
+
24
+ The rendering always happens inside a short-lived, disposable container which runs the image the repository
25
+ declares as 'PlantUML' in '<repository>/.ScriptCollection/OCIImages/ImageDefinition.csv'. Nothing of the rendering
26
+ comes from the executing machine: plantuml itself, the java-runtime, Graphviz (which plantuml needs to lay out
27
+ component- and class-diagrams) and the fonts are all part of that image, so the pinned image-tag alone determines
28
+ what a diagram looks like.
29
+
30
+ That is what makes the generated svg byte-identical on every machine. It is required because plantuml computes the
31
+ whole svg-geometry from the font-metrics of the jvm: Windows- and Linux-builds of a jdk use the same FreeType-based
32
+ rasterizer and round identically, but a macOS-build uses Apple's CoreText and rounds the vertical metrics slightly
33
+ differently, which shifts positions in the resulting svg. Rendering with one pinned linux-image everywhere avoids
34
+ that, so a regenerated diagram does not show up as a spurious change. When the image-tag is bumped, the committed
35
+ diagram-svgs have to be regenerated and re-committed once."""
36
+
37
+ # Name under which the image used for the rendering has to be declared by every repository.
38
+ __image_name: str = "PlantUML"
39
+ # Font all diagrams are rendered with. It is passed on the commandline (and not written into every single
40
+ # diagram-source) so that a hand-written diagram is rendered with the same font as a generated one. Pinning it
41
+ # keeps the diagrams independent of which font plantuml's default 'sans-serif' happens to resolve to.
42
+ __diagram_font_name: str = "DejaVu Sans"
43
+ # Folder inside the rendering-container to which the folder with the diagram-sources is mounted when the rendering
44
+ # runs on a host. This is the working-directory the image itself declares.
45
+ __container_work_folder: str = "/data"
46
+
47
+ __sc: ScriptCollectionCore = None
48
+ __oci_image_manager: OCIImageManager = None
49
+ __repository_folder: str = None
50
+
51
+ def __init__(self, sc: ScriptCollectionCore, oci_image_manager: OCIImageManager, repository_folder: str):
52
+ self.__sc = sc
53
+ self.__oci_image_manager = oci_image_manager
54
+ self.__repository_folder = repository_folder
55
+
56
+ @staticmethod
57
+ @GeneralUtilities.check_arguments
58
+ def get_diagram_font_name() -> str:
59
+ """Returns the font all diagrams are rendered with. Generated diagram-sources state it as 'skinparam
60
+ defaultFontName' themselves so their committed content already says which font they belong to."""
61
+ return PlantUMLRenderer.__diagram_font_name
62
+
63
+ @staticmethod
64
+ @GeneralUtilities.check_arguments
65
+ def get_image_name() -> str:
66
+ """Returns the name under which the image used for the rendering has to be declared in
67
+ '<repository>/.ScriptCollection/OCIImages/ImageDefinition.csv'."""
68
+ return PlantUMLRenderer.__image_name
69
+
70
+ @staticmethod
71
+ @GeneralUtilities.check_arguments
72
+ def get_output_filename_for_plantuml_filename(plantuml_file: str) -> str:
73
+ """Returns the name of the svg-file plantuml writes for the given diagram-source. Plantuml derives it from the
74
+ title given behind '@startuml' and falls back to the name of the source-file when there is none."""
75
+ for line in GeneralUtilities.read_lines_from_file(plantuml_file):
76
+ prefix = "@startuml "
77
+ if line.startswith(prefix):
78
+ title = line[len(prefix):]
79
+ return title+".svg"
80
+ return Path(plantuml_file).stem+".svg"
81
+
82
+ @GeneralUtilities.check_arguments
83
+ def render_folder(self, diagrams_files_folder: str) -> None:
84
+ """Renders every '*.plantuml'-file which is located somewhere below the given folder into a svg-file next to it."""
85
+ plantuml_files: list[str] = [file for file in GeneralUtilities.get_all_files_of_folder(diagrams_files_folder) if file.endswith(".plantuml")]
86
+ if len(plantuml_files) == 0:
87
+ return
88
+ docker_image: str = self.__oci_image_manager.get_registry_address_for_image_with_default_tag(self.__repository_folder, PlantUMLRenderer.__image_name)
89
+ self.__assert_docker_daemon_is_reachable()
90
+ image_address, image_tag = ScriptCollectionCore.split_image_address_and_tag(docker_image)
91
+ # Pull explicitly (once for all diagrams) instead of letting the first "docker run" download the image
92
+ # implicitly, because docker writes the progress of an implicit download to std-err, which would be logged as
93
+ # an error although nothing failed.
94
+ self.__sc.docker_pull(image_address, image_tag)
95
+ # Inside a build-container the forwarded docker-socket belongs to the daemon of the host, so the container
96
+ # started here is a sibling-container and not a child. See get_container_call_configuration.
97
+ own_container_id: str = self.__sc.get_own_container_id() if self.__sc.is_runnning_in_container() else None
98
+ for plantuml_file in plantuml_files:
99
+ folder: str = os.path.dirname(plantuml_file)
100
+ container_call: PlantUMLContainerCall = PlantUMLRenderer.get_container_call_configuration(folder, own_container_id)
101
+ self.__run_plantuml_in_container(container_call, docker_image, os.path.basename(plantuml_file))
102
+ result_file: str = os.path.join(folder, PlantUMLRenderer.get_output_filename_for_plantuml_filename(plantuml_file))
103
+ GeneralUtilities.assert_file_exists(result_file)
104
+ self.__sc.format_xml_file(result_file)
105
+
106
+ @staticmethod
107
+ @GeneralUtilities.check_arguments
108
+ def get_container_call_configuration(diagrams_files_folder: str, own_container_id: str) -> PlantUMLContainerCall:
109
+ """Returns how the rendering-container has to be started for the given folder. There are two cases:
110
+
111
+ - This process runs directly on a host: the docker-daemon resolves a bind-mount on the same filesystem this
112
+ process sees, so the folder with the diagram-sources is bind-mounted into the container. 'own_container_id'
113
+ is None in this case.
114
+ - This process itself runs in a container whose docker-socket is forwarded to the daemon of the host (for
115
+ example the build-container): a bind-mount would then be resolved by that daemon, where the paths of this
116
+ process do not exist. Docker silently creates an empty directory for a missing bind-mount-source, so the
117
+ rendering would run in an empty working-directory and would not find any diagram. The volumes of this
118
+ container are therefore shared with the sibling-container instead, which makes the repository visible there
119
+ under exactly the path this process uses.
120
+
121
+ The same rendering-command is used in both cases; only the mount-arguments and the working-directory differ."""
122
+ if own_container_id is None:
123
+ return PlantUMLContainerCall(["-v", f"{diagrams_files_folder}:{PlantUMLRenderer.__container_work_folder}"], PlantUMLRenderer.__container_work_folder)
124
+ return PlantUMLContainerCall(["--volumes-from", own_container_id], PlantUMLRenderer.__to_container_path(diagrams_files_folder))
125
+
126
+ @staticmethod
127
+ @GeneralUtilities.check_arguments
128
+ def get_user_arguments() -> list[str]:
129
+ """Returns the arguments which make the rendering-container write the generated svg as the user this process
130
+ runs as. The image runs as an own unprivileged user by default, which can not write into a folder of the
131
+ machine when the ownership does not match - the generated svg has to belong to the user who runs the build.
132
+ On windows there is no such ownership, so nothing is passed there."""
133
+ if GeneralUtilities.current_system_is_windows():
134
+ return []
135
+ # "getuid"/"getgid" do not exist on windows, which is why they are only reached below that check; pylint
136
+ # analyses this file on windows as well and does not see that.
137
+ return ["--user", f"{os.getuid()}:{os.getgid()}"] # pylint: disable=no-member
138
+
139
+ @GeneralUtilities.check_arguments
140
+ def __run_plantuml_in_container(self, container_call: PlantUMLContainerCall, docker_image: str, plantuml_filename: str) -> None:
141
+ # The image declares "java -jar <plantuml.jar>" as its entrypoint, so only the arguments of plantuml itself are
142
+ # passed here.
143
+ plantuml_arguments: list[str] = ["-tsvg", f"-SdefaultFontName={PlantUMLRenderer.__diagram_font_name}", plantuml_filename]
144
+ docker_arguments: list[str] = ["run", "--rm"]+container_call.mount_arguments+PlantUMLRenderer.get_user_arguments()+["-w", container_call.work_folder, docker_image]+plantuml_arguments
145
+ self.__sc.run_program_argsasarray("docker", docker_arguments)
146
+
147
+ @GeneralUtilities.check_arguments
148
+ def __assert_docker_daemon_is_reachable(self) -> None:
149
+ # The rendering runs via "docker run", so an unreachable daemon makes it fail with an error which looks like a
150
+ # rendering-problem. "docker version --format {{.Server.Version}}" queries the daemon itself and exits
151
+ # non-zero exactly when it can not be reached, which distinguishes the infrastructure-problem from a real
152
+ # rendering-error.
153
+ daemon_check = self.__sc.run_program_argsasarray("docker", ["version", "--format", "{{.Server.Version}}"], throw_exception_if_exitcode_is_not_zero=False, print_live_output=False)
154
+ if daemon_check[0] != 0:
155
+ raise ValueError(f"The plantuml-diagrams can not be rendered because the docker-daemon is not reachable (exit-code {daemon_check[0]}: {daemon_check[2].strip()}). The rendering runs plantuml via 'docker run', which requires a running docker-daemon (inside a build-container its socket must be forwarded to the daemon of the host). This is an infrastructure-problem, not a problem of a diagram.")
156
+
157
+ @staticmethod
158
+ @GeneralUtilities.check_arguments
159
+ def __to_container_path(path: str) -> str:
160
+ # A path which is used inside the container has to be written in the linux-notation. This only has an effect
161
+ # when this function is called with a path of a windows-host, which happens in the tests.
162
+ return path.replace("\\", "/").rstrip("/")
@@ -1,7 +1,6 @@
1
1
  import os
2
2
  import json
3
3
  import re
4
- import socket
5
4
  from datetime import datetime, timedelta,timezone
6
5
  import xmlschema
7
6
  from packaging.version import Version
@@ -609,7 +608,7 @@ class TFCPS_CodeUnit_BuildCodeUnits:
609
608
  # The sibling betterleaks-container would then scan the wrong directory - without the
610
609
  # repository-content and without ".betterleaks.toml", which causes false positives.
611
610
  # Sharing our own volumes instead exposes the repository to betterleaks at the same path.
612
- mount_arguments = ["--volumes-from", self.__get_own_container_id()]
611
+ mount_arguments = ["--volumes-from", self.sc.get_own_container_id()]
613
612
  repository_in_scan_container = self.repository
614
613
  else:
615
614
  # Running directly on the host: a normal bind-mount works because the path is resolved
@@ -644,33 +643,6 @@ class TFCPS_CodeUnit_BuildCodeUnits:
644
643
  self.sc.log.log(line, LogLevel.Error)
645
644
  raise ValueError(f"Found unignored secret findings (exit code {result[0]}). See {os.path.join(self.repository, '.betterleaks.toml')} to ignore known false positives.")
646
645
 
647
- @GeneralUtilities.check_arguments
648
- def __get_own_container_id(self) -> str:
649
- # Determine the id of the container this process runs in so its volumes can be shared with
650
- # sibling-containers via "docker run --volumes-from".
651
- # In mountinfo the own container-id only appears reliably in the source-path of the
652
- # "/etc/hostname"/"/etc/hosts"/"/etc/resolv.conf"-mounts (".../containers/<id>/..."). A plain
653
- # 64-hex-match there would also hit overlay-layer-hashes (which are not containers), so the
654
- # "containers/"-prefix must be matched explicitly.
655
- try:
656
- with open("/proc/self/mountinfo", "r", encoding="utf-8") as file_handle:
657
- match = re.search(r"/containers/([0-9a-f]{64})/", file_handle.read())
658
- if match is not None:
659
- return match.group(1)
660
- except Exception:
661
- pass
662
- # cgroup (v1): the container-id is part of the cgroup-path; here a plain 64-hex-match is safe.
663
- try:
664
- with open("/proc/self/cgroup", "r", encoding="utf-8") as file_handle:
665
- match = re.search(r"[0-9a-f]{64}", file_handle.read())
666
- if match is not None:
667
- return match.group(0)
668
- except Exception:
669
- pass
670
- # Fallback: the hostname equals the short container-id for containers started without an
671
- # explicit hostname.
672
- return socket.gethostname()
673
-
674
646
  @GeneralUtilities.check_arguments
675
647
  def use_cache(self) -> bool:
676
648
  return self.__use_cache
@@ -23,6 +23,7 @@ from ..SCLog import LogLevel
23
23
  from ..OCIImages.AbstractImageHandler import AbstractImageHandler
24
24
  from ..OCIImages.OCIImageManager import OCIImageManager
25
25
  from .PackageSource import PackageSource
26
+ from .PlantUMLRenderer import PlantUMLRenderer
26
27
 
27
28
  class TFCPS_Tools_General:
28
29
 
@@ -34,16 +35,6 @@ class TFCPS_Tools_General:
34
35
  # Relative path (inside the source-repository and inside the ScriptCollection.Resources-package) of the
35
36
  # file that pins the OpenAPIGenerator-version used as default when no repository-specific version is given.
36
37
  __openapigenerator_version_resource_relative_path:str="Dependencies/OpenAPIGenerator/Version.txt"
37
- # Relative path (inside the source-repository and inside the ScriptCollection.Resources-package) of the
38
- # file that pins the PlantUML-version used as default when no repository-specific version is given.
39
- __plantuml_version_resource_relative_path:str="Dependencies/PlantUML/Version.txt"
40
- # Font used for rendering all PlantUML-diagrams. Pinning it makes the resulting SVG identical across machines
41
- # (PlantUML's default 'sans-serif' otherwise resolves to different host-fonts on Windows vs Linux, which changes
42
- # the computed text-lengths and coordinates and thus produces spurious diffs). The font is available in the
43
- # build-image via the apt-package 'fonts-dejavu'.
44
- __default_diagram_font_name:str="DejaVu Sans"
45
- # Font-files (all faces of the diagram-font) bundled with the package and forced via the JVM-font-path when rendering.
46
- __bundled_diagram_font_filenames:list[str]=["DejaVuSans.ttf","DejaVuSans-Bold.ttf","DejaVuSans-Oblique.ttf","DejaVuSans-BoldOblique.ttf"]
47
38
  # Relative path (in the source-repository and in the ScriptCollection.Resources-package) of the file that pins the
48
39
  # default Eclipse-Temurin-JRE-version used by ensure_jre_is_available/download_jre when a repository does not pin its
49
40
  # own version in '<repo>/Other/Resources/Dependencies/JRE/Version.txt'. The file contains a build like "21.0.6+7".
@@ -108,7 +99,6 @@ class TFCPS_Tools_General:
108
99
  if verbose:
109
100
  self.__sc.log.loglevel = LogLevel.Debug
110
101
  self.download_cyclonedx(enforce_update)
111
- self.download_plantuml(enforce_update)
112
102
  self.download_jre(enforce_update)
113
103
  self.download_mediamtx(enforce_update)
114
104
  self.download_trufflehog(enforce_update)
@@ -120,22 +110,14 @@ class TFCPS_Tools_General:
120
110
  self.__sc.log.log("Download cachable tool \"CycloneDX-CLI\" into global cache...", LogLevel.Debug)
121
111
  self.ensure_cyclonedxcli_is_available(enforce_update)
122
112
 
123
- @GeneralUtilities.check_arguments
124
- def download_plantuml(self, enforce_update: bool = False) -> None:
125
- self.__sc.log.log("Download cachable tool \"PlantUML\" into global cache...", LogLevel.Debug)
126
- # No repository-context is available when warming the global cache (e.g. scdownloadcachabletools in a
127
- # build-image), so download the default version pinned by the ScriptCollection-package. Actual builds
128
- # pass the version pinned in their own '<repo>/Other/Resources/Dependencies/PlantUML/Version.txt'.
129
- self.ensure_plantuml_is_available(enforce_update, self.get_default_plantuml_version())
130
-
131
113
  @GeneralUtilities.check_arguments
132
114
  def download_jre(self, enforce_update: bool = False) -> None:
133
115
  self.__sc.log.log("Download cachable tool \"JRE\" into global cache...", LogLevel.Debug)
134
116
  # No repository-context is available when warming the global cache (e.g. scdownloadcachabletools in a
135
117
  # build-image), so download the default version pinned by the ScriptCollection-package. Actual builds
136
118
  # pass the version pinned in their own '<repo>/Other/Resources/Dependencies/JRE/Version.txt'. This is
137
- # independent of the Java used to render PlantUML-diagrams (see __run_plantuml_in_linux_container), which
138
- # always runs inside a Docker-container instead of this cached JRE.
119
+ # independent of the PlantUML-diagram-rendering (see PlantUMLRenderer), which brings its own java in the
120
+ # image it runs in.
139
121
  self.ensure_jre_is_available(enforce_update)
140
122
 
141
123
  @GeneralUtilities.check_arguments
@@ -888,14 +870,13 @@ class TFCPS_Tools_General:
888
870
  self.__sc.assert_is_git_repository(repository_folder)
889
871
  # If the currently checked-out commit is itself tagged with a release-version ('v<semver>') and the working-tree
890
872
  # is clean, the committed diagram-SVGs were generated for exactly this release-state and must not change; a
891
- # difference would then indicate a rendering-regression (e.g. a font/JRE-mismatch, see
892
- # __generate_svg_files_from_plantuml) instead of an expected content-change and must fail loudly.
873
+ # difference would then indicate a rendering-regression (for example because another image-tag was used, see
874
+ # PlantUMLRenderer) instead of an expected content-change and must fail loudly.
893
875
  current_commit_tags = [tag for tag in GeneralUtilities.string_to_lines(self.__sc.run_program_argsasarray("git", ["tag", "--points-at", "HEAD"], repository_folder, throw_exception_if_exitcode_is_not_zero=False)[1]) if GeneralUtilities.string_has_content(tag)]
894
876
  current_commit_has_release_tag = any(re.match(r"^v\d+\.\d+\.\d+$", tag) for tag in current_commit_tags)
895
877
  assert_remains_unchanged: bool = current_commit_has_release_tag and not self.__sc.git_repository_has_uncommitted_changes(repository_folder)
896
- plantuml_jar_file=self.ensure_plantuml_is_available(not use_cache, self.get_plantuml_version(repository_folder))
897
878
  target_folder = os.path.join(repository_folder, "Other", "Reference")
898
- self.__generate_svg_files_from_plantuml(target_folder, plantuml_jar_file, repository_folder)
879
+ self.__render_plantuml_files(target_folder, repository_folder)
899
880
  if assert_remains_unchanged:
900
881
  GeneralUtilities.assert_condition(not self.__sc.git_repository_has_uncommitted_changes(repository_folder), f"Generating svg-files from plantuml-files in '{repository_folder}' changed the repository unexpectedly.")
901
882
 
@@ -903,14 +884,13 @@ class TFCPS_Tools_General:
903
884
  def generate_svg_files_from_plantuml_files_for_codeunit(self, codeunit_folder: str,use_cache:bool) -> None:
904
885
  self.assert_is_codeunit_folder(codeunit_folder)
905
886
  repository_folder = os.path.dirname(codeunit_folder)
906
- plantuml_jar_file=self.ensure_plantuml_is_available(not use_cache, self.get_plantuml_version(repository_folder))
907
887
  target_folder = os.path.join(codeunit_folder, "Other", "Reference")
908
- self.__generate_svg_files_from_plantuml(target_folder, plantuml_jar_file, repository_folder)
888
+ self.__render_plantuml_files(target_folder, repository_folder)
909
889
 
910
890
  @GeneralUtilities.check_arguments
911
891
  def generate_svg_files_from_vega_files_for_repository(self, repository_folder: str,use_cache:bool) -> None:
912
892
  # "use_cache" is accepted for interface-parity with generate_svg_files_from_plantuml_files_for_repository.
913
- # Unlike plantuml/the JRE, "vg2svg" is assumed to already be available on the PATH (like "vl2svg", see
893
+ # "vg2svg" is assumed to already be available on the PATH (like "vl2svg", see
914
894
  # ScriptCollectionCore.generate_chart_diagram), so there is nothing here which could be cached/downloaded.
915
895
  self.__sc.log.log("Generate svg-files from vega-files...")
916
896
  self.__sc.assert_is_git_repository(repository_folder)
@@ -935,36 +915,6 @@ class TFCPS_Tools_General:
935
915
  GeneralUtilities.assert_file_exists(result_file)
936
916
  self.__sc.format_xml_file(result_file)
937
917
 
938
- @GeneralUtilities.check_arguments
939
- def ensure_plantuml_is_available(self, enforce_update: bool, program_version: str) -> str:
940
- """Ensures the plantuml.jar for the given version is available in the global cache and returns its absolute path.
941
- The jar is stored under a version-specific subfolder ('<cache>/Tools/PlantUML/<version>/plantuml.jar') so that
942
- different versions coexist without evicting each other. The version must be given explicitly (there is no default);
943
- callers resolve it via get_plantuml_version (the repository-pin or the bundled default)."""
944
- local_resource_name = os.path.join("PlantUML", program_version)
945
- return self.ensure_file_from_github_assets_is_available_with_retry("plantuml", "plantuml", local_resource_name, "plantuml.jar", lambda latest_version: "plantuml.jar", enforce_update=enforce_update, pinned_version=program_version)
946
-
947
- @GeneralUtilities.check_arguments
948
- def get_plantuml_version(self, repository_folder: str = None) -> str:
949
- """Resolves the PlantUML-version to use: the repository-specific pin in
950
- '<repo>/Other/Resources/Dependencies/PlantUML/Version.txt' if present, otherwise the default
951
- bundled with ScriptCollection (see get_default_plantuml_version)."""
952
- if repository_folder is not None:
953
- version_file = os.path.join(repository_folder, "Other", "Resources", "Dependencies", "PlantUML", "Version.txt")
954
- if os.path.isfile(version_file):
955
- return GeneralUtilities.read_text_from_file(version_file).strip()
956
- return self.get_default_plantuml_version()
957
-
958
- @GeneralUtilities.check_arguments
959
- def get_default_plantuml_version(self) -> str:
960
- """Returns the PlantUML-version used when no repository-specific version is pinned (for example when warming
961
- the global cache via scdownloadcachabletools). The value is read from the version-file bundled with the
962
- ScriptCollection-package, with a fallback to the source-file for an unbuilt source-checkout."""
963
-
964
- content = GeneralUtilities._internal_load_resource(TFCPS_Tools_General.__plantuml_version_resource_relative_path)
965
- return content.decode("utf-8").strip()
966
-
967
-
968
918
  @GeneralUtilities.check_arguments
969
919
  def get_jre_version(self, repository_folder: str = None) -> str:
970
920
  """Resolves the JRE-version to use: the repository-specific pin in '<repo>/Other/Resources/Dependencies/JRE/Version.txt'
@@ -988,7 +938,7 @@ class TFCPS_Tools_General:
988
938
  """Ensures the pinned JDK is available in the global cache for the executing platform and returns the absolute path
989
939
  to its 'java'-executable. The version is the repository-specific pin if present, otherwise the bundled default (see
990
940
  get_jre_version). Used by tools which need a locally-runnable, deterministically-versioned JRE (the PlantUML-diagram
991
- rendering itself now always runs inside a Docker-container instead, see __run_plantuml_in_linux_container)."""
941
+ rendering does not use it: it runs in an image which brings its own java, see PlantUMLRenderer)."""
992
942
  local_resource_name = "JRE"
993
943
  jre_version = self.get_jre_version(repository_folder)
994
944
  feature_version = jre_version.split(".")[0] # e.g. "21" from "21.0.6+7"
@@ -1046,88 +996,18 @@ class TFCPS_Tools_General:
1046
996
  return java_executable
1047
997
 
1048
998
  @GeneralUtilities.check_arguments
1049
- def __generate_svg_files_from_plantuml(self, diagrams_files_folder: str, plantuml_jar_file: str, repository_folder: str) -> None:
1050
- # Pin the font for all rendered diagrams via a PlantUML-config-file so the resulting SVG is identical across
1051
- # machines, without having to add a skinparam to every (also hand-written) .plantuml-file. See the comment at
1052
- # __default_diagram_font_name for the reason.
1053
- font_config_file = os.path.join(GeneralUtilities.get_temp_folder(), f"plantuml-font-config-{uuid.uuid4()}.cfg")
1054
- GeneralUtilities.write_text_to_file(font_config_file, f'skinparam defaultFontName "{TFCPS_Tools_General.__default_diagram_font_name}"')
1055
- # Force the JVM to use the DejaVu-fonts bundled with ScriptCollection (via the font-path) instead of whatever
1056
- # font-version happens to be installed on the host. This makes the text-measurement - and thus the resulting
1057
- # SVG-geometry - identical across machines (e.g. a Windows-client and the Debian-build-container), because the
1058
- # exact same font-files are used everywhere.
1059
- bundled_fonts_folder = self.__extract_bundled_fonts_to_temp_folder()
1060
- # Pinning the JDK-build and the font is sufficient to get byte-identical SVGs on Windows and Linux, because both
1061
- # use the same FreeType-based font-rasterizer internally, so the AWT-font-metrics (in particular the vertical
1062
- # ascent/descent used e.g. for the note-box-positioning) round identically there. macOS-builds of the JDK use
1063
- # Apple's native CoreText font-manager instead, which rounds those vertical metrics slightly differently even
1064
- # for the exact same pinned font-file and JDK-build, shifting positions in the rendered SVG by a fraction of a
1065
- # pixel. To still get an identical result on macOS, the rendering itself does not run on a native macOS-JVM
1066
- # there but inside a short-lived Docker-container that runs the Java-image the repository itself declares in
1067
- # '.ScriptCollection/OCIImages/ImageDefinition.csv' (image-name 'Java', see __run_plantuml_in_linux_container) -
1068
- # i.e. the diagram is always rendered by a Linux-JVM, regardless of host.
1069
- try:
1070
- for file in GeneralUtilities.get_all_files_of_folder(diagrams_files_folder):
1071
- if file.endswith(".plantuml"):
1072
- output_filename = self.get_output_filename_for_plantuml_filename(file)
1073
- folder = os.path.dirname(file)
1074
- self.__run_plantuml_in_linux_container(folder, os.path.basename(file), plantuml_jar_file, font_config_file, bundled_fonts_folder, repository_folder)
1075
- result_file = folder+"/" + output_filename
1076
- GeneralUtilities.assert_file_exists(result_file)
1077
- self.__sc.format_xml_file(result_file)
1078
- finally:
1079
- GeneralUtilities.ensure_file_does_not_exist(font_config_file)
1080
- if bundled_fonts_folder is not None:
1081
- GeneralUtilities.ensure_directory_does_not_exist(bundled_fonts_folder)
1082
-
1083
- @GeneralUtilities.check_arguments
1084
- def __run_plantuml_in_linux_container(self, folder: str, plantuml_filename: str, plantuml_jar_file: str, font_config_file: str, bundled_fonts_folder: str, repository_folder: str) -> None:
1085
- """Renders a single .plantuml-file into a svg-file by running PlantUML inside a short-lived, disposable Docker-
1086
- container. All diagram-rendering happens this way, regardless of the host-platform (see __generate_svg_files_from_plantuml
1087
- for why this is required to get byte-identical results on Windows/Linux/macOS). The image is not hardcoded here: every
1088
- repository must declare it itself as the image named 'Java' in '<repository>/.ScriptCollection/OCIImages/ImageDefinition.csv'
1089
- (the same mechanism used for e.g. 'Betterleaks'/'SCBuilder', see __search_for_secrets_in_repository/build_codeunits_in_container
1090
- in TFCPS_CodeUnit_BuildCodeUnits), so a repository can pin the exact JDK-build it wants rendered with. The bundled font and
1091
- the font-config are mounted into the container; no network-access is required inside the container for this."""
1092
- docker_image = self.oci_image_manager.get_registry_address_for_image_with_default_tag(repository_folder, "Java")
1093
- container_jar_file = "/opt/plantuml.jar"
1094
- container_font_config_file = "/opt/font-config.cfg"
1095
- container_fonts_folder = "/opt/fonts"
1096
- container_work_folder = "/work"
1097
- docker_arguments = ["run", "--rm", "-v", f"{plantuml_jar_file}:{container_jar_file}:ro", "-v", f"{font_config_file}:{container_font_config_file}:ro", "-v", f"{folder}:{container_work_folder}", "-w", container_work_folder]
1098
- java_font_arguments: list[str] = []
1099
- if bundled_fonts_folder is not None:
1100
- docker_arguments = docker_arguments+["-v", f"{bundled_fonts_folder}:{container_fonts_folder}:ro"]
1101
- java_font_arguments = [f"-Dsun.java2d.fontpath=prepend:{container_fonts_folder}"]
1102
- docker_arguments = docker_arguments+[docker_image, "java"]+java_font_arguments+["-jar", container_jar_file, "-tsvg", "-config", container_font_config_file, plantuml_filename]
1103
- self.__sc.run_program_argsasarray("docker", docker_arguments)
1104
-
1105
- @GeneralUtilities.check_arguments
1106
- def __extract_bundled_fonts_to_temp_folder(self) -> str:
1107
- # Extracts the DejaVu-fonts bundled with the ScriptCollection-package into a temporary folder and returns its path
1108
- # (the JVM needs a real folder for its font-path; see __default_diagram_font_name). The bytes are read via
1109
- # GeneralUtilities._internal_load_resource so this also works when the package is stored as a zip-archive. Returns
1110
- # None if the fonts are not available (e.g. an older installation without the bundled fonts). The caller is
1111
- # responsible for removing the returned folder afterwards.
1112
- temp_folder = os.path.join(GeneralUtilities.get_temp_folder(), f"scriptcollection-diagram-fonts-{uuid.uuid4()}")
1113
- try:
1114
- GeneralUtilities.ensure_directory_exists(temp_folder)
1115
- for font_filename in TFCPS_Tools_General.__bundled_diagram_font_filenames:
1116
- font_bytes = GeneralUtilities._internal_load_resource(f"Fonts/{font_filename}")
1117
- GeneralUtilities.write_binary_to_file(os.path.join(temp_folder, font_filename), font_bytes)
1118
- except (FileNotFoundError, ModuleNotFoundError):
1119
- GeneralUtilities.ensure_directory_does_not_exist(temp_folder)
1120
- return None
1121
- return temp_folder
999
+ def __render_plantuml_files(self, diagrams_files_folder: str, repository_folder: str) -> None:
1000
+ # Everything which is required to render a diagram is implemented by PlantUMLRenderer. Plantuml itself is not
1001
+ # a tool which is downloaded onto this machine: it is part of the image which the repository declares for the
1002
+ # rendering, so there is nothing to resolve here.
1003
+ renderer: PlantUMLRenderer = PlantUMLRenderer(self.__sc, self.oci_image_manager, repository_folder)
1004
+ renderer.render_folder(diagrams_files_folder)
1122
1005
 
1123
1006
  @GeneralUtilities.check_arguments
1124
1007
  def get_output_filename_for_plantuml_filename(self, plantuml_file: str) -> str:
1125
- for line in GeneralUtilities.read_lines_from_file(plantuml_file):
1126
- prefix = "@startuml "
1127
- if line.startswith(prefix):
1128
- title = line[len(prefix):]
1129
- return title+".svg"
1130
- return Path(plantuml_file).stem+".svg"
1008
+ """Returns the name of the svg-file which is generated for the given plantuml-file (see
1009
+ PlantUMLRenderer.get_output_filename_for_plantuml_filename)."""
1010
+ return PlantUMLRenderer.get_output_filename_for_plantuml_filename(plantuml_file)
1131
1011
 
1132
1012
  @staticmethod
1133
1013
  @GeneralUtilities.check_arguments
@@ -1154,7 +1034,7 @@ class TFCPS_Tools_General:
1154
1034
  lines = ["@startuml CodeUnits-Overview"]
1155
1035
  # Pin font so the rendered SVG is byte-identical across machines (Java/PlantUML's
1156
1036
  # default 'sans-serif' otherwise resolves to different host fonts on Windows vs Linux).
1157
- lines.append(f'skinparam defaultFontName "{TFCPS_Tools_General.__default_diagram_font_name}"')
1037
+ lines.append(f'skinparam defaultFontName "{PlantUMLRenderer.get_diagram_font_name()}"')
1158
1038
  lines.append(f"title CodeUnits of {project_name}")
1159
1039
 
1160
1040
  codeunits = self.get_codeunits(repository_folder)
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: scriptcollection
3
- Version: 4.4.22
3
+ Version: 4.4.24
4
4
  Summary: The ScriptCollection is the place for reusable scripts.
5
5
  Author-email: Marius Göcke <marius.goecke@gmail.com>
6
6
  Project-URL: Homepage, https://github.com/anionDev/ScriptCollection
@@ -1,7 +1,7 @@
1
1
  ScriptCollection/AnionBuildPlatform.py,sha256=LF9b4f4iqgsjgXZjS0RHiEBw73tQANfu0O1dYGWNjy8,11948
2
2
  ScriptCollection/ArbTranslationsOrganizer.py,sha256=FLJcNP6qFTQOkxL7es0Sq3O7kb_TgoRreqH-uogR4xA,12201
3
3
  ScriptCollection/CertificateUpdater.py,sha256=bD0VhKQsD2cNRTG1kzMkhgpd0BZw7igbG30goKw5p1A,9749
4
- ScriptCollection/Executables.py,sha256=jU4TPpi3psAd1gsMVAGCrw6Wyv7MdX1spBh9Grk0gbA,74303
4
+ ScriptCollection/Executables.py,sha256=Ovq6LVhtP6mqCPmBxch9WgTmePBk7F8MLyZUBkQloAE,74171
5
5
  ScriptCollection/GeneralUtilities.py,sha256=7iirl-TItW5UDIOC8osY8chb0nFbPz6QQmVBsbgQgIA,72016
6
6
  ScriptCollection/HTTPMaintenanceOverheadHelper.py,sha256=TToNtyO1XzsMbBsTBf3o0xgOK0v4Jf03qw2Z0xb2nCk,2007
7
7
  ScriptCollection/ProcessesRunner.py,sha256=Va9O-ohWoRfe4pO2gPBzc940gkM5BpP4Txcu1CmLOvg,1494
@@ -12,7 +12,7 @@ ScriptCollection/ProgramRunnerSudo.py,sha256=ot9Ib-plQ8wejR9M2XXfnx6GR-va9k8SH1g
12
12
  ScriptCollection/RepositoryDiagramGenerator.py,sha256=K_u2NW_p4ozdWD50irJEkkcDVa70TcUJpZN63TeXSLw,7092
13
13
  ScriptCollection/RepositoryHistoryAnalyzer.py,sha256=rD8eC5lMUe5MHmCBHfYft_G-N9IbvtsFGkU7EMwPjrY,5779
14
14
  ScriptCollection/SCLog.py,sha256=Fjf8Pdi63cXHGMxL_aI6A0dwGm7QIfrv3czjvpSUlaM,4705
15
- ScriptCollection/ScriptCollectionCore.py,sha256=-NV8HHdUfqHruXRTP5iDf7QY9pOzInHEGa4poFeIwMU,272058
15
+ ScriptCollection/ScriptCollectionCore.py,sha256=iR8KA1JDlAaQINn56k2v-mszY7ljoTNPLPEBYCQFjm4,276146
16
16
  ScriptCollection/TestKind.py,sha256=EBTLR8yBz5VmWA2NZIpDTbQNg6tkfv_kAsIzEJ--mCI,1756
17
17
  ScriptCollection/UnassignedVariablesCheck.py,sha256=8xNcp1D5HeOLO1a1NEerq2TsnpFhw7yzYPkaay-oisY,3804
18
18
  ScriptCollection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -30,19 +30,14 @@ ScriptCollection/Resources/CultureChooser/CultureChooser.js,sha256=5-4pwGDq5j1Un
30
30
  ScriptCollection/Resources/CultureChooser/index.html,sha256=gxQzbrSp4WU52TqN-gcBEtz2gJXmmM14OwTSFtFVRvw,276
31
31
  ScriptCollection/Resources/Dependencies/JRE/Version.txt,sha256=WlFzNJMH4lfVzW5QGHnuE52jLujSGpQ48zVB-Cln-7g,9
32
32
  ScriptCollection/Resources/Dependencies/OpenAPIGenerator/Version.txt,sha256=hdAgOhOHx4s13fJ-j0A06oYoM9rdEfDe0RzHoeAKXxo,7
33
- ScriptCollection/Resources/Dependencies/PlantUML/Version.txt,sha256=j8zklHUnAikNxeYhvQJsadO-Aa6AqQnIoEAwW_uu-a0,10
34
- ScriptCollection/Resources/Fonts/DejaVuSans-Bold.ttf,sha256=5kdsG4BQKSQpTu1AiUxbGOBsGBREypU-UzQmLfnCdyQ,705684
35
- ScriptCollection/Resources/Fonts/DejaVuSans-BoldOblique.ttf,sha256=60NtygwllLc9i2A7iS43T9_Y2IXSX_tPGN9MTAtJ5Q8,643292
36
- ScriptCollection/Resources/Fonts/DejaVuSans-Oblique.ttf,sha256=SvdfoW7m061D4ezsQYYsJJVK8mpVxrseuye9SGpQ9fQ,635416
37
- ScriptCollection/Resources/Fonts/DejaVuSans.ttf,sha256=faGVp0xVvvmI0NSPlQi9XYSUJcF3Dbpde_xs6e2EiVQ,757076
38
- ScriptCollection/Resources/Fonts/LICENSE.txt,sha256=egg7E25k0GR5TDQZdR5cfdENL2TBCP5boWHq5eWVipM,8816
39
33
  ScriptCollection/Resources/MaintenanceSite/MaintenanceSite.html,sha256=CX9S1bdOz6xU2aGfr03tJRGczQrlpn-IeODc15d5kc0,232
40
34
  ScriptCollection/TFCPS/PackageSource.py,sha256=tQoMbxrIbV3mYHKH2wgOoGzIHY1TvBH8EAFpWGhryrQ,1311
35
+ ScriptCollection/TFCPS/PlantUMLRenderer.py,sha256=upnafiGKV-SdRI8iRBkbbWHN2u6v9KxoswdKi12AwoY,11060
41
36
  ScriptCollection/TFCPS/SCTaskRunnerServer.py,sha256=tub8_1QBu0nWAaGnBWp2nErOW-SOHf_UL6qjOSGbnxU,31026
42
37
  ScriptCollection/TFCPS/TFCPS_BuildCodeUnitsHook.py,sha256=67_DQwoH5bhxxSmwtuAeoW1NOCMiLMzOy48OqlJX-KY,1744
43
38
  ScriptCollection/TFCPS/TFCPS_CodeUnitSpecific_Base.py,sha256=aCfGCbevCOV1IJ444dhvwJkGDKQNH3mqIucPAuSUq-o,40149
44
39
  ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnit.py,sha256=Mj9t1SyRpkYZE74cLsGWYv4xB89gXL2ld-RX3xvvGdw,9835
45
- ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=8AZoZ-A0nHoAIV6xa142GO2ppjsWuwDEFT1bNmAPGTU,48870
40
+ ScriptCollection/TFCPS/TFCPS_CodeUnit_BuildCodeUnits.py,sha256=EVC50YNlaiB16JwBnayIvtVbGpFY0kYRvQOGs23PgnA,47398
46
41
  ScriptCollection/TFCPS/TFCPS_CreateRelease.py,sha256=kpEmSnfzfgB4OjcCuS_X6jgW_ftcphxEnjjoLoAHTLY,6582
47
42
  ScriptCollection/TFCPS/TFCPS_Generic.py,sha256=mRBcf7XuNWOSXbZYc3NuJow18AMZ30D6Z-BtyNYfNcM,2072
48
43
  ScriptCollection/TFCPS/TFCPS_MergeToMain.py,sha256=Krt5oyGNcRAN3szsgU7LoTh8yVTOdHW-Kq7R9MDDV-Q,7673
@@ -50,7 +45,7 @@ ScriptCollection/TFCPS/TFCPS_MergeToStable.py,sha256=oYEhz5ZWMnbu97_CcYEqdDxakUF
50
45
  ScriptCollection/TFCPS/TFCPS_OCIImageSecretScan.py,sha256=rhw0glr4gZ5enG9faOD51xE4MMK1cIdNjUdaswiMsrY,14622
51
46
  ScriptCollection/TFCPS/TFCPS_PreBuildCodeunitsScript.py,sha256=XLVsFTA1jvfDbZ7wYJgIdEByZhF_bYVbA5jkisuvK4k,2322
52
47
  ScriptCollection/TFCPS/TFCPS_RemoteBuild.py,sha256=gQQbk7Va7c_0VL2pu_UYM-GPkbQxe0vvs2D_gJdZulI,21103
53
- ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=vLqP2EuLOWILRDI2MQZF-ryRetbn21f-k_BukAlhuNQ,169373
48
+ ScriptCollection/TFCPS/TFCPS_Tools_General.py,sha256=vfURo1uDtJVH45EwLd8APWix4FMCUEirXS941hFnG6g,159039
54
49
  ScriptCollection/TFCPS/TFCPS_VisualRegressionTests.py,sha256=6_63udxHnPlu_TMk_ftLZTnzriJO8MCxVCVAsweZqHs,37073
55
50
  ScriptCollection/TFCPS/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
56
51
  ScriptCollection/TFCPS/CPP/TFCPS_CodeUnitSpecific_CPP.py,sha256=4skj2I73VOo93HMXcBuWmdyuoE9zjqr2H_DtsYrcvNo,16375
@@ -62,7 +57,7 @@ ScriptCollection/TFCPS/DotNet/CertificateGeneratorInformationGenerate.py,sha256=
62
57
  ScriptCollection/TFCPS/DotNet/CertificateGeneratorInformationNoGenerate.py,sha256=i0zEGehj0sttxjjZtoq2KFSKp_ulxVyWp_ZgAhIY_So,241
63
58
  ScriptCollection/TFCPS/DotNet/TFCPS_CodeUnitSpecific_DotNet.py,sha256=GCFzDNAnmm40EeqOYgD_EeuEwDY58ujwJ1-Zn_naamc,61797
64
59
  ScriptCollection/TFCPS/DotNet/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
65
- ScriptCollection/TFCPS/Flutter/TFCPS_CodeUnitSpecific_Flutter.py,sha256=USyCVpAtuvOr2snQA_AM-YcSJzQ3vnUQWrVgXX9Wgyk,51768
60
+ ScriptCollection/TFCPS/Flutter/TFCPS_CodeUnitSpecific_Flutter.py,sha256=KR_Kvxp5yeWrCQXqUwmiv8IPGKCbHMUmdrsNovpowVs,51698
66
61
  ScriptCollection/TFCPS/Flutter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
67
62
  ScriptCollection/TFCPS/Go/TFCPS_CodeUnitSpecific_Go.py,sha256=m4Pax-U6o5XuspLnLfnWjyQMtoC7zBDDNJW9EhLWjeE,9012
68
63
  ScriptCollection/TFCPS/Go/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -76,8 +71,8 @@ ScriptCollection/TFCPS/Rust/TFCPS_CodeUnitSpecific_Rust.py,sha256=yyjWPMHQjPLkML
76
71
  ScriptCollection/TFCPS/Rust/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
77
72
  ScriptCollection/TFCPS/TypeScript/TFCPS_CodeUnitSpecific_TypeScript.py,sha256=5z990qyO5durX07xRWRwju1hl6wpjQAy2f-yRwJ-7s0,11856
78
73
  ScriptCollection/TFCPS/TypeScript/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
79
- scriptcollection-4.4.22.dist-info/METADATA,sha256=OuQdjS2Vp-rR1ljx7aw92t49LnCzQN8AxFvPEzQFXMo,7690
80
- scriptcollection-4.4.22.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
81
- scriptcollection-4.4.22.dist-info/entry_points.txt,sha256=GNma7tN0J59EvK71su-G1w22RnZ05bXcPrELyLx3AL0,6151
82
- scriptcollection-4.4.22.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
83
- scriptcollection-4.4.22.dist-info/RECORD,,
74
+ scriptcollection-4.4.24.dist-info/METADATA,sha256=zUUw_zEeCAQclVZguwET6TJ1R6A_1p5EkfzhDlNze2k,7690
75
+ scriptcollection-4.4.24.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
76
+ scriptcollection-4.4.24.dist-info/entry_points.txt,sha256=GNma7tN0J59EvK71su-G1w22RnZ05bXcPrELyLx3AL0,6151
77
+ scriptcollection-4.4.24.dist-info/top_level.txt,sha256=hY2hOVH0V0Ce51WB76zKkIWTUNwMUdHo4XDkR2vYVwg,17
78
+ scriptcollection-4.4.24.dist-info/RECORD,,
@@ -1 +0,0 @@
1
- v1.2026.6
@@ -1,187 +0,0 @@
1
- Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
2
- Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
3
-
4
-
5
- Bitstream Vera Fonts Copyright
6
- ------------------------------
7
-
8
- Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
9
- a trademark of Bitstream, Inc.
10
-
11
- Permission is hereby granted, free of charge, to any person obtaining a copy
12
- of the fonts accompanying this license ("Fonts") and associated
13
- documentation files (the "Font Software"), to reproduce and distribute the
14
- Font Software, including without limitation the rights to use, copy, merge,
15
- publish, distribute, and/or sell copies of the Font Software, and to permit
16
- persons to whom the Font Software is furnished to do so, subject to the
17
- following conditions:
18
-
19
- The above copyright and trademark notices and this permission notice shall
20
- be included in all copies of one or more of the Font Software typefaces.
21
-
22
- The Font Software may be modified, altered, or added to, and in particular
23
- the designs of glyphs or characters in the Fonts may be modified and
24
- additional glyphs or characters may be added to the Fonts, only if the fonts
25
- are renamed to names not containing either the words "Bitstream" or the word
26
- "Vera".
27
-
28
- This License becomes null and void to the extent applicable to Fonts or Font
29
- Software that has been modified and is distributed under the "Bitstream
30
- Vera" names.
31
-
32
- The Font Software may be sold as part of a larger software package but no
33
- copy of one or more of the Font Software typefaces may be sold by itself.
34
-
35
- THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
36
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
37
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
38
- TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
39
- FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
40
- ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
41
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
42
- THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
43
- FONT SOFTWARE.
44
-
45
- Except as contained in this notice, the names of Gnome, the Gnome
46
- Foundation, and Bitstream Inc., shall not be used in advertising or
47
- otherwise to promote the sale, use or other dealings in this Font Software
48
- without prior written authorization from the Gnome Foundation or Bitstream
49
- Inc., respectively. For further information, contact: fonts at gnome dot
50
- org.
51
-
52
- Arev Fonts Copyright
53
- ------------------------------
54
-
55
- Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
56
-
57
- Permission is hereby granted, free of charge, to any person obtaining
58
- a copy of the fonts accompanying this license ("Fonts") and
59
- associated documentation files (the "Font Software"), to reproduce
60
- and distribute the modifications to the Bitstream Vera Font Software,
61
- including without limitation the rights to use, copy, merge, publish,
62
- distribute, and/or sell copies of the Font Software, and to permit
63
- persons to whom the Font Software is furnished to do so, subject to
64
- the following conditions:
65
-
66
- The above copyright and trademark notices and this permission notice
67
- shall be included in all copies of one or more of the Font Software
68
- typefaces.
69
-
70
- The Font Software may be modified, altered, or added to, and in
71
- particular the designs of glyphs or characters in the Fonts may be
72
- modified and additional glyphs or characters may be added to the
73
- Fonts, only if the fonts are renamed to names not containing either
74
- the words "Tavmjong Bah" or the word "Arev".
75
-
76
- This License becomes null and void to the extent applicable to Fonts
77
- or Font Software that has been modified and is distributed under the
78
- "Tavmjong Bah Arev" names.
79
-
80
- The Font Software may be sold as part of a larger software package but
81
- no copy of one or more of the Font Software typefaces may be sold by
82
- itself.
83
-
84
- THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
85
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
86
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
87
- OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
88
- TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
89
- INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
90
- DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
91
- FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
92
- OTHER DEALINGS IN THE FONT SOFTWARE.
93
-
94
- Except as contained in this notice, the name of Tavmjong Bah shall not
95
- be used in advertising or otherwise to promote the sale, use or other
96
- dealings in this Font Software without prior written authorization
97
- from Tavmjong Bah. For further information, contact: tavmjong @ free
98
- . fr.
99
-
100
- TeX Gyre DJV Math
101
- -----------------
102
- Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
103
-
104
- Math extensions done by B. Jackowski, P. Strzelczyk and P. Pianowski
105
- (on behalf of TeX users groups) are in public domain.
106
-
107
- Letters imported from Euler Fraktur from AMSfonts are (c) American
108
- Mathematical Society (see below).
109
- Bitstream Vera Fonts Copyright
110
- Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera
111
- is a trademark of Bitstream, Inc.
112
-
113
- Permission is hereby granted, free of charge, to any person obtaining a copy
114
- of the fonts accompanying this license (“Fonts”) and associated
115
- documentation
116
- files (the “Font Software”), to reproduce and distribute the Font Software,
117
- including without limitation the rights to use, copy, merge, publish,
118
- distribute,
119
- and/or sell copies of the Font Software, and to permit persons to whom
120
- the Font Software is furnished to do so, subject to the following
121
- conditions:
122
-
123
- The above copyright and trademark notices and this permission notice
124
- shall be
125
- included in all copies of one or more of the Font Software typefaces.
126
-
127
- The Font Software may be modified, altered, or added to, and in particular
128
- the designs of glyphs or characters in the Fonts may be modified and
129
- additional
130
- glyphs or characters may be added to the Fonts, only if the fonts are
131
- renamed
132
- to names not containing either the words “Bitstream” or the word “Vera”.
133
-
134
- This License becomes null and void to the extent applicable to Fonts or
135
- Font Software
136
- that has been modified and is distributed under the “Bitstream Vera”
137
- names.
138
-
139
- The Font Software may be sold as part of a larger software package but
140
- no copy
141
- of one or more of the Font Software typefaces may be sold by itself.
142
-
143
- THE FONT SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS
144
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
145
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
146
- TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
147
- FOUNDATION
148
- BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL,
149
- SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN
150
- ACTION
151
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR
152
- INABILITY TO USE
153
- THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
154
- Except as contained in this notice, the names of GNOME, the GNOME
155
- Foundation,
156
- and Bitstream Inc., shall not be used in advertising or otherwise to promote
157
- the sale, use or other dealings in this Font Software without prior written
158
- authorization from the GNOME Foundation or Bitstream Inc., respectively.
159
- For further information, contact: fonts at gnome dot org.
160
-
161
- AMSFonts (v. 2.2) copyright
162
-
163
- The PostScript Type 1 implementation of the AMSFonts produced by and
164
- previously distributed by Blue Sky Research and Y&Y, Inc. are now freely
165
- available for general use. This has been accomplished through the
166
- cooperation
167
- of a consortium of scientific publishers with Blue Sky Research and Y&Y.
168
- Members of this consortium include:
169
-
170
- Elsevier Science IBM Corporation Society for Industrial and Applied
171
- Mathematics (SIAM) Springer-Verlag American Mathematical Society (AMS)
172
-
173
- In order to assure the authenticity of these fonts, copyright will be
174
- held by
175
- the American Mathematical Society. This is not meant to restrict in any way
176
- the legitimate use of the fonts, such as (but not limited to) electronic
177
- distribution of documents containing these fonts, inclusion of these fonts
178
- into other public domain or commercial font collections or computer
179
- applications, use of the outline data to create derivative fonts and/or
180
- faces, etc. However, the AMS does require that the AMS copyright notice be
181
- removed from any derivative versions of the fonts which have been altered in
182
- any way. In addition, to ensure the fidelity of TeX documents using Computer
183
- Modern fonts, Professor Donald Knuth, creator of the Computer Modern faces,
184
- has requested that any alterations which yield different font metrics be
185
- given a different name.
186
-
187
- $Id$