Author: arielch
Date: Wed Sep 19 19:22:51 2012
New Revision: 1387712
URL: http://svn.apache.org/viewvc?rev=1387712&view=rev
Log:
#i120925# - Prevent library name clash
Modified:
incubator/ooo/trunk/main/connectivity/prj/d.lst
incubator/ooo/trunk/main/connectivity/source/drivers/mysql/makefile.mk
incubator/ooo/trunk/main/connectivity/source/drivers/odbc/makefile.mk
incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
Modified: incubator/ooo/trunk/main/connectivity/prj/d.lst
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/connectivity/prj/d.lst?rev=1387712&r1=1387711&r2=1387712&view=diff
==============================================================================
--- incubator/ooo/trunk/main/connectivity/prj/d.lst (original)
+++ incubator/ooo/trunk/main/connectivity/prj/d.lst Wed Sep 19 19:22:51 2012
@@ -1,6 +1,6 @@
..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
+..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so
..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
..\%__SRC%\lib\*.jnilib %_DEST%\lib%_EXT%\*.jnilib
..\%__SRC%\slb\connectivity*.* %_DEST%\lib%_EXT%\connectivity*.*
Modified: incubator/ooo/trunk/main/connectivity/source/drivers/mysql/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/connectivity/source/drivers/mysql/makefile.mk?rev=1387712&r1=1387711&r2=1387712&view=diff
==============================================================================
--- incubator/ooo/trunk/main/connectivity/source/drivers/mysql/makefile.mk
(original)
+++ incubator/ooo/trunk/main/connectivity/source/drivers/mysql/makefile.mk Wed
Sep 19 19:22:51 2012
@@ -55,7 +55,8 @@ SHL1VERSIONMAP=$(SOLARENV)/src/component
# --- Library -----------------------------------
-SHL1TARGET= $(MYSQL_TARGET)$(DLLPOSTFIX)
+REALNAME:=$(MYSQL_TARGET).uno
+SHL1TARGET=$(REALNAME)$(DLLPOSTFIX)
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(CPPULIB) \
Modified: incubator/ooo/trunk/main/connectivity/source/drivers/odbc/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/connectivity/source/drivers/odbc/makefile.mk?rev=1387712&r1=1387711&r2=1387712&view=diff
==============================================================================
--- incubator/ooo/trunk/main/connectivity/source/drivers/odbc/makefile.mk
(original)
+++ incubator/ooo/trunk/main/connectivity/source/drivers/odbc/makefile.mk Wed
Sep 19 19:22:51 2012
@@ -54,7 +54,9 @@ SLOFILES=\
# --- ODBC Library -----------------------------------
-SHL1TARGET= $(ODBC_TARGET)$(DLLPOSTFIX)
+
+REALNAME:=$(ODBC_TARGET).uno
+SHL1TARGET=$(REALNAME)$(DLLPOSTFIX)
SHL1OBJS=$(SLOFILES)
SHL1STDLIBS=\
$(ODBCBASELIB) \
Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1387712&r1=1387711&r2=1387712&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp Wed Sep 19
19:22:51 2012
@@ -1058,8 +1058,8 @@ End
#endif
#endif
-STD_LIB_FILE(gid_File_Lib_Mysql,mysql)
-STD_LIB_FILE(gid_File_Lib_Odbc,odbc)
+STD_LIB_FILE(gid_File_Lib_Mysql,mysql.uno)
+STD_LIB_FILE(gid_File_Lib_Odbc,odbc.uno)
// STD_LIB_FILE( gid_File_Lib_Ofa , ofa)
