Changed build.bat to include the SVN number and the files are created accordingly. This makes releases easier, but needs some commits when changing from unstable to release candidate to release...

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2440 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2013-01-24 09:21:31 +00:00
commit 0d5cbcb0be
4 changed files with 26 additions and 26 deletions

View file

@ -6,6 +6,22 @@ echo An error occured, please check the build log!
pause pause
exit -1 exit -1
) )
echo Installer preparation start after key press echo File preparations
cd ..
echo Getting current Version
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.bat releases\package-SVN.bat
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-SVN.bat
echo Finshed
pause pause
package.bat

View file

@ -0,0 +1,4 @@
@echo off
cd ..
tools\innosetup\ISCC.exe releases\innosetup\setup-SVN.iss
cd releases

View file

@ -118,7 +118,7 @@ InfoBeforeFile=..\additional_files\readme.txt
LicenseFile=..\additional_files\license.txt LicenseFile=..\additional_files\license.txt
LanguageDetectionMethod=uilanguage LanguageDetectionMethod=uilanguage
MinVersion=,5.01.2600 MinVersion=,5.01.2600
OutputBaseFilename={#ExeName}-INSTALLER-{#Version} OutputBaseFilename={#ExeName}-INSTALLER-{#Version}-UNSTABLE
OutputDir=..\ OutputDir=..\
PrivilegesRequired=none PrivilegesRequired=none
SetupIconFile=..\..\icons\applicationIcon\icon.ico SetupIconFile=..\..\icons\applicationIcon\icon.ico

View file

@ -1,20 +1,5 @@
@echo off @echo off
cd .. cd ..
echo Getting current Version
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
cd bin\Release
del *.log
echo Making MD5
..\..\tools\FileVerifier++\fvc.exe -c -a MD5 -r -o checksum.MD5 Greenshot.exe GreenshotPlugin.dll
cd ..\..
echo Building installer after key press
pause
tools\innosetup\ISCC.exe releases\innosetup\setup-SVN.iss
echo Building ZIP after key press
pause
del releases\Greenshot-NO-INSTALLER.zip del releases\Greenshot-NO-INSTALLER.zip
mkdir releases\NO-INSTALLER mkdir releases\NO-INSTALLER
echo ;dummy config, used to make greenshot store the configuration in this directory > releases\NO-INSTALLER\greenshot.ini echo ;dummy config, used to make greenshot store the configuration in this directory > releases\NO-INSTALLER\greenshot.ini
@ -38,11 +23,6 @@ del /s *.bak
del /s *installer*.xml del /s *installer*.xml
del /s *website*.xml del /s *website*.xml
del /s *template.txt del /s *template.txt
..\..\tools\7zip\7za.exe a -x!.SVN -r ..\Greenshot-NO-INSTALLER.zip * ..\..\tools\7zip\7za.exe a -x!.SVN -r ..\Greenshot-NO-INSTALLER-1.1.0.$WCREV$-UNSTABLE.zip *
cd ..\.. cd ..
echo Cleanup after key press rmdir /s /q NO-INSTALLER
pause
rmdir /s /q releases\NO-INSTALLER
echo Finshed
pause