Skip to content

Commit abb445f

Browse files
T0haT0ha
committed
Added develop builds + some refactor
1 parent 70c749a commit abb445f

3 files changed

Lines changed: 99 additions & 5 deletions

File tree

‎Makefile‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,14 @@ version:
5050

5151
# PLATFORM-SPECIFIC RISE
5252

53+
develop: version
54+
@($(MAKE) rel_dev PLATFORM=linux)
55+
56+
mac_dev: version
57+
@($(MAKE) rel_dev PLATFORM=mac)
58+
@($(MAKE) mac_frontend PLATFORM=mac)
59+
@($(MAKE) dmg PLATFORM=mac)
60+
5361
linux: version
5462
@($(MAKE) rel PLATFORM=linux)
5563
@($(MAKE) frontend PLATFORM=linux)
@@ -88,12 +96,19 @@ win: version
8896

8997
## TODO: simplify further by adding a $(MODE) argument to be used in place of rel_inner_slim and rel_inner_full
9098
rel: compile
91-
@$(MAKE) clean_release
99+
@($(MAKE) clean_release)
92100
@(cd rel; ./add_overlay.escript reltool.config reltool_tmp.config reltool_$(PLATFORM).config)
93101
@($(MAKE) rel_inner_full PLATFORM=$(PLATFORM))
94102
@echo Generated a self-contained Rise project
95103
@echo in 'rel/rise', configured to run on $(PLATFORM).
96104

105+
rel_dev: compile
106+
@($(MAKE) clean_release)
107+
@(cd rel; ./add_overlay.escript reltool.config reltool_tmp.config reltool_$(PLATFORM).config)
108+
@($(MAKE) rel_inner_dev PLATFORM=$(PLATFORM))
109+
@echo Generated a self-contained Rise project
110+
@echo in 'rel/rise', configured to run on $(PLATFORM).
111+
97112
rel_win: compile
98113
@$(MAKE) clean_release
99114
@(cd rel; ./add_overlay.escript reltool.config reltool_tmp.config reltool_win.config)
@@ -140,16 +155,23 @@ generate:
140155
erl_interface:
141156
@(cd rel; escript copy_erl_interface.escript)
142157

