Skip to content

Commit

Permalink
Merge branch 'master' into new-license
Browse files Browse the repository at this point in the history
  • Loading branch information
aaustin committed Dec 19, 2015
2 parents 598e584 + b5c3303 commit baea1a9
Show file tree
Hide file tree
Showing 19 changed files with 1,015 additions and 1,303 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "Web-SDK"]
path = Web-SDK
url = git@github.com:BranchMetrics/Web-SDK.git
url = git@github.com:BranchMetrics/Smart-App-Banner-Deep-Linking-Web-SDK.git
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ EXTERN=Web-SDK/src/extern.js

.PHONY: clean

all: dist/build.min.js dist/build.js README.md README.md
all: dist/build.min.js dist/build.js Reference.md README.md
clean:
rm -f dist/** docs/cordova/3_branch_cordova.md README.md README.md
rm -f dist/** docs/cordova/3_branch_cordova.md Reference.md README.md

# Kinda gross, but will download closure compiler if you don't have it.
compiler/compiler.jar:
Expand Down Expand Up @@ -41,7 +41,7 @@ docs/cordova/3_branch_cordova.md: $(SOURCES)
jsdox Web-SDK/src/3_branch_cordova.js --output docs/cordova
rm Web-SDK/src/3_branch_cordova.js

README.md: docs/0_notice.md docs/cordova/1_intro.md docs/cordova/3_branch_cordova.md docs/4_footer.md
Reference.md: docs/cordova/3_branch_cordova.md docs/4_footer.md
perl Web-SDK/build_utils/toc_generator.pl Web-SDK/src/6_branch.js docs/cordova/2_table_of_contents.md CORDOVA
cat docs/0_notice.md docs/cordova/1_intro.md docs/cordova/2_table_of_contents.md docs/cordova/3_branch_cordova.md docs/4_footer.md > README.md
perl -p -i -e 's/# Global//' README.md
cat docs/cordova/2_table_of_contents.md docs/cordova/3_branch_cordova.md docs/4_footer.md > Reference.md
perl -p -i -e 's/# Global//' Reference.md
Loading

0 comments on commit baea1a9

Please sign in to comment.