Changes between Version 2 and Version 3 of ReleasingApplications

Timestamp:

Aug 11, 2010, 2:24:19 PM (14 years ago)

Author:

Kevin Milner

Comment:

--

ReleasingApplications

@@ -7 +7 @@
 * update.major.version - updates the major (first) version. For example, this will update from 1.5.2 to 2.0.0
 * update.minor.version - updates the major (first) version. For example, this will update from 1.5.2 to 1.6.0
-* update.build.number - '''should not be used here'''
+* update.build.number - '''(only do this when [#Updatingthecurrentrelease updating the current release])''' updates the build number. For example, this will update from 1.5.2 to 1.5.3
 
 Commit the newly modified file [source:trunk/ant/include/build.version ant/include/build.version] to trunk.
@@ -52 +52 @@
 [5:opensha] /usr/local/tomcat/default/webapps/OpenSHA/WEB-INF/ant: ./runAnt.sh cc-build-test.xml restart.tomcat
 }}}
+
+== Updating the current release ==
+To update the current release, first make sure all changes are in the release branch. If the changes that you need were developed in trunk, you'll need to merge the change into the release branch (and the commit it). If the change was made in the release branch and it's something you want to keep, you should merge it back to trunk.
+
+You should update the build number in the release branch as well, then commit the change. See [#UpdateBuildVersion Update Build Version] above.
+
+Once the updates are in the release branch on SVN, you'll need to update the checked out copy on the server. SSH into !opensha@opensha.usc.edu then navigate to the Tomcat development build directory (for more information see [wiki:TomcatConfig Tomcat Configuration]).
+{{{
+kevin@milner:~$ ssh opensha@opensha.usc.edu
+Last login: Wed Aug 11 14:09:07 2010 from milner.usc.edu
+[1:opensha] ~: cd /usr/local/tomcat/default/webapps/OpenSHA/WEB-INF
+}}}
+Then rebuild the project
+{{{
+[2:opensha] /usr/local/tomcat/default/webapps/OpenSHA/WEB-INF: ./rebuild.sh 
+}}}