summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/import/TARGETS.git2148
-rw-r--r--etc/import/include/git2/TARGETS.git2284
-rw-r--r--etc/import/src/TARGETS.git2124
3 files changed, 277 insertions, 279 deletions
diff --git a/etc/import/TARGETS.git2 b/etc/import/TARGETS.git2
index 48b30ad3..9ea458a8 100644
--- a/etc/import/TARGETS.git2
+++ b/etc/import/TARGETS.git2
@@ -1,6 +1,6 @@
{ "git2":
{ "type": "export"
- , "target": ["./", "src", "git2internal"]
+ , "target": "git2configured"
, "flexible_config":
[ "OS"
, "ARCH"
@@ -16,15 +16,159 @@
, "DEBUG_POOL"
, "ENABLE_TRACE"
, "THREADSAFE"
+ , "REGEX_BACKEND"
+ , "WINHTTP"
, "USE_ICONV"
, "USE_NSEC"
- , "REGEX_BACKEND"
, "USE_SSH"
, "USE_NTLMCLIENT"
, "USE_GSSAPI"
, "USE_SHA1"
, "USE_HTTPS"
+ , "USE_HTTP_PARSER"
+ , "USE_BUNDLED_ZLIB"
+ ]
+ }
+, "git2configured":
+ { "type": "configure"
+ , "arguments_config":
+ [ "OS"
+ , "ARCH"
+ , "TARGET_ARCH"
+ , "USE_SYSTEM_LIBS"
+ , "DEBUG_POOL"
+ , "ENABLE_TRACE"
+ , "THREADSAFE"
+ , "REGEX_BACKEND"
, "WINHTTP"
+ , "USE_ICONV"
+ , "USE_NSEC"
+ , "USE_SSH"
+ , "USE_NTLMCLIENT"
+ , "USE_GSSAPI"
+ , "USE_SHA1"
+ , "USE_HTTPS"
+ , "USE_HTTP_PARSER"
+ , "USE_BUNDLED_ZLIB"
]
+ , "target": ["./", "src", "git2internal"]
+ , "config":
+ { "type": "let*"
+ , "bindings":
+ [ [ "TARGET_ARCH"
+ , { "type": "var"
+ , "name": "TARGET_ARCH"
+ , "default":
+ { "type": "var"
+ , "name": "ARCH"
+ , "default":
+ {"type": "fail", "msg": "Required variable 'ARCH' is not set."}
+ }
+ }
+ ]
+ , [ "OS"
+ , { "type": "var"
+ , "name": "OS"
+ , "default":
+ {"type": "fail", "msg": "Required variable 'OS' is not set."}
+ }
+ ]
+ , ["THREADSAFE", {"type": "var", "name": "THREADSAFE", "default": true}]
+ , ["USE_SSH", {"type": "var", "name": "USE_SSH", "default": true}]
+ , ["USE_GSSAPI", {"type": "var", "name": "USE_GSSAPI", "default": true}]
+ , ["USE_SHA1", {"type": "var", "name": "USE_SHA1", "default": true}]
+ , ["USE_HTTPS", {"type": "var", "name": "USE_HTTPS", "default": true}]
+ , [ "WINHTTP"
+ , { "type": "var"
+ , "name": "WINHTTP"
+ , "default":
+ { "type": "=="
+ , "$1": {"type": "var", "name": "OS"}
+ , "$2": "windows"
+ }
+ }
+ ]
+ , [ "USE_HTTPS"
+ , { "type": "case*"
+ , "expr": {"type": "var", "name": "USE_HTTPS"}
+ , "case":
+ [ [ true
+ , { "type": "case*"
+ , "expr": {"type": "var", "name": "OS"}
+ , "case":
+ [ [ "windows"
+ , { "type": "if"
+ , "cond": {"type": "var", "name": "WINHTTP"}
+ , "then": "WinHTTP"
+ , "else": true
+ }
+ ]
+ ]
+ , "default": true
+ }
+ ]
+ ]
+ , "default": {"type": "var", "name": "USE_HTTPS"}
+ }
+ ]
+ , [ "USE_GSSAPI"
+ , { "type": "case*"
+ , "expr": {"type": "var", "name": "USE_GSSAPI"}
+ , "case":
+ [ [ true
+ , { "type": "case*"
+ , "expr": {"type": "var", "name": "OS"}
+ , "case": [["darwin", "GSS.framework"]]
+ , "default": "gssapi"
+ }
+ ]
+ ]
+ , "default": {"type": "var", "name": "USE_GSSAPI"}
+ }
+ ]
+ , [ "USE_SHA1"
+ , { "type": "case*"
+ , "expr": {"type": "var", "name": "USE_SHA1"}
+ , "case":
+ [ [true, "CollisionDetection"]
+ , [ "HTTPS"
+ , { "type": "case*"
+ , "expr": {"type": "var", "name": "USE_HTTPS"}
+ , "case":
+ [ ["SecureTransport", "CommonCrypto"]
+ , ["WinHTTP", "Win32"]
+ , [false, "CollisionDetection"]
+ , [null, "CollisionDetection"]
+ ]
+ , "default": {"type": "var", "name": "USE_HTTPS"}
+ }
+ ]
+ ]
+ , "default": {"type": "var", "name": "USE_SHA1"}
+ }
+ ]
+ ]
+ , "body":
+ { "type": "env"
+ , "vars":
+ [ "OS"
+ , "TARGET_ARCH"
+ , "USE_SYSTEM_LIBS"
+ , "DEBUG_POOL"
+ , "ENABLE_TRACE"
+ , "THREADSAFE"
+ , "REGEX_BACKEND"
+ , "USE_ICONV"
+ , "USE_NSEC"
+ , "USE_SSH"
+ , "USE_NTLMCLIENT"
+ , "USE_GSSAPI"
+ , "USE_SHA1"
+ , "USE_HTTPS"
+ , "USE_HTTP_PARSER"
+ , "USE_BUNDLED_ZLIB"
+ ]
+ }
+ }
}
}
diff --git a/etc/import/include/git2/TARGETS.git2 b/etc/import/include/git2/TARGETS.git2
index ada9989f..86f68807 100644
--- a/etc/import/include/git2/TARGETS.git2
+++ b/etc/import/include/git2/TARGETS.git2
@@ -19,212 +19,130 @@
]
, "name": "sys/features.h"
, "data":
- { "type": "let*"
- , "bindings":
- [ ["THREADSAFE", {"type": "var", "name": "THREADSAFE", "default": true}]
- , [ "ENABLE_TRACE"
- , {"type": "var", "name": "ENABLE_TRACE", "default": true}
- ]
- , ["USE_SSH", {"type": "var", "name": "USE_SSH", "default": true}]
- , [ "WINHTTP"
- , { "type": "var"
- , "name": "WINHTTP"
- , "default":
- { "type": "=="
- , "$1": {"type": "var", "name": "OS"}
- , "$2": "windows"
- }
+ { "type": "join"
+ , "separator": "\n"
+ , "$1":
+ { "type": "++"
+ , "$1":
+ [ ["#ifndef INCLUDE_features_h__", "#define INCLUDE_features_h__", ""]
+ , { "type": "if"
+ , "cond": {"type": "var", "name": "DEBUG_POOL"}
+ , "then": ["#define GIT_DEBUG_POOL 1"]
}
- ]
- , [ "USE_HTTPS"
- , { "type": "case*"
- , "expr": {"type": "var", "name": "USE_HTTPS", "default": true}
+ , { "type": "if"
+ , "cond": {"type": "var", "name": "ENABLE_TRACE"}
+ , "then": ["#define GIT_TRACE 1"]
+ }
+ , { "type": "if"
+ , "cond": {"type": "var", "name": "THREADSAFE"}
+ , "then": ["#define GIT_THREADS 1"]
+ }
+ , { "type": "case"
+ , "expr":
+ { "type": "var"
+ , "name": "TARGET_ARCH"
+ , "default": {"type": "var", "name": "ARCH"}
+ }
, "case":
- [ [ true
+ { "x86_64": ["#define GIT_ARCH_64 1"]
+ , "arm64": ["#define GIT_ARCH_64 1"]
+ }
+ , "default": ["#define GIT_ARCH_32 1"]
+ }
+ , { "type": "if"
+ , "cond": {"type": "var", "name": "USE_ICONV"}
+ , "then": ["#define GIT_USE_ICONV 1"]
+ }
+ , { "type": "if"
+ , "cond": {"type": "var", "name": "USE_NSEC"}
+ , "then":
+ { "type": "++"
+ , "$1":
+ [ [ "#define GIT_USE_NSEC 1"
+ , "#define GIT_USE_FUTIMENS 1"
+ , "#define GIT_USE_STAT_MTIME_NSEC 1"
+ ]
, { "type": "case*"
, "expr": {"type": "var", "name": "OS"}
, "case":
- [ [ "windows"
- , { "type": "if"
- , "cond": {"type": "var", "name": "WINHTTP"}
- , "then": "WinHTTP"
- , "else": true
- }
- ]
- ]
- , "default": true
+ { "darwin": ["#define GIT_USE_STAT_MTIMESPEC 1"]
+ , "bsd": ["#define GIT_USE_STAT_MTIMESPEC 1"]
+ }
+ , "default": ["#define GIT_USE_STAT_MTIM 1"]
}
]
- ]
- , "default": {"type": "var", "name": "USE_HTTPS"}
+ }
}
- ]
- , [ "USE_GSSAPI"
, { "type": "case*"
- , "expr": {"type": "var", "name": "USE_GSSAPI", "default": true}
+ , "expr": {"type": "var", "name": "REGEX_BACKEND"}
, "case":
- [ [ true
- , { "type": "case*"
- , "expr": {"type": "var", "name": "OS"}
- , "case": [["darwin", "GSS.framework"]]
- , "default": "gssapi"
- }
- ]
+ [ ["regcomp_l", ["#define GIT_REGEX_REGCOMP_L 1"]]
+ , ["regcomp", ["#define GIT_REGEX_REGCOMP 1"]]
+ , ["pcre", ["#define GIT_REGEX_PCRE 1"]]
+ , ["pcre2", ["#define GIT_REGEX_PCRE2 1"]]
+ , ["builtin", ["#define GIT_REGEX_BUILTIN 1"]]
+ , [null, ["#define GIT_REGEX_BUILTIN 1"]]
]
- , "default": {"type": "var", "name": "USE_GSSAPI"}
+ , "default":
+ { "type": "fail"
+ , "msg": "The REGEX_BACKEND option provided is not supported"
+ }
+ }
+ , { "type": "if"
+ , "cond": {"type": "var", "name": "USE_SSH"}
+ , "then":
+ ["#define GIT_SSH 1", "#define GIT_SSH_MEMORY_CREDENTIALS 1"]
+ }
+ , { "type": "if"
+ , "cond": {"type": "var", "name": "USE_NTLMCLIENT"}
+ , "then": ["#define GIT_NTLM 1"]
}
- ]
- , [ "USE_SHA1"
, { "type": "case*"
- , "expr": {"type": "var", "name": "USE_SHA1", "default": true}
+ , "expr": {"type": "var", "name": "USE_GSSAPI"}
, "case":
- [ [true, "CollisionDetection"]
- , [ "HTTPS"
+ [ ["GSS.framework", ["#define GIT_GSSFRAMEWORK 1"]]
+ , ["gssapi", ["#define GIT_GSSAPI 1"]]
+ , [false, []]
+ ]
+ , "default":
+ { "type": "fail"
+ , "msg": "Backend asked for in USE_GSSAPI is not supported"
+ }
+ }
+ , { "type": "if"
+ , "cond": {"type": "var", "name": "USE_HTTPS"}
+ , "then":
+ { "type": "++"
+ , "$1":
+ [ ["#define GIT_HTTPS 1"]
, { "type": "case*"
, "expr": {"type": "var", "name": "USE_HTTPS"}
, "case":
- [ ["SecureTransport", "CommonCrypto"]
- , ["WinHTTP", "Win32"]
- , [false, "CollisionDetection"]
- , [null, "CollisionDetection"]
+ [ ["SecureTransport", ["#define GIT_SECURE_TRANSPORT 1"]]
+ , ["OpenSSL", ["#define GIT_OPENSSL 1"]]
+ , ["mbedTLS", ["#define GIT_MBEDTLS 1"]]
+ , ["WinHTTP", ["#define GIT_WINHTTP 1"]]
]
- , "default": {"type": "var", "name": "USE_HTTPS"}
+ , "default":
+ { "type": "fail"
+ , "msg": "Backend asked for in USE_HTTPS is not supported"
+ }
}
]
+ }
+ }
+ , { "type": "case*"
+ , "expr": {"type": "var", "name": "USE_SHA1"}
+ , "case":
+ [ ["CollisionDetection", ["#define GIT_SHA1_COLLISIONDETECT 1"]]
+ , ["Win32", ["#define GIT_SHA1_WIN32 1"]]
+ , ["CommonCrypto", ["#define GIT_SHA1_COMMON_CRYPTO 1"]]
+ , ["OpenSSL", ["#define GIT_SHA1_OPENSSL 1"]]
+ , ["mbedTLS", ["#define GIT_SHA1_MBEDTLS 1"]]
]
- , "default": {"type": "var", "name": "USE_SHA1"}
}
+ , ["", "#endif", ""]
]
- ]
- , "body":
- { "type": "join"
- , "separator": "\n"
- , "$1":
- { "type": "++"
- , "$1":
- [ [ "#ifndef INCLUDE_features_h__"
- , "#define INCLUDE_features_h__"
- , ""
- ]
- , { "type": "if"
- , "cond": {"type": "var", "name": "DEBUG_POOL"}
- , "then": ["#define GIT_DEBUG_POOL 1"]
- }
- , { "type": "if"
- , "cond": {"type": "var", "name": "ENABLE_TRACE"}
- , "then": ["#define GIT_TRACE 1"]
- }
- , { "type": "if"
- , "cond": {"type": "var", "name": "THREADSAFE"}
- , "then": ["#define GIT_THREADS 1"]
- }
- , { "type": "case"
- , "expr":
- { "type": "var"
- , "name": "TARGET_ARCH"
- , "default": {"type": "var", "name": "ARCH"}
- }
- , "case":
- { "x86_64": ["#define GIT_ARCH_64 1"]
- , "arm64": ["#define GIT_ARCH_64 1"]
- }
- , "default": ["#define GIT_ARCH_32 1"]
- }
- , { "type": "if"
- , "cond": {"type": "var", "name": "USE_ICONV"}
- , "then": ["#define GIT_USE_ICONV 1"]
- }
- , { "type": "if"
- , "cond": {"type": "var", "name": "USE_NSEC"}
- , "then":
- { "type": "++"
- , "$1":
- [ [ "#define GIT_USE_NSEC 1"
- , "#define GIT_USE_FUTIMENS 1"
- , "#define GIT_USE_STAT_MTIME_NSEC 1"
- ]
- , { "type": "case*"
- , "expr": {"type": "var", "name": "OS"}
- , "case":
- { "darwin": ["#define GIT_USE_STAT_MTIMESPEC 1"]
- , "bsd": ["#define GIT_USE_STAT_MTIMESPEC 1"]
- }
- , "default": ["#define GIT_USE_STAT_MTIM 1"]
- }
- ]
- }
- }
- , { "type": "case*"
- , "expr": {"type": "var", "name": "REGEX_BACKEND"}
- , "case":
- [ ["regcomp_l", ["#define GIT_REGEX_REGCOMP_L 1"]]
- , ["regcomp", ["#define GIT_REGEX_REGCOMP 1"]]
- , ["pcre", ["#define GIT_REGEX_PCRE 1"]]
- , ["pcre2", ["#define GIT_REGEX_PCRE2 1"]]
- , ["builtin", ["#define GIT_REGEX_BUILTIN 1"]]
- , [null, ["#define GIT_REGEX_BUILTIN 1"]]
- ]
- , "default":
- { "type": "fail"
- , "msg": "The REGEX_BACKEND option provided is not supported"
- }
- }
- , { "type": "if"
- , "cond": {"type": "var", "name": "USE_SSH"}
- , "then":
- ["#define GIT_SSH 1", "#define GIT_SSH_MEMORY_CREDENTIALS 1"]
- }
- , { "type": "if"
- , "cond": {"type": "var", "name": "USE_NTLMCLIENT"}
- , "then": ["#define GIT_NTLM 1"]
- }
- , { "type": "case*"
- , "expr": {"type": "var", "name": "USE_GSSAPI"}
- , "case":
- [ ["GSS.framework", ["#define GIT_GSSFRAMEWORK 1"]]
- , ["gssapi", ["#define GIT_GSSAPI 1"]]
- , [false, []]
- ]
- , "default":
- { "type": "fail"
- , "msg": "Backend asked for in USE_GSSAPI is not supported"
- }
- }
- , { "type": "if"
- , "cond": {"type": "var", "name": "USE_HTTPS"}
- , "then":
- { "type": "++"
- , "$1":
- [ ["#define GIT_HTTPS 1"]
- , { "type": "case*"
- , "expr": {"type": "var", "name": "USE_HTTPS"}
- , "case":
- [ ["SecureTransport", ["#define GIT_SECURE_TRANSPORT 1"]]
- , ["OpenSSL", ["#define GIT_OPENSSL 1"]]
- , ["mbedTLS", ["#define GIT_MBEDTLS 1"]]
- , ["WinHTTP", ["#define GIT_WINHTTP 1"]]
- ]
- , "default":
- { "type": "fail"
- , "msg": "Backend asked for in USE_HTTPS is not supported"
- }
- }
- ]
- }
- }
- , { "type": "case*"
- , "expr": {"type": "var", "name": "USE_SHA1"}
- , "case":
- [ ["CollisionDetection", ["#define GIT_SHA1_COLLISIONDETECT 1"]]
- , ["Win32", ["#define GIT_SHA1_WIN32 1"]]
- , ["CommonCrypto", ["#define GIT_SHA1_COMMON_CRYPTO 1"]]
- , ["OpenSSL", ["#define GIT_SHA1_OPENSSL 1"]]
- , ["mbedTLS", ["#define GIT_SHA1_MBEDTLS 1"]]
- ]
- }
- , ["", "#endif", ""]
- ]
- }
}
}
}
diff --git a/etc/import/src/TARGETS.git2 b/etc/import/src/TARGETS.git2
index 533286d3..212af582 100644
--- a/etc/import/src/TARGETS.git2
+++ b/etc/import/src/TARGETS.git2
@@ -173,7 +173,7 @@
{ "type": "++"
, "$1":
[ { "type": "if"
- , "cond": {"type": "var", "name": "THREADSAFE", "default": true}
+ , "cond": {"type": "var", "name": "THREADSAFE"}
, "then": ["-lpthread"]
}
, { "type": "case"
@@ -309,46 +309,20 @@
}
, "git2_hash":
{ "type": ["@", "rules", "CC", "library"]
- , "arguments_config": ["USE_SHA1", "USE_HTTPS"]
+ , "arguments_config": ["USE_SHA1"]
, "deps":
- { "type": "let*"
- , "bindings":
- [ [ "USE_SHA1"
- , { "type": "case*"
- , "expr": {"type": "var", "name": "USE_SHA1"}
- , "case":
- [ [true, "CollisionDetection"]
- , [ "HTTPS"
- , { "type": "case*"
- , "expr": {"type": "var", "name": "USE_HTTPS"}
- , "case":
- [ ["SecureTransport", "CommonCrypto"]
- , ["WinHTTP", "Win32"]
- , [false, "CollisionDetection"]
- , [null, "CollisionDetection"]
- ]
- , "default": {"type": "var", "name": "USE_HTTPS"}
- }
- ]
- ]
- , "default": {"type": "var", "name": "USE_SHA1"}
- }
- ]
+ { "type": "case*"
+ , "expr": {"type": "var", "name": "USE_SHA1"}
+ , "case":
+ [ ["CollisionDetection", ["git2_hash_collision_detection"]]
+ , ["OpenSSL", ["git2_hash_openssl"]]
+ , ["CommonCrypto", ["git2_hash_common_crypto"]]
+ , ["mbedTLS", ["git2_hash_mbedtls"]]
+ , ["Win32", ["git2_hash_win32"]]
+ , ["Generic", ["git2_hash_generic"]]
]
- , "body":
- { "type": "case*"
- , "expr": {"type": "var", "name": "USE_SHA1"}
- , "case":
- [ ["CollisionDetection", ["git2_hash_collision_detection"]]
- , ["OpenSSL", ["git2_hash_openssl"]]
- , ["CommonCrypto", ["git2_hash_common_crypto"]]
- , ["mbedTLS", ["git2_hash_mbedtls"]]
- , ["Win32", ["git2_hash_win32"]]
- , ["Generic", ["git2_hash_generic"]]
- ]
- , "default":
- {"type": "fail", "msg": "Asked for unknown SHA1 backend in `USE_SHA1`"}
- }
+ , "default":
+ {"type": "fail", "msg": "Asked for unknown SHA1 backend in `USE_SHA1`"}
}
}
, "git2_regex":
@@ -505,63 +479,25 @@
}
, "git2_https":
{ "type": ["@", "rules", "CC", "library"]
- , "arguments_config": ["OS", "USE_SYSTEM_LIBS", "WINHTTP", "USE_HTTPS"]
+ , "arguments_config": ["OS", "USE_SYSTEM_LIBS", "USE_HTTPS"]
, "name": ["git2_http"]
, "link external":
- { "type": "let*"
- , "bindings":
- [ [ "WINHTTP"
- , { "type": "var"
- , "name": "WINHTTP"
- , "default":
- { "type": "=="
- , "$1": {"type": "var", "name": "OS"}
- , "$2": "windows"
- }
- }
- ]
- , [ "USE_HTTPS"
- , { "type": "case*"
- , "expr": {"type": "var", "name": "USE_HTTPS", "default": true}
- , "case":
- [ [ true
- , { "type": "case*"
- , "expr": {"type": "var", "name": "OS"}
- , "case":
- [ [ "windows"
- , { "type": "if"
- , "cond": {"type": "var", "name": "WINHTTP"}
- , "then": "WinHTTP"
- , "else": true
- }
- ]
- ]
- , "default": true
- }
- ]
- ]
- , "default": {"type": "var", "name": "USE_HTTPS"}
- }
- ]
- ]
- , "body":
- { "type": "case*"
- , "expr": {"type": "var", "name": "USE_HTTPS"}
- , "case": [["WinHTTP", ["-lwinhttp"]]]
- , "default":
- { "type": "if"
- , "cond": {"type": "var", "name": "USE_SYSTEM_LIBS"}
- , "then":
- { "type": "case*"
- , "expr": {"type": "var", "name": "USE_HTTPS"}
- , "case":
- [ ["OpenSSL", ["-lssl"]]
- , ["mbedTLS", ["-lmbedtls"]]
- , [ "SecureTransport"
- , ["-framework", "CoreFoundation", "-framework", "Security"]
- ]
+ { "type": "case*"
+ , "expr": {"type": "var", "name": "USE_HTTPS"}
+ , "case": [["WinHTTP", ["-lwinhttp"]]]
+ , "default":
+ { "type": "if"
+ , "cond": {"type": "var", "name": "USE_SYSTEM_LIBS"}
+ , "then":
+ { "type": "case*"
+ , "expr": {"type": "var", "name": "USE_HTTPS"}
+ , "case":
+ [ ["OpenSSL", ["-lssl"]]
+ , ["mbedTLS", ["-lmbedtls"]]
+ , [ "SecureTransport"
+ , ["-framework", "CoreFoundation", "-framework", "Security"]
]
- }
+ ]
}
}
}
@@ -571,7 +507,7 @@
, "then": []
, "else":
{ "type": "case*"
- , "expr": {"type": "var", "name": "USE_HTTPS", "default": true}
+ , "expr": {"type": "var", "name": "USE_HTTPS"}
, "case":
[ ["OpenSSL", [["@", "ssl", "", "ssl"]]]
, ["mbedTLS", [["@", "mbedtls", "", "ssl"]]]