Re: [boinc_dev] Wrapper resource file version corrupted

[Rom Walton]

I've applied your patch to the wrapper and vboxwrapper.

Leaving git enabled in Trac was causing our server performance problems.
We disabled it until we can complete the migration to a new server.

- Rom

-Original Message-
From: Teemu Mannermaa [mailto:t...@sci.fi] 
Sent: Sunday, September 07, 2014 9:15 AM
To: BOINC Developers Mailing List
Cc: Rom Walton
Subject: Wrapper resource file version corrupted

Hi,

Commit
http://boinc.berkeley.edu/gitweb/?p=boinc-v2.git;a=commit;h=9f5e9a0b7e7f
c39915cc6abcd0fb5fccfa738822
is awesome but unfortunately the way FileVersion and ProductVersion are
set they end up containing junk (binary data, instead of text strings).
:(

Attached is a patch that fixes it but you could also make an already
stringified version for wrapper and use that instead.

PS. Your trac git browser is broken and just throws error Unsupported
version control system git: Can't find an appropriate component, maybe
the corresponding plugin was not enabled?. :(
--
Teemu Mannermaa
System Specialist

Anything is possible but probabilities vary.

___
boinc_dev mailing list
boinc_dev@ssl.berkeley.edu
http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev
To unsubscribe, visit the above URL and
(near bottom of page) enter your email address.

[boinc_dev] Wrapper resource file version corrupted

[Teemu Mannermaa]

Hi,

Commit
http://boinc.berkeley.edu/gitweb/?p=boinc-v2.git;a=commit;h=9f5e9a0b7e7fc39915cc6abcd0fb5fccfa738822
is awesome but unfortunately the way FileVersion and ProductVersion are
set they end up containing junk (binary data, instead of text strings). :(

Attached is a patch that fixes it but you could also make an already
stringified version for wrapper and use that instead.

PS. Your trac git browser is broken and just throws error Unsupported
version control system git: Can't find an appropriate component, maybe
the corresponding plugin was not enabled?. :(
-- 
Teemu Mannermaa
System Specialist

Anything is possible but probabilities vary.

diff --git a/samples/wrapper/wrapper_win.rc b/samples/wrapper/wrapper_win.rc
index c2cc384..1704abe 100644
--- a/samples/wrapper/wrapper_win.rc
+++ b/samples/wrapper/wrapper_win.rc
@@ -33,6 +33,10 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 // Version
 //
 
+// Helpful macros to convert version to string notation
+#define TOSTR(s) #s
+#define VER_TOSTR(maj,min,rel) TOSTR(maj) . TOSTR(min) . TOSTR(rel) \0
+
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,WRAPPER_RELEASE,0
  PRODUCTVERSION BOINC_MAJOR_VERSION,BOINC_MINOR_VERSION,WRAPPER_RELEASE,0
@@ -52,12 +56,12 @@ BEGIN
 BEGIN
 VALUE CompanyName, Space Sciences Laboratory
 VALUE FileDescription, BOINC Wrapper
-VALUE FileVersion, BOINC_MAJOR_VERSION . BOINC_MINOR_VERSION 
. WRAPPER_RELEASE \0
+VALUE FileVersion, VER_TOSTR(BOINC_MAJOR_VERSION, 
BOINC_MINOR_VERSION, WRAPPER_RELEASE)
 VALUE InternalName, vboxwrapper
 VALUE LegalCopyright, © 2011-2014 University of California
 VALUE OriginalFilename, wrapper.exe
 VALUE ProductName, BOINC Wrapper
-VALUE ProductVersion, BOINC_MAJOR_VERSION . 
BOINC_MINOR_VERSION . WRAPPER_RELEASE \0
+VALUE ProductVersion, VER_TOSTR(BOINC_MAJOR_VERSION, 
BOINC_MINOR_VERSION, WRAPPER_RELEASE)
 END
 END
 BLOCK VarFileInfo
___
boinc_dev mailing list
boinc_dev@ssl.berkeley.edu
http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev
To unsubscribe, visit the above URL and
(near bottom of page) enter your email address.