[setup - the official Cygwin setup program] branch master, updated. release_2.904-4-gaa071e60

Jon TURNEY jturney@sourceware.org
Fri May 29 14:05:00 GMT 2020




https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=aa071e60504674c5750c1915e33014d3777f092f

commit aa071e60504674c5750c1915e33014d3777f092f
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Thu May 28 15:34:08 2020 +0100

    Improve how paired boolean options appear in help output
    
    Include a prefix in the boolean option long name appearing in help
    output (although we should probably pick the default, rather than first,
    prefix)

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=f8ec5b4c41418378dfb8ae8cccf3e93343673968

commit f8ec5b4c41418378dfb8ae8cccf3e93343673968
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Wed May 27 17:05:08 2020 +0100

    Add dpiAware to manifest

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=ab7f62bf5f733299ccc9d21a4620bc3a1602a781

commit ab7f62bf5f733299ccc9d21a4620bc3a1602a781
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Wed May 27 17:04:51 2020 +0100

    Make application manifest architecture generic
    
    It was made architecture specific in 2258d2a1, but then made the same
    again for both architectures in aa09dcbb.

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=5cc5f5871519724f5412df456d263c4bd7fdbb91

commit 5cc5f5871519724f5412df456d263c4bd7fdbb91
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Wed May 27 16:40:26 2020 +0100

    Parse build-depends: case-insensitively


Diff:
---
 Makefile.am                                     |  3 +-
 inilex.ll                                       |  2 +-
 libgetopt++/include/getopt++/DefaultFormatter.h |  8 +++--
 res.rc                                          |  4 ---
 setup.exe.manifest                              | 24 ++++++++------
 setup64.exe.manifest                            | 43 -------------------------
 6 files changed, 22 insertions(+), 62 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 987909cd..b316764f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -44,7 +44,6 @@ EXTRA_DIST = \
 	cygwin-setup.ico \
 	cygwin-terminal.ico \
 	setup.exe.manifest \
-	setup64.exe.manifest \
 	tree-minus.ico \
 	tree-plus.ico
 
@@ -272,7 +271,7 @@ setup_version.c : Makefile
 	mv version.tmp setup_version.c
 
 # setup.exe.manifest is included in res.rc
-res.o: @SETUP@.exe.manifest
+res.o: setup.exe.manifest
 
 .rc.o:
 	$(AM_V_GEN)$(WINDRES) --include-dir $(srcdir) -o $@ $<
diff --git a/inilex.ll b/inilex.ll
index 26a95e3c..a4b0f64c 100644
--- a/inilex.ll
+++ b/inilex.ll
@@ -119,7 +119,7 @@ B64	[a-zA-Z0-9_-]
 "ldesc:"		return LDESC;
 "message:"		return MESSAGE;
 "Source:"		return SOURCEPACKAGE;
-"Build-Depends:"	return BUILDDEPENDS;
+"[bB]uild-[dD]epends:"	return BUILDDEPENDS;
 "replace-versions:"	return REPLACE_VERSIONS;
 
 "category:"|"Section:"	return CATEGORY;
diff --git a/libgetopt++/include/getopt++/DefaultFormatter.h b/libgetopt++/include/getopt++/DefaultFormatter.h
index 440eb54b..8b421a67 100644
--- a/libgetopt++/include/getopt++/DefaultFormatter.h
+++ b/libgetopt++/include/getopt++/DefaultFormatter.h
@@ -49,10 +49,14 @@ class DefaultFormatter {
         theStream << "   ";
       else
         theStream << s_lead << anOption->shortOption ()[0];
-      theStream << l_lead << anOption->longOption ()
+
+      std::string longOption = anOption->longOptionPrefixes ()[0] +
+        anOption->longOption ();
+
+      theStream << l_lead << longOption
 		<< std::string (o_len
 				- s_lead.size () - 1 - l_lead.size ()
-				- anOption->longOption ().size (), ' ');
+				- longOption.size (), ' ');
       std::string helpmsg = anOption->shortHelp();
       while (helpmsg.size() > h_len)
 	{
diff --git a/res.rc b/res.rc
index fb0c5ace..31eb9c49 100644
--- a/res.rc
+++ b/res.rc
@@ -503,11 +503,7 @@ END
 // Manifest
 //
 
-#ifdef __x86_64__
-CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "setup64.exe.manifest"
-#else
 CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "setup.exe.manifest"
-#endif
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/setup.exe.manifest b/setup.exe.manifest
index 18da7b86..45a5f082 100755
--- a/setup.exe.manifest
+++ b/setup.exe.manifest
@@ -2,21 +2,20 @@
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <assemblyIdentity
       version="1.0.0.0"
-      processorArchitecture="x86"
       name="RedHat.Cygwin.Setup"
       type="win32"
   />
   <description>Cygwin installation tool</description>
   <dependency>
       <dependentAssembly>
-	  <assemblyIdentity
-	      type="win32"
-	      name="Microsoft.Windows.Common-Controls"
-	      version="6.0.0.0"
-	      processorArchitecture="x86"
-	      publicKeyToken="6595b64144ccf1df"
-	      language="*"
-	  />
+          <assemblyIdentity
+              type="win32"
+              name="Microsoft.Windows.Common-Controls"
+              version="6.0.0.0"
+              processorArchitecture="*"
+              publicKeyToken="6595b64144ccf1df"
+              language="*"
+          />
       </dependentAssembly>
   </dependency>
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
@@ -35,9 +34,14 @@
       <!--The ID below indicates application support for Windows 8 -->
       <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
       <!--The ID below indicates application support for Windows 8.1 -->
-      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> 
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
       <!--The ID below indicates application support for Windows 10 -->
       <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
     </application>
   </compatibility>
+  <asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+    <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+      <dpiAware>true</dpiAware>
+    </asmv3:windowsSettings>
+  </asmv3:application>
 </assembly>
diff --git a/setup64.exe.manifest b/setup64.exe.manifest
deleted file mode 100755
index 850bb181..00000000
--- a/setup64.exe.manifest
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity
-      version="1.0.0.0"
-      processorArchitecture="amd64"
-      name="RedHat.Cygwin.Setup"
-      type="win32"
-  />
-  <description>Cygwin installation tool</description>
-  <dependency>
-      <dependentAssembly>
-	  <assemblyIdentity
-	      type="win32"
-	      name="Microsoft.Windows.Common-Controls"
-	      version="6.0.0.0"
-	      processorArchitecture="amd64"
-	      publicKeyToken="6595b64144ccf1df"
-	      language="*"
-	  />
-      </dependentAssembly>
-  </dependency>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!--The ID below indicates application support for Windows Vista -->
-      <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
-      <!--The ID below indicates application support for Windows 7 -->
-      <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-      <!--The ID below indicates application support for Windows 8 -->
-      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-      <!--The ID below indicates application support for Windows 8.1 -->
-      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> 
-      <!--The ID below indicates application support for Windows 10 -->
-      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-    </application>
-  </compatibility>
-</assembly>



More information about the Cygwin-apps-cvs mailing list