From c9320f38f25df841083bf9eb3575c223cea7d2e3 Mon Sep 17 00:00:00 2001 From: jsmorley Date: Sat, 17 Apr 2010 02:00:09 +0000 Subject: [PATCH] Rainstaller: This commit is to get the repository set up to add Rainstaller.exe to the Rainmeter build and installation package - Rainstaller is installed to the Rainmeter program folder under \Addons\Rainstaller Rainstaller.exe Rainstaller.chm - A file association is created for the extension .rmskins to allow double clicking a .rmskins file to open Rainstaller.exe, unpack the .rmskins archive (it is a renamed .zip file) and install the Skin(s) / Themes included. - Rainstaller.lnk (Rainstaller.exe) and Rainstaller Help.lnk (Rainstaller Help.chm) are added to the Windows Start Menu under Rainmeter - Code added to the "uninstall" routines in Rainmeter Install Script.nsi to remove the file association for Rainstaller.exe / .rmskins on uninstall of Rainmeter and to remove the links from the Windows Start Menu. ***************** Code Changes: - New version of Build.py for compiling all source code - New version of Rainmeter Install Script.nsi for creating the Rainmeter installation package - Source code and build script for Rainstaller in \Addons\Rainstaller\Source Rainmeter.nsi Rainmeter.chm \include (folder has some addon scripts and plugins for NSIS) Note: As of this build, everything works EXCEPT that Rainstaller can only be used by double-clicking a .rmskins file. The ability to drag and drop a .rmskins file on Rainstaller.exe or to run Rainstaller.exe and "browse" to open a .rmskins file is coming in the next day or two. --- Application/Application.rc | 8 ++++---- Rainmeter.sln | 35 ++++++++++++++++++----------------- revision-number.h | 2 +- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/Application/Application.rc b/Application/Application.rc index 9b002e8a..f64e608f 100644 --- a/Application/Application.rc +++ b/Application/Application.rc @@ -27,8 +27,8 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,0,376 - PRODUCTVERSION 1,2,0,376 + FILEVERSION 1,2,0,377 + PRODUCTVERSION 1,2,0,377 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -44,12 +44,12 @@ BEGIN BLOCK "040b04b0" BEGIN VALUE "FileDescription", "Rainmeter - A Customizable Resource Meter" - VALUE "FileVersion", "1, 2, 0, 376" + VALUE "FileVersion", "1, 2, 0, 377" VALUE "InternalName", "Rainmeter" VALUE "LegalCopyright", "Copyright (C) 2010 - Rainy" VALUE "OriginalFilename", "Rainmeter.exe" VALUE "ProductName", "Rainmeter" - VALUE "ProductVersion", "1, 2, 0, 376" + VALUE "ProductVersion", "1, 2, 0, 377" END END BLOCK "VarFileInfo" diff --git a/Rainmeter.sln b/Rainmeter.sln index dfa1e37e..873dddac 100644 --- a/Rainmeter.sln +++ b/Rainmeter.sln @@ -102,7 +102,7 @@ Global {D2A0903C-E760-4134-AE61-3D55BF8F760C}.Debug|x64.ActiveCfg = Debug|Win32 {D2A0903C-E760-4134-AE61-3D55BF8F760C}.Release|Win32.ActiveCfg = Release|Win32 {D2A0903C-E760-4134-AE61-3D55BF8F760C}.Release|Win32.Build.0 = Release|Win32 - {D2A0903C-E760-4134-AE61-3D55BF8F760C}.Release|x64.ActiveCfg = Release|Win32 + {D2A0903C-E760-4134-AE61-3D55BF8F760C}.Release|x64.ActiveCfg = Release|x64 {D2A0903C-E760-4134-AE61-3D55BF8F760C}.Release64|Win32.ActiveCfg = Release64|Win32 {D2A0903C-E760-4134-AE61-3D55BF8F760C}.Release64|Win32.Build.0 = Release64|Win32 {D2A0903C-E760-4134-AE61-3D55BF8F760C}.Release64|x64.ActiveCfg = Release64|x64 @@ -124,7 +124,7 @@ Global {EE8EC522-8430-4B46-86A3-D943D77F9E4B}.Debug|x64.ActiveCfg = Debug|Win32 {EE8EC522-8430-4B46-86A3-D943D77F9E4B}.Release|Win32.ActiveCfg = Release|Win32 {EE8EC522-8430-4B46-86A3-D943D77F9E4B}.Release|Win32.Build.0 = Release|Win32 - {EE8EC522-8430-4B46-86A3-D943D77F9E4B}.Release|x64.ActiveCfg = Release|Win32 + {EE8EC522-8430-4B46-86A3-D943D77F9E4B}.Release|x64.ActiveCfg = Release|x64 {EE8EC522-8430-4B46-86A3-D943D77F9E4B}.Release64|Win32.ActiveCfg = Release64|Win32 {EE8EC522-8430-4B46-86A3-D943D77F9E4B}.Release64|Win32.Build.0 = Release64|Win32 {EE8EC522-8430-4B46-86A3-D943D77F9E4B}.Release64|x64.ActiveCfg = Release64|x64 @@ -134,16 +134,17 @@ Global {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Debug|x64.ActiveCfg = Debug|Win32 {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Release|Win32.ActiveCfg = Release|Win32 {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Release|Win32.Build.0 = Release|Win32 - {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Release|x64.ActiveCfg = Release|Win32 + {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Release|x64.ActiveCfg = Release|x64 {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Release64|Win32.ActiveCfg = Release64|Win32 {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Release64|Win32.Build.0 = Release64|Win32 {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Release64|x64.ActiveCfg = Release64|x64 + {761BAD94-EA54-4DBD-9FF0-50FDAFECBE93}.Release64|x64.Build.0 = Release64|x64 {BCE0E543-7ADC-4E10-AD66-52E90F70ED4A}.Debug|Win32.ActiveCfg = Debug|Win32 {BCE0E543-7ADC-4E10-AD66-52E90F70ED4A}.Debug|Win32.Build.0 = Debug|Win32 {BCE0E543-7ADC-4E10-AD66-52E90F70ED4A}.Debug|x64.ActiveCfg = Debug|Win32 {BCE0E543-7ADC-4E10-AD66-52E90F70ED4A}.Release|Win32.ActiveCfg = Release|Win32 {BCE0E543-7ADC-4E10-AD66-52E90F70ED4A}.Release|Win32.Build.0 = Release|Win32 - {BCE0E543-7ADC-4E10-AD66-52E90F70ED4A}.Release|x64.ActiveCfg = Release|Win32 + {BCE0E543-7ADC-4E10-AD66-52E90F70ED4A}.Release|x64.ActiveCfg = Release|x64 {BCE0E543-7ADC-4E10-AD66-52E90F70ED4A}.Release64|Win32.ActiveCfg = Release64|Win32 {BCE0E543-7ADC-4E10-AD66-52E90F70ED4A}.Release64|Win32.Build.0 = Release64|Win32 {BCE0E543-7ADC-4E10-AD66-52E90F70ED4A}.Release64|x64.ActiveCfg = Release64|x64 @@ -153,7 +154,7 @@ Global {5344B52B-BAC3-479C-B41D-D465B8BDA1AD}.Debug|x64.ActiveCfg = Debug|Win32 {5344B52B-BAC3-479C-B41D-D465B8BDA1AD}.Release|Win32.ActiveCfg = Release|Win32 {5344B52B-BAC3-479C-B41D-D465B8BDA1AD}.Release|Win32.Build.0 = Release|Win32 - {5344B52B-BAC3-479C-B41D-D465B8BDA1AD}.Release|x64.ActiveCfg = Release|Win32 + {5344B52B-BAC3-479C-B41D-D465B8BDA1AD}.Release|x64.ActiveCfg = Release|x64 {5344B52B-BAC3-479C-B41D-D465B8BDA1AD}.Release64|Win32.ActiveCfg = Release64|Win32 {5344B52B-BAC3-479C-B41D-D465B8BDA1AD}.Release64|Win32.Build.0 = Release64|Win32 {5344B52B-BAC3-479C-B41D-D465B8BDA1AD}.Release64|x64.ActiveCfg = Release64|x64 @@ -163,7 +164,7 @@ Global {C862B662-5CC6-4E79-B1B3-905E0B98D627}.Debug|x64.ActiveCfg = Debug|Win32 {C862B662-5CC6-4E79-B1B3-905E0B98D627}.Release|Win32.ActiveCfg = Release|Win32 {C862B662-5CC6-4E79-B1B3-905E0B98D627}.Release|Win32.Build.0 = Release|Win32 - {C862B662-5CC6-4E79-B1B3-905E0B98D627}.Release|x64.ActiveCfg = Release|Win32 + {C862B662-5CC6-4E79-B1B3-905E0B98D627}.Release|x64.ActiveCfg = Release|x64 {C862B662-5CC6-4E79-B1B3-905E0B98D627}.Release64|Win32.ActiveCfg = Release64|Win32 {C862B662-5CC6-4E79-B1B3-905E0B98D627}.Release64|Win32.Build.0 = Release64|Win32 {C862B662-5CC6-4E79-B1B3-905E0B98D627}.Release64|x64.ActiveCfg = Release64|x64 @@ -173,7 +174,7 @@ Global {C30E7EB6-9655-4AF4-98AE-D6E6B14631AF}.Debug|x64.ActiveCfg = Debug|Win32 {C30E7EB6-9655-4AF4-98AE-D6E6B14631AF}.Release|Win32.ActiveCfg = Release|Win32 {C30E7EB6-9655-4AF4-98AE-D6E6B14631AF}.Release|Win32.Build.0 = Release|Win32 - {C30E7EB6-9655-4AF4-98AE-D6E6B14631AF}.Release|x64.ActiveCfg = Release|Win32 + {C30E7EB6-9655-4AF4-98AE-D6E6B14631AF}.Release|x64.ActiveCfg = Release|x64 {C30E7EB6-9655-4AF4-98AE-D6E6B14631AF}.Release64|Win32.ActiveCfg = Release64|Win32 {C30E7EB6-9655-4AF4-98AE-D6E6B14631AF}.Release64|Win32.Build.0 = Release64|Win32 {C30E7EB6-9655-4AF4-98AE-D6E6B14631AF}.Release64|x64.ActiveCfg = Release64|x64 @@ -183,7 +184,7 @@ Global {C029E0CF-F203-41D0-9608-A3EA2CF0ED1F}.Debug|x64.ActiveCfg = Debug|Win32 {C029E0CF-F203-41D0-9608-A3EA2CF0ED1F}.Release|Win32.ActiveCfg = Release|Win32 {C029E0CF-F203-41D0-9608-A3EA2CF0ED1F}.Release|Win32.Build.0 = Release|Win32 - {C029E0CF-F203-41D0-9608-A3EA2CF0ED1F}.Release|x64.ActiveCfg = Release|Win32 + {C029E0CF-F203-41D0-9608-A3EA2CF0ED1F}.Release|x64.ActiveCfg = Release|x64 {C029E0CF-F203-41D0-9608-A3EA2CF0ED1F}.Release64|Win32.ActiveCfg = Release64|Win32 {C029E0CF-F203-41D0-9608-A3EA2CF0ED1F}.Release64|Win32.Build.0 = Release64|Win32 {C029E0CF-F203-41D0-9608-A3EA2CF0ED1F}.Release64|x64.ActiveCfg = Release64|x64 @@ -193,7 +194,7 @@ Global {17D3BD92-6F5D-438C-A89B-88F4CE06DB94}.Debug|x64.ActiveCfg = Debug|Win32 {17D3BD92-6F5D-438C-A89B-88F4CE06DB94}.Release|Win32.ActiveCfg = Release|Win32 {17D3BD92-6F5D-438C-A89B-88F4CE06DB94}.Release|Win32.Build.0 = Release|Win32 - {17D3BD92-6F5D-438C-A89B-88F4CE06DB94}.Release|x64.ActiveCfg = Release|Win32 + {17D3BD92-6F5D-438C-A89B-88F4CE06DB94}.Release|x64.ActiveCfg = Release|x64 {17D3BD92-6F5D-438C-A89B-88F4CE06DB94}.Release64|Win32.ActiveCfg = Release64|Win32 {17D3BD92-6F5D-438C-A89B-88F4CE06DB94}.Release64|Win32.Build.0 = Release64|Win32 {17D3BD92-6F5D-438C-A89B-88F4CE06DB94}.Release64|x64.ActiveCfg = Release64|x64 @@ -203,7 +204,7 @@ Global {D10AB316-0F7A-4551-BE4F-385E04CCF1E8}.Debug|x64.ActiveCfg = Debug|Win32 {D10AB316-0F7A-4551-BE4F-385E04CCF1E8}.Release|Win32.ActiveCfg = Release|Win32 {D10AB316-0F7A-4551-BE4F-385E04CCF1E8}.Release|Win32.Build.0 = Release|Win32 - {D10AB316-0F7A-4551-BE4F-385E04CCF1E8}.Release|x64.ActiveCfg = Release|Win32 + {D10AB316-0F7A-4551-BE4F-385E04CCF1E8}.Release|x64.ActiveCfg = Release|x64 {D10AB316-0F7A-4551-BE4F-385E04CCF1E8}.Release64|Win32.ActiveCfg = Release64|Win32 {D10AB316-0F7A-4551-BE4F-385E04CCF1E8}.Release64|Win32.Build.0 = Release64|Win32 {D10AB316-0F7A-4551-BE4F-385E04CCF1E8}.Release64|x64.ActiveCfg = Release64|x64 @@ -213,7 +214,7 @@ Global {6EBCA4DA-8CC7-42FE-8F45-878ABE165078}.Debug|x64.ActiveCfg = Debug|Win32 {6EBCA4DA-8CC7-42FE-8F45-878ABE165078}.Release|Win32.ActiveCfg = Release|Win32 {6EBCA4DA-8CC7-42FE-8F45-878ABE165078}.Release|Win32.Build.0 = Release|Win32 - {6EBCA4DA-8CC7-42FE-8F45-878ABE165078}.Release|x64.ActiveCfg = Release|Win32 + {6EBCA4DA-8CC7-42FE-8F45-878ABE165078}.Release|x64.ActiveCfg = Release|x64 {6EBCA4DA-8CC7-42FE-8F45-878ABE165078}.Release64|Win32.ActiveCfg = Release64|Win32 {6EBCA4DA-8CC7-42FE-8F45-878ABE165078}.Release64|Win32.Build.0 = Release64|Win32 {6EBCA4DA-8CC7-42FE-8F45-878ABE165078}.Release64|x64.ActiveCfg = Release64|x64 @@ -223,7 +224,7 @@ Global {8B820B9F-C154-417C-A090-42198F2AF496}.Debug|x64.ActiveCfg = Debug|Win32 {8B820B9F-C154-417C-A090-42198F2AF496}.Release|Win32.ActiveCfg = Release|Win32 {8B820B9F-C154-417C-A090-42198F2AF496}.Release|Win32.Build.0 = Release|Win32 - {8B820B9F-C154-417C-A090-42198F2AF496}.Release|x64.ActiveCfg = Release|Win32 + {8B820B9F-C154-417C-A090-42198F2AF496}.Release|x64.ActiveCfg = Release|x64 {8B820B9F-C154-417C-A090-42198F2AF496}.Release64|Win32.ActiveCfg = Release64|Win32 {8B820B9F-C154-417C-A090-42198F2AF496}.Release64|Win32.Build.0 = Release64|Win32 {8B820B9F-C154-417C-A090-42198F2AF496}.Release64|x64.ActiveCfg = Release64|x64 @@ -233,7 +234,7 @@ Global {B9184DBA-C6B7-44FE-8BBD-0852DB22D2E4}.Debug|x64.ActiveCfg = Debug|Win32 {B9184DBA-C6B7-44FE-8BBD-0852DB22D2E4}.Release|Win32.ActiveCfg = Release|Win32 {B9184DBA-C6B7-44FE-8BBD-0852DB22D2E4}.Release|Win32.Build.0 = Release|Win32 - {B9184DBA-C6B7-44FE-8BBD-0852DB22D2E4}.Release|x64.ActiveCfg = Release|Win32 + {B9184DBA-C6B7-44FE-8BBD-0852DB22D2E4}.Release|x64.ActiveCfg = Release|x64 {B9184DBA-C6B7-44FE-8BBD-0852DB22D2E4}.Release64|Win32.ActiveCfg = Release64|Win32 {B9184DBA-C6B7-44FE-8BBD-0852DB22D2E4}.Release64|Win32.Build.0 = Release64|Win32 {B9184DBA-C6B7-44FE-8BBD-0852DB22D2E4}.Release64|x64.ActiveCfg = Release64|x64 @@ -243,7 +244,7 @@ Global {BEB03F9B-FDC4-4DD4-B315-E3414DB0B137}.Debug|x64.ActiveCfg = Debug|Win32 {BEB03F9B-FDC4-4DD4-B315-E3414DB0B137}.Release|Win32.ActiveCfg = Release|Win32 {BEB03F9B-FDC4-4DD4-B315-E3414DB0B137}.Release|Win32.Build.0 = Release|Win32 - {BEB03F9B-FDC4-4DD4-B315-E3414DB0B137}.Release|x64.ActiveCfg = Release|Win32 + {BEB03F9B-FDC4-4DD4-B315-E3414DB0B137}.Release|x64.ActiveCfg = Release|x64 {BEB03F9B-FDC4-4DD4-B315-E3414DB0B137}.Release64|Win32.ActiveCfg = Release64|Win32 {BEB03F9B-FDC4-4DD4-B315-E3414DB0B137}.Release64|Win32.Build.0 = Release64|Win32 {BEB03F9B-FDC4-4DD4-B315-E3414DB0B137}.Release64|x64.ActiveCfg = Release64|x64 @@ -253,7 +254,7 @@ Global {4F8C4C09-431C-45C4-830B-32006E783C3A}.Debug|x64.ActiveCfg = Debug|Win32 {4F8C4C09-431C-45C4-830B-32006E783C3A}.Release|Win32.ActiveCfg = Release|Win32 {4F8C4C09-431C-45C4-830B-32006E783C3A}.Release|Win32.Build.0 = Release|Win32 - {4F8C4C09-431C-45C4-830B-32006E783C3A}.Release|x64.ActiveCfg = Release|Win32 + {4F8C4C09-431C-45C4-830B-32006E783C3A}.Release|x64.ActiveCfg = Release|x64 {4F8C4C09-431C-45C4-830B-32006E783C3A}.Release64|Win32.ActiveCfg = Release64|Win32 {4F8C4C09-431C-45C4-830B-32006E783C3A}.Release64|Win32.Build.0 = Release64|Win32 {4F8C4C09-431C-45C4-830B-32006E783C3A}.Release64|x64.ActiveCfg = Release64|x64 @@ -263,7 +264,7 @@ Global {A2DD3CBE-B140-4892-A875-24107FA52518}.Debug|x64.ActiveCfg = Debug|Win32 {A2DD3CBE-B140-4892-A875-24107FA52518}.Release|Win32.ActiveCfg = Release|Win32 {A2DD3CBE-B140-4892-A875-24107FA52518}.Release|Win32.Build.0 = Release|Win32 - {A2DD3CBE-B140-4892-A875-24107FA52518}.Release|x64.ActiveCfg = Release|Win32 + {A2DD3CBE-B140-4892-A875-24107FA52518}.Release|x64.ActiveCfg = Release|x64 {A2DD3CBE-B140-4892-A875-24107FA52518}.Release64|Win32.ActiveCfg = Release64|Win32 {A2DD3CBE-B140-4892-A875-24107FA52518}.Release64|Win32.Build.0 = Release64|Win32 {A2DD3CBE-B140-4892-A875-24107FA52518}.Release64|x64.ActiveCfg = Release64|x64 @@ -273,7 +274,7 @@ Global {45A34285-56DD-4521-912B-3F884D36FA35}.Debug|x64.ActiveCfg = Debug|Win32 {45A34285-56DD-4521-912B-3F884D36FA35}.Release|Win32.ActiveCfg = Release|Win32 {45A34285-56DD-4521-912B-3F884D36FA35}.Release|Win32.Build.0 = Release|Win32 - {45A34285-56DD-4521-912B-3F884D36FA35}.Release|x64.ActiveCfg = Release|Win32 + {45A34285-56DD-4521-912B-3F884D36FA35}.Release|x64.ActiveCfg = Release|x64 {45A34285-56DD-4521-912B-3F884D36FA35}.Release64|Win32.ActiveCfg = Release64|Win32 {45A34285-56DD-4521-912B-3F884D36FA35}.Release64|Win32.Build.0 = Release64|Win32 {45A34285-56DD-4521-912B-3F884D36FA35}.Release64|x64.ActiveCfg = Release64|x64 diff --git a/revision-number.h b/revision-number.h index dafd83ba..2eb2c5b9 100644 --- a/revision-number.h +++ b/revision-number.h @@ -1,2 +1,2 @@ #pragma once -const int revision_number = 376; \ No newline at end of file +const int revision_number = 377; \ No newline at end of file