fork/cellxgene
1
0
Fork 0
mirror of https://github.com/chanzuckerberg/cellxgene.git synced 2026-10-06 16:48:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up main Makefile (#1376)

Browse Source 
* Remove unnecessary make target alias

* Remove installing from build directory

* Update documentation
This commit is contained in:
Matt Weiden
2020-04-09 17:35:49 -07:00
committed by GitHub
parent 0398249a20
commit 14021db239
3 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+2 -13
View File
@@ -22,16 +22,12 @@ clean-%:
# BUILDING PACKAGE # BUILDING PACKAGE
.PHONY: build
build: clean build-cli
@echo "done"
.PHONY: build-client .PHONY: build-client
build-client: build-client:
cd client && $(MAKE) ci build cd client && $(MAKE) ci build
.PHONY: build-cli .PHONY: build
build-cli: build-client build: clean build-client
git ls-files server/ | grep -v 'server/test/' | cpio -pdm $(BUILDDIR) git ls-files server/ | grep -v 'server/test/' | cpio -pdm $(BUILDDIR)
cp -r client/build/ $(CLIENTBUILD) cp -r client/build/ $(CLIENTBUILD)
$(call copy_client_assets,$(CLIENTBUILD),$(SERVERBUILD)) $(call copy_client_assets,$(CLIENTBUILD),$(SERVERBUILD))
@@ -150,13 +146,6 @@ gen-package-lock:
# INSTALL # INSTALL
# setup.py sucks when you have your library in a separate folder, adding these in to help setup envs
# install from build directory
.PHONY: install
install: uninstall
cd $(BUILDDIR) && pip install -e .
# install from source tree for development # install from source tree for development
.PHONY: install-dev .PHONY: install-dev
install-dev: uninstall install-dev: uninstall
dev_docs/developer_guidelines.md
+1 -1
View File
@@ -99,6 +99,6 @@ If you would like to run the client tests individually, follow the steps below i
1. For the smoke test run `npm run smoke-test` or `make smoke-test` 1. For the smoke test run `npm run smoke-test` or `make smoke-test`
### Tips ### Tips
* You can also install/launch the server side code from npm scrips (requires python3.6 with virtualenv) in `client/` directory run `npm run backend-dev` * You can also install/launch the server side code from npm scrips (requires python3.6 with virtualenv) with the `scripts/backend_dev` script.
dev_docs/developer_scripts.md
+3 -5
View File
@@ -9,10 +9,9 @@ Documentation for the `Makefile` targets in the project root directory.
builds source code builds source code
``` ```
build - builds whole app client and server build - builds the whole app (client/ source and server/ source packaged together)
build-cli - makes build dir and moves python and client files build-client - runs the client webpack build
build-client - runs webpack build build-for-server-dev - builds client and copies output directly into the server source tree (only for server devlopment)
build-for-server-dev - builds client and copies output directly into source tree (only for server devlopment)
``` ```
### Clean commands ### Clean commands
@@ -50,7 +49,6 @@ dev-env - installs requirements and requirments-dev (for building code)
Installs cellxgene from different locations Installs cellxgene from different locations
``` ```
install - installs from local build directory
install-dev - installs from local source tree install-dev - installs from local source tree
install-release-test - installs from test pypi install-release-test - installs from test pypi
install-release - installs from pypi install-release - installs from pypi