Ure is also an alias, get rid of CVSROOT/modules file in the linked tree.

* git/ooo-link-modules.sh: ure is also an alias, get rid of
CVSROOT/modules file in the linked tree.
* git/ooo-to-git.sh: Create the git trees.

2 files changed, 45 insertions, 5 deletions

diff --git a/git/ooo-link-modules.sh b/git/ooo-link-modules.sh
index f623ae78d..a06f84ac2 100755
--- a/git/ooo-link-modules.sh
+++ b/git/ooo-link-modules.sh
@@ -1,7 +1,6 @@
 #! /bin/bash
 
 MODULESDIR="cvsup"
-MODULES="$MODULESDIR/CVSROOT/modules"
 LINKDIR="ooo"
 
 [ -d "$LINKDIR" ] && { echo "$LINKDIR already exists" ; exit 1 ; }
@@ -31,13 +30,16 @@ function linkdir() {
     done
 }
 
-ONLY="`grep '^OpenOffice2 -a' "$MODULES" | sed 's/^OpenOffice2 -a //'`"
-ONLY=" $ONLY "
-
 mkdir -p "$LINKDIR"
 mkdir "$LINKDIR/tmp"
 
-ln -s "../$MODULESDIR/CVSROOT" "$LINKDIR/CVSROOT"
+cp -a "../$MODULESDIR/CVSROOT" "$LINKDIR/CVSROOT"
+
+MODULES="$LINKDIR/CVSROOT/modules.save"
+mv "$LINKDIR/CVSROOT/modules" "$MODULES"
+
+ONLY="`grep '^OpenOffice2 -a' "$MODULES" | sed 's/^OpenOffice2 -a //'`"
+ONLY=" $ONLY "
 
 # link everything to openoffice.org subdir
 echo "Linking modules"
diff --git a/git/ooo-to-git.sh b/git/ooo-to-git.sh
new file mode 100755
index 000000000..58d9aac9d
--- /dev/null
+++ b/git/ooo-to-git.sh
@@ -0,0 +1,38 @@
+#! /bin/bash
+
+# CVS_PATH must be absolute
+CVS_PATH="/local/git/ooo"
+GIT_PATH="ooo-git"
+
+[ -e "$GIT_PATH" ] && { echo "'$GIT_PATH' already exists." ; exit 1 ; }
+mkdir -p "$GIT_PATH"
+
+# cvsps cache seems to break things :-(
+rm ~/.cvsps/*
+
+COUNT=0
+echo -n "Creating "
+for I in `( cd "$CVS_PATH" ; echo * )` ; do
+    [ "$I" = "CVSROOT" ] && continue
+
+    if [ "$COUNT" -lt "6" ] ; then
+	COUNT=$(( $COUNT + 1 ))
+    else
+	echo "..."
+	wait
+	COUNT=0
+	echo -n "Creating "
+    fi
+
+    echo -n "$I "
+    git-cvsimport-ooo -v -C "$GIT_PATH/$I.git" -i -k -o master \
+                      -m -M 'INTEGRATION: CWS (\w+)' \
+                      -d "$CVS_PATH" \
+                      "$I" \
+                      > "$GIT_PATH/$I.log" 2>&1 &
+#if we already have the cvsps output, use  -P "/local/git/ooo-git.cvsps" \
+done
+
+echo "..."
+wait
+echo "Done"