diff --git a/source/dub/compilers/compiler.d b/source/dub/compilers/compiler.d index 45f064e..9cc0676 100644 --- a/source/dub/compilers/compiler.d +++ b/source/dub/compilers/compiler.d @@ -57,7 +57,7 @@ } static immutable SpecialFlag[] s_specialFlags = [ {["-c", "-o-"], "Automatically issued by DUB, do not specify in package.json"}, - {[ "-w", "-Wall", "-Werr"], `Use "buildRequirements" to control warning behavior`}, + {["-w", "-Wall", "-Werr"], `Use "buildRequirements" to control warning behavior`}, {["-property", "-fproperty"], "Using this flag may break building of dependencies and it will probably be removed from DMD in the future"}, {["-wi"], `Use the "buildRequirements" field to control warning behavior`}, {["-d", "-de", "-dw"], `Use the "buildRequirements" field to control deprecation behavior`}, @@ -169,7 +169,7 @@ if (settings.requirements & BuildRequirements.disallowInlining) settings.options &= BuildOptions.inline; if (settings.requirements & BuildRequirements.disallowOptimization) settings.options &= ~BuildOptions.optimize; if (settings.requirements & BuildRequirements.requireBoundsCheck) settings.options &= ~BuildOptions.noBoundsChecks; - if (settings.requirements & BuildRequirements.requireContracts) settings.options &= ~BuildOptions.release; + if (settings.requirements & BuildRequirements.requireContracts) settings.options &= ~BuildOptions.releaseMode; if (settings.requirements & BuildRequirements.relaxProperties) settings.options &= ~BuildOptions.property; } } @@ -378,8 +378,8 @@ enum BuildOptions { none = 0, /// Use compiler defaults - debug_ = 1<<0, /// Compile in debug mode (enables contracts, -debug) - release = 1<<1, /// Compile in release mode (disables assertions and bounds checks, -release) + debugMode = 1<<0, /// Compile in debug mode (enables contracts, -debug) + releaseMode = 1<<1, /// Compile in release mode (disables assertions and bounds checks, -release) coverage = 1<<2, /// Enable code coverage analysis (-cov) debugInfo = 1<<3, /// Enable symbolic debug information (-g) debugInfoC = 1<<4, /// Enable symbolic debug information in C compatible form (-gc) diff --git a/source/dub/compilers/dmd.d b/source/dub/compilers/dmd.d index da36a23..329e937 100644 --- a/source/dub/compilers/dmd.d +++ b/source/dub/compilers/dmd.d @@ -25,8 +25,8 @@ class DmdCompiler : Compiler { private static immutable s_options = [ - tuple(BuildOptions.debug_, ["-debug"]), - tuple(BuildOptions.release, ["-release"]), + tuple(BuildOptions.debugMode, ["-debug"]), + tuple(BuildOptions.releaseMode, ["-release"]), tuple(BuildOptions.coverage, ["-cov"]), tuple(BuildOptions.debugInfo, ["-g"]), tuple(BuildOptions.debugInfoC, ["-gc"]), diff --git a/source/dub/compilers/gdc.d b/source/dub/compilers/gdc.d index 7ee0cd0..039defb 100644 --- a/source/dub/compilers/gdc.d +++ b/source/dub/compilers/gdc.d @@ -25,8 +25,8 @@ class GdcCompiler : Compiler { private static immutable s_options = [ - tuple(BuildOptions.debug_, ["-fdebug"]), - tuple(BuildOptions.release, ["-frelease"]), + tuple(BuildOptions.debugMode, ["-fdebug"]), + tuple(BuildOptions.releaseMode, ["-frelease"]), tuple(BuildOptions.coverage, ["-fprofile-arcs", "-ftest-coverage"]), tuple(BuildOptions.debugInfo, ["-g"]), tuple(BuildOptions.debugInfoC, ["-g", "-fdebug-c"]), diff --git a/source/dub/compilers/ldc.d b/source/dub/compilers/ldc.d index daecbca..8563bb9 100644 --- a/source/dub/compilers/ldc.d +++ b/source/dub/compilers/ldc.d @@ -25,8 +25,8 @@ class LdcCompiler : Compiler { private static immutable s_options = [ - tuple(BuildOptions.debug_, ["-d-debug"]), - tuple(BuildOptions.release, ["-release"]), + tuple(BuildOptions.debugMode, ["-d-debug"]), + tuple(BuildOptions.releaseMode, ["-release"]), //tuple(BuildOptions.coverage, ["-?"]), tuple(BuildOptions.debugInfo, ["-g"]), tuple(BuildOptions.debugInfoC, ["-gc"]), diff --git a/source/dub/generators/visuald.d b/source/dub/generators/visuald.d index 5a4dad1..c5418b4 100644 --- a/source/dub/generators/visuald.d +++ b/source/dub/generators/visuald.d @@ -330,7 +330,7 @@ ret.formattedWrite(" %s\n", buildsettings.options & BuildOptions.debugInfo ? "1" : "0"); ret.formattedWrite(" %s\n", buildsettings.options & BuildOptions.optimize ? "1" : "0"); ret.formattedWrite(" %s\n", buildsettings.options & BuildOptions.inline ? "1" : "0"); - ret.formattedWrite(" %s\n", buildsettings.options & BuildOptions.release ? "1" : "0"); + ret.formattedWrite(" %s\n", buildsettings.options & BuildOptions.releaseMode ? "1" : "0"); // Lib or exe? enum diff --git a/source/dub/package_.d b/source/dub/package_.d index a4917d1..e6595cd 100644 --- a/source/dub/package_.d +++ b/source/dub/package_.d @@ -216,14 +216,14 @@ with(BuildOptions) switch (build_type) { default: throw new Exception(format("Unknown build type for %s: '%s'", this.name, build_type)); case "plain": break; - case "debug": settings.addOptions(debug_, debugInfo); break; - case "release": settings.addOptions(release, optimize, inline); break; - case "unittest": settings.addOptions(unittests, debug_, debugInfo); break; + case "debug": settings.addOptions(debugMode, debugInfo); break; + case "release": settings.addOptions(releaseMode, optimize, inline); break; + case "unittest": settings.addOptions(unittests, debugMode, debugInfo); break; case "docs": settings.addOptions(syntaxOnly); settings.addDFlags("-c", "-Dddocs"); break; case "ddox": settings.addOptions(syntaxOnly); settings.addDFlags("-c", "-Df__dummy.html", "-Xfdocs.json"); break; case "profile": settings.addOptions(profile, optimize, inline, debugInfo); break; case "cov": settings.addOptions(coverage, debugInfo); break; - case "unittest-cov": settings.addOptions(unittests, coverage, debug_, debugInfo); break; + case "unittest-cov": settings.addOptions(unittests, coverage, debugMode, debugInfo); break; } } }