Rebar3 support

priv/base/env.sh

@@ -26,6 +26,7 @@ RUNNER_PATCH_DIR={{runner_patch_dir}}
 PIPE_DIR={{pipe_dir}}
 RUNNER_USER={{runner_user}}
 APP_VERSION={{app_version}}
+CUTTLEFISH_SCHEMA_DIR={{cuttlefish_schema_dir}}
 
 # Variables needed to support creation of .pid files
 # PID directory and pid file name of this app
@@ -135,7 +136,7 @@ CUTTLEFISH="{{cuttlefish}}"
 if [ -z "$CUTTLEFISH" ]; then
     CUTTLEFISH_COMMAND_PREFIX=""
 else
-    CUTTLEFISH_COMMAND_PREFIX="$ERTS_PATH/escript $ERTS_PATH/cuttlefish -e $RUNNER_ETC_DIR -s $RUNNER_LIB_DIR -d {{platform_data_dir}}/generated.configs -c $RUNNER_ETC_DIR/{{cuttlefish_conf}}"
+    CUTTLEFISH_COMMAND_PREFIX="$ERTS_PATH/escript $ERTS_PATH/cuttlefish -e $RUNNER_ETC_DIR -s $CUTTLEFISH_SCHEMA_DIR -d {{platform_data_dir}}/generated.configs -c $RUNNER_ETC_DIR/{{cuttlefish_conf}}"
 fi
 
 # Ping node without stealing stdin

priv/base/runner

@@ -307,7 +307,7 @@ case "$1" in
         echo "q() or init:stop() will terminate the $SCRIPT node."
         shift
         NODE_NAME=${NAME_ARG#* }
-        exec $ERTS_PATH/erl -name c_$$_$NODE_NAME -hidden -remsh $NODE_NAME $COOKIE_ARG $NET_TICKTIME_ARG
+        exec $ERTS_PATH/erl -name c_$$_$NODE_NAME -hidden -remsh $NODE_NAME -boot start_clean $COOKIE_ARG $NET_TICKTIME_ARG
         ;;
 
     console)
@@ -366,6 +366,7 @@ case "$1" in
         NODE_NAME=${NAME_ARG#* }
         $ERTS_PATH/erl -noshell -noinput \
             -pa $RUNNER_PATCH_DIR \
+            -boot start_clean
             -hidden $NAME_PARAM np_etop$MYPID$NAME_HOST $COOKIE_ARG $NET_TICKTIME_ARG \
             -s etop -s erlang halt -output text \
             -node $NODE_NAME \

priv/templates/deb/Makefile.bootstrap

@@ -6,7 +6,7 @@ export
 
 bootstrap:
 	mkdir -p $(PKG_ID)/debian
-	cd $(PKG_ID)/debian && $(REBAR) -v create \
+	cd $(PKG_ID)/debian && ../$(DEPS_DIR)/node_package/rebar -v create \
                               template_dir=../$(DEPS_DIR)/node_package/priv/templates \
                               template_vars=../pkg.vars.config template=deb
 	make -C $(PKG_ID) -f debian/Makefile

priv/templates/deb/deb.template

@@ -23,7 +23,8 @@
              {platform_etc_dir,  "/etc/{{package_install_name}}"},
              {platform_base_dir, "/usr/lib/{{package_install_name}}"},
              {platform_lib_dir,  "/usr/lib/{{package_install_name}}/lib"},
-             {platform_log_dir,  "/var/log/{{package_install_name}}"}
+             {platform_log_dir,  "/var/log/{{package_install_name}}"},
+             {cuttlefish_schema_dir, "/usr/share/{{package_install_name}}/schema"} 
             ]
 }.
 {template, "Makefile", "Makefile"}.

priv/templates/deb/postrm

@@ -31,6 +31,9 @@ case "$1" in
         if [ -d /etc/{{package_install_name}} ]; then
                 rm -r /etc/{{package_install_name}}
         fi
+        if [ -d /usr/share/{{package_install_name}} ]; then
+                rm -r /usr/share/{{package_install_name}}
+        fi
         if [ -e /etc/init.d/{{package_install_name}} ]; then
                 rm  /etc/init.d/{{package_install_name}}
         fi

priv/templates/deb/rules

@@ -18,7 +18,7 @@ ROOTDIR := debian/{{package_name}}
 ## the generate command EXECUTES in rel/
 build:
 	unset CC CFLAGS CPPFLAGS LDFLAGS CXX CXXFLAGS \