143-
rel_inner:
158+
rel_inner_full: generate erl_interface
144159
@(cd rel; cp overlay/rebar.config.src rise/rebar.config)
145160
@(cd rel/rise; git clone git://github.com/SovereignPrime/RISE-nitrogen-site.git ./site)
146-
@(cd rel/rise; $(MAKE); $(MAKE) cookie; $(MAKE) copy-static)
161+
@(cd rel/rise; $(MAKE); $(MAKE) cookie)
147162
@printf "Rise Version:\n${RISE_VERSION}\n\n" > rel/rise/BuildInfo.txt
148163
@echo "Built On (uname -v):" >> rel/rise/BuildInfo.txt
149164
@uname -v >> rel/rise/BuildInfo.txt
150165
@rm -rf rel/reltool.config
151166

152-
rel_inner_full: generate erl_interface rel_inner
167+
rel_inner_dev: generate erl_interface
168+
@(cd rel; cp overlay/rebar_dev.config.src rise/rebar.config)
169+
@(cd rel/rise; git clone git://github.com/SovereignPrime/RISE-nitrogen-site.git --branch develop ./site)
170+
@(cd rel/rise; $(MAKE); $(MAKE) cookie)
171+
@printf "Rise Version:\n${RISE_VERSION}\n\n" > rel/rise/BuildInfo.txt
172+
@echo "Built On (uname -v):" >> rel/rise/BuildInfo.txt
173+
@uname -v >> rel/rise/BuildInfo.txt
174+
@rm -rf rel/reltool.config
153175

154176

155177
rel_inner_win: generate erl_interface

‎rel/overlay/linux/bin/rise_service‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ CALLER_DIR=$PWD
99

1010
RUNNER_BASE_DIR=${RUNNER_SCRIPT_DIR%/*}
1111
ROOTDIR=$RUNNER_BASE_DIR
12-
RUNNER_ETC_DIR=~/.config/RISE
12+
RUNNER_ETC_DIR=$ROOTDIR/etc
1313

1414
ERL_LIBS=$RUNNER_BASE_DIR/lib
1515
DOC_ROOT=$RUNNER_BASE_DIR/site/static

‎rel/overlay/rebar_dev.config.src‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
%% vim: ts=4 sw=4 et ft=erlang
2+
{sub_dirs, [
3+
"site",
4+
"deps"
5+
]}.
6+
7+
{require_otp_vsn, "R16B0[1-3]|17"}.
8+
9+
{cover_enabled, true}.
10+
11+
{erl_opts, [debug_info, fail_on_warning, {d, debug}]}.
12+
13+
{deps_dir, ["lib"]}.
14+
15+
{port_env, [
16+
{"win32", "CC" , "gcc"},
17+
{"win32", "CXX", "g++"},
18+
{"win32", "DRV_CXX_TEMPLATE",
19+
"$CXX -c $CXXFLAGS $DRV_CFLAGS $PORT_IN_FILES -o $PORT_OUT_FILE"},
20+
{"win32", "DRV_CC_TEMPLATE",
21+
"$CC -c $CFLAGS $DRV_CFLAGS $PORT_IN_FILES -o $PORT_OUT_FILE"},
22+
{"win32", "DRV_LINK_TEMPLATE",
23+
"$CC $PORT_IN_FILES $LDFLAGS $DRV_LDFLAGS -o $PORT_OUT_FILE"},
24+
{"win32", "EXE_CXX_TEMPLATE",
25+
"$CXX -c $CXXFLAGS $EXE_CFLAGS $PORT_IN_FILES -o $PORT_OUT_FILE"},
26+
{"win32", "EXE_CC_TEMPLATE",
27+
"$CC -c $CFLAGS $EXE_CFLAGS $PORT_IN_FILES -o $PORT_OUT_FILE"},
28+
{"win32", "EXE_LINK_TEMPLATE",
29+
"$CC $PORT_IN_FILES $LDFLAGS $EXE_LDFLAGS -o $PORT_OUT_FILE"},
30+
{"win32", "DRV_CFLAGS" , "-g -Wall -fPIC $ERL_CFLAGS"},
31+
{"win32", "DRV_LDFLAGS", "-shared $ERL_LDFLAGS"},
32+
{"win32", "EXE_CFLAGS" , "-g -Wall -fPIC $ERL_CFLAGS"},
33+
{"win32", "EXE_LDFLAGS", "$ERL_LDFLAGS"},
34+
35+
%{"win32", "ERL_CFLAGS", lists:concat([" -I", erl_interface_dir(include),
36+
% " -I", filename:join(erts_dir(), "include"),
37+
% " "])},
38+
39+
{"win32", "ERL_EI_LIBDIR", "lib/erl_interface-3.7.15/lib"}
40+
% {"win32", "ERLANG_ARCH" , },
41+
% {"win32", "ERLANG_TARGET", rebar_utils:get_arch()}
42+
]}.
43+
44+
{deps, [
45+
%% START_PLATFORM_DEPENDENCIES
46+
%% These lines will be replaced with any platform specific dependencies.
47+
%% The platform-sepecific dependencies can be located in
48+
%% rel/overlay/<platform>/rebar.config.deps
49+
%% END_PLATFORM_DEPENDENCIES
50+
51+
%% Uncomment the following lines and comment the bottom lines with specific
52+
%% tags to always pull the latest versions
53+
%%{nitrogen_core, ".*", {git, "git://github.com/nitrogen/nitrogen_core",{branch, master}}},
54+
%%{nprocreg, ".*", {git, "git://github.com/nitrogen/nprocreg", {branch, master}}},
55+
%% {simple_bridge, ".*", {git, "git://github.com/nitrogen/simple_bridge",{branch, master}}},
56+
{simple_bridge, ".*", {git, "git://github.com/SovereignPrime/simple_bridge",{branch, master}}},
57+
%%{sync, ".*", {git, "git://github.com/rustyio/sync", {branch, master}}}
58+
59+
%% Get specific tagged version
60+
{nitrogen_core, ".*", {git, "git://github.com/SovereignPrime/nitrogen_core"}},
61+
{nprocreg, ".*", {git, "git://github.com/nitrogen/nprocreg", {tag, "v0.2.1"}}},
62+
{cowboy, ".*", {git, "git://github.com/extend/cowboy", {tag, "0.8.6"}}},
63+
{ranch, ".*", {git, "git://github.com/extend/ranch", {tag, "0.8.5"}}},
64+
{mimetypes, ".*", {git, "git://github.com/spawngrid/mimetypes", {branch, master}}},
65+
{mochijson2, ".*", {git, "git://github.com/bjnortier/mochijson2.git", "3663fb01fd98958181adc2d1300c7bfa553e1434"}},
66+
{bitmessage, ".*", {git, "git://github.com/SovereignPrime/BitMessage.erl.git", {branch, "develop"}}},
67+
{eminer, ".*", {git, "git://github.com/t0ha/eminer.git", {branch, "develop"}}},
68+
%{pat, ".*", {git, "git://github.com/selectel/pat.git", "3c0916931065d037d66f884601e7d740e2a3d7fe"}},
69+
{etorrent_core, ".*", {git, "git://github.com/SovereignPrime/etorrent_core.git", {branch, "develop"}}},
70+
{sigma_search, ".*", {git, "git://github.com/SovereignPrime/sigma_search.git", {branch, master}}},
71+
{sync, ".*", {git, "git://github.com/rustyio/sync", "a8366be73244383c07f9cafe30b72e83f3ad0621"}}
72+
]}.

0 commit comments

Comments
 (0)