diff --git a/lib/codegen/Cargo.toml b/lib/codegen/Cargo.toml index f5bee967fa..b25fb6f16c 100644 --- a/lib/codegen/Cargo.toml +++ b/lib/codegen/Cargo.toml @@ -21,9 +21,8 @@ target-lexicon = { version = "0.0.3", default-features = false } # machine code. Integration tests that need external dependencies can be # accomodated in `tests`. -# Temporarily disable this while we work out how to publish this crate. -#[build-dependencies] -#cranelift-codegen-meta = { path = "../codegen-meta", version = "0.17.0-alpha" } +[build-dependencies] +cranelift-meta = { path = "meta", version = "0.17.0-alpha" } [features] # The "std" feature enables use of libstd. The "core" feature enables use diff --git a/lib/codegen/build.rs b/lib/codegen/build.rs index 78a87f1ee7..dedaa35f8a 100644 --- a/lib/codegen/build.rs +++ b/lib/codegen/build.rs @@ -18,8 +18,7 @@ // The build script expects to be run from the directory where this build.rs file lives. The // current directory is used to find the sources. -// Temporarily disable this while we work out how to publish this crate. -//extern crate cranelift_codegen_meta as meta; +extern crate cranelift_meta as meta; use std::env; use std::process; @@ -57,8 +56,8 @@ fn main() { crate_dir.join("build.rs").to_str().unwrap() ); - // Scripts are in `$crate_dir/meta`. - let meta_dir = crate_dir.join("meta"); + // Scripts are in `$crate_dir/meta-python`. + let meta_dir = crate_dir.join("meta-python"); let build_script = meta_dir.join("build.py"); // Launch build script with Python. We'll just find python in the path. @@ -79,7 +78,7 @@ fn main() { // DEVELOPMENT: // ------------------------------------------------------------------------ // Now that the Python build process is complete, generate files that are - // emitted by the `cretonne_codegen_meta` crate. + // emitted by the `meta` crate. // ------------------------------------------------------------------------ // Temporarily disable this while we work out how to publish this crate. //if let Err(err) = meta::gen_types::generate("new_types.rs", &out_dir) { diff --git a/lib/codegen/meta/base/__init__.py b/lib/codegen/meta-python/base/__init__.py similarity index 100% rename from lib/codegen/meta/base/__init__.py rename to lib/codegen/meta-python/base/__init__.py diff --git a/lib/codegen/meta/base/entities.py b/lib/codegen/meta-python/base/entities.py similarity index 100% rename from lib/codegen/meta/base/entities.py rename to lib/codegen/meta-python/base/entities.py diff --git a/lib/codegen/meta/base/formats.py b/lib/codegen/meta-python/base/formats.py similarity index 100% rename from lib/codegen/meta/base/formats.py rename to lib/codegen/meta-python/base/formats.py diff --git a/lib/codegen/meta/base/immediates.py b/lib/codegen/meta-python/base/immediates.py similarity index 100% rename from lib/codegen/meta/base/immediates.py rename to lib/codegen/meta-python/base/immediates.py diff --git a/lib/codegen/meta/base/instructions.py b/lib/codegen/meta-python/base/instructions.py similarity index 100% rename from lib/codegen/meta/base/instructions.py rename to lib/codegen/meta-python/base/instructions.py diff --git a/lib/codegen/meta/base/legalize.py b/lib/codegen/meta-python/base/legalize.py similarity index 100% rename from lib/codegen/meta/base/legalize.py rename to lib/codegen/meta-python/base/legalize.py diff --git a/lib/codegen/meta/base/predicates.py b/lib/codegen/meta-python/base/predicates.py similarity index 100% rename from lib/codegen/meta/base/predicates.py rename to lib/codegen/meta-python/base/predicates.py diff --git a/lib/codegen/meta/base/semantics.py b/lib/codegen/meta-python/base/semantics.py similarity index 100% rename from lib/codegen/meta/base/semantics.py rename to lib/codegen/meta-python/base/semantics.py diff --git a/lib/codegen/meta/base/settings.py b/lib/codegen/meta-python/base/settings.py similarity index 100% rename from lib/codegen/meta/base/settings.py rename to lib/codegen/meta-python/base/settings.py diff --git a/lib/codegen/meta/base/types.py b/lib/codegen/meta-python/base/types.py similarity index 100% rename from lib/codegen/meta/base/types.py rename to lib/codegen/meta-python/base/types.py diff --git a/lib/codegen/meta/build.py b/lib/codegen/meta-python/build.py similarity index 100% rename from lib/codegen/meta/build.py rename to lib/codegen/meta-python/build.py diff --git a/lib/codegen/meta/cdsl/__init__.py b/lib/codegen/meta-python/cdsl/__init__.py similarity index 100% rename from lib/codegen/meta/cdsl/__init__.py rename to lib/codegen/meta-python/cdsl/__init__.py diff --git a/lib/codegen/meta/cdsl/ast.py b/lib/codegen/meta-python/cdsl/ast.py similarity index 100% rename from lib/codegen/meta/cdsl/ast.py rename to lib/codegen/meta-python/cdsl/ast.py diff --git a/lib/codegen/meta/cdsl/formats.py b/lib/codegen/meta-python/cdsl/formats.py similarity index 100% rename from lib/codegen/meta/cdsl/formats.py rename to lib/codegen/meta-python/cdsl/formats.py diff --git a/lib/codegen/meta/cdsl/instructions.py b/lib/codegen/meta-python/cdsl/instructions.py similarity index 100% rename from lib/codegen/meta/cdsl/instructions.py rename to lib/codegen/meta-python/cdsl/instructions.py diff --git a/lib/codegen/meta/cdsl/isa.py b/lib/codegen/meta-python/cdsl/isa.py similarity index 100% rename from lib/codegen/meta/cdsl/isa.py rename to lib/codegen/meta-python/cdsl/isa.py diff --git a/lib/codegen/meta/cdsl/operands.py b/lib/codegen/meta-python/cdsl/operands.py similarity index 100% rename from lib/codegen/meta/cdsl/operands.py rename to lib/codegen/meta-python/cdsl/operands.py diff --git a/lib/codegen/meta/cdsl/predicates.py b/lib/codegen/meta-python/cdsl/predicates.py similarity index 100% rename from lib/codegen/meta/cdsl/predicates.py rename to lib/codegen/meta-python/cdsl/predicates.py diff --git a/lib/codegen/meta/cdsl/registers.py b/lib/codegen/meta-python/cdsl/registers.py similarity index 100% rename from lib/codegen/meta/cdsl/registers.py rename to lib/codegen/meta-python/cdsl/registers.py diff --git a/lib/codegen/meta/cdsl/settings.py b/lib/codegen/meta-python/cdsl/settings.py similarity index 100% rename from lib/codegen/meta/cdsl/settings.py rename to lib/codegen/meta-python/cdsl/settings.py diff --git a/lib/codegen/meta/cdsl/test_ast.py b/lib/codegen/meta-python/cdsl/test_ast.py similarity index 100% rename from lib/codegen/meta/cdsl/test_ast.py rename to lib/codegen/meta-python/cdsl/test_ast.py diff --git a/lib/codegen/meta/cdsl/test_package.py b/lib/codegen/meta-python/cdsl/test_package.py similarity index 100% rename from lib/codegen/meta/cdsl/test_package.py rename to lib/codegen/meta-python/cdsl/test_package.py diff --git a/lib/codegen/meta/cdsl/test_ti.py b/lib/codegen/meta-python/cdsl/test_ti.py similarity index 100% rename from lib/codegen/meta/cdsl/test_ti.py rename to lib/codegen/meta-python/cdsl/test_ti.py diff --git a/lib/codegen/meta/cdsl/test_typevar.py b/lib/codegen/meta-python/cdsl/test_typevar.py similarity index 100% rename from lib/codegen/meta/cdsl/test_typevar.py rename to lib/codegen/meta-python/cdsl/test_typevar.py diff --git a/lib/codegen/meta/cdsl/test_xform.py b/lib/codegen/meta-python/cdsl/test_xform.py similarity index 100% rename from lib/codegen/meta/cdsl/test_xform.py rename to lib/codegen/meta-python/cdsl/test_xform.py diff --git a/lib/codegen/meta/cdsl/ti.py b/lib/codegen/meta-python/cdsl/ti.py similarity index 100% rename from lib/codegen/meta/cdsl/ti.py rename to lib/codegen/meta-python/cdsl/ti.py diff --git a/lib/codegen/meta/cdsl/types.py b/lib/codegen/meta-python/cdsl/types.py similarity index 100% rename from lib/codegen/meta/cdsl/types.py rename to lib/codegen/meta-python/cdsl/types.py diff --git a/lib/codegen/meta/cdsl/typevar.py b/lib/codegen/meta-python/cdsl/typevar.py similarity index 100% rename from lib/codegen/meta/cdsl/typevar.py rename to lib/codegen/meta-python/cdsl/typevar.py diff --git a/lib/codegen/meta/cdsl/xform.py b/lib/codegen/meta-python/cdsl/xform.py similarity index 100% rename from lib/codegen/meta/cdsl/xform.py rename to lib/codegen/meta-python/cdsl/xform.py diff --git a/lib/codegen/meta/check.sh b/lib/codegen/meta-python/check.sh similarity index 100% rename from lib/codegen/meta/check.sh rename to lib/codegen/meta-python/check.sh diff --git a/lib/codegen/meta/constant_hash.py b/lib/codegen/meta-python/constant_hash.py similarity index 100% rename from lib/codegen/meta/constant_hash.py rename to lib/codegen/meta-python/constant_hash.py diff --git a/lib/codegen/meta/gen_binemit.py b/lib/codegen/meta-python/gen_binemit.py similarity index 100% rename from lib/codegen/meta/gen_binemit.py rename to lib/codegen/meta-python/gen_binemit.py diff --git a/lib/codegen/meta/gen_build_deps.py b/lib/codegen/meta-python/gen_build_deps.py similarity index 100% rename from lib/codegen/meta/gen_build_deps.py rename to lib/codegen/meta-python/gen_build_deps.py diff --git a/lib/codegen/meta/gen_encoding.py b/lib/codegen/meta-python/gen_encoding.py similarity index 100% rename from lib/codegen/meta/gen_encoding.py rename to lib/codegen/meta-python/gen_encoding.py diff --git a/lib/codegen/meta/gen_instr.py b/lib/codegen/meta-python/gen_instr.py similarity index 100% rename from lib/codegen/meta/gen_instr.py rename to lib/codegen/meta-python/gen_instr.py diff --git a/lib/codegen/meta/gen_legalizer.py b/lib/codegen/meta-python/gen_legalizer.py similarity index 100% rename from lib/codegen/meta/gen_legalizer.py rename to lib/codegen/meta-python/gen_legalizer.py diff --git a/lib/codegen/meta/gen_registers.py b/lib/codegen/meta-python/gen_registers.py similarity index 100% rename from lib/codegen/meta/gen_registers.py rename to lib/codegen/meta-python/gen_registers.py diff --git a/lib/codegen/meta/gen_settings.py b/lib/codegen/meta-python/gen_settings.py similarity index 100% rename from lib/codegen/meta/gen_settings.py rename to lib/codegen/meta-python/gen_settings.py diff --git a/lib/codegen/meta/gen_types.py b/lib/codegen/meta-python/gen_types.py similarity index 100% rename from lib/codegen/meta/gen_types.py rename to lib/codegen/meta-python/gen_types.py diff --git a/lib/codegen/meta/isa/__init__.py b/lib/codegen/meta-python/isa/__init__.py similarity index 100% rename from lib/codegen/meta/isa/__init__.py rename to lib/codegen/meta-python/isa/__init__.py diff --git a/lib/codegen/meta/isa/arm32/__init__.py b/lib/codegen/meta-python/isa/arm32/__init__.py similarity index 100% rename from lib/codegen/meta/isa/arm32/__init__.py rename to lib/codegen/meta-python/isa/arm32/__init__.py diff --git a/lib/codegen/meta/isa/arm32/defs.py b/lib/codegen/meta-python/isa/arm32/defs.py similarity index 100% rename from lib/codegen/meta/isa/arm32/defs.py rename to lib/codegen/meta-python/isa/arm32/defs.py diff --git a/lib/codegen/meta/isa/arm32/registers.py b/lib/codegen/meta-python/isa/arm32/registers.py similarity index 100% rename from lib/codegen/meta/isa/arm32/registers.py rename to lib/codegen/meta-python/isa/arm32/registers.py diff --git a/lib/codegen/meta/isa/arm32/settings.py b/lib/codegen/meta-python/isa/arm32/settings.py similarity index 100% rename from lib/codegen/meta/isa/arm32/settings.py rename to lib/codegen/meta-python/isa/arm32/settings.py diff --git a/lib/codegen/meta/isa/arm64/__init__.py b/lib/codegen/meta-python/isa/arm64/__init__.py similarity index 100% rename from lib/codegen/meta/isa/arm64/__init__.py rename to lib/codegen/meta-python/isa/arm64/__init__.py diff --git a/lib/codegen/meta/isa/arm64/defs.py b/lib/codegen/meta-python/isa/arm64/defs.py similarity index 100% rename from lib/codegen/meta/isa/arm64/defs.py rename to lib/codegen/meta-python/isa/arm64/defs.py diff --git a/lib/codegen/meta/isa/arm64/registers.py b/lib/codegen/meta-python/isa/arm64/registers.py similarity index 100% rename from lib/codegen/meta/isa/arm64/registers.py rename to lib/codegen/meta-python/isa/arm64/registers.py diff --git a/lib/codegen/meta/isa/arm64/settings.py b/lib/codegen/meta-python/isa/arm64/settings.py similarity index 100% rename from lib/codegen/meta/isa/arm64/settings.py rename to lib/codegen/meta-python/isa/arm64/settings.py diff --git a/lib/codegen/meta/isa/riscv/__init__.py b/lib/codegen/meta-python/isa/riscv/__init__.py similarity index 100% rename from lib/codegen/meta/isa/riscv/__init__.py rename to lib/codegen/meta-python/isa/riscv/__init__.py diff --git a/lib/codegen/meta/isa/riscv/defs.py b/lib/codegen/meta-python/isa/riscv/defs.py similarity index 100% rename from lib/codegen/meta/isa/riscv/defs.py rename to lib/codegen/meta-python/isa/riscv/defs.py diff --git a/lib/codegen/meta/isa/riscv/encodings.py b/lib/codegen/meta-python/isa/riscv/encodings.py similarity index 100% rename from lib/codegen/meta/isa/riscv/encodings.py rename to lib/codegen/meta-python/isa/riscv/encodings.py diff --git a/lib/codegen/meta/isa/riscv/recipes.py b/lib/codegen/meta-python/isa/riscv/recipes.py similarity index 100% rename from lib/codegen/meta/isa/riscv/recipes.py rename to lib/codegen/meta-python/isa/riscv/recipes.py diff --git a/lib/codegen/meta/isa/riscv/registers.py b/lib/codegen/meta-python/isa/riscv/registers.py similarity index 100% rename from lib/codegen/meta/isa/riscv/registers.py rename to lib/codegen/meta-python/isa/riscv/registers.py diff --git a/lib/codegen/meta/isa/riscv/settings.py b/lib/codegen/meta-python/isa/riscv/settings.py similarity index 100% rename from lib/codegen/meta/isa/riscv/settings.py rename to lib/codegen/meta-python/isa/riscv/settings.py diff --git a/lib/codegen/meta/isa/x86/__init__.py b/lib/codegen/meta-python/isa/x86/__init__.py similarity index 100% rename from lib/codegen/meta/isa/x86/__init__.py rename to lib/codegen/meta-python/isa/x86/__init__.py diff --git a/lib/codegen/meta/isa/x86/defs.py b/lib/codegen/meta-python/isa/x86/defs.py similarity index 100% rename from lib/codegen/meta/isa/x86/defs.py rename to lib/codegen/meta-python/isa/x86/defs.py diff --git a/lib/codegen/meta/isa/x86/encodings.py b/lib/codegen/meta-python/isa/x86/encodings.py similarity index 100% rename from lib/codegen/meta/isa/x86/encodings.py rename to lib/codegen/meta-python/isa/x86/encodings.py diff --git a/lib/codegen/meta/isa/x86/instructions.py b/lib/codegen/meta-python/isa/x86/instructions.py similarity index 100% rename from lib/codegen/meta/isa/x86/instructions.py rename to lib/codegen/meta-python/isa/x86/instructions.py diff --git a/lib/codegen/meta/isa/x86/legalize.py b/lib/codegen/meta-python/isa/x86/legalize.py similarity index 100% rename from lib/codegen/meta/isa/x86/legalize.py rename to lib/codegen/meta-python/isa/x86/legalize.py diff --git a/lib/codegen/meta/isa/x86/recipes.py b/lib/codegen/meta-python/isa/x86/recipes.py similarity index 100% rename from lib/codegen/meta/isa/x86/recipes.py rename to lib/codegen/meta-python/isa/x86/recipes.py diff --git a/lib/codegen/meta/isa/x86/registers.py b/lib/codegen/meta-python/isa/x86/registers.py similarity index 100% rename from lib/codegen/meta/isa/x86/registers.py rename to lib/codegen/meta-python/isa/x86/registers.py diff --git a/lib/codegen/meta/isa/x86/settings.py b/lib/codegen/meta-python/isa/x86/settings.py similarity index 100% rename from lib/codegen/meta/isa/x86/settings.py rename to lib/codegen/meta-python/isa/x86/settings.py diff --git a/lib/codegen/meta/mypy.ini b/lib/codegen/meta-python/mypy.ini similarity index 100% rename from lib/codegen/meta/mypy.ini rename to lib/codegen/meta-python/mypy.ini diff --git a/lib/codegen/meta/semantics/__init__.py b/lib/codegen/meta-python/semantics/__init__.py similarity index 100% rename from lib/codegen/meta/semantics/__init__.py rename to lib/codegen/meta-python/semantics/__init__.py diff --git a/lib/codegen/meta/semantics/elaborate.py b/lib/codegen/meta-python/semantics/elaborate.py similarity index 100% rename from lib/codegen/meta/semantics/elaborate.py rename to lib/codegen/meta-python/semantics/elaborate.py diff --git a/lib/codegen/meta/semantics/macros.py b/lib/codegen/meta-python/semantics/macros.py similarity index 100% rename from lib/codegen/meta/semantics/macros.py rename to lib/codegen/meta-python/semantics/macros.py diff --git a/lib/codegen/meta/semantics/primitives.py b/lib/codegen/meta-python/semantics/primitives.py similarity index 100% rename from lib/codegen/meta/semantics/primitives.py rename to lib/codegen/meta-python/semantics/primitives.py diff --git a/lib/codegen/meta/semantics/smtlib.py b/lib/codegen/meta-python/semantics/smtlib.py similarity index 100% rename from lib/codegen/meta/semantics/smtlib.py rename to lib/codegen/meta-python/semantics/smtlib.py diff --git a/lib/codegen/meta/semantics/test_elaborate.py b/lib/codegen/meta-python/semantics/test_elaborate.py similarity index 100% rename from lib/codegen/meta/semantics/test_elaborate.py rename to lib/codegen/meta-python/semantics/test_elaborate.py diff --git a/lib/codegen/meta/srcgen.py b/lib/codegen/meta-python/srcgen.py similarity index 100% rename from lib/codegen/meta/srcgen.py rename to lib/codegen/meta-python/srcgen.py diff --git a/lib/codegen/meta/stubs/z3/__init__.pyi b/lib/codegen/meta-python/stubs/z3/__init__.pyi similarity index 100% rename from lib/codegen/meta/stubs/z3/__init__.pyi rename to lib/codegen/meta-python/stubs/z3/__init__.pyi diff --git a/lib/codegen/meta/stubs/z3/z3core.pyi b/lib/codegen/meta-python/stubs/z3/z3core.pyi similarity index 100% rename from lib/codegen/meta/stubs/z3/z3core.pyi rename to lib/codegen/meta-python/stubs/z3/z3core.pyi diff --git a/lib/codegen/meta/stubs/z3/z3types.pyi b/lib/codegen/meta-python/stubs/z3/z3types.pyi similarity index 100% rename from lib/codegen/meta/stubs/z3/z3types.pyi rename to lib/codegen/meta-python/stubs/z3/z3types.pyi diff --git a/lib/codegen/meta/test_constant_hash.py b/lib/codegen/meta-python/test_constant_hash.py similarity index 100% rename from lib/codegen/meta/test_constant_hash.py rename to lib/codegen/meta-python/test_constant_hash.py diff --git a/lib/codegen/meta/test_gen_legalizer.py b/lib/codegen/meta-python/test_gen_legalizer.py similarity index 100% rename from lib/codegen/meta/test_gen_legalizer.py rename to lib/codegen/meta-python/test_gen_legalizer.py diff --git a/lib/codegen/meta/test_srcgen.py b/lib/codegen/meta-python/test_srcgen.py similarity index 100% rename from lib/codegen/meta/test_srcgen.py rename to lib/codegen/meta-python/test_srcgen.py diff --git a/lib/codegen/meta/unique_table.py b/lib/codegen/meta-python/unique_table.py similarity index 100% rename from lib/codegen/meta/unique_table.py rename to lib/codegen/meta-python/unique_table.py diff --git a/lib/codegen-meta/Cargo.toml b/lib/codegen/meta/Cargo.toml similarity index 95% rename from lib/codegen-meta/Cargo.toml rename to lib/codegen/meta/Cargo.toml index cebb2545b0..40ac0f416a 100644 --- a/lib/codegen-meta/Cargo.toml +++ b/lib/codegen/meta/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "cranelift-codegen-meta" +name = "cranelift-meta" authors = ["The Cranelift Project Developers"] version = "0.17.0" description = "Metaprogram for cranelift-codegen code generator library" diff --git a/lib/codegen-meta/LICENSE b/lib/codegen/meta/LICENSE similarity index 100% rename from lib/codegen-meta/LICENSE rename to lib/codegen/meta/LICENSE diff --git a/lib/codegen-meta/src/base/mod.rs b/lib/codegen/meta/src/base/mod.rs similarity index 100% rename from lib/codegen-meta/src/base/mod.rs rename to lib/codegen/meta/src/base/mod.rs diff --git a/lib/codegen-meta/src/base/types.rs b/lib/codegen/meta/src/base/types.rs similarity index 100% rename from lib/codegen-meta/src/base/types.rs rename to lib/codegen/meta/src/base/types.rs diff --git a/lib/codegen-meta/src/cdsl/mod.rs b/lib/codegen/meta/src/cdsl/mod.rs similarity index 100% rename from lib/codegen-meta/src/cdsl/mod.rs rename to lib/codegen/meta/src/cdsl/mod.rs diff --git a/lib/codegen-meta/src/cdsl/types.rs b/lib/codegen/meta/src/cdsl/types.rs similarity index 100% rename from lib/codegen-meta/src/cdsl/types.rs rename to lib/codegen/meta/src/cdsl/types.rs diff --git a/lib/codegen-meta/src/error.rs b/lib/codegen/meta/src/error.rs similarity index 100% rename from lib/codegen-meta/src/error.rs rename to lib/codegen/meta/src/error.rs diff --git a/lib/codegen-meta/src/gen_types.rs b/lib/codegen/meta/src/gen_types.rs similarity index 100% rename from lib/codegen-meta/src/gen_types.rs rename to lib/codegen/meta/src/gen_types.rs diff --git a/lib/codegen-meta/src/lib.rs b/lib/codegen/meta/src/lib.rs similarity index 100% rename from lib/codegen-meta/src/lib.rs rename to lib/codegen/meta/src/lib.rs diff --git a/lib/codegen-meta/src/srcgen.rs b/lib/codegen/meta/src/srcgen.rs similarity index 100% rename from lib/codegen-meta/src/srcgen.rs rename to lib/codegen/meta/src/srcgen.rs