Changeset 77

Timestamp:

Feb 28, 2010 10:32:03 AM (11 years ago)

Author:

bradbell

Message:

[ckbs/trunk] Move ckbs.omh so file names are releative to trunk directory.

ckbs.omh: move to trunk directory.
ckbs.omh: move from omh subdirectory, OMhelp path commands no longer needed.
copy_doc.sh: change omh/ckbs.omh to ckbs.omh.
new_stable.sh: change omh/ckbs.omh to ckbs.omh.
build_doc.sh: change omh/ckbs.omh to ckbs.omh.

Location:

projects/ckbs/trunk

Files:

• build_doc.sh (modified) (1 diff)
• ckbs.omh (moved) (moved from projects/ckbs/trunk/omh/ckbs.omh) (1 diff)
• copy_doc.sh (modified) (1 diff)
• new_stable.sh (modified) (4 diffs)

projects/ckbs/trunk/build_doc.sh

@@ -58 +58 @@
         for arg2 in -noframe -printable
         do
-                echo "omhelp omh/ckbs.omh $arg1 $arg2 -debug >& omhelp.log"
-                if ! $cmd ../omh/ckbs.omh $arg1 $arg2 -debug >& ../omhelp.log
+                echo "omhelp ckbs.omh $arg1 $arg2 -debug >& omhelp.log"
+                if ! $cmd ../ckbs.omh $arg1 $arg2 -debug >& ../omhelp.log
                 then
                         echo "build_doc.sh: omhelp error, see omhelp.log"

projects/ckbs/trunk/ckbs.omh

@@ -22 +22 @@
         xml
 $$
-
-$path%..%.m%$$
-$path%..%.omh%$$
 
 $latex \newcommand{\T}{{\rm T}}$$

projects/ckbs/trunk/copy_doc.sh

@@ -12 +12 @@
         version=`date +%F | sed -e 's|-||g' -e 's|^|0.|'`
         #
-        sed -i omh/ckbs.omh -e "s/ckbs-[0-9.]\{10\}/ckbs-$version/"
+        sed -i ckbs.omh -e "s/ckbs-[0-9.]\{10\}/ckbs-$version/"
 fi
 #

projects/ckbs/trunk/new_stable.sh

@@ -6 +6 @@
 # License: GNU General Public License Version 2
 # ----------------------------------------------------------------------------
-echo "Current revision number = "
-rev=`svn info --revision HEAD | grep '^Revision:' | sed -e 's|^Revision: *||'`
-echo "$rev"
+echo "Getting current revision number"
+rev_trunk=`svn info --revision HEAD | \
+        grep '^Revision:' | sed -e 's|^Revision: *||'`
+rev_stable=`expr $rev_trunk + 1` 
+rev_release=`expr $rev_trunk + 2`
+echo "rev_trunk=$rev_trunk, rev_stable=$rev_stable, rev_release=$rev_release"
+#
 stable_version=`date +%F |sed -e 's/-//g' -e 's|^|0.|'`
 repository="https://projects.coin-or.org/svn/CoinBazaar/projects/ckbs"
@@ -22 +26 @@
         exit 1
 fi
-doc_version=`grep '$section' omh/ckbs.omh | \
+doc_version=`grep '$section' ckbs.omh | \
         sed -e 's|.*ckbs-\([0-9.]\{10\}\).*|\1|'`
 if [ "$doc_version" != "$stable_version" ]
@@ -34 +38 @@
 # create the new stable version
 msg="[ckbs/stable] Create ckbs/stable/$stable_version 
-from ckbs/trunk at revision $rev."
+from ckbs/trunk at revision $rev_stable."
 echo "svn copy $rep_trunk $rep_stable -m \"$msg\""
 if ! svn copy  $rep_trunk $rep_stable -m "$msg"
@@ -44 +48 @@
 # create the new release version
 msg="[ckbs/releases] Create ckbs/releases/$stable_version.0 
-from ckbs/stable/$stable_version at revision $rev."
+from ckbs/stable/$stable_version at revision $rev_release."
 echo "svn copy $rep_stable $rep_release -m \"$msg\""
 if ! svn copy  $rep_stable $rep_release -m "$msg"