ooo-build r13443 - in trunk: . bin src test/mono

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Jul 30 20:24:49 2008
New Revision: 13443
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13443&view=rev

Log:
* install cli_uno_bridge.dll.config to the ure
* src/cli_uno_bridge.dll.config.in: the libs we want are in
  basis-link/ure-link


Modified:
   trunk/ChangeLog
   trunk/bin/install-mono
   trunk/src/cli_uno_bridge.dll.config.in
   trunk/test/mono/Makefile

Modified: trunk/bin/install-mono
==============================================================================
--- trunk/bin/install-mono	(original)
+++ trunk/bin/install-mono	Wed Jul 30 20:24:49 2008
@@ -38,7 +38,7 @@
 for dll in cli_uno_bridge.dll ; do
     sed -e "s|@LIBDIRBASE@|$LIBDIRBASE|g" \
 	-e "s|@OOOINSTALLDIRNAME@|$OOOINSTALLDIRNAME|g" \
-	$SRCDIR/$dll.config.in >$OOINSTDIR/basis$VERSION/program/$dll.config
+	$SRCDIR/$dll.config.in > $OOINSTDIR/ure/lib/$dll.config
 done
 	perl -pi -e "s,</configuration>,  <dllmap dll=\"cli_uno_glue\" target=\"$LIBDIRBASE/$OOOINSTALLDIRNAME/ure-link/lib/libcli_uno_glue.so\"/>\n</configuration>," \
 		$OOINSTDIR/ure/lib/cli_cppuhelper.config

Modified: trunk/src/cli_uno_bridge.dll.config.in
==============================================================================
--- trunk/src/cli_uno_bridge.dll.config.in	(original)
+++ trunk/src/cli_uno_bridge.dll.config.in	Wed Jul 30 20:24:49 2008
@@ -1,7 +1,7 @@
 <configuration>
-  <dllmap dll="cli_uno" target="@LIBDIRBASE@/@OOOINSTALLDIRNAME@/basis-link/program/libcli_uno.so"/>
+  <dllmap dll="cli_uno" target="@LIBDIRBASE@/@OOOINSTALLDIRNAME@/basis-link/ure-link/lib/libcli_uno.so"/>
   <!-- FIXME: need to look for another libraries
-  <dllmap dll="sal" target="@LIBDIRBASE@/@OOOINSTALLDIRNAME@/basis-link/program/libsal.so.3"/>
-  <dllmap dll="uno_cppu" target="@LIBDIRBASE@/@OOOINSTALLDIRNAME@/basis-link/program/libuno_cppu.so.3"/>
+  <dllmap dll="sal" target="@LIBDIRBASE@/@OOOINSTALLDIRNAME@/basis-link/ure-link/lib/libsal.so.3"/>
+  <dllmap dll="uno_cppu" target="@LIBDIRBASE@/@OOOINSTALLDIRNAME@/basis-link/ure-link/lib/libuno_cppu.so.3"/>
   -->
 </configuration>

Modified: trunk/test/mono/Makefile
==============================================================================
--- trunk/test/mono/Makefile	(original)
+++ trunk/test/mono/Makefile	Wed Jul 30 20:24:49 2008
@@ -10,7 +10,7 @@
 
 SpreadsheetSample.exe: ${SOURCES}
 	mcs SpreadsheetSample.cs SpreadsheetDocHelper.cs \
-	    `pkg-config --libs mono-ooo-2.0`
+	    `pkg-config --libs mono-openoffice`
 
 clean:
 	rm -f SpreadsheetSample.exe