-		&& OVERLAY_VARS="overlay_vars=../debian/vars.config" make rel
+		&& OVERLAY_VARS="debian/vars.config" make rel
 	touch build
 
 clean:

priv/templates/deb/vars.config

@@ -8,6 +8,7 @@
 {platform_base_dir, "{{platform_base_dir}}"}.
 {platform_lib_dir,  "{{platform_lib_dir}}"}.
 {platform_log_dir,  "{{platform_log_dir}}"}.
+{cuttlefish_schema_dir, "{{cuttlefish_schema_dir}}"}.
 
 {runner_script_dir,  "{{platform_bin_dir}}"}.
 {runner_base_dir,    "{{platform_base_dir}}"}.

priv/templates/fbsd/Makefile.bootstrap

@@ -6,7 +6,7 @@ export
 
 bootstrap:
 	mkdir -p $(PKG_ID)/fbsd
-	cd $(PKG_ID)/fbsd && $(REBAR) -v create \
+	cd $(PKG_ID)/fbsd && ../$(DEPS_DIR)/node_package/rebar -v create \
                               template_dir=../$(DEPS_DIR)/node_package/priv/templates \
                               template_vars=../pkg.vars.config template=fbsd
 	$(MAKE) -C $(PKG_ID) -f fbsd/Makefile

priv/templates/fbsd/vars.config

@@ -8,6 +8,7 @@
 {platform_base_dir, "{{platform_base_dir}}"}.
 {platform_lib_dir,  "{{platform_lib_dir}}"}.
 {platform_log_dir,  "{{platform_log_dir}}"}.
+{cuttlefish_schema_dir, "{{cuttlefish_schema_dir}}"}.
 
 %% TODO can we just get rid of these?
 {runner_script_dir,  "{{platform_bin_dir}}"}.

priv/templates/fbsdng/Makefile.bootstrap

@@ -6,7 +6,7 @@ export
 
 bootstrap:
 	mkdir -p $(PKG_ID)/fbsdng
-	cd $(PKG_ID)/fbsdng && $(REBAR) -v create \
+	cd $(PKG_ID)/fbsdng && ../$(DEPS_DIR)/node_package/rebar -v create \
                                 template_dir=../$(DEPS_DIR)/node_package/priv/templates \
                                 template_vars=../pkg.vars.config template=fbsdng
 	$(MAKE) -C $(PKG_ID) -f fbsdng/Makefile

priv/templates/fbsdng/vars.config

@@ -8,6 +8,7 @@
 {platform_base_dir, "{{platform_base_dir}}"}.
 {platform_lib_dir,  "{{platform_lib_dir}}"}.
 {platform_log_dir,  "{{platform_log_dir}}"}.
+{cuttlefish_schema_dir, "{{cuttlefish_schema_dir}}"}.
 
 %% TODO can we just get rid of these?
 {runner_script_dir,  "{{platform_bin_dir}}"}.

priv/templates/osx/Makefile.bootstrap

@@ -5,7 +5,7 @@
 export
 
 bootstrap:
-	$(REBAR) -v create \
+	$(PKG_ID)/$(DEPS_DIR)/node_package/rebar -v create \
 			template_dir=$(PKG_ID)/$(DEPS_DIR)/node_package/priv/templates \
 			template_vars=$(PKG_ID)/pkg.vars.config template=osx
 	make -f Makefile

priv/templates/rpm/Makefile.bootstrap

@@ -5,7 +5,7 @@
 export
 
 bootstrap:
-	$(REBAR) -v create \
+	$(PKG_ID)/$(DEPS_DIR)/node_package/rebar -v create \
                     template_dir=$(PKG_ID)/$(DEPS_DIR)/node_package/priv/templates \
                     template_vars=$(PKG_ID)/pkg.vars.config template=rpm
 	make -f Makefile

priv/templates/rpm/specfile

@@ -44,6 +44,7 @@ Obsoletes: {{package_name}}
 %define platform_base_dir %{_libdir}/{{package_install_name}}
 %define platform_lib_dir %{platform_base_dir}/lib
 %define platform_log_dir %{_localstatedir}/log/{{package_install_name}}
+%define cuttlefish_schema_dir %{_datarootdir}/{{package_install_name}}/schema
 
 
 %prep
