packaging/ostree
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sys: regenerate with new gir

Browse Source
This commit is contained in:
Felix Krull authored and Colin Walters committed 2022-05-06 12:53:53 -04:00
1 parent 0f0ccb898d
commit bc0a8a04d3
6 files changed
+193 -231
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

rust-bindings/rust/sys/tests/abi.rs
+107 -100
View File
@@ -227,7 +227,14 @@ fn get_c_value(dir: &Path, cc: &Compiler, name: &str) -> Result<String, Box<Erro
&abi_cmd, &output).into());
}
Ok(str::from_utf8(&output.stdout)?.trim().to_owned())
let output = str::from_utf8(&output.stdout)?.trim();
if !output.starts_with("###gir test###") ||
!output.ends_with("###gir test###") {
return Err(format!("command {:?} return invalid output, {:?}",
&abi_cmd, &output).into());
}
Ok(String::from(&output[14..(output.len() - 14)]))
}
const RUST_LAYOUTS: &[(&str, Layout)] = &[
@@ -281,8 +288,8 @@ const RUST_LAYOUTS: &[(&str, Layout)] = &[
];
const RUST_CONSTANTS: &[(&str, &str)] = &[
("OSTREE_CHECKSUM_FLAGS_IGNORE_XATTRS", "1"),
("OSTREE_CHECKSUM_FLAGS_NONE", "0"),
("(guint) OSTREE_CHECKSUM_FLAGS_IGNORE_XATTRS", "1"),
("(guint) OSTREE_CHECKSUM_FLAGS_NONE", "0"),
("OSTREE_COMMIT_GVARIANT_STRING", "(a{sv}aya(say)sstayay)"),
("OSTREE_COMMIT_META_KEY_COLLECTION_BINDING", "ostree.collection-binding"),
("OSTREE_COMMIT_META_KEY_ENDOFLIFE", "ostree.endoflife"),
@@ -290,114 +297,114 @@ const RUST_CONSTANTS: &[(&str, &str)] = &[
("OSTREE_COMMIT_META_KEY_REF_BINDING", "ostree.ref-binding"),
("OSTREE_COMMIT_META_KEY_SOURCE_TITLE", "ostree.source-title"),
("OSTREE_COMMIT_META_KEY_VERSION", "version"),
("OSTREE_DEPLOYMENT_UNLOCKED_DEVELOPMENT", "1"),
("OSTREE_DEPLOYMENT_UNLOCKED_HOTFIX", "2"),
("OSTREE_DEPLOYMENT_UNLOCKED_NONE", "0"),
("OSTREE_DIFF_FLAGS_IGNORE_XATTRS", "1"),
("OSTREE_DIFF_FLAGS_NONE", "0"),
("(gint) OSTREE_DEPLOYMENT_UNLOCKED_DEVELOPMENT", "1"),
("(gint) OSTREE_DEPLOYMENT_UNLOCKED_HOTFIX", "2"),
("(gint) OSTREE_DEPLOYMENT_UNLOCKED_NONE", "0"),
("(guint) OSTREE_DIFF_FLAGS_IGNORE_XATTRS", "1"),
("(guint) OSTREE_DIFF_FLAGS_NONE", "0"),
("OSTREE_DIRMETA_GVARIANT_STRING", "(uuua(ayay))"),
("OSTREE_FILEMETA_GVARIANT_STRING", "(uuua(ayay))"),
("OSTREE_GPG_ERROR_INVALID_SIGNATURE", "1"),
("OSTREE_GPG_ERROR_MISSING_KEY", "2"),
("OSTREE_GPG_ERROR_NO_SIGNATURE", "0"),
("OSTREE_GPG_SIGNATURE_ATTR_EXP_TIMESTAMP", "7"),
("OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT", "5"),
("OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT_PRIMARY", "12"),
("OSTREE_GPG_SIGNATURE_ATTR_HASH_ALGO_NAME", "9"),
("OSTREE_GPG_SIGNATURE_ATTR_KEY_EXPIRED", "2"),
("OSTREE_GPG_SIGNATURE_ATTR_KEY_MISSING", "4"),
("OSTREE_GPG_SIGNATURE_ATTR_KEY_REVOKED", "3"),
("OSTREE_GPG_SIGNATURE_ATTR_PUBKEY_ALGO_NAME", "8"),
("OSTREE_GPG_SIGNATURE_ATTR_SIG_EXPIRED", "1"),
("OSTREE_GPG_SIGNATURE_ATTR_TIMESTAMP", "6"),
("OSTREE_GPG_SIGNATURE_ATTR_USER_EMAIL", "11"),
("OSTREE_GPG_SIGNATURE_ATTR_USER_NAME", "10"),
("OSTREE_GPG_SIGNATURE_ATTR_VALID", "0"),
("OSTREE_GPG_SIGNATURE_FORMAT_DEFAULT", "0"),
("(gint) OSTREE_GPG_ERROR_INVALID_SIGNATURE", "1"),
("(gint) OSTREE_GPG_ERROR_MISSING_KEY", "2"),
("(gint) OSTREE_GPG_ERROR_NO_SIGNATURE", "0"),
("(gint) OSTREE_GPG_SIGNATURE_ATTR_EXP_TIMESTAMP", "7"),
("(gint) OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT", "5"),
("(gint) OSTREE_GPG_SIGNATURE_ATTR_FINGERPRINT_PRIMARY", "12"),
("(gint) OSTREE_GPG_SIGNATURE_ATTR_HASH_ALGO_NAME", "9"),
("(gint) OSTREE_GPG_SIGNATURE_ATTR_KEY_EXPIRED", "2"),
("(gint) OSTREE_GPG_SIGNATURE_ATTR_KEY_MISSING", "4"),
("(gint) OSTREE_GPG_SIGNATURE_ATTR_KEY_REVOKED", "3"),
("(gint) OSTREE_GPG_SIGNATURE_ATTR_PUBKEY_ALGO_NAME", "8"),
("(gint) OSTREE_GPG_SIGNATURE_ATTR_SIG_EXPIRED", "1"),
("(gint) OSTREE_GPG_SIGNATURE_ATTR_TIMESTAMP", "6"),
("(gint) OSTREE_GPG_SIGNATURE_ATTR_USER_EMAIL", "11"),
("(gint) OSTREE_GPG_SIGNATURE_ATTR_USER_NAME", "10"),
("(gint) OSTREE_GPG_SIGNATURE_ATTR_VALID", "0"),
("(gint) OSTREE_GPG_SIGNATURE_FORMAT_DEFAULT", "0"),
("OSTREE_MAX_METADATA_SIZE", "10485760"),
("OSTREE_MAX_METADATA_WARN_SIZE", "7340032"),
("OSTREE_META_KEY_DEPLOY_COLLECTION_ID", "ostree.deploy-collection-id"),
("OSTREE_OBJECT_TYPE_COMMIT", "4"),
("OSTREE_OBJECT_TYPE_COMMIT_META", "6"),
("OSTREE_OBJECT_TYPE_DIR_META", "3"),
("OSTREE_OBJECT_TYPE_DIR_TREE", "2"),
("OSTREE_OBJECT_TYPE_FILE", "1"),
("OSTREE_OBJECT_TYPE_PAYLOAD_LINK", "7"),
("OSTREE_OBJECT_TYPE_TOMBSTONE_COMMIT", "5"),
("(gint) OSTREE_OBJECT_TYPE_COMMIT", "4"),
("(gint) OSTREE_OBJECT_TYPE_COMMIT_META", "6"),
("(gint) OSTREE_OBJECT_TYPE_DIR_META", "3"),
("(gint) OSTREE_OBJECT_TYPE_DIR_TREE", "2"),
("(gint) OSTREE_OBJECT_TYPE_FILE", "1"),
("(gint) OSTREE_OBJECT_TYPE_PAYLOAD_LINK", "7"),
("(gint) OSTREE_OBJECT_TYPE_TOMBSTONE_COMMIT", "5"),
("OSTREE_ORIGIN_TRANSIENT_GROUP", "libostree-transient"),
("OSTREE_REPO_CHECKOUT_FILTER_ALLOW", "0"),
("OSTREE_REPO_CHECKOUT_FILTER_SKIP", "1"),
("OSTREE_REPO_CHECKOUT_MODE_NONE", "0"),
("OSTREE_REPO_CHECKOUT_MODE_USER", "1"),
("OSTREE_REPO_CHECKOUT_OVERWRITE_ADD_FILES", "2"),
("OSTREE_REPO_CHECKOUT_OVERWRITE_NONE", "0"),
("OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_FILES", "1"),
("OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_IDENTICAL", "3"),
("OSTREE_REPO_COMMIT_FILTER_ALLOW", "0"),
("OSTREE_REPO_COMMIT_FILTER_SKIP", "1"),
("OSTREE_REPO_COMMIT_ITER_RESULT_DIR", "3"),
("OSTREE_REPO_COMMIT_ITER_RESULT_END", "1"),
("OSTREE_REPO_COMMIT_ITER_RESULT_ERROR", "0"),
("OSTREE_REPO_COMMIT_ITER_RESULT_FILE", "2"),
("OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS", "4"),
("OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CONSUME", "16"),
("OSTREE_REPO_COMMIT_MODIFIER_FLAGS_DEVINO_CANONICAL", "32"),
("OSTREE_REPO_COMMIT_MODIFIER_FLAGS_ERROR_ON_UNLABELED", "8"),
("OSTREE_REPO_COMMIT_MODIFIER_FLAGS_GENERATE_SIZES", "2"),
("OSTREE_REPO_COMMIT_MODIFIER_FLAGS_NONE", "0"),
("OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS", "1"),
("OSTREE_REPO_COMMIT_STATE_NORMAL", "0"),
("OSTREE_REPO_COMMIT_STATE_PARTIAL", "1"),
("OSTREE_REPO_COMMIT_TRAVERSE_FLAG_NONE", "1"),
("OSTREE_REPO_LIST_OBJECTS_ALL", "4"),
("OSTREE_REPO_LIST_OBJECTS_LOOSE", "1"),
("OSTREE_REPO_LIST_OBJECTS_NO_PARENTS", "8"),
("OSTREE_REPO_LIST_OBJECTS_PACKED", "2"),
("OSTREE_REPO_LIST_REFS_EXT_ALIASES", "1"),
("OSTREE_REPO_LIST_REFS_EXT_EXCLUDE_MIRRORS", "4"),
("OSTREE_REPO_LIST_REFS_EXT_EXCLUDE_REMOTES", "2"),
("OSTREE_REPO_LIST_REFS_EXT_NONE", "0"),
("(gint) OSTREE_REPO_CHECKOUT_FILTER_ALLOW", "0"),
("(gint) OSTREE_REPO_CHECKOUT_FILTER_SKIP", "1"),
("(gint) OSTREE_REPO_CHECKOUT_MODE_NONE", "0"),
("(gint) OSTREE_REPO_CHECKOUT_MODE_USER", "1"),
("(gint) OSTREE_REPO_CHECKOUT_OVERWRITE_ADD_FILES", "2"),
("(gint) OSTREE_REPO_CHECKOUT_OVERWRITE_NONE", "0"),
("(gint) OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_FILES", "1"),
("(gint) OSTREE_REPO_CHECKOUT_OVERWRITE_UNION_IDENTICAL", "3"),
("(gint) OSTREE_REPO_COMMIT_FILTER_ALLOW", "0"),
("(gint) OSTREE_REPO_COMMIT_FILTER_SKIP", "1"),
("(gint) OSTREE_REPO_COMMIT_ITER_RESULT_DIR", "3"),
("(gint) OSTREE_REPO_COMMIT_ITER_RESULT_END", "1"),
("(gint) OSTREE_REPO_COMMIT_ITER_RESULT_ERROR", "0"),
("(gint) OSTREE_REPO_COMMIT_ITER_RESULT_FILE", "2"),
("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CANONICAL_PERMISSIONS", "4"),
("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_CONSUME", "16"),
("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_DEVINO_CANONICAL", "32"),
("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_ERROR_ON_UNLABELED", "8"),
("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_GENERATE_SIZES", "2"),
("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_NONE", "0"),
("(guint) OSTREE_REPO_COMMIT_MODIFIER_FLAGS_SKIP_XATTRS", "1"),
("(guint) OSTREE_REPO_COMMIT_STATE_NORMAL", "0"),
("(guint) OSTREE_REPO_COMMIT_STATE_PARTIAL", "1"),
("(guint) OSTREE_REPO_COMMIT_TRAVERSE_FLAG_NONE", "1"),
("(guint) OSTREE_REPO_LIST_OBJECTS_ALL", "4"),
("(guint) OSTREE_REPO_LIST_OBJECTS_LOOSE", "1"),
("(guint) OSTREE_REPO_LIST_OBJECTS_NO_PARENTS", "8"),
("(guint) OSTREE_REPO_LIST_OBJECTS_PACKED", "2"),
("(guint) OSTREE_REPO_LIST_REFS_EXT_ALIASES", "1"),
("(guint) OSTREE_REPO_LIST_REFS_EXT_EXCLUDE_MIRRORS", "4"),
("(guint) OSTREE_REPO_LIST_REFS_EXT_EXCLUDE_REMOTES", "2"),
("(guint) OSTREE_REPO_LIST_REFS_EXT_NONE", "0"),
("OSTREE_REPO_METADATA_REF", "ostree-metadata"),
("OSTREE_REPO_MODE_ARCHIVE", "1"),
("OSTREE_REPO_MODE_ARCHIVE_Z2", "1"),
("OSTREE_REPO_MODE_BARE", "0"),
("OSTREE_REPO_MODE_BARE_USER", "2"),
("OSTREE_REPO_MODE_BARE_USER_ONLY", "3"),
("OSTREE_REPO_PRUNE_FLAGS_NONE", "0"),
("OSTREE_REPO_PRUNE_FLAGS_NO_PRUNE", "1"),
("OSTREE_REPO_PRUNE_FLAGS_REFS_ONLY", "2"),
("OSTREE_REPO_PULL_FLAGS_BAREUSERONLY_FILES", "8"),
("OSTREE_REPO_PULL_FLAGS_COMMIT_ONLY", "2"),
("OSTREE_REPO_PULL_FLAGS_MIRROR", "1"),
("OSTREE_REPO_PULL_FLAGS_NONE", "0"),
("OSTREE_REPO_PULL_FLAGS_TRUSTED_HTTP", "16"),
("OSTREE_REPO_PULL_FLAGS_UNTRUSTED", "4"),
("OSTREE_REPO_REMOTE_CHANGE_ADD", "0"),
("OSTREE_REPO_REMOTE_CHANGE_ADD_IF_NOT_EXISTS", "1"),
("OSTREE_REPO_REMOTE_CHANGE_DELETE", "2"),
("OSTREE_REPO_REMOTE_CHANGE_DELETE_IF_EXISTS", "3"),
("OSTREE_REPO_REMOTE_CHANGE_REPLACE", "4"),
("OSTREE_REPO_RESOLVE_REV_EXT_LOCAL_ONLY", "1"),
("OSTREE_REPO_RESOLVE_REV_EXT_NONE", "0"),
("OSTREE_SEPOLICY_RESTORECON_FLAGS_ALLOW_NOLABEL", "1"),
("OSTREE_SEPOLICY_RESTORECON_FLAGS_KEEP_EXISTING", "2"),
("OSTREE_SEPOLICY_RESTORECON_FLAGS_NONE", "0"),
("(gint) OSTREE_REPO_MODE_ARCHIVE", "1"),
("(gint) OSTREE_REPO_MODE_ARCHIVE_Z2", "1"),
("(gint) OSTREE_REPO_MODE_BARE", "0"),
("(gint) OSTREE_REPO_MODE_BARE_USER", "2"),
("(gint) OSTREE_REPO_MODE_BARE_USER_ONLY", "3"),
("(gint) OSTREE_REPO_PRUNE_FLAGS_NONE", "0"),
("(gint) OSTREE_REPO_PRUNE_FLAGS_NO_PRUNE", "1"),
("(gint) OSTREE_REPO_PRUNE_FLAGS_REFS_ONLY", "2"),
("(guint) OSTREE_REPO_PULL_FLAGS_BAREUSERONLY_FILES", "8"),
("(guint) OSTREE_REPO_PULL_FLAGS_COMMIT_ONLY", "2"),
("(guint) OSTREE_REPO_PULL_FLAGS_MIRROR", "1"),
("(guint) OSTREE_REPO_PULL_FLAGS_NONE", "0"),
("(guint) OSTREE_REPO_PULL_FLAGS_TRUSTED_HTTP", "16"),
("(guint) OSTREE_REPO_PULL_FLAGS_UNTRUSTED", "4"),
("(gint) OSTREE_REPO_REMOTE_CHANGE_ADD", "0"),
("(gint) OSTREE_REPO_REMOTE_CHANGE_ADD_IF_NOT_EXISTS", "1"),
("(gint) OSTREE_REPO_REMOTE_CHANGE_DELETE", "2"),
("(gint) OSTREE_REPO_REMOTE_CHANGE_DELETE_IF_EXISTS", "3"),
("(gint) OSTREE_REPO_REMOTE_CHANGE_REPLACE", "4"),
("(guint) OSTREE_REPO_RESOLVE_REV_EXT_LOCAL_ONLY", "1"),
("(guint) OSTREE_REPO_RESOLVE_REV_EXT_NONE", "0"),
("(guint) OSTREE_SEPOLICY_RESTORECON_FLAGS_ALLOW_NOLABEL", "1"),
("(guint) OSTREE_SEPOLICY_RESTORECON_FLAGS_KEEP_EXISTING", "2"),
("(guint) OSTREE_SEPOLICY_RESTORECON_FLAGS_NONE", "0"),
("OSTREE_SHA256_DIGEST_LEN", "32"),
("OSTREE_SHA256_STRING_LEN", "64"),
("OSTREE_STATIC_DELTA_GENERATE_OPT_LOWLATENCY", "0"),
("OSTREE_STATIC_DELTA_GENERATE_OPT_MAJOR", "1"),
("(gint) OSTREE_STATIC_DELTA_GENERATE_OPT_LOWLATENCY", "0"),
("(gint) OSTREE_STATIC_DELTA_GENERATE_OPT_MAJOR", "1"),
("OSTREE_SUMMARY_GVARIANT_STRING", "(a(s(taya{sv}))a{sv})"),
("OSTREE_SUMMARY_SIG_GVARIANT_STRING", "a{sv}"),
("OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NONE", "0"),
("OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NOT_DEFAULT", "2"),
("OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NO_CLEAN", "4"),
("OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN", "1"),
("OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_PENDING", "8"),
("OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_ROLLBACK", "16"),
("OSTREE_SYSROOT_UPGRADER_FLAGS_IGNORE_UNCONFIGURED", "2"),
("OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_ALLOW_OLDER", "1"),
("OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_NONE", "0"),
("OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_SYNTHETIC", "2"),
("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NONE", "0"),
("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NOT_DEFAULT", "2"),
("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NO_CLEAN", "4"),
("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN", "1"),
("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_PENDING", "8"),
("(guint) OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_RETAIN_ROLLBACK", "16"),
("(guint) OSTREE_SYSROOT_UPGRADER_FLAGS_IGNORE_UNCONFIGURED", "2"),
("(guint) OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_ALLOW_OLDER", "1"),
("(guint) OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_NONE", "0"),
("(guint) OSTREE_SYSROOT_UPGRADER_PULL_FLAGS_SYNTHETIC", "2"),
("OSTREE_TIMESTAMP", "0"),
("OSTREE_TREE_GVARIANT_STRING", "(a(say)a(sayay))"),
];
rust-bindings/rust/sys/tests/constant.c
+15 -15
View File
@@ -7,21 +7,21 @@
int main() {
printf(_Generic((ABI_CONSTANT_NAME),
char *: "%s",
const char *: "%s",
char: "%c",
signed char: "%hhd",
unsigned char: "%hhu",
short int: "%hd",
unsigned short int: "%hu",
int: "%d",
unsigned int: "%u",
long: "%ld",
unsigned long: "%lu",
long long: "%lld",
unsigned long long: "%llu",
double: "%f",
long double: "%ld"),
char *: "###gir test###%s###gir test###\n",
const char *: "###gir test###%s###gir test###\n",
char: "###gir test###%c###gir test###\n",
signed char: "###gir test###%hhd###gir test###\n",
unsigned char: "###gir test###%hhu###gir test###\n",
short int: "###gir test###%hd###gir test###\n",
unsigned short int: "###gir test###%hu###gir test###\n",
int: "###gir test###%d###gir test###\n",
unsigned int: "###gir test###%u###gir test###\n",
long: "###gir test###%ld###gir test###\n",
unsigned long: "###gir test###%lu###gir test###\n",
long long: "###gir test###%lld###gir test###\n",
unsigned long long: "###gir test###%llu###gir test###\n",
double: "###gir test###%f###gir test###\n",
long double: "###gir test###%ld###gir test###\n"),
ABI_CONSTANT_NAME);
return 0;
}