Merge pull request #2098 from veelo/issue2085

Fork: 0

johnpearcey / dub_jkp

Browse code Merge pull request #2098 from veelo/issue2085 Fix #2085: [visuald] spurious library project merged-on-behalf-of: Petar Kirov <PetarKirov@users.noreply.github.com> master
commit f968ccdafc4934f493946a2e98cf738790df1875 2 parents fdcfb7d + cf4a049 The Dlang Bot authored on 25 Jan 2021 GitHub committed on 25 Jan 2021

Patch

Unified Split

Showing 7 changed files

                Ignore Space
               Show notes
              View
            
          
          3 ■■■■■
          source/dub/generators/visuald.d
 					ret[i] = '"' ~ p.toNativeString() ~ '"';
				}
				return ret;
			}
 
			if (buildsettings.targetType == TargetType.none)
				return;
 
			foreach(architecture; settings.platform.architecture) {
				auto arch = architecture.vsArchitecture;
				ret.formattedWrite("  <Config name=\"%s\" platform=\"%s\">\n", to!string(type), arch);
 					ret[i] = '"' ~ p.toNativeString() ~ '"';
 				}
 				return ret;
 			}
+			if (buildsettings.targetType == TargetType.none)
+				return;
 			foreach(architecture; settings.platform.architecture) {
 				auto arch = architecture.vsArchitecture;
 				ret.formattedWrite("  <Config name=\"%s\" platform=\"%s\">\n", to!string(type), arch);

                Ignore Space
               Show notes
              View
            
          
          11 ■■■■■
          test/issue2085-target-none-visuald.sh
        
        
        
          0 → 100755
               #!/usr/bin/env bash
 
. $(dirname "${BASH_SOURCE[0]}")/common.sh
cd "${CURR_DIR}/issue2085-target-none-visuald" || die "Could not cd."
 
"$DUB" generate visuald
 
if grep -c -e \"</Config>\" .dub/root.visualdproj; then
	die $LINENO 'Regression of issue #2085.'
fi
+#!/usr/bin/env bash
+. $(dirname "${BASH_SOURCE[0]}")/common.sh
+cd "${CURR_DIR}/issue2085-target-none-visuald" || die "Could not cd."
+"$DUB" generate visuald
+if grep -c -e \"</Config>\" .dub/root.visualdproj; then
+	die $LINENO 'Regression of issue #2085.'
+fi

Ignore Space Show notes View test/issue2085-target-none-visuald/.no_build 0 → 100644

Ignore Space Show notes View test/issue2085-target-none-visuald/.no_run 0 → 100644

Ignore Space Show notes View test/issue2085-target-none-visuald/dub.json 0 → 100644

Ignore Space Show notes View test/issue2085-target-none-visuald/sub/dub.json 0 → 100644

Ignore Space Show notes View test/issue2085-target-none-visuald/sub/source/app.d 0 → 100644

Show line notes below