Skip to content

Commit a0549cb

Browse files
amiramixamiramix
committed
Update builderl to the newest version and change project location
1 parent 8ec6f55 commit a0549cb

19 files changed

+89
-104
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
/lib/*/priv/mibs/
88

99
/deps/migresia/
10-
/deps/builderl/
1110
/deps/node_package/
1211
/deps/recon/
1312

‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "deps/builderl"]
2+
path = deps/builderl
3+
url = https://github.com/builderl/builderl.git

‎GNUmakefile

+13-16
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# -*- mode: Makefile -*-
2-
# Copyright (c) 2015, Grzegorz Junka
2+
3+
# Copyright (c) 2015-2016, Grzegorz Junka
34
# All rights reserved.
45
#
56
# Redistribution and use in source and binary forms, with or without
@@ -35,20 +36,13 @@
3536
# Credit for the Erlang downloading tip:
3637
# https://groups.google.com/forum/?fromgroups=#!topic/erlang-programming/U0JJ3SeUv5Y
3738

38-
# Project-specific variables and settings (Change where required)
39-
#-------------------------------------------------------------------------------
40-
# Tested version known to compile riak_pb
41-
REBARURL ?= https://github.com/yoonka/erlstrap/wiki/rebar
42-
# Git repository for dependencies listed in files in deps-versions/
43-
GITURL ?= https://github.com/yoonka
44-
# The development branch, use dependencies from deps-versions/$GITDEVELOP
45-
# if the current branch starts with the name of the development branch
46-
GITDEVELOP ?= develop
47-
# Name of the default branch, use dependencies from deps-versions/$GITMASTER
48-
GITMASTER ?= master
49-
# Compilation flags
50-
ERLCFLAGS ?= -W -v -pa deps/lager/ebin +debug_info
51-
#-------------------------------------------------------------------------------
39+
## Project-specific variables and settings (Change where required)
40+
##------------------------------------------------------------------------------
41+
## Tested version known to compile riak_pb
42+
REBARURL ?= https://github.com/yoonka/erlstrap/wiki/rebar
43+
## Compilation flags
44+
# ERLCFLAGS ?= -W -v -pa deps/lager/ebin +debug_info +'{parse_transform, lager_transform}'
45+
##------------------------------------------------------------------------------
5246

5347
## These are defaults used in GNUmakefileBuilderl, change if needed
5448
##------------------------------------------------------------------------------
@@ -67,7 +61,10 @@ BLDERLLOCAL := GNUmakefileBuilderl
6761
# URL to download the builderl/makefiles/GNUmakefileBuilderl makefile
6862
BLDERLMKURL := https://raw.githubusercontent.com/yoonka/builderl/master/makefiles/GNUmakefileBuilderl
6963

70-
ifneq ($(MAKECMDGOALS),$(filter $(MAKECMDGOALS),rm-builderl))
64+
ifneq (rm-builderl,$(filter $(MAKECMDGOALS),rm-builderl))
65+
66+
.PHONY: all
67+
all: get-deps tgz
7168

7269
ifeq ($(wildcard $(BLDERLLOCAL)),)
7370
$(shell erl -noshell -s inets -s ssl -eval \

‎GNUmakefileBuilderl

+17-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# -*- mode: Makefile -*-
2-
# Copyright (c) 2015, Grzegorz Junka
2+
3+
# Copyright (c) 2015-2016, Grzegorz Junka
34
# All rights reserved.
45
#
56
# Redistribution and use in source and binary forms, with or without
@@ -35,20 +36,25 @@ CUSTOMMK ?= GNUmakefileCustom
3536
# Pull builderl repository if needed
3637
ISBLDERL := $(shell git --git-dir=$(BLDERLPATH)/.git \
3738
--work-tree=$(BLDERLPATH)/ status > /dev/null 2>&1; echo $$?)
39+
BLDISDIFF := $(shell git diff $(BLDERLPATH) 2>&1 | wc -l | tr -d '[[:space:]]')
40+
ifneq ($(ISBLDERL)-$(BLDISDIFF),0-0)
41+
$(info Repository $(BLDERLPATH)/ not up to date, will try to update)
42+
ISDIRTY := $(shell git diff $(BLDERLPATH) 2>/dev/null \
43+
| grep "\-dirty" | wc -l | tr -d '[[:space:]]')
44+
ifeq ($(ISDIRTY),0)
45+
ISBLDERL := $(shell git submodule update --init $(BLDERLPATH) \
46+
> /dev/null 2>&1; echo $$?)
3847
ifneq ($(ISBLDERL),0)
39-
$(info Repository $(BLDERLPATH)/ does not exist, will create)
40-
ISBLDERL := $(shell mkdir -p $(BLDERLPATH); \
41-
git clone $(BLDERLURL) 1>&2; echo $$?)
48+
$(error Can not update submodule $(BLDERLPATH))
49+
endif # ISBLDERL
4250
$(shell rm -f bin/builderl)
4351
$(shell ln -s ../$(BLDERLPATH) bin/builderl)
44-
endif
45-
46-
ifneq ($(ISBLDERL),0)
47-
$(error Can not pull the repository)
48-
endif
52+
else # ISDIRTY
53+
$(warning $(BLDERLPATH)/ contains local changes, not updating!)
54+
endif # ISDIRTY
55+
endif # ISBLDERL-BLDISDIFF
4956

50-
incs := common rel_app_vars deps targets configs clean debug
51-
include $(foreach file,$(incs),$(BLDERLPATH)/makefiles/$(file))
57+
include $(BLDERLPATH)/makefiles/common
5258

5359
ifneq ($(wildcard $(CUSTOMMK)),)
5460
include $(CUSTOMMK)

‎bin/builderl.esh

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env escript
2+
%% -*- erlang -*-
3+
%%! -smp enable -hidden
4+
5+
-include("builderl/include/load_builderl.hrl").
6+
7+
main(Args) ->
8+
load_builderl(),
9+
Foo = list_to_atom(filename:basename(escript:script_name(), ".esh")),
10+
bld_load:Foo(Args).

‎bin/config.esh

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
builderl.esh

‎bin/configure.esh

-9
This file was deleted.

‎bin/configure.esh

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
builderl.esh

‎bin/deps.esh

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
builderl.esh

‎bin/init.esh

-9
This file was deleted.

‎bin/init.esh

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
builderl.esh

‎bin/migresia.esh

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
builderl.esh

‎bin/mk_dev.esh

-9
This file was deleted.

‎bin/mk_dev.esh

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
builderl.esh

‎bin/mk_rel.esh

-9
This file was deleted.

‎bin/mk_rel.esh

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
builderl.esh

‎bin/start.esh

-9
This file was deleted.

‎bin/start.esh

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
builderl.esh

‎bin/stop.esh

-9
This file was deleted.

‎bin/stop.esh

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
builderl.esh

‎bin/update_root_dir.esh

-9
This file was deleted.

‎bin/update_root_dir.esh

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
builderl.esh

‎deps-versions/develop

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
dep_clone_args = \
2-
'-b develop $(repo_base_url)/builderl_sample_setup.git' \
3-
'-b develop $(repo_base_url)/builderl_sample_http_if.git http_interface' \
4-
'-b develop $(repo_base_url)/builderl_sample_tcp_if.git tcp_interface'
1+
%% -*- erlang -*-
52

6-
deps = \
7-
builderl_sample_setup http_interface tcp_interface
3+
{"develop", "=REPOBASE=/ex1_sc_setup.git", "builderl_sample_setup"}.
4+
{"develop", "=REPOBASE=/ex1_http_interface.git", "http_interface"}.
5+
{"develop", "=REPOBASE=/ex1_tcp_interface.git", "tcp_interface"}.
6+
7+
"gen_web_server".
8+
"resource_discovery".
9+
"simple_cache".

‎deps-versions/master

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
dep_clone_args = \
2-
'-b master $(repo_base_url)/builderl_sample_setup.git' \
3-
'-b master $(repo_base_url)/builderl_sample_http_if.git http_interface' \
4-
'-b master $(repo_base_url)/builderl_sample_tcp_if.git tcp_interface'
1+
%% -*- erlang -*-
52

6-
deps = \
7-
builderl_sample_setup http_interface tcp_interface
3+
{"master", "=REPOBASE=/ex1_sc_setup.git", "builderl_sample_setup"}.
4+
{"master", "=REPOBASE=/ex1_http_interface.git", "http_interface"}.
5+
{"master", "=REPOBASE=/ex1_tcp_interface.git", "tcp_interface"}.
6+
7+
"gen_web_server".
8+
"resource_discovery".
9+
"simple_cache".

‎deps/builderl

Submodule builderl added at ce96feb

‎etc/reltool.config

+19-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,26 @@
66
%% default_nodes: Default set of node types
77
%% setup_config: Release Name | Setup Application | Setup Module
88
{builderl,
9-
[{boot_version, "sc-0.1.0"},
9+
[{default_repo_base, "https://github.com/builderl"},
1010
{setup_config, "cmd", builderl_sample_setup, cmd_config},
11+
{make_profiles,
12+
[{default,
13+
[{make_options,
14+
[
15+
%%{pa, "deps/lager/ebin"}
16+
%%,{mk_plugin, "lib/deploy/src/deps_make"}
17+
]},
18+
{erl,
19+
[verbose, debug_info, return, {i, "lib"}, {i, "deps"}
20+
%%,{parse_transform, lager_transform}
21+
]}]},
22+
{test,
23+
[{make_options,
24+
[{spa, "test"}]},
25+
{erl,
26+
[{d, 'TEST'}, {d, 'DEBUG'}]}]}
27+
]},
28+
{boot_version, "sc-0.1.0"},
1129
{release_types,
1230
[{sc, "rel_sc", "sc", sc_config, 0},
1331
{htif, "rel_http_if", "http_if", htif_config, 10},

0 commit comments

Comments
 (0)