New upstream version 0.30.1upstream/0.30.1

5 files changed, 87 insertions, 33 deletions

diff --git a/src/unit/Unit.c b/src/unit/Unit.c
deleted file mode 100644
index 263bdf9..0000000
--- a/src/unit/Unit.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Unit.c generated by valac 0.40.4, the Vala compiler
- * generated from Unit.vala, do not modify */
-
-/* Copyright 2016 Software Freedom Conservancy Inc.
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-
-#include <glib.h>
-#include <glib-object.h>
-
-
-
-
-void unit_init (GError** error);
-void unit_terminate (void);
-
-
-void
-unit_init (GError** error)
-{
-}
-
-
-void
-unit_terminate (void)
-{
-}
-
-
-
diff --git a/src/unit/rc/Unit.m4 b/src/unit/rc/Unit.m4
new file mode 100644
index 0000000..2665dd6
--- /dev/null
+++ b/src/unit/rc/Unit.m4
@@ -0,0 +1,29 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ */
+
+/* This file is the master unit file for the _UNIT_NAME_ unit.  It should be edited to include
+ * whatever code is deemed necessary.
+ *
+ * The init() and terminate() methods are mandatory.
+ *
+ * If the unit needs to be configured prior to initialization, add the proper parameters to
+ * the preconfigure() method, implement it, and ensure in init() that it's been called.
+ */
+
+namespace _UNIT_NAME_ {
+
+// preconfigure may be deleted if not used.
+public void preconfigure() {
+}
+
+public void init() throws Error {
+}
+
+public void terminate() {
+}
+
+}
+
diff --git a/src/unit/rc/UnitInternals.m4 b/src/unit/rc/UnitInternals.m4
new file mode 100644
index 0000000..71614d4
--- /dev/null
+++ b/src/unit/rc/UnitInternals.m4
@@ -0,0 +1,32 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace _UNIT_NAME_ {
+
+private int _unit_init_count = 0;
+
+public void init_entry() throws Error {
+    if (_unit_init_count++ != 0)
+        return;
+    
+    _UNIT_USES_INITS_
+    
+    _UNIT_NAME_.init();
+}
+
+public void terminate_entry() {
+    if (_unit_init_count == 0 || --_unit_init_count != 0)
+        return;
+    
+    _UNIT_NAME_.terminate();
+    
+    _UNIT_USES_TERMINATORS_
+}
+
+}
+
diff --git a/src/unit/rc/template.vala b/src/unit/rc/template.vala
new file mode 100644
index 0000000..31fc93d
--- /dev/null
+++ b/src/unit/rc/template.vala
@@ -0,0 +1,7 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ */
+
+
diff --git a/src/unit/rc/unitize_entry.m4 b/src/unit/rc/unitize_entry.m4
new file mode 100644
index 0000000..31602b2
--- /dev/null
+++ b/src/unit/rc/unitize_entry.m4
@@ -0,0 +1,19 @@
+/* Copyright 2016 Software Freedom Conservancy Inc.
+ *
+ * This software is licensed under the GNU Lesser General Public License
+ * (version 2.1 or later).  See the COPYING file in this distribution.
+ *
+ * Auto-generated file.  Do not modify!
+ */
+
+namespace _APP_UNIT_ {
+
+public void app_init() throws Error {
+    _APP_UNIT_.init_entry();
+}
+
+public void app_terminate() {
+    _APP_UNIT_.terminate_entry();
+}
+
+}