* Makefile.am (EXTRA_DIST): Add setup64.exe.manifest.

(res.o): Depend on arch-specific manifest file.
* res.rc (CREATEPROCESS_MANIFEST_RESOURCE_ID): Add separate
definition for x86-64.
* setup.exe.manifest: Throughout, set processorArchitecture to x86.
Remove trustInfo section.
* setup64.exe.manifest: New file.

diff --git a/ChangeLog b/ChangeLog
index f7973f9952c0bdea38cd06dfd65d15f629374fed..10b52a00d77ea46c7e9ada1274722e564008b1c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2013-04-05  Yaakov Selkowitz  <yselkowitz@users.sourceforge.net>
+
+       * Makefile.am (EXTRA_DIST): Add setup64.exe.manifest.
+       (res.o): Depend on arch-specific manifest file.
+       * res.rc (CREATEPROCESS_MANIFEST_RESOURCE_ID): Add separate
+       definition for x86-64.
+       * setup.exe.manifest: Throughout, set processorArchitecture to x86.
+       Remove trustInfo section.
+       * setup64.exe.manifest: New file.
+
 2013-03-22  Corinna Vinschen  <corinna@vinschen.de>
 
        * desktop.cc (do_desktop_setup): Install "Cygwin64 Terminal" link on

diff --git a/Makefile.am b/Makefile.am
index d174640c3d67b65cdd9a5dded3d211891bd8cad5..33448aba51c9a2a43c590658677cad2fecbea417 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,6 +50,7 @@ EXTRA_DIST = \
        choose-spin.bmp \
        cygwin.ico \
        setup.exe.manifest \
+       setup64.exe.manifest \
        tree-minus.bmp \
        tree-plus.bmp
 
@@ -278,7 +279,7 @@ setup_version.c : $(srcdir)/ChangeLog 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/res.rc b/res.rc
index 3bce49aad5201bbd4562329611a8864e5c49dfc2..bf3032d34b3397c1f15ff6ed05b97302287654e3 100644 (file)
--- a/res.rc
+++ b/res.rc
@@ -465,7 +465,11 @@ 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 e7b3f4b7d7bf1bf85a9c266724db3afc308f331f..c195ebcdf670adc4adc82699539170c638b51e58 100755 (executable)
--- a/setup.exe.manifest
+++ b/setup.exe.manifest
@@ -2,7 +2,7 @@
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <assemblyIdentity
       version="1.0.0.0"
-      processorArchitecture="*"
+      processorArchitecture="x86"
       name="RedHat.Cygwin.Setup"
       type="win32"
   />
@@ -13,19 +13,12 @@
              type="win32"
              name="Microsoft.Windows.Common-Controls"
              version="6.0.0.0"
-             processorArchitecture="*"
+             processorArchitecture="x86"
              publicKeyToken="6595b64144ccf1df"
              language="*"
          />
       </dependentAssembly>
   </dependency>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel level="requireAdministrator" uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>
       <!--The ID below indicates application support for Windows Vista -->

diff --git a/setup64.exe.manifest b/setup64.exe.manifest
new file mode 100755 (executable)
index 0000000..61c5241
--- /dev/null
+++ b/setup64.exe.manifest
@@ -0,0 +1,39 @@
+<?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="requireAdministrator" 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}"/>
+    </application>
+  </compatibility>
+</assembly>