Merge tag 'upstream/2.3.1'

Upstream version 2.3.1

1 files changed, 11 insertions, 0 deletions

diff --git a/doc/generated/examples/variants_ex_2.xml b/doc/generated/examples/variants_ex_2.xml
new file mode 100644
index 0000000..ac883de
--- /dev/null
+++ b/doc/generated/examples/variants_ex_2.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0/scons.xsd scons.xsd">C:\&gt;<userinput>scons -Q OS=windows</userinput>
+Install file: "build/windows/world/world.h" as "export/windows/include/world.h"
+cl /Fobuild\windows\hello\hello.obj /c build\windows\hello\hello.c /nologo /Iexport\windows\include
+cl /Fobuild\windows\world\world.obj /c build\windows\world\world.c /nologo /Iexport\windows\include
+lib /nologo /OUT:build\windows\world\world.lib build\windows\world\world.obj
+Install file: "build/windows/world/world.lib" as "export/windows/lib/world.lib"
+link /nologo /OUT:build\windows\hello\hello.exe /LIBPATH:export\windows\lib world.lib build\windows\hello\hello.obj
+embedManifestExeCheck(target, source, env)
+Install file: "build/windows/hello/hello.exe" as "export/windows/bin/hello.exe"
+</screen>