build.xml | ●●●●● patch | view | raw | blame | history | |
release.template | ●●●●● patch | view | raw | blame | history |
build.xml
@@ -780,11 +780,33 @@ </filterset> </copy> <chmod file="${recipe}" perm="ugo+rx" /> </target> <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Prepare for the next point release development cycle. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <target name="nextPointReleaseCycle" depends="prepare" description="prepare for the next point release development cycle"> <!-- next cycle --> <mx:version stage="snapshot" incrementNumber="incremental" dryrun="${dryrun}" /> <mx:commit showtitle="no"> <message>Reset build identifiers for next development cycle</message> <message>Reset build identifiers for next point release cycle</message> </mx:commit> </target> <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Prepare for the next minor release development cycle. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <target name="nextMinorReleaseCycle" depends="prepare" description="prepare for the next minor release development cycle"> <!-- next cycle --> <mx:version stage="snapshot" incrementNumber="minor" dryrun="${dryrun}" /> <mx:commit showtitle="no"> <message>Reset build identifiers for next minor release cycle</message> </mx:commit> </target> release.template
@@ -57,13 +57,25 @@ echo "" ant publishSite # return to project master # merge to master echo "" echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" echo "Checking out master" echo "Merging release ${project.version} to master" echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" echo "" git checkout master git merge -m "Merge release ${project.version}" ${project.commitId} ant nextPointReleaseCycle # merge to develop echo "" echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" echo "Merging release ${project.version} to develop" echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" echo "" git checkout develop git merge -m "Merge release ${project.version}" ${project.commitId} ant nextMinorReleaseCycle # push Maven repository to origin echo "" @@ -78,7 +90,7 @@ # push project branches echo "" echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" echo "Pushing master, gh-pages, and tag ${project.tag}" echo "Pushing master, develop, gh-pages, and tag ${project.tag}" echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" echo "" git push origin master gh-pages tag ${project.tag} git push origin master develop gh-pages tag ${project.tag}