From c0cc0ea1b4c7054ce97a11f2d156359e175ab4da Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Mon, 4 May 2009 21:45:17 +0000
Subject: Autogenerate setup-manifest.xml with the current version.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1507
---
 src/resource.rc.in              |  2 +-
 src/setup-res.rc.in             |  2 +-
 src/setup/Makefile.am           |  3 +--
 src/setup/setup-manifest.xml    | 16 ----------------
 src/setup/setup-manifest.xml.in | 16 ++++++++++++++++
 5 files changed, 19 insertions(+), 20 deletions(-)
 delete mode 100644 src/setup/setup-manifest.xml
 create mode 100644 src/setup/setup-manifest.xml.in

(limited to 'src')

diff --git a/src/resource.rc.in b/src/resource.rc.in
index 318a3fc6..7eb5d00f 100644
--- a/src/resource.rc.in
+++ b/src/resource.rc.in
@@ -9,7 +9,7 @@ FILETYPE 1
  {
   BLOCK "040904E4"
   {
-   VALUE "FileVersion", "@PACKAGE_VERSION@"
+   VALUE "FileVersion", "@PACKAGE_VERSION@.0"
    VALUE "FileDescription", "@PACKAGE_STRING@"
    VALUE "InternalName", "@PACKAGE_TARNAME@"
    VALUE "CompanyName", "@PACKAGE_BUGREPORT@"
diff --git a/src/setup-res.rc.in b/src/setup-res.rc.in
index 0b714122..6a351354 100644
--- a/src/setup-res.rc.in
+++ b/src/setup-res.rc.in
@@ -11,7 +11,7 @@ FILETYPE 1
  {
   BLOCK "040904E4"
   {
-   VALUE "FileVersion", "@PACKAGE_VERSION@"
+   VALUE "FileVersion", "@PACKAGE_VERSION@.0"
    VALUE "FileDescription", "@PACKAGE_STRING@ Setup"
    VALUE "InternalName", "@PACKAGE_TARNAME@"
    VALUE "CompanyName", "@PACKAGE_BUGREPORT@"
diff --git a/src/setup/Makefile.am b/src/setup/Makefile.am
index a39a1812..fa5d1992 100644
--- a/src/setup/Makefile.am
+++ b/src/setup/Makefile.am
@@ -21,6 +21,5 @@ SOURCE_FILES =                                  \
 libsetup_a_SOURCES = $(SOURCE_FILES)
 
 EXTRA_DIST=                                     \
-    setup_icon.c                                \
-    setup-manifest.xml
+    setup_icon.c
 
diff --git a/src/setup/setup-manifest.xml b/src/setup/setup-manifest.xml
deleted file mode 100644
index 74dd5493..00000000
--- a/src/setup/setup-manifest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <!-- The "name" field in this tag should be the same as the executable's
-       name -->
-  <assemblyIdentity version="1.1.1.0" processorArchitecture="*"
-                    name="chocolate-setup" type="win32"/>
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <!-- Hi Vista! We don't require elevated privileges. Thanks! -->
-        <requestedExecutionLevel level="asInvoker"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
-
diff --git a/src/setup/setup-manifest.xml.in b/src/setup/setup-manifest.xml.in
new file mode 100644
index 00000000..70ae915e
--- /dev/null
+++ b/src/setup/setup-manifest.xml.in
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <!-- The "name" field in this tag should be the same as the executable's
+       name -->
+  <assemblyIdentity version="@PACKAGE_VERSION@.0" processorArchitecture="*"
+                    name="chocolate-setup" type="win32"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <!-- Hi Vista! We don't require elevated privileges. Thanks! -->
+        <requestedExecutionLevel level="asInvoker"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
+
-- 
cgit v1.2.3