Commits

Kota UENISHI  committed e984793 Merge

merge

  • Participants
  • Parent commits e78a265, 42c4548

Comments (0)

Files changed (6)

 # If so, define the subdirectory targets and uncomment this section.
 #
 
-.SUBDIRS: omake cerl c c++ ocaml haskell
+.SUBDIRS: omake cerl c c++ ocaml haskell erlang
 
 ########################################################################
 # C configuration.

File erlang/OMakefile

 # If so, define the subdirectory targets and uncomment this section.
 #
 
-# .SUBDIRS:
+.SUBDIRS: otp_test
 
 ########################################################################
 # C configuration.

File erlang/otp_test/Makefile

-all:: compile deploy
+all:: compile
 
 compile::
-	cd src ; erl -make
-
-deploy::
-	cp src/*.beam ebin/
+	./rebar compile
 
 clean::
 	-rm src/*.beam
 	-rm ebin/*.beam
 
-edoc::
-	@echo $<
+eunit::
+	./rebar eunit

File erlang/otp_test/ebin/otp_test.app

-%% This is the application resource file (.app file) for the hello_world,
-%% application.
-{application, otp_test,
-  [{description, "Your Desc HERE"},
-   {vsn, "0.1.0"},
-   {modules, [
-	      otp_test_app, otp_test_sup, otp_test_sup2,  otp_test_server, otp_test_gen_server, otp_test_fsm
-	     ]},
-   {registered,[
-		otp_test_sup, otp_test_sup2, otp_test_server, otp_test_gen_server, otp_test_fsm
-	       ]},
-   {applications, [kernel, stdlib]},
-   {mod, {otp_test_app,[]}},
-   {start_phases, []}
-  ]
-}.

File erlang/otp_test/rebar

Binary file added.

File erlang/otp_test/rel/reltool.config

+{sys, [
+       {lib_dirs, []},
+       {rel, "otp_test_node", "2",
+        [
+         kernel,
+         stdlib,
+         sasl
+        ]},
+       {rel, "start_clean", "",
+        [
+         kernel,
+         stdlib
+        ]},
+       {boot_rel, "otp_test_node"},
+       {profile, embedded},
+       {excl_sys_filters, ["^bin/.*",
+                           "^erts.*/bin/(dialyzer|typer)"]},
+       {app, sasl, [{incl_cond, include}]}
+      ]}.
+
+{target_dir, "otp_test_node"}.
+
+{overlay, [
+           {mkdir, "log/sasl"},
+           {copy, "files/erl", "{{erts_vsn}}/bin/erl"},
+           {copy, "files/nodetool", "{{erts_vsn}}/bin/nodetool"},
+           {copy, "files/otp_test_node", "bin/otp_test_node"},
+           {copy, "files/app.config", "etc/app.config"},
+           {copy, "files/vm.args", "etc/vm.args"}
+           ]}.