github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-31 12:10:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed the templates to work with .NET 20/35

Browse source
This commit is contained in:
RKrom 2013-12-11 17:02:49 +01:00
parent 4de1705bb2
commit 5e10243eb3
18 changed files with 82 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.gitignore vendored
View file

@ -1,11 +1,11 @@
.svn/ .svn/
*.gsp *.gsp
*.bak *.bak
*INSTALLER*.exe Greenshot*INSTALLER*.exe
*INSTALLER*.zip Greenshot*INSTALLER*.zip
*.paf.exe *.paf.exe
*-SVN.* *-SVN.*
bin/ /Greenshot*/bin/
obj/ obj/
fugue/ fugue/
*Credentials.private.cs *Credentials.private.cs
@ -16,9 +16,7 @@ upgradeLog.XML
/Greenshot/releases/additional_files/readme.txt /Greenshot/releases/additional_files/readme.txt
/*.error /*.error
/Greenshot/releases/innosetup/setup.iss /Greenshot/releases/innosetup/setup.iss
/Greenshot/tools/PortableApps.comInstaller/Data
/Greenshot/releases/portable/Greenshot.exe
/Greenshot/releases/portable/help.html
/Greenshot/releases/portable/App/AppInfo
/Greenshot/packages /Greenshot/packages
/Greenshot/releases/appinfo.ini /Greenshot/releases/appinfo.ini
/Greenshot/tools/PortableApps.comInstaller/Data/PortableApps.comInstallerLog.txt

1
Greenshot/AssemblyInfo.cs.template
View file

@ -20,7 +20,6 @@
*/ */
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Windows.Markup;
// Information about this assembly is defined by the following // Information about this assembly is defined by the following
// attributes. // attributes.
// //

1
Greenshot/tools/PortableApps.comInstaller/Data/settings.ini Normal file
View file

@ -0,0 +1 @@
[InstallerWizard]

1
GreenshotBoxPlugin/Properties/AssemblyInfo.cs.template
View file

@ -23,7 +23,6 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Windows.Markup;
#endregion #endregion
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following

1
GreenshotConfluencePlugin/Properties/AssemblyInfo.cs.template
View file

@ -23,7 +23,6 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Windows.Markup;
#endregion #endregion
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following

1
GreenshotDropboxPlugin/Properties/AssemblyInfo.cs.template
View file

@ -23,7 +23,6 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Windows.Markup;
#endregion #endregion
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following

1
GreenshotExternalCommandPlugin/Properties/AssemblyInfo.cs.template
View file

@ -23,7 +23,6 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Windows.Markup;
#endregion #endregion
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following

1
GreenshotFlickrPlugin/Properties/AssemblyInfo.cs.template
View file

@ -23,7 +23,6 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Windows.Markup;
#endregion #endregion
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following

1
GreenshotImgurPlugin/Properties/AssemblyInfo.cs.template
View file

@ -23,7 +23,6 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Windows.Markup;
#endregion #endregion
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following

1
GreenshotJiraPlugin/Properties/AssemblyInfo.cs.template
View file

@ -23,7 +23,6 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Windows.Markup;
#endregion #endregion
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following

22
GreenshotOCRCommand/Properties/AssemblyInfo.cs.template
View file

