Skip to content

Commit

Permalink
Remove refs stuff from makefile and instructions
Browse files Browse the repository at this point in the history
  • Loading branch information
theengineear committed Sep 30, 2015
1 parent 021cc42 commit 71892b3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 24 deletions.
8 changes: 2 additions & 6 deletions make_instructions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,12 @@ Available targets (i.e. $ make target):

sync_chunked -> sync chunked_requests submodule ONLY

sync_refs -> sync graph_reference submodule ONLY

pull_subs -> `cd` into *each* submodule and `git pull origin master`

pull_mpl -> pull in mplexporter *master* branch

pull_chunked -> pull in chunked_requests *master* branch

pull_refs -> pull in graph_reference *master* branch

################################################################################

Getting setup:
Expand All @@ -51,8 +47,8 @@ Getting setup:

Pulling in changes from subprojects:

1. Only pull submodules that you require (e.g., $ make pull_refs)
2. Make sure to sync these changes (e.g., $ make sync_refs)
1. Only pull submodules that you require (e.g., $ make pull_mpl)
2. Make sure to sync these changes (e.g., $ make sync_mpl)

################################################################################

Expand Down
20 changes: 2 additions & 18 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ readme :

setup_subs :
@echo "Deleting old submodule locations, if they exist"
rm -rf plotly/graph_reference
rm -rf plotly/mplexporter
rm -rf plotly/chunked_requests
rm -rf plotly/plotly/chunked_requests
Expand All @@ -31,11 +30,11 @@ install : sync_subs
@echo "Installing Python API with make"
python setup.py install

sync_subs : sync_mpl sync_chunked sync_refs
sync_subs : sync_mpl sync_chunked
@echo ""
@echo "Submodules synced"

pull_subs : pull_mpl pull_chunked pull_refs
pull_subs : pull_mpl pull_chunked
@echo ""
@echo "Submodules pulled"

Expand All @@ -49,21 +48,6 @@ sync_chunked : submodules/chunked_requests
@echo "Syncing chunked_requests directories"
rsync -r submodules/chunked_requests/chunked_requests plotly/plotly/

sync_refs : submodules/graph_reference
@echo ""
@echo "Syncing graph_reference directories"
rm -rf plotly/graph_reference
mkdir plotly/graph_reference
cp submodules/graph_reference/graph_objs/python/graph_objs_meta.json plotly/graph_reference
cp submodules/graph_reference/graph_objs/python/KEY_TO_NAME.json plotly/graph_reference
cp submodules/graph_reference/graph_objs/python/NAME_TO_KEY.json plotly/graph_reference
cp submodules/graph_reference/graph_objs/python/OBJ_MAP.json plotly/graph_reference

pull_refs : submodules/graph_reference
@echo ""
@echo "Pulling down updates from graph_reference"
cd submodules/graph_reference; git pull origin master

pull_mpl : submodules/mplexporter
@echo ""
@echo "Pulling down updates from mplexporter"
Expand Down

0 comments on commit 71892b3

Please sign in to comment.