From c4205de6714db747c0346d8f34519098105ba0be Mon Sep 17 00:00:00 2001 From: RKrom Date: Wed, 11 Dec 2013 20:02:42 +0100 Subject: [PATCH] Fixed templates, forgot that the PluginAttribute is still needed. The build seems to work, and create a valid Greenshot installer, zip and paf.exe --- .../additional_files/readme.txt.template | 8 +++++++- .../Properties/AssemblyInfo.cs.template | 3 +++ .../Properties/AssemblyInfo.cs.template | 3 +++ .../Properties/AssemblyInfo.cs.template | 3 +++ .../Properties/AssemblyInfo.cs.template | 3 +++ .../Properties/AssemblyInfo.cs.template | 3 +++ .../Properties/AssemblyInfo.cs.template | 3 +++ .../Properties/AssemblyInfo.cs.template | 3 +++ .../Properties/AssemblyInfo.cs.template | 3 +++ .../Properties/AssemblyInfo.cs.template | 3 +++ .../Properties/AssemblyInfo.cs.template | 3 +++ .../Properties/AssemblyInfo.cs.template | 3 +++ build.ps1 | 20 ++++++++++--------- 13 files changed, 51 insertions(+), 10 deletions(-) diff --git a/Greenshot/releases/additional_files/readme.txt.template b/Greenshot/releases/additional_files/readme.txt.template index d6115982d..d6feb182a 100644 --- a/Greenshot/releases/additional_files/readme.txt.template +++ b/Greenshot/releases/additional_files/readme.txt.template @@ -4,11 +4,17 @@ CHANGE LOG: @GITDETAILVERSION@ Bugfix Release +Changes: +* We moved our repository to BitBucket (GIT), this forced us to change the build script and the version + Bugs resolved (for bug details go to http://sourceforge.net/p/greenshot/bugs and search on the ID): * Bug #xxxx: +Features: +* Changed the Box plug-in to use the new V2 API, which is mandatory from 13.12.2013. The Box plug-in now needs the .NET 3.5 Full Framework. -1.1.6 build $WCREV$ Bugfix Release + +1.1.6 build 2779 Bugfix Release Bugs resolved (for bug details go to http://sourceforge.net/p/greenshot/bugs and search on the ID): * Bug #1515: Changed the settings GUI to clearly show that the interactive Window capture mode doesn't use the windows capture mode settings. diff --git a/GreenshotBoxPlugin/Properties/AssemblyInfo.cs.template b/GreenshotBoxPlugin/Properties/AssemblyInfo.cs.template index 1e0a0fa49..544983da6 100644 --- a/GreenshotBoxPlugin/Properties/AssemblyInfo.cs.template +++ b/GreenshotBoxPlugin/Properties/AssemblyInfo.cs.template @@ -23,6 +23,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; +using Greenshot.Plugin; #endregion // General Information about an assembly is controlled through the following @@ -36,6 +37,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright (C) 2012")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] +// The PluginAttribute describes the "entryType" and if the plugin is configurable +[assembly: PluginAttribute("GreenshotBoxPlugin.BoxPlugin", true)] // This sets the default COM visibility of types in the assembly to invisible. // If you need to expose a type to COM, use [ComVisible(true)] on that type. diff --git a/GreenshotConfluencePlugin/Properties/AssemblyInfo.cs.template b/GreenshotConfluencePlugin/Properties/AssemblyInfo.cs.template index cab48af1a..dd9e9108c 100644 --- a/GreenshotConfluencePlugin/Properties/AssemblyInfo.cs.template +++ b/GreenshotConfluencePlugin/Properties/AssemblyInfo.cs.template @@ -23,6 +23,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; +using Greenshot.Plugin; #endregion // General Information about an assembly is controlled through the following @@ -36,6 +37,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright (C) 2007-2013")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] +// The PluginAttribute describes the "entryType" and if the plugin is configurable +[assembly: PluginAttribute("GreenshotConfluencePlugin.ConfluencePlugin", true)] // This sets the default COM visibility of types in the assembly to invisible. // If you need to expose a type to COM, use [ComVisible(true)] on that type. diff --git a/GreenshotDropboxPlugin/Properties/AssemblyInfo.cs.template b/GreenshotDropboxPlugin/Properties/AssemblyInfo.cs.template index 1a7933eef..2a67c2832 100644 --- a/GreenshotDropboxPlugin/Properties/AssemblyInfo.cs.template +++ b/GreenshotDropboxPlugin/Properties/AssemblyInfo.cs.template @@ -23,6 +23,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; +using Greenshot.Plugin; #endregion // General Information about an assembly is controlled through the following @@ -36,6 +37,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright (C) 2012")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] +// The PluginAttribute describes the "entryType" and if the plugin is configurable +[assembly: PluginAttribute("GreenshotDropboxPlugin.DropboxPlugin", true)] // This sets the default COM visibility of types in the assembly to invisible. // If you need to expose a type to COM, use [ComVisible(true)] on that type. diff --git a/GreenshotExternalCommandPlugin/Properties/AssemblyInfo.cs.template b/GreenshotExternalCommandPlugin/Properties/AssemblyInfo.cs.template index f59f9a077..a65cc0da4 100644 --- a/GreenshotExternalCommandPlugin/Properties/AssemblyInfo.cs.template +++ b/GreenshotExternalCommandPlugin/Properties/AssemblyInfo.cs.template @@ -23,6 +23,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; +using Greenshot.Plugin; #endregion // General Information about an assembly is controlled through the following @@ -36,6 +37,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright (C) 2007-2013")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] +// The PluginAttribute describes the "entryType" and if the plugin is configurable +[assembly: PluginAttribute("ExternalCommand.ExternalCommandPlugin", true)] // This sets the default COM visibility of types in the assembly to invisible. // If you need to expose a type to COM, use [ComVisible(true)] on that type. diff --git a/GreenshotFlickrPlugin/Properties/AssemblyInfo.cs.template b/GreenshotFlickrPlugin/Properties/AssemblyInfo.cs.template index 25d13e603..d29d354cf 100644 --- a/GreenshotFlickrPlugin/Properties/AssemblyInfo.cs.template +++ b/GreenshotFlickrPlugin/Properties/AssemblyInfo.cs.template @@ -23,6 +23,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; +using Greenshot.Plugin; #endregion // General Information about an assembly is controlled through the following @@ -36,6 +37,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright (C) 2012")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] +// The PluginAttribute describes the "entryType" and if the plugin is configurable +[assembly: PluginAttribute("GreenshotFlickrPlugin.FlickrPlugin", true)] // This sets the default COM visibility of types in the assembly to invisible. // If you need to expose a type to COM, use [ComVisible(true)] on that type. diff --git a/GreenshotImgurPlugin/Properties/AssemblyInfo.cs.template b/GreenshotImgurPlugin/Properties/AssemblyInfo.cs.template index 91f675a5d..da6716978 100644 --- a/GreenshotImgurPlugin/Properties/AssemblyInfo.cs.template +++ b/GreenshotImgurPlugin/Properties/AssemblyInfo.cs.template @@ -23,6 +23,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; +using Greenshot.Plugin; #endregion // General Information about an assembly is controlled through the following @@ -36,6 +37,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright (C) 2007-2013")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] +// The PluginAttribute describes the "entryType" and if the plugin is configurable +[assembly: PluginAttribute("GreenshotImgurPlugin.ImgurPlugin", true)] // This sets the default COM visibility of types in the assembly to invisible. // If you need to expose a type to COM, use [ComVisible(true)] on that type. diff --git a/GreenshotJiraPlugin/Properties/AssemblyInfo.cs.template b/GreenshotJiraPlugin/Properties/AssemblyInfo.cs.template index 665b809a6..28d1169ca 100644 --- a/GreenshotJiraPlugin/Properties/AssemblyInfo.cs.template +++ b/GreenshotJiraPlugin/Properties/AssemblyInfo.cs.template @@ -23,6 +23,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; +using Greenshot.Plugin; #endregion // General Information about an assembly is controlled through the following @@ -36,6 +37,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright (C) 2007-2013")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] +// The PluginAttribute describes the "entryType" and if the plugin is configurable +[assembly: PluginAttribute("GreenshotJiraPlugin.JiraPlugin", true)] // This sets the default COM visibility of types in the assembly to invisible. // If you need to expose a type to COM, use [ComVisible(true)] on that type. diff --git a/GreenshotOCRPlugin/Properties/AssemblyInfo.cs.template b/GreenshotOCRPlugin/Properties/AssemblyInfo.cs.template index 4499ec44f..ad0473faa 100644 --- a/GreenshotOCRPlugin/Properties/AssemblyInfo.cs.template +++ b/GreenshotOCRPlugin/Properties/AssemblyInfo.cs.template @@ -23,6 +23,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; +using Greenshot.Plugin; #endregion // General Information about an assembly is controlled through the following @@ -36,6 +37,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright (C) 2007-2013")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] +// The PluginAttribute describes the "entryType" and if the plugin is configurable +[assembly: PluginAttribute("GreenshotOCR.OcrPlugin", true)] // This sets the default COM visibility of types in the assembly to invisible. // If you need to expose a type to COM, use [ComVisible(true)] on that type. diff --git a/GreenshotOfficePlugin/Properties/AssemblyInfo.cs.template b/GreenshotOfficePlugin/Properties/AssemblyInfo.cs.template index 93bf54024..a53d16452 100644 --- a/GreenshotOfficePlugin/Properties/AssemblyInfo.cs.template +++ b/GreenshotOfficePlugin/Properties/AssemblyInfo.cs.template @@ -23,6 +23,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; +using Greenshot.Plugin; #endregion // General Information about an assembly is controlled through the following @@ -36,6 +37,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright (C) 2007-2013")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] +// The PluginAttribute describes the "entryType" and if the plugin is configurable +[assembly: PluginAttribute("GreenshotOfficePlugin.OfficePlugin", true)] // This sets the default COM visibility of types in the assembly to invisible. // If you need to expose a type to COM, use [ComVisible(true)] on that type. diff --git a/GreenshotPhotobucketPlugin/Properties/AssemblyInfo.cs.template b/GreenshotPhotobucketPlugin/Properties/AssemblyInfo.cs.template index 2005e7be4..6e422b546 100644 --- a/GreenshotPhotobucketPlugin/Properties/AssemblyInfo.cs.template +++ b/GreenshotPhotobucketPlugin/Properties/AssemblyInfo.cs.template @@ -23,6 +23,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; +using Greenshot.Plugin; #endregion // General Information about an assembly is controlled through the following @@ -36,6 +37,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright (C) 2007-2013")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] +// The PluginAttribute describes the "entryType" and if the plugin is configurable +[assembly: PluginAttribute("GreenshotPhotobucketPlugin.PhotobucketPlugin", true)] // This sets the default COM visibility of types in the assembly to invisible. // If you need to expose a type to COM, use [ComVisible(true)] on that type. diff --git a/GreenshotPicasaPlugin/Properties/AssemblyInfo.cs.template b/GreenshotPicasaPlugin/Properties/AssemblyInfo.cs.template index 4a01be3fc..610c009c2 100644 --- a/GreenshotPicasaPlugin/Properties/AssemblyInfo.cs.template +++ b/GreenshotPicasaPlugin/Properties/AssemblyInfo.cs.template @@ -23,6 +23,7 @@ using System; using System.Reflection; using System.Runtime.InteropServices; +using Greenshot.Plugin; #endregion // General Information about an assembly is controlled through the following @@ -36,6 +37,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("Copyright (C) 2012")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] +// The PluginAttribute describes the "entryType" and if the plugin is configurable +[assembly: PluginAttribute("GreenshotPicasaPlugin.PicasaPlugin", true)] // This sets the default COM visibility of types in the assembly to invisible. // If you need to expose a type to COM, use [ComVisible(true)] on that type. diff --git a/build.ps1 b/build.ps1 index a2e15ac47..2509bd1ff 100644 --- a/build.ps1 +++ b/build.ps1 @@ -167,7 +167,8 @@ Function PackagePortable { echo "An error occured, please check $portableOutput.log and $portableOutput.error for errors!" exit -1 } - Remove-Item "$destbase\portabletmp" -recurse -Confirm:$false + Start-Sleep -m 1000 + Remove-Item "$destbase\portabletmp" -Recurse -Confirm:$false return } @@ -220,7 +221,8 @@ Function PackageZip { echo "An error occured, please check $zipOutput.log and $zipOutput.error for errors!" exit -1 } - Remove-Item "$destinstaller" -recurse -Confirm:$false + Start-Sleep -m 1000 + Remove-Item "$destinstaller" -Recurse -Confirm:$false return } @@ -262,8 +264,8 @@ WaitForKey # SIG # Begin signature block # MIIEtAYJKoZIhvcNAQcCoIIEpTCCBKECAQExCzAJBgUrDgMCGgUAMGkGCisGAQQB # gjcCAQSgWzBZMDQGCisGAQQBgjcCAR4wJgIDAQAABBAfzDtgWUsITrck0sYpfvNR -# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQUlmS1LJgo97UtV5POMlFuE9iS -# yWegggK+MIICujCCAaagAwIBAgIQyoRJHMJDVbNFmmfObt+Y4DAJBgUrDgMCHQUA +# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQUOo5Wxn5LIY+1LynthZmQSrtx +# 7SigggK+MIICujCCAaagAwIBAgIQyoRJHMJDVbNFmmfObt+Y4DAJBgUrDgMCHQUA # MCwxKjAoBgNVBAMTIVBvd2VyU2hlbGwgTG9jYWwgQ2VydGlmaWNhdGUgUm9vdDAe # Fw0xMzExMjYxOTMxMTVaFw0zOTEyMzEyMzU5NTlaMBoxGDAWBgNVBAMTD1Bvd2Vy # U2hlbGwgVXNlcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0SEsL7kNLoYA @@ -281,9 +283,9 @@ WaitForKey # QDAsMSowKAYDVQQDEyFQb3dlclNoZWxsIExvY2FsIENlcnRpZmljYXRlIFJvb3QC # EMqESRzCQ1WzRZpnzm7fmOAwCQYFKw4DAhoFAKB4MBgGCisGAQQBgjcCAQwxCjAI # oAKAAKECgAAwGQYJKoZIhvcNAQkDMQwGCisGAQQBgjcCAQQwHAYKKwYBBAGCNwIB -# CzEOMAwGCisGAQQBgjcCARUwIwYJKoZIhvcNAQkEMRYEFPy89grwAkqkUfIWJQR1 -# N5zo3qVVMA0GCSqGSIb3DQEBAQUABIGAsOLH02OKRs6Sq8JtHFX2BzwE79LnqP5h -# 106pDkybKDKsI/dX9VXsKFwxiScAOueKWWL+QAnb3kDp6Ozd4m1XTACjKZ2UVwKI -# UmXZQP8nUzbtgmafwgrJngZ24gRON5dVO4RayeXXUu9tWiQg9F6kzo5linh6K0iC -# Z+9uQPBDOYs= +# CzEOMAwGCisGAQQBgjcCARUwIwYJKoZIhvcNAQkEMRYEFFJFG4yaTw7L/jaQHY6B +# kRWbD1tYMA0GCSqGSIb3DQEBAQUABIGAnS5Sjop7/Jwq8EncF4MApvyfRtw1mBPB +# M53xkvHWFQIbdTlt7Ve0Ggnu36pdXY5jWFP1geghDwKRbJgDb5EycRp5bwq7KiHc +# Sv1bBpsmV9zeM12vCmo4X8LX4JJxMKnj+RPRWjfp/aQXQoXRCScw6YrIubIwScul +# Xg1DJFZ+R88= # SIG # End signature block