diff --git a/cgmanifests/submodules/cgmanifest.json b/cgmanifests/submodules/cgmanifest.json index 5c230d1183..ef17b11608 100644 --- a/cgmanifests/submodules/cgmanifest.json +++ b/cgmanifests/submodules/cgmanifest.json @@ -1,6 +1,50 @@ { "Version": 1, "Registrations": [ + { + "Component": { + "Type": "other", + "other": { + "Name": "automake", + "Version": "1.16.2", + "DownloadUrl": "http://ftp.gnu.org/gnu/automake/automake-1.16.2.tar.gz" + }, + "comments": "manylinux dependency" + } + }, + { + "Component": { + "Type": "other", + "other": { + "Name": "libtool", + "Version": "2.4.6", + "DownloadUrl": "http://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.gz" + }, + "comments": "manylinux dependency" + } + }, + { + "Component": { + "Type": "other", + "other": { + "Name": "sqlite", + "Version": "3320300", + "DownloadUrl": "https://www.sqlite.org/2020/sqlite-autoconf-3320300.tar.gz" + }, + "comments": "manylinux dependency" + } + }, + { + "Component": { + "Type": "other", + "other": { + "Name": "git", + "Version": "2.26.2", + "DownloadUrl": "https://github.com/git/git/archive/2.26.2.tar.gz" + }, + "comments": "manylinux dependency" + } + }, { "component": { "type": "git", @@ -365,22 +409,12 @@ "component": { "type": "git", "git": { - "commitHash": "80d452484c5409444b0ec19383faa84bb7a4d351", + "commitHash": "59a2ac2745d8a57ac94c6accced73620d59fb844", "repositoryUrl": "https://github.com/pybind/pybind11.git" }, "comments": "git submodule at cmake/external/onnx/third_party/pybind11" } }, - { - "component": { - "type": "git", - "git": { - "commitHash": "6a00cbc4a9b8e68b71caf7f774b3f9c753ae84d5", - "repositoryUrl": "https://github.com/wjakob/clang-cindex-python3" - }, - "comments": "git submodule at cmake/external/onnx/third_party/pybind11/tools/clang" - } - }, { "component": { "type": "git", diff --git a/cgmanifests/submodules/generate_submodule_cgmanifest.py b/cgmanifests/submodules/generate_submodule_cgmanifest.py index b75f8792a9..a1ee7d909e 100644 --- a/cgmanifests/submodules/generate_submodule_cgmanifest.py +++ b/cgmanifests/submodules/generate_submodule_cgmanifest.py @@ -4,10 +4,54 @@ import json import os import subprocess import sys +import re SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__)) REPO_DIR = os.path.normpath(os.path.join(SCRIPT_DIR, "..", "..")) +package_name = None +package_filename = None +package_url = None + +registrations = [] + +with open(os.path.join(REPO_DIR,'tools','ci_build','github','linux','docker','manylinux2014_build_scripts','build_env.sh'), "r") as f: + for line in f: + if not line.strip(): + package_name = None + package_filename = None + package_url = None + if package_filename is None: + m = re.match("(.+?)_ROOT=(.*)$",line) + if m != None: + package_name = m.group(1) + package_filename = m.group(2) + else: + m = re.match("(.+?)_AUTOCONF_VERSION=(.*)$",line) + if m != None: + package_name = m.group(1) + package_filename = m.group(2) + elif package_url is None: + m = re.match("(.+?)_DOWNLOAD_URL=(.+)$",line) + if m != None: + package_url = m.group(2) + "/" + package_filename + ".tar.gz" + registration = { + "Component": { + "Type": "other", + "other": { + "Name": package_name.lower(), + "Version": package_filename.split("-")[-1], + "DownloadUrl": package_url, + }, + "comments": "manylinux dependency" + } + } + registrations.append(registration) + package_name = None + package_filename = None + package_url = None + + proc = subprocess.run( ["git", "submodule", "foreach", "--quiet", "--recursive", "{} {} $toplevel/$sm_path".format( sys.executable, os.path.join(SCRIPT_DIR, "print_submodule_info.py"))], @@ -17,7 +61,7 @@ proc = subprocess.run( stderr=subprocess.PIPE, universal_newlines=True) -registrations = [] + submodule_lines = proc.stdout.splitlines() for submodule_line in submodule_lines: (absolute_path, url, commit) = submodule_line.split(" ")