From 2934c2ad094605abe534543684d52106f1fba90b Mon Sep 17 00:00:00 2001
From: RKrom <robin@getgreenshot.org>
Date: Tue, 30 Oct 2012 08:15:47 +0000
Subject: [PATCH] Moved the build.bat code to package.bat and changed the
 build.bat to actually Build Greenshot with MSBuild. Afterwards, if the build
 didn't have any errors the package.bat is called to create the installer &
 zip.

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@2224 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
---
 Greenshot/releases/build.bat   | 48 +++++-----------------------------
 Greenshot/releases/package.bat | 44 +++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 41 deletions(-)
 create mode 100644 Greenshot/releases/package.bat

diff --git a/Greenshot/releases/build.bat b/Greenshot/releases/build.bat
index 64361225e..eefdb6d02 100644
--- a/Greenshot/releases/build.bat
+++ b/Greenshot/releases/build.bat
@@ -1,45 +1,11 @@
 @echo off
 echo Starting Greenshot BUILD
-cd ..
-echo Getting current Version
-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
+\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
-
-tools\innosetup\ISCC.exe releases\innosetup\setup-SVN.iss
-echo Building ZIP after key press
+exit -1
+)
+echo Installer preparation start after key press
 pause
-
-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
-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
-..\..\tools\7zip\7za.exe a -x!.SVN -r ..\Greenshot-NO-INSTALLER.zip *
-cd ..\..
-echo Cleanup after key press
-pause
-
-rmdir /s /q releases\NO-INSTALLER
-echo Finshed
-pause
\ No newline at end of file
+package.bat
\ No newline at end of file
diff --git a/Greenshot/releases/package.bat b/Greenshot/releases/package.bat
new file mode 100644
index 000000000..6697ca0ed
--- /dev/null
+++ b/Greenshot/releases/package.bat
@@ -0,0 +1,44 @@
+@echo off
+cd ..
+echo Getting current Version
+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
+mkdir releases\NO-INSTALLER
+echo dummy config, used to make greenshot store the configuration in this directory  > releases\NO-INSTALLER\greenshot.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
+..\..\tools\7zip\7za.exe a -x!.SVN -r ..\Greenshot-NO-INSTALLER.zip *
+cd ..\..
+echo Cleanup after key press
+pause
+
+rmdir /s /q releases\NO-INSTALLER
+echo Finshed
+pause
\ No newline at end of file