From e78c2902f5147f535706a068bfbc5cf68d2ac32c Mon Sep 17 00:00:00 2001 From: Geir Sagberg Date: Wed, 17 Aug 2016 22:10:29 +0200 Subject: [PATCH] Use ** rather than * for globbing I ran into an issue when building https://github.com/aspnet/JavaScriptServices where the samples were in a lower subdirectory. Since the glob `samples/*/project.json` would only match projects directly below `samples`, the projects were not being built. Using `** ` instead matches all `project.json` in all subdirectories. --- build/shade/_k-standard-goals.shade | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/shade/_k-standard-goals.shade b/build/shade/_k-standard-goals.shade index 7182a0c..275266c 100644 --- a/build/shade/_k-standard-goals.shade +++ b/build/shade/_k-standard-goals.shade @@ -16,9 +16,9 @@ default BUILD_DIR='${Path.Combine(TARGET_DIR, "build")}' default TEST_DIR='${Path.Combine(TARGET_DIR, "test")}' default Configuration='${E("Configuration")}' default PACKAGELIST_JSON_FILENAME = 'NuGetPackageVerifier.json' -default SRC_PROJECT_GLOB = "src/*/project.json" -default TEST_PROJECT_GLOB = "test/*/project.json" -default SAMPLES_PROJECT_GLOB = "samples/*/project.json" +default SRC_PROJECT_GLOB = "src/**/project.json" +default TEST_PROJECT_GLOB = "test/**/project.json" +default SAMPLES_PROJECT_GLOB = "samples/**/project.json" @{ if (string.IsNullOrEmpty(E("DOTNET_BUILD_VERSION"))) @@ -103,7 +103,7 @@ default SAMPLES_PROJECT_GLOB = "samples/*/project.json" } #build-clean if='Directory.Exists("src")' - k-clean each='var projectFile in Files.Include("src/*/project.json")' + k-clean each='var projectFile in Files.Include(SRC_PROJECT_GLOB)' #ci-deep-clean .deep-clean target='clean' if='IsTeamCity' @@ -431,4 +431,4 @@ macro name="UpdateResx" resxFile='string' k-generate-resx macro name='GitCommand' gitCommand='string' - git \ No newline at end of file + git