From b71ff61a81cddca36f7445fea0b91d47cb94cc9b Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Mon, 8 Mar 2004 06:32:42 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=3043 --- checkin_notes | 13 +++++ client/Makefile.am | 15 ++++-- client/win/update-boinc-cli-version | 27 ++++++++++ client/win/update-boinc-dll-version | 27 ++++++++++ client/win/update-boinc-gui-version | 27 ++++++++++ client/win/update-boinc-ss-version | 26 ++++++++++ client/win/update-resource-version | 80 ----------------------------- set-version | 5 +- 8 files changed, 136 insertions(+), 84 deletions(-) create mode 100755 client/win/update-boinc-cli-version create mode 100755 client/win/update-boinc-dll-version create mode 100755 client/win/update-boinc-gui-version create mode 100755 client/win/update-boinc-ss-version delete mode 100755 client/win/update-resource-version diff --git a/checkin_notes b/checkin_notes index 4c01a3b8dc..ded8d7aef6 100755 --- a/checkin_notes +++ b/checkin_notes @@ -10397,3 +10397,16 @@ Rom Mar 6 2004 lib/ util.c, .h + +Rom Mar 6 2004 + - Updated the version setting code so that it will include the new file resources for Windows + + / + set-verson + client/ + makefile.am + client/win/ + update-boinc-cli-version + update-boinc-dll-version + update-boinc-gui-version + update-boinc-ss-version diff --git a/client/Makefile.am b/client/Makefile.am index 85a46b1371..c3cc51cb97 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -66,10 +66,19 @@ client-bin-gz: @CLIENT_BIN_FILENAME@.gz win/win_config.h: $(top_srcdir)/config.h grep '#define.*VERSION' $^ > $@ -win/resource.rc: $(top_srcdir)/config.h - cd win && ./update-resource-version +win/boinc_cli.rc: $(top_srcdir)/config.h + cd win && ./update-boinc-cli-version -version: win/win_config.h win/resource.rc +win/boinc_dll.rc: $(top_srcdir)/config.h + cd win && ./update-boinc-dll-version + +win/boinc_gui.rc: $(top_srcdir)/config.h + cd win && ./update-boinc-gui-version + +win/boinc_ss.rc: $(top_srcdir)/config.h + cd win && ./update-boinc-ss-version + +version: win/win_config.h win/boinc_cli.rc win/boinc_dll.rc win/boinc_gui.rc win/boinc_ss.rc # make a hard link to the client name. @CLIENT_BIN_FILENAME@: boinc_client diff --git a/client/win/update-boinc-cli-version b/client/win/update-boinc-cli-version new file mode 100755 index 0000000000..f695805bdb --- /dev/null +++ b/client/win/update-boinc-cli-version @@ -0,0 +1,27 @@ +#!/usr/bin/env python + +# $Id$ +# update boinc_cli.rc with version numbers. + +import boinc_path_config +from Boinc.version import * +import os, re + +version_string = '%d,%d,0,0' % (MAJOR_VERSION, MINOR_VERSION) +version_string_spaces = '"%d, %d, 0, 0\\\\0"' % (MAJOR_VERSION, MINOR_VERSION) + + +fn_boinc_cli_rc_old = 'boinc_cli.rc.old' +fn_boinc_cli_rc = 'boinc_cli.rc' + +os.rename(fn_boinc_cli_rc, fn_boinc_cli_rc_old) +rc_boinc_cli_old = open(fn_boinc_cli_rc_old) +rc_boinc_cli = open(fn_boinc_cli_rc, 'w') + +for line in rc_boinc_cli_old: + line = re.sub('( +(FILEVERSION|PRODUDUCTVERSION) +).*', '\\1'+version_string, line) + line = re.sub('( +VALUE "(FileVersion|ProductVersion)", +).*', '\\1'+version_string_spaces, line) + rc_boinc_cli.write(line) + +print "Updated boinc_cli.rc to version %d.%02d" %(MAJOR_VERSION, MINOR_VERSION) + diff --git a/client/win/update-boinc-dll-version b/client/win/update-boinc-dll-version new file mode 100755 index 0000000000..6f6ff29318 --- /dev/null +++ b/client/win/update-boinc-dll-version @@ -0,0 +1,27 @@ +#!/usr/bin/env python + +# $Id$ +# update boinc_dll.rc with version numbers. + +import boinc_path_config +from Boinc.version import * +import os, re + +version_string = '%d,%d,0,0' % (MAJOR_VERSION, MINOR_VERSION) +version_string_spaces = '"%d, %d, 0, 0\\\\0"' % (MAJOR_VERSION, MINOR_VERSION) + + +fn_boinc_dll_rc_old = 'boinc_dll.rc.old' +fn_boinc_dll_rc = 'boinc_dll.rc' + +os.rename(fn_boinc_dll_rc, fn_boinc_dll_rc_old) +rc_boinc_dll_old = open(fn_boinc_dll_rc_old) +rc_boinc_dll = open(fn_boinc_dll_rc, 'w') + +for line in rc_boinc_dll_old: + line = re.sub('( +(FILEVERSION|PRODUDUCTVERSION) +).*', '\\1'+version_string, line) + line = re.sub('( +VALUE "(FileVersion|ProductVersion)", +).*', '\\1'+version_string_spaces, line) + rc_boinc_dll.write(line) + +print "Updated boinc_dll.rc to version %d.%02d" %(MAJOR_VERSION, MINOR_VERSION) + diff --git a/client/win/update-boinc-gui-version b/client/win/update-boinc-gui-version new file mode 100755 index 0000000000..543ff31473 --- /dev/null +++ b/client/win/update-boinc-gui-version @@ -0,0 +1,27 @@ +#!/usr/bin/env python + +# $Id$ +# update boinc_gui.rc with version numbers. + +import boinc_path_config +from Boinc.version import * +import os, re + +version_string = '%d,%d,0,0' % (MAJOR_VERSION, MINOR_VERSION) +version_string_spaces = '"%d, %d, 0, 0\\\\0"' % (MAJOR_VERSION, MINOR_VERSION) + + +fn_boinc_gui_rc_old = 'boinc_gui.rc.old' +fn_boinc_gui_rc = 'boinc_gui.rc' + +os.rename(fn_boinc_gui_rc, fn_boinc_gui_rc_old) +rc_boinc_gui_old = open(fn_boinc_gui_rc_old) +rc_boinc_gui = open(fn_boinc_gui_rc, 'w') + +for line in rc_boinc_gui_old: + line = re.sub('( +(FILEVERSION|PRODUDUCTVERSION) +).*', '\\1'+version_string, line) + line = re.sub('( +VALUE "(FileVersion|ProductVersion)", +).*', '\\1'+version_string_spaces, line) + rc_boinc_gui.write(line) + +print "Updated boinc_gui.rc to version %d.%02d" %(MAJOR_VERSION, MINOR_VERSION) + diff --git a/client/win/update-boinc-ss-version b/client/win/update-boinc-ss-version new file mode 100755 index 0000000000..73f152c0b6 --- /dev/null +++ b/client/win/update-boinc-ss-version @@ -0,0 +1,26 @@ +#!/usr/bin/env python + +# $Id$ +# update boinc_ss.rc with version numbers. + +import boinc_path_config +from Boinc.version import * +import os, re + +version_string = '%d,%d,0,0' % (MAJOR_VERSION, MINOR_VERSION) +version_string_spaces = '"%d, %d, 0, 0\\\\0"' % (MAJOR_VERSION, MINOR_VERSION) + + +fn_boinc_ss_rc_old = 'boinc_ss.rc.old' +fn_boinc_ss_rc = 'boinc_ss.rc' + +os.rename(fn_boinc_ss_rc, fn_boinc_ss_rc_old) +rc_boinc_ss_old = open(fn_boinc_ss_rc_old) +rc_boinc_ss = open(fn_boinc_ss_rc, 'w') + +for line in rc_boinc_ss_old: + line = re.sub('( +(FILEVERSION|PRODUDUCTVERSION) +).*', '\\1'+version_string, line) + line = re.sub('( +VALUE "(FileVersion|ProductVersion)", +).*', '\\1'+version_string_spaces, line) + rc_boinc_ss.write(line) + +print "Updated boinc_ss.rc to version %d.%02d" %(MAJOR_VERSION, MINOR_VERSION) diff --git a/client/win/update-resource-version b/client/win/update-resource-version deleted file mode 100755 index e021d63ae4..0000000000 --- a/client/win/update-resource-version +++ /dev/null @@ -1,80 +0,0 @@ -#!/usr/bin/env python - -# $Id$ -# update boinc_cli.rc with version numbers. -# update boinc_dll.rc with version numbers. -# update boinc_gui.rc with version numbers. -# update boinc_ss.rc with version numbers. - -import boinc_path_config -from Boinc.version import * -import os, re - -version_string = '%d,%d,0,0' % (MAJOR_VERSION, MINOR_VERSION) -version_string_spaces = '"%d, %d, 0, 0\\\\0"' % (MAJOR_VERSION, MINOR_VERSION) - - -fn_boinc_cli_rc_old = 'boinc_cli.rc.old' -fn_boinc_cli_rc = 'boinc_cli.rc' - -os.rename(fn_boinc_cli_rc, fn_boinc_cli_rc_old) -rc_boinc_cli_old = open(fn_boinc_cli_rc_old) -rc_boinc_cli = open(fn_boinc_cli_rc, 'w') - -for line in rc_boinc_cli_old: - line = re.sub('( +(FILEVERSION|PRODUDUCTVERSION) +).*', '\\1'+version_string, line) - line = re.sub('( +VALUE "(FileVersion|ProductVersion)", +).*', '\\1'+version_string_spaces, line) - rc_boinc_cli.write(line) - -print "Updated boinc_cli.rc to version %d.%02d" %(MAJOR_VERSION, MINOR_VERSION) - - - - -fn_boinc_dll_rc_old = 'boinc_dll.rc.old' -fn_boinc_dll_rc = 'boinc_dll.rc' - -os.rename(fn_boinc_dll_rc, fn_boinc_dll_rc_old) -rc_boinc_dll_old = open(fn_boinc_dll_rc_old) -rc_boinc_dll = open(fn_boinc_dll_rc, 'w') - -for line in rc_boinc_dll_old: - line = re.sub('( +(FILEVERSION|PRODUDUCTVERSION) +).*', '\\1'+version_string, line) - line = re.sub('( +VALUE "(FileVersion|ProductVersion)", +).*', '\\1'+version_string_spaces, line) - rc_boinc_dll.write(line) - -print "Updated boinc_dll.rc to version %d.%02d" %(MAJOR_VERSION, MINOR_VERSION) - - - - -fn_boinc_gui_rc_old = 'boinc_gui.rc.old' -fn_boinc_gui_rc = 'boinc_gui.rc' - -os.rename(fn_boinc_gui_rc, fn_boinc_gui_rc_old) -rc_boinc_gui_old = open(fn_boinc_gui_rc_old) -rc_boinc_gui = open(fn_boinc_gui_rc, 'w') - -for line in rc_boinc_gui_old: - line = re.sub('( +(FILEVERSION|PRODUDUCTVERSION) +).*', '\\1'+version_string, line) - line = re.sub('( +VALUE "(FileVersion|ProductVersion)", +).*', '\\1'+version_string_spaces, line) - rc_boinc_gui.write(line) - -print "Updated boinc_gui.rc to version %d.%02d" %(MAJOR_VERSION, MINOR_VERSION) - - - - -fn_boinc_ss_rc_old = 'boinc_ss.rc.old' -fn_boinc_ss_rc = 'boinc_ss.rc' - -os.rename(fn_boinc_ss_rc, fn_boinc_ss_rc_old) -rc_boinc_ss_old = open(fn_boinc_ss_rc_old) -rc_boinc_ss = open(fn_boinc_ss_rc, 'w') - -for line in rc_boinc_ss_old: - line = re.sub('( +(FILEVERSION|PRODUDUCTVERSION) +).*', '\\1'+version_string, line) - line = re.sub('( +VALUE "(FileVersion|ProductVersion)", +).*', '\\1'+version_string_spaces, line) - rc_boinc_ss.write(line) - -print "Updated boinc_ss.rc to version %d.%02d" %(MAJOR_VERSION, MINOR_VERSION) diff --git a/set-version b/set-version index 7299ca21f6..1f6b1b7d0d 100755 --- a/set-version +++ b/set-version @@ -29,4 +29,7 @@ fi cmd ./_autosetup -c cmd cd client cmd make win/win_config.h -cmd make win/resource.rc +cmd make win/boinc_cli.rc +cmd make win/boinc_dll.rc +cmd make win/boinc_gui.rc +cmd make win/boinc_ss.rc