From b0f8b36fed8fddd534660d365974d883ff82aa74 Mon Sep 17 00:00:00 2001 From: RKrom Date: Fri, 5 Apr 2013 12:16:15 +0000 Subject: [PATCH] RC2 Preparations, version update for the next build git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2554 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4 --- Greenshot/AssemblyInfo.cs.template | 2 +- Greenshot/releases/innosetup/setup.iss | 94 +------------------ Greenshot/releases/package.bat | 2 +- .../Properties/AssemblyInfo.cs.template | 2 +- .../Properties/AssemblyInfo.cs.template | 2 +- .../Properties/AssemblyInfo.cs.template | 2 +- .../Properties/AssemblyInfo.cs.template | 2 +- .../Properties/AssemblyInfo.cs.template | 2 +- .../Properties/AssemblyInfo.cs.template | 2 +- .../Properties/AssemblyInfo.cs.template | 2 +- .../Properties/AssemblyInfo.cs.template | 2 +- .../Properties/AssemblyInfo.cs.template | 2 +- .../Properties/AssemblyInfo.cs.template | 2 +- .../Properties/AssemblyInfo.cs.template | 2 +- .../Properties/AssemblyInfo.cs.template | 2 +- .../Properties/AssemblyInfo.cs.template | 2 +- 16 files changed, 17 insertions(+), 107 deletions(-) diff --git a/Greenshot/AssemblyInfo.cs.template b/Greenshot/AssemblyInfo.cs.template index dd8a4a8df..3d9a23f50 100644 --- a/Greenshot/AssemblyInfo.cs.template +++ b/Greenshot/AssemblyInfo.cs.template @@ -47,4 +47,4 @@ using System.Runtime.InteropServices; // You can specify all values by your own or you can build default build and revision // numbers with the '*' character (the default): -[assembly: AssemblyVersion("1.1.1.$WCREV$")] +[assembly: AssemblyVersion("1.1.2.$WCREV$")] diff --git a/Greenshot/releases/innosetup/setup.iss b/Greenshot/releases/innosetup/setup.iss index 374d075f9..762d577c8 100644 --- a/Greenshot/releases/innosetup/setup.iss +++ b/Greenshot/releases/innosetup/setup.iss @@ -1,16 +1,5 @@ #define ExeName "Greenshot" -#define Version "1.1.1.$WCREV$" - -; Include the scripts to install .NET Framework 2.0 -; See http://www.codeproject.com/KB/install/dotnetfx_innosetup_instal.aspx -#include "scripts\products.iss" -#include "scripts\products\winversion.iss" -#include "scripts\products\fileversion.iss" -#include "scripts\products\msi20.iss" -#include "scripts\products\msi31.iss" -#include "scripts\products\dotnetfx20.iss" -#include "scripts\products\dotnetfx20sp1.iss" -#include "scripts\products\dotnetfx20sp2.iss" +#define Version "1.1.2.$WCREV$" [Files] Source: ..\..\bin\Release\Greenshot.exe; DestDir: {app}; Components: greenshot; Flags: overwritereadonly ignoreversion replacesameversion @@ -292,7 +281,7 @@ Name: "plugins\office"; Description: {cm:office}; Types: default full custom; Fl Name: "plugins\ocr"; Description: {cm:ocr}; Types: default full custom; Flags: disablenouninstallwarning Name: "plugins\jira"; Description: {cm:jira}; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\imgur"; Description: {cm:imgur}; Types: default full custom; Flags: disablenouninstallwarning -Name: "plugins\confluence"; Description: {cm:confluence}; Types: full custom; Flags: disablenouninstallwarning; Check: hasDotNet35FullOrHigher() +Name: "plugins\confluence"; Description: {cm:confluence}; Types: full custom; Flags: disablenouninstallwarning Name: "plugins\externalcommand"; Description: {cm:externalcommand}; Types: default full custom; Flags: disablenouninstallwarning ;Name: "plugins\networkimport"; Description: "Network Import Plugin"; Types: full Name: "plugins\box"; Description: "Box Plugin"; Types: full custom; Flags: disablenouninstallwarning @@ -510,61 +499,6 @@ begin Result := returnValue; end; -function hasDotNet(version: string; service: cardinal): Boolean; -// Indicates whether the specified version and service pack of the .NET Framework is installed. -// -// version -- Specify one of these strings for the required .NET Framework version: -// 'v1.1.4322' .NET Framework 1.1 -// 'v2.0.50727' .NET Framework 2.0 -// 'v3.0' .NET Framework 3.0 -// 'v3.5' .NET Framework 3.5 -// 'v4\Client' .NET Framework 4.0 Client Profile -// 'v4\Full' .NET Framework 4.0 Full Installation -// -// service -- Specify any non-negative integer for the required service pack level: -// 0 No service packs required -// 1, 2, etc. Service pack 1, 2, etc. required -var - key: string; - install, serviceCount: cardinal; - success: boolean; -begin - key := 'SOFTWARE\Microsoft\NET Framework Setup\NDP\' + version; - // .NET 3.0 uses value InstallSuccess in subkey Setup - if Pos('v3.0', version) = 1 then begin - success := RegQueryDWordValue(HKLM, key + '\Setup', 'InstallSuccess', install); - end else begin - success := RegQueryDWordValue(HKLM, key, 'Install', install); - end; - // .NET 4.0 uses value Servicing instead of SP - if Pos('v4', version) = 1 then begin - success := success and RegQueryDWordValue(HKLM, key, 'Servicing', serviceCount); - end else begin - success := success and RegQueryDWordValue(HKLM, key, 'SP', serviceCount); - end; - result := success and (install = 1) and (serviceCount >= service); -end; - -function hasDotNet20() : boolean; -begin - Result := hasDotNet('v2.0.50727',0); -end; - -function hasDotNet40() : boolean; -begin - Result := hasDotNet('v4\Client',0) or hasDotNet('v4\Full',0); -end; - -function hasDotNet35FullOrHigher() : boolean; -begin - Result := hasDotNet('v3.5',0) or hasDotNet('v4\Full',0) or hasDotNet('4.5\Full',0); -end; - -function hasDotNet35OrHigher() : boolean; -begin - Result := hasDotNet('v3.5',0) or hasDotNet('v4\Client',0) or hasDotNet('v4\Full',0) or hasDotNet('4.5\Client',0) or hasDotNet('4.5\Full',0); -end; - function getNGENPath(argument: String) : String; var installPath: string; @@ -582,30 +516,6 @@ begin Result := installPath; end; -// Initialize the setup -function InitializeSetup(): Boolean; -begin - // Only check for 2.0 and install if we don't have .net 3.5 or higher - if not hasDotNet35OrHigher() then - begin - // Enhance installer otherwise .NET installations won't work - msi20('2.0'); - msi31('3.0'); - - //install .netfx 2.0 sp2 if possible; if not sp1 if possible; if not .netfx 2.0 - if minwinversion(5, 1) then begin - dotnetfx20sp2(); - end else begin - if minwinversion(5, 0) and minwinspversion(5, 0, 4) then begin - // kb835732(); - dotnetfx20sp1(); - end else begin - dotnetfx20(); - end; - end; - end; - Result := true; -end; [Run] Filename: "{code:getNGENPath}\ngen.exe"; Parameters: "install ""{app}\{#ExeName}.exe"""; StatusMsg: "{cm:optimize}"; Flags: runhidden runasoriginaluser Filename: "{code:getNGENPath}\ngen.exe"; Parameters: "install ""{app}\GreenshotPlugin.dll"""; StatusMsg: "{cm:optimize}"; Flags: runhidden runasoriginaluser diff --git a/Greenshot/releases/package.bat b/Greenshot/releases/package.bat index e9633ba09..23c505dd5 100644 --- a/Greenshot/releases/package.bat +++ b/Greenshot/releases/package.bat @@ -23,6 +23,6 @@ del /s *.bak del /s *installer*.xml del /s *website*.xml del /s *template.txt -..\..\tools\7zip\7za.exe a -x!.SVN -r ..\Greenshot-NO-INSTALLER-1.1.1.$WCREV$-RC1.zip * +..\..\tools\7zip\7za.exe a -x!.SVN -r ..\Greenshot-NO-INSTALLER-1.1.2.$WCREV$-RC1.zip * cd .. rmdir /s /q NO-INSTALLER diff --git a/GreenshotBoxPlugin/Properties/AssemblyInfo.cs.template b/GreenshotBoxPlugin/Properties/AssemblyInfo.cs.template index 68495975d..3f63abacc 100644 --- a/GreenshotBoxPlugin/Properties/AssemblyInfo.cs.template +++ b/GreenshotBoxPlugin/Properties/AssemblyInfo.cs.template @@ -51,4 +51,4 @@ using Greenshot.Plugin; // // You can specify all the values or you can use the default the Revision and // Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("1.1.1.$WCREV$")] +[assembly: AssemblyVersion("1.1.2.$WCREV$")] diff --git a/GreenshotConfluencePlugin/Properties/AssemblyInfo.cs.template b/GreenshotConfluencePlugin/Properties/AssemblyInfo.cs.template index 3c6f2863d..cf4cc70cc 100644 --- a/GreenshotConfluencePlugin/Properties/AssemblyInfo.cs.template +++ b/GreenshotConfluencePlugin/Properties/AssemblyInfo.cs.template @@ -51,4 +51,4 @@ using Greenshot.Plugin; // // You can specify all the values or you can use the default the Revision and // Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("1.1.1.$WCREV$")] \ No newline at end of file +[assembly: AssemblyVersion("1.1.2.$WCREV$")] \ No newline at end of file diff --git a/GreenshotDropboxPlugin/Properties/AssemblyInfo.cs.template b/GreenshotDropboxPlugin/Properties/AssemblyInfo.cs.template index 7ca6b82b3..3dbc41904 100644 --- a/GreenshotDropboxPlugin/Properties/AssemblyInfo.cs.template +++ b/GreenshotDropboxPlugin/Properties/AssemblyInfo.cs.template @@ -51,4 +51,4 @@ using Greenshot.Plugin; // // You can specify all the values or you can use the default the Revision and // Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("1.1.1.$WCREV$")] +[assembly: AssemblyVersion("1.1.2.$WCREV$")] diff --git a/GreenshotExternalCommandPlugin/Properties/AssemblyInfo.cs.template b/GreenshotExternalCommandPlugin/Properties/AssemblyInfo.cs.template index 8ebc75e4a..cd8f01087 100644 --- a/GreenshotExternalCommandPlugin/Properties/AssemblyInfo.cs.template +++ b/GreenshotExternalCommandPlugin/Properties/AssemblyInfo.cs.template @@ -50,4 +50,4 @@ using Greenshot.Plugin; // // You can specify all the values or you can use the default the Revision and // Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("1.1.1.$WCREV$")] +[assembly: AssemblyVersion("1.1.2.$WCREV$")] diff --git a/GreenshotFlickrPlugin/Properties/AssemblyInfo.cs.template b/GreenshotFlickrPlugin/Properties/AssemblyInfo.cs.template index 532408c39..0fc51c9a5 100644 --- a/GreenshotFlickrPlugin/Properties/AssemblyInfo.cs.template +++ b/GreenshotFlickrPlugin/Properties/AssemblyInfo.cs.template @@ -51,4 +51,4 @@ using Greenshot.Plugin; // // You can specify all the values or you can use the default the Revision and // Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("1.1.1.$WCREV$")] +[assembly: AssemblyVersion("1.1.2.$WCREV$")] diff --git a/GreenshotImgurPlugin/Properties/AssemblyInfo.cs.template b/GreenshotImgurPlugin/Properties/AssemblyInfo.cs.template index 04f0bba2c..d8d9c0df4 100644 --- a/GreenshotImgurPlugin/Properties/AssemblyInfo.cs.template +++ b/GreenshotImgurPlugin/Properties/AssemblyInfo.cs.template @@ -51,4 +51,4 @@ using Greenshot.Plugin; // // You can specify all the values or you can use the default the Revision and // Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("1.1.1.$WCREV$")] +[assembly: AssemblyVersion("1.1.2.$WCREV$")] diff --git a/GreenshotJiraPlugin/Properties/AssemblyInfo.cs.template b/GreenshotJiraPlugin/Properties/AssemblyInfo.cs.template index 0467a83db..d9fd1bf56 100644 --- a/GreenshotJiraPlugin/Properties/AssemblyInfo.cs.template +++ b/GreenshotJiraPlugin/Properties/AssemblyInfo.cs.template @@ -51,4 +51,4 @@ using Greenshot.Plugin; // // You can specify all the values or you can use the default the Revision and // Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("1.1.1.$WCREV$")] \ No newline at end of file +[assembly: AssemblyVersion("1.1.2.$WCREV$")] \ No newline at end of file diff --git a/GreenshotOCRPlugin/Properties/AssemblyInfo.cs.template b/GreenshotOCRPlugin/Properties/AssemblyInfo.cs.template index 8f75a2d56..4ff27154d 100644 --- a/GreenshotOCRPlugin/Properties/AssemblyInfo.cs.template +++ b/GreenshotOCRPlugin/Properties/AssemblyInfo.cs.template @@ -51,4 +51,4 @@ using Greenshot.Plugin; // // You can specify all the values or you can use the default the Revision and // Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("1.1.1.$WCREV$")] +[assembly: AssemblyVersion("1.1.2.$WCREV$")] diff --git a/GreenshotOfficePlugin/Properties/AssemblyInfo.cs.template b/GreenshotOfficePlugin/Properties/AssemblyInfo.cs.template index 82491a8e3..873874296 100644 --- a/GreenshotOfficePlugin/Properties/AssemblyInfo.cs.template +++ b/GreenshotOfficePlugin/Properties/AssemblyInfo.cs.template @@ -51,4 +51,4 @@ using Greenshot.Plugin; // // You can specify all the values or you can use the default the Revision and // Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("1.1.1.$WCREV$")] +[assembly: AssemblyVersion("1.1.2.$WCREV$")] diff --git a/GreenshotPhotobucketPlugin/Properties/AssemblyInfo.cs.template b/GreenshotPhotobucketPlugin/Properties/AssemblyInfo.cs.template index 82eef9923..d58cc4c24 100644 --- a/GreenshotPhotobucketPlugin/Properties/AssemblyInfo.cs.template +++ b/GreenshotPhotobucketPlugin/Properties/AssemblyInfo.cs.template @@ -51,4 +51,4 @@ using Greenshot.Plugin; // // You can specify all the values or you can use the default the Revision and // Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("1.1.1.$WCREV$")] +[assembly: AssemblyVersion("1.1.2.$WCREV$")] diff --git a/GreenshotPicasaPlugin/Properties/AssemblyInfo.cs.template b/GreenshotPicasaPlugin/Properties/AssemblyInfo.cs.template index 0495dd0dd..6bea953a0 100644 --- a/GreenshotPicasaPlugin/Properties/AssemblyInfo.cs.template +++ b/GreenshotPicasaPlugin/Properties/AssemblyInfo.cs.template @@ -51,4 +51,4 @@ using Greenshot.Plugin; // // You can specify all the values or you can use the default the Revision and // Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("1.1.1.$WCREV$")] +[assembly: AssemblyVersion("1.1.2.$WCREV$")] diff --git a/GreenshotPlugin/Properties/AssemblyInfo.cs.template b/GreenshotPlugin/Properties/AssemblyInfo.cs.template index d9ada499d..3c81a7587 100644 --- a/GreenshotPlugin/Properties/AssemblyInfo.cs.template +++ b/GreenshotPlugin/Properties/AssemblyInfo.cs.template @@ -48,4 +48,4 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can use the default the Revision and // Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("1.1.1.$WCREV$")] +[assembly: AssemblyVersion("1.1.2.$WCREV$")] diff --git a/PluginExample/Properties/AssemblyInfo.cs.template b/PluginExample/Properties/AssemblyInfo.cs.template index 2d8cc4d1f..24a5e6db8 100644 --- a/PluginExample/Properties/AssemblyInfo.cs.template +++ b/PluginExample/Properties/AssemblyInfo.cs.template @@ -52,4 +52,4 @@ using Greenshot.Plugin; // // You can specify all the values or you can use the default the Revision and // Build Numbers by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.7.$WCREV$")] +[assembly: AssemblyVersion("1.1.2.$WCREV$")]