Skip to content

Commit

Permalink
Moved to use agaveapi/cli as base
Browse files Browse the repository at this point in the history
  • Loading branch information
mwvaughn committed May 6, 2016
1 parent 8a82393 commit 1b6f1fe
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Matthew Vaughn
# Feb 4, 2016
# May 6, 2016

sdk_version := $(shell cat VERSION)
api_version := v2
api_release := 2.1.6
api_release := 2.1.8

TENANT_NAME := 'Cyverse'
TENANT_KEY := 'iplantc.org'
Expand All @@ -17,17 +17,17 @@ SED = ''

all: $(SOURCES)

.SILENT: foundation-cli
foundation-cli: git-test
echo "Fetching foundation-cli source..."
.SILENT: cli
cli: git-test
echo "Fetching agaveapi/cli source..."
if [ ! -d "$(OBJ)" ]; then \
git clone -b cyverse -q https://bitbucket.org/taccaci/foundation-cli ;\
rm -rf foundation-cli/.git ;\
cp -R foundation-cli $(OBJ); \
git clone -q https://bitbucket.org/agaveapi/cli.git ;\
rm -rf cli/.git ;\
cp -R cli $(OBJ); \
fi

.SILENT: customize
customize: foundation-cli
customize: cli
echo "Customizing..."
cp -fr src/templates $(OBJ)/
cp -fr src/scripts/* $(OBJ)/bin/
Expand All @@ -49,7 +49,7 @@ test:

.PHONY: clean
clean:
rm -rf $(OBJ) foundation-cli
rm -rf $(OBJ) cli

.SILENT: install
install: $(OBJ)
Expand Down Expand Up @@ -102,7 +102,7 @@ docker-clean:
dist: all
tar -czf "$(OBJ).tgz" $(OBJ)
rm -rf $(OBJ)
rm -rf foundation-cli
rm -rf cli
echo "Ready for release. "

.SILENT: release
Expand Down

0 comments on commit 1b6f1fe

Please sign in to comment.