Hello,
This time with the correct patch file attached.
At the moment packages/windows-innosetup/tools/set_version.pl generates
different output in autorun (set_version.pl -a) and manual run mode when
the subversion binary (svn.exe) that gets called does not output a
revision number when called with the --version parameter.
This is the case with the 1.4.0 RC4 binary which outputs 'version 1.4.0
(Release Candidate 4)'.
This difference prevents the windows installer executable from being
created, since the svn_revision define in the generated svn_version.iss
file gets set to "unset" instead of an empty string. Which in its turn
is an invalid version value value for Inno Setup.
The attached patch fixes this.
[[
* packages/windows-innosetup/tools/set_version.pl:
Produce the same output file, regardless of the -a parameter
]]
Kind regards,
Gerrit Jan
--
G.J. Doornink <dkg@xs4all.nl>
Index: packages/windows-innosetup/tools/set_version.pl
===================================================================
--- packages/windows-innosetup/tools/set_version.pl (revision 21011)
+++ packages/windows-innosetup/tools/set_version.pl (working copy)
@@ -127,11 +127,11 @@
{
my ($SvnVersion, $SvnRevision) = &SvnVersion;
my ($InputVersion, $InputRevision)='';
-
- $SvnRevision = "unset" if (! $SvnRevision);
if (! $g_AutoRun)
{
+ $SvnRevision = "unset" if (! $SvnRevision);
+
print "\nsvn.exe that's mentioned in your svn_dynamics.iss file have ",
"told me that the\n",
"version you want to make a distro from is $SvnVersion and that the ",
@@ -255,7 +255,7 @@
}
else
{
- $SvnRetVal =~ s/([\d]?\.[\d]{1,2}\.[\d]{1,2})/$1/;
+ $SvnRetVal =~ s/([\d]?\.[\d]{1,2}\.[\d]{1,2}).*/$1/;
$SvnVersion = $SvnRetVal;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Aug 8 14:55:35 2006