Changeset 756

Timestamp:

08/12/07 03:08:31 (1 year ago)

Author:

Gregor

Message:

sss/conf.d: Added 'error' and 'warn' hook commands (see ticket #103).

docs/README.software_engineers: Updated to match.

Files:

• trunk/docs/ChangeLog (modified) (1 diff)
• trunk/docs/README.software_engineers (modified) (2 diffs)
• trunk/sss/conf.d (modified) (2 diffs)

trunk/docs/ChangeLog

@@ -1 +1 @@
-SVN from 0.70:
-        - Fixed 'set' and 'add' commands (see ticket #102).
+        - Added 'error' and 'warn' hook commands (see ticket #103).
-
-0.70 from 0.69:

trunk/docs/README.software_engineers

@@ -245 +245 @@
-There are also a number of special, builtin commands available.
-
+= warn and error =
+
+A warning or error condition can be specified by the hook commands 'warn' and
+'error'.
+
+An example of 'error':
+version (!Posix) {
+    prebuild=error Only POSIX is supported.
+}
+
+An example of 'warn':
+version (Posix) {
+    prebuild=warn POSIX support is untested.
+}
+
+When an error hook command is run, building of course halts.
+
-= install =
-
@@ -345 +362 @@
-These are included at the top of the dsss.conf file. Common settings are 'name'
-(the name of the software package) and 'version'.
+
+There is also a global setting available to specify which sections should be
+built normally, 'defaulttargets'. Without it, all sections will be built by
+default. The section list is simply separated by spaces:
+defaulttargets=xlib xbin
-
-It is also possible to specify global settings later in the dsss.conf file by

trunk/sss/conf.d

@@ -625 +625 @@
-                
-        } else if (tokens.length == 3 &&
-                   tokens[1] == ":") {
-            // a command
-            if (tokens[0] == "warn") {
-                // a warning
-                writefln("WARNING: %s", tokens[2]);
-            } else if (tokens[0] == "error") {
-                // an error
-                writefln("ERROR: %s", tokens[2]);
-            }
-            
-        } else if (tokens.length == 3 &&
-                   tokens[1] == "=") {
-            // a setting
@@ -863 +852 @@
-            // if it's a .d file, -exec it
-            saySystemDie(dsss_build ~ "-full -exec " ~ cmd);
+
+        } else if (cmd.length > 5 &&
+                   cmd[0..5] == "warn ") {
+            writefln("WARNING: %s", cmd[5..$]);
+
+        } else if (cmd.length > 6 &&
+                   cmd[0..6] == "error ") {
+            writefln("ERROR: %s", cmd[6..$]);
+            exit(1);
-            
-        } else if (cmd.length > 8 &&