[buck] Do not use .buckversion

Reviewed By: jvillard Differential Revision: D24705566 fbshipit-source-id: d76b3710e
4 years ago · 47fad6eaf3
parent 0bf010d72a
commit 47fad6eaf3
26 changed files with 16 additions and 20 deletions
--- a/.gitignore
+++ b/.gitignore
@ -72,6 +72,7 @@ duplicates.txt
 /configure
 /Makefile.autoconf
 /.buckversion
 /.buck-java8
 /*/.gitignore
 /*/*/.gitignore
--- a/2
+++ b/2
@ -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
--- 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"],
+  AC_MSG_CHECKING([which .buck-java8 to use])
-  [buckversion_file="$oss_buckversion_file"])
+  cp "facebook/dependencies/dotbuck-java8" ".buck-java8"
-cat "$buckversion_file" > ".buckversion"
+  AC_MSG_RESULT([facebook/dependencies/dotbuck-java8]))
 AC_MSG_RESULT([$buckversion_file])
 AC_CHECK_TOOL([GETCONF], [getconf], [no])
--- a/1
+++ b/1
@ -1 +0,0 @@
 47922db48687c6bebdf79e41c001f222c2b948fd
--- a/infer/tests/build_systems/buck_blacklist/.buck-java8
+++ b/infer/tests/build_systems/buck_blacklist/.buck-java8
@ -0,0 +1 @@
 ../../../../.buck-java8
--- a/infer/tests/build_systems/buck_blacklist/.buckversion
+++ b/infer/tests/build_systems/buck_blacklist/.buckversion
@ -1 +0,0 @@
 ../../../../.buckversion
--- a/infer/tests/build_systems/buck_clang_test_determinator/.buck-java8
+++ b/infer/tests/build_systems/buck_clang_test_determinator/.buck-java8
@ -0,0 +1 @@
 ../../../../.buck-java8
--- a/infer/tests/build_systems/buck_clang_test_determinator/.buckversion
+++ b/infer/tests/build_systems/buck_clang_test_determinator/.buckversion
@ -1 +0,0 @@
 3a1d93f2ea0699f9177b11a09cfafcb02f96a902
--- a/infer/tests/build_systems/buck_combined/.buck-java8
+++ b/infer/tests/build_systems/buck_combined/.buck-java8
@ -0,0 +1 @@
 ../../../../.buck-java8
--- a/infer/tests/build_systems/buck_combined/.buckversion
+++ b/infer/tests/build_systems/buck_combined/.buckversion
@ -1 +0,0 @@
 ../../../../.buckversion
--- a/infer/tests/build_systems/buck_export_changed_functions/.buck-java8
+++ b/infer/tests/build_systems/buck_export_changed_functions/.buck-java8
@ -0,0 +1 @@
 ../../../../.buck-java8
--- a/infer/tests/build_systems/buck_export_changed_functions/.buckversion
+++ b/infer/tests/build_systems/buck_export_changed_functions/.buckversion
@ -1 +0,0 @@
 ../../../../.buckversion
--- a/infer/tests/build_systems/buck_flavors/.buck-java8
+++ b/infer/tests/build_systems/buck_flavors/.buck-java8
@ -0,0 +1 @@
 ../../../../.buck-java8
--- a/infer/tests/build_systems/buck_flavors/.buckversion
+++ b/infer/tests/build_systems/buck_flavors/.buckversion
@ -1 +0,0 @@
 ../../../../.buckversion
--- a/infer/tests/build_systems/buck_flavors_deterministic/.buck-java8
+++ b/infer/tests/build_systems/buck_flavors_deterministic/.buck-java8
@ -0,0 +1 @@
 ../../../../.buck-java8
--- a/infer/tests/build_systems/buck_flavors_deterministic/.buckversion
+++ b/infer/tests/build_systems/buck_flavors_deterministic/.buckversion
@ -1 +0,0 @@
 ../../../../.buckversion
--- a/infer/tests/build_systems/buck_flavors_diff/.buck-java8
+++ b/infer/tests/build_systems/buck_flavors_diff/.buck-java8
@ -0,0 +1 @@
 ../../../../.buck-java8
--- a/infer/tests/build_systems/buck_flavors_diff/.buckversion
+++ b/infer/tests/build_systems/buck_flavors_diff/.buckversion
@ -1 +0,0 @@
 ../../../../.buckversion
--- a/infer/tests/build_systems/buck_flavors_run/.buck-java8
+++ b/infer/tests/build_systems/buck_flavors_run/.buck-java8
@ -0,0 +1 @@
 ../../../../.buck-java8
--- a/infer/tests/build_systems/buck_flavors_run/.buckversion
+++ b/infer/tests/build_systems/buck_flavors_run/.buckversion
@ -1 +0,0 @@
 ../../../../.buckversion
--- a/infer/tests/build_systems/buck_java_flavor/.buck-java8
+++ b/infer/tests/build_systems/buck_java_flavor/.buck-java8
@ -0,0 +1 @@
 ../../../../.buck-java8
--- a/infer/tests/build_systems/buck_java_flavor/.buckversion
+++ b/infer/tests/build_systems/buck_java_flavor/.buckversion
@ -1 +0,0 @@
 ../../../../.buckversion
--- a/infer/tests/build_systems/codetoanalyze/.buck-java8
+++ b/infer/tests/build_systems/codetoanalyze/.buck-java8
@ -0,0 +1 @@
 ../../../../.buck-java8
--- a/infer/tests/build_systems/codetoanalyze/.buckversion
+++ b/infer/tests/build_systems/codetoanalyze/.buckversion
@ -1 +0,0 @@
 ../../../../.buckversion
--- a/infer/tests/build_systems/genrulecapture/.buck-java8
+++ b/infer/tests/build_systems/genrulecapture/.buck-java8
@ -0,0 +1 @@
 ../../../../.buck-java8
--- a/infer/tests/build_systems/genrulecapture/.buckversion
+++ b/infer/tests/build_systems/genrulecapture/.buckversion
@ -1 +0,0 @@
 ../../../../.buckversion