rename make copy-flow-files to make bin/flow

Summary:
old name didn't make sense, new name matches the file it generates.

yes, the ocp version of these targets still exists, and also writes bin/flow, but I hope to consolidate to a single build system.

also in this diff, I combine the `make bin/flow` and `make dist/flow.zip` calls in Circle, so that we don't recompile flow twice.

Reviewed By: avikchaudhuri

Differential Revision: D7523844

fbshipit-source-id: a38f2442cf3de635cb2e478930cb6a9d90d89bfd

Author: mroch

.circleci/config.yml

@@ -72,7 +72,9 @@ jobs:
       - save_cache: *save_opam_cache
       - run:
           name: Build flow
-          command: opam config exec -- make
+          command: |
+            opam config exec -- make bin/flow dist/flow.zip
+            mkdir -p bin/linux && cp bin/flow bin/linux/flow
       - run:
           name: Build libflowparser
           command: opam config exec -- make -C src/parser dist/libflowparser.zip
@@ -85,8 +87,6 @@ jobs:
       - run:
           name: Create artifacts
           command: |
-            mkdir -p bin/linux && cp bin/flow bin/linux/flow
-            opam config exec -- make dist/flow.zip
             cp dist/flow.zip dist/flow-linux64.zip
             cp src/parser/dist/libflowparser.zip dist/libflowparser-linux64.zip
             cp src/parser/flow_parser.js dist/flow_parser.js
@@ -146,15 +146,15 @@ jobs:
       - save_cache: *save_opam_cache
       - run:
           name: Build flow
-          command: opam config exec -- make
+          command: |
+            opam config exec -- make bin/flow dist/flow.zip
+            mkdir -p bin/macos && cp bin/flow bin/macos/flow
       - run:
           name: Build libflowparser
           command: opam config exec -- make -C src/parser dist/libflowparser.zip
       - run:
           name: Create artifacts
           command: |
-            mkdir -p bin/macos && cp bin/flow bin/macos/flow
-            opam config exec -- make dist/flow.zip
             cp dist/flow.zip dist/flow-osx.zip
             cp src/parser/dist/libflowparser.zip dist/libflowparser-osx.zip
       - persist_to_workspace:

Makefile

@@ -194,7 +194,7 @@ LINKER_FLAGS=$(BYTECODE_LINKER_FLAGS)
 
 RELEASE_TAGS=$(if $(FLOW_RELEASE),-tag warn_a,)
 
-all: build-flow copy-flow-files
+all: bin/flow$(EXE)
 all-ocp: build-flow-with-ocp copy-flow-files-ocp
 
 all-homebrew:
@@ -305,9 +305,9 @@ _build/scripts/ppx_gen_flowlibs.native: scripts/ppx_gen_flowlibs.ml
 		scripts/ppx_gen_flowlibs.native
 	rm -f ppx_gen_flowlibs.native
 
-copy-flow-files: build-flow
-	mkdir -p bin
-	cp _build/src/flow.native bin/flow$(EXE)
+bin/flow$(EXE): build-flow
+	mkdir -p $(@D)
+	cp _build/src/flow.native $@
 
 copy-flow-files-ocp: build-flow-with-ocp
 	mkdir -p bin
@@ -322,10 +322,10 @@ do-test:
 do-test-tool:
 	FLOW_BIN=../../bin/flow$(EXE) ${MAKE} -C packages/flow-dev-tools test
 
-test-tool: build-flow copy-flow-files
+test-tool: bin/flow$(EXE)
 	${MAKE} do-test-tool
 
-test: build-flow copy-flow-files
+test: bin/flow$(EXE)
 	${MAKE} do-test
 
 test-ocp: build-flow-with-ocp copy-flow-files-ocp