Skip to content

Implement -rb switch for recursive build and -rx switch for exclusion lists. #1861

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ghost wants to merge 1 commit into from
Closed

Implement -rb switch for recursive build and -rx switch for exclusion lists. #1861

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ini/freebsd/bin32/dmd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[Environment32]
DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib32 -L--export-dynamic
DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib32 -L--export-dynamic -rx=object -rx=std.* -rx=core.* -rx=etc.*

[Environment64]
DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib64 -L--export-dynamic
DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib64 -L--export-dynamic -rx=object -rx=std.* -rx=core.* -rx=etc.*
4 changes: 2 additions & 2 deletions ini/freebsd/bin64/dmd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[Environment32]
DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib32 -L--export-dynamic
DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib32 -L--export-dynamic -rx=object -rx=std.* -rx=core.* -rx=etc.*

[Environment64]
DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib64 -L--export-dynamic
DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib64 -L--export-dynamic -rx=object -rx=std.* -rx=core.* -rx=etc.*
4 changes: 2 additions & 2 deletions ini/linux/bin32/dmd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[Environment32]
DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib32 -L--export-dynamic
DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib32 -L--export-dynamic -rx=object -rx=std.* -rx=core.* -rx=etc.*

[Environment64]
DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib64 -L--export-dynamic
DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib64 -L--export-dynamic -rx=object -rx=std.* -rx=core.* -rx=etc.*
4 changes: 2 additions & 2 deletions ini/linux/bin64/dmd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[Environment32]
DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib32 -L--export-dynamic
DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib32 -L--export-dynamic -rx=object -rx=std.* -rx=core.* -rx=etc.*

[Environment64]
DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib64 -L--export-dynamic
DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib64 -L--export-dynamic -rx=object -rx=std.* -rx=core.* -rx=etc.*
2 changes: 1 addition & 1 deletion ini/osx/bin/dmd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

[Environment]

DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib
DFLAGS=-I%@P%/../../src/phobos -I%@P%/../../src/druntime/import -L-L%@P%/../lib -rx=object -rx=std.* -rx=core.* -rx=etc.*
2 changes: 1 addition & 1 deletion ini/osx/bin/dmdx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

[Environment]

DFLAGS=-I~/dmd2/src/phobos -I~/dmd2/src/druntime/import
DFLAGS=-I~/dmd2/src/phobos -I~/dmd2/src/druntime/import -rx=object -rx=std.* -rx=core.* -rx=etc.*
2 changes: 1 addition & 1 deletion ini/windows/bin/sc.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version=7.51 Build 020

; environment for both 32/64 bit
[Environment]
DFLAGS="-I%@P%\..\..\src\phobos" "-I%@P%\..\..\src\druntime\import"
DFLAGS="-I%@P%\..\..\src\phobos" "-I%@P%\..\..\src\druntime\import" -rx=object -rx=std.* -rx=core.* -rx=etc.*

; optlink only reads from the Environment section so we need this redundancy
; from the Environment32 section (bugzilla 11302)
Expand Down
86 changes: 48 additions & 38 deletions src/mars.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,8 @@ Usage:\n\
-profile profile runtime performance of generated code\n\
-property enforce property syntax\n\
-quiet suppress unnecessary messages\n\
-rb recursively build all dependencies (if not filtered by -rx)\n\
-rx do not build a dependency (e.g. -rx=foo.bar -rx=foo.*)\n\
-release compile release version\n\
-run srcfile args... run resulting program, passing args\n\
-shared generate shared library (DLL)\n\
Expand Down Expand Up @@ -643,6 +645,8 @@ int tryMain(size_t argc, const char *argv[])
}
#endif

global.params.excludeList = new Strings();

