Tag: cws_dev300_dba31a User: oj Date: 2008-06-06 08:58:49+0000 Modified: dba/connectivity/version.mk dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java dba/connectivity/source/drivers/ado/makefile.mk dba/connectivity/source/drivers/evoab/makefile.mk dba/connectivity/source/drivers/evoab2/makefile.mk dba/connectivity/source/drivers/hsqldb/makefile.mk dba/connectivity/source/drivers/jdbc/makefile.mk dba/connectivity/source/drivers/mozab/makefile.mk dba/connectivity/source/drivers/mysql/makefile.mk dba/connectivity/source/drivers/odbc/makefile.mk
Log: #i57999# fix naming schema File Changes: Directory: /dba/connectivity/ ============================= File [changed]: version.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/version.mk?r1=1.17&r2=1.17.32.1 Delta lines: +2 -77 -------------------- --- version.mk 2008-04-10 07:27:35+0000 1.17 +++ version.mk 2008-06-06 08:58:43+0000 1.17.32.1 @@ -8,7 +8,7 @@ # # $RCSfile: version.mk,v $ # -# $Revision: 1.17 $ +# $Revision: 1.17.32.1 $ # # This file is part of OpenOffice.org. # @@ -33,62 +33,22 @@ # target ADO_TARGET=ado -# the major -ADO_MAJOR=2 -# the minor -ADO_MINOR=0 -# the micro -ADO_MICRO=0 - - # ----------------------------ODBC BASE settings-----------------------------------# # target ODBC2_TARGET=odbcbase -# the major -ODBC2_MAJOR=2 -# the minor -ODBC2_MINOR=0 -# the micro -ODBC2_MICRO=0 - - # ----------------------------ODBC settings-----------------------------------# # target ODBC_TARGET=odbc -# the major -ODBC_MAJOR=2 -# the minor -ODBC_MINOR=0 -# the micro -ODBC_MICRO=0 - - # ----------------------------JDBC settings-----------------------------------# # target JDBC_TARGET=jdbc -# the major -JDBC_MAJOR=2 -# the minor -JDBC_MINOR=0 -# the micro -JDBC_MICRO=0 - - # ----------------------------dbtools settings-----------------------------------# # target DBTOOLS_TARGET=dbtools -# the major -DBTOOLS_MAJOR=2 -# the minor -DBTOOLS_MINOR=0 -# the micro -DBTOOLS_MICRO=0 - - # -----------------------DRIVER MANAGER settings--------------------------------# # target SDBC_TARGET=sdbc @@ -117,16 +77,6 @@ # target DBASE_TARGET=dbase -# the major -DBASE_MAJOR=2 -# the minor -DBASE_MINOR=0 -# the micro -DBASE_MICRO=0 - - - - # ----------------------------MOZAB settings-----------------------------------# # the major MOZAB_MAJOR=2 @@ -135,32 +85,15 @@ # the micro MOZAB_MICRO=0 - - # ----------------------------MySQL settings-----------------------------------# # target MYSQL_TARGET=mysql -# the major -MYSQL_MAJOR=2 -# the minor -MYSQL_MINOR=0 -# the micro -MYSQL_MICRO=0 - # ----------------------------Evoab settings-----------------------------------# # target EVOAB_TARGET=evoab -# the major -EVOAB_MAJOR=1 -# the minor -EVOAB_MINOR=0 -# the micro -EVOAB_MICRO=0 - - # ----------------------------Kab settings-------------------------------------# # target KAB_TARGET=kab @@ -184,15 +117,7 @@ # the micro MACAB_MICRO=0 - # ----------------------------HSQLDB settings-----------------------------------# # target HSQLDB_TARGET=hsqldb -# the major -HSQLDB_MAJOR=2 -# the minor -HSQLDB_MINOR=0 -# the micro -HSQLDB_MICRO=0 - Directory: /dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/ ============================================================ File [changed]: NativeLibraries.java Url: http://dba.openoffice.org/source/browse/dba/connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java?r1=1.3.32.1&r2=1.3.32.2 Delta lines: +3 -3 ------------------- --- NativeLibraries.java 2008-06-05 12:11:05+0000 1.3.32.1 +++ NativeLibraries.java 2008-06-06 08:58:43+0000 1.3.32.2 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: NativeLibraries.java,v $ - * $Revision: 1.3.32.1 $ + * $Revision: 1.3.32.2 $ * * This file is part of OpenOffice.org. * @@ -40,9 +40,9 @@ loadLibrary("msvcr71"); loadLibrary("uwinapi"); loadLibrary("sal3"); - loadLibrary("dbtools680mi"); + loadLibrary("dbtoolsmi"); } - loadLibrary("hsqldb2"); + loadLibrary("hsqldb"); } private static void loadLibrary(String libname) { Directory: /dba/connectivity/source/drivers/ado/ ================================================ File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/makefile.mk?r1=1.16&r2=1.16.32.1 Delta lines: +3 -3 ------------------- --- makefile.mk 2008-04-10 08:28:01+0000 1.16 +++ makefile.mk 2008-06-06 08:58:43+0000 1.16.32.1 @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.16 $ +# $Revision: 1.16.32.1 $ # # This file is part of OpenOffice.org. # @@ -83,7 +83,7 @@ $(SLO)$/adoimp.obj # --- Library ----------------------------------- -SHL1TARGET= $(ADO_TARGET)$(ADO_MAJOR) +SHL1TARGET= $(ADO_TARGET)$(DLLPOSTFIX) SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(CPPULIB) \ Directory: /dba/connectivity/source/drivers/evoab/ ================================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/evoab/makefile.mk?r1=1.8&r2=1.8.32.1 Delta lines: +3 -3 ------------------- --- makefile.mk 2008-04-10 08:46:51+0000 1.8 +++ makefile.mk 2008-06-06 08:58:44+0000 1.8.32.1 @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.8 $ +# $Revision: 1.8.32.1 $ # # This file is part of OpenOffice.org. # @@ -71,7 +71,7 @@ # --- Library ----------------------------------- #SHL1TARGET=$(TARGET)$(DLLPOSTFIX) -SHL1TARGET= $(EVOAB_TARGET)$(EVOAB_MAJOR) +SHL1TARGET= $(EVOAB_TARGET)$(DLLPOSTFIX) SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(CPPULIB) \ Directory: /dba/connectivity/source/drivers/evoab2/ =================================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/evoab2/makefile.mk?r1=1.7&r2=1.7.32.1 Delta lines: +3 -3 ------------------- --- makefile.mk 2008-04-10 08:56:16+0000 1.7 +++ makefile.mk 2008-06-06 08:58:45+0000 1.7.32.1 @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.7.32.1 $ # # This file is part of OpenOffice.org. # @@ -77,7 +77,7 @@ # --- Library ----------------------------------- #SHL1TARGET=$(TARGET)$(DLLPOSTFIX) -SHL1TARGET= $(EVOAB_TARGET)2 +SHL1TARGET= $(EVOAB_TARGET)$(DLLPOSTFIX) SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(CPPULIB) \ Directory: /dba/connectivity/source/drivers/hsqldb/ =================================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/makefile.mk?r1=1.14&r2=1.14.32.1 Delta lines: +4 -4 ------------------- --- makefile.mk 2008-04-10 09:21:52+0000 1.14 +++ makefile.mk 2008-06-06 08:58:45+0000 1.14.32.1 @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.14 $ +# $Revision: 1.14.32.1 $ # # This file is part of OpenOffice.org. # @@ -91,8 +91,8 @@ SHL1VERSIONMAP=$(HSQLDB_TARGET).map # --- Library ----------------------------------- - -SHL1TARGET= $(HSQLDB_TARGET)$(HSQLDB_MAJOR) +# NO $(DLLPOSTFIX) otherwise we have to find on which plattform we are for the java files +SHL1TARGET= $(HSQLDB_TARGET) SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(CPPULIB) \ Directory: /dba/connectivity/source/drivers/jdbc/ ================================================= File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/jdbc/makefile.mk?r1=1.23&r2=1.23.32.1 Delta lines: +3 -3 ------------------- --- makefile.mk 2008-04-10 09:29:56+0000 1.23 +++ makefile.mk 2008-06-06 08:58:45+0000 1.23.32.1 @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.23 $ +# $Revision: 1.23.32.1 $ # # This file is part of OpenOffice.org. # @@ -86,7 +86,7 @@ # --- Library ----------------------------------- -SHL1TARGET= $(JDBC_TARGET)$(JDBC_MAJOR) +SHL1TARGET= $(JDBC_TARGET)$(DLLPOSTFIX) SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(CPPULIB) \ Directory: /dba/connectivity/source/drivers/mozab/ ================================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/makefile.mk?r1=1.27&r2=1.27.32.1 Delta lines: +5 -5 ------------------- --- makefile.mk 2008-04-10 10:07:16+0000 1.27 +++ makefile.mk 2008-06-06 08:58:46+0000 1.27.32.1 @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.27 $ +# $Revision: 1.27.32.1 $ # # This file is part of OpenOffice.org. # @@ -100,7 +100,7 @@ # --- MOZAB BASE Library ----------------------------------- SHL1VERSIONMAP= $(TARGET).map -SHL1TARGET= $(TARGET)$(MOZAB_MAJOR) +SHL1TARGET= $(TARGET)$(DLLPOSTFIX) SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(CPPULIB) \ @@ -112,7 +112,7 @@ SHL1DEPN= -SHL1IMPLIB= i$(TARGET)$(MOZAB_MAJOR) +SHL1IMPLIB= i$(TARGET)$(DLLPOSTFIX) SHL1DEF= $(MISC)$/$(SHL1TARGET).def @@ -163,7 +163,7 @@ # --- MOZAB BASE Library ----------------------------------- SHL2VERSIONMAP= $(TARGET2).map -SHL2TARGET= $(TARGET2)$(MOZAB_MAJOR) +SHL2TARGET= $(TARGET2)$(DLLPOSTFIX) SHL2OBJS=$(SLO2FILES) SHL2STDLIBS=\ $(CPPULIB) \ Directory: /dba/connectivity/source/drivers/mysql/ ================================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mysql/makefile.mk?r1=1.9&r2=1.9.32.1 Delta lines: +3 -3 ------------------- --- makefile.mk 2008-04-10 10:25:13+0000 1.9 +++ makefile.mk 2008-06-06 08:58:46+0000 1.9.32.1 @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.9 $ +# $Revision: 1.9.32.1 $ # # This file is part of OpenOffice.org. # @@ -62,7 +62,7 @@ # --- Library ----------------------------------- -SHL1TARGET= $(MYSQL_TARGET)$(MYSQL_MAJOR) +SHL1TARGET= $(MYSQL_TARGET)$(DLLPOSTFIX) SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(CPPULIB) \ Directory: /dba/connectivity/source/drivers/odbc/ ================================================= File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/odbc/makefile.mk?r1=1.16&r2=1.16.32.1 Delta lines: +4 -4 ------------------- --- makefile.mk 2008-04-10 10:35:08+0000 1.16 +++ makefile.mk 2008-06-06 08:58:46+0000 1.16.32.1 @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.16 $ +# $Revision: 1.16.32.1 $ # # This file is part of OpenOffice.org. # @@ -67,7 +67,7 @@ # --- ODBC BASE Library ----------------------------------- -SHL1TARGET= $(ODBC2_TARGET)$(ODBC2_MAJOR) +SHL1TARGET= $(ODBC2_TARGET)$(DLLPOSTFIX) SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ $(DBTOOLSLIB) \ @@ -97,7 +97,7 @@ # --- ODBC Library ----------------------------------- -SHL2TARGET= $(ODBC_TARGET)$(ODBC_MAJOR) +SHL2TARGET= $(ODBC_TARGET)$(DLLPOSTFIX) SHL2OBJS=$(SLO2FILES) SHL2STDLIBS=\ $(ODBCBASELIB) \ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
