diff --git a/checkin_notes b/checkin_notes index 9ca39b3e55..35bc9f5cfc 100644 --- a/checkin_notes +++ b/checkin_notes @@ -5443,3 +5443,21 @@ David 11 June 2009 tools/ make_project upgrade + +Rom 11 June 2009 + - SCR: Update default values per BOINC defaults. + - PTP: Add files needed by the installer(s). + + clientscr/progress/ + + clientscr/ + screensaver.h + win_build/installerv2/ + Progress.ism + Progressx64.ism + win_build/installerv2/redist/0409/ + ptp-eula.rtf + win_build/installerv2/redist/Progress/ + acct_mgr_url.xml + progress.ico + ss_config.xml diff --git a/clientscr/progress/boincscr.exe b/clientscr/progress/win/x86/boincscr.exe similarity index 100% rename from clientscr/progress/boincscr.exe rename to clientscr/progress/win/x86/boincscr.exe diff --git a/clientscr/progress/gr.jpg b/clientscr/progress/win/x86/gr.jpg similarity index 100% rename from clientscr/progress/gr.jpg rename to clientscr/progress/win/x86/gr.jpg diff --git a/clientscr/progress/gr_mask.rgb b/clientscr/progress/win/x86/gr_mask.rgb similarity index 100% rename from clientscr/progress/gr_mask.rgb rename to clientscr/progress/win/x86/gr_mask.rgb diff --git a/clientscr/progress/gradient.jpg b/clientscr/progress/win/x86/gradient.jpg similarity index 100% rename from clientscr/progress/gradient.jpg rename to clientscr/progress/win/x86/gradient.jpg diff --git a/clientscr/progress/project.jpg b/clientscr/progress/win/x86/project.jpg similarity index 100% rename from clientscr/progress/project.jpg rename to clientscr/progress/win/x86/project.jpg diff --git a/clientscr/progress/project_mask.rgb b/clientscr/progress/win/x86/project_mask.rgb similarity index 100% rename from clientscr/progress/project_mask.rgb rename to clientscr/progress/win/x86/project_mask.rgb diff --git a/clientscr/progress/simt b/clientscr/progress/win/x86/simt similarity index 100% rename from clientscr/progress/simt rename to clientscr/progress/win/x86/simt diff --git a/clientscr/progress/total.jpg b/clientscr/progress/win/x86/total.jpg similarity index 100% rename from clientscr/progress/total.jpg rename to clientscr/progress/win/x86/total.jpg diff --git a/clientscr/progress/total_mask.rgb b/clientscr/progress/win/x86/total_mask.rgb similarity index 100% rename from clientscr/progress/total_mask.rgb rename to clientscr/progress/win/x86/total_mask.rgb diff --git a/clientscr/screensaver.h b/clientscr/screensaver.h index 3729dfee48..6c6f75578f 100644 --- a/clientscr/screensaver.h +++ b/clientscr/screensaver.h @@ -20,9 +20,9 @@ #define __SCREENSAVER_H__ // Default values, overriden by screensaver config file ss_config.xml -#define GFX_DEFAULT_PERIOD 600 /* if default OpenGL screensaver exists, display it for 600 secs */ -#define GFX_SCIENCE_PERIOD 1800 /* Display various science graphics apps for 1800 secs */ -#define GFX_CHANGE_PERIOD 600 /* if > 1 CPUs, change screensaver every 600 secs */ +#define GFX_DEFAULT_PERIOD 120 /* if default OpenGL screensaver exists, display it for 2 minutes */ +#define GFX_SCIENCE_PERIOD 600 /* Display various science graphics apps for 10 minutes */ +#define GFX_CHANGE_PERIOD 300 /* if > 1 CPUs, change screensaver every 5 minutes */ enum SS_PHASE { DEFAULT_SS_PHASE, diff --git a/win_build/installerv2/Progress.ism b/win_build/installerv2/Progress.ism new file mode 100644 index 0000000000..8460ed3fbb Binary files /dev/null and b/win_build/installerv2/Progress.ism differ diff --git a/win_build/installerv2/Progressx64.ism b/win_build/installerv2/Progressx64.ism new file mode 100644 index 0000000000..605e3f05d5 Binary files /dev/null and b/win_build/installerv2/Progressx64.ism differ diff --git a/win_build/installerv2/redist/0409/ptp-eula.rtf b/win_build/installerv2/redist/0409/ptp-eula.rtf new file mode 100644 index 0000000000..032951e4d3 --- /dev/null +++ b/win_build/installerv2/redist/0409/ptp-eula.rtf @@ -0,0 +1,22 @@ +{\rtf1\ansi\ansicpg1252\deff0\deflang1033\deflangfe1033{\fonttbl{\f0\fmodern\fprq1\fcharset0 Courier New;}} +{\colortbl ;\red0\green0\blue255;} +{\*\generator Msftedit 5.41.21.2506;}\viewkind4\uc1\pard\nowidctlpar\f0\fs20 Progress Thru Processors\par +\par +License Agreement\par +\par +Please carefully read the following terms and conditions before using this software. Your use of this software indicates your acceptance of this license agreement and warranty.\par +\par +Disclaimer of Warranty\par +\par +THIS SOFTWARE AND THE ACCOMPANYING FILES ARE DISTRIBUTED "AS IS" AND WITHOUT WARRANTIES OF ANY KIND, AND THE IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE HEREBY DISCLAIMED. ANY STATUTORY WARRANTY OF NON-INFRINGEMENT IS ALSO DISCLAIMED.\par +\par +Restrictions\par +\par +You may use this software on a computer system only if you own the system or have the permission of the owner.\par +\par +Distribution\par +\par +\pard This is free software. It is distributed under the terms of the GNU Lesser General Public License as published by the Free Software Foundation (http://www.fsf.org/). The source code may be obtained from the BOINC web site (http://boinc.berkeley.edu/).\par +\par +} + \ No newline at end of file diff --git a/win_build/installerv2/redist/Progress/acct_mgr_url.xml b/win_build/installerv2/redist/Progress/acct_mgr_url.xml new file mode 100644 index 0000000000..23852fc02e --- /dev/null +++ b/win_build/installerv2/redist/Progress/acct_mgr_url.xml @@ -0,0 +1,16 @@ + + GridRepublic + http://www.gridrepublic.org/ + +1024 +9c3af22a230f1eb122b8eab256e5e46b49f6d357e65d00e414cf6af105aef217 +1de0793353097bbbb918413f79cb5bfaa4532daf061ece07b63f209690a3e1b1 +8906a9ae4f521ec25e6fb79b8679dd4c18c0f022dcb95baefeca091d572c7738 +e1b1d542bbec94552e0e37c698427f4538b947b79072d112ebcf4d9c509b16d9 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000000000 +0000000000000000000000000000000000000000000000000000000000010001 +. + + \ No newline at end of file diff --git a/win_build/installerv2/redist/Progress/progress.ico b/win_build/installerv2/redist/Progress/progress.ico new file mode 100644 index 0000000000..337a3ec9b7 Binary files /dev/null and b/win_build/installerv2/redist/Progress/progress.ico differ diff --git a/win_build/installerv2/redist/Progress/ss_config.xml b/win_build/installerv2/redist/Progress/ss_config.xml new file mode 100644 index 0000000000..276811bb72 --- /dev/null +++ b/win_build/installerv2/redist/Progress/ss_config.xml @@ -0,0 +1,3 @@ + + 1 +