Merge remote-tracking branch 'upstream/master' into merge_master
commit 2fb2b07f6cf3bcb3a2b9b55f9f5b4393a7275c06
2 parents 907c3ca + 13581f8
@Martin Nowak Martin Nowak authored on 22 Jun 2017
Showing 22 changed files
View
18
.github/issue_template.md 0 → 100644
Please search for existing solutions to your problem.
- Issue list: https://github.com/dlang/dub/issues?q=is%3Aissue
- Cookbook: https://github.com/dlang/dub/wiki/Cookbook
- Stack Overflow: https://stackoverflow.com/questions/tagged/dub
 
### System information
- **dub version** (e.g. dub 1.3.0)
- **OS Platform and distribution** (e.g. Windows 10, Linux Ubuntu 16.04)
- **compiler version** (e.g. dmd-2.074.1)
 
### Bug Description
 
### How to reproduce?
 
### Expected Behavior
 
### Logs
View
29
.travis.yml
sudo: false
 
matrix:
include:
- d: dmd-nightly
env: [FRONTEND=2.074]
- d: dmd-beta
env: [FRONTEND=2.074]
- d: dmd
env: [FRONTEND=2.074]
- d: dmd-2.074.0
env: [FRONTEND=2.074]
- d: dmd-2.073.0
env:
- [FRONTEND=2.073]
- [COVERAGE=true]
- d: dmd-2.066.1
env: [FRONTEND=2.066]
- d: dmd-2.065.0
env: [FRONTEND=2.065]
- d: ldc-beta
env: [FRONTEND=2.073]
- d: ldc
env: [FRONTEND=2.072]
- d: ldc-1.2.0
env: [FRONTEND=2.072]
- d: ldc-1.1.0
env: [FRONTEND=2.071]
- d: ldc-1.0.0
env: [FRONTEND=2.070]
- d: ldc-0.17.2
env: [FRONTEND=2.068]
- d: ldc-0.16.1
env: [FRONTEND=2.067]
- d: ldc-0.15.1
env: [FRONTEND=2.066]
- d: ldc-0.14.0
env: [FRONTEND=2.065]
- d: gdc
env: [FRONTEND=2.068]
- d: gdc-5.2.0
env: [FRONTEND=2.066]
- d: gdc-4.9.2
env: [FRONTEND=2.066]
- d: gdc-4.9.0
env: [FRONTEND=2.065]
 
allow_failures:
- d: gdc
 
script:
- ./travis-ci.sh
View
2
■■■
README.md
 
## Key features
 
- Simple package and build description not getting in your way
- Integrated with Git, avoiding maintainance tasks such as incrementing version numbers or uploading new project releases
- Integrated with Git, avoiding maintenance tasks such as incrementing version numbers or uploading new project releases
- Generates VisualD project/solution files, integrated into MonoD
- Support for DMD, GDC and LDC (common DMD flags are translated automatically)
- Supports development workflows by optionally using local directories as a package source
 
View
2
■■■
dub.selections.json
"libev": "5.0.0+4.04",
"libevent": "2.0.1+2.0.16",
"memutils": "0.4.8",
"openssl": "1.1.5+1.0.1g",
"vibe-d": "0.7.30"
"vibe-d": "0.7.31"
}
}
View
2
■■■
scripts/win-installer/EnvVarUpdate.nsh
DetailPrint "ERROR: PathString is blank"
Goto EnvVarUpdate_Restore_Vars
${EndIf}
 
;;khc - here check if length is going to be greater then max string length
;;khc - here check if length is going to be greater than max string length
;; and abort if so - also abort if original path empty - may mean
;; it was too long as well- write message to say set it by hand
 
Push $6
View
32
source/dub/commandline.d
return inp.length > 1 ? inp[0 .. $-1] : default_value;
}
 
void depCallback(ref PackageRecipe p, ref PackageFormat fmt) {
import std.datetime: Clock;
 
if (m_nonInteractive) return;
 
while (true) {
string rawfmt = input("Package recipe format (sdl/json)", fmt.to!string);
logError("Invalid format, \""~rawfmt~"\", enter either \"sdl\" or \"json\".");
}
}
auto author = p.authors.join(", ");
p.name = input("Name", p.name);
while (true) {
// Tries getting the name until a valid one is given.
import std.regex;
auto nameRegex = regex(`^[a-z\-_]+$`);
string triedName = input("Name", p.name);
if (triedName.matchFirst(nameRegex).empty) {
logError("Invalid name, \""~triedName~"\", names should consist only of lowercase alphanumeric characters, - and _.");
} else {
p.name = triedName;
break;
}
}
p.description = input("Description", p.description);
p.authors = input("Author name", author).split(",").map!(a => a.strip).array;
p.license = input("License", p.license);
p.copyright = input("Copyright string", p.copyright);
string copyrightString = .format("Copyright © %s, %-(%s, %)", Clock.currTime().year, p.authors);
p.copyright = input("Copyright string", copyrightString);
 
while (true) {
auto depname = input("Add dependency (leave empty to skip)", null);
if (!depname.length) break;
args.getopt("prerelease", &m_prerelease, [
"Uses the latest pre-release version, even if release versions are available"
]);
args.getopt("verify", &m_verify, [
"Updates the project and performs a build. If successful, rewrites the selected versions file <to be implemeted>."
"Updates the project and performs a build. If successful, rewrites the selected versions file <to be implemented>."
]);
args.getopt("missing-only", &m_missingOnly, [
"Performs an upgrade only for dependencies that don't yet have a version selected. This is also done automatically before each build."
]);
View
1
■■■■
source/dub/compilers/buildsettings.d
void addImportPaths(in string[] value...) { add(importPaths, value); }
void addStringImportPaths(in string[] value...) { add(stringImportPaths, value); }
void prependStringImportPaths(in string[] value...) { prepend(stringImportPaths, value); }
void addImportFiles(in string[] value...) { add(importFiles, value); }
void removeImportFiles(in string[] value...) { removePaths(importFiles, value); }
void addStringImportFiles(in string[] value...) { addSI(stringImportFiles, value); }
void addPreGenerateCommands(in string[] value...) { add(preGenerateCommands, value, false); }
void addPostGenerateCommands(in string[] value...) { add(postGenerateCommands, value, false); }
void addPreBuildCommands(in string[] value...) { add(preBuildCommands, value, false); }
View
source/dub/compilers/dmd.d
View
source/dub/compilers/gdc.d
View
source/dub/compilers/utils.d
View
source/dub/dependency.d
View
source/dub/generators/build.d
View
source/dub/generators/generator.d
View
source/dub/init.d
View
source/dub/internal/sdlang/ast.d
View
source/dub/internal/vibecompat/data/json.d
View
source/dub/packagemanager.d
View
source/dub/recipe/packagerecipe.d
View
test/0-init-multi-json.sh
View
test/0-init-multi.sh
View
test/issue782-gtkd-pkg-config/fake-gtkd/pkgconfig/fake-gtkd.pc
View
test/run-unittest.sh