[Libreoffice-commits] .: 171 commits - config_host.mk.in configure.in connectivity/AllLangResTarget_cnr.mk connectivity/AllLangResTarget_hsqldb.mk connectivity/AllLangResTarget_sdbcl.mk connectivity/AllLangResTarget_sdberr.mk connectivity/com connectivity/Configuration_ado.mk connectivity/Configuration_calc.mk connectivity/Configuration_dbase.mk connectivity/Configuration_evoab.mk connectivity/Configuration_flat.mk connectivity/Configuration_hsqldb.mk connectivity/Configuration_jdbc.mk connectivity/Configuration_kab.mk connectivity/Configuration_macab.mk connectivity/Configuration_mozab2.mk connectivity/Configuration_mozab.mk connectivity/Configuration_mysql.mk connectivity/Configuration_odbc.mk connectivity/Configuration_postgresql.mk connectivity/Configuration_tdeab.mk connectivity/dbtools.pmk connectivity/inc connectivity/Jar_ConnectivityTools.mk connectivity/Jar_sdbc_hsqldb.mk connectivity/JunitTest_complex.mk connectivity/Library_ado.mk connectivity/Library_calc.mk connectivity/Libra ry_dbase.mk connectivity/Library_dbpool2.mk connectivity/Library_dbtools.mk connectivity/Library_evoab.mk connectivity/Library_file.mk connectivity/Library_flat.mk connectivity/Library_hsqldb.mk connectivity/Library_jdbc.mk connectivity/Library_kab1.mk connectivity/Library_kabdrv1.mk connectivity/Library_macab1.mk connectivity/Library_macabdrv1.mk connectivity/Library_mozabdrv.mk connectivity/Library_mozab.mk connectivity/Library_mozbootstrap.mk connectivity/Library_mysql.mk connectivity/Library_odbcbase.mk connectivity/Library_odbc.mk connectivity/Library_postgresql-sdbc-impl.mk connectivity/Library_postgresql-sdbc.mk connectivity/Library_sdbc2.mk connectivity/Library_tdeab1.mk connectivity/Library_tdeabdrv1.mk connectivity/Makefile connectivity/makefile.pmk connectivity/Module_connectivity.mk connectivity/Package_generated.mk connectivity/Package_inc.mk connectivity/Package_postgresql-sdbc.mk connectivity/Package_xml.mk connectivity/prj connectivity/qa connectivity/Rdb_pos tgresql-sdbc.mk connectivity/registry connectivity/source connectivity/target.pmk connectivity/util connectivity/version.mk cross_tail_build/prj cross_toolset/prj dbaccess/Library_dbui.mk dbaccess/Library_dbu.mk desktop/WinResTarget_quickstart.mk desktop/WinResTarget_sbase.mk desktop/WinResTarget_scalc.mk desktop/WinResTarget_sdraw.mk desktop/WinResTarget_simpress.mk desktop/WinResTarget_smath.mk desktop/WinResTarget_sofficebin.mk desktop/WinResTarget_soffice.mk desktop/WinResTarget_sweb.mk desktop/WinResTarget_swriter.mk extensions/source extensions/test extensions/WinResTarget_activex.mk extensions/WinResTarget_npsoplugin.mk fpicker/WinResTarget_fps.mk icu/icuversion.mk icu/makefile.mk icu/prj io/Module_io.mk io/Package_xml.mk jfreereport/version.mk Makefile.top Module_cross_tail_build.mk Module_tail_build.mk officecfg/util postprocess/packcomponents postprocess/packregistry postprocess/prj python/makefile.mk python/prj python/pyversion.Makefile rdbmaker/source reportbuild er/Configuration_reportbuilder.mk reportbuilder/Extension_reportbuilder.mk reportbuilder/Jar_reportbuilder.mk reportbuilder/java reportbuilder/Makefile reportbuilder/Module_reportbuilder.mk reportbuilder/Package_readme.mk reportbuilder/prj reportbuilder/registry reportbuilder/template reportbuilder/util RepositoryExternal.mk Repository.mk RepositoryModule_ooo.mk scp2/CustomTarget_langmacros.mk scp2/InstallModule_accessories.mk scp2/InstallModule_activex.mk scp2/InstallModule_base.mk scp2/InstallModule_binfilter.mk scp2/InstallModule_calc.mk scp2/InstallModule_canvas.mk scp2/InstallModule_crashrep.mk scp2/InstallModule_draw.mk scp2/InstallModule_extensions.mk scp2/InstallModule_gnome.mk scp2/InstallModule_graphicfilter.mk scp2/InstallModule_impress.mk scp2/InstallModule_javafilter.mk scp2/InstallModule_kde.mk scp2/InstallModule_math.mk scp2/InstallModule_onlineupdate.mk scp2/InstallModule_ooo.mk scp2/InstallModule_python.mk scp2/InstallModule_quickstart.mk scp2/InstallModule_ sdkoo.mk scp2/InstallModule_smoketest.mk scp2/InstallModule_stdlibs.mk scp2/InstallModule_tde.mk scp2/InstallModule_ure.mk scp2/InstallModule_ure_standalone.mk scp2/InstallModule_windows.mk scp2/InstallModule_winexplorerext.mk scp2/InstallModule_writer.mk scp2/InstallModule_xsltfilter.mk scp2/InstallScript_sdkoo.mk scp2/InstallScript_setup_osl.mk scp2/InstallScript_test.mk scp2/InstallScript_ure.mk scp2/macros scp2/Makefile scp2/Module_scp2.mk scp2/Package_inc.mk scp2/Package_langmacros.mk scp2/prj scp2/source scp2/util sc/source shell/CustomTarget_shlxthdl_res.mk shell/CustomTarget_x64.mk shell/Executable_gnome_open_url.mk shell/Executable_lngconvex.mk shell/Executable_regsvrex.mk shell/Executable_senddoc.mk shell/Executable_uri_encode.mk shell/inc shell/InternalUnoApi_cmdmail.mk shell/InternalUnoApi_localebe.mk shell/InternalUnoApi_macbe.mk shell/InternalUnoApi_smplmail.mk shell/InternalUnoApi_syssh.mk shell/InternalUnoApi_syssh_win.mk shell/InternalUnoApi_wininetbe.mk she ll/Library_cmdmail.mk shell/Library_desktopbe.mk shell/Library_gconfbe.mk shell/Library_kde4be.mk shell/Library_kdebe.mk shell/Library_localebe.mk shell/Library_macbe.mk shell/Library_ooofilt.mk shell/Library_ooofilt_x64.mk shell/Library_propertyhdl.mk shell/Library_propertyhdl_x64.mk shell/Library_recentfile.mk shell/Library_shlxthdl.mk shell/Library_shlxthdl_x64.mk shell/Library_smplmail.mk shell/Library_syssh.mk shell/Library_syssh_win.mk shell/Library_tdebe.mk shell/Library_wininetbe.mk shell/Makefile shell/Module_shell.mk shell/Package_inc.mk shell/Package_scripts.mk shell/prj shell/source shell/StaticLibrary_shlxthandler_common.mk shell/StaticLibrary_shlxthandler_common_x64.mk shell/StaticLibrary_simplemapi.mk shell/StaticLibrary_xmlparser.mk shell/StaticLibrary_xmlparser_x64.mk shell/WinResTarget_shlxthdl.mk slideshow/Library_OGLTrans.mk solenv/bin solenv/gbuild solenv/inc .src_root stoc/Module_stoc.mk stoc/Package_xml.mk store/Package_inc.mk svl/Library_svl.mk tail_b uild/prj testtools/CustomTarget_bridgetest_climaker.mk testtools/CustomTarget_bridgetest_javamaker.mk testtools/CustomTarget_bridgetest.mk testtools/CustomTarget_uno_test.mk testtools/inc testtools/InternalUnoApi_bridgetest.mk testtools/Jar_testComponent.mk testtools/Library_bridgetest.mk testtools/Library_constructors.mk testtools/Library_cppobj.mk testtools/Makefile testtools/Module_testtools.mk testtools/prj testtools/Rdb_uno_services.mk testtools/source testtools/StaticLibrary_bridgetest.mk unixODBC/Module_unixODBC.mk vcl/Library_vclplug_kde4.mk vcl/Library_vclplug_kde.mk vcl/WinResTarget_vcl.mk writerfilter/source
David Tardon
dtardon at kemper.freedesktop.org
Mon May 28 22:39:28 PDT 2012
Makefile.top | 10
Module_cross_tail_build.mk | 1
Module_tail_build.mk | 11
Repository.mk | 86 +
RepositoryExternal.mk | 557 +++++++++-
RepositoryModule_ooo.mk | 2
config_host.mk.in | 4
configure.in | 16
connectivity/AllLangResTarget_cnr.mk | 45
connectivity/AllLangResTarget_hsqldb.mk | 47
connectivity/AllLangResTarget_sdbcl.mk | 45
connectivity/AllLangResTarget_sdberr.mk | 40
connectivity/Configuration_ado.mk | 38
connectivity/Configuration_calc.mk | 38
connectivity/Configuration_dbase.mk | 38
connectivity/Configuration_evoab.mk | 38
connectivity/Configuration_flat.mk | 38
connectivity/Configuration_hsqldb.mk | 38
connectivity/Configuration_jdbc.mk | 38
connectivity/Configuration_kab.mk | 38
connectivity/Configuration_macab.mk | 38
connectivity/Configuration_mozab.mk | 38
connectivity/Configuration_mozab2.mk | 38
connectivity/Configuration_mysql.mk | 38
connectivity/Configuration_odbc.mk | 38
connectivity/Configuration_postgresql.mk | 38
connectivity/Configuration_tdeab.mk | 38
connectivity/Jar_ConnectivityTools.mk | 57 +
connectivity/Jar_sdbc_hsqldb.mk | 54
connectivity/JunitTest_complex.mk | 77 +
connectivity/Library_ado.mk | 94 +
connectivity/Library_calc.mk | 75 +
connectivity/Library_dbase.mk | 84 +
connectivity/Library_dbpool2.mk | 62 +
connectivity/Library_dbtools.mk | 155 ++
connectivity/Library_evoab.mk | 82 +
connectivity/Library_file.mk | 88 +
connectivity/Library_flat.mk | 75 +
connectivity/Library_hsqldb.mk | 80 +
connectivity/Library_jdbc.mk | 93 +
connectivity/Library_kab1.mk | 54
connectivity/Library_kabdrv1.mk | 66 +
connectivity/Library_macab1.mk | 57 +
connectivity/Library_macabdrv1.mk | 76 +
connectivity/Library_mozab.mk | 55
connectivity/Library_mozabdrv.mk | 93 +
connectivity/Library_mozbootstrap.mk | 61 +
connectivity/Library_mysql.mk | 63 +
connectivity/Library_odbc.mk | 62 +
connectivity/Library_odbcbase.mk | 75 +
connectivity/Library_postgresql-sdbc-impl.mk | 111 +
connectivity/Library_postgresql-sdbc.mk | 54
connectivity/Library_sdbc2.mk | 58 +
connectivity/Library_tdeab1.mk | 56 +
connectivity/Library_tdeabdrv1.mk | 66 +
connectivity/Makefile | 7
connectivity/Module_connectivity.mk | 149 ++
connectivity/Package_generated.mk | 32
connectivity/Package_inc.mk | 85 +
connectivity/Package_postgresql-sdbc.mk | 32
connectivity/Package_xml.mk | 44
connectivity/Rdb_postgresql-sdbc.mk | 35
connectivity/com/sun/star/sdbcx/comp/hsqldb/makefile.mk | 65 -
connectivity/dbtools.pmk | 29
connectivity/inc/connectivity/OSubComponent.hxx | 94 +
connectivity/inc/connectivity/sdbcx/VCatalog.hxx | 2
connectivity/inc/makefile.mk | 39
connectivity/makefile.pmk | 62 -
connectivity/prj/build.lst | 32
connectivity/prj/d.lst | 59 -
connectivity/qa/connectivity/tools/makefile.mk | 72 -
connectivity/qa/makefile.mk | 86 -
connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu | 269 ++++
connectivity/registry/calc/org/openoffice/Office/DataAccess/Drivers.xcu | 63 +
connectivity/registry/dbase/org/openoffice/Office/DataAccess/Drivers.xcu | 100 +
connectivity/registry/evoab2/org/openoffice/Office/DataAccess/Drivers.xcu | 76 +
connectivity/registry/flat/org/openoffice/Office/DataAccess/Drivers.xcu | 120 ++
connectivity/registry/hsqldb/org/openoffice/Office/DataAccess/Drivers.xcu | 78 +
connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu | 219 +++
connectivity/registry/kab/org/openoffice/Office/DataAccess/Drivers.xcu | 46
connectivity/registry/macab/org/openoffice/Office/DataAccess/Drivers.xcu | 46
connectivity/registry/mozab/org/openoffice/Office/DataAccess/Drivers.xcu | 154 ++
connectivity/registry/mozab2/org/openoffice/Office/DataAccess/Drivers.xcu | 118 ++
connectivity/registry/mysql/org/openoffice/Office/DataAccess/Drivers.xcu | 258 ++++
connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu | 180 +++
connectivity/registry/postgresql/org/openoffice/Office/DataAccess/Drivers.xcu | 110 +
connectivity/registry/tdeab/org/openofffice/Office/DataAccess/Drivers.xcu | 46
connectivity/source/commontools/dbtools.cxx | 2
connectivity/source/commontools/makefile.mk | 100 -
connectivity/source/cpool/exports.dxp | 1
connectivity/source/cpool/makefile.mk | 85 -
connectivity/source/dbtools/exports.dxp | 1
connectivity/source/dbtools/makefile.mk | 108 -
connectivity/source/drivers/ado/AKeyColumn.cxx | 69 -
connectivity/source/drivers/ado/AKeyColumns.cxx | 95 -
connectivity/source/drivers/ado/ado.xcu | 269 ----
connectivity/source/drivers/ado/exports.dxp | 2
connectivity/source/drivers/ado/makefile.mk | 122 --
connectivity/source/drivers/calc/calc.xcu | 63 -
connectivity/source/drivers/calc/exports.dxp | 1
connectivity/source/drivers/calc/makefile.mk | 95 -
connectivity/source/drivers/dbase/dbase.mxp.map | 171 ---
connectivity/source/drivers/dbase/dbase.xcu | 100 -
connectivity/source/drivers/dbase/exports.dxp | 1
connectivity/source/drivers/dbase/makefile.mk | 134 --
connectivity/source/drivers/evoab2/NConnection.hxx | 2
connectivity/source/drivers/evoab2/NResultSet.hxx | 2
connectivity/source/drivers/evoab2/NStatement.hxx | 2
connectivity/source/drivers/evoab2/evoab2.xcu | 76 -
connectivity/source/drivers/evoab2/makefile.mk | 120 --
connectivity/source/drivers/file/makefile.mk | 105 -
connectivity/source/drivers/flat/exports.dxp | 1
connectivity/source/drivers/flat/flat.mxp.map | 139 --
connectivity/source/drivers/flat/flat.xcu | 120 --
connectivity/source/drivers/flat/makefile.mk | 112 --
connectivity/source/drivers/hsqldb/exports.dxp | 28
connectivity/source/drivers/hsqldb/hsqldb.map | 33
connectivity/source/drivers/hsqldb/hsqldb.xcu | 78 -
connectivity/source/drivers/hsqldb/makefile.mk | 126 --
connectivity/source/drivers/jdbc/exports.dxp | 2
connectivity/source/drivers/jdbc/jdbc.xcu | 219 ---
connectivity/source/drivers/jdbc/makefile.mk | 115 --
connectivity/source/drivers/kab/KConnection.hxx | 2
connectivity/source/drivers/kab/exports.dxp | 1
connectivity/source/drivers/kab/kab.xcu | 46
connectivity/source/drivers/kab/kabdrv.map | 9
connectivity/source/drivers/kab/makefile.mk | 256 ----
connectivity/source/drivers/kab/tdeab.xcu | 46
connectivity/source/drivers/kab/tdeabdrv.map | 9
connectivity/source/drivers/macab/MacabConnection.hxx | 2
connectivity/source/drivers/macab/MacabResultSetMetaData.cxx | 2
connectivity/source/drivers/macab/exports.dxp | 1
connectivity/source/drivers/macab/macab.xcu | 46
connectivity/source/drivers/macab/makefile.mk | 142 --
connectivity/source/drivers/mozab/MConnection.hxx | 2
connectivity/source/drivers/mozab/bootstrap/makefile.mk | 94 -
connectivity/source/drivers/mozab/exports.dxp | 1
connectivity/source/drivers/mozab/makefile.mk | 202 ---
connectivity/source/drivers/mozab/makefile_mozab.mk | 127 --
connectivity/source/drivers/mozab/mozab.xcu | 154 --
connectivity/source/drivers/mozab/mozab2.xcu | 118 --
connectivity/source/drivers/mozab/mozabdrv.map | 8
connectivity/source/drivers/mozab/mozillasrc/makefile.mk | 76 -
connectivity/source/drivers/mysql/exports.dxp | 1
connectivity/source/drivers/mysql/makefile.mk | 89 -
connectivity/source/drivers/mysql/mysql.xcu | 258 ----
connectivity/source/drivers/odbc/makefile.mk | 87 -
connectivity/source/drivers/odbc/odbc.xcu | 180 ---
connectivity/source/drivers/odbcbase/makefile.mk | 94 -
connectivity/source/drivers/postgresql/makefile.mk | 204 ---
connectivity/source/drivers/postgresql/postgresql.xcu | 110 -
connectivity/source/drivers/postgresql/pq_connection.cxx | 2
connectivity/source/drivers/postgresql/pq_driver.cxx | 2
connectivity/source/inc/OSubComponent.hxx | 94 -
connectivity/source/inc/adabas/BCatalog.hxx | 79 -
connectivity/source/inc/adabas/BColumn.hxx | 56 -
connectivity/source/inc/adabas/BColumns.hxx | 63 -
connectivity/source/inc/adabas/BConnection.hxx | 80 -
connectivity/source/inc/adabas/BDatabaseMetaData.hxx | 57 -
connectivity/source/inc/adabas/BDriver.hxx | 178 ---
connectivity/source/inc/adabas/BGroup.hxx | 52
connectivity/source/inc/adabas/BGroups.hxx | 68 -
connectivity/source/inc/adabas/BIndex.hxx | 60 -
connectivity/source/inc/adabas/BIndexColumn.hxx | 60 -
connectivity/source/inc/adabas/BIndexColumns.hxx | 60 -
connectivity/source/inc/adabas/BIndexes.hxx | 60 -
connectivity/source/inc/adabas/BKeys.hxx | 57 -
connectivity/source/inc/adabas/BPreparedStatement.hxx | 54
connectivity/source/inc/adabas/BResultSet.hxx | 62 -
connectivity/source/inc/adabas/BResultSetMetaData.hxx | 59 -
connectivity/source/inc/adabas/BStatement.hxx | 62 -
connectivity/source/inc/adabas/BTable.hxx | 112 --
connectivity/source/inc/adabas/BTables.hxx | 82 -
connectivity/source/inc/adabas/BUser.hxx | 84 -
connectivity/source/inc/adabas/BUsers.hxx | 68 -
connectivity/source/inc/adabas/BViews.hxx | 66 -
connectivity/source/inc/ado/AConnection.hxx | 2
connectivity/source/inc/ado/AIndexColumns.hxx | 57 -
connectivity/source/inc/file/FConnection.hxx | 2
connectivity/source/inc/java/sql/Connection.hxx | 2
connectivity/source/inc/java/sql/JStatement.hxx | 2
connectivity/source/inc/odbc/OConnection.hxx | 2
connectivity/source/manager/exports.dxp | 1
connectivity/source/manager/makefile.mk | 82 -
connectivity/source/manager/sdbc.mxp.map | 51
connectivity/source/parse/makefile.mk | 67 -
connectivity/source/parse/sqlbison.y | 13
connectivity/source/parse/sqlflex.l | 16
connectivity/source/parse/wrap_sqlbison.cxx | 32
connectivity/source/parse/wrap_sqlflex.cxx | 36
connectivity/source/resource/makefile.mk | 104 -
connectivity/source/sdbcx/makefile.mk | 60 -
connectivity/source/simpledbt/makefile.mk | 53
connectivity/target.pmk | 39
connectivity/util/makefile.mk | 62 -
connectivity/version.mk | 130 --
cross_tail_build/prj/build.lst | 2
cross_toolset/prj/build.lst | 2
dbaccess/Library_dbu.mk | 3
dbaccess/Library_dbui.mk | 301 -----
desktop/WinResTarget_quickstart.mk | 4
desktop/WinResTarget_sbase.mk | 7
desktop/WinResTarget_scalc.mk | 7
desktop/WinResTarget_sdraw.mk | 7
desktop/WinResTarget_simpress.mk | 7
desktop/WinResTarget_smath.mk | 7
desktop/WinResTarget_soffice.mk | 7
desktop/WinResTarget_sofficebin.mk | 7
desktop/WinResTarget_sweb.mk | 7
desktop/WinResTarget_swriter.mk | 7
extensions/WinResTarget_activex.mk | 13
extensions/WinResTarget_npsoplugin.mk | 2
extensions/source/update/feed/test/makefile.mk | 58 -
extensions/test/ole/OleClient/makefile.mk | 72 -
fpicker/WinResTarget_fps.mk | 6
icu/icuversion.mk | 38
icu/makefile.mk | 2
icu/prj/d.lst | 2
io/Module_io.mk | 1
io/Package_xml.mk | 34
jfreereport/version.mk | 2
officecfg/util/schema_val.xsl | 23
postprocess/packcomponents/makefile.mk | 61 -
postprocess/packregistry/makefile.mk | 59 -
postprocess/prj/build.lst | 2
python/makefile.mk | 7
python/prj/d.lst | 1
python/pyversion.Makefile | 25
rdbmaker/source/codemaker/dependency.cxx | 13
reportbuilder/Configuration_reportbuilder.mk | 56 +
reportbuilder/Extension_reportbuilder.mk | 102 +
reportbuilder/Jar_reportbuilder.mk | 296 +++++
reportbuilder/Makefile | 7
reportbuilder/Module_reportbuilder.mk | 39
reportbuilder/Package_readme.mk | 34
reportbuilder/java/com/sun/star/report/function/metadata/makefile.mk | 66 -
reportbuilder/java/com/sun/star/report/makefile.mk | 74 -
reportbuilder/java/com/sun/star/report/pentaho/makefile.mk | 147 --
reportbuilder/java/com/sun/star/report/util/ReportUtil.java | 46
reportbuilder/java/com/sun/star/report/util/makefile.mk | 49
reportbuilder/java/makefile.mk | 45
reportbuilder/prj/build.lst | 15
reportbuilder/prj/d.lst | 12
reportbuilder/registry/data/org/openoffice/Office/UI/makefile.mk | 48
reportbuilder/registry/data/org/openoffice/Office/makefile.mk | 70 -
reportbuilder/registry/data/org/openoffice/TypeDetection/makefile.mk | 57 -
reportbuilder/registry/data/org/openoffice/makefile.mk | 52
reportbuilder/registry/schema/org/openoffice/Office/UI/makefile.mk | 60 -
reportbuilder/registry/schema/org/openoffice/Office/makefile.mk | 48
reportbuilder/template/en-US/wizard/report/makefile.mk | 69 -
reportbuilder/template/makefile.mk | 121 --
reportbuilder/template/registry/data/org/openoffice/Office/makefile.mk | 49
reportbuilder/template/wizard/report/makefile.mk | 69 -
reportbuilder/util/delzip | 1
reportbuilder/util/description.xml | 2
reportbuilder/util/makefile.mk | 168 ---
reportbuilder/util/makefile.pmk | 66 -
reportbuilder/util/target.pmk | 34
sc/source/filter/xml/xmlexprt.cxx | 2
scp2/CustomTarget_langmacros.mk | 40
scp2/InstallModule_accessories.mk | 89 +
scp2/InstallModule_activex.mk | 47
scp2/InstallModule_base.mk | 52
scp2/InstallModule_binfilter.mk | 46
scp2/InstallModule_calc.mk | 51
scp2/InstallModule_canvas.mk | 47
scp2/InstallModule_crashrep.mk | 39
scp2/InstallModule_draw.mk | 47
scp2/InstallModule_extensions.mk | 63 +
scp2/InstallModule_gnome.mk | 52
scp2/InstallModule_graphicfilter.mk | 43
scp2/InstallModule_impress.mk | 54
scp2/InstallModule_javafilter.mk | 46
scp2/InstallModule_kde.mk | 48
scp2/InstallModule_math.mk | 47
scp2/InstallModule_onlineupdate.mk | 43
scp2/InstallModule_ooo.mk | 243 ++++
scp2/InstallModule_python.mk | 63 +
scp2/InstallModule_quickstart.mk | 44
scp2/InstallModule_sdkoo.mk | 39
scp2/InstallModule_smoketest.mk | 39
scp2/InstallModule_stdlibs.mk | 43
scp2/InstallModule_tde.mk | 47
scp2/InstallModule_ure.mk | 48
scp2/InstallModule_ure_standalone.mk | 39
scp2/InstallModule_windows.mk | 68 +
scp2/InstallModule_winexplorerext.mk | 48
scp2/InstallModule_writer.mk | 47
scp2/InstallModule_xsltfilter.mk | 43
scp2/InstallScript_sdkoo.mk | 34
scp2/InstallScript_setup_osl.mk | 81 +
scp2/InstallScript_test.mk | 34
scp2/InstallScript_ure.mk | 35
scp2/Makefile | 7
scp2/Module_scp2.mk | 89 +
scp2/Package_inc.mk | 32
scp2/Package_langmacros.mk | 32
scp2/macros/macro.pl | 1
scp2/macros/makefile.mk | 48
scp2/prj/build.lst | 30
scp2/prj/d.lst | 29
scp2/source/accessories/makefile.mk | 84 -
scp2/source/activex/makefile.mk | 54
scp2/source/base/makefile.mk | 62 -
scp2/source/binfilter/makefile.mk | 50
scp2/source/calc/makefile.mk | 59 -
scp2/source/canvas/makefile.mk | 54
scp2/source/crashrep/makefile.mk | 48
scp2/source/draw/makefile.mk | 56 -
scp2/source/extensions/makefile.mk | 60 -
scp2/source/gnome/makefile.mk | 77 -
scp2/source/graphicfilter/makefile.mk | 48
scp2/source/impress/makefile.mk | 67 -
scp2/source/javafilter/makefile.mk | 57 -
scp2/source/kde/makefile.mk | 60 -
scp2/source/math/makefile.mk | 55
scp2/source/onlineupdate/makefile.mk | 49
scp2/source/ooo/makefile.mk | 552 ---------
scp2/source/ooo/module_headless.scp | 27
scp2/source/ooo/module_headless.ulf | 32
scp2/source/python/makefile.mk | 65 -
scp2/source/quickstart/folderitem_quickstart.scp | 35
scp2/source/quickstart/makefile.mk | 51
scp2/source/sdkoo/makefile.mk | 46
scp2/source/smoketest/makefile.mk | 42
scp2/source/stdlibs/makefile.mk | 52
scp2/source/tde/makefile.mk | 56 -
scp2/source/templates/makefile.mk | 56 -
scp2/source/templates/module_langpack_binfilter.sct | 38
scp2/source/templates/module_langpack_onlineupdate.sct | 37
scp2/source/winexplorerext/makefile.mk | 56 -
scp2/source/writer/makefile.mk | 56 -
scp2/source/xsltfilter/makefile.mk | 49
scp2/util/makefile.mk | 258 ----
shell/CustomTarget_shlxthdl_res.mk | 52
shell/CustomTarget_x64.mk | 72 +
shell/Executable_gnome_open_url.mk | 40
shell/Executable_lngconvex.mk | 52
shell/Executable_regsvrex.mk | 34
shell/Executable_senddoc.mk | 43
shell/Executable_uri_encode.mk | 34
shell/InternalUnoApi_cmdmail.mk | 37
shell/InternalUnoApi_localebe.mk | 37
shell/InternalUnoApi_macbe.mk | 37
shell/InternalUnoApi_smplmail.mk | 37
shell/InternalUnoApi_syssh.mk | 37
shell/InternalUnoApi_syssh_win.mk | 37
shell/InternalUnoApi_wininetbe.mk | 37
shell/Library_cmdmail.mk | 49
shell/Library_desktopbe.mk | 48
shell/Library_gconfbe.mk | 59 +
shell/Library_kde4be.mk | 53
shell/Library_kdebe.mk | 57 +
shell/Library_localebe.mk | 55
shell/Library_macbe.mk | 61 +
shell/Library_ooofilt.mk | 90 +
shell/Library_ooofilt_x64.mk | 92 +
shell/Library_propertyhdl.mk | 85 +
shell/Library_propertyhdl_x64.mk | 90 +
shell/Library_recentfile.mk | 53
shell/Library_shlxthdl.mk | 94 +
shell/Library_shlxthdl_x64.mk | 100 +
shell/Library_smplmail.mk | 54
shell/Library_syssh.mk | 52
shell/Library_syssh_win.mk | 50
shell/Library_tdebe.mk | 57 +
shell/Library_wininetbe.mk | 48
shell/Makefile | 7
shell/Module_shell.mk | 141 ++
shell/Package_inc.mk | 36
shell/Package_scripts.mk | 37
shell/StaticLibrary_shlxthandler_common.mk | 71 +
shell/StaticLibrary_shlxthandler_common_x64.mk | 73 +
shell/StaticLibrary_simplemapi.mk | 34
shell/StaticLibrary_xmlparser.mk | 49
shell/StaticLibrary_xmlparser_x64.mk | 36
shell/WinResTarget_shlxthdl.mk | 41
shell/inc/internal/stream_helper.hxx | 2
shell/inc/makefile.mk | 39
shell/prj/build.lst | 29
shell/prj/d.lst | 39
shell/source/all/makefile.mk | 74 -
shell/source/backends/desktopbe/makefile.mk | 59 -
shell/source/backends/gconfbe/makefile.mk | 97 -
shell/source/backends/kde4be/makefile.mk | 87 -
shell/source/backends/kdebe/makefile.mk | 123 --
shell/source/backends/localebe/localebe.xml | 4
shell/source/backends/localebe/makefile.mk | 80 -
shell/source/backends/macbe/macbackend.cxx | 491 --------
shell/source/backends/macbe/macbackend.mm | 491 ++++++++
shell/source/backends/macbe/macbecdef.cxx | 2
shell/source/backends/macbe/makefile.mk | 86 -
shell/source/backends/wininetbe/makefile.mk | 76 -
shell/source/backends/wininetbe/wininetbe.xml | 4
shell/source/cmdmail/cmdmail.xml | 1
shell/source/cmdmail/exports.dxp | 1
shell/source/cmdmail/makefile.mk | 78 -
shell/source/tools/lngconvex/makefile.mk | 66 -
shell/source/tools/regsvrex/makefile.mk | 49
shell/source/unix/exec/makefile.mk | 101 -
shell/source/unix/exec/syssh.xml | 7
shell/source/unix/misc/gnome-open-url.c | 8
shell/source/unix/misc/makefile.mk | 83 -
shell/source/unix/sysshell/makefile.mk | 75 -
shell/source/win32/exports.dxp | 1
shell/source/win32/makefile.mk | 77 -
shell/source/win32/ooofilereader/makefile.mk | 92 -
shell/source/win32/shlxthandler/columninfo/makefile.mk | 67 -
shell/source/win32/shlxthandler/exports.dxp | 4
shell/source/win32/shlxthandler/infotips/makefile.mk | 68 -
shell/source/win32/shlxthandler/makefile.mk | 170 ---
shell/source/win32/shlxthandler/ooofilt/exports.dxp | 4
shell/source/win32/shlxthandler/ooofilt/makefile.mk | 140 --
shell/source/win32/shlxthandler/prophdl/exports.dxp | 2
shell/source/win32/shlxthandler/prophdl/makefile.mk | 152 --
shell/source/win32/shlxthandler/propsheets/makefile.mk | 69 -
shell/source/win32/shlxthandler/res/makefile.mk | 74 -
shell/source/win32/shlxthandler/res/shlxthdl.rc | 12
shell/source/win32/shlxthandler/thumbviewer/makefile.mk | 64 -
shell/source/win32/shlxthandler/util/makefile.mk | 73 -
shell/source/win32/simplemail/exports.dxp | 1
shell/source/win32/simplemail/makefile.mk | 87 -
shell/source/win32/simplemail/smplmail.xml | 5
shell/source/win32/syssh.xml | 3
shell/source/win32/zipfile/makefile.mk | 60 -
slideshow/Library_OGLTrans.mk | 2
solenv/bin/modules/par2script/check.pm | 2
solenv/bin/modules/par2script/exiter.pm | 7
solenv/bin/modules/par2script/globals.pm | 2
solenv/bin/modules/par2script/parameter.pm | 1
solenv/bin/modules/par2script/work.pm | 2
solenv/bin/modules/pre2par/work.pm | 8
solenv/bin/par2script.pl | 36
solenv/bin/pre2par.pl | 3
solenv/gbuild/Configuration.mk | 15
solenv/gbuild/InstallModule.mk | 139 ++
solenv/gbuild/InstallModuleTarget.mk | 385 ++++++
solenv/gbuild/InstallScript.mk | 115 ++
solenv/gbuild/InternalUnoApi.mk | 2
solenv/gbuild/Jar.mk | 6
solenv/gbuild/TargetLocations.mk | 24
solenv/gbuild/WinResTarget.mk | 75 +
solenv/gbuild/gbuild.mk | 3
solenv/gbuild/platform/IOS_ARM_GCC.mk | 27
solenv/gbuild/platform/WNT_INTEL_GCC.mk | 47
solenv/gbuild/platform/WNT_INTEL_MSC.mk | 49
solenv/gbuild/platform/macosx.mk | 27
solenv/gbuild/platform/solaris.mk | 25
solenv/gbuild/platform/unxgcc.mk | 32
solenv/inc/libs.mk | 1
stoc/Module_stoc.mk | 1
stoc/Package_xml.mk | 43
store/Package_inc.mk | 1
svl/Library_svl.mk | 5
tail_build/prj/build.lst | 2
testtools/CustomTarget_bridgetest.mk | 106 +
testtools/CustomTarget_bridgetest_climaker.mk | 46
testtools/CustomTarget_bridgetest_javamaker.mk | 39
testtools/CustomTarget_uno_test.mk | 43
testtools/InternalUnoApi_bridgetest.mk | 42
testtools/Jar_testComponent.mk | 57 +
testtools/Library_bridgetest.mk | 53
testtools/Library_constructors.mk | 54
testtools/Library_cppobj.mk | 58 +
testtools/Makefile | 7
testtools/Module_testtools.mk | 66 +
testtools/Rdb_uno_services.mk | 41
testtools/StaticLibrary_bridgetest.mk | 43
testtools/inc/makefile.mk | 39
testtools/prj/build.lst | 9
testtools/source/bridgetest/cli/makefile.mk | 202 ---
testtools/source/bridgetest/idl/makefile.mk | 73 -
testtools/source/bridgetest/makefile.mk | 238 ----
unixODBC/Module_unixODBC.mk | 7
vcl/Library_vclplug_kde.mk | 19
vcl/Library_vclplug_kde4.mk | 16
vcl/WinResTarget_vcl.mk | 4
writerfilter/source/rtftok/rtfsprm.cxx | 12
writerfilter/source/rtftok/rtfsprm.hxx | 2
writerfilter/source/rtftok/rtfvalue.hxx | 1
480 files changed, 13130 insertions(+), 16214 deletions(-)
New commits:
commit 824270f1829461895938c5794e7b2a255307ed9f
Author: David Tardon <dtardon at redhat.com>
Date: Mon May 28 12:35:25 2012 +0200
implement operator= too
Change-Id: I5d5b5562a130ac5ba46afa3273cf65e7bbed2c13
diff --git a/writerfilter/source/rtftok/rtfsprm.cxx b/writerfilter/source/rtftok/rtfsprm.cxx
index 976505f..d84d374 100644
--- a/writerfilter/source/rtftok/rtfsprm.cxx
+++ b/writerfilter/source/rtftok/rtfsprm.cxx
@@ -127,11 +127,23 @@ RTFSprms::RTFSprms(const RTFSprms& rSprms)
m_aSprms.push_back(std::make_pair(i->first, RTFValue::Pointer_t(i->second->Clone())));
}
+RTFSprms& RTFSprms::operator=(const RTFSprms& rOther)
+{
+ RTFSprms aTmp(rOther);
+ swap(aTmp);
+ return *this;
+}
+
std::vector< std::pair<Id, RTFValue::Pointer_t> >* RTFSprms::operator->()
{
return &m_aSprms;
}
+void RTFSprms::swap(RTFSprms& rOther)
+{
+ m_aSprms.swap(rOther.m_aSprms);
+}
+
} // namespace rtftok
} // namespace writerfilter
diff --git a/writerfilter/source/rtftok/rtfsprm.hxx b/writerfilter/source/rtftok/rtfsprm.hxx
index 7c73d0e..b8275e1 100644
--- a/writerfilter/source/rtftok/rtfsprm.hxx
+++ b/writerfilter/source/rtftok/rtfsprm.hxx
@@ -41,9 +41,11 @@ namespace writerfilter {
typedef std::vector< std::pair<Id, RTFValue::Pointer_t> >::iterator Iterator_t;
RTFSprms();
RTFSprms(const RTFSprms& rSprms);
+ RTFSprms& operator=(const RTFSprms& rOther);
std::vector< std::pair<Id, RTFValue::Pointer_t> >* operator->();
RTFValue::Pointer_t find(Id nKeyword);
bool erase(Id nKeyword);
+ void swap(RTFSprms& rOther);
private:
std::vector< std::pair<Id, RTFValue::Pointer_t> > m_aSprms;
};
diff --git a/writerfilter/source/rtftok/rtfvalue.hxx b/writerfilter/source/rtftok/rtfvalue.hxx
index d5c6b3e..8a14ef5 100644
--- a/writerfilter/source/rtftok/rtfvalue.hxx
+++ b/writerfilter/source/rtftok/rtfvalue.hxx
@@ -61,6 +61,7 @@ namespace writerfilter {
RTFSprms& getAttributes();
RTFSprms& getSprms();
private:
+ RTFValue& operator=(RTFValue const& rOther);
int m_nValue;
rtl::OUString m_sValue;
boost::shared_ptr<RTFSprms> m_pAttributes;
commit 44074025027be3d2d0d9ac539361a6958c744a86
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Mon May 28 17:11:54 2012 +0200
connectivity: add SAL_DLLPUBLIC_EXPORT
Change-Id: I850b9f9fcf662eafaee6c4c00187c6902670b639
diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx
index c148646..e1e3754 100644
--- a/connectivity/source/drivers/postgresql/pq_connection.cxx
+++ b/connectivity/source/drivers/postgresql/pq_connection.cxx
@@ -785,7 +785,7 @@ static struct cppu::ImplementationEntry g_entries[] =
extern "C"
{
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , g_entries );
commit 16f09b72e235f3763d3822357bac6013ee9d965b
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Mon May 28 15:23:46 2012 +0200
partially revert 3ca7b8c296bcda699bcf642db3932b3fdbe7ad06
It is not possible to use PRIVATE this way.
So, there are still warnings as:
LINK : warning LNK4104: export of symbol 'DllCanUnloadNow' should be PRIVATE
Change-Id: I9f14dd95b611475ef89914270c931a7115f1f5c8
diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk
index 35e3662..af30efb 100644
--- a/shell/Library_ooofilt.mk
+++ b/shell/Library_ooofilt.mk
@@ -76,10 +76,10 @@ $(eval $(call gb_Library_use_static_libraries,ooofilt,\
))
$(eval $(call gb_Library_add_ldflags,ooofilt,\
- /EXPORT:DllCanUnloadNow,PRIVATE \
- /EXPORT:DllGetClassObject,PRIVATE \
- /EXPORT:DllRegisterServer,PRIVATE \
- /EXPORT:DllUnregisterServer,PRIVATE \
+ /EXPORT:DllCanUnloadNow \
+ /EXPORT:DllGetClassObject \
+ /EXPORT:DllRegisterServer \
+ /EXPORT:DllUnregisterServer \
))
$(eval $(call gb_Library_add_exception_objects,ooofilt,\
diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk
index ca779ff..7620d52 100644
--- a/shell/Library_ooofilt_x64.mk
+++ b/shell/Library_ooofilt_x64.mk
@@ -78,10 +78,10 @@ $(eval $(call gb_Library_use_static_libraries,ooofilt_x64,\
))
$(eval $(call gb_Library_add_ldflags,ooofilt_x64,\
- /EXPORT:DllCanUnloadNow,PRIVATE \
- /EXPORT:DllGetClassObject,PRIVATE \
- /EXPORT:DllRegisterServer,PRIVATE \
- /EXPORT:DllUnregisterServer,PRIVATE \
+ /EXPORT:DllCanUnloadNow \
+ /EXPORT:DllGetClassObject \
+ /EXPORT:DllRegisterServer \
+ /EXPORT:DllUnregisterServer \
))
$(eval $(call gb_Library_add_exception_objects,ooofilt_x64,\
diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk
index 8b7d7ff..4d701cd 100644
--- a/shell/Library_propertyhdl.mk
+++ b/shell/Library_propertyhdl.mk
@@ -74,8 +74,8 @@ $(eval $(call gb_Library_use_static_libraries,propertyhdl,\
))
$(eval $(call gb_Library_add_ldflags,propertyhdl,\
- /EXPORT:DllCanUnloadNow,PRIVATE \
- /EXPORT:DllGetClassObject,PRIVATE \
+ /EXPORT:DllCanUnloadNow \
+ /EXPORT:DllGetClassObject \
))
$(eval $(call gb_Library_add_exception_objects,propertyhdl,\
diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk
index c84738b..f613bd3 100644
--- a/shell/Library_propertyhdl_x64.mk
+++ b/shell/Library_propertyhdl_x64.mk
@@ -79,8 +79,8 @@ $(eval $(call gb_Library_use_static_libraries,propertyhdl_x64,\
))
$(eval $(call gb_Library_add_ldflags,propertyhdl_x64,\
- /EXPORT:DllCanUnloadNow,PRIVATE \
- /EXPORT:DllGetClassObject,PRIVATE \
+ /EXPORT:DllCanUnloadNow \
+ /EXPORT:DllGetClassObject \
))
$(eval $(call gb_Library_add_exception_objects,propertyhdl_x64,\
diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk
index c546db6..b8df8a9 100644
--- a/shell/Library_shlxthdl.mk
+++ b/shell/Library_shlxthdl.mk
@@ -74,10 +74,10 @@ $(eval $(call gb_Library_use_static_libraries,shlxthdl,\
$(eval $(call gb_Library_add_nativeres,shlxthdl,shlxthdl))
$(eval $(call gb_Library_add_ldflags,shlxthdl,\
- /EXPORT:DllCanUnloadNow,PRIVATE \
- /EXPORT:DllGetClassObject,PRIVATE \
- /EXPORT:DllRegisterServer,PRIVATE \
- /EXPORT:DllUnregisterServer,PRIVATE \
+ /EXPORT:DllCanUnloadNow \
+ /EXPORT:DllGetClassObject \
+ /EXPORT:DllRegisterServer \
+ /EXPORT:DllUnregisterServer \
))
$(eval $(call gb_Library_add_exception_objects,shlxthdl,\
diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk
index d1e2d98..f13d9dc 100644
--- a/shell/Library_shlxthdl_x64.mk
+++ b/shell/Library_shlxthdl_x64.mk
@@ -80,10 +80,10 @@ $(eval $(call gb_Library_use_static_libraries,shlxthdl_x64,\
$(eval $(call gb_Library_add_nativeres,shlxthdl_x64,shlxthdl))
$(eval $(call gb_Library_add_ldflags,shlxthdl_x64,\
- /EXPORT:DllCanUnloadNow,PRIVATE \
- /EXPORT:DllGetClassObject,PRIVATE \
- /EXPORT:DllRegisterServer,PRIVATE \
- /EXPORT:DllUnregisterServer,PRIVATE \
+ /EXPORT:DllCanUnloadNow \
+ /EXPORT:DllGetClassObject \
+ /EXPORT:DllRegisterServer \
+ /EXPORT:DllUnregisterServer \
))
$(eval $(call gb_Library_add_generated_exception_objects,shlxthdl_x64,\
commit 22e8f9b907d4ec183adfecbae279a1039b6f571d
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Mon May 28 15:04:18 2012 +0200
shell: export more symbols, as private
Change-Id: Ifca9712c2ee28c8e38925150b3e6d0f27195ff1d
diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk
index 30dd615..35e3662 100644
--- a/shell/Library_ooofilt.mk
+++ b/shell/Library_ooofilt.mk
@@ -57,38 +57,31 @@ $(eval $(call gb_Library_use_libraries,ooofilt,\
advapi32 \
comctl32 \
kernel32 \
+ msvcprt \
ole32 \
shell32 \
uuid \
$(gb_Library_win32_OLDNAMES) \
))
-ifneq ($(COM),GCC)
-
-$(eval $(call gb_Library_use_libraries,ooofilt,\
- msvcprt \
-))
-
ifneq ($(PRODUCT),full)
$(eval $(call gb_Library_use_libraries,ooofilt,\
msvcrt \
))
endif
-$(eval $(call gb_Library_add_ldflags,ooofilt,\
- /EXPORT:DllCanUnloadNow \
- /EXPORT:DllGetClassObject \
- /EXPORT:DllRegisterServer \
- /EXPORT:DllUnregisterServer \
-))
-
-endif
-
$(eval $(call gb_Library_use_static_libraries,ooofilt,\
shell_xmlparser \
shlxthandler_common \
))
+$(eval $(call gb_Library_add_ldflags,ooofilt,\
+ /EXPORT:DllCanUnloadNow,PRIVATE \
+ /EXPORT:DllGetClassObject,PRIVATE \
+ /EXPORT:DllRegisterServer,PRIVATE \
+ /EXPORT:DllUnregisterServer,PRIVATE \
+))
+
$(eval $(call gb_Library_add_exception_objects,ooofilt,\
shell/source/win32/shlxthandler/ooofilt/ooofilt \
shell/source/win32/shlxthandler/ooofilt/propspec \
diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk
index 0e68d62..ca779ff 100644
--- a/shell/Library_ooofilt_x64.mk
+++ b/shell/Library_ooofilt_x64.mk
@@ -77,14 +77,12 @@ $(eval $(call gb_Library_use_static_libraries,ooofilt_x64,\
shlxthandler_common_x64 \
))
-ifeq ($(COM),MSC)
$(eval $(call gb_Library_add_ldflags,ooofilt_x64,\
- /EXPORT:DllCanUnloadNow \
- /EXPORT:DllGetClassObject \
- /EXPORT:DllRegisterServer \
- /EXPORT:DllUnregisterServer \
+ /EXPORT:DllCanUnloadNow,PRIVATE \
+ /EXPORT:DllGetClassObject,PRIVATE \
+ /EXPORT:DllRegisterServer,PRIVATE \
+ /EXPORT:DllUnregisterServer,PRIVATE \
))
-endif
$(eval $(call gb_Library_add_exception_objects,ooofilt_x64,\
CustomTarget/shell/source/win32/shlxthandler/ooofilt/ooofilt \
diff --git a/shell/Library_propertyhdl.mk b/shell/Library_propertyhdl.mk
index 250a530..8b7d7ff 100644
--- a/shell/Library_propertyhdl.mk
+++ b/shell/Library_propertyhdl.mk
@@ -59,6 +59,7 @@ $(eval $(call gb_Library_use_libraries,propertyhdl,\
gdi32 \
gdiplus \
kernel32 \
+ msvcprt \
ole32 \
oleaut32 \
propsys \
@@ -67,24 +68,16 @@ $(eval $(call gb_Library_use_libraries,propertyhdl,\
uuid \
))
-ifneq ($(COM),GCC)
-
-$(eval $(call gb_Library_use_libraries,propertyhdl,\
- msvcprt \
-))
-
-ifneq ($(PRODUCT),full)
-$(eval $(call gb_Library_use_libraries,propertyhdl,\
-))
-endif
-
-endif
-
$(eval $(call gb_Library_use_static_libraries,propertyhdl,\
shell_xmlparser \
shlxthandler_common \
))
+$(eval $(call gb_Library_add_ldflags,propertyhdl,\
+ /EXPORT:DllCanUnloadNow,PRIVATE \
+ /EXPORT:DllGetClassObject,PRIVATE \
+))
+
$(eval $(call gb_Library_add_exception_objects,propertyhdl,\
shell/source/win32/shlxthandler/prophdl/propertyhdl \
))
diff --git a/shell/Library_propertyhdl_x64.mk b/shell/Library_propertyhdl_x64.mk
index af9fa22..c84738b 100644
--- a/shell/Library_propertyhdl_x64.mk
+++ b/shell/Library_propertyhdl_x64.mk
@@ -78,6 +78,11 @@ $(eval $(call gb_Library_use_static_libraries,propertyhdl_x64,\
shlxthandler_common_x64 \
))
+$(eval $(call gb_Library_add_ldflags,propertyhdl_x64,\
+ /EXPORT:DllCanUnloadNow,PRIVATE \
+ /EXPORT:DllGetClassObject,PRIVATE \
+))
+
$(eval $(call gb_Library_add_exception_objects,propertyhdl_x64,\
shell/source/win32/shlxthandler/prophdl/propertyhdl \
))
diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk
index 199cc8d..c546db6 100644
--- a/shell/Library_shlxthdl.mk
+++ b/shell/Library_shlxthdl.mk
@@ -73,14 +73,12 @@ $(eval $(call gb_Library_use_static_libraries,shlxthdl,\
$(eval $(call gb_Library_add_nativeres,shlxthdl,shlxthdl))
-ifeq ($(COM),MSC)
$(eval $(call gb_Library_add_ldflags,shlxthdl,\
- /EXPORT:DllCanUnloadNow \
- /EXPORT:DllGetClassObject \
- /EXPORT:DllRegisterServer \
- /EXPORT:DllUnregisterServer \
+ /EXPORT:DllCanUnloadNow,PRIVATE \
+ /EXPORT:DllGetClassObject,PRIVATE \
+ /EXPORT:DllRegisterServer,PRIVATE \
+ /EXPORT:DllUnregisterServer,PRIVATE \
))
-endif
$(eval $(call gb_Library_add_exception_objects,shlxthdl,\
shell/source/win32/shlxthandler/classfactory \
diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk
index 5411162..d1e2d98 100644
--- a/shell/Library_shlxthdl_x64.mk
+++ b/shell/Library_shlxthdl_x64.mk
@@ -79,14 +79,12 @@ $(eval $(call gb_Library_use_static_libraries,shlxthdl_x64,\
$(eval $(call gb_Library_add_nativeres,shlxthdl_x64,shlxthdl))
-ifeq ($(COM),MSC)
$(eval $(call gb_Library_add_ldflags,shlxthdl_x64,\
- /EXPORT:DllCanUnloadNow \
- /EXPORT:DllGetClassObject \
- /EXPORT:DllRegisterServer \
- /EXPORT:DllUnregisterServer \
+ /EXPORT:DllCanUnloadNow,PRIVATE \
+ /EXPORT:DllGetClassObject,PRIVATE \
+ /EXPORT:DllRegisterServer,PRIVATE \
+ /EXPORT:DllUnregisterServer,PRIVATE \
))
-endif
$(eval $(call gb_Library_add_generated_exception_objects,shlxthdl_x64,\
CustomTarget/shell/source/win32/shlxthandler/classfactory \
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 6e3c242..124ed70 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -63,7 +63,7 @@ $(eval $(call gb_Module_add_targets,shell,\
))
endif
-ifeq ($(GUI),WNT)
+ifeq ($(OS),WNT)
$(eval $(call gb_Module_add_targets,shell,\
Executable_regsvrex \
@@ -77,7 +77,7 @@ $(eval $(call gb_Module_add_targets,shell,\
StaticLibrary_simplemapi \
))
-ifneq ($(COM),GCC)
+ifeq ($(COM),MSC)
$(eval $(call gb_Module_add_targets,shell,\
CustomTarget_shlxthdl_res \
Library_ooofilt \
diff --git a/shell/source/cmdmail/exports.dxp b/shell/source/cmdmail/exports.dxp
deleted file mode 100755
index 7003307..0000000
--- a/shell/source/cmdmail/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/shell/source/win32/exports.dxp b/shell/source/win32/exports.dxp
deleted file mode 100755
index 7003307..0000000
--- a/shell/source/win32/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/shell/source/win32/shlxthandler/prophdl/exports.dxp b/shell/source/win32/shlxthandler/prophdl/exports.dxp
deleted file mode 100755
index 2ada825..0000000
--- a/shell/source/win32/shlxthandler/prophdl/exports.dxp
+++ /dev/null
@@ -1,2 +0,0 @@
-DllGetClassObject PRIVATE
-DllCanUnloadNow PRIVATE
\ No newline at end of file
diff --git a/shell/source/win32/simplemail/exports.dxp b/shell/source/win32/simplemail/exports.dxp
deleted file mode 100755
index 7003307..0000000
--- a/shell/source/win32/simplemail/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
commit db416d1355048c36482fbd546696606fbb8e2768
Author: David Tardon <dtardon at redhat.com>
Date: Mon May 28 08:33:54 2012 +0200
export COM functions
Change-Id: I5ab936c90b596716f92f04d0db46a77a656a758b
diff --git a/shell/Library_ooofilt.mk b/shell/Library_ooofilt.mk
index 0abdd9b..30dd615 100644
--- a/shell/Library_ooofilt.mk
+++ b/shell/Library_ooofilt.mk
@@ -75,6 +75,13 @@ $(eval $(call gb_Library_use_libraries,ooofilt,\
))
endif
+$(eval $(call gb_Library_add_ldflags,ooofilt,\
+ /EXPORT:DllCanUnloadNow \
+ /EXPORT:DllGetClassObject \
+ /EXPORT:DllRegisterServer \
+ /EXPORT:DllUnregisterServer \
+))
+
endif
$(eval $(call gb_Library_use_static_libraries,ooofilt,\
diff --git a/shell/Library_ooofilt_x64.mk b/shell/Library_ooofilt_x64.mk
index 270abfd..0e68d62 100644
--- a/shell/Library_ooofilt_x64.mk
+++ b/shell/Library_ooofilt_x64.mk
@@ -77,6 +77,15 @@ $(eval $(call gb_Library_use_static_libraries,ooofilt_x64,\
shlxthandler_common_x64 \
))
+ifeq ($(COM),MSC)
+$(eval $(call gb_Library_add_ldflags,ooofilt_x64,\
+ /EXPORT:DllCanUnloadNow \
+ /EXPORT:DllGetClassObject \
+ /EXPORT:DllRegisterServer \
+ /EXPORT:DllUnregisterServer \
+))
+endif
+
$(eval $(call gb_Library_add_exception_objects,ooofilt_x64,\
CustomTarget/shell/source/win32/shlxthandler/ooofilt/ooofilt \
CustomTarget/shell/source/win32/shlxthandler/ooofilt/propspec \
diff --git a/shell/Library_shlxthdl.mk b/shell/Library_shlxthdl.mk
index 3464a66..199cc8d 100644
--- a/shell/Library_shlxthdl.mk
+++ b/shell/Library_shlxthdl.mk
@@ -73,6 +73,15 @@ $(eval $(call gb_Library_use_static_libraries,shlxthdl,\
$(eval $(call gb_Library_add_nativeres,shlxthdl,shlxthdl))
+ifeq ($(COM),MSC)
+$(eval $(call gb_Library_add_ldflags,shlxthdl,\
+ /EXPORT:DllCanUnloadNow \
+ /EXPORT:DllGetClassObject \
+ /EXPORT:DllRegisterServer \
+ /EXPORT:DllUnregisterServer \
+))
+endif
+
$(eval $(call gb_Library_add_exception_objects,shlxthdl,\
shell/source/win32/shlxthandler/classfactory \
shell/source/win32/shlxthandler/columninfo/columninfo \
diff --git a/shell/Library_shlxthdl_x64.mk b/shell/Library_shlxthdl_x64.mk
index c6fd400..5411162 100644
--- a/shell/Library_shlxthdl_x64.mk
+++ b/shell/Library_shlxthdl_x64.mk
@@ -79,6 +79,15 @@ $(eval $(call gb_Library_use_static_libraries,shlxthdl_x64,\
$(eval $(call gb_Library_add_nativeres,shlxthdl_x64,shlxthdl))
+ifeq ($(COM),MSC)
+$(eval $(call gb_Library_add_ldflags,shlxthdl_x64,\
+ /EXPORT:DllCanUnloadNow \
+ /EXPORT:DllGetClassObject \
+ /EXPORT:DllRegisterServer \
+ /EXPORT:DllUnregisterServer \
+))
+endif
+
$(eval $(call gb_Library_add_generated_exception_objects,shlxthdl_x64,\
CustomTarget/shell/source/win32/shlxthandler/classfactory \
CustomTarget/shell/source/win32/shlxthandler/columninfo/columninfo \
diff --git a/shell/source/win32/shlxthandler/exports.dxp b/shell/source/win32/shlxthandler/exports.dxp
deleted file mode 100755
index 953039c..0000000
--- a/shell/source/win32/shlxthandler/exports.dxp
+++ /dev/null
@@ -1,4 +0,0 @@
-DllRegisterServer PRIVATE
-DllUnregisterServer PRIVATE
-DllGetClassObject PRIVATE
-DllCanUnloadNow PRIVATE
\ No newline at end of file
diff --git a/shell/source/win32/shlxthandler/ooofilt/exports.dxp b/shell/source/win32/shlxthandler/ooofilt/exports.dxp
deleted file mode 100755
index 953039c..0000000
--- a/shell/source/win32/shlxthandler/ooofilt/exports.dxp
+++ /dev/null
@@ -1,4 +0,0 @@
-DllRegisterServer PRIVATE
-DllUnregisterServer PRIVATE
-DllGetClassObject PRIVATE
-DllCanUnloadNow PRIVATE
\ No newline at end of file
commit 802e83f972bd28903c6f214a862262d5f9a2843e
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date: Mon May 28 00:29:56 2012 +0200
bridgetest_climaker is commented out
Change-Id: I6d0ab4c67061245d33732823c6de17e95568da85
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index 7f422f2..c2e3068 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -43,12 +43,15 @@ $(eval $(call gb_Module_add_targets,testtools,\
))
endif
-
-ifeq ($(COM),MSC)
-$(eval $(call gb_Module_add_targets,testtools,\
- CustomTarget_bridgetest_climaker \
-))
-endif
+# FIXME: currently failing to build with
+# Attempted to read or write protected memory. This is often an
+# indication that other memory is corrupt.
+# at ?A0x393b8821.sal_main()
+#ifeq ($(COM),MSC)
+#$(eval $(call gb_Module_add_targets,testtools,\
+# CustomTarget_bridgetest_climaker \
+#))
+#endif
ifneq ($(CROSS_COMPILING),YES)
# FIXME: Mac OSX PPC GCC fails this test!, likely broken UNO bridge.
commit 9442f7d9d3a900c57bab0d35763cf7405a0f3afe
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date: Sun May 27 23:25:44 2012 +0200
postgresql-lib: add shell32.dll on windows
Change-Id: I5a2619347c5cc0a3f7f896223fc4a60ae79d3796
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
index b634b58..62c4f2f 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -46,6 +46,12 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\
$(gb_STDLIBS) \
))
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\
+ shell32 \
+))
+endif
+
$(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\
postgresql \
))
commit db16457cf2432723c21adf0fc79d765176705662
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date: Sun May 27 22:53:13 2012 +0200
testtools: superfluous include
Change-Id: I4af6cac4f925cd4c9cf7a83f0c2a0b3295043544
diff --git a/testtools/Library_bridgetest.mk b/testtools/Library_bridgetest.mk
index a8f8fa5..283521f 100644
--- a/testtools/Library_bridgetest.mk
+++ b/testtools/Library_bridgetest.mk
@@ -28,11 +28,6 @@ $(eval $(call gb_Library_Library,testtools_bridgetest))
$(eval $(call gb_Library_set_componentfile,testtools_bridgetest,testtools/source/bridgetest/bridgetest))
-$(eval $(call gb_Executable_set_include,testtools_bridgetest,\
- -I$(SRCDIR)/testtools/source/bridgetest \
- $$(INCLUDE) \
-))
-
$(eval $(call gb_Library_use_internal_api,testtools_bridgetest,\
bridgetest \
))
commit 1d8764e55a6075cbde7c8b7fdce2455594b05074
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun May 27 00:43:26 2012 +0200
testtools: superfluous dependency
Change-Id: Id57d40f2b6cdaa9934a885764d986d581d149a59
diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk
index b66d8a3..56c7f79 100644
--- a/testtools/CustomTarget_bridgetest_climaker.mk
+++ b/testtools/CustomTarget_bridgetest_climaker.mk
@@ -31,7 +31,7 @@ climaker_DIR := $(call gb_CustomTarget_get_workdir,testtools/bridgetest_climaker
$(call gb_CustomTarget_get_target,testtools/bridgetest_climaker) : \
$(climaker_DIR)/cli_types_bridgetest.dll
-$(climaker_DIR)/cli_types_bridgetest.dll : $(OUTDIR)/bin/bridgetest.rdb \
+$(climaker_DIR)/cli_types_bridgetest.dll : \
$(OUTDIR)/bin/types.rdb $(OUTDIR)/bin/cli_uretypes.dll \
$(call gb_Executable_get_target_for_build,climaker) | $(climaker_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1)
commit 5e32d1570f0e9377c1f59b6784f334903be9bf3f
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun May 27 00:21:12 2012 +0200
no openssl library on Windows
Change-Id: I40df9611be87830e4938ee20a4e3be19767ddfad
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 5a4ba25..731bad7 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1285,8 +1285,9 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
)
ifeq ($(GUI)$(COM),WNTMSC)
+$(call gb_LinkTarget_use_external,$(1),openssl)
+
$(call gb_LinkTarget_use_libraries,$(1),\
- openssl \
secur32 \
ws2_32 \
$(if $(filter YES,$(WITH_LDAP)),ldap) \
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index fb833f7..3882327 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -407,7 +407,6 @@ gb_Library_PLAINLIBS_NONE += \
$(gb_Library_win32_OLDNAMES) \
ole32 \
oleaut32 \
- openssl \
propsys \
secur32 \
shell32 \
commit 57759ad6618a95b6ec549ea7e77c4bdfebb41b63
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat May 26 23:47:05 2012 +0200
scp2: fix Windows build
Change-Id: I6662bfca925f9dae99b3f70fd81dba04d36ac9c8
diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
index db8aa61..1b717a7 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -73,15 +73,12 @@ endef
# ScpPreprocessTarget class
-gb_ScpPreprocessTarget_TARGET := $(call gb_Executable_get_target_for_build,cpp.lcc)
-gb_ScpPreprocessTarget_COMMAND := $(gb_Helper_set_ld_path) $(gb_ScpPreprocessTarget_TARGET)
-
gb_ScpPreprocessTarget_get_source = $(SRCDIR)/$(1).scp
define gb_ScpPreprocessTarget__command
$(call gb_Output_announce,$(2),$(true),SPP,2)
$(call gb_Helper_abbreviate_dirs,\
- $(gb_ScpPreprocessTarget_COMMAND) \
+ $(call gb_Helper_execute,cpp.lcc) \
-+ -P \
$(SCPDEFS) $(SCP_DEFS) -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \
$(SCP_INCLUDE) $(SCP_TEMPLATE_INCLUDE) \
commit a153924d50a1aa58d901df9c7ad00db759f2cfed
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat May 26 23:38:34 2012 +0200
pq's name is different on Windows
Change-Id: I63731a1114edcf60a19083e6ceafaae1b402e716
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6a6f498..5a4ba25 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1281,7 +1281,7 @@ $(call gb_LinkTarget_set_include,$(1),\
)
$(call gb_LinkTarget_use_static_libraries,$(1),\
- pq \
+ $(if $(filter MSC,$(COM)),lib)pq \
)
ifeq ($(GUI)$(COM),WNTMSC)
@@ -1296,7 +1296,7 @@ endif
endef
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
- pq \
+ $(if $(filter MSC,$(COM)),lib)pq \
))
endif # SYSTEM_POSTGRESQL
commit 9fdab181f9888499dd77622cc5f42e6612ad3cbb
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat May 26 23:12:53 2012 +0200
shell is gbuildified
Change-Id: Ia40e317a69883c578a349035604afb5a5dad4c86
diff --git a/Makefile.top b/Makefile.top
index 5bd62f0..192ddbd 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -111,6 +111,7 @@ scripting\
sd\
sdext\
sfx2\
+shell\
slideshow\
smoketest\
solenv\
@@ -231,7 +232,6 @@ remotebridges\
rhino\
saxon\
setup_native\
-shell\
soltools\
stax\
stlport\
commit 3ba040eae5f0c87391994cc345ba83a43b277591
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat May 26 22:41:54 2012 +0200
testttools: tweak makefiles, fix typos
Change-Id: I4e7c7f2d79641772479924f8efc479beaf137f8f
diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk
index a4237d3..473613d 100644
--- a/testtools/CustomTarget_bridgetest.mk
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -43,14 +43,12 @@ bridgetest_TARGET := $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) \
ifneq ($(SOLAR_JAVA),)
bridgetest_TARGET := $(bridgetest_TARGET) \
$(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) \
- $(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX)
+ $(workdir_SERVER)/bridgetest_inprocess_java$(BATCH_SUFFIX)
endif
$(call gb_CustomTarget_get_target,testtools/bridgetest) : $(bridgetest_TARGET)
-# which other prerequisites do we need here?
-$(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \
- $(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
+$(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) :| $(workdir_SERVER)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs,\
echo "$(UNO_EXE)" \
@@ -62,26 +60,20 @@ $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \
"--singleaccept" > $@)
$(GIVE_EXEC_RIGHTS) $@
-ifneq ($(SOLAR_JAVA),)
-# how to do it more elegantly?
-MY_CLASSPATH := $(OUTDIR)/bin/ridl.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/java_uno.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/jurt.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/juh.jar
+testtools_MY_CLASSPATH := $(OUTDIR)/bin/ridl.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/java_uno.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/jurt.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/juh.jar
-# which other prerequisites do we need here?
-$(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) : \
- $(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
+$(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) :| $(workdir_SERVER)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs,\
echo "java" \
- "-classpath $(MY_CLASSPATH)$(gb_CLASSPATHSEP)$(OUTDIR)/bin/testComponent.jar" \
+ "-classpath $(testtools_MY_CLASSPATH)$(gb_CLASSPATHSEP)$(OUTDIR)/bin/testComponent.jar" \
"com.sun.star.comp.bridge.TestComponentMain" \
\""uno:socket$(COMMA)host=127.0.0.1$(COMMA)port=2002;urp;test"\" \
"singleaccept"> $@)
$(GIVE_EXEC_RIGHTS) $@
-# which other prerequisites do we need here?
-$(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) : \
- $(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
+$(workdir_SERVER)/bridgetest_inprocess_java$(BATCH_SUFFIX) :| $(workdir_SERVER)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs,\
echo "JAVA_HOME=$(JAVA_HOME)" \
@@ -97,11 +89,8 @@ $(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) : \
"-- com.sun.star.test.bridge.JavaTestObject noCurrentContext" \
> $@)
$(GIVE_EXEC_RIGHTS) $@
-endif
-# which other prerequisites do we need here?
-$(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) : \
- $(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
+$(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) :| $(workdir_SERVER)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
$(call gb_Helper_abbreviate_dirs,\
echo "$(UNO_EXE)" \
diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk
index 87ee4f6..b66d8a3 100644
--- a/testtools/CustomTarget_bridgetest_climaker.mk
+++ b/testtools/CustomTarget_bridgetest_climaker.mk
@@ -36,7 +36,7 @@ $(climaker_DIR)/cli_types_bridgetest.dll : $(OUTDIR)/bin/bridgetest.rdb \
$(call gb_Executable_get_target_for_build,climaker) | $(climaker_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1)
$(call gb_Helper_abbreviate_dirs, \
- $(call gb_Helper_execute,climaker \
+ $(call gb_Helper_execute,climaker) \
$(if $(filter -s,$(MAKEFLAGS)),,--verbose) \
--out $@ \
-X $(OUTDIR)/bin/types.rdb \
commit a587845c5e3497ec88c3985bea665c4dd9c2e746
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri May 25 18:37:02 2012 +0200
shell: change last gb_Helper_abbreviate_dirs_native
Change-Id: I51e6db0a6b6da2adf42e3d759865994d8624c192
diff --git a/shell/CustomTarget_shlxthdl_res.mk b/shell/CustomTarget_shlxthdl_res.mk
index 125d4df..67e27a6 100644
--- a/shell/CustomTarget_shlxthdl_res.mk
+++ b/shell/CustomTarget_shlxthdl_res.mk
@@ -40,7 +40,7 @@ $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl
$(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LCX,1)
- $(call gb_Helper_abbreviate_dirs_native,\
+ $(call gb_Helper_abbreviate_dirs,\
cd $(SRCDIR)/shell/source/win32/shlxthandler/res && \
$(call gb_Executable_get_target_for_build,lngconvex) \
-ulf shlxthdl.ulf \
commit 23d8c43d4927aa0c4b1d5537856e165fa60e2096
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date: Sat May 26 20:55:40 2012 +0200
dl library added
Change-Id: I9afb1e2cd82ab02c456735282a6ef0b0be15cfbc
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk
index 9de5dc4..b634b58 100644
--- a/connectivity/Library_postgresql-sdbc-impl.mk
+++ b/connectivity/Library_postgresql-sdbc-impl.mk
@@ -58,6 +58,7 @@ include $(OUTDIR_FOR_BUILD)/inc/postgresql/libpq-flags.mk
$(eval $(call gb_Library_add_libs,postgresql-sdbc-impl,\
$(if $(filter-out MACOSX,$(OS)),-Wl,--as-needed) \
$(LIBPQ_DEP_LIBS) \
+ $(if $(filter-out MACOSX,$(OS)),-ldl) \
$(if $(filter-out MACOSX,$(OS)),-Wl,--no-as-needed) \
))
commit f4543be3dddb47c73342d575e5768e673f89473b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat May 26 12:02:57 2012 -0500
connectivity is a gbuild module now, clean-up d.lst
Change-Id: I30965c09fdc96ec984c18b5e55a8edb69bdcba17
diff --git a/connectivity/prj/d.lst b/connectivity/prj/d.lst
index 86533a2..e69de29 100644
--- a/connectivity/prj/d.lst
+++ b/connectivity/prj/d.lst
@@ -1,54 +0,0 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin\*.dll
-..\%__SRC%\bin\*.res %_DEST%\bin\*.res
-..\%__SRC%\lib\*.so %_DEST%\lib\*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-..\%__SRC%\lib\*.jnilib %_DEST%\lib\*.jnilib
-..\%__SRC%\lib\*.a %_DEST%\lib\*.a
-..\%__SRC%\slb\connectivity*.* %_DEST%\lib\connectivity*.*
-..\%__SRC%\lib\idbt* %_DEST%\lib\idbt*
-..\%__SRC%\lib\*.oxt %_DEST%\bin\*.oxt
-..\%__SRC%\bin\*.oxt %_DEST%\bin\*.oxt
-..\source\cpool\*.xml %_DEST%\xml\*.xml
-..\source\drivers\adabas\*.xml %_DEST%\xml\*.xml
-..\source\drivers\ado\*.xml %_DEST%\xml\*.xml
-..\source\drivers\tdeab\*.xml %_DEST%\xml\*.xml
-..\source\drivers\kab\*.xml %_DEST%\xml\*.xml
-..\source\drivers\macab\*.xml %_DEST%\xml\*.xml
-..\source\drivers\file\*.xml %_DEST%\xml\*.xml
-..\source\drivers\flat\*.xml %_DEST%\xml\*.xml
-..\source\drivers\dbase\*.xml %_DEST%\xml\*.xml
-..\source\drivers\jdbc\*.xml %_DEST%\xml\*.xml
-..\source\drivers\odbc\*.xml %_DEST%\xml\*.xml
-..\source\drivers\mozab\*.xml %_DEST%\xml\*.xml
-..\source\drivers\evoab2\*.xml %_DEST%\xml\*.xml
-..\source\drivers\calc\*.xml %_DEST%\xml\*.xml
-..\source\drivers\mysql\*.xml %_DEST%\xml\*.xml
-..\%__SRC%\class\*.jar %_DEST%\bin\*.jar
-
-mkdir: %_DEST%\xml\registry\spool\DataAccess
-
-..\%__SRC%\inc\sqlbison.hxx %_DEST%\inc\connectivity\sqlbison.hxx
-..\%__SRC%\misc\registry\data\org\openoffice\Office\DataAccess\*.xcu %_DEST%\xml\registry\spool\DataAccess\*.xcu
-..\%COMMON_OUTDIR%\bin\fcfg_drivers_*.zip %_DEST%\pck\fcfg_drivers_*.zip
-..\%__SRC%\bin\fcfg_drivers_*.zip %_DEST%\pck\fcfg_drivers_*.zip
-..\%__SRC%\misc\adabas.component %_DEST%\xml\adabas.component
-..\%__SRC%\misc\ado.component %_DEST%\xml\ado.component
-..\%__SRC%\misc\calc.component %_DEST%\xml\calc.component
-..\%__SRC%\misc\dbase.component %_DEST%\xml\dbase.component
-..\%__SRC%\misc\dbpool2.component %_DEST%\xml\dbpool2.component
-..\%__SRC%\misc\dbtools.component %_DEST%\xml\dbtools.component
-..\%__SRC%\misc\evoab.component %_DEST%\xml\evoab.component
-..\%__SRC%\misc\flat.component %_DEST%\xml\flat.component
-..\%__SRC%\misc\hsqldb.component %_DEST%\xml\hsqldb.component
-..\%__SRC%\misc\jdbc.component %_DEST%\xml\jdbc.component
-..\%__SRC%\misc\tdeab1.component %_DEST%\xml\tdeab1.component
-..\%__SRC%\misc\kab1.component %_DEST%\xml\kab1.component
-..\%__SRC%\misc\macab1.component %_DEST%\xml\macab1.component
-..\%__SRC%\misc\mozab.component %_DEST%\xml\mozab.component
-..\%__SRC%\misc\mozbootstrap.component %_DEST%\xml\mozbootstrap.component
-..\%__SRC%\misc\mysql.component %_DEST%\xml\mysql.component
-..\%__SRC%\misc\odbc.component %_DEST%\xml\odbc.component
-..\%__SRC%\misc\sdbc2.component %_DEST%\xml\sdbc2.component
-
-..\%__SRC%\misc\postgresql-sdbc.rdb %_DEST%\xml\postgresql-sdbc.rdb
-..\source\drivers\postgresql\postgresql-sdbc.ini %_DEST%\bin\postgresql-sdbc.ini
commit 0396c844aba9fc2cb4ffebedad732c09f3d906b8
Author: David Tardon <dtardon at redhat.com>
Date: Sat May 26 14:04:25 2012 +0200
register additional libs required by postgressql
Change-Id: I223122d9f99c8068af21c80f9b52642c762c79af
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 0676ea7..fb833f7 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -396,6 +396,7 @@ gb_Library_PLAINLIBS_NONE += \
imm32\
kernel32 \
jawt \
+ ldap \
libcmt \
libcmtd \
mpr \
@@ -406,7 +407,9 @@ gb_Library_PLAINLIBS_NONE += \
$(gb_Library_win32_OLDNAMES) \
ole32 \
oleaut32 \
+ openssl \
propsys \
+ secur32 \
shell32 \
shlwapi \
urlmon \
commit 3379e91177f54405f234107ce077fbc769195cef
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date: Sat May 26 09:50:26 2012 +0200
fixed build error with --without-java parameter
Change-Id: Id383a2cd8bdaa14e6d991ee971a6b26230922b10
diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk
index 4452c8e..a4237d3 100644
--- a/testtools/CustomTarget_bridgetest.mk
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -37,11 +37,16 @@ BATCH_SUFFIX :=
GIVE_EXEC_RIGHTS=chmod +x
endif
-$(call gb_CustomTarget_get_target,testtools/bridgetest) : \
- $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) \
+bridgetest_TARGET := $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) \
+ $(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX)
+
+ifneq ($(SOLAR_JAVA),)
+bridgetest_TARGET := $(bridgetest_TARGET) \
$(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) \
- $(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) \
- $(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) \
+ $(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX)
+endif
+
+$(call gb_CustomTarget_get_target,testtools/bridgetest) : $(bridgetest_TARGET)
# which other prerequisites do we need here?
$(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \
commit 390c62238dfc913ffa2122728ddc6c3e2306e0b9
Author: David Tardon <dtardon at redhat.com>
Date: Fri May 25 21:57:10 2012 +0200
do not configure activex component on mingw
Change-Id: I4aa4be9c29248c75929f6bcd5f09b33cf2a381a0
diff --git a/configure.in b/configure.in
index e13897d..2ecac9b 100644
--- a/configure.in
+++ b/configure.in
@@ -10479,7 +10479,7 @@ AC_SUBST(ENABLE_SILENT_MSI)
dnl ===================================================================
dnl Test whether to enable ActiveX embedding
dnl ===================================================================
-if test "$_os" = "WINNT"; then
+if test "$_os" = "WINNT" -a "$WITH_MINGW" != yes; then
AC_MSG_CHECKING([whether to enable ActiveX embedding of LibreOffice components])
if test "$enable_activex_component" = "yes" -o "$enable_activex_component" = "TRUE" -o "$enable_activex_component" = ""; then
ENABLE_ACTIVEX_COMPONENT="TRUE"
commit d3bf42d2a48f094f83b3254b38de1cf638a26e2f
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri May 25 22:18:03 2012 -0500
connectivity: clean-up build.lst after gbuildification
Change-Id: I3c8207671c54eea3f1aa4dee1dd9b2247a8e4a45
diff --git a/connectivity/prj/build.lst b/connectivity/prj/build.lst
index f4851c5..859142e 100644
--- a/connectivity/prj/build.lst
+++ b/connectivity/prj/build.lst
@@ -1,32 +1,2 @@
cn connectivity : shell TRANSLATIONS:translations comphelper MOZ:moz POSTGRESQL:postgresql svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb QADEVOOO:qadevOOo officecfg NSS:nss LIBXSLT:libxslt NULL
-cn connectivity usr1 - all cn_mkout NULL
-cn connectivity\inc nmake - all cn_inc NULL
-cn connectivity\com\sun\star\sdbcx\comp\hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_inc NULL
-cn connectivity\source\commontools nmake - all cn_cmtools cn_parse cn_inc NULL
-cn connectivity\source\manager nmake - all cn_manager cn_dbtools cn_inc NULL
-cn connectivity\source\cpool nmake - all cn_cpool cn_dbtools cn_inc NULL
-cn connectivity\source\resource nmake - all cn_res cn_inc NULL
-cn connectivity\source\sdbcx nmake - all cn_sdbcx cn_inc NULL
-cn connectivity\source\drivers\ado nmake - all cn_ado cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\mozab\mozillasrc nmake - all cn_mozab_mozillasrc cn_file cn_inc NULL
-cn connectivity\source\drivers\mozab\bootstrap nmake - all cn_mozab_bootstrap cn_mozab_mozillasrc cn_inc NULL
-cn connectivity\source\drivers\mozab nmake - all cn_mozab cn_mozab_bootstrap cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\kab nmake - all cn_kab cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\macab nmake - all cn_macab cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\evoab2 nmake - all cn_evoab2 cn_dbtools cn_file cn_inc NULL
-cn connectivity\source\drivers\calc nmake - all cn_calc cn_file cn_inc NULL
-cn connectivity\source\drivers\odbcbase nmake - all cn_odbcbase cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_odbcbase cn_inc NULL
-cn connectivity\source\drivers\mysql nmake - all cn_mysql cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\postgresql nmake - all cn_postgresql cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\jdbc nmake - all cn_jdbc cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\file nmake - all cn_file cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\flat nmake - all cn_flat cn_dbtools cn_file cn_inc NULL
-cn connectivity\source\drivers\dbase nmake - all cn_dbase cn_dbtools cn_file cn_inc NULL
-cn connectivity\source\drivers\hsqldb nmake - all cn_hsqldb cn_dbtools cn_inc NULL
-cn connectivity\source\parse nmake - all cn_parse cn_inc NULL
-cn connectivity\source\simpledbt nmake - all cn_simpledbt cn_cmtools cn_inc NULL
-cn connectivity\source\dbtools nmake - all cn_dbtools cn_simpledbt cn_cmtools cn_parse cn_res cn_sdbcx cn_inc cn_res NULL
-cn connectivity\qa\connectivity\tools nmake - all cn_qa_tools cn_inc NULL
-cn connectivity\qa nmake - all cn_qa cn_inc NULL
-cn connectivity\util nmake - all cn_util cn_ado cn_mozab cn_kab cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_flat cn_dbase cn_hsqldb cn_macab NULL
+
commit b0f5bf22815b9d6b2d8936c426f1dde302420d2c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri May 25 20:41:31 2012 -0500
fix Layer for macab* to please Mac Build
Change-Id: Ie5b833e3aaf3a69d42c8e8024f19be2d13c86be4
diff --git a/Repository.mk b/Repository.mk
index f3e6bcd..fa701f7 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -307,8 +307,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
lnth \
log \
lwpft \
- macab1 \
- macabdrv1 \
MacOSXSpell \
merged \
mozab2 \
@@ -436,6 +434,8 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
localedata_es \
localedata_euro \
localedata_others \
+ macab1 \
+ macabdrv1 \
mcnttype \
mozbootstrap \
officebean \
commit 6d20de9abcafeedd51b76a79a300609b1e7115fb
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri May 25 19:58:43 2012 -0500
scp2: rebase mishap.. icuversion.mk is no more
Change-Id: Ie3fe45fce1e27332c178596ed7f60967781ffcda
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 79bb780..927c4e1 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -177,10 +177,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
))
endif
-ifneq ($(SYSTEM_ICU),YES)
-include $(OUTDIR)/inc/icuversion.mk
-endif
-
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-DICU_MAJOR=$(ICU_MAJOR) \
-DICU_MINOR=$(ICU_MINOR) \
commit 575e8d8d3eeb1cd55cb44acc1d9109e8d8ade9bd
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri May 25 18:27:50 2012 -0500
connectivity: Mac use bison 2.3 which need a '=' for %file-prefix
Change-Id: I87c2b301739946163c4b5cecf04e30ed6f137e67
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 536cfc9..b170956 100755
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -1,5 +1,5 @@
-%file-prefix "sql"
-%name-prefix "SQLyy"
+%file-prefix="sql"
+%name-prefix="SQLyy"
%no-lines
%defines
commit c9609d433e795dc468e0696f57c0fb838182fb1c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri May 25 18:27:04 2012 -0500
connectivity: use gbuild api for flex (this hide a -Werror problem on Mac)
Change-Id: I7b5551932db6e3e6037ad4f98ed77a29b4dec5db
diff --git a/connectivity/Library_dbtools.mk b/connectivity/Library_dbtools.mk
index 33de116..3336815 100644
--- a/connectivity/Library_dbtools.mk
+++ b/connectivity/Library_dbtools.mk
@@ -79,22 +79,14 @@ $(eval $(call gb_Library_add_noexception_objects,dbtools,\
$(eval $(call gb_Library_add_grammars,dbtools,\
connectivity/source/parse/sqlbison \
))
-
-$(SRCDIR)/connectivity/source/parse/sqlflex.l: $(call gb_YaccTarget_get_target,connectivity/source/parse/sqlbison)
-$(WORKDIR)/CustomTarget/connectivity/sqlflex.cxx: $(SRCDIR)/connectivity/source/parse/sqlflex.l
- mkdir -p $(dir $@)
- flex -i -8 -PSQLyy -L -o$@ $<
+$(eval $(call gb_Library_add_scanners,dbtools,\
+connectivity/source/parse/sqlflex \
+))
-$(call gb_Library_get_clean_target,dbtools): dbtools_flex_clean
+$(call gb_LexTarget_get_scanner_target,connectivity/source/parse/sqlflex) : T_LEXFLAGS := -i -8 -PSQLyy -L
-.PHONY: dbtools_flex_clean
-dbtools_flex_clean:
- rm -rf $(WORKDIR)/CustomTarget/connectivity
-$(eval $(call gb_Library_add_generated_exception_objects,dbtools,\
- CustomTarget/connectivity/sqlflex \
-))
$(eval $(call gb_Library_add_exception_objects,dbtools,\
connectivity/source/commontools/predicateinput \
commit 4689264f6717c19b23263cfa9f35a270e969a10c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri May 25 18:25:36 2012 -0500
WaE unused variable
Change-Id: I9545097bd69928f608dd34d5729a6053be3114d1
diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
index c3eebc8..d4fa119 100644
--- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
+++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
@@ -79,7 +79,7 @@ void MacabResultSetMetaData::setMacabFields(const ::rtl::Reference<connectivity:
}
// -------------------------------------------------------------------------
-sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnDisplaySize(sal_Int32 column) throw(SQLException, RuntimeException)
+sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnDisplaySize(sal_Int32 /* column */) throw(SQLException, RuntimeException)
{
// For now, all columns are the same size.
return 50;
commit 1d6a9646291365025f484b84b24646fe55325407
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Fri May 25 18:16:38 2012 -0500
connectivity: missing include in gbuildification
Change-Id: I3180537cf379976659e93d93eb707ca87ae13735
diff --git a/connectivity/Library_macab1.mk b/connectivity/Library_macab1.mk
index d8d87c2..cf5168c 100644
--- a/connectivity/Library_macab1.mk
+++ b/connectivity/Library_macab1.mk
@@ -43,6 +43,12 @@ $(eval $(call gb_Library_use_libraries,macab1,\
$(gb_STDLIBS) \
))
+$(eval $(call gb_Library_set_include,macab1,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/source/inc \
+))
+
$(eval $(call gb_Library_add_exception_objects,macab1,\
connectivity/source/drivers/macab/MacabDriver \
connectivity/source/drivers/macab/MacabServices \
diff --git a/connectivity/Library_macabdrv1.mk b/connectivity/Library_macabdrv1.mk
index fde08dc..0f15bb4 100644
--- a/connectivity/Library_macabdrv1.mk
+++ b/connectivity/Library_macabdrv1.mk
@@ -47,6 +47,12 @@ $(eval $(call gb_Library_use_libraries,macabdrv1,\
$(gb_STDLIBS) \
))
+$(eval $(call gb_Library_set_include,macabdrv1,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/source/inc \
+))
+
$(eval $(call gb_Library_add_exception_objects,macabdrv1,\
connectivity/source/drivers/macab/MacabColumns \
connectivity/source/drivers/macab/MacabTable \
commit 534b69a7d6e62f962c180d8728fc876b94b292be
Author: David Tardon <dtardon at redhat.com>
Date: Sun May 20 17:50:22 2012 +0200
fix copy-and-paste bug
Change-Id: I236165572652d7740d637ac19994aca549f501bb
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 927c4e1..79bb780 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -177,6 +177,10 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
))
endif
+ifneq ($(SYSTEM_ICU),YES)
+include $(OUTDIR)/inc/icuversion.mk
+endif
+
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-DICU_MAJOR=$(ICU_MAJOR) \
-DICU_MINOR=$(ICU_MINOR) \
commit 86d2a9d3c4b61118aed2fa97dcff9df36557bc84
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun May 20 09:11:40 2012 -0500
provide a gnu-make compatible include for pyversion
Change-Id: I I7d0de9bc04c26e71c6bd915a659a15c3e1f712d2
diff --git a/python/makefile.mk b/python/makefile.mk
index 3e71095..1f41a96 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -172,6 +172,7 @@ BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe pcbuild.sln "$(CONF)|$(ARCH)"
.ENDIF
PYVERSIONFILE=$(MISC)$/pyversion.mk
+PYVERSIONGFILE=$(MISC)$/pyversion.Makefile
# --- Targets ------------------------------------------------------
@@ -207,7 +208,7 @@ $(PYCONFIG) : $(MISC)$/build$/$(TARFILE_NAME)$/PC$/pyconfig.h
.ENDIF
.ENDIF
-ALLTAR : $(PYVERSIONFILE)
+ALLTAR : $(PYVERSIONFILE) $(PYVERSIONGFILE)
.ENDIF # "$(L10N_framework)"==""
# rule to allow relocating the whole framework, removing reference to buildinstallation directory
@@ -252,4 +253,8 @@ $(PYVERSIONFILE) : pyversion.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
@-rm -f $@
$(COMMAND_ECHO)$(COPY) pyversion.mk $@
+$(PYVERSIONGFILE) : pyversion.Makefile $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
+ @-rm -f $@
+ $(COMMAND_ECHO)$(COPY) pyversion.Makefile $@
+
.ENDIF # DISABLE_PYTHON != TRUE
diff --git a/python/prj/d.lst b/python/prj/d.lst
index 4fb4405..0c936ab 100644
--- a/python/prj/d.lst
+++ b/python/prj/d.lst
@@ -8,6 +8,7 @@ mkdir: %_DEST%\lib\OOoPython.framework\Versions\2.6\include\python2.6
# MACOSX - end
..\%__SRC%\misc\pyversion.mk %_DEST%\inc\pyversion.mk
+..\%__SRC%\misc\pyversion.Makefile %_DEST%\inc\pyversion.Makefile
mkdir: %_DEST%\lib\python
mkdir: %_DEST%\lib\python\lib-old
diff --git a/python/pyversion.Makefile b/python/pyversion.Makefile
new file mode 100644
index 0000000..4b4be9c
--- /dev/null
+++ b/python/pyversion.Makefile
@@ -0,0 +1,25 @@
+# when you want to change the python version, you must update the d.lst
+# in the python project accordingly !!!
+PYMAJOR:=2
+PYMINOR:=6
+PYMICRO:=1
+PYVERSION:=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
+
+ifeq ($(GUI),UNX)
+ifeq ($(OS),MACOSX)
+PY_FULL_DLL_NAME:=libpython$(PYMAJOR).$(PYMINOR).a
+PYTHONLIB=-F$(SOLARLIBDIR) -framework OOoPython
+CFLAGS+=-I$(SOLARLIBDIR)/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/include/python$(PYMAJOR).$(PYMINOR)
+else
+PY_FULL_DLL_NAME:=libpython$(PYMAJOR).$(PYMINOR).so.1.0
+PYTHONLIB:=-lpython$(PYMAJOR).$(PYMINOR)
+endif
+else
+ifeq ($(COM),GCC)
+PY_FULL_DLL_NAME:=libpython$(PYMAJOR).$(PYMINOR).dll
+PYTHONLIB:=-lpython$(PYMAJOR).$(PYMINOR)
+else
+PY_FULL_DLL_NAME:=python$(PYMAJOR)$(PYMINOR).dll
+PYTHONLIB:=python$(PYMAJOR)$(PYMINOR).lib
+endif
+endif
diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk
index 774775d..53d0891 100644
--- a/scp2/InstallModule_python.mk
+++ b/scp2/InstallModule_python.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_InstallModule_add_defs,scp2/python,\
-DSYSTEM_PYTHON \
))
else
-include $(OUTDIR)/inc/pyversion.mk
+include $(OUTDIR)/inc/pyversion.Makefile
$(eval $(call gb_InstallModule_add_defs,scp2/python,\
-DPYVERSION=$(PYVERSION) \
commit 1cb5fa76a8414a072271e2655d8aa6b25fcd03bc
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri May 25 17:35:18 2012 +0200
bin icuversion.mk, set the variables in configure
Change-Id: Ife00d7477dacfe1eb325c722517fb038ead083db
diff --git a/configure.in b/configure.in
index 4576511..e13897d 100644
--- a/configure.in
+++ b/configure.in
@@ -7821,9 +7821,9 @@ SYSTEM_GENBRK=
SYSTEM_GENCCODE=
SYSTEM_GENCMN=
-ICU_MAJOR=
-ICU_MINOR=
-ICU_MICRO=
+ICU_MAJOR=49
+ICU_MINOR=1
+ICU_MICRO=1
ICU_RECLASSIFIED_CLOSE_PARENTHESIS="YES"
ICU_RECLASSIFIED_PREPEND_SET_EMPTY="YES"
ICU_RECLASSIFIED_CONDITIONAL_JAPANESE_STARTER="YES"
diff --git a/icu/icuversion.mk b/icu/icuversion.mk
deleted file mode 100755
index ddc7104..0000000
--- a/icu/icuversion.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-# major
-.IF "$(ICU_MAJOR)" == ""
-ICU_MAJOR=49
-.ENDIF
-# minor
-.IF "$(ICU_MINOR)" == ""
-ICU_MINOR=1
-.ENDIF
-# micro
-.IF "$(ICU_MICRO)" == ""
-ICU_MICRO=1
-.ENDIF
diff --git a/icu/makefile.mk b/icu/makefile.mk
index afedbbc..d6a73f9 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -35,8 +35,6 @@ TARGET=so_icu
# --- Files --------------------------------------------------------
-.INCLUDE : icuversion.mk
-
TARFILE_NAME=icu4c-49_1_1-src
TARFILE_MD5=7c53f83e0327343f4060c0eb83842daf
TARFILE_ROOTDIR=icu
diff --git a/icu/prj/d.lst b/icu/prj/d.lst
index c76b3ff..d5fc11a 100644
--- a/icu/prj/d.lst
+++ b/icu/prj/d.lst
@@ -42,8 +42,6 @@ mkdir: %_DEST%\inc\external\unicode
..\%__SRC%\lib\libicuuc.a %_DEST%\lib\
..\%__SRC%\lib\libicutu.a %_DEST%\lib\
-..\icuversion.mk %_DEST%\inc\icuversion.mk
-
linklib: libicudata.*.*.*
linklib: libicui18n.*.*.*
linklib: libicule.*.*.*
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 81653a0..927c4e1 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -177,10 +177,6 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
))
endif
-ifneq ($(SYSTEM_LIBXSLT),YES)
-include $(OUTDIR)/inc/icuversion.mk
-endif
-
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-DICU_MAJOR=$(ICU_MAJOR) \
-DICU_MINOR=$(ICU_MINOR) \
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index a936193..c8259bd 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -26,7 +26,6 @@
#*************************************************************************
LIBSMKREV!:="$$Revision: 1.134.2.3 $$"
-.INCLUDE .IGNORE : icuversion.mk
.INCLUDE .IGNORE : i18npool/version.mk
.INCLUDE .IGNORE : comphelper/version.mk
.INCLUDE .IGNORE : ucbhelper/version.mk
commit db90240a654c276e83a776de30ef3c07645a6558
Author: David Tardon <dtardon at redhat.com>
Date: Fri May 25 12:03:17 2012 +0200
ConnectivityTools.jar is only used by complex tests
Change-Id: I480ec61e44f008e8f473825063a2ac0575970d7b
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index d3c6948..76e822a 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -56,7 +56,6 @@ $(eval $(call gb_Module_add_targets,connectivity,\
AllLangResTarget_hsqldb \
Configuration_hsqldb \
Configuration_jdbc \
- Jar_ConnectivityTools \
Jar_sdbc_hsqldb \
Library_hsqldb \
Library_jdbc \
@@ -138,9 +137,13 @@ endif
endif
+ifneq ($(filter QADEVOOO,$(BUILD_TYPE)),)
+$(eval $(call gb_Module_add_subsequentcheck_targets,connectivity,\
+ Jar_ConnectivityTools \
+))
# FIXME: Does not work. Convert to JUnit.
-# $(eval $(call gb_Module_add_subsequentcheck_targets,connectivity,\
# JunitTest_complex \
-# ))
+
+endif
# vim: set noet sw=4 ts=4:
commit 53c361b8cb8c523e0bb5f160aee38259802aac7b
Author: David Tardon <dtardon at redhat.com>
Date: Fri May 25 11:49:02 2012 +0200
do not use gb_Helper_*native* functions
Change-Id: Iba3e4b97efe9dde7bb26e0e78ec7ec60ae642634
diff --git a/testtools/CustomTarget_bridgetest.mk b/testtools/CustomTarget_bridgetest.mk
index c1f4317..4452c8e 100644
--- a/testtools/CustomTarget_bridgetest.mk
+++ b/testtools/CustomTarget_bridgetest.mk
@@ -47,7 +47,7 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest) : \
$(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \
$(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
- $(call gb_Helper_abbreviate_dirs_native,\
+ $(call gb_Helper_abbreviate_dirs,\
echo "$(UNO_EXE)" \
"-ro $(OUTDIR)/xml/uno_services.rdb" \
"-ro $(OUTDIR)/bin/udkapi.rdb" \
@@ -60,13 +60,13 @@ $(workdir_SERVER)/bridgetest_server$(BATCH_SUFFIX) : \
ifneq ($(SOLAR_JAVA),)
# how to do it more elegantly?
-MY_CLASSPATH := $(call gb_Helper_native_path,$(OUTDIR)/bin/ridl.jar)$(gb_CLASSPATHSEP)$(call gb_Helper_native_path,$(OUTDIR)/bin/java_uno.jar)$(gb_CLASSPATHSEP)$(call gb_Helper_native_path,$(OUTDIR)/bin/jurt.jar)$(gb_CLASSPATHSEP)$(call gb_Helper_native_path,$(OUTDIR)/bin/juh.jar)
+MY_CLASSPATH := $(OUTDIR)/bin/ridl.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/java_uno.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/jurt.jar$(gb_CLASSPATHSEP)$(OUTDIR)/bin/juh.jar
# which other prerequisites do we need here?
$(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) : \
$(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
- $(call gb_Helper_abbreviate_dirs_native,\
+ $(call gb_Helper_abbreviate_dirs,\
echo "java" \
"-classpath $(MY_CLASSPATH)$(gb_CLASSPATHSEP)$(OUTDIR)/bin/testComponent.jar" \
"com.sun.star.comp.bridge.TestComponentMain" \
@@ -78,7 +78,7 @@ $(workdir_SERVER)/bridgetest_javaserver$(BATCH_SUFFIX) : \
$(workdir_SERVER)/bridgetest_inprocess_java(BATCH_SUFFIX) : \
$(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
- $(call gb_Helper_abbreviate_dirs_native,\
+ $(call gb_Helper_abbreviate_dirs,\
echo "JAVA_HOME=$(JAVA_HOME)" \
"LD_LIBRARY_PATH=$(OUTDIR)/lib" \
"$(UNO_EXE)" \
@@ -98,7 +98,7 @@ endif
$(workdir_SERVER)/bridgetest_client$(BATCH_SUFFIX) : \
$(SRCDIR)/testtools/source/bridgetest/*.component | $(workdir_SERVER)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
- $(call gb_Helper_abbreviate_dirs_native,\
+ $(call gb_Helper_abbreviate_dirs,\
echo "$(UNO_EXE)" \
"-ro $(OUTDIR)/xml/ure/services.rdb" \
"-ro $(OUTDIR)/xml/uno_services.rdb" \
diff --git a/testtools/CustomTarget_bridgetest_climaker.mk b/testtools/CustomTarget_bridgetest_climaker.mk
index a54281d..87ee4f6 100644
--- a/testtools/CustomTarget_bridgetest_climaker.mk
+++ b/testtools/CustomTarget_bridgetest_climaker.mk
@@ -35,7 +35,7 @@ $(climaker_DIR)/cli_types_bridgetest.dll : $(OUTDIR)/bin/bridgetest.rdb \
$(OUTDIR)/bin/types.rdb $(OUTDIR)/bin/cli_uretypes.dll \
$(call gb_Executable_get_target_for_build,climaker) | $(climaker_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1)
- $(call gb_Helper_abbreviate_dirs_native, \
+ $(call gb_Helper_abbreviate_dirs, \
$(call gb_Helper_execute,climaker \
$(if $(filter -s,$(MAKEFLAGS)),,--verbose) \
--out $@ \
diff --git a/testtools/CustomTarget_bridgetest_javamaker.mk b/testtools/CustomTarget_bridgetest_javamaker.mk
index 5e4110f..593cf16 100644
--- a/testtools/CustomTarget_bridgetest_javamaker.mk
+++ b/testtools/CustomTarget_bridgetest_javamaker.mk
@@ -33,7 +33,7 @@ $(call gb_CustomTarget_get_target,testtools/bridgetest_javamaker) : $(javamaker_
$(javamaker_DIR)/done : $(call gb_UnoApiTarget_get_target,bridgetest) \
$(call gb_Executable_get_target_for_build,javamaker) | $(javamaker_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
- $(call gb_Helper_abbreviate_dirs_native, \
+ $(call gb_Helper_abbreviate_dirs, \
$(call gb_Helper_execute,javamaker -BUCR -nD -O$(javamaker_DIR)/class -X$(OUTDIR)/bin/types.rdb $<) && touch $@)
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/testtools/CustomTarget_uno_test.mk b/testtools/CustomTarget_uno_test.mk
index 0e76891..89a8d27 100644
--- a/testtools/CustomTarget_uno_test.mk
+++ b/testtools/CustomTarget_uno_test.mk
@@ -33,7 +33,7 @@ UNO_EXE := $(OUTDIR)/bin/uno
$(call gb_CustomTarget_get_target,testtools/uno_test) : $(call gb_Rdb_get_target,uno_services) \
$(UNO_EXE) \
$(call gb_InternalUnoApi_get_target,bridgetest)
- $(call gb_Helper_abbreviate_dirs_native, $(UNO_EXE) \
+ $(call gb_Helper_abbreviate_dirs, $(UNO_EXE) \
-ro $(OUTDIR)/xml/uno_services.rdb \
-ro $(OUTDIR)/bin/udkapi.rdb \
-ro $(WORKDIR)/UnoApiTarget/bridgetest.rdb \
commit 3bd076f3e029173ee2d6fba6227ebaccd6cae7ca
Author: David Tardon <dtardon at redhat.com>
Date: Fri May 25 09:29:49 2012 +0200
fix after merge
Change-Id: Icd95b14777ccc428440971ab03aa3ad65e3d379f
diff --git a/Makefile b/Makefile
index a2f10e9..8b27545 100644
--- a/Makefile
+++ b/Makefile
@@ -17,361 +17,6 @@ SRCDIR:=$(patsubst %/,%,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))
.PHONY : $(filter-out $(SRCDIR)/config_host.mk,$(MAKECMDGOALS))
-ifeq ($(gb_Side),)
-gb_Side:=host
-endif
-
-include $(SRCDIR)/config_$(gb_Side).mk
-
-ifeq ($(GMAKE_OPTIONS),)
-ifeq ($(verbose),)
-export GMAKE_OPTIONS:=-rs
-else
-export GMAKE_OPTIONS:=-r
-endif
-endif
-
-gbuild_modules:= \
-MathMLDTD\
-Mesa\
-UnoControls\
-accessibility\
-animations\
-apple_remote\
-avmedia\
-basctl\
-basebmp\
-basegfx\
-basic\
-bean\
-binaryurp\
-canvas\
-chart2\
-clucene\
-codemaker\
-comphelper\
-configmgr\
-cppcanvas\
-cppu\
-cppuhelper\
-cpputools\
-cui\
-dbaccess\
-desktop\
-drawinglayer\
-dtrans\
-editeng\
-embeddedobj\
-embedserv\
-eventattacher\
-extensions\
-fileaccess\
-filter\
-forms\
-formula\
-fpicker\
-framework\
-hwpfilter\
-i18npool\
-i18nutil\
-idl\
-idlc\
-io\
-javaunohelper\
-jurt\
-jvmaccess\
-jvmfwk\
-l10ntools\
-lingucomponent\
-linguistic\
-lotuswordpro\
-nlpsolver\
-np_sdk\
-o3tl\
-offapi\
-officecfg\
-oovbaapi\
-oox\
-package\
-packimages\
-padmin\
-psprint_config\
-qadevOOo\
-regexp\
-registry\
-reportdesign\
-rdbmaker\
-ridljar\
-rsc\
-sal\
-salhelper\
-sane\
-sax\
-sc\
-scaddins\
-sccomp\
-scripting\
-sd\
-sdext\
-sfx2\
-slideshow\
-smoketest\
-sot\
-starmath\
-stoc\
-store\
-svl\
-svtools\
-svx\
-sw\
-swext\
-tail_build\
-test\
-testtools\
-toolkit\
-tools\
-translations\
-twain\
-ucb\
-ucbhelper\
-udkapi\
-unixODBC\
-unodevtools\
-unoil\
-unotest\
-unotools\
-unoxml\
-ure\
-uui\
-vbahelper\
-vcl\
-wizards\
-writerfilter\
-writerperfect\
-xmerge\
-xml2cmp\
-xmlhelp\
-xmloff\
-xmlreader\
-xmlscript\
-xmlsecurity\
-
-dmake_modules:=\
-afms\
-apache-commons\
-autodoc\
-beanshell\
-berkeleydb\
-binfilter \
-boost\
-bridges\
-cairo\
-cli_ure\
-connectivity\
-cosv\
-cppunit\
-crashrep\
-ct2n\
-curl\
-dictionaries \
-epm\
-expat\
-external\
-extras\
-fontconfig\
-freetype\
-gdk-pixbuf\
-gettext\
-glib\
-graphite\
-helpcontent2 \
-hsqldb\
-hunspell\
-hyphen\
-icc\
-icu\
-instsetoo_native\
-jfreereport\
-jpeg\
-languagetool\
-libcdr\
-libcmis\
-libcroco\
-libexttextcat\
-libgsf\
-libpng\
-librsvg\
-libvisio\
-libwpd\
-libwpg\
-libwps\
-libxml2\
-libxmlsec\
-libxslt\
-lcms2\
-lpsolve\
-lucene\
-mdds\
-migrationanalysis\
-more_fonts\
-moz\
-mysqlc\
-mysqlcppconn\
-mythes\
-neon\
-nss\
-odk\
-openssl\
-pango\
-postgresql\
-postprocess\
-python\
-pyuno\
-readlicense_oo\
-redland\
-remotebridges\
-reportbuilder\
-rhino\
-saxon\
-scp2\
-setup_native\
-shell\
-solenv\
-soltools\
-stax\
-stlport\
-sysui\
-tomcat\
-udm\
-vigra\
-x11_extensions\
-xpdf\
-xsltml\
-zlib\
-
-gb_TAILBUILDMODULES := $(shell make -f $(SRCDIR)/tail_build/Makefile showmodules)
-
-define gbuild_module_rules
-.PHONY: $(1) $(1).all $(1).clean $(1).deliver
-
-$(1): bootstrap fetch
- cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) gb_PARTIALBUILD=T
-
-ifeq ($(filter $(1),$(gb_TAILBUILDMODULES)),)
-$(1).all: bootstrap fetch
- cd $(1) && unset MAKEFLAGS && \
- $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
-else
-$(1).all: bootstrap fetch
- cd tail_build && unset MAKEFLAGS && export gb_TAILBUILDTARGET="$(WORKDIR)/Module/$(1) $(WORKDIR)/Module/check/$(1)" && \
- $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
-endif
-
-$(1).clean:
- cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) clean gb_PARTIALBUILD=T
-
-$(1).subsequentcheck:
- cd $(1) && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) subsequentcheck gb_PARTIALBUILD=T
-
-$(1).deliver:
- @true
-
-endef
-
-define gbuild_modules_rules
-$(foreach m,$(1),$(call gbuild_module_rules,$(m)))
-endef
-
-define dmake_module_rules
-.PHONY: $(1) $(1).all $(1).deliver $(1).clean
-
-$(1): bootstrap fetch
- cd $(1) && unset MAKEFLAGS && \
- $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM)
-
-$(1).all: bootstrap fetch
- cd $(1) && unset MAKEFLAGS && \
- $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM)
-
-$(1).deliver: $(1)
- cd $(1) && $(SOLARENV)/bin/deliver.pl
-
-$(1).clean:
- cd $(1) && $(SOLARENV)/bin/deliver.pl -delete
- rm -fr $(1)/$(INPATH)
-
-endef
-
-define dmake_modules_rules
-$(foreach m,$(1),$(call dmake_module_rules,$(m)))
-endef
-
-#
-# Partial Build
-#
-$(eval $(call gbuild_modules_rules,$(gbuild_modules)))
-
-$(eval $(call dmake_modules_rules,$(dmake_modules)))
-
-#
-# Clean
-#
-clean: clean-host clean-build
-
-clean-host:
- rm -fr $(DEVINSTALLDIR)
- rm -fr $(SOLARVER)/$(INPATH) # not necessarily below SRCDIR
- rm -fr $(SRCDIR)/*/$(INPATH)
- rm -fr install
-
-clean-build:
-ifeq ($(CROSS_COMPILING),YES)
- rm -rf $(SOLARVER)/$(INPATH_FOR_BUILD) # not necessarily below SRCDIR
- rm -rf $(SRCDIR)/*/$(INPATH_FOR_BUILD)
-endif
-
-#
-# Distclean
-#
-distclean : clean
-ifeq ($(BUILD_DMAKE),YES)
- (if [ -f dmake/Makefile ] ; then $(GNUMAKE) -j $(GMAKE_PARALLELISM) -C dmake distclean; fi) && \
- rm -f solenv/*/bin/dmake*
-endif
- rm -fr config_host.mk config_build.mk aclocal.m4 autom4te.cache \
- bin/repo-list config.log config.status configure \
- ooo.lst post_download post_download.log \
- config_host.mk.last set_soenv.stamp src.downloaded warn
- find $(SOLARENV)/gdb -name "*.pyc" -exec rm {} \;
-
-#
-# custom command
-#
-ifneq ( $(MAKECMDGOALS),cmd)
-cmd:
- echo "custom cmd" && ( $(cmd) )
-
-endif
-
-ifneq ($(filter-out clean distclean,$(MAKECMDGOALS)),)
-#
-# Makefile
-#
-
-# I don't like to touch stuff that are supposed to be
-# in the source tree, hence read-only
-# but I couldn't find a way to get make to
-# restart after an autogen. and we _have_ to
-# restart since autogen can have changed
-# config_host.mk which is included in this
-# Makefile
-
-ifeq ($(OS_FOR_BUILD),WNT)
-CONFIG_HOST_MK=$(shell cygpath -u $(SRCDIR))/config_host.mk
-else
-CONFIG_HOST_MK=$(SRCDIR)/config_host.mk
-endif
-
# recursively invoke Makefile.top, which includes config_host.mk
$(firstword $(MAKECMDGOALS)) : $(SRCDIR)/config_host.mk
$(MAKE) -r -f $(SRCDIR)/Makefile.top $(MAKECMDGOALS)
@@ -389,171 +34,4 @@ $(SRCDIR)/config_host.mk : \
$(SRCDIR)/autogen.lastrun:
@true
-#
-# Fetch
-#
-fetch: src.downloaded
-
-src.downloaded : Makefile ooo.lst download
-ifeq ($(DO_FETCH_TARBALLS),YES)
- @./download $(SRCDIR)/ooo.lst && touch $@
-else
- @echo "Automatic fetching of external tarballs is disabled."
-endif
-
-#
-# Bootstap
-#
-ifeq ($(OS_FOR_BUILD),WNT)
-WORKDIR_BOOTSTRAP=$(shell cygpath -u $(WORKDIR))/bootstrap
-else
-WORKDIR_BOOTSTRAP=$(WORKDIR)/bootstrap
-endif
-
-$(WORKDIR_BOOTSTRAP):
- @cd $(SRCDIR) && ./bootstrap
- @mkdir -p $(dir $@) && touch $@
-
-bootstrap: $(WORKDIR_BOOTSTRAP)
-
-#
-# Build
-#
-build-packimages: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
-ifeq ($(DISABLE_SCRIPTING),TRUE)
-# We must get the headers from vbahelper "delivered" because
-# as we don't link to any libs from there they won't otherwise be, or
-# something. And we still do include those headers always even if the
-# libs aren't built in the --disable-scripting case. (Ifdefs for
-# DISABLE_SCRIPTING will be added to the code later as necessary.)
- $(GNUMAKE) vbahelper
-endif
-ifeq ($(DISABLE_DBCONNECTIVITY),TRUE)
-# Ditto for dbconnectivity in the --disable-database-connectivity case
- cd connectivity && sed -e 's/^\(export [A-Z0-9_]*=\)\(.*\)$$/\1"\2"/' <../config_host.mk >conftmp.sh && . conftmp.sh && rm conftmp.sh && $(SOLARENV)/bin/deliver.pl
-endif
- cd packimages && unset MAKEFLAGS && \
- $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) --all -- -P$(GMAKE_PARALLELISM) && \
- make
-
-build: build-packimages
-ifeq ($(OS_FOR_BUILD),WNT)
- cd instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl
-else
- cd instsetoo_native && unset MAKEFLAGS && \
- $(SOLARENV)/bin/build.pl -P$(BUILD_NCPUS) -- -P$(GMAKE_PARALLELISM)
-endif
-
-cross-toolset: bootstrap fetch
- cd cross_toolset && $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS)
-
-
-#
-# Install
-#
-
-install:
- echo "Installing in $(INSTALLDIR)..." && \
- ooinstall "$(INSTALLDIR)" && \
- echo "" && \
- echo "Installation finished, you can now execute:" && \
- echo "$(INSTALLDIR)/program/soffice"
-
-install-strip:
- echo "Installing and stripping binaries in $(INSTALLDIR)..." && \
- ooinstall --strip "$(INSTALLDIR)" && \
- echo "" && \
- echo "Installation finished, you can now execute:" && \
- echo "$(INSTALLDIR)/program/soffice"
-
-dev-install: build
- @rm -rf $(DEVINSTALLDIR)
- @mkdir $(DEVINSTALLDIR)
-ifeq ($(DISABLE_LINKOO),TRUE)
- @ooinstall $(DEVINSTALLDIR)/opt
- @install-gdb-printers -L
-else
- @ooinstall -l $(DEVINSTALLDIR)/opt
-endif
- @rm -f $(SRCDIR)/install && ln -s $(DEVINSTALLDIR)/opt/ $(SRCDIR)/install
-
-distro-pack-install: install
- $(SRCDIR)/bin/distro-install-clean-up
- $(SRCDIR)/bin/distro-install-desktop-integration
- $(SRCDIR)/bin/distro-install-sdk
- $(SRCDIR)/bin/distro-install-file-lists
-
-id:
- @create-ids
-
-tags:
- @create-tags
-
-docs:
- @mkdocs.sh $(SRCDIR)/docs $(SOLARENV)/inc/doxygen.cfg
-
-findunusedcode:
- @which callcatcher > /dev/null 2>&1 || \
- (echo "callcatcher not installed" && false)
- @sed -e s,$$INPATH,callcatcher,g $(SRCDIR)/config_host.mk | sed -e s,"export OOO_JUNIT_JAR=.*","export OOO_JUNIT_JAR=",g > $(SRCDIR)/config_host_callcatcher.mk
- @mkdir -p $(SRCDIR)/solenv/callcatcher/bin && \
- ln -sf $(SRCDIR)/solenv/$(INPATH)/bin/dmake \
- $(SRCDIR)/solenv/callcatcher/bin/dmake
- @$(GNUMAKE) -f $(SOLARENV)/bin/callcatcher.Makefile findunusedcode
- @grep ::.*\( unusedcode.all \
- | grep -v ^Atom \
- | grep -v ^boost:: \
- | grep -v ^CIcc \
- | grep -v ^CLuceneError:: \
- | grep -v ^cppu:: \
- | grep -v ^Dde \
- | grep -v ^graphite2:: \
- | grep -v ^jvmaccess:: \
- | grep -v ^libcdr:: \
- | grep -v ^libcmis:: \
- | grep -v ^libvisio:: \
- | grep -v ^libwpg:: \
- | grep -v ^lucene:: \
- | grep -v ^Matrix3d:: \
- | grep -v ^salhelper:: \
- | grep -v ^WP1 \
- | grep -v ^WP3 \
- | grep -v ^WP42 \
- | grep -v ^WP6 \
- | grep -v ^WPG \
- | grep -v ^WPS \
- | grep -v WPX \
- > unusedcode.easy
-
-check: dev-install subsequentcheck
-
-subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install)
- $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
-
-debugrun:
- $(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
-
-endif # not clean or distclean
-
-
-#########################
-# help
-#
-.PHONY: help
-help:
- @cat $(SRCDIR)/solenv/gbuild/gbuild.help.txt
- @true
-
-#########################
-# fun
-#
-.PHONY: fun
-dmake_modules_count := $(words $(dmake_modules))
-gbuild_modules_count := $(words $(gbuild_modules))
-all_modules_count := $(words $(dmake_modules) $(gbuild_modules))
-fun:
- @echo Oh dear - you have still $(dmake_modules_count) dmake modules to convert [from $(all_modules_count)]
- @echo but wait you have already converted $(gbuild_modules_count) - congrats and keep going ...
- @true
-
# vim: set noet sw=4 ts=4:
diff --git a/Makefile.top b/Makefile.top
index d8227cb..5bd62f0 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -125,6 +125,7 @@ sw\
swext\
tail_build\
test\
+testtools\
toolkit\
tools\
translations\
@@ -235,7 +236,6 @@ soltools\
stax\
stlport\
sysui\
-testtools\
tomcat\
udm\
vigra\
commit b396546834a704b79a8be1e3a8e07b231e138c06
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date: Sat May 19 22:29:46 2012 +0200
cleaning up dmake stuff
Change-Id: I85d1ffef06028f8781a0406ea6e43b0e0406413c
diff --git a/testtools/inc/makefile.mk b/testtools/inc/makefile.mk
deleted file mode 100644
index 26dc958..0000000
--- a/testtools/inc/makefile.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=testtools
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/testtools/prj/build.lst b/testtools/prj/build.lst
index 0b8f340..76da8aa 100644
--- a/testtools/prj/build.lst
+++ b/testtools/prj/build.lst
@@ -1,8 +1,3 @@
tt testtools : cpputools io remotebridges stoc javaunohelper PYUNO:pyuno cli_ure offapi ure LIBXSLT:libxslt NULL
-tt testtools\inc nmake - all tt_inc NULL
-tt testtools\source\bridgetest nmake - all tt_bridgetest tt_bridgetest_idl tt_inc NULL
-tt testtools\source\bridgetest\cli nmake - w,vc7 tt_cli tt_bridgetest tt_bridgetest_idl tt_inc NULL
-tt testtools\source\bridgetest\idl nmake - all tt_bridgetest_idl tt_inc NULL
-tt testtools\com\sun\star\comp\bridge nmake - all tt_javaTestObjs tt_bridgetest_idl tt_inc NULL
-tt testtools\source\bridgetest\pyuno nmake - all tt_pyuno tt_bridgetest tt_inc NULL
-tt testtools\source\cliversioning nmake - all tt_cliver NULL
+tt testtools usr1 - all tt_mkout NULL
+tt testtools\prj nmake - all tt_prj NULL
diff --git a/testtools/source/bridgetest/cli/makefile.mk b/testtools/source/bridgetest/cli/makefile.mk
deleted file mode 100644
index 8965f1d..0000000
--- a/testtools/source/bridgetest/cli/makefile.mk
+++ /dev/null
@@ -1,202 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=testtools
-TARGET=$(ENFORCEDSHLPREFIX)cli_cpp_bridgetest.uno
-USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
-
-# disable caching to avoid stale objects
-# on version changes
-CCACHE_DISABLE=TRUE
-.EXPORT : CCACHE_DISABLE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE =
-CFLAGSENABLESYMBOLS:=-Z7
-# ------------------------------------------------------------------
-
-#These tests are for Windows only
-.IF "$(COM)" == "MSC" && "$(GUI)" == "WNT"
-
-.IF "$(CCNUMVER)" >= "001399999999"
-CFLAGSCXX += -clr:oldSyntax -AI $(OUT)$/bin -AI $(SOLARBINDIR)
-SHL1STDLIBS = \
- mscoree.lib \
- msvcmrt.lib
-.ELSE
-CFLAGSCXX += -clr -AI $(OUT)$/bin -AI $(SOLARBINDIR)
-SHL1STDLIBS = \
- mscoree.lib
-.ENDIF
-SLOFILES= \
- $(SLO)$/cli_cpp_bridgetest.obj
-
-SHL1OBJS = $(SLOFILES)
-
-SHL1TARGET = $(TARGET)
-
-SHL1DEF = $(MISC)$/$(SHL1TARGET).def
-DEF1NAME = $(SHL1TARGET)
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(COM)" == "MSC" && "$(GUI)" == "WNT"
-
-ALLTAR : $(BIN)$/cli_bridgetest_inprocess.exe
-
-#################################################################
-
-CLI_URE = $(SOLARBINDIR)$/cli_ure.dll
-CLI_URETYPES = $(SOLARBINDIR)$/cli_uretypes.dll
-CLI_BASETYPES = $(SOLARBINDIR)$/cli_basetypes.dll
-CLI_CPPUHELPER = $(SOLARBINDIR)$/cli_cppuhelper.dll
-CLI_OOOTYPES = $(SOLARBINDIR)$/cli_oootypes.dll
-CLI_TYPES_BRIDGETEST = $(BIN)$/cli_types_bridgetest.dll
-
-CSCFLAGS = -warnaserror+
-.IF "$(CCNUMVER)" <= "001399999999"
-VBC_FLAGS = -warnaserror+
-.ELSE
-VBC_FLAGS = -nowarn:42030 -warnaserror+
-.ENDIF
-.IF "$(debug)" != ""
-CSCFLAGS += -debug+ -checked+ -define:DEBUG -define:TRACE
-VBC_FLAGS += -debug+ -define:DEBUG=TRUE -define:TRACE=TRUE
-.ELSE
-CSCFLAGS += -optimize
-VBC_FLAGS += -optimize
-.ENDIF
-
-
-# C# ----------------------------------------------
-$(BIN)$/cli_cs_testobj.uno.dll : \
- cli_cs_testobj.cs \
- cli_cs_multi.cs \
- $(CLI_BASETYPES) \
- $(CLI_URETYPES) \
- $(CLI_URE)
- $(CSC) $(CSCFLAGS) -target:library -out:$@ \
- -reference:$(CLI_TYPES_BRIDGETEST) \
- -reference:$(CLI_URE) \
- -reference:$(CLI_BASETYPES) \
- -reference:$(CLI_URETYPES) \
- cli_cs_testobj.cs cli_cs_multi.cs
-
-$(BIN)$/cli_cs_bridgetest.uno.dll : \
- cli_cs_bridgetest.cs \
- $(CLI_BASETYPES) \
- $(CLI_URETYPES) \
- $(CLI_URE)
- $(CSC) $(CSCFLAGS) -target:library -out:$@ \
- -reference:$(CLI_TYPES_BRIDGETEST) \
- -reference:$(CLI_URETYPES) \
- -reference:$(CLI_BASETYPES) \
- -reference:$(CLI_URE) \
- -reference:System.dll \
- cli_cs_bridgetest.cs
-
-# Visual Basic ------------------------------------------
-$(BIN)$/cli_vb_bridgetest.uno.dll : \
- cli_vb_bridgetest.vb \
- $(CLI_BASETYPES) \
- $(CLI_URETYPES) \
- $(CLI_URE)
- $(VBC) $(VBC_FLAGS) \
- -target:library \
- -out:$@ \
- -reference:$(CLI_URETYPES) \
- -reference:$(CLI_BASETYPES) \
- -reference:$(CLI_URE) \
- -reference:$(CLI_TYPES_BRIDGETEST) \
- -reference:System.dll \
- -reference:System.Drawing.dll \
- -reference:System.Windows.Forms.dll \
- cli_vb_bridgetest.vb
-
-$(BIN)$/cli_vb_testobj.uno.dll : \
- cli_vb_testobj.vb \
- $(CLI_BASETYPES) \
- $(CLI_URETYPES) \
- $(CLI_URE)
- $(VBC) $(VBC_FLAGS) \
- -target:library \
- -out:$@ \
- -reference:$(CLI_BASETYPES) \
- -reference:$(CLI_URETYPES) \
- -reference:$(CLI_URE) \
- -reference:$(CLI_TYPES_BRIDGETEST) \
- -reference:System.dll \
- -reference:System.Drawing.dll \
- -reference:System.Windows.Forms.dll \
- cli_vb_testobj.vb
-
-$(MISC)$/copyassemblies.done .ERRREMOVE:
- $(GNUCOPY) $(CLI_CPPUHELPER) $(BIN)$/$(CLI_CPPUHELPER:f)
- $(GNUCOPY) $(CLI_BASETYPES) $(BIN)$/$(CLI_BASETYPES:f)
- $(GNUCOPY) $(CLI_URETYPES) $(BIN)$/$(CLI_URETYPES:f)
- $(GNUCOPY) $(CLI_URE) $(BIN)$/$(CLI_URE:f)
- $(GNUCOPY) $(CLI_OOOTYPES) $(BIN)$/$(CLI_OOOTYPES:f)
- $(TOUCH) $@
-
-$(BIN)$/cli_bridgetest_inprocess.exe : \
- cli_bridgetest_inprocess.cs \
- $(BIN)$/cli_cs_bridgetest.uno.dll \
- $(BIN)$/cli_cs_testobj.uno.dll \
- $(BIN)$/cli_vb_bridgetest.uno.dll \
- $(BIN)$/cli_vb_testobj.uno.dll \
- $(BIN)$/cli_cpp_bridgetest.uno.dll \
- $(MISC)$/copyassemblies.done \
- $(CLI_BASETYPES) \
- $(CLI_URETYPES) \
- $(CLI_URE) \
- $(CLI_CPPUHELPER)
- $(CSC) $(CSCFLAGS) -target:exe -out:$@ \
- -reference:$(CLI_TYPES_BRIDGETEST) \
- -reference:$(CLI_BASETYPES) \
- -reference:$(CLI_URETYPES) \
- -reference:$(CLI_URE) \
- -reference:$(CLI_CPPUHELPER) \
- -reference:$(BIN)$/cli_cs_bridgetest.uno.dll \
- -reference:$(BIN)$/cli_cs_testobj.uno.dll \
- -reference:$(BIN)$/cli_vb_bridgetest.uno.dll \
- -reference:$(BIN)$/cli_vb_testobj.uno.dll \
- -reference:$(BIN)$/cli_cpp_bridgetest.uno.dll \
- cli_bridgetest_inprocess.cs
- $(GNUCOPY) cli_bridgetest_inprocess.ini $(BIN)
-
-.ENDIF
-
diff --git a/testtools/source/bridgetest/idl/makefile.mk b/testtools/source/bridgetest/idl/makefile.mk
deleted file mode 100644
index 8b17273..0000000
--- a/testtools/source/bridgetest/idl/makefile.mk
+++ /dev/null
@@ -1,73 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..
-PRJNAME := testtools
-TARGET := bridgetest_idl
-
-.INCLUDE: settings.mk
-
-.INCLUDE: target.mk
-
-.IF "$(L10N_framework)"==""
-
-ALLTAR: $(MISC)$/$(TARGET).cppumaker.done $(MISC)$/$(TARGET).javamaker.done
-
-$(MISC)$/$(TARGET).cppumaker.done: $(BIN)$/bridgetest.rdb
- $(CPPUMAKER) -O$(INCCOM) -BUCR $< -X$(SOLARBINDIR)/types.rdb
- $(TOUCH) $@
-
-$(MISC)$/$(TARGET).javamaker.done: $(BIN)$/bridgetest.rdb
- $(JAVAMAKER) -O$(CLASSDIR) -BUCR -nD -X$(SOLARBINDIR)/types.rdb $<
- $(TOUCH) $@
-
-$(BIN)$/bridgetest.rdb: bridgetest.idl
- $(IDLC) -O$(MISC)$/$(TARGET) -I$(SOLARIDLDIR) -cid -we $<
- - $(RM) $@
- $(REGMERGE) $@ /UCR $(MISC)$/$(TARGET)$/bridgetest.urd
-
-.IF "$(GUI)" == "WNT"
-.IF "$(COM)" != "GCC"
-
-CLIMAKERFLAGS =
-.IF "$(debug)" != ""
-CLIMAKERFLAGS += --verbose
-.ENDIF
-
-ALLTAR: $(MISC)$/$(TARGET).cppumaker.done \
- $(MISC)$/$(TARGET).javamaker.done \
- $(BIN)$/cli_types_bridgetest.dll
-
-$(BIN)$/cli_types_bridgetest.dll: $(BIN)$/bridgetest.rdb
- $(CLIMAKER) $(CLIMAKERFLAGS) --out $@ -r $(SOLARBINDIR)$/cli_uretypes.dll \
- -X $(SOLARBINDIR)$/types.rdb $<
- $(TOUCH) $@
-
-.ENDIF
-.ENDIF # GUI, WNT
-.ENDIF # L10N_framework
-
diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk
deleted file mode 100644
index 3e31ba6..0000000
--- a/testtools/source/bridgetest/makefile.mk
+++ /dev/null
@@ -1,238 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=testtools
-TARGET=bridgetest
-USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-LIBTARGET=NO
-
-.INCLUDE: settings.mk
-
-.IF "$(L10N_framework)"==""
-
-DLLPRE = # no leading "lib" on .so files
-
-.IF "$(GUI)"=="WNT"
-BATCH_SUFFIX=.bat
-GIVE_EXEC_RIGHTS=@echo
-MY_URE_INTERNAL_JAVA_DIR=$(strip $(subst,\,/ file:///$(shell @$(WRAPCMD) echo $(SOLARBINDIR))))
-MY_LOCAL_CLASSDIR=$(strip $(subst,\,/ file:///$(shell $(WRAPCMD) echo $(PWD)/$(CLASSDIR)/)))
-.ELSE
-GIVE_EXEC_RIGHTS=chmod +x
-MY_URE_INTERNAL_JAVA_DIR=file://$(SOLARBINDIR)
-MY_LOCAL_CLASSDIR=file://$(PWD)/$(CLASSDIR)/
-.ENDIF
-
-my_components = bridgetest constructors cppobj
-.IF "$(SOLAR_JAVA)" != ""
-my_components += testComponent
-.END
-
-.IF "$(GUI)"=="WNT"
-.IF "$(compcheck)" != ""
-CFLAGSCXX += -DCOMPCHECK
-.ENDIF
-.ENDIF
-
-SLOFILES = \
- $(SLO)$/bridgetest.obj \
- $(SLO)$/cppobj.obj \
- $(SLO)$/currentcontextchecker.obj \
- $(SLO)$/multi.obj
-
-# ---- test ----
-
-LIB1TARGET=$(SLB)$/cppobj.lib
-LIB1OBJFILES= \
- $(SLO)$/cppobj.obj $(SLO)$/currentcontextchecker.obj $(SLO)$/multi.obj
-
-SHL1TARGET = $(ENFORCEDSHLPREFIX)cppobj.uno
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(SALLIB)
-
-SHL1LIBS= $(LIB1TARGET)
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-DEF1NAME= $(SHL1TARGET)
-.IF "$(GUI)"=="WNT"
-SHL1VERSIONMAP = $(SOLARENV)/src/component.map
-.ELSE # just a quick hack for GCC fdo#42865
-SHL1USE_EXPORTS = name
-.ENDIF
-
-# ---- test object ----
-
-LIB2TARGET=$(SLB)$/bridgetest.lib
-LIB2OBJFILES= \
- $(SLO)$/bridgetest.obj \
- $(SLO)$/currentcontextchecker.obj \
- $(SLO)$/multi.obj
-
-SHL2TARGET = $(ENFORCEDSHLPREFIX)bridgetest.uno
-SHL2STDLIBS= \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(SALLIB)
-
-SHL2LIBS= $(LIB2TARGET)
-SHL2DEF= $(MISC)$/$(SHL2TARGET).def
-DEF2NAME= $(SHL2TARGET)
-.IF "$(GUI)"=="WNT"
-SHL2VERSIONMAP = $(SOLARENV)/src/component.map
-.ELSE # just a quick hack for GCC fdo#42865
-SHL2USE_EXPORTS = name
-.ENDIF
-
-
-SHL3TARGET = $(ENFORCEDSHLPREFIX)constructors.uno
-SHL3OBJS = $(SLO)$/constructors.obj
-SHL3STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB)
-SHL3VERSIONMAP = $(SOLARENV)/src/component.map
-SHL3IMPLIB = i$(SHL3TARGET)
-DEF3NAME = $(SHL3TARGET)
-
-.IF "$(SOLAR_JAVA)" != ""
-JARFILES = java_uno.jar jurt.jar ridl.jar
-JAVATARGETS=\
- $(DLLDEST)$/bridgetest_javaserver$(BATCH_SUFFIX) \
- $(DLLDEST)$/bridgetest_inprocess_java$(BATCH_SUFFIX)
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-.ENDIF # L10N_framework
-
-.INCLUDE : target.mk
-.IF "$(L10N_framework)"==""
-ALLTAR: \
- runtest \
- $(DLLDEST)/services.rdb \
- $(DLLDEST)$/uno_types.rdb \
- $(DLLDEST)$/uno_services.rdb \
- $(DLLDEST)$/bridgetest_server$(BATCH_SUFFIX) \
- $(DLLDEST)$/bridgetest_client$(BATCH_SUFFIX) \
- $(JAVATARGETS)
-
-#################################################################
-
-runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \
- $(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN)
-.IF "$(CROSS_COMPILING)"!="YES"
-.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
- @echo "Mac OSX PPC GCC fails this test!, likely broken UNO bridge. Fix me."
-.ELSE
- cd $(DLLDEST) && $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/uno \
- -ro uno_services.rdb -ro uno_types.rdb \
- -s com.sun.star.test.bridge.BridgeTest -- \
- com.sun.star.test.bridge.CppTestObject
-.ENDIF
-.ENDIF
-
-$(DLLDEST)/services.rdb :
- $(COPY) $(SOLARXMLDIR)/ure/services.rdb $@
-
-$(DLLDEST)$/uno_types.rdb : $(SOLARBINDIR)$/udkapi.rdb
- echo $(DLLDEST)
- $(GNUCOPY) $(SOLARBINDIR)$/udkapi.rdb $@
- $(REGMERGE) $@ / $(BIN)$/bridgetest.rdb
-
-$(DLLDEST)$/bridgetest_client$(BATCH_SUFFIX) .ERRREMOVE: makefile.mk
- echo '$(AUGMENT_LIBRARY_PATH)' '$(SOLARBINDIR)'/uno -ro services.rdb \
- -ro uno_services.rdb -ro uno_types.rdb \
- -s com.sun.star.test.bridge.BridgeTest -- \
- -u \''uno:socket,host=127.0.0.1,port=2002;urp;test'\' > $@
- $(GIVE_EXEC_RIGHTS) $@
-
-$(DLLDEST)$/bridgetest_server$(BATCH_SUFFIX) .ERRREMOVE: makefile.mk
- echo '$(AUGMENT_LIBRARY_PATH)' '$(SOLARBINDIR)'/uno -ro uno_services.rdb -ro uno_types.rdb \
- -s com.sun.star.test.bridge.CppTestObject \
- -u \''uno:socket,host=127.0.0.1,port=2002;urp;test'\' --singleaccept \
- > $@
- $(GIVE_EXEC_RIGHTS) $@
-
-
-.IF "$(SOLAR_JAVA)" != ""
-# jar-files, which regcomp needs so that it can use java
-MY_JARS=java_uno.jar ridl.jar jurt.jar juh.jar
-
-# CLASSPATH, which regcomp needs to be run
-MY_CLASSPATH_TMP=$(foreach,i,$(MY_JARS) $(SOLARBINDIR)$/$i)$(PATH_SEPERATOR)$(XCLASSPATH)
-MY_CLASSPATH=$(strip $(subst,!,$(PATH_SEPERATOR) $(MY_CLASSPATH_TMP:s/ /!/)))$(PATH_SEPERATOR)..$/class
-
-# Use "127.0.0.1" instead of "localhost", see #i32281#:
-$(DLLDEST)$/bridgetest_javaserver$(BATCH_SUFFIX) : makefile.mk
- -rm -f $@
- echo java -classpath "$(MY_CLASSPATH)$(PATH_SEPERATOR)..$/class$/testComponent.jar" \
- com.sun.star.comp.bridge.TestComponentMain \""uno:socket,host=127.0.0.1,port=2002;urp;test"\" singleaccept > $@
- $(GIVE_EXEC_RIGHTS) $@
-
-$(DLLDEST)$/bridgetest_inprocess_java$(BATCH_SUFFIX) .ERRREMOVE: makefile.mk
- echo '$(AUGMENT_LIBRARY_PATH)' JAVA_HOME='$(JAVA_HOME)' \
- '$(SOLARBINDIR)'/uno -ro services.rdb -ro uno_services.rdb \
- -ro uno_types.rdb -s com.sun.star.test.bridge.BridgeTest \
- -env:URE_INTERNAL_JAVA_DIR=$(MY_URE_INTERNAL_JAVA_DIR) \
- -env:MY_CLASSDIR_URL=$(MY_LOCAL_CLASSDIR) \
- -- com.sun.star.test.bridge.JavaTestObject noCurrentContext > $@
- $(GIVE_EXEC_RIGHTS) $@
-.ENDIF
-
-$(DLLDEST)$/uno_services.rdb .ERRREMOVE : $(SOLARENV)/bin/packcomponents.xslt \
- $(MISC)/uno_services.input $(my_components:^"$(MISC)/":+".component")
- $(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
- $(SOLARENV)/bin/packcomponents.xslt $(MISC)/uno_services.input
-
-$(MISC)/uno_services.input :
- echo \
- '<list>$(my_components:^"<filename>":+".component</filename>")</list>' \
- > $@
-
-$(MISC)/bridgetest.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- bridgetest.component
- $(XSLTPROC) --nonet --stringparam uri './$(SHL2TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt bridgetest.component
-
-$(MISC)/constructors.component .ERRREMOVE : \
- $(SOLARENV)/bin/createcomponent.xslt constructors.component
- $(XSLTPROC) --nonet --stringparam uri './$(SHL3TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt constructors.component
-
-$(MISC)/cppobj.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- cppobj.component
- $(XSLTPROC) --nonet --stringparam uri './$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt cppobj.component
-
-$(MISC)/testComponent.component .ERRREMOVE : \
- $(SOLARENV)/bin/createcomponent.xslt testComponent.component
- $(XSLTPROC) --nonet --stringparam uri \
- 'vnd.sun.star.expand:$${{MY_CLASSDIR_URL}}testComponent.jar' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt testComponent.component
-
-.ENDIF # L10N_framework
commit db63d1a864c033373bdf35b0470c312251cc866c
Author: David Ostrovsky <David.Ostrovsky at gmx.de>
Date: Sat May 19 22:10:41 2012 +0200
prefix testtools libraries with testtools_ in Repository.mk
Change-Id: I0894b073b5263a45c9026ec55049ebeaf0770535
diff --git a/Repository.mk b/Repository.mk
index a113a6b..f3e6bcd 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -590,9 +590,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
endif
$(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
- cppobj \
- bridgetest \
- constructors \
acceptor \
binaryurp \
bootstrap \
@@ -607,6 +604,9 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
reflection \
stocservices \
streams \
+ testtools_cppobj \
+ testtools_bridgetest \
+ testtools_constructors \
textinstream \
textoutstream \
uuresolver \
@@ -647,7 +647,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
shlxthandler_common \
shlxthandler_common_x64 \
salcpprt \
- testtools_bridgetest \
+ testtools_bridgetest_s \
transex \
ulingu \
vclmain \
diff --git a/testtools/Library_bridgetest.mk b/testtools/Library_bridgetest.mk
index b2765f6..a8f8fa5 100644
--- a/testtools/Library_bridgetest.mk
+++ b/testtools/Library_bridgetest.mk
@@ -24,34 +24,34 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_Library_Library,bridgetest))
+$(eval $(call gb_Library_Library,testtools_bridgetest))
-$(eval $(call gb_Library_set_componentfile,bridgetest,testtools/source/bridgetest/bridgetest))
+$(eval $(call gb_Library_set_componentfile,testtools_bridgetest,testtools/source/bridgetest/bridgetest))
-$(eval $(call gb_Executable_set_include,bridgetest,\
+$(eval $(call gb_Executable_set_include,testtools_bridgetest,\
-I$(SRCDIR)/testtools/source/bridgetest \
$$(INCLUDE) \
))
-$(eval $(call gb_Library_use_internal_api,bridgetest,\
+$(eval $(call gb_Library_use_internal_api,testtools_bridgetest,\
bridgetest \
))
-$(eval $(call gb_Library_use_api,bridgetest,\
+$(eval $(call gb_Library_use_api,testtools_bridgetest,\
udkapi \
))
-$(eval $(call gb_Library_use_static_libraries,bridgetest,\
- testtools_bridgetest \
+$(eval $(call gb_Library_use_static_libraries,testtools_bridgetest,\
+ testtools_bridgetest_s \
))
-$(eval $(call gb_Library_use_libraries,bridgetest,\
+$(eval $(call gb_Library_use_libraries,testtools_bridgetest,\
cppu \
cppuhelper \
sal \
))
-$(eval $(call gb_Library_add_exception_objects,bridgetest,\
+$(eval $(call gb_Library_add_exception_objects,testtools_bridgetest,\
testtools/source/bridgetest/bridgetest \
))
diff --git a/testtools/Library_constructors.mk b/testtools/Library_constructors.mk
index abf273b..3de7008 100644
--- a/testtools/Library_constructors.mk
+++ b/testtools/Library_constructors.mk
@@ -24,30 +24,30 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_Library_Library,constructors))
+$(eval $(call gb_Library_Library,testtools_constructors))
-$(eval $(call gb_Library_set_componentfile,constructors,testtools/source/bridgetest/constructors))
+$(eval $(call gb_Library_set_componentfile,testtools_constructors,testtools/source/bridgetest/constructors))
-$(eval $(call gb_Executable_set_include,constructors,\
+$(eval $(call gb_Executable_set_include,testtools_constructors,\
-I$(SRCDIR)/testtools/source/bridgetest \
$$(INCLUDE) \
))
-$(eval $(call gb_Library_use_internal_api,constructors,\
+$(eval $(call gb_Library_use_internal_api,testtools_constructors,\
bridgetest \
))
-$(eval $(call gb_Library_use_api,constructors,\
+$(eval $(call gb_Library_use_api,testtools_constructors,\
udkapi \
))
-$(eval $(call gb_Library_use_libraries,constructors,\
+$(eval $(call gb_Library_use_libraries,testtools_constructors,\
cppu \
cppuhelper \
sal \
))
-$(eval $(call gb_Library_add_exception_objects,constructors,\
+$(eval $(call gb_Library_add_exception_objects,testtools_constructors,\
testtools/source/bridgetest/constructors \
))
diff --git a/testtools/Library_cppobj.mk b/testtools/Library_cppobj.mk
index 649f71a..0bbdf23 100644
--- a/testtools/Library_cppobj.mk
+++ b/testtools/Library_cppobj.mk
@@ -24,34 +24,34 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_Library_Library,cppobj))
+$(eval $(call gb_Library_Library,testtools_cppobj))
-$(eval $(call gb_Library_set_componentfile,cppobj,testtools/source/bridgetest/cppobj))
+$(eval $(call gb_Library_set_componentfile,testtools_cppobj,testtools/source/bridgetest/cppobj))
-$(eval $(call gb_Executable_set_include,cppobj,\
+$(eval $(call gb_Executable_set_include,testtools_cppobj,\
-I$(SRCDIR)/testtools/source/bridgetest \
$$(INCLUDE) \
))
-$(eval $(call gb_Library_use_internal_api,cppobj,\
+$(eval $(call gb_Library_use_internal_api,testtools_cppobj,\
bridgetest \
))
-$(eval $(call gb_Library_use_api,cppobj,\
+$(eval $(call gb_Library_use_api,testtools_cppobj,\
udkapi \
))
-$(eval $(call gb_Library_use_static_libraries,cppobj,\
- testtools_bridgetest \
+$(eval $(call gb_Library_use_static_libraries,testtools_cppobj,\
+ testtools_bridgetest_s \
))
-$(eval $(call gb_Library_use_libraries,cppobj,\
+$(eval $(call gb_Library_use_libraries,testtools_cppobj,\
cppu \
cppuhelper \
sal \
))
-$(eval $(call gb_Library_add_exception_objects,cppobj,\
+$(eval $(call gb_Library_add_exception_objects,testtools_cppobj,\
testtools/source/bridgetest/cppobj \
))
diff --git a/testtools/StaticLibrary_bridgetest.mk b/testtools/StaticLibrary_bridgetest.mk
index c3bde3c..ed96f34 100644
--- a/testtools/StaticLibrary_bridgetest.mk
+++ b/testtools/StaticLibrary_bridgetest.mk
@@ -25,22 +25,17 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_StaticLibrary_StaticLibrary,testtools_bridgetest))
+$(eval $(call gb_StaticLibrary_StaticLibrary,testtools_bridgetest_s))
-$(eval $(call gb_StaticLibrary_set_include,cppobj,\
- -I$(SRCDIR)/testtools/source/bridgetest \
- $$(INCLUDE) \
-))
-
-$(eval $(call gb_StaticLibrary_use_internal_api,testtools_bridgetest,\
+$(eval $(call gb_StaticLibrary_use_internal_api,testtools_bridgetest_s,\
bridgetest \
))
-$(eval $(call gb_StaticLibrary_use_api,testtools_bridgetest,\
+$(eval $(call gb_StaticLibrary_use_api,testtools_bridgetest_s,\
udkapi \
))
-$(eval $(call gb_StaticLibrary_add_exception_objects,testtools_bridgetest,\
+$(eval $(call gb_StaticLibrary_add_exception_objects,testtools_bridgetest_s,\
testtools/source/bridgetest/currentcontextchecker \
testtools/source/bridgetest/multi \
))
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list