From 09a1d904641567d6db6e9129304979b4743cc328 Mon Sep 17 00:00:00 2001 From: sb Date: Tue, 12 Jan 2010 18:49:59 +0100 Subject: sb118: #i108269# first step of removing tcsh support --- connectivity/util/makefile.mk | 2 -- 1 file changed, 2 deletions(-) (limited to 'connectivity') diff --git a/connectivity/util/makefile.mk b/connectivity/util/makefile.mk index 805aa0110f6f..e446a371c547 100755 --- a/connectivity/util/makefile.mk +++ b/connectivity/util/makefile.mk @@ -70,9 +70,7 @@ $(MISC)$/$(TARGET)_delzip : $(BIN)$/fcfg_drivers_{$(alllangiso)}.zip : $(REALFILTERPACKAGES_FILTERS_UI_LANGPACKS) cd $(DIR_FILTERCFGOUT)$/$(@:b:s/fcfg_drivers_//) && zip -ru ..$/..$/..$/bin$/fcfg_drivers_$(@:b:s/fcfg_drivers_//).zip org/* -.IF "$(USE_SHELL)"!="4nt" $(PERL) -w $(SOLARENV)$/bin$/cleanzip.pl $@ -.ENDIF # "$(USE_SHELL)"!="4nt" ALLTAR: \ $(MISC)$/$(TARGET)_delzip \ -- cgit From ec0ee57607a1e8a800bb4809a0be6921df1f2e19 Mon Sep 17 00:00:00 2001 From: sb Date: Fri, 29 Jan 2010 17:01:54 +0100 Subject: sb118: #i108776# changed addsym.awk to also export STLport num_put symbols, and simplified it by requiring that first section is labeled UDK_3_0_0; adapted map files accordingly, replacing many individual ones with solenv/src templates --- connectivity/source/cpool/dbpool.map | 8 -------- connectivity/source/cpool/makefile.mk | 2 +- connectivity/source/dbtools/dbt.map | 8 -------- connectivity/source/drivers/adabas/adabas.map | 8 -------- connectivity/source/drivers/adabas/makefile.mk | 2 +- connectivity/source/drivers/calc/calc.map | 8 -------- connectivity/source/drivers/calc/makefile.mk | 2 +- connectivity/source/drivers/dbase/dbase.map | 10 ---------- connectivity/source/drivers/dbase/makefile.mk | 2 +- connectivity/source/drivers/evoab/evoab.map | 8 -------- connectivity/source/drivers/evoab/makefile.mk | 2 +- connectivity/source/drivers/evoab2/evoab2.map | 8 -------- connectivity/source/drivers/evoab2/makefile.mk | 2 +- connectivity/source/drivers/flat/flat.map | 8 -------- connectivity/source/drivers/flat/makefile.mk | 2 +- connectivity/source/drivers/jdbc/jdbc.map | 8 -------- connectivity/source/drivers/jdbc/makefile.mk | 2 +- connectivity/source/drivers/kab/kab.map | 8 -------- connectivity/source/drivers/kab/kabdrv.map | 2 +- connectivity/source/drivers/kab/makefile.mk | 2 +- connectivity/source/drivers/macab/macab.map | 8 -------- connectivity/source/drivers/macab/macabdrv.map | 2 +- connectivity/source/drivers/macab/makefile.mk | 2 +- connectivity/source/drivers/mozab/bootstrap/makefile.mk | 2 +- connectivity/source/drivers/mozab/bootstrap/mozbootstrap.map | 8 -------- connectivity/source/drivers/mozab/makefile.mk | 2 +- connectivity/source/drivers/mozab/mozab.map | 8 -------- connectivity/source/drivers/mozab/mozabdrv.map | 2 +- connectivity/source/drivers/mysql/makefile.mk | 2 +- connectivity/source/drivers/mysql/mysql.map | 8 -------- connectivity/source/drivers/odbc/makefile.mk | 2 +- connectivity/source/drivers/odbc/odbc.map | 8 -------- connectivity/source/manager/makefile.mk | 2 +- connectivity/source/manager/sdbc.map | 8 -------- 34 files changed, 18 insertions(+), 148 deletions(-) delete mode 100644 connectivity/source/cpool/dbpool.map delete mode 100644 connectivity/source/dbtools/dbt.map delete mode 100644 connectivity/source/drivers/adabas/adabas.map delete mode 100644 connectivity/source/drivers/calc/calc.map delete mode 100644 connectivity/source/drivers/dbase/dbase.map delete mode 100644 connectivity/source/drivers/evoab/evoab.map delete mode 100644 connectivity/source/drivers/evoab2/evoab2.map delete mode 100644 connectivity/source/drivers/flat/flat.map delete mode 100644 connectivity/source/drivers/jdbc/jdbc.map delete mode 100644 connectivity/source/drivers/kab/kab.map delete mode 100755 connectivity/source/drivers/macab/macab.map delete mode 100644 connectivity/source/drivers/mozab/bootstrap/mozbootstrap.map delete mode 100644 connectivity/source/drivers/mozab/mozab.map delete mode 100644 connectivity/source/drivers/mysql/mysql.map delete mode 100644 connectivity/source/drivers/odbc/odbc.map delete mode 100644 connectivity/source/manager/sdbc.map (limited to 'connectivity') diff --git a/connectivity/source/cpool/dbpool.map b/connectivity/source/cpool/dbpool.map deleted file mode 100644 index 7202c9d71b93..000000000000 --- a/connectivity/source/cpool/dbpool.map +++ /dev/null @@ -1,8 +0,0 @@ -DBPOOL_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/connectivity/source/cpool/makefile.mk b/connectivity/source/cpool/makefile.mk index 056e5c161758..9867b8663825 100644 --- a/connectivity/source/cpool/makefile.mk +++ b/connectivity/source/cpool/makefile.mk @@ -59,7 +59,7 @@ SLOFILES=\ SHL1TARGET= $(DBPOOL_TARGET)$(DBPOOL_MAJOR) -SHL1VERSIONMAP=$(TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ diff --git a/connectivity/source/dbtools/dbt.map b/connectivity/source/dbtools/dbt.map deleted file mode 100644 index c3eaaa5a253f..000000000000 --- a/connectivity/source/dbtools/dbt.map +++ /dev/null @@ -1,8 +0,0 @@ -DBTOOLS_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/connectivity/source/drivers/adabas/adabas.map b/connectivity/source/drivers/adabas/adabas.map deleted file mode 100644 index 7ce4c703e6b3..000000000000 --- a/connectivity/source/drivers/adabas/adabas.map +++ /dev/null @@ -1,8 +0,0 @@ -ADABAS_2_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/connectivity/source/drivers/adabas/makefile.mk b/connectivity/source/drivers/adabas/makefile.mk index 5b3483ed57bb..65cade7d839c 100644 --- a/connectivity/source/drivers/adabas/makefile.mk +++ b/connectivity/source/drivers/adabas/makefile.mk @@ -75,7 +75,7 @@ SLOFILES=\ $(SLO)$/BResultSetMetaData.obj \ $(SLO)$/BResultSet.obj -SHL1VERSIONMAP=$(TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map # --- Library ----------------------------------- diff --git a/connectivity/source/drivers/calc/calc.map b/connectivity/source/drivers/calc/calc.map deleted file mode 100644 index bcab8e6c9101..000000000000 --- a/connectivity/source/drivers/calc/calc.map +++ /dev/null @@ -1,8 +0,0 @@ -CALC_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/connectivity/source/drivers/calc/makefile.mk b/connectivity/source/drivers/calc/makefile.mk index f4019564ed30..465e9ff5d742 100644 --- a/connectivity/source/drivers/calc/makefile.mk +++ b/connectivity/source/drivers/calc/makefile.mk @@ -61,7 +61,7 @@ SLOFILES=\ $(SLO)$/Cservices.obj \ $(SLO)$/CDriver.obj -SHL1VERSIONMAP= $(TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map # --- Library ----------------------------------- diff --git a/connectivity/source/drivers/dbase/dbase.map b/connectivity/source/drivers/dbase/dbase.map deleted file mode 100644 index 2c620b4f3620..000000000000 --- a/connectivity/source/drivers/dbase/dbase.map +++ /dev/null @@ -1,10 +0,0 @@ -DBASE_2_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; - - diff --git a/connectivity/source/drivers/dbase/makefile.mk b/connectivity/source/drivers/dbase/makefile.mk index 37a88ef47674..e9f8314760ca 100644 --- a/connectivity/source/drivers/dbase/makefile.mk +++ b/connectivity/source/drivers/dbase/makefile.mk @@ -93,7 +93,7 @@ EXCEPTIONSFILES +=\ .ENDIF -SHL1VERSIONMAP=$(TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map # --- Library ----------------------------------- diff --git a/connectivity/source/drivers/evoab/evoab.map b/connectivity/source/drivers/evoab/evoab.map deleted file mode 100644 index 00cf7191f143..000000000000 --- a/connectivity/source/drivers/evoab/evoab.map +++ /dev/null @@ -1,8 +0,0 @@ -EVOAB_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/connectivity/source/drivers/evoab/makefile.mk b/connectivity/source/drivers/evoab/makefile.mk index 8982322513de..809df6ef8513 100644 --- a/connectivity/source/drivers/evoab/makefile.mk +++ b/connectivity/source/drivers/evoab/makefile.mk @@ -69,7 +69,7 @@ SLOFILES=\ $(SLO)$/LDebug.obj -SHL1VERSIONMAP=$(TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map # --- Library ----------------------------------- diff --git a/connectivity/source/drivers/evoab2/evoab2.map b/connectivity/source/drivers/evoab2/evoab2.map deleted file mode 100644 index 00cf7191f143..000000000000 --- a/connectivity/source/drivers/evoab2/evoab2.map +++ /dev/null @@ -1,8 +0,0 @@ -EVOAB_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/connectivity/source/drivers/evoab2/makefile.mk b/connectivity/source/drivers/evoab2/makefile.mk index 6d7ca92fbdd6..dc5ac1a2f0ee 100644 --- a/connectivity/source/drivers/evoab2/makefile.mk +++ b/connectivity/source/drivers/evoab2/makefile.mk @@ -65,7 +65,7 @@ SLOFILES=\ $(SLO)$/EApi.obj \ $(SLO)$/NDebug.obj -SHL1VERSIONMAP=$(TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map # --- Library ----------------------------------- diff --git a/connectivity/source/drivers/flat/flat.map b/connectivity/source/drivers/flat/flat.map deleted file mode 100644 index bf26bd0fa0fa..000000000000 --- a/connectivity/source/drivers/flat/flat.map +++ /dev/null @@ -1,8 +0,0 @@ -FLAT_2_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/connectivity/source/drivers/flat/makefile.mk b/connectivity/source/drivers/flat/makefile.mk index 071c8c0cc976..4a9b2aada20a 100644 --- a/connectivity/source/drivers/flat/makefile.mk +++ b/connectivity/source/drivers/flat/makefile.mk @@ -74,7 +74,7 @@ EXCEPTIONSFILES=\ $(SLO)$/EDriver.obj -SHL1VERSIONMAP=$(TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map # --- Library ----------------------------------- SHL1TARGET=$(TARGET)$(DLLPOSTFIX) diff --git a/connectivity/source/drivers/jdbc/jdbc.map b/connectivity/source/drivers/jdbc/jdbc.map deleted file mode 100644 index 23369ec76466..000000000000 --- a/connectivity/source/drivers/jdbc/jdbc.map +++ /dev/null @@ -1,8 +0,0 @@ -JDBC_2_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/connectivity/source/drivers/jdbc/makefile.mk b/connectivity/source/drivers/jdbc/makefile.mk index fb37a3077743..4eed481b17da 100644 --- a/connectivity/source/drivers/jdbc/makefile.mk +++ b/connectivity/source/drivers/jdbc/makefile.mk @@ -82,7 +82,7 @@ SLOFILES=\ $(SLO)$/tools.obj \ $(SLO)$/ContextClassLoader.obj -SHL1VERSIONMAP=$(JDBC_TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map # --- Library ----------------------------------- diff --git a/connectivity/source/drivers/kab/kab.map b/connectivity/source/drivers/kab/kab.map deleted file mode 100644 index 6b7216de8c11..000000000000 --- a/connectivity/source/drivers/kab/kab.map +++ /dev/null @@ -1,8 +0,0 @@ -KAB_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/connectivity/source/drivers/kab/kabdrv.map b/connectivity/source/drivers/kab/kabdrv.map index c32084ddd4ab..5de866f2e52f 100644 --- a/connectivity/source/drivers/kab/kabdrv.map +++ b/connectivity/source/drivers/kab/kabdrv.map @@ -1,4 +1,4 @@ -KAB_1_0 { +UDK_3_0_0 { global: createKabConnection; initKApplication; diff --git a/connectivity/source/drivers/kab/makefile.mk b/connectivity/source/drivers/kab/makefile.mk index 2c0a86f8562b..de6955f4b066 100644 --- a/connectivity/source/drivers/kab/makefile.mk +++ b/connectivity/source/drivers/kab/makefile.mk @@ -65,7 +65,7 @@ DEPOBJFILES= \ # --- Library ----------------------------------- -SHL1VERSIONMAP=$(TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1TARGET= $(TARGET)$(KAB_MAJOR) SHL1OBJS=$(SLOFILES) diff --git a/connectivity/source/drivers/macab/macab.map b/connectivity/source/drivers/macab/macab.map deleted file mode 100755 index fe2d1ac90534..000000000000 --- a/connectivity/source/drivers/macab/macab.map +++ /dev/null @@ -1,8 +0,0 @@ -MACAB_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/connectivity/source/drivers/macab/macabdrv.map b/connectivity/source/drivers/macab/macabdrv.map index d953690f6ba3..e23423e71592 100755 --- a/connectivity/source/drivers/macab/macabdrv.map +++ b/connectivity/source/drivers/macab/macabdrv.map @@ -1,4 +1,4 @@ -MACAB_1_0 { +UDK_3_0_0 { global: createMacabConnection; local: diff --git a/connectivity/source/drivers/macab/makefile.mk b/connectivity/source/drivers/macab/makefile.mk index 8edc8951fa95..c5516d13a6e8 100755 --- a/connectivity/source/drivers/macab/makefile.mk +++ b/connectivity/source/drivers/macab/makefile.mk @@ -58,7 +58,7 @@ DEPOBJFILES= \ # --- Library ----------------------------------- -SHL1VERSIONMAP=$(TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1TARGET= $(TARGET)$(MACAB_MAJOR) SHL1OBJS=$(SLOFILES) diff --git a/connectivity/source/drivers/mozab/bootstrap/makefile.mk b/connectivity/source/drivers/mozab/bootstrap/makefile.mk index 00f76ddeb8fd..44881d130106 100644 --- a/connectivity/source/drivers/mozab/bootstrap/makefile.mk +++ b/connectivity/source/drivers/mozab/bootstrap/makefile.mk @@ -71,7 +71,7 @@ SLOFILES += \ CDEFS+=-DMINIMAL_PROFILEDISCOVER SHL1TARGET=$(TARGET) -SHL1VERSIONMAP= $(TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1OBJS=$(SLOFILES) SHL1DEF=$(MISC)$/$(SHL1TARGET).def DEF1NAME=$(SHL1TARGET) diff --git a/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.map b/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.map deleted file mode 100644 index 750db5d4af09..000000000000 --- a/connectivity/source/drivers/mozab/bootstrap/mozbootstrap.map +++ /dev/null @@ -1,8 +0,0 @@ -MOZBOOTSTRAP_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/connectivity/source/drivers/mozab/makefile.mk b/connectivity/source/drivers/mozab/makefile.mk index 76161dc32119..f9a2159832c0 100644 --- a/connectivity/source/drivers/mozab/makefile.mk +++ b/connectivity/source/drivers/mozab/makefile.mk @@ -89,7 +89,7 @@ SLOFILES=\ # --- MOZAB BASE Library ----------------------------------- -SHL1VERSIONMAP= $(TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1TARGET= $(TARGET)$(DLLPOSTFIX) SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ diff --git a/connectivity/source/drivers/mozab/mozab.map b/connectivity/source/drivers/mozab/mozab.map deleted file mode 100644 index 9f3a1f27d0f5..000000000000 --- a/connectivity/source/drivers/mozab/mozab.map +++ /dev/null @@ -1,8 +0,0 @@ -MOZAB_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/connectivity/source/drivers/mozab/mozabdrv.map b/connectivity/source/drivers/mozab/mozabdrv.map index 918cb530e1f1..a431a0737754 100644 --- a/connectivity/source/drivers/mozab/mozabdrv.map +++ b/connectivity/source/drivers/mozab/mozabdrv.map @@ -1,4 +1,4 @@ -MOZABDRV_1_0 { +UDK_3_0_0 { global: OMozabConnection_CreateInstance; OMozillaBootstrap_CreateInstance; diff --git a/connectivity/source/drivers/mysql/makefile.mk b/connectivity/source/drivers/mysql/makefile.mk index 0d46f0c35dbb..fc59fca38e80 100644 --- a/connectivity/source/drivers/mysql/makefile.mk +++ b/connectivity/source/drivers/mysql/makefile.mk @@ -59,7 +59,7 @@ SLOFILES=\ $(SLO)$/YUsers.obj \ $(SLO)$/Yservices.obj -SHL1VERSIONMAP=$(MYSQL_TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map # --- Library ----------------------------------- diff --git a/connectivity/source/drivers/mysql/mysql.map b/connectivity/source/drivers/mysql/mysql.map deleted file mode 100644 index 834658431ada..000000000000 --- a/connectivity/source/drivers/mysql/mysql.map +++ /dev/null @@ -1,8 +0,0 @@ -MYSQL_2_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/connectivity/source/drivers/odbc/makefile.mk b/connectivity/source/drivers/odbc/makefile.mk index 8f37b6185d5e..95d20f751fcf 100644 --- a/connectivity/source/drivers/odbc/makefile.mk +++ b/connectivity/source/drivers/odbc/makefile.mk @@ -75,7 +75,7 @@ SHL1IMPLIB= i$(ODBC_TARGET) SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) -SHL1VERSIONMAP=odbc.map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map # --- Targets ---------------------------------- diff --git a/connectivity/source/drivers/odbc/odbc.map b/connectivity/source/drivers/odbc/odbc.map deleted file mode 100644 index 14e4b7110c89..000000000000 --- a/connectivity/source/drivers/odbc/odbc.map +++ /dev/null @@ -1,8 +0,0 @@ -ODBC_3_0_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/connectivity/source/manager/makefile.mk b/connectivity/source/manager/makefile.mk index 7cb514cd3696..8d11a5db4602 100644 --- a/connectivity/source/manager/makefile.mk +++ b/connectivity/source/manager/makefile.mk @@ -56,7 +56,7 @@ SLOFILES=\ SHL1TARGET= $(SDBC_TARGET)$(SDBC_MAJOR) -SHL1VERSIONMAP=$(TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map SHL1OBJS=$(SLOFILES) SHL1STDLIBS=\ diff --git a/connectivity/source/manager/sdbc.map b/connectivity/source/manager/sdbc.map deleted file mode 100644 index 2d8534b22e21..000000000000 --- a/connectivity/source/manager/sdbc.map +++ /dev/null @@ -1,8 +0,0 @@ -SDBC_1_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; -- cgit From 1eaa9c24e22e375b60b89169d7031b8ef5866eab Mon Sep 17 00:00:00 2001 From: sb Date: Thu, 11 Feb 2010 11:07:17 +0100 Subject: sb118: #i109112# re-purpose EXTRAJARFILES --- connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'connectivity') diff --git a/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk b/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk index 3977a4869ede..3ded70663ccf 100644 --- a/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk +++ b/connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk @@ -42,10 +42,9 @@ SECONDARY_PACKAGE = org$/hsqldb$/lib .IF "$(SYSTEM_HSQLDB)" == "YES" -XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(HSQLDB_JAR) -JARFILES+= $(HSQLDB_JAR) +EXTRAJARFILES = $(HSQLDB_JAR) .ELSE -JARFILES+= hsqldb.jar +JARFILES = hsqldb.jar .ENDIF JAVAFILES =\ @@ -64,7 +63,7 @@ JAVACLASSFILES = $(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class JARCOMPRESS = TRUE JARCLASSDIRS = $(PACKAGE) $(SECONDARY_PACKAGE) JARTARGET = $(TARGET).jar -JARCLASSPATH = $(JARFILES) .. +JARCLASSPATH = $(JARFILES) $(EXTRAJARFILES) .. # --- Targets ------------------------------------------------------ .INCLUDE : target.mk -- cgit