projects/doodle: builder.d annotate

annotate builder.d @ 133:9e1a313d8003

Merge

author	David Bryant <bagnose@gmail.com>
date	Thu, 02 Aug 2012 15:34:17 +0930
parents	bc5baa585b32 5920bb2ddd0f
children

rev	line source
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1 module builder;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	2
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	3 private {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	4 import std.stream;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	5 import std.stdio;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	6 import std.string;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	7 import std.process;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	8 import std.file;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	9 import std.path;
123 0d427170a805 Move to 64-bit David Bryant <bagnose@gmail.com> parents: 95 diff changeset	10 import std.datetime;
0d427170a805 Move to 64-bit David Bryant <bagnose@gmail.com> parents: 95 diff changeset	11 import std.array;
0d427170a805 Move to 64-bit David Bryant <bagnose@gmail.com> parents: 95 diff changeset	12 import core.vararg;
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	13 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	14
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	15
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	16 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	17 // builder is a build tool for D code. It is intended for use during development,
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	18 // and so supports:
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	19 // * Building only those targets that are out of date.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	20 // * Automated execution and evaluation of regression tests.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	21 // * Automatic linking of libraries that are part of the project.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	22 // * Enforcement of dependency rules (explained below).
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	23 // * Enforcement of a directory structure designed to support reusable components.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	24 // * Complete separation of source from targets (friendly on checkouts).
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	25 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	26 // To keep things simple and fast, builder won't build arbitrary code - but it will build
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	27 // code written to be built with it. Besides having to obey dependency and directory
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	28 // layout and naming rules, you have to do imports as one of:
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	29 // public import module_name;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	30 // private import module_name;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	31 // import module_name;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	32 // static import module_name;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	33 // static import module_alias = module_name;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	34 // specifically, the module-name has to be the last thing on the line.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	35 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	36 //
32 705817d8514a Pass -g flag to dmd for compiles rather than links. David Bryant <bagnose@gmail.com> parents: 30 diff changeset	37 // The directory structure employs a hierarchy of:
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	38 // * Bundle - A collection of products. Has no source code of its own, and does not appear in package paths.
30 4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	39 // Corresponds to the root of a checkout/repository. The bundle is on the source search path.
4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	40 // * Product - Top-level package, usually to provide namespace, but can also contain code
4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	41 // just like lower-level packages.
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	42 // * Package - A self-contained set of library code, executable code, docs, tests, etc.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	43 // Can contain nested packages, and can refer to other packages.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	44 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	45 // Bundles are the mechanism for reusing source code in other repositories.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	46 // We do this by lines in a bundle "uses" file that specify where to find a used bundle.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	47 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	48 // The directory structure within a bundle is:
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	49 //
30 4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	50 // +--README Introductory information
4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	51 // +--configure.d D script to set up a build directory
4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	52 // +--builder.d This file
4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	53 // +--options Compiler options
4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	54 // +--uses Specifies which other bundles to use, with paths relative to this bundle
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	55 // \|
30 4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	56 // +--package-name(s) A package, containing library source
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	57 // \|
30 4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	58 // +--doc Restructured-text documents and associated images
4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	59 // \|
4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	60 // +--data Data files required by tests and binaries
4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	61 // \|
4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	62 // +--test Code for regression tests
4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	63 // \|
4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	64 // +--prog Code for binaries
4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	65 // \|
4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	66 // +--package-name(s) Nested packages
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	67 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	68 // The resultant build directory structure is:
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	69 //
30 4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	70 // +--build Script to build the system (put there by configure)
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	71 // \|
30 4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	72 // +--obj Contains object files and libraries in package structure
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	73 // \|
30 4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	74 // +--test Contains test binaries and results in package structure
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	75 // \|
30 4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	76 // +--bin Contains the binaries built from prog directories
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	77 // \|
30 4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	78 // +--doc Contains the package html docs, in package structure
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	79 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	80 // The dependency rules are:
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	81 // * A built file depends on its sources, and anything the sources explicitly import.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	82 // * A parent depends on its children, transitively, and everything they depend on, transitively.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	83 // * Everything depends on the parents and descendants of its explicit imports,
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	84 // up to but not including the common ancestor, transitively.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	85 //
95 85589f7a3a28 Changed the builder to ignore all directories named "nobuild". David Bryant <bagnose@gmail.com> parents: 93 diff changeset	86 // Directories beginning with '.' or named "nobuild" are ignored.
85589f7a3a28 Changed the builder to ignore all directories named "nobuild". David Bryant <bagnose@gmail.com> parents: 93 diff changeset	87 //
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	88
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	89
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	90 // TODO - add doc, data
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	91 // TODO - add timeout on test execution - say 2 seconds.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	92 // TODO - add excludes files in packages to allow files and directories to be ignored.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	93
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	94
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	95 //-------------------------------------------------------------------------------
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	96 // primitives
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	97 //-------------------------------------------------------------------------------
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	98
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	99
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	100 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	101 // Some global data
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	102 //
39 b6c34f1fc7f3 Changed inout to ref for compile daveb parents: 32 diff changeset	103 abstract class Global {
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	104 static string buildPath;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	105 static string optionsPath;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	106 static string[] bundlePaths;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	107 static bool[string] products;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	108 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	109
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	110
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	111 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	112 // throw an exception
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	113 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	114 void error(string text) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	115 writefln("%s", text);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	116 throw new Exception(text);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	117 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	118
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	119
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	120 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	121 // return the modification time of the file at path
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	122 //
123 0d427170a805 Move to 64-bit David Bryant <bagnose@gmail.com> parents: 95 diff changeset	123 long modified_time(string path) {
0d427170a805 Move to 64-bit David Bryant <bagnose@gmail.com> parents: 95 diff changeset	124 SysTime fileStatusChangeTime, fileAccessTime, fileModificationTime;
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	125 if (!exists(path)) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	126 return 0;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	127 }
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	128 getTimes(path, fileAccessTime, fileModificationTime);
5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	129 return fileModificationTime.stdTime;
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	130 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	131
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	132
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	133 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	134 // A string formatter that allows progressive composition
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	135 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	136 class StringFormatter {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	137 char[] buffer;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	138 int pos;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	139
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	140 this() {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	141 buffer.length = 1024;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	142 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	143
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	144 void clear() {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	145 pos = 0;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	146 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	147
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	148 // append some formatted text to the internal buffer
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	149 void format(...) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	150 void put(dchar c) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	151 if (pos+4 >= buffer.length) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	152 buffer.length = buffer.length * 2;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	153 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	154 char[4] buf;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	155 char[] result = std.utf.toUTF8(buf, c);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	156 buffer[pos..pos+4] = buf;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	157 pos += result.length;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	158 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	159 std.format.doFormat(&put, _arguments, _argptr);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	160 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	161
93 069ceb9446ad Fixes to builder for dmd 2.0.48 and rejigged options file slightly. "David Bryant <bagnose@gmail.com>" parents: 89 diff changeset	162 // return an immutable copy of the internal buffer
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	163 string str() {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	164 return buffer[0..pos].idup;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	165 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	166 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	167
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	168 //---------------------------------------------------------
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	169 // parser
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	170 //---------------------------------------------------------
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	171
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	172 // FIXME - put in a proper parser that understands about version syntax and all the rest.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	173
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	174 ///
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	175 /// Parse file for import statements, returning an array of module names
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	176 ///
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	177 string[] parseImports(string path) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	178
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	179 string[] result;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	180
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	181 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	182 // If this is an import declaration line, return the imported module, else null
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	183 // This isn't perfect by any means (but it is simple and fast), but here we go:
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	184 // * Strip whitespace from front.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	185 // * If first word is private, public, static or import, and
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	186 // * If we have import already or there is another import later in the line, then
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	187 // * The last word on the line is a module.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	188 // A less-than-perfect parser is ok because it only has to work for code
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	189 // within the project, so we can write code that it works for.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	190 //
93 069ceb9446ad Fixes to builder for dmd 2.0.48 and rejigged options file slightly. "David Bryant <bagnose@gmail.com>" parents: 89 diff changeset	191 void parseForImport(char[] line) {
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	192 static string[] leaders = ["private ", "public ", "static ", "import "];
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	193 bool found;
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	194 auto stripped = stripLeft(line);
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	195 if (stripped.length > 8) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	196 foreach (i, leader ; leaders) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	197 if (stripped[0..leader.length] == leader) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	198 // this is a possibility - look for import token
93 069ceb9446ad Fixes to builder for dmd 2.0.48 and rejigged options file slightly. "David Bryant <bagnose@gmail.com>" parents: 89 diff changeset	199 scope char[][] tokens = split(stripped);
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	200 if (tokens.length > 1) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	201 if (i == 3) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	202 found = true;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	203 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	204 else {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	205 foreach (token; tokens[0..$-1]) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	206 if (token == "import") {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	207 found = true;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	208 break;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	209 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	210 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	211 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	212 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	213
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	214 if (found) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	215 //writefln("found import of %s", tokens[$-1][0..$-1]);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	216 result ~= tokens[$-1][0..$-1].idup;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	217 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	218
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	219 break;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	220 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	221 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	222 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	223 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	224
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	225 scope file = new BufferedFile(path);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	226 foreach (char[] line; file) {
93 069ceb9446ad Fixes to builder for dmd 2.0.48 and rejigged options file slightly. "David Bryant <bagnose@gmail.com>" parents: 89 diff changeset	227 parseForImport(line);
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	228 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	229 //writefln("imports of %s are %s", file, result);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	230 return result;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	231 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	232
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	233
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	234 //------------------------------------------------------------------------------
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	235 // Dependency graph
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	236 //------------------------------------------------------------------------------
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	237
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	238 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	239 // An item that may depend on things and be depended on in turn
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	240 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	241 abstract class Item {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	242 static Item[string] mItems; // items by path so parent-path items can be found
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	243
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	244 string mKind; // for logging
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	245 string mPath; // identifies the item
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	246 long mTime; // modification time, 0 ==> doesn't exist, -1 ==> don't care
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	247 Item[string] mDepends; // items this one depends on
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	248
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	249 bool mChecking;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	250 bool mChecked;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	251 bool mDirty;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	252
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	253 this(string kind, string path) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	254 //writefln("creating %s-item at %s", kind, path);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	255 mKind = kind;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	256 mPath = path;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	257 mTime = modified_time(path);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	258 mItems[path] = this;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	259 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	260
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	261 // add a dependency to this item
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	262 final void addDepends(Item item) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	263 if (!(item.mPath in mDepends)) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	264 //writefln("%s depends on %s", this.mPath, item.mPath);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	265 mDepends[item.mPath] = item;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	266 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	267 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	268
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	269 // Find out if this item is dirty (needs to be built), returning true if dirty.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	270 final bool dirty() {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	271 if (mChecking) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	272 error(format("circularity: %s depends on itself", mPath));
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	273 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	274 if (!mChecked) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	275 mChecking = true;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	276 if (mTime == 0) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	277 //writefln("%s is dirty because it doesn't exist", basename(mPath));
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	278 mDirty = true;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	279 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	280 foreach (other; mDepends) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	281 if (mDirty) break;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	282 if (other.dirty) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	283 //writefln("%s is dirty because %s is dirty", basename(mPath), basename(other.mPath));
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	284 mDirty = true;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	285 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	286 else if (mTime != -1 && other.mTime != -1 && other.mTime > mTime) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	287 //writefln("%s is dirty because %s is younger", basename(mPath), basename(other.mPath));
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	288 //writefln(" other=%s, mine=%s", other.mTime, mTime);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	289 mDirty = true;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	290 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	291 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	292 mChecking = false;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	293 mChecked = true;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	294 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	295 return mDirty;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	296 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	297
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	298 // build just this item
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	299 protected abstract void build();
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	300
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	301 // build this item and everything it depends on
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	302 final void buildChain() {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	303 if (dirty) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	304 foreach (other; mDepends) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	305 other.buildChain;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	306 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	307 build;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	308 if (mTime != -1) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	309 mTime = modified_time(mPath);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	310 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	311 mDirty = false;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	312 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	313 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	314
43 d0604b062db8 Get rid of warnings in builder daveb parents: 42 diff changeset	315 override string toString() {
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	316 return mKind ~ "-item-" ~ mPath;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	317 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	318 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	319
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	320
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	321 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	322 // A directory
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	323 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	324 class DirectoryItem : Item {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	325
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	326 this(string path) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	327 super("directory", path);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	328 mTime = mPath.exists ? 1 : 0;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	329
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	330 // this directory depends on its parent directory chain
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	331 string parent_path = path.dirName;
93 069ceb9446ad Fixes to builder for dmd 2.0.48 and rejigged options file slightly. "David Bryant <bagnose@gmail.com>" parents: 89 diff changeset	332 if (parent_path.length > 0 && parent_path[0] != '.' && parent_path != "/") {
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	333 Item* parent = parent_path in mItems;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	334 if (parent) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	335 assert(cast(DirectoryItem *)parent);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	336 addDepends(*parent);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	337 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	338 else {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	339 // recursively create chain of directories above this,
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	340 // and depend on it.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	341 addDepends(new DirectoryItem(parent_path));
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	342 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	343 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	344 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	345
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	346 // build this directory
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	347 override void build() {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	348 writefln("Directory %s", mPath);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	349 mkdir(mPath);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	350 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	351 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	352
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	353
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	354 ///
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	355 /// A group Item - used to help manage build order via dependencies
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	356 /// All FileItems are members of exactly one group, and they all depend on
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	357 /// all the groups their owning group depends on.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	358 ///
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	359 class GroupItem : Item {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	360
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	361 static GroupItem[string] mGroups; // all groups
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	362
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	363 Item[] mMembers;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	364
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	365 this(string path) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	366 super("group", path);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	367 mTime = -1;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	368 mGroups[mPath] = this;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	369 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	370
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	371 void addMember(Item member) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	372 addDepends(member);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	373 mMembers ~= member;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	374 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	375
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	376 // add dependencies on other group and its ancestors
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	377 // Only called AFTER all items have been greated and assigned their group.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	378 void dependsOnGroup(GroupItem other) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	379 if (other !is this) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	380
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	381 // this group and everything in it (other than source) depends on other group
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	382 addDepends(other);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	383 foreach (member; mMembers) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	384 if (!cast(SourceItem) member) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	385 member.addDepends(other);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	386 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	387 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	388
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	389 // and all other group's higher-level groups until common ancestor
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	390 string other_parent_path = other.mPath.dirName;
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	391 if (other_parent_path != "." &&
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	392 other_parent_path.length < mPath.length &&
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	393 mPath[0..other_parent_path.length] != other_parent_path)
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	394 {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	395 GroupItem* other_parent = other_parent_path in mGroups;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	396 if (other_parent) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	397 dependsOnGroup(*other_parent);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	398 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	399 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	400 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	401 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	402
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	403 // build just this item
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	404 override void build() {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	405 // nothing to do
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	406 writefln("Group %s", mPath);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	407 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	408 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	409
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	410
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	411 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	412 // a physical file in the filesystem
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	413 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	414 abstract class FileItem : Item {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	415 GroupItem mGroup;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	416
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	417 this(string kind, string path, GroupItem group) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	418 super(kind, path);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	419 mGroup = group;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	420 group.addMember(this);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	421
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	422 // this file depends on on its parent directory
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	423 string parent_path = path.dirName;
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	424 Item* parent = parent_path in mItems;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	425 if (parent) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	426 assert(cast(DirectoryItem *)parent);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	427 addDepends(*parent);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	428 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	429 else {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	430 addDepends(new DirectoryItem(parent_path));
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	431 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	432 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	433 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	434
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	435
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	436 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	437 // A source file - must exist
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	438 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	439 class SourceItem : FileItem {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	440
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	441 SourceItem[string] mImports; // the source items this one imports
30 4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	442 ObjectItem mObject; // the object item to be built from this source
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	443
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	444 this(string path, GroupItem group) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	445 super("source", path, group);
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	446 if (!isFile(path)) error(format("source file %s not found", path));
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	447 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	448
30 4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	449 // set the object item
4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	450 void set_object(ObjectItem obj) {
4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	451 mObject = obj;
4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	452 }
4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	453
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	454 // Add an import to this source item.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	455 // These are used later to determine all the non-structural item dependencies.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	456 void addImport(SourceItem source) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	457 if (!(source.mPath in mImports)) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	458 //writefln("%s imports %s", mPath, source.mPath);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	459 mImports[source.mPath] = source;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	460 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	461 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	462
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	463 override void build() {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	464 // nothing to do, and should never be dirty
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	465 writefln("Source %s", mPath);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	466 error("should never need to build Source");
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	467 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	468 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	469
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	470
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	471 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	472 // An object file
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	473 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	474 class ObjectItem : FileItem {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	475 SourceItem mSource;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	476
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	477 this(string path, SourceItem source, GroupItem group) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	478 super("object", path, group);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	479 addDepends(source);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	480 mSource = source;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	481 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	482
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	483 // Use our source's imports to add non-structural dependencies.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	484 // The rules are:
30 4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	485 // * We depend on any sources our source imports, and their objects, transitively.
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	486 // * Our group depends on the imported source's group, and any of its
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	487 // ancestral groups that aren't our ancestors.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	488 // * We must not trace a chain of imports back to our source.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	489 void resolveImports() {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	490
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	491 void dependsOnImportsOf(SourceItem source) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	492 foreach (s; source.mImports) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	493 if (s is mSource) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	494 error(format("circular chain of imports - last link from %s to %s",
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	495 source.toString, s.toString));
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	496 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	497 if (s.mGroup !is mGroup) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	498 addDepends(s.mGroup);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	499 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	500 addDepends(s);
30 4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	501 addDepends(s.mObject);
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	502 dependsOnImportsOf(s);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	503 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	504 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	505
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	506 dependsOnImportsOf(mSource);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	507
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	508 foreach (s; mSource.mImports) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	509 mGroup.dependsOnGroup(s.mGroup);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	510 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	511 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	512
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	513 // an object file is built from its source
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	514 override void build() {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	515 writefln("Object %s", mPath);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	516 scope cmd = new StringFormatter;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	517
132 bc5baa585b32 Updated to dmd 2.060 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	518 cmd.format("dmd -m64 -c");
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	519 foreach (path; Global.bundlePaths) {
93 069ceb9446ad Fixes to builder for dmd 2.0.48 and rejigged options file slightly. "David Bryant <bagnose@gmail.com>" parents: 89 diff changeset	520 cmd.format(" -I%s", path);
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	521 }
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	522 cmd.format(" -od%s %s", dirName(mPath), mSource.mPath);
29 960b408d3ac5 Builds and runs ok with builder now. Graham St Jack <graham.stjack@internode.on.net> parents: 28 diff changeset	523 cmd.format(" @%s", Global.optionsPath);
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	524
132 bc5baa585b32 Updated to dmd 2.060 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	525 //writefln("cmd: %s", cmd.str);
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	526 if (std.process.system(cmd.str)) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	527 writefln("%s", cmd.str);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	528 error(format("build of %s failed", mPath));
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	529 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	530 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	531 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	532
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	533
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	534 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	535 // A library
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	536 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	537 class LibraryItem : FileItem {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	538 string mName;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	539
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	540 this(string path, string name, GroupItem group) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	541 super("library", path, group);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	542 mName = name;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	543 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	544
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	545 // a library is built by archiving all of its contributing ObjectFiles
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	546 override void build() {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	547 writefln("Library %s", mPath);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	548 scope cmd = new StringFormatter;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	549 cmd.format("ar csr %s ", mPath);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	550 foreach (item; mDepends) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	551 auto obj = cast(ObjectItem) item;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	552 if (obj) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	553 cmd.format(" %s", obj.mPath);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	554 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	555 }
132 bc5baa585b32 Updated to dmd 2.060 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	556 //writefln("cmd: %s", cmd.str);
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	557 if (std.process.system(cmd.str)) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	558 writefln("%s", cmd.str);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	559 error("command failed");
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	560 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	561 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	562
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	563 // Add this library and any it depends on to libs, if they aren't there already.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	564 // NOTE - they are added with libraries appearing after those they depend on
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	565 // (reverse of compiler command-line).
39 b6c34f1fc7f3 Changed inout to ref for compile daveb parents: 32 diff changeset	566 void addNeeded(ref LibraryItem[] libs) {
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	567
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	568 void add(LibraryItem lib) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	569 foreach (item; libs) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	570 if (lib is item) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	571 return;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	572 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	573 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	574 libs ~= lib;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	575 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	576
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	577 foreach (item; mDepends) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	578 auto lib = cast(LibraryItem) item;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	579 if (lib) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	580 lib.addNeeded(libs);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	581 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	582 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	583 add(this);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	584 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	585 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	586
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	587
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	588 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	589 // A program
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	590 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	591 class ProgramItem : FileItem {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	592 ObjectItem mObject;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	593
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	594 this(string path, ObjectItem object, GroupItem group) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	595 super("program", path, group);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	596 mObject = object;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	597 addDepends(object);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	598 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	599
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	600 // a program file is built from its object and all the libraries
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	601 // the object needs, transitively
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	602 override void build() {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	603 writefln("Program %s", mPath);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	604 scope cmd = new StringFormatter();
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	605
132 bc5baa585b32 Updated to dmd 2.060 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	606 cmd.format("dmd -m64 -L-L%s", buildPath(Global.buildPath, "lib"));
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	607 cmd.format(" -of%s %s", mPath, mObject.mPath);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	608
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	609 // add the libraries we need
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	610 LibraryItem[] libs;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	611 foreach (item; mDepends) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	612 auto lib = cast(LibraryItem) item;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	613 if (lib) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	614 lib.addNeeded(libs);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	615 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	616 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	617 foreach_reverse (lib; libs) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	618 cmd.format(" -L-l%s", lib.mName);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	619 }
29 960b408d3ac5 Builds and runs ok with builder now. Graham St Jack <graham.stjack@internode.on.net> parents: 28 diff changeset	620 cmd.format(" @%s", Global.optionsPath);
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	621
132 bc5baa585b32 Updated to dmd 2.060 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	622 //writefln("cmd: %s", cmd.str);
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	623 if (std.process.system(cmd.str)) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	624 writefln("%s", cmd.str);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	625 error("command failed");
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	626 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	627 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	628 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	629
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	630
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	631 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	632 // A test result - run the program to generate the result file
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	633 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	634 class ResultItem : FileItem {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	635 ProgramItem mProgram;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	636
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	637 this(string path, ProgramItem program, GroupItem group) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	638 super("result", path, group);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	639 mProgram = program;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	640 addDepends(program);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	641 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	642
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	643 override void build() {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	644 writef("Test %s", mPath);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	645 if (exists(mPath)) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	646 mPath.remove();
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	647 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	648 scope cmd = new StringFormatter();
93 069ceb9446ad Fixes to builder for dmd 2.0.48 and rejigged options file slightly. "David Bryant <bagnose@gmail.com>" parents: 89 diff changeset	649 scope tmpPath = mPath ~ ".failed";
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	650 cmd.format("%s > %s 2>&1", mProgram.mPath, tmpPath);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	651
132 bc5baa585b32 Updated to dmd 2.060 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	652 //writefln("cmd: %s", cmd.str);
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	653 if (std.process.system(cmd.str)) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	654 // failed
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	655 writefln(" failed");
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	656 writefln("%s", cmd.str);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	657 error("test failed");
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	658 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	659 else {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	660 tmpPath.rename(mPath);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	661 writefln(" passed");
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	662 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	663 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	664 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	665
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	666
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	667
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	668
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	669 //-------------------------------------------------------------------------------
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	670 // Tree of modules, packages, products and system, etc - things in the source tree.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	671 // When a node explicity depends on another, it (and its parent up to the common ancestor)
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	672 // implicity depend on that node and its ancestors and descendants, and everything they depend on.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	673 // Circularities are not allowed.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	674 //-------------------------------------------------------------------------------
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	675
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	676 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	677 // a node in a tree. It depends on explicit mDepends, plus any children, and
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	678 // anything any of those depend on. The dependencies are tracked to enforce
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	679 // dependency rules. Actual build-order dependencies are done with Items.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	680 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	681 class Node {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	682 string mName;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	683 Node mParent;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	684 Node[] mChildren;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	685 string mSlashName;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	686 string mDotName;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	687
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	688 Node[] mDepends;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	689
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	690 // create the root of the tree
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	691 this() {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	692 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	693
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	694 // create a node in the tree
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	695 this(string name, Node parent) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	696 assert(parent);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	697 mName = name;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	698 mParent = parent;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	699 if (parent.mName.length) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	700 // child of non-root
132 bc5baa585b32 Updated to dmd 2.060 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	701 mSlashName = parent.mSlashName ~ "/" ~ mName;
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	702 mDotName = parent.mDotName ~ "." ~ mName;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	703 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	704 else {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	705 // child of the root
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	706 mSlashName = mName;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	707 mDotName = mName;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	708 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	709 parent.mChildren ~= this;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	710 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	711
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	712 // return a node with the given name-chain, or null if not found.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	713 // The root node is not considered part of the chain
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	714 final Node find(string[] chain) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	715
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	716 // return child of node as specified by chain, or null if not found
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	717 Node locate(Node node, string[] chain) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	718 foreach (child; node.mChildren) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	719 if (child.mName == chain[0]) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	720 if (chain.length > 1) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	721 return locate(child, chain[1..$]);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	722 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	723 else {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	724 return child;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	725 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	726 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	727 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	728 return null;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	729 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	730
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	731 // ascend to root and recursively descend to specified node
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	732 assert(chain.length > 0);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	733 Node node = this;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	734 while (node.mParent) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	735 node = node.mParent;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	736 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	737 return locate(node, chain);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	738 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	739 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	740
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	741
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	742 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	743 // A source-code module
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	744 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	745 class Module : Node {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	746 SourceItem mSource;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	747 ObjectItem mObject;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	748 FileItem mClump; // library or program item this module contributes to
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	749
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	750 this(string name, string path, Node parent, GroupItem group) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	751 super(name, parent);
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	752 string obj_path = buildPath(Global.buildPath, "obj", mSlashName ~ ".o");
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	753 mSource = new SourceItem(path, group);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	754 mObject = new ObjectItem(obj_path, mSource, group);
30 4a688da41f1a Minor improvement to builder Graham St Jack <graham.stjack@internode.on.net> parents: 29 diff changeset	755 mSource.set_object(mObject);
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	756 //writefln("loaded Module %s from %s", mDotName, mSource.mPath);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	757 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	758
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	759 void setClump(FileItem clump) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	760 assert(!mClump);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	761 mClump = clump;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	762 mClump.addDepends(mObject);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	763 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	764
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	765 // trace direct imports
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	766 final void trace() {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	767
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	768 // add an import dependancy (if it is inside our project)
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	769 void imports(string importing) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	770 string[] chain = split(importing, ".");
93 069ceb9446ad Fixes to builder for dmd 2.0.48 and rejigged options file slightly. "David Bryant <bagnose@gmail.com>" parents: 89 diff changeset	771 assert(chain.length > 0, format("source '%s' importing: '%s'", mSource, importing));
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	772
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	773 // only depend on internal products
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	774 if (!(chain[0] in Global.products)) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	775 return;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	776 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	777
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	778 // find the imported Module's source item and add it to our source item's imports
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	779 Module other = cast(Module) find(chain);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	780 if (!other \|\| !other.mClump) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	781 writefln("import of unknown module " ~ importing ~ " from " ~ mDotName);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	782 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	783 else if (cast(LibraryItem)other.mClump) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	784 // the other's mClump is a library
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	785
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	786 // our source imports other's source - only allowed for library source
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	787 mSource.addImport(other.mSource);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	788
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	789 if (mClump.mPath != other.mClump.mPath) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	790 // this module's clump depends on other's library (needed for linking)
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	791 mClump.addDepends(other.mClump);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	792 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	793 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	794 else {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	795 error(format("import of non-library module %s from %s",
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	796 importing, mDotName));
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	797 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	798 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	799
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	800 assert(mClump);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	801 foreach (importing; parseImports(mSource.mPath)) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	802 //writefln("%s imports module %s", mDotName, importing);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	803 imports(importing);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	804 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	805 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	806 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	807
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	808
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	809 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	810 // An executable program.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	811 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	812 class Exe : Module {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	813 ProgramItem mProgram;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	814 ResultItem mResult;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	815
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	816 this(string name, string path, Node parent, bool test, GroupItem group) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	817 super(name, path, parent, group);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	818 if (test) {
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	819 mProgram = new ProgramItem(buildPath(Global.buildPath, "test", mSlashName), mObject, group);
5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	820 mResult = new ResultItem(buildPath(Global.buildPath, "test", mSlashName ~ ".result"), mProgram, group);
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	821 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	822 else {
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	823 mProgram = new ProgramItem(buildPath(Global.buildPath, "bin", mName), mObject, group);
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	824 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	825 setClump(mProgram);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	826 //writefln("loaded Program %s", mProgram.mPath);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	827 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	828 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	829
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	830
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	831 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	832 // a package
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	833 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	834 class Package : Node {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	835 LibraryItem mLibrary;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	836 GroupItem mGroup; // represents the package
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	837
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	838 // load the package
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	839 this(string name, string path, Node parent) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	840 super(name, parent);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	841 mGroup = new GroupItem(mSlashName);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	842
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	843 string lib_name = replace(mDotName, ".", "_");
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	844
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	845 // examine all the children of the package's directory
132 bc5baa585b32 Updated to dmd 2.060 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	846 foreach (string child; dirEntries(path, SpanMode.shallow)) {
bc5baa585b32 Updated to dmd 2.060 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	847 child = baseName(child);
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	848 string p = buildPath(path, child);
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	849 if (child[0] != '.') {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	850
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	851 if (isFile(p)) {
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	852
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	853 if (child.length > 2 && child[$-2..$] == ".d") {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	854 // a library module
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	855 if (!mLibrary) {
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	856 mLibrary = new LibraryItem(buildPath(Global.buildPath, "lib", "lib" ~ lib_name ~ ".a"),
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	857 lib_name, mGroup);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	858 }
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	859 Module m = new Module(stripExtension(child), p, this, mGroup);
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	860 m.setClump(mLibrary);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	861 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	862 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	863
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	864 else if (isDir(p)) {
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	865
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	866 if (child == "build-tool") {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	867 // reserved for build-tool
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	868 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	869 else if (child == "doc") {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	870 // TODO
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	871 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	872 else if (child == "data") {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	873 // TODO
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	874 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	875 else if (child == "test") {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	876 // test programs
132 bc5baa585b32 Updated to dmd 2.060 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	877 foreach (string grandchild; dirEntries(p, SpanMode.shallow)) {
bc5baa585b32 Updated to dmd 2.060 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	878 grandchild = baseName(grandchild);
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	879 string p2 = buildPath(p, grandchild);
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	880 if (grandchild[0] != '.' &&
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	881 isFile(p2) &&
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	882 grandchild.length > 2 &&
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	883 grandchild[$-2..$] == ".d")
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	884 {
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	885 Exe exe = new Exe(stripExtension(grandchild), p2, this, true, mGroup);
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	886 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	887 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	888 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	889 else if (child == "prog") {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	890 // deliverable programs
132 bc5baa585b32 Updated to dmd 2.060 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	891 foreach (string grandchild; dirEntries(p, SpanMode.shallow)) {
bc5baa585b32 Updated to dmd 2.060 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	892 grandchild = baseName(grandchild);
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	893 string p2 = buildPath(p, grandchild);
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	894 if (child[0] != '.' &&
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	895 isFile(p2) &&
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	896 grandchild.length > 2 &&
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	897 grandchild[$-2..$] == ".d")
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	898 {
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	899 Exe exe = new Exe(stripExtension(grandchild), p2, this, false, mGroup);
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	900 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	901 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	902 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	903 else {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	904 // a child package
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	905 Package pkg = new Package(child, p, this);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	906 mGroup.addDepends(pkg.mGroup);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	907 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	908 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	909 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	910 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	911 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	912
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	913 // trace dependancies
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	914 void trace() {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	915 foreach (child; mChildren) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	916 Package pkg = cast(Package) child;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	917 Module m = cast(Module) child;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	918 if (pkg) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	919 pkg.trace();
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	920 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	921 else if (m) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	922 m.trace();
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	923 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	924 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	925 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	926 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	927
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	928
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	929 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	930 // A Product - a top-level package
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	931 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	932 class Product : Package {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	933 string mPath;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	934
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	935 this(string name, string path, Node parent) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	936 writefln("loading Product %s from %s", name, path);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	937 mPath = path;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	938 super(name, path, parent);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	939 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	940 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	941
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	942
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	943 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	944 // the whole project
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	945 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	946 class Project : Node {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	947
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	948 // create the project, loading its bundle and those it uses
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	949 this(string path) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	950 super();
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	951 load(path);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	952 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	953
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	954 // load the bundle at path
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	955 void load(string path) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	956 //writefln("loading bundle from %s", path);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	957
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	958 // add path to Global for use when compiling
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	959 Global.bundlePaths ~= path;
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	960 Global.optionsPath = buildPath(path, "options");
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	961
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	962 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	963 // load bundles specified in the uses file - lines are bundle paths relative to path
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	964 //
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	965 string uses_path = buildPath(path, "uses");
5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	966 if (exists(uses_path) && isFile(uses_path)) {
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	967 //writefln("reading uses file: %s", uses_path);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	968 scope file = new BufferedFile(uses_path);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	969 foreach (char[] line; file) {
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	970 load(buildPath(path, line.idup));
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	971 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	972 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	973
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	974 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	975 // load local products
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	976 //
132 bc5baa585b32 Updated to dmd 2.060 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	977 foreach (string name; dirEntries(path, SpanMode.shallow)) {
bc5baa585b32 Updated to dmd 2.060 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	978 name = baseName(name);
95 85589f7a3a28 Changed the builder to ignore all directories named "nobuild". David Bryant <bagnose@gmail.com> parents: 93 diff changeset	979 if (name[0] != '.' && name != "nobuild") {
131 5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	980 string p = buildPath(path, name);
5920bb2ddd0f Update configure/builder to dmd-2.059 David Bryant <bagnose@gmail.com> parents: 127 diff changeset	981 if (isDir(p)) {
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	982 foreach (node; mChildren) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	983 Product existing = cast(Product)node;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	984 if (existing && existing.mName == name) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	985 error(format("product %s has two paths: %s and %s",
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	986 name, p, existing.mPath));
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	987 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	988 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	989 new Product(name, p, this);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	990 Global.products[name] = true;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	991 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	992 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	993 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	994
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	995
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	996 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	997 // trace imports, then finish the Item dependency graph
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	998 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	999 foreach (child; mChildren) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1000 Product product = cast(Product) child;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1001 if (product) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1002 product.trace();
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1003 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1004 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1005 foreach (item; Item.mItems) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1006 ObjectItem obj = cast(ObjectItem) item;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1007 if (obj) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1008 obj.resolveImports;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1009 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1010 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1011
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1012 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1013 // print a dependency graph
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1014 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1015 foreach (group; GroupItem.mGroups) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1016 // TODO
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1017 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1018
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1019 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1020 // Build everything that is out of date
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1021 //
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1022 foreach (group; GroupItem.mGroups) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1023 group.buildChain;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1024 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1025 writefln("all done");
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1026 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1027 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1028
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1029
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1030 //--------------------------------------------------------------------------------------
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1031 // main - args[1] is where the project source is, and args[2] is where the build happens
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1032 // All the paths are set to absolute so that the source files
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1033 // can be found by an editor or debugger, wherever its current directory is.
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1034 //--------------------------------------------------------------------------------------
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1035 int main(string[] args) {
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1036 int usage() {
83 06b4504cbcb0 Checkpoint of trying to get a different renderer going (OpenGL) daveb parents: 45 diff changeset	1037 writeln("Usage: builder <project-path> <build-path>");
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1038 return -1;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1039 }
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1040
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1041 if (args.length < 3) return usage;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1042
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1043 string sourcePath = args[1];
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1044 Global.buildPath = args[2];
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1045
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1046 writefln("building source at %s into %s", sourcePath, Global.buildPath);
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1047
83 06b4504cbcb0 Checkpoint of trying to get a different renderer going (OpenGL) daveb parents: 45 diff changeset	1048 try {
06b4504cbcb0 Checkpoint of trying to get a different renderer going (OpenGL) daveb parents: 45 diff changeset	1049 // do the work
06b4504cbcb0 Checkpoint of trying to get a different renderer going (OpenGL) daveb parents: 45 diff changeset	1050 scope project = new Project(sourcePath);
06b4504cbcb0 Checkpoint of trying to get a different renderer going (OpenGL) daveb parents: 45 diff changeset	1051 }
06b4504cbcb0 Checkpoint of trying to get a different renderer going (OpenGL) daveb parents: 45 diff changeset	1052 catch (Exception e) {
93 069ceb9446ad Fixes to builder for dmd 2.0.48 and rejigged options file slightly. "David Bryant <bagnose@gmail.com>" parents: 89 diff changeset	1053 writeln("Error, bailing out.");
83 06b4504cbcb0 Checkpoint of trying to get a different renderer going (OpenGL) daveb parents: 45 diff changeset	1054 return 1;
06b4504cbcb0 Checkpoint of trying to get a different renderer going (OpenGL) daveb parents: 45 diff changeset	1055 }
28 1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1056
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1057 return 0;
1754cb773d41 Part-way through getting to compile with configure/builder. Graham St Jack <graham.stjack@internode.on.net> parents: diff changeset	1058 }

Mercurial > projects > doodle

annotate builder.d @ 133:9e1a313d8003