Skip to content

Commit

Permalink
Add examples to build distribution, updating project build roots.
Browse files Browse the repository at this point in the history
	Change on 2017/12/16 by tball <tball@google.com>

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=179304301
  • Loading branch information
tomball committed Dec 16, 2017
1 parent f7e3cc8 commit de7c68b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 2 deletions.
13 changes: 12 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ dist: print_environment translator_dist jre_emul_dist junit_dist jsr305_dist \
protobuf_dist: protobuf_compiler_dist protobuf_runtime_dist


all_dist: dist all_frameworks
all_dist: dist all_frameworks examples_dist

clean:
@rm -rf $(BUILD_DIR) $(DIST_DIR)
Expand Down Expand Up @@ -113,6 +113,17 @@ test_protobuf: junit_dist protobuf_compiler_dist protobuf_runtime_dist

test_all: test test_protobuf

examples_dist: copy_examples fix_dist_references

copy_examples:
@cp -r examples $(DIST_DIR)

fix_dist_references:
@sed -i '' 's/\/dist//' $(DIST_DIR)/examples/Hello/Hello.xcconfig
@sed -i '' 's/\/dist//' $(DIST_DIR)/examples/protobuf/Makefile
@sed -i '' 's/\<path to local j2objc distribution\>/..\/../' \
$(DIST_DIR)/examples/Contacts/WORKSPACE

print_environment:
@echo Locale: $${LANG}
@echo `uname -a`
Expand Down
2 changes: 1 addition & 1 deletion examples/Contacts/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
git_repository(
name = "build_bazel_rules_apple",
remote = "https://github.com/bazelbuild/rules_apple.git",
tag = "0.0.1",
tag = "0.2.0",
)

local_repository(
Expand Down

0 comments on commit de7c68b

Please sign in to comment.