# # # patch "guitone.pro" # from [a463da456755181b378f696bfd56486b810a814e] # to [ed6059a0be9839473da75757415268b8087dc03d] # # patch "notes/RELEASE_CHECKLIST" # from [212f5db84d59a7669e93adb63ace4e0c5063be7d] # to [e0901857e753333a49d670df0e8b506979a94343] # ============================================================ --- guitone.pro a463da456755181b378f696bfd56486b810a814e +++ guitone.pro ed6059a0be9839473da75757415268b8087dc03d @@ -1,7 +1,10 @@ # # global version strings # -GUITONE_VERSION = "0.9" +GUITONE_VERSION = "0.9" +# this is automatically determined if we're executing qmake in a monotone +# workspace, for source releases however we need to set it explicitely +GUITONE_REVISION = "" MIN_MTN_INT_VERSION = "7.0" MAX_MTN_INT_VERSION = "9.0" @@ -215,8 +218,18 @@ RCC_DIR = tmp RESOURCES = res/guitone.qrc RCC_DIR = tmp +exists(_MTN) { + # we could (should?) check here if we have at least mtn-0.26 here since + # otherwise get_base_revision_id is not available, but since guitone only + # runs with newer versions of monotone anyways, who cares... + unix:system(which mtn >/dev/null 2>&1):GUITONE_REVISION="$$system(mtn au get_base_revision_id)" + win32:system(mtn version 1>2>NUL):GUITONE_REVISION="$$system(mtn au get_base_revision_id)" +} + +isEmpty(GUITONE_REVISION):GUITONE_REVISION = "?" + DEFINES += GUITONE_VERSION=\\\"$${GUITONE_VERSION}\\\" \ - GUITONE_REVISION=\\\"$$system(mtn au get_base_revision_id)\\\" \ + GUITONE_REVISION=\\\"$${GUITONE_REVISION}\\\" \ MIN_MTN_INT_VERSION=\\\"$${MIN_MTN_INT_VERSION}\\\" \ MAX_MTN_INT_VERSION=\\\"$${MAX_MTN_INT_VERSION}\\\" ============================================================ --- notes/RELEASE_CHECKLIST 212f5db84d59a7669e93adb63ace4e0c5063be7d +++ notes/RELEASE_CHECKLIST e0901857e753333a49d670df0e8b506979a94343 @@ -12,13 +12,16 @@ 4) Tag the release: mtn tag REV guitone- 4) Tag the release: mtn tag REV guitone-MAJOR.MINOR.BUGFIX, f.e. "guitone-0.6.3", while .BUGFIX is optional -5) TGZ release (source, all): +5) Set the revision ID of the tagged revision in guitone.pro as GUITONE_REVISION + if you plan to make a source release (f.e. a tarball) +6) TGZ release (source, all): + $ mtn co -d your.db -r t:guitone-MAJOR.MINOR.BUGFIX guitone-MAJOR.MINOR.BUGFIX $ rm -rf guitone-MAJOR.MINOR.BUGFIX/{_MTN,.mtn-ignore,attic,notes} $ tar czvf guitone-MAJOR.MINOR.BUGFIX.tgz guitone-MAJOR.MINOR.BUGFIX -6) EXE release (binary, win32, mingw): +7) EXE release (binary, win32, mingw): Ensure that you've downloaded and installed the Inno Setup's Quick Start Package from http://www.jrsoftware.org/isdl.php before you continue. @@ -36,7 +39,7 @@ 6) EXE release (binary, win32, mingw): After the setup ran through successfully without errors, _test_ the installation. If everything is fine again, upload the created setup file on the server. -7) DMG release (binary, Mac OS X): +8) DMG release (binary, Mac OS X): You need to download the deployqt utility and put it into your PATH before the bundling succeeds. Download the utility here: @@ -54,31 +57,32 @@ 7) DMG release (binary, Mac OS X): dependencies as @executable path. Check if the created disk image is properly mountable and contains all needed files. -8) sftp into address@hidden and create a new +9) sftp into address@hidden and create a new directory MAJOR.MINOR.BUGFIX in /www/guitone.thomaskeller.biz/htdocs/releases. Upload NEWS and README as well as the created files from the above steps 4-6. -9) symlink /www/guitone.thomaskeller.biz/htdocs/releases/MAJOR.MINOR.BUGFIX to - /www/guitone.thomaskeller.biz/htdocs/releases/latest +10) symlink /www/guitone.thomaskeller.biz/htdocs/releases/MAJOR.MINOR.BUGFIX to + /www/guitone.thomaskeller.biz/htdocs/releases/latest -10) Pull the branch biz.thomaskeller.guitone.website and check it out: +11) Pull the branch biz.thomaskeller.guitone.website and check it out: $ mtn pull -d your.db thomaskeller.biz biz.thomaskeller.guitone.website \ -k address@hidden $ mtn co -d your.db -b biz.thomaskeller.guitone.website guitone-web $ cd guitone-web -11) Edit appcast.xml and insert a new entry for the latest release. Take NEWS +12) Edit appcast.xml and insert a new entry for the latest release. Take NEWS as starting point by replacing all occurences of /^ -/ with