From 47fad6eaf39295317e83b8ed4378efd923e775d2 Mon Sep 17 00:00:00 2001 From: Josh Berdine Date: Wed, 4 Nov 2020 04:36:55 -0800 Subject: [PATCH] [buck] Do not use .buckversion Reviewed By: jvillard Differential Revision: D24705566 fbshipit-source-id: d76b3710e --- .gitignore | 1 + Makefile | 2 +- configure.ac | 10 +++------- dotbuckversion | 1 - infer/tests/build_systems/buck_blacklist/.buck-java8 | 1 + infer/tests/build_systems/buck_blacklist/.buckversion | 1 - .../buck_clang_test_determinator/.buck-java8 | 1 + .../buck_clang_test_determinator/.buckversion | 1 - infer/tests/build_systems/buck_combined/.buck-java8 | 1 + infer/tests/build_systems/buck_combined/.buckversion | 1 - .../buck_export_changed_functions/.buck-java8 | 1 + .../buck_export_changed_functions/.buckversion | 1 - infer/tests/build_systems/buck_flavors/.buck-java8 | 1 + infer/tests/build_systems/buck_flavors/.buckversion | 1 - .../buck_flavors_deterministic/.buck-java8 | 1 + .../buck_flavors_deterministic/.buckversion | 1 - .../tests/build_systems/buck_flavors_diff/.buck-java8 | 1 + .../tests/build_systems/buck_flavors_diff/.buckversion | 1 - infer/tests/build_systems/buck_flavors_run/.buck-java8 | 1 + .../tests/build_systems/buck_flavors_run/.buckversion | 1 - infer/tests/build_systems/buck_java_flavor/.buck-java8 | 1 + .../tests/build_systems/buck_java_flavor/.buckversion | 1 - infer/tests/build_systems/codetoanalyze/.buck-java8 | 1 + infer/tests/build_systems/codetoanalyze/.buckversion | 1 - infer/tests/build_systems/genrulecapture/.buck-java8 | 1 + infer/tests/build_systems/genrulecapture/.buckversion | 1 - 26 files changed, 16 insertions(+), 20 deletions(-) delete mode 100644 dotbuckversion create mode 120000 infer/tests/build_systems/buck_blacklist/.buck-java8 delete mode 120000 infer/tests/build_systems/buck_blacklist/.buckversion create mode 120000 infer/tests/build_systems/buck_clang_test_determinator/.buck-java8 delete mode 100644 infer/tests/build_systems/buck_clang_test_determinator/.buckversion create mode 120000 infer/tests/build_systems/buck_combined/.buck-java8 delete mode 120000 infer/tests/build_systems/buck_combined/.buckversion create mode 120000 infer/tests/build_systems/buck_export_changed_functions/.buck-java8 delete mode 120000 infer/tests/build_systems/buck_export_changed_functions/.buckversion create mode 120000 infer/tests/build_systems/buck_flavors/.buck-java8 delete mode 120000 infer/tests/build_systems/buck_flavors/.buckversion create mode 120000 infer/tests/build_systems/buck_flavors_deterministic/.buck-java8 delete mode 120000 infer/tests/build_systems/buck_flavors_deterministic/.buckversion create mode 120000 infer/tests/build_systems/buck_flavors_diff/.buck-java8 delete mode 120000 infer/tests/build_systems/buck_flavors_diff/.buckversion create mode 120000 infer/tests/build_systems/buck_flavors_run/.buck-java8 delete mode 120000 infer/tests/build_systems/buck_flavors_run/.buckversion create mode 120000 infer/tests/build_systems/buck_java_flavor/.buck-java8 delete mode 120000 infer/tests/build_systems/buck_java_flavor/.buckversion create mode 120000 infer/tests/build_systems/codetoanalyze/.buck-java8 delete mode 120000 infer/tests/build_systems/codetoanalyze/.buckversion create mode 120000 infer/tests/build_systems/genrulecapture/.buck-java8 delete mode 120000 infer/tests/build_systems/genrulecapture/.buckversion diff --git a/.gitignore b/.gitignore index f8de0f4b3..1c0283145 100644 --- a/.gitignore +++ b/.gitignore @@ -72,6 +72,7 @@ duplicates.txt /configure /Makefile.autoconf /.buckversion +/.buck-java8 /*/.gitignore /*/*/.gitignore diff --git a/Makefile b/Makefile index 2f6df817c..9d9eff7bb 100644 --- a/Makefile +++ b/Makefile @@ -798,7 +798,7 @@ endif .PHONY: conf-clean conf-clean: clean - $(REMOVE) .buckversion + $(REMOVE) .buck-java8 $(REMOVE) Makefile.autoconf $(REMOVE) acinclude.m4 $(REMOVE) aclocal.m4 diff --git a/configure.ac b/configure.ac index 0d3999c72..750ba9383 100644 --- a/configure.ac +++ b/configure.ac @@ -336,14 +336,10 @@ AC_SUBST([ENABLE_OCAML_BINANNOT]) # We use Buck to run the Infer tests -AC_MSG_CHECKING([which .buckversion to use]) -fb_buckversion_file=facebook/dependencies/dotbuckversion -oss_buckversion_file=dotbuckversion AS_IF([test x"$is_facebook_tree" = x"yes"], - [buckversion_file="$fb_buckversion_file"], - [buckversion_file="$oss_buckversion_file"]) -cat "$buckversion_file" > ".buckversion" -AC_MSG_RESULT([$buckversion_file]) + AC_MSG_CHECKING([which .buck-java8 to use]) + cp "facebook/dependencies/dotbuck-java8" ".buck-java8" + AC_MSG_RESULT([facebook/dependencies/dotbuck-java8])) AC_CHECK_TOOL([GETCONF], [getconf], [no]) diff --git a/dotbuckversion b/dotbuckversion deleted file mode 100644 index dd238b648..000000000 --- a/dotbuckversion +++ /dev/null @@ -1 +0,0 @@ -47922db48687c6bebdf79e41c001f222c2b948fd diff --git a/infer/tests/build_systems/buck_blacklist/.buck-java8 b/infer/tests/build_systems/buck_blacklist/.buck-java8 new file mode 120000 index 000000000..fc94e0dec --- /dev/null +++ b/infer/tests/build_systems/buck_blacklist/.buck-java8 @@ -0,0 +1 @@ +../../../../.buck-java8 \ No newline at end of file diff --git a/infer/tests/build_systems/buck_blacklist/.buckversion b/infer/tests/build_systems/buck_blacklist/.buckversion deleted file mode 120000 index 0a46cf46a..000000000 --- a/infer/tests/build_systems/buck_blacklist/.buckversion +++ /dev/null @@ -1 +0,0 @@ -../../../../.buckversion \ No newline at end of file diff --git a/infer/tests/build_systems/buck_clang_test_determinator/.buck-java8 b/infer/tests/build_systems/buck_clang_test_determinator/.buck-java8 new file mode 120000 index 000000000..fc94e0dec --- /dev/null +++ b/infer/tests/build_systems/buck_clang_test_determinator/.buck-java8 @@ -0,0 +1 @@ +../../../../.buck-java8 \ No newline at end of file diff --git a/infer/tests/build_systems/buck_clang_test_determinator/.buckversion b/infer/tests/build_systems/buck_clang_test_determinator/.buckversion deleted file mode 100644 index 9a34dd379..000000000 --- a/infer/tests/build_systems/buck_clang_test_determinator/.buckversion +++ /dev/null @@ -1 +0,0 @@ -3a1d93f2ea0699f9177b11a09cfafcb02f96a902 \ No newline at end of file diff --git a/infer/tests/build_systems/buck_combined/.buck-java8 b/infer/tests/build_systems/buck_combined/.buck-java8 new file mode 120000 index 000000000..fc94e0dec --- /dev/null +++ b/infer/tests/build_systems/buck_combined/.buck-java8 @@ -0,0 +1 @@ +../../../../.buck-java8 \ No newline at end of file diff --git a/infer/tests/build_systems/buck_combined/.buckversion b/infer/tests/build_systems/buck_combined/.buckversion deleted file mode 120000 index 0a46cf46a..000000000 --- a/infer/tests/build_systems/buck_combined/.buckversion +++ /dev/null @@ -1 +0,0 @@ -../../../../.buckversion \ No newline at end of file diff --git a/infer/tests/build_systems/buck_export_changed_functions/.buck-java8 b/infer/tests/build_systems/buck_export_changed_functions/.buck-java8 new file mode 120000 index 000000000..fc94e0dec --- /dev/null +++ b/infer/tests/build_systems/buck_export_changed_functions/.buck-java8 @@ -0,0 +1 @@ +../../../../.buck-java8 \ No newline at end of file diff --git a/infer/tests/build_systems/buck_export_changed_functions/.buckversion b/infer/tests/build_systems/buck_export_changed_functions/.buckversion deleted file mode 120000 index 0a46cf46a..000000000 --- a/infer/tests/build_systems/buck_export_changed_functions/.buckversion +++ /dev/null @@ -1 +0,0 @@ -../../../../.buckversion \ No newline at end of file diff --git a/infer/tests/build_systems/buck_flavors/.buck-java8 b/infer/tests/build_systems/buck_flavors/.buck-java8 new file mode 120000 index 000000000..fc94e0dec --- /dev/null +++ b/infer/tests/build_systems/buck_flavors/.buck-java8 @@ -0,0 +1 @@ +../../../../.buck-java8 \ No newline at end of file diff --git a/infer/tests/build_systems/buck_flavors/.buckversion b/infer/tests/build_systems/buck_flavors/.buckversion deleted file mode 120000 index 0a46cf46a..000000000 --- a/infer/tests/build_systems/buck_flavors/.buckversion +++ /dev/null @@ -1 +0,0 @@ -../../../../.buckversion \ No newline at end of file diff --git a/infer/tests/build_systems/buck_flavors_deterministic/.buck-java8 b/infer/tests/build_systems/buck_flavors_deterministic/.buck-java8 new file mode 120000 index 000000000..fc94e0dec --- /dev/null +++ b/infer/tests/build_systems/buck_flavors_deterministic/.buck-java8 @@ -0,0 +1 @@ +../../../../.buck-java8 \ No newline at end of file diff --git a/infer/tests/build_systems/buck_flavors_deterministic/.buckversion b/infer/tests/build_systems/buck_flavors_deterministic/.buckversion deleted file mode 120000 index 0a46cf46a..000000000 --- a/infer/tests/build_systems/buck_flavors_deterministic/.buckversion +++ /dev/null @@ -1 +0,0 @@ -../../../../.buckversion \ No newline at end of file diff --git a/infer/tests/build_systems/buck_flavors_diff/.buck-java8 b/infer/tests/build_systems/buck_flavors_diff/.buck-java8 new file mode 120000 index 000000000..fc94e0dec --- /dev/null +++ b/infer/tests/build_systems/buck_flavors_diff/.buck-java8 @@ -0,0 +1 @@ +../../../../.buck-java8 \ No newline at end of file diff --git a/infer/tests/build_systems/buck_flavors_diff/.buckversion b/infer/tests/build_systems/buck_flavors_diff/.buckversion deleted file mode 120000 index 0a46cf46a..000000000 --- a/infer/tests/build_systems/buck_flavors_diff/.buckversion +++ /dev/null @@ -1 +0,0 @@ -../../../../.buckversion \ No newline at end of file diff --git a/infer/tests/build_systems/buck_flavors_run/.buck-java8 b/infer/tests/build_systems/buck_flavors_run/.buck-java8 new file mode 120000 index 000000000..fc94e0dec --- /dev/null +++ b/infer/tests/build_systems/buck_flavors_run/.buck-java8 @@ -0,0 +1 @@ +../../../../.buck-java8 \ No newline at end of file diff --git a/infer/tests/build_systems/buck_flavors_run/.buckversion b/infer/tests/build_systems/buck_flavors_run/.buckversion deleted file mode 120000 index 0a46cf46a..000000000 --- a/infer/tests/build_systems/buck_flavors_run/.buckversion +++ /dev/null @@ -1 +0,0 @@ -../../../../.buckversion \ No newline at end of file diff --git a/infer/tests/build_systems/buck_java_flavor/.buck-java8 b/infer/tests/build_systems/buck_java_flavor/.buck-java8 new file mode 120000 index 000000000..fc94e0dec --- /dev/null +++ b/infer/tests/build_systems/buck_java_flavor/.buck-java8 @@ -0,0 +1 @@ +../../../../.buck-java8 \ No newline at end of file diff --git a/infer/tests/build_systems/buck_java_flavor/.buckversion b/infer/tests/build_systems/buck_java_flavor/.buckversion deleted file mode 120000 index 0a46cf46a..000000000 --- a/infer/tests/build_systems/buck_java_flavor/.buckversion +++ /dev/null @@ -1 +0,0 @@ -../../../../.buckversion \ No newline at end of file diff --git a/infer/tests/build_systems/codetoanalyze/.buck-java8 b/infer/tests/build_systems/codetoanalyze/.buck-java8 new file mode 120000 index 000000000..fc94e0dec --- /dev/null +++ b/infer/tests/build_systems/codetoanalyze/.buck-java8 @@ -0,0 +1 @@ +../../../../.buck-java8 \ No newline at end of file diff --git a/infer/tests/build_systems/codetoanalyze/.buckversion b/infer/tests/build_systems/codetoanalyze/.buckversion deleted file mode 120000 index 0a46cf46a..000000000 --- a/infer/tests/build_systems/codetoanalyze/.buckversion +++ /dev/null @@ -1 +0,0 @@ -../../../../.buckversion \ No newline at end of file diff --git a/infer/tests/build_systems/genrulecapture/.buck-java8 b/infer/tests/build_systems/genrulecapture/.buck-java8 new file mode 120000 index 000000000..fc94e0dec --- /dev/null +++ b/infer/tests/build_systems/genrulecapture/.buck-java8 @@ -0,0 +1 @@ +../../../../.buck-java8 \ No newline at end of file diff --git a/infer/tests/build_systems/genrulecapture/.buckversion b/infer/tests/build_systems/genrulecapture/.buckversion deleted file mode 120000 index 0a46cf46a..000000000 --- a/infer/tests/build_systems/genrulecapture/.buckversion +++ /dev/null @@ -1 +0,0 @@ -../../../../.buckversion \ No newline at end of file