for (size_t i = 1; i < argc; i++)
{
const char *p = argv[i];
Expand Down Expand Up @@ -722,6 +726,10 @@ int tryMain(size_t argc, const char *argv[])
global.params.is64bit = true;
else if (strcmp(p + 1, "profile") == 0)
global.params.trace = 1;
else if (strcmp(p + 1, "rb") == 0)
global.params.buildRecurse = 1;
else if (memcmp(p + 1, "rx=", 3) == 0)
global.params.excludeList->push(p + 4);
else if (strcmp(p + 1, "v") == 0)
global.params.verbose = 1;
else if (strcmp(p + 1, "vtls") == 0)
Expand Down Expand Up @@ -1270,8 +1278,7 @@ Language changes listed by -transition=id:\n\
}

// Create Modules
Modules modules;
modules.reserve(files.dim);
Module::buildModules.reserve(files.dim);
bool firstmodule = true;
for (size_t i = 0; i < files.dim; i++)
{
Expand Down Expand Up @@ -1381,7 +1388,7 @@ Language changes listed by -transition=id:\n\

Identifier *id = Lexer::idPool(name);
Module *m = new Module(files[i], id, global.params.doDocComments, global.params.doHdrGeneration);
modules.push(m);
Module::buildModules.push(m);

if (firstmodule)
{ global.params.objfiles->push(m->objfile->name->str);
Expand All @@ -1397,8 +1404,8 @@ Language changes listed by -transition=id:\n\
{
for (size_t i = 0; 1; i++)
{
assert(i != modules.dim);
Module *m = modules[i];
assert(i != Module::buildModules.dim);
Module *m = Module::buildModules[i];
if (strcmp(m->srcfile->name->str, global.main_d) == 0)
{
static const char buf[] = "int main(){return 0;}";
Expand All @@ -1412,28 +1419,29 @@ Language changes listed by -transition=id:\n\
#define ASYNCREAD 1
#if ASYNCREAD
// Multi threaded
AsyncRead *aw = AsyncRead::create(modules.dim);
for (size_t i = 0; i < modules.dim; i++)
AsyncRead *aw = AsyncRead::create(Module::buildModules.dim);
for (size_t i = 0; i < Module::buildModules.dim; i++)
{
Module *m = modules[i];
Module *m = Module::buildModules[i];
aw->addFile(m->srcfile);
}
aw->start();
#else
// Single threaded
for (size_t i = 0; i < modules.dim; i++)
for (size_t i = 0; i < Module::buildModules.dim; i++)
{
Module *m = modules[i];
m = Module::buildModules[i];
Copy link
Contributor

@timotheecour timotheecour Feb 26, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Module*m=

m->read(Loc());
}
#endif

// Parse files
bool anydocfiles = false;
size_t filecount = modules.dim;
size_t filecount = Module::buildModules.dim;
for (size_t filei = 0, modi = 0; filei < filecount; filei++, modi++)
{
Module *m = modules[modi];
Module *m = Module::buildModules[modi];

if (global.params.verbose)
fprintf(global.stdmsg, "parse %s\n", m->toChars());
if (!Module::rootModule)
Expand All @@ -1454,8 +1462,8 @@ Language changes listed by -transition=id:\n\
anydocfiles = true;
m->gendocfile();

// Remove m from list of modules
modules.remove(modi);
// Remove m from list of Module::buildModules
Module::buildModules.remove(modi);
modi--;

// Remove m's object file from list of object files
Expand All @@ -1476,7 +1484,7 @@ Language changes listed by -transition=id:\n\
AsyncRead::dispose(aw);
#endif

if (anydocfiles && modules.dim &&
if (anydocfiles && Module::buildModules.dim &&
(global.params.oneobj || global.params.objname))
{
error(Loc(), "conflicting Ddoc and obj generation options");
Expand All @@ -1491,9 +1499,9 @@ Language changes listed by -transition=id:\n\
* line switches and what else is imported, they are generated
* before any semantic analysis.
*/
for (size_t i = 0; i < modules.dim; i++)
for (size_t i = 0; i < Module::buildModules.dim; i++)
{
Module *m = modules[i];
Module *m = Module::buildModules[i];
if (global.params.verbose)
fprintf(global.stdmsg, "import %s\n", m->toChars());
m->genhdrfile();
Expand All @@ -1503,9 +1511,9 @@ Language changes listed by -transition=id:\n\
fatal();

// load all unconditional imports for better symbol resolving
for (size_t i = 0; i < modules.dim; i++)
for (size_t i = 0; i < Module::buildModules.dim; i++)
{
Module *m = modules[i];
Module *m = Module::buildModules[i];
if (global.params.verbose)
fprintf(global.stdmsg, "importall %s\n", m->toChars());
m->importAll(NULL);
Expand All @@ -1516,9 +1524,9 @@ Language changes listed by -transition=id:\n\
backend_init();

// Do semantic analysis
for (size_t i = 0; i < modules.dim; i++)
for (size_t i = 0; i < Module::buildModules.dim; i++)
{
Module *m = modules[i];
Module *m = Module::buildModules[i];
if (global.params.verbose)
fprintf(global.stdmsg, "semantic %s\n", m->toChars());
m->semantic();
Expand All @@ -1530,9 +1538,9 @@ Language changes listed by -transition=id:\n\
Module::runDeferredSemantic();

// Do pass 2 semantic analysis
for (size_t i = 0; i < modules.dim; i++)
for (size_t i = 0; i < Module::buildModules.dim; i++)
{
Module *m = modules[i];
Module *m = Module::buildModules[i];
if (global.params.verbose)
fprintf(global.stdmsg, "semantic2 %s\n", m->toChars());
m->semantic2();
Expand All @@ -1541,9 +1549,9 @@ Language changes listed by -transition=id:\n\
fatal();

// Do pass 3 semantic analysis
for (size_t i = 0; i < modules.dim; i++)
for (size_t i = 0; i < Module::buildModules.dim; i++)
{
Module *m = modules[i];
Module *m = Module::buildModules[i];
if (global.params.verbose)
fprintf(global.stdmsg, "semantic3 %s\n", m->toChars());
m->semantic3();
Expand Down Expand Up @@ -1593,9 +1601,9 @@ Language changes listed by -transition=id:\n\
// Scan for functions to inline
if (global.params.useInline)
{
for (size_t i = 0; i < modules.dim; i++)
for (size_t i = 0; i < Module::buildModules.dim; i++)
{
Module *m = modules[i];
Module *m = Module::buildModules[i];
if (global.params.verbose)
fprintf(global.stdmsg, "inline scan %s\n", m->toChars());
inlineScan(m);
Expand Down Expand Up @@ -1627,7 +1635,7 @@ Language changes listed by -transition=id:\n\
if (global.params.doXGeneration)
{
OutBuffer buf;
json_generate(&buf, &modules);
json_generate(&buf, &Module::buildModules);

// Write buf to file
const char *name = global.params.xfilename;
Expand Down Expand Up @@ -1672,11 +1680,12 @@ Language changes listed by -transition=id:\n\

if (global.params.oneobj)
{
if (modules.dim)
obj_start(modules[0]->srcfile->toChars());
for (size_t i = 0; i < modules.dim; i++)
if (Module::buildModules.dim)
obj_start(Module::buildModules[0]->srcfile->toChars());

for (size_t i = 0; i < Module::buildModules.dim; i++)
{
Module *m = modules[i];
Module *m = Module::buildModules[i];
if (global.params.verbose)
fprintf(global.stdmsg, "code %s\n", m->toChars());
m->genobjfile(0);
Expand All @@ -1685,16 +1694,16 @@ Language changes listed by -transition=id:\n\
if (!global.errors && global.params.doDocComments)
m->gendocfile();
}
if (!global.errors && modules.dim)
if (!global.errors && Module::buildModules.dim)
{
obj_end(library, modules[0]->objfile);
obj_end(library, Module::buildModules[0]->objfile);
}
}
else
{
for (size_t i = 0; i < modules.dim; i++)
for (size_t i = 0; i < Module::buildModules.dim; i++)
{
Module *m = modules[i];
Module *m = Module::buildModules[i];
if (global.params.verbose)
fprintf(global.stdmsg, "code %s\n", m->toChars());
if (global.params.obj)
Expand Down Expand Up @@ -1745,9 +1754,10 @@ Language changes listed by -transition=id:\n\

/* Delete .obj files and .exe file
*/
for (size_t i = 0; i < modules.dim; i++)
for (size_t i = 0; i < Module::buildModules.dim; i++)
{
modules[i]->deleteObjFile();
Module *m = Module::buildModules[i];
m->deleteObjFile();
if (global.params.oneobj)
break;
}
Expand Down
2 changes: 2 additions & 0 deletions src/mars.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ typedef Array<const char *> Strings;
// Put command line switches in here
struct Param
{
bool buildRecurse; // build modules recursively
Strings *excludeList; // exclude filters for modules not to be built when building recursively
char obj; // write object file
char link; // perform link
char dll; // generate shared dynamic library
Expand Down
55 changes: 55 additions & 0 deletions src/module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ AggregateDeclaration *Module::moduleinfo;
Module *Module::rootModule;
DsymbolTable *Module::modules;
Modules Module::amodules;
Modules Module::buildModules;

Dsymbols Module::deferred; // deferred Dsymbol's needing semantic() run on them
Dsymbols Module::deferred3;
Expand Down Expand Up @@ -191,6 +192,48 @@ const char *Module::kind()
return "module";
}

bool isModuleFiltered(Identifiers *packages, Identifier *ident)
{
char *fullName = ident->toChars();
if (packages && packages->dim)
{
OutBuffer buf;
for (size_t i = 0; i < packages->dim; i++)
{
Identifier *pid = (*packages)[i];
buf.writestring(pid->toChars());
buf.writeByte('.');
}

buf.writestring(fullName);
buf.writeByte(0);
fullName = (char *)buf.extractData();
}

bool filtered = false;
for (size_t i = 0; i < global.params.excludeList->dim; i++)
{
const char *filter = (*global.params.excludeList)[i];

size_t len = strlen(filter);
if (filter[len - 1] == '*') // wildcard
{
if (memcmp(fullName, filter, len - 1) == 0)
{
//printf("-- found: %s filter: %s\n", fullName, filter);
return true;
}
}
else if (strcmp(fullName, filter) == 0)
{
//printf("-- found: %s filter: %s\n", fullName, filter);
return true;
}
}

return false;
}

Module *Module::load(Loc loc, Identifiers *packages, Identifier *ident)
{ Module *m;
char *filename;
Expand Down Expand Up @@ -252,6 +295,18 @@ Module *Module::load(Loc loc, Identifiers *packages, Identifier *ident)
d_gcc_magic_module(m);
#endif

// don't build interface file
bool isInterfaceFile = FileName::exists(FileName::forceExt(filename, global.hdr_ext));

if (global.params.buildRecurse && !isInterfaceFile)
{
if (!isModuleFiltered(packages, ident))
{
buildModules.push(m);
m->importedFrom = m; // m->isRoot() == true
}
}
Copy link
Member

@MartinNowak MartinNowak Feb 7, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a bit sceptical that this is sufficient. What if Module::load is called during semantic3, you'll call buildModules.push(m); with a module that had no semantic run yet. When I implemented a similar functionality (~2 years ago) I had to explicitly do that.


return m;
}

Expand Down
1 change: 1 addition & 0 deletions src/module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ class Module : public Package
static Module *rootModule;
static DsymbolTable *modules; // symbol table of all modules
static Modules amodules; // array of all modules
static Modules buildModules; // array of modules to build
static Dsymbols deferred; // deferred Dsymbol's needing semantic() run on them
static Dsymbols deferred3; // deferred Dsymbol's needing semantic3() run on them
static unsigned dprogress; // progress resolving the deferred list
Expand Down
Loading