@ -1,4 +1,24 @@
using System.Reflection; /*
* Greenshot - a free and open source screenshot tool
* Copyright (C) 2007-2013 Thomas Braun, Jens Klingen, Robin Krom
*
* For more information see: http://getgreenshot.org/
* The Greenshot project is hosted on Sourceforge: http://sourceforge.net/projects/greenshot/
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
using System.Reflection;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;

1
GreenshotOCRPlugin/Properties/AssemblyInfo.cs.template
View file

@ -23,7 +23,6 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Windows.Markup;
#endregion #endregion
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following

1
GreenshotOfficePlugin/Properties/AssemblyInfo.cs.template
View file

@ -23,7 +23,6 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Windows.Markup;
#endregion #endregion
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following

1
GreenshotPhotobucketPlugin/Properties/AssemblyInfo.cs.template
View file

@ -23,7 +23,6 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Windows.Markup;
#endregion #endregion
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following

1
GreenshotPicasaPlugin/Properties/AssemblyInfo.cs.template
View file

@ -23,7 +23,6 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Windows.Markup;
#endregion #endregion
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following

8
GreenshotPlugin/Properties/AssemblyInfo.cs.template
View file

@ -23,7 +23,6 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Windows.Markup;
#endregion #endregion
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following
@ -50,10 +49,3 @@ using System.Windows.Markup;
// Build Numbers by using the '*' as shown below: // Build Numbers by using the '*' as shown below:
[assembly: AssemblyVersion("@GITVERSION@")] [assembly: AssemblyVersion("@GITVERSION@")]
[assembly: AssemblyInformationalVersion("@GITDETAILVERSION@")] [assembly: AssemblyInformationalVersion("@GITDETAILVERSION@")]
// Definitions for XAML namespaces
[assembly: XmlnsPrefix("http://schemas.getgreenshot.net/plugin/", "greenshotplugin")]
[assembly: XmlnsDefinition("http://schemas.getgreenshot.net/plugin/", "GreenshotPlugin")]
[assembly: XmlnsDefinition("http://schemas.getgreenshot.net/plugin/", "GreenshotPlugin.Core")]
[assembly: XmlnsDefinition("http://schemas.getgreenshot.net/plugin/", "GreenshotPlugin.Core.Settings")]
[assembly: XmlnsDefinition("http://schemas.getgreenshot.net/plugin/", "GreenshotPlugin.WPF")]

1
PluginExample/Properties/AssemblyInfo.cs.template
View file

@ -23,7 +23,6 @@
using System; using System;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Windows.Markup;
#endregion #endregion
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following

92
build.ps1
View file

@ -95,9 +95,9 @@ Function FillTemplates {
} }
Function Build { Function Build {
$msBuild = "C:\Windows\Microsoft.NET\Framework64\v4.0.30319\MSBuild" $msBuild = "C:\Windows\Microsoft.NET\Framework64\v3.5\MSBuild"
if (-not (Test-Path("$msBuild"))) { if (-not (Test-Path("$msBuild"))) {
$msBuild = "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild" $msBuild = "C:\Windows\Microsoft.NET\Framework\v3.5\MSBuild"
} }
$parameters = @('Greenshot\Greenshot.sln', '/t:Clean;Build', '/p:Configuration="Release"', '/p:Platform="Any CPU"') $parameters = @('Greenshot\Greenshot.sln', '/t:Clean;Build', '/p:Configuration="Release"', '/p:Platform="Any CPU"')
$buildOutput = "$(get-location)\build.log" $buildOutput = "$(get-location)\build.log"
@ -119,42 +119,56 @@ Function MD5Checksums {
} }
Function PackagePortable { Function PackagePortable {
#del /q releases\GreenshotPortable*.paf.exe $sourcebase = "$(get-location)\Greenshot\bin\Release"
#del /q releases\portable\App\Greenshot\*
#rmdir /s /q releases\portable\App\Greenshot\Languages
#rmdir /s /q releases\portable\App\Greenshot\Plugins
#del /q releases\portable\*.*
#pause
#mkdir releases\portable\App\Greenshot\Plugins
#xcopy /S bin\Release\Plugins\* releases\portable\App\Greenshot\Plugins\
#mkdir releases\portable\App\Greenshot\Languages
#xcopy /S Languages\language*.xml releases\portable\App\Greenshot\Languages
#xcopy /S Languages\help*.html releases\portable\App\Greenshot\Languages
#copy Languages\help-en-US.html releases\portable\help.html
#xcopy /S bin\Release\Languages\Plugins\* releases\portable\App\Greenshot\Languages\Plugins\
#copy /B bin\Release\checksum.MD5 releases\portable\App\Greenshot
#copy /B bin\Release\GreenshotPlugin.dll releases\portable\App\Greenshot
#copy /B bin\Release\Greenshot.exe releases\portable\
#copy /B bin\Release\Greenshot.exe.config releases\portable\App\Greenshot
#xcopy /S releases\additional_files\*.txt releases\portable\App\Greenshot
#del releases\portable\App\Greenshot\readme.template.txt
#pause
#tools\PortableApps.comInstaller\PortableApps.comInstaller.exe %CD%\releases\portable
#pause
$destbase = "$(get-location)\Greenshot\releases" $destbase = "$(get-location)\Greenshot\releases"
# Only remove the paf we are going to create, to prevent adding but keeping the history
if (Test-Path ("$destbase\GreenshotPortable-$version.paf.exe")) {
Remove-Item "$destbase\GreenshotPortable-$version.paf.exe" -Confirm:$false
}
# Remove the directory to create the files in
if (Test-Path ("$destbase\portabletmp")) {
Remove-Item "$destbase\portabletmp" -recurse -Confirm:$false
}
Copy-Item -Path "$destbase\portable" -Destination "$destbase\portabletmp" -Recurse
$INCLUDE=@("*.gsp", "*.dll", "*.exe")
Get-ChildItem -Path "$sourcebase\Plugins\" -Recurse -Include $INCLUDE | foreach {
$path = $_.fullname -replace ".*\\Plugins\\", "$destbase\portabletmp\App\Greenshot\Plugins\"
New-Item -ItemType File -Path "$path" -Force | Out-Null
Copy-Item -Path $_ -Destination "$path" -Force
}
$INCLUDE=@("help-*.html","language-*.xml")
Get-ChildItem -Path "$sourcebase\Languages\" -Recurse -Include $INCLUDE | foreach {
$path = $_.fullname -replace ".*\\Languages\\", "$destbase\portabletmp\App\Greenshot\Languages\"
New-Item -ItemType File -Path "$path" -Force | Out-Null
Copy-Item -Path $_ -Destination "$path" -Force
}
Copy-Item -Path "$sourcebase\Languages\Plugins\" -Destination "$destbase\portabletmp\App\Greenshot\Languages\Plugins\" -Recurse
@( "$sourcebase\checksum.MD5",
"$sourcebase\Greenshot.exe.config",
"$sourcebase\GreenshotPlugin.dll",
"$sourcebase\GreenshotEditor.dll",
"$destbase\additional_files\*.txt" ) | foreach { Copy-Item $_ "$destbase\portabletmp\App\Greenshot\" }
Copy-Item -Path "$sourcebase\Languages\help-en-US.html" -Destination "$destbase\portabletmp\help.html"
Copy-Item -Path "$sourcebase\Greenshot.exe" -Destination "$destbase\portabletmp"
Copy-Item -Path "$destbase\appinfo.ini" -Destination "$destbase\portabletmp\App\AppInfo\appinfo.ini"
$portableOutput = "$(get-location)\portable" $portableOutput = "$(get-location)\portable"
$portableInstaller = "$(get-location)\greenshot\tools\PortableApps.comInstaller\PortableApps.comInstaller.exe" $portableInstaller = "$(get-location)\greenshot\tools\PortableApps.comInstaller\PortableApps.comInstaller.exe"
$arguments = @("$destbase\portable") $arguments = @("$destbase\portabletmp")
echo "Starting $portableInstaller $arguments" echo "Starting $portableInstaller $arguments"
$portableResult = Start-Process -wait -PassThru "$portableInstaller" -ArgumentList $arguments -NoNewWindow -RedirectStandardOutput "$portableOutput.log" -RedirectStandardError "$portableOutput.error" $portableResult = Start-Process -wait -PassThru "$portableInstaller" -ArgumentList $arguments -NoNewWindow -RedirectStandardOutput "$portableOutput.log" -RedirectStandardError "$portableOutput.error"
if ($portableResult.ExitCode -ne 0) { if ($portableResult.ExitCode -ne 0) {
echo "An error occured, please check $portableOutput.log and $portableOutput.error for errors!" echo "An error occured, please check $portableOutput.log and $portableOutput.error for errors!"
exit -1 exit -1
} }
Remove-Item "$destbase\portabletmp" -recurse -Confirm:$false
return return
} }
@ -177,7 +191,7 @@ Function PackageZip {
echo ";In this file you should add your default settings" | Set-Content "$destinstaller\greenshot-defaults.ini" -encoding UTF8 echo ";In this file you should add your default settings" | Set-Content "$destinstaller\greenshot-defaults.ini" -encoding UTF8
echo ";In this file you should add your fixed settings" | Set-Content "$destinstaller\greenshot-fixed.ini" -encoding UTF8 echo ";In this file you should add your fixed settings" | Set-Content "$destinstaller\greenshot-fixed.ini" -encoding UTF8
$INCLUDE=@("*.gsp","*.dll") $INCLUDE=@("*.gsp", "*.dll", "*.exe")
Get-ChildItem -Path "$sourcebase\Plugins\" -Recurse -Include $INCLUDE | foreach { Get-ChildItem -Path "$sourcebase\Plugins\" -Recurse -Include $INCLUDE | foreach {
$path = $_.fullname -replace ".*\\Plugins\\", "$destinstaller\Plugins\" $path = $_.fullname -replace ".*\\Plugins\\", "$destinstaller\Plugins\"
New-Item -ItemType File -Path "$path" -Force | Out-Null New-Item -ItemType File -Path "$path" -Force | Out-Null
@ -190,6 +204,7 @@ Function PackageZip {
New-Item -ItemType File -Path "$path" -Force | Out-Null New-Item -ItemType File -Path "$path" -Force | Out-Null
Copy-Item -Path $_ -Destination "$path" -Force Copy-Item -Path $_ -Destination "$path" -Force
} }
Copy-Item -Path "$sourcebase\Languages\Plugins\" -Destination "$destinstaller\Languages\Plugins\" -Recurse
@( "$sourcebase\checksum.MD5", @( "$sourcebase\checksum.MD5",
"$sourcebase\Greenshot.exe", "$sourcebase\Greenshot.exe",
@ -207,7 +222,7 @@ Function PackageZip {
echo "An error occured, please check $zipOutput.log and $zipOutput.error for errors!" echo "An error occured, please check $zipOutput.log and $zipOutput.error for errors!"
exit -1 exit -1
} }
#Remove-Item "$destinstaller" -recurse -Confirm:$false Remove-Item "$destinstaller" -recurse -Confirm:$false
return return
} }
@ -238,6 +253,9 @@ PackageInstaller
echo "Generating ZIP" echo "Generating ZIP"
PackageZip PackageZip
echo "Generating Portable"
PackagePortable
echo "Ready, press any key to continue!" echo "Ready, press any key to continue!"
WaitForKey WaitForKey
@ -246,8 +264,8 @@ WaitForKey
# SIG # Begin signature block # SIG # Begin signature block
# MIIEtAYJKoZIhvcNAQcCoIIEpTCCBKECAQExCzAJBgUrDgMCGgUAMGkGCisGAQQB # MIIEtAYJKoZIhvcNAQcCoIIEpTCCBKECAQExCzAJBgUrDgMCGgUAMGkGCisGAQQB
# gjcCAQSgWzBZMDQGCisGAQQBgjcCAR4wJgIDAQAABBAfzDtgWUsITrck0sYpfvNR # gjcCAQSgWzBZMDQGCisGAQQBgjcCAR4wJgIDAQAABBAfzDtgWUsITrck0sYpfvNR
# AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQUlbFVweNW7YraUhh7CNud8cS4 # AgEAAgEAAgEAAgEAAgEAMCEwCQYFKw4DAhoFAAQUrj4gCFRpu7VRoh4bzyfOF1yt
# HCugggK+MIICujCCAaagAwIBAgIQyoRJHMJDVbNFmmfObt+Y4DAJBgUrDgMCHQUA # w+6gggK+MIICujCCAaagAwIBAgIQyoRJHMJDVbNFmmfObt+Y4DAJBgUrDgMCHQUA
# MCwxKjAoBgNVBAMTIVBvd2VyU2hlbGwgTG9jYWwgQ2VydGlmaWNhdGUgUm9vdDAe # MCwxKjAoBgNVBAMTIVBvd2VyU2hlbGwgTG9jYWwgQ2VydGlmaWNhdGUgUm9vdDAe
# Fw0xMzExMjYxOTMxMTVaFw0zOTEyMzEyMzU5NTlaMBoxGDAWBgNVBAMTD1Bvd2Vy # Fw0xMzExMjYxOTMxMTVaFw0zOTEyMzEyMzU5NTlaMBoxGDAWBgNVBAMTD1Bvd2Vy
# U2hlbGwgVXNlcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0SEsL7kNLoYA # U2hlbGwgVXNlcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0SEsL7kNLoYA
@ -265,9 +283,9 @@ WaitForKey
# QDAsMSowKAYDVQQDEyFQb3dlclNoZWxsIExvY2FsIENlcnRpZmljYXRlIFJvb3QC # QDAsMSowKAYDVQQDEyFQb3dlclNoZWxsIExvY2FsIENlcnRpZmljYXRlIFJvb3QC
# EMqESRzCQ1WzRZpnzm7fmOAwCQYFKw4DAhoFAKB4MBgGCisGAQQBgjcCAQwxCjAI # EMqESRzCQ1WzRZpnzm7fmOAwCQYFKw4DAhoFAKB4MBgGCisGAQQBgjcCAQwxCjAI
# oAKAAKECgAAwGQYJKoZIhvcNAQkDMQwGCisGAQQBgjcCAQQwHAYKKwYBBAGCNwIB # oAKAAKECgAAwGQYJKoZIhvcNAQkDMQwGCisGAQQBgjcCAQQwHAYKKwYBBAGCNwIB
# CzEOMAwGCisGAQQBgjcCARUwIwYJKoZIhvcNAQkEMRYEFPa00iSnYtAOO8lKmzlv # CzEOMAwGCisGAQQBgjcCARUwIwYJKoZIhvcNAQkEMRYEFH5N3rkoNAqfwfm9+NWz
# dosV3T21MA0GCSqGSIb3DQEBAQUABIGARi5Xcf6HDxqHyidGg+cwOnTtowXJnAln # e956GSjEMA0GCSqGSIb3DQEBAQUABIGAnNDXqL2r7NpwSzqCO8ceO9mhf1b3hlG7
# 1VkPnlkxXETkm/FTC3gVNWoOY+Tu0FIZT1CY9pRKxiQE6kLx/1PYxjdWVg5CyEFa # OaavA85n73okZ/+V0xrCh9no3HZGOiQop8ER+QqKcOaoePwMkEySt2lhBkCB8hyr
# B0ZQN3EOMn8r0UpY0LRnIg6hS/d7ucGR+yOXZ8yoLj7ehUwT39AQgSZ8d0SRqS1A # kH3qaJdksld5E/m1LXm/b0A/6dmDahcn1LMDKndisayPup43K2SNCv4iewnp6hhB
# DpRjRHpB9Yk= # uI1p0ciFDRc=
# SIG # End signature block # SIG # End signature block