incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
Subject svn commit: r1142142 - /incubator/ooo/trunk/tools/dev/
Date Sat, 02 Jul 2011 02:04:40 GMT
Author: gstein
Date: Sat Jul  2 02:04:40 2011
New Revision: 1142142

Adjust the selection of CWS's from the cws-list.txt file. We also need to
fetch the cws_l10n/* repositories. Thus, differentiate between the
repository name ($cwsrepos) and local directory name ($cws). The latter
will be named "l10n.$FOO" for those corresponding to cws_l10n/*.

Note: in this revision, the 'grep' selection avoids the cws_l10n
repositories. In my testing, it said those repositories were not related
to DEV300. I need to consult the mailing list to figure out what is wrong.

* tools/dev/ use a simple grep to get the repository
    name, and then construct a local directory name separately.


Modified: incubator/ooo/trunk/tools/dev/
--- incubator/ooo/trunk/tools/dev/ (original)
+++ incubator/ooo/trunk/tools/dev/ Sat Jul  2 02:04:40 2011
@@ -60,24 +60,30 @@ cwsfile=`basename "$2"`
 cwslist=`(cd "$cwsdir" ; pwd)`/$cwsfile
-for cws in `sed -n '/^cws\//s#^cws/##p' $cwslist` ; do
+for cwsrepos in `grep '^cws/' $cwslist` ; do
   cd "$work"
+  # Construct a name for our working directory
+  cws=`echo $cwsrepos | sed 's#.*/##'`
+  if test "`echo $cwsrepos | sed -n '/cws_l10n/p'`" ; then
+    cws="l10n.$cws"
+  fi
   if test -d "$cws" ; then
     echo "============ '$cws' exists. Pulling ..."
     cd "$cws"
-    hg pull "$REPOS/cws/$cws"
+    hg pull "$REPOS/$cwsrepos"
   elif test -e "$cws" ; then
     echo "ERROR: '$cws' exists and is not a directory."
     exit 1
   # filter out empty CWS: hg incoming returns 1 if there's nothing to pull
-  elif hg -R "$dev300" incoming "$REPOS/cws/$cws" >/dev/null; then
+  elif hg -R "$dev300" incoming "$REPOS/$cwsrepos" >/dev/null; then
     echo "============ '$cws' is being created ..."
     hg clone -U "$dev300" "$cws"
     cd "$cws"
-    hg pull "$REPOS/cws/$cws"
+    hg pull "$REPOS/$cwsrepos"
     echo "============ '$cws' skipped: nothing to pull ..."

View raw message