Merge pull request #1450 from rtbo/build_settings

Fork: 0

johnpearcey / dub_jkp

Browse code Merge pull request #1450 from rtbo/build_settings_vars Build settings vars master
commit 2cbab876001999ea0b71e68e9ba5d322a52e1125 2 parents 78a317d + 9914720 Sebastian Wilzbach authored on 14 Jul 2018 GitHub committed on 14 Jul 2018

Patch

Unified Split

Showing 12 changed files

                Ignore Space
               Show notes
              View
            
          
          22 ■■■■■
          changelog/buildSettingsVars.dd
        
        
        
          0 → 100644
               Variables such as `$ARCH` or `$PLATFORM` are now supported in the build settings.
 
JSON lines such as
-------
    "lflags-posix-x86": [ "-L$PACKAGE_DIR/lib/posix-x86" ],
    "lflags-posix-x86_64": [ "-L$PACKAGE_DIR/lib/posix-x86_64" ],
-------
can be turned into
-------
    "lflags-posix": [ "-L$PACKAGE_DIR/lib/posix-$ARCH" ],
-------
 
Both `$VAR` and `${VAR}` syntaxes are supported.
The supported variables are as follow:
$(TABLE
    $(TR $(TH name) $(TH values))
    $(TR $(TD `$ARCH`) $(TD $(D_INLINECODE "x86", "x86_64")))
    $(TR $(TD `$PLATFORM`) $(TD $(D_INLINECODE "linux", "windows", ...)))
    $(TR $(TD `$PLATFORM_POSIX`) $(TD $(D_INLINECODE "posix", "windows", ...)))
    $(TR $(TD `$BUILD_TYPE`) $(TD $(D_INLINECODE "debug", "release", ...)))
)
+Variables such as `$ARCH` or `$PLATFORM` are now supported in the build settings.
+JSON lines such as
+-------
+    "lflags-posix-x86": [ "-L$PACKAGE_DIR/lib/posix-x86" ],
+    "lflags-posix-x86_64": [ "-L$PACKAGE_DIR/lib/posix-x86_64" ],
+-------
+can be turned into
+-------
+    "lflags-posix": [ "-L$PACKAGE_DIR/lib/posix-$ARCH" ],
+-------
+Both `$VAR` and `${VAR}` syntaxes are supported.
+The supported variables are as follow:
+$(TABLE
+    $(TR $(TH name) $(TH values))
+    $(TR $(TD `$ARCH`) $(TD $(D_INLINECODE "x86", "x86_64")))
+    $(TR $(TD `$PLATFORM`) $(TD $(D_INLINECODE "linux", "windows", ...)))
+    $(TR $(TD `$PLATFORM_POSIX`) $(TD $(D_INLINECODE "posix", "windows", ...)))
+    $(TR $(TD `$BUILD_TYPE`) $(TD $(D_INLINECODE "debug", "release", ...)))
+)

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          source/dub/dub.d
-		auto test_config = format("%s-test-%s", m_project.rootPackage.name.replace(".", "-").replace(":", "-"), config);
 
		BuildSettings lbuildsettings = settings.buildSettings;
		m_project.addBuildSettings(lbuildsettings, settings.platform, config, null, true);
		m_project.addBuildSettings(lbuildsettings, settings, config, null, true);
		if (lbuildsettings.targetType == TargetType.none) {
			logInfo(`Configuration '%s' has target type "none". Skipping test.`, config);
			return;
		}
 		auto test_config = format("%s-test-%s", m_project.rootPackage.name.replace(".", "-").replace(":", "-"), config);
 		BuildSettings lbuildsettings = settings.buildSettings;
+		m_project.addBuildSettings(lbuildsettings, settings.platform, config, null, true);
+		m_project.addBuildSettings(lbuildsettings, settings, config, null, true);
 		if (lbuildsettings.targetType == TargetType.none) {
 			logInfo(`Configuration '%s' has target type "none". Skipping test.`, config);
 			return;
 		}

Ignore Space Show notes View source/dub/generators/generator.d

Ignore Space Show notes View source/dub/project.d

Ignore Space Show notes View source/dub/recipe/packagerecipe.d

Ignore Space Show notes View test/issue1447-build-settings-vars.sh 0 → 100755

Ignore Space Show notes View test/issue1447-build-settings-vars/.no_run 0 → 100644

Ignore Space Show notes View test/issue1447-build-settings-vars/.no_test 0 → 100644

Ignore Space Show notes View test/issue1447-build-settings-vars/dub.json 0 → 100644

Ignore Space Show notes View test/issue1447-build-settings-vars/source/app.d 0 → 100644

Ignore Space Show notes View test/issue1447-build-settings-vars/view-x86/arch 0 → 100644

Ignore Space Show notes View test/issue1447-build-settings-vars/view-x86_64/arch 0 → 100644

Show line notes below