diff --git a/Greenshot/releases/additional_files/readme.template.txt b/Greenshot/releases/additional_files/readme.txt.template similarity index 97% rename from Greenshot/releases/additional_files/readme.template.txt rename to Greenshot/releases/additional_files/readme.txt.template index 0d43ac128..d6115982d 100644 --- a/Greenshot/releases/additional_files/readme.template.txt +++ b/Greenshot/releases/additional_files/readme.txt.template @@ -2,6 +2,12 @@ Greenshot: A screenshot tool optimized for productivity. Save a screenshot or a CHANGE LOG: +@GITDETAILVERSION@ Bugfix Release + +Bugs resolved (for bug details go to http://sourceforge.net/p/greenshot/bugs and search on the ID): +* Bug #xxxx: + + 1.1.6 build $WCREV$ Bugfix Release Bugs resolved (for bug details go to http://sourceforge.net/p/greenshot/bugs and search on the ID): diff --git a/Greenshot/releases/build.bat b/Greenshot/releases/build.bat deleted file mode 100644 index 03ab9c2b4..000000000 --- a/Greenshot/releases/build.bat +++ /dev/null @@ -1,48 +0,0 @@ -@echo off -echo File preparations -echo Getting current Version -cd .. -tools\TortoiseSVN\SubWCRev.exe ..\ releases\additional_files\readme.template.txt releases\additional_files\readme.txt -tools\TortoiseSVN\SubWCRev.exe ..\ releases\innosetup\setup.iss releases\innosetup\setup-SVN.iss -tools\TortoiseSVN\SubWCRev.exe ..\ releases\package_zip.bat releases\package_zip-SVN.bat -tools\TortoiseSVN\SubWCRev.exe ..\ releases\appinfo.ini.template releases\portable\App\AppInfo\appinfo.ini -tools\TortoiseSVN\SubWCRev.exe ..\ AssemblyInfo.cs.template AssemblyInfo.cs -rem Plugins -tools\TortoiseSVN\SubWCRev.exe ..\GreenshotBoxPlugin ..\GreenshotBoxPlugin\Properties\AssemblyInfo.cs.template ..\GreenshotBoxPlugin\Properties\AssemblyInfo.cs -tools\TortoiseSVN\SubWCRev.exe ..\GreenshotConfluencePlugin ..\GreenshotConfluencePlugin\Properties\AssemblyInfo.cs.template ..\GreenshotConfluencePlugin\Properties\AssemblyInfo.cs -tools\TortoiseSVN\SubWCRev.exe ..\GreenshotDropboxPlugin ..\GreenshotDropboxPlugin\Properties\AssemblyInfo.cs.template ..\GreenshotDropboxPlugin\Properties\AssemblyInfo.cs -tools\TortoiseSVN\SubWCRev.exe ..\GreenshotExternalCommandPlugin ..\GreenshotExternalCommandPlugin\Properties\AssemblyInfo.cs.template ..\GreenshotExternalCommandPlugin\Properties\AssemblyInfo.cs -tools\TortoiseSVN\SubWCRev.exe ..\GreenshotFlickrPlugin ..\GreenshotFlickrPlugin\Properties\AssemblyInfo.cs.template ..\GreenshotFlickrPlugin\Properties\AssemblyInfo.cs -tools\TortoiseSVN\SubWCRev.exe ..\GreenshotImgurPlugin ..\GreenshotImgurPlugin\Properties\AssemblyInfo.cs.template ..\GreenshotImgurPlugin\Properties\AssemblyInfo.cs -tools\TortoiseSVN\SubWCRev.exe ..\GreenshotJiraPlugin ..\GreenshotJiraPlugin\Properties\AssemblyInfo.cs.template ..\GreenshotJiraPlugin\Properties\AssemblyInfo.cs -tools\TortoiseSVN\SubWCRev.exe ..\GreenshotOCRPlugin ..\GreenshotOCRPlugin\Properties\AssemblyInfo.cs.template ..\GreenshotOCRPlugin\Properties\AssemblyInfo.cs -tools\TortoiseSVN\SubWCRev.exe ..\GreenshotOfficePlugin ..\GreenshotOfficePlugin\Properties\AssemblyInfo.cs.template ..\GreenshotOfficePlugin\Properties\AssemblyInfo.cs -tools\TortoiseSVN\SubWCRev.exe ..\GreenshotPhotobucketPlugin ..\GreenshotPhotobucketPlugin\Properties\AssemblyInfo.cs.template ..\GreenshotPhotobucketPlugin\Properties\AssemblyInfo.cs -tools\TortoiseSVN\SubWCRev.exe ..\GreenshotPicasaPlugin ..\GreenshotPicasaPlugin\Properties\AssemblyInfo.cs.template ..\GreenshotPicasaPlugin\Properties\AssemblyInfo.cs -tools\TortoiseSVN\SubWCRev.exe ..\GreenshotPlugin ..\GreenshotPlugin\Properties\AssemblyInfo.cs.template ..\GreenshotPlugin\Properties\AssemblyInfo.cs -tools\TortoiseSVN\SubWCRev.exe ..\PluginExample ..\PluginExample\Properties\AssemblyInfo.cs.template ..\PluginExample\Properties\AssemblyInfo.cs -cd releases -echo Starting Greenshot BUILD -\Windows\Microsoft.NET\Framework\v3.5\MSBuild ..\Greenshot.sln /t:Clean;Build /p:Configuration=Release /p:Platform="Any CPU" > build.log -if %ERRORLEVEL% GEQ 1 ( -echo An error occured, please check the build log! -pause -exit -1 -) -cd .. -cd bin\Release -del *.log -echo Making MD5 -..\..\tools\FileVerifier++\fvc.exe -c -a MD5 -r -o checksum.MD5 Greenshot.exe GreenshotPlugin.dll -cd ..\..\releases -echo Building installer after key press -pause -call build_installer.bat -echo Building zip after key press -pause -call package_zip-SVN.bat -echo Building portable -pause -call package_portable.bat -echo Finshed -pause \ No newline at end of file diff --git a/Greenshot/releases/build_installer.bat b/Greenshot/releases/build_installer.bat deleted file mode 100644 index a02074b17..000000000 --- a/Greenshot/releases/build_installer.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -cd .. -tools\innosetup\ISCC.exe releases\innosetup\setup-SVN.iss -cd releases \ No newline at end of file diff --git a/Greenshot/releases/package_portable.bat b/Greenshot/releases/package_portable.bat deleted file mode 100644 index d769e2a40..000000000 --- a/Greenshot/releases/package_portable.bat +++ /dev/null @@ -1,30 +0,0 @@ -@echo off -cd .. - -del /q releases\GreenshotPortable*.paf.exe -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\log4net.dll releases\portable\App\Greenshot -copy /B log4net-portable.xml 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 \ No newline at end of file diff --git a/Greenshot/releases/package_zip.bat b/Greenshot/releases/package_zip.bat deleted file mode 100644 index 4343a2657..000000000 --- a/Greenshot/releases/package_zip.bat +++ /dev/null @@ -1,28 +0,0 @@ -@echo off -cd .. -del releases\Greenshot-NO-INSTALLER.zip -mkdir releases\NO-INSTALLER -echo ;dummy config, used to make greenshot store the configuration in this directory > releases\NO-INSTALLER\greenshot.ini -echo ;In this file you should add your default settings > releases\NO-INSTALLER\greenshot-defaults.ini -echo ;In this file you should add your fixed settings > releases\NO-INSTALLER\greenshot-fixed.ini -xcopy /S bin\Release\Plugins releases\NO-INSTALLER\Plugins\ -copy /B bin\Release\checksum.MD5 releases\NO-INSTALLER -copy /B bin\Release\Greenshot.exe releases\NO-INSTALLER -copy /B bin\Release\Greenshot.exe.config releases\NO-INSTALLER -copy /B bin\Release\GreenshotPlugin.dll releases\NO-INSTALLER -copy /B bin\Release\log4net.dll releases\NO-INSTALLER -copy /B log4net-portable.xml releases\NO-INSTALLER\log4net.xml -xcopy /S releases\additional_files\*.txt releases\NO-INSTALLER -mkdir releases\NO-INSTALLER\Languages -xcopy /S languages\language*.xml releases\NO-INSTALLER\Languages\ -xcopy /S languages\help*.html releases\NO-INSTALLER\Languages\ -xcopy /S bin\Release\Languages\Plugins releases\NO-INSTALLER\Languages\Plugins\ -cd releases\NO-INSTALLER -del /s *.pdb -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.6.$WCREV$.zip * -cd .. -rmdir /s /q NO-INSTALLER