1: Fix the version string in the release branch. However, in this case, the goal is to remove the "=PRE-RELEASE=" and other junk from the version string so you're left with an official version string for the final release. *:: =git checkout V7_0_3-branch= -*:: Edit =src/condor_c++_util/condor_version.cpp= -*:: Set the version string to: ="$CondorVersion: 7.0.3 " __DATE__ BUILDIDSTR " $";= +*:: Edit the top-level =CMakeLists.txt= +*::: Set =PRE_RELEASE= to =OFF= *:: =git diff= (to verify the change before you commit it)... *:: =git commit -a -m "set official version string for 7.0.3"= *:: =git push origin V7_0_3-branch= -1: Update =src/condor_c++_util/condor_version.cpp= on the main-line development branch (e.g. V7_0-branch) to go to the next version number and to include the string "PRE-RELEASE-UWCS". +1: Update =CMakeLists.txt= on the main-line development branch (e.g. V7_0-branch) to go to the next version number and to include the string "PRE-RELEASE-UWCS". *:: =git checkout V7_0-branch= -*:: Edit =src/condor_c++_util/condor_version.cpp= -*:: Set the version string to: ="$CondorVersion: 7.0.4 " __DATE__ BUILDIDSTR " PRE-RELEASE-UWCS $";= +*:: Edit the top-level =CMakeLists.txt= +*::: Set =PRE_RELEASE= to ="PRE-RELEASE-UWCS"= *:: =git diff= (to verify the change before you commit it)... *:: =git commit -a -m "updated version string for 7.0.4"= *:: =git push origin V7_0-branch= -*:: Then edit the top-level CMakeLists.txt file and set the VERSION string at the top of that file to the new version +*:: Edit the top-level =CMakeLists.txt= +*::: Set VERSION to the new version 1: Get ready to make a release branch for the manual. You should ensure that ALL of the required doc merges are done. Usually Karen (smoler@cs) takes care of this, but you should check with her to coordinate. If she's not around, there are usually 3 merges that need to happen for any development series release. For example, to release 7.1.1, assuming we've been updating the V7_0_3-branch of doc for stable series changes, you'd need to do the following before you could make a V7_1_1-branch of doc. If you're doing a stable series release, you'd only need to do the first of those merges (=V7_0_3-branch= into =V7_0-branch=) and you'd be ready to create a =V7_0_4-branch= of the manual. *:: =V7_0_3-branch= into =V7_0-branch= (the current 7.0 manual)
