commit c0cc0ea1b4c7054ce97a11f2d156359e175ab4da
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Mon May 4 21:45:17 2009 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Mon May 4 21:45:17 2009 +0000
Autogenerate setup-manifest.xml with the current version.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1507
---
configure.in | 1 +
src/resource.rc.in | 2 +-
src/setup-res.rc.in | 2 +-
src/setup/Makefile.am | 3 +--
src/setup/{setup-manifest.xml => setup-manifest.xml.in} | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure.in b/configure.in
index f4a867f2..0de7622a 100644
--- a/configure.in
+++ b/configure.in
@@ -100,6 +100,7 @@ src/setup/Makefile
pcsound/Makefile
src/resource.rc
src/setup-res.rc
+src/setup/setup-manifest.xml
src/doom-screensaver.desktop
])
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.in
similarity index 88%
rename from src/setup/setup-manifest.xml
rename to src/setup/setup-manifest.xml.in
index 74dd5493..70ae915e 100644
--- a/src/setup/setup-manifest.xml
+++ b/src/setup/setup-manifest.xml.in
@@ -2,7 +2,7 @@
<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="*"
+ <assemblyIdentity version="@PACKAGE_VERSION@.0" processorArchitecture="*"
name="chocolate-setup" type="win32"/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>