Buck2 cleanups (#66)

* add missing new lines * Rename move contents of toolchain dir to toolchains dir * add buck-out to .gitignore * reinstantiate prelude module * fix pyre
facebookexperimental · Oct 13, 2023 · 0d7d261 · 0d7d261
1 parent 5d87f3b
commit 0d7d261
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 13 deletions.
diff --git a/.buckconfig b/.buckconfig
@@ -15,3 +15,6 @@ target_platform_detector_spec = target:root//...->prelude//platforms:default
 
 [project]
 ignore = .git
+
+[build]
+execution_platforms = prelude//platforms:default
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 # build files
 /build/
 /out/
+/buck-out/
 
 # sources
 /projects/*/sources
@@ -16,6 +17,9 @@
 .vagrant/
 ubuntu-bionic-18.04-cloudimg-console.log
 
+# pyre
+.pyre/
+
 bpftools-arm64.tar.gz
 bpftools-min-arm64.tar.gz
 bpftools-x86_64.tar.gz

diff --git a/.pyre_configuration b/.pyre_configuration
@@ -0,0 +1,7 @@
+{
+  "use_buck2": true,
+  "bxl_builder": "prelude//python/sourcedb/classic.bxl:build",
+  "targets": [
+    "root//projects/jdwp/..."
+  ]
+}
diff --git a/Makefile b/Makefile
@@ -37,7 +37,7 @@ export PATH:=$(abspath $(HOST_OUT_DIR)/bin):$(PATH)
 all:
 	@echo "Choose a project to build"
 
-include toolchain/toolchain.mk
+include toolchains/toolchains.mk
 
 $(ANDROID_BUILD_DIR) $(HOST_BUILD_DIR) $(DOWNLOADS_DIR) $(ANDROID_SYSROOTS_OUT_DIR):
 	mkdir -p $@

diff --git a/prelude b/prelude
diff --git a/projects/jdwp/.pyre_configuration b/projects/jdwp/.pyre_configuration
diff --git a/projects/jdwp/BUCK b/projects/jdwp/BUCK
@@ -11,4 +11,4 @@ python_library(
     name = "lib",
     srcs = [],
     visibility = ["PUBLIC"],
-)
+)
diff --git a/projects/jdwp/main.py b/projects/jdwp/main.py
@@ -4,4 +4,4 @@ def main():
   return None
 
 if __name__ == "__main__":
-  main()
+  main()
diff --git a/toolchains/BUCK b/toolchains/BUCK
@@ -16,4 +16,4 @@ system_python_toolchain(
 system_python_bootstrap_toolchain(
     name = "python_bootstrap",
     visibility = ["PUBLIC"],
-)
+)
diff --git a/toolchain/autotools.mk → toolchains/autotools.mk b/toolchain/autotools.mk → toolchains/autotools.mk
@@ -17,12 +17,12 @@ HOST_CONFIG_SITE = $(HOST_OUT_DIR)/share/config.site
 HOST_EXTRA_CONFIGURE_FLAGS = --prefix=$(abspath $(HOST_OUT_DIR))
 
 $(ANDROID_CONFIG_SITE): | $(ANDROID_OUT_DIR)
-	cp toolchain/config.site.template $@
+	cp toolchains/config.site.template $@
 	@sed -ibkp -e "s+<BIN_PATH>+$(abspath $(ANDROID_TOOLCHAIN_PATH))+g" $@
 	@sed -ibkp -e "s+<TRIPLE>+$(ANDROID_TRIPLE)+g" $@
 	@sed -ibkp -e "s+<SITE_PATH>+$(abspath $(ANDROID_OUT_DIR))+g" $@
 	@sed -ibkp -e "s+<API>+$(NDK_API)+g" $@
 
 $(HOST_CONFIG_SITE): | $(HOST_OUT_DIR)
-	cp toolchain/config.site.host.template $@
+	cp toolchains/config.site.host.template $@
 	@sed -ibkp -e "s+<SITE_PATH>+$(abspath $(HOST_OUT_DIR))+g" $@
diff --git a/toolchain/cmake.mk → toolchains/cmake.mk b/toolchain/cmake.mk → toolchains/cmake.mk
diff --git a/toolchain/config.site.host.template → toolchains/config.site.host.template b/toolchain/config.site.host.template → toolchains/config.site.host.template
diff --git a/toolchain/config.site.template → toolchains/config.site.template b/toolchain/config.site.template → toolchains/config.site.template
diff --git a/toolchain/toolchain.mk → toolchains/toolchains.mk b/toolchain/toolchain.mk → toolchains/toolchains.mk
@@ -6,8 +6,8 @@ ANDROID_TOOLCHAIN_PATH = \
     $(abspath $(NDK_PATH)/toolchains/llvm/prebuilt/linux-x86_64/bin)
 ANDROID_TOOLCHAIN_STRIP_PATH = $(ANDROID_TOOLCHAIN_PATH)/llvm-strip
 
-include toolchain/autotools.mk
-include toolchain/cmake.mk
+include toolchains/autotools.mk
+include toolchains/cmake.mk
 
 ifeq ($(NDK_ARCH), arm64)
 ANDROID_SYSROOT_LIB_SUBDIR = aarch64-linux-android
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,4 +4,4 @@ def main(): @@
       return None
     if __name__ == "__main__":
-      main()
+      main()