ooo-build r13751 - in trunk: . bin

[pmladek svn gnome org]

Author: pmladek
Date: Mon Sep  1 21:04:37 2008
New Revision: 13751
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13751&view=rev

Log:
2008-09-01  Petr Mladek  <pmladek suse cz>

	* bin/install-mono: replace basis-link and basis3.0 with basis3.0;
	  replace the hardcoded ooo-3.0 with $OOOINSTALLDIRNAME; remove the
	  obsolete attempt to create compat symlinks



Modified:
   trunk/ChangeLog
   trunk/bin/install-mono

Modified: trunk/bin/install-mono
==============================================================================
--- trunk/bin/install-mono	(original)
+++ trunk/bin/install-mono	Mon Sep  1 21:04:37 2008
@@ -55,26 +55,21 @@
     for dll in ure/lib/cli_basetypes.dll \
                ure/lib/cli_cppuhelper.dll \
 	       ure/lib/cli_uretypes.dll \
-	       basis-link/program/cli_oootypes.dll \
+	       basis$VERSION/program/cli_oootypes.dll \
 	       ure/lib/cli_uno_bridge.dll \
 	       ure/lib/cli_ure.dll ; do
-	wrong_config_name=$OOINSTDIR/${dll/\.dll/\.config}
-	if [ -f ${wrong_config_name} ]
-	then
-		ln -sf ${wrong_config_name} $OOINSTDIR/$dll.config
-	fi
 	gacutil $gacutil_root -i $OOINSTDIR/$dll -package $OOOINSTALLDIRNAME || exit 0
 
 	# the original fixes are not longer needed
-	rm -f $OOINSTDIR/basis3.0/program/$dll
-	rm -f $OOINSTDIR/basis3.0/program/$dll.config
+	rm -f $OOINSTDIR/basis$VERSION/program/$dll
+	rm -f $OOINSTDIR/basis$VERSION/program/$dll.config
 
 	# remove the deleted fixes from the filelist
 	if test -n "$OODESTDIR" ; then
 	    file_list=`grep "^$OOINSTBASE/$dll$" $OODESTDIR/gid* | head -n 1 | cut -d: -f1`
 	    test -z "$file_list" && echo "Error: \"$OOINSTBASE/$dll\" has not found in any filelist" && exit 1;
-	    sed -e "s|^$OOINSTBASE/basis3.0/$dll$||" \
-	        -e "s|^$OOINSTBASE/basis3.0/$dll.config$||" \
+	    sed -e "s|^$OOINSTBASE/basis$VERSION/$dll$||" \
+	        -e "s|^$OOINSTBASE/basis$VERSION/$dll.config$||" \
 		$file_list >$file_list.mono
 	    mv $file_list.mono $file_list
 	fi
@@ -82,7 +77,7 @@
 
     # filelist for the GAC
     if test -n "$OODESTDIR" ; then
-        for dir in `find $OODESTDIR/usr/lib/mono -type d -regex ".*/cli_[_a-z]*" -o -regex ".*/ooo-3.0"` ; do
+        for dir in `find $OODESTDIR/usr/lib/mono -type d -regex ".*/cli_[_a-z]*" -o -regex ".*/$OOOINSTALLDIRNAME"` ; do
 	    find $dir -type d | sed "s|^$OODESTDIR\(.*\)|%dir \1|" >>$MONOGACFILELIST
 	    find $dir -type f -o -type l | sed "s|^$OODESTDIR\(.*\)|\1|" >>$MONOGACFILELIST
 	done