@@ -58,6 +59,7 @@ cat > rpm.vars.config <<EOF
 {platform_base_dir, "%{platform_base_dir}"}.
 {platform_lib_dir,  "%{platform_lib_dir}"}.
 {platform_log_dir,  "%{platform_log_dir}"}.
+{cuttlefish_schema_dir, "%{cuttlefish_schema_dir}"}.
 
 {runner_script_dir, "%{platform_bin_dir}"}.
 {runner_base_dir,   "%{platform_base_dir}"}.
@@ -71,15 +73,17 @@ cat > rpm.vars.config <<EOF
 EOF
 
 %build
-OVERLAY_VARS="overlay_vars=../rpm.vars.config" make rel
+OVERLAY_VARS="rpm.vars.config" make rel
 
 %install
-%define relpath       %{_builddir}/%{buildsubdir}/rel/{{package_install_name}}
+%define relpath       %{_builddir}/%{buildsubdir}/_build/default/rel/{{package_install_name}}
 %define buildroot_lib %{buildroot}%{_libdir}/{{package_install_name}}
 %define buildroot_etc %{buildroot}%{_sysconfdir}/{{package_install_name}}
+%define buildroot_share %{buildroot}%{_datarootdir}/{{package_install_name}}
 
 mkdir -p %{buildroot_etc}
 mkdir -p %{buildroot_lib}
+mkdir -p %{buildroot_share}
 mkdir -p %{buildroot}%{_localstatedir}/lib/{{package_install_name}}
 mkdir -p %{buildroot}%{_localstatedir}/log/{{package_install_name}}
 mkdir -p %{buildroot}%{_localstatedir}/run/{{package_install_name}}
@@ -93,6 +97,10 @@ if [ -d %{relpath}/bin ]; then \
    find %{relpath}/bin -type f \
         -exec install -p -D -m 0755 {} %{buildroot}%{_{{bin_or_sbin}}dir}/ \; ;fi
 
+# copy the start_clean.boot
+if [ -f %{relpath}/bin/start_clean.boot ]; then \
+    cp %{relpath}/bin/start_clean.boot %{buildroot_lib}; fi
+
 # Scan for manpages that are optional for each command in the package_commands list
 # If found:
 #     * install manpages
@@ -108,6 +116,9 @@ if [ -d %{_builddir}/%{buildsubdir}/doc/man/man1 ]; then \
    {{/package_commands}}echo -n; fi
 
 cp -R %{relpath}/etc/* %{buildroot_etc}
+cp -R %{relpath}/share/* %{buildroot_share}
+
+echo "%{_datarootdir}/{{package_install_name}}/*" >> additional_files_list
 
 mkdir -p %{buildroot}%{_localstatedir}/lib/{{package_install_name}}
 cp -R %{relpath}/data/* \

priv/templates/smartos/Makefile.bootstrap

@@ -6,7 +6,7 @@ export
 
 bootstrap:
 	mkdir -p $(PKG_ID)/smartos
-	cd $(PKG_ID)/smartos && $(REBAR) -v create \
+	cd $(PKG_ID)/smartos && ../$(DEPS_DIR)/node_package/rebar -v create \
                               template_dir=../$(DEPS_DIR)/node_package/priv/templates \
                               template_vars=../pkg.vars.config template=smartos
 	$(MAKE) -C $(PKG_ID) -f smartos/Makefile

priv/templates/smartos/vars.config

@@ -8,6 +8,7 @@
 {platform_base_dir, "{{platform_base_dir}}"}.
 {platform_lib_dir,  "{{platform_lib_dir}}"}.
 {platform_log_dir,  "{{platform_log_dir}}"}.
+{cuttlefish_schema_dir, "{{cuttlefish_schema_dir}}"}.
 
 %% TODO can we just get rid of these?
 {runner_script_dir,  "{{platform_bin_dir}}"}.

priv/templates/solaris/Makefile.bootstrap

@@ -6,7 +6,7 @@ export
 
 bootstrap:
 	mkdir -p $(PKG_ID)/solaris
-	cd $(PKG_ID)/solaris && $(REBAR) -v create \
+	cd $(PKG_ID)/solaris && ../$(DEPS_DIR)/node_package/rebar -v create \
                               template_dir=../$(DEPS_DIR)/node_package/priv/templates \
                               template_vars=../pkg.vars.config template=solaris
 	$(MAKE) -C $(PKG_ID) -f solaris/Makefile