diff options
Diffstat (limited to 'desktop/source')
28 files changed, 50 insertions, 1538 deletions
diff --git a/desktop/source/app/main.c b/desktop/source/app/main.c index 88610ba18ef9..b24d8187884c 100755 --- a/desktop/source/app/main.c +++ b/desktop/source/app/main.c @@ -26,8 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" - #include "sal/main.h" #include "sofficemain.h" diff --git a/desktop/source/app/makefile.mk b/desktop/source/app/makefile.mk deleted file mode 100755 index f905bd6ea296..000000000000 --- a/desktop/source/app/makefile.mk +++ /dev/null @@ -1,113 +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=desktop -TARGET=dkt -AUTOSEG=true -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : ../deployment/inc/dp_misc.mk - -.IF "$(ENABLE_GNOMEVFS)"=="TRUE" -CFLAGS+=-DGNOME_VFS_ENABLED -.ENDIF - -# .IF "$(OS)" == "WNT" -# .IF "$(COM)" == "GCC" -# DEPLOYMENTMISCLIB = -ldeploymentmisc$(DLLPOSTFIX) -# .ELSE -# DEPLOYMENTMISCLIB = ideploymentmisc$(DLLPOSTFIX).lib -# .ENDIF -# .ELSE -# DEPLOYMENTMISCLIB = -ldeploymentmisc$(DLLPOSTFIX) -# .ENDIF - -.IF "$(GUI)"=="WNT" || "$(GUIBASE)"=="aqua" || "$(ENABLE_SYSTRAY_GTK)"=="TRUE" -CFLAGS+=-DENABLE_QUICKSTART_APPLET -.ENDIF - -SHL1TARGET = sofficeapp -SHL1OBJS = \ - $(SLO)$/app.obj \ - $(SLO)$/appfirststart.obj \ - $(SLO)$/appinit.obj \ - $(SLO)$/appsys.obj \ - $(SLO)$/check_ext_deps.obj \ - $(SLO)$/cmdlineargs.obj \ - $(SLO)$/cmdlinehelp.obj \ - $(SLO)$/configinit.obj \ - $(SLO)$/desktopcontext.obj \ - $(SLO)$/desktopresid.obj \ - $(SLO)$/dispatchwatcher.obj \ - $(SLO)$/langselect.obj \ - $(SLO)$/lockfile.obj \ - $(SLO)$/lockfile2.obj \ - $(SLO)$/officeipcthread.obj \ - $(SLO)$/sofficemain.obj \ - $(SLO)$/userinstall.obj - -SHL1LIBS = $(SLB)$/mig.lib - -SHL1STDLIBS = \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(DEPLOYMENTMISCLIB) \ - $(I18NISOLANGLIB) \ - $(SALLIB) \ - $(SFXLIB) \ - $(SVLLIB) \ - $(SVTOOLLIB) \ - $(TKLIB) \ - $(TOOLSLIB) \ - $(UCBHELPERLIB) \ - $(UNOTOOLSLIB) \ - $(VCLLIB) \ - -SHL1VERSIONMAP = version.map -SHL1IMPLIB = i$(SHL1TARGET) -DEF1NAME = $(SHL1TARGET) - -OBJFILES = \ - $(OBJ)$/copyright_ascii_ooo.obj \ - $(OBJ)$/main.obj \ - $(OBJ)$/copyright_ascii_sun.obj - -SLOFILES = $(SHL1OBJS) - -SRS1NAME= desktop -SRC1FILES= desktop.src - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index 14c044e82a23..4d093b9122f2 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -29,6 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_desktop.hxx" +#include "desktopdllapi.h" + #include "app.hxx" #include "cmdlineargs.hxx" #include "cmdlinehelp.hxx" @@ -40,7 +42,7 @@ int SVMain(); // -=-= main() -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -extern "C" int soffice_main() +extern "C" int DESKTOP_DLLPUBLIC soffice_main() { tools::extendApplicationEnvironment(); diff --git a/desktop/source/app/sofficemain.h b/desktop/source/app/sofficemain.h index 539988834a02..bbe86d54e2bc 100755 --- a/desktop/source/app/sofficemain.h +++ b/desktop/source/app/sofficemain.h @@ -29,13 +29,13 @@ #ifndef INCLUDED_DESKTOP_SOURCE_APP_SOFFICEMAIN_H #define INCLUDED_DESKTOP_SOURCE_APP_SOFFICEMAIN_H -#include "sal/config.h" +#include "desktopdllapi.h" #if defined __cplusplus extern "C" { #endif -int soffice_main(void); +int DESKTOP_DLLPUBLIC soffice_main(void); #if defined __cplusplus } diff --git a/desktop/source/deployment/gui/makefile.mk b/desktop/source/deployment/gui/makefile.mk deleted file mode 100755 index eed15ac25be7..000000000000 --- a/desktop/source/deployment/gui/makefile.mk +++ /dev/null @@ -1,109 +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 = desktop -TARGET = deploymentgui -ENABLE_EXCEPTIONS = TRUE -NO_BSYMBOLIC = TRUE -USE_PCH := -ENABLE_PCH := -PRJINC:=..$/.. - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk -DLLPRE = - -SLOFILES = \ - $(SLO)$/dp_gui_service.obj \ - $(SLO)$/dp_gui_extlistbox.obj \ - $(SLO)$/dp_gui_dialog2.obj \ - $(SLO)$/dp_gui_theextmgr.obj \ - $(SLO)$/license_dialog.obj \ - $(SLO)$/dp_gui_dependencydialog.obj \ - $(SLO)$/dp_gui_thread.obj \ - $(SLO)$/dp_gui_updatedialog.obj \ - $(SLO)$/dp_gui_updateinstalldialog.obj \ - $(SLO)$/dp_gui_autoscrolledit.obj \ - $(SLO)$/dp_gui_extensioncmdqueue.obj \ - $(SLO)$/descedit.obj - -SHL1TARGET = $(TARGET)$(DLLPOSTFIX).uno -SHL1VERSIONMAP = $(SOLARENV)/src/component.map - -SHL1STDLIBS = \ - $(SALLIB) \ - $(SALHELPERLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(UCBHELPERLIB) \ - $(COMPHELPERLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(I18NISOLANGLIB) \ - $(TKLIB) \ - $(VCLLIB) \ - $(SVTOOLLIB) \ - $(SVLLIB) \ - $(SVXLIB) \ - $(SVXCORELIB) \ - $(SFXLIB) \ - $(DEPLOYMENTMISCLIB) \ - $(OLE32LIB) - -SHL1DEPN = -SHL1IMPLIB = i$(TARGET) -SHL1LIBS = $(SLB)$/$(TARGET).lib -SHL1DEF = $(MISC)$/$(SHL1TARGET).def - -DEF1NAME = $(SHL1TARGET) - -SRS1NAME = $(TARGET) -SRC1FILES = \ - dp_gui_dialog.src \ - dp_gui_dialog2.src \ - dp_gui_backend.src \ - dp_gui_dependencydialog.src \ - dp_gui_updatedialog.src \ - dp_gui_versionboxes.src \ - dp_gui_updateinstalldialog.src - -RESLIB1NAME = $(TARGET) -RESLIB1SRSFILES = $(SRS)$/$(TARGET).srs -RESLIB1IMAGES= $(PRJ)$/res - -.INCLUDE : target.mk - - -ALLTAR : $(MISC)/deploymentgui.component - -$(MISC)/deploymentgui.component .ERRREMOVE : \ - $(SOLARENV)/bin/createcomponent.xslt deploymentgui.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt deploymentgui.component diff --git a/desktop/source/deployment/makefile.mk b/desktop/source/deployment/makefile.mk deleted file mode 100755 index bffc8241c300..000000000000 --- a/desktop/source/deployment/makefile.mk +++ /dev/null @@ -1,109 +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 = desktop -TARGET = deployment -ENABLE_EXCEPTIONS = TRUE -NO_BSYMBOLIC = TRUE - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk - -CFLAGS+= $(SYSTEM_DB_CFLAGS) - -INCPRE += inc - -DLLPRE = - -SHL1TARGET = $(TARGET)$(DLLPOSTFIX).uno -SHL1VERSIONMAP = $(SOLARENV)/src/component.map - -SHL1LIBS = \ - $(SLB)$/deployment_manager.lib \ - $(SLB)$/deployment_registry.lib \ - $(SLB)$/deployment_registry_executable.lib \ - $(SLB)$/deployment_registry_component.lib \ - $(SLB)$/deployment_registry_configuration.lib \ - $(SLB)$/deployment_registry_package.lib \ - $(SLB)$/deployment_registry_script.lib \ - $(SLB)$/deployment_registry_sfwk.lib \ - $(SLB)$/deployment_registry_help.lib - -SHL1OBJS = \ - $(SLO)$/dp_log.obj \ - $(SLO)$/dp_persmap.obj \ - $(SLO)$/dp_services.obj \ - $(SLO)$/dp_xml.obj - -SHL1STDLIBS = \ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(UCBHELPERLIB) \ - $(COMPHELPERLIB) \ - $(TOOLSLIB) \ - $(XMLSCRIPTLIB) \ - $(SVLLIB) \ - $(UNOTOOLSLIB) \ - $(DEPLOYMENTMISCLIB) \ - $(HELPLINKERLIB) - -SHL1DEPN = -SHL1IMPLIB = i$(TARGET) -SHL1DEF = $(MISC)$/$(SHL1TARGET).def - -DEF1NAME = $(SHL1TARGET) - -SLOFILES = $(LIB1OBJFILES) - -RESLIB1NAME = $(TARGET) - -RESLIB1SRSFILES = \ - $(SRS)$/deployment_registry_configuration.srs \ - $(SRS)$/deployment_registry_component.srs \ - $(SRS)$/deployment_registry_script.srs \ - $(SRS)$/deployment_registry_sfwk.srs \ - $(SRS)$/deployment_registry_package.srs \ - $(SRS)$/deployment_registry_help.srs \ - $(SRS)$/deployment_registry.srs \ - $(SRS)$/deployment_manager.srs \ - $(SRS)$/deployment_unopkg.srs - -RESLIB1SRSFILES += $(SRS)$/deployment_misc.srs - -.INCLUDE : target.mk - - -ALLTAR : $(MISC)/deployment.component - -$(MISC)/deployment.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - deployment.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt deployment.component diff --git a/desktop/source/deployment/manager/makefile.mk b/desktop/source/deployment/manager/makefile.mk deleted file mode 100755 index 022f5e27e554..000000000000 --- a/desktop/source/deployment/manager/makefile.mk +++ /dev/null @@ -1,53 +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 = desktop -TARGET = deployment_manager -ENABLE_EXCEPTIONS = TRUE - -.INCLUDE : settings.mk - -CFLAGS+= $(SYSTEM_DB_CFLAGS) - -SRS1NAME = $(TARGET) -SRC1FILES = \ - dp_manager.src - -SLOFILES = \ - $(SLO)$/dp_activepackages.obj \ - $(SLO)$/dp_manager.obj \ - $(SLO)$/dp_managerfac.obj \ - $(SLO)$/dp_informationprovider.obj \ - $(SLO)$/dp_extensionmanager.obj \ - $(SLO)$/dp_commandenvironments.obj \ - $(SLO)$/dp_properties.obj - -.INCLUDE : ..$/target.pmk -.INCLUDE : target.mk - diff --git a/desktop/source/deployment/misc/makefile.mk b/desktop/source/deployment/misc/makefile.mk deleted file mode 100755 index 9c0b33d36698..000000000000 --- a/desktop/source/deployment/misc/makefile.mk +++ /dev/null @@ -1,78 +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 = desktop -TARGET = deployment_misc -USE_DEFFILE = TRUE -ENABLE_EXCEPTIONS = TRUE -VISIBILITY_HIDDEN=TRUE - -.INCLUDE : settings.mk - -# Reduction of exported symbols: -CDEFS += -DDESKTOP_DEPLOYMENTMISC_DLLIMPLEMENTATION - -CFLAGS+= $(SYSTEM_DB_CFLAGS) - -SRS1NAME = $(TARGET) -SRC1FILES = \ - dp_misc.src - -SHL1TARGET = deploymentmisc$(DLLPOSTFIX) -SHL1OBJS = \ - $(SLO)$/dp_misc.obj \ - $(SLO)$/dp_resource.obj \ - $(SLO)$/dp_identifier.obj \ - $(SLO)$/dp_interact.obj \ - $(SLO)$/dp_ucb.obj \ - $(SLO)$/db.obj \ - $(SLO)$/dp_version.obj \ - $(SLO)$/dp_descriptioninfoset.obj \ - $(SLO)$/dp_dependencies.obj \ - $(SLO)$/dp_platform.obj \ - $(SLO)$/dp_update.obj - -SHL1STDLIBS = \ - $(BERKELEYLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(TOOLSLIB) \ - $(UCBHELPERLIB) \ - $(UNOTOOLSLIB) \ - $(XMLSCRIPTLIB) \ - $(COMPHELPERLIB) -SHL1IMPLIB = i$(SHL1TARGET) -DEF1NAME = $(SHL1TARGET) - -SLOFILES = $(SHL1OBJS) - -.INCLUDE : ..$/target.pmk -.INCLUDE : target.mk - diff --git a/desktop/source/deployment/registry/component/makefile.mk b/desktop/source/deployment/registry/component/makefile.mk deleted file mode 100755 index b7ee5c203cd5..000000000000 --- a/desktop/source/deployment/registry/component/makefile.mk +++ /dev/null @@ -1,48 +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 = desktop -TARGET = deployment_registry_component -ENABLE_EXCEPTIONS = TRUE - -.INCLUDE : settings.mk - -SRS1NAME = $(TARGET) -SRC1FILES = \ - dp_component.src - -INCPRE += ..$/..$/inc - -SLOFILES = \ - $(SLO)$/dp_component.obj \ - $(SLO)$/dp_compbackenddb.obj - -.INCLUDE : ..$/..$/target.pmk -.INCLUDE : target.mk - diff --git a/desktop/source/deployment/registry/configuration/makefile.mk b/desktop/source/deployment/registry/configuration/makefile.mk deleted file mode 100755 index 1fb637ef8e3a..000000000000 --- a/desktop/source/deployment/registry/configuration/makefile.mk +++ /dev/null @@ -1,50 +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 = desktop -TARGET = deployment_registry_configuration -ENABLE_EXCEPTIONS = TRUE - -INCPRE += ..$/..$/inc - -.INCLUDE : settings.mk - -CFLAGS+= $(SYSTEM_DB_CFLAGS) - -SRS1NAME = $(TARGET) -SRC1FILES = \ - dp_configuration.src - -SLOFILES = \ - $(SLO)$/dp_configuration.obj \ - $(SLO)$/dp_configurationbackenddb.obj - -.INCLUDE : ..$/..$/target.pmk -.INCLUDE : target.mk - diff --git a/desktop/source/deployment/registry/executable/makefile.mk b/desktop/source/deployment/registry/executable/makefile.mk deleted file mode 100755 index 81b2baa44e5d..000000000000 --- a/desktop/source/deployment/registry/executable/makefile.mk +++ /dev/null @@ -1,44 +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 = desktop -TARGET = deployment_registry_executable -ENABLE_EXCEPTIONS = TRUE - -.INCLUDE : settings.mk - -INCPRE += ..$/..$/inc - -SLOFILES = \ - $(SLO)$/dp_executable.obj \ - $(SLO)$/dp_executablebackenddb.obj - -.INCLUDE : ..$/..$/target.pmk -.INCLUDE : target.mk - diff --git a/desktop/source/deployment/registry/help/makefile.mk b/desktop/source/deployment/registry/help/makefile.mk deleted file mode 100755 index 81778bf728c0..000000000000 --- a/desktop/source/deployment/registry/help/makefile.mk +++ /dev/null @@ -1,50 +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 = desktop -TARGET = deployment_registry_help -ENABLE_EXCEPTIONS = TRUE - -INCPRE += ..$/..$/inc - -.INCLUDE : settings.mk - -CFLAGS+= $(SYSTEM_DB_CFLAGS) - -SRS1NAME = $(TARGET) -SRC1FILES = \ - dp_help.src - -SLOFILES = \ - $(SLO)$/dp_help.obj \ - $(SLO)$/dp_helpbackenddb.obj - -.INCLUDE : ..$/..$/target.pmk -.INCLUDE : target.mk - diff --git a/desktop/source/deployment/registry/makefile.mk b/desktop/source/deployment/registry/makefile.mk deleted file mode 100755 index e45cec272ca7..000000000000 --- a/desktop/source/deployment/registry/makefile.mk +++ /dev/null @@ -1,49 +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 = desktop -TARGET = deployment_registry -ENABLE_EXCEPTIONS = TRUE - -.INCLUDE : settings.mk - -SRS1NAME = $(TARGET) -SRC1FILES = \ - dp_registry.src - -INCPRE += inc - -SLOFILES = \ - $(SLO)$/dp_backend.obj \ - $(SLO)$/dp_registry.obj \ - $(SLO)$/dp_backenddb.obj - -.INCLUDE : ..$/target.pmk -.INCLUDE : target.mk - diff --git a/desktop/source/deployment/registry/package/makefile.mk b/desktop/source/deployment/registry/package/makefile.mk deleted file mode 100755 index 203ce176d289..000000000000 --- a/desktop/source/deployment/registry/package/makefile.mk +++ /dev/null @@ -1,48 +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 = desktop -TARGET = deployment_registry_package -ENABLE_EXCEPTIONS = TRUE - -.INCLUDE : settings.mk - -SRS1NAME = $(TARGET) -SRC1FILES = \ - dp_package.src - -INCPRE += ..$/..$/inc - -SLOFILES = \ - $(SLO)$/dp_package.obj \ - $(SLO)$/dp_extbackenddb.obj - -.INCLUDE : ..$/..$/target.pmk -.INCLUDE : target.mk - diff --git a/desktop/source/deployment/registry/script/makefile.mk b/desktop/source/deployment/registry/script/makefile.mk deleted file mode 100755 index 708def358021..000000000000 --- a/desktop/source/deployment/registry/script/makefile.mk +++ /dev/null @@ -1,49 +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 = desktop -TARGET = deployment_registry_script -ENABLE_EXCEPTIONS = TRUE - -.INCLUDE : settings.mk - -SRS1NAME = $(TARGET) -SRC1FILES = \ - dp_script.src - -INCPRE += ..$/..$/inc - -SLOFILES = \ - $(SLO)$/dp_script.obj \ - $(SLO)$/dp_lib_container.obj \ - $(SLO)$/dp_scriptbackenddb.obj - -.INCLUDE : ..$/..$/target.pmk -.INCLUDE : target.mk - diff --git a/desktop/source/deployment/registry/sfwk/makefile.mk b/desktop/source/deployment/registry/sfwk/makefile.mk deleted file mode 100755 index a052296d5c21..000000000000 --- a/desktop/source/deployment/registry/sfwk/makefile.mk +++ /dev/null @@ -1,48 +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 = desktop -TARGET = deployment_registry_sfwk -ENABLE_EXCEPTIONS = TRUE - -.INCLUDE : settings.mk -SRS1NAME = $(TARGET) - -SRC1FILES = \ - dp_sfwk.src - -INCPRE += ..$/..$/inc - -SLOFILES = \ - $(SLO)$/dp_parceldesc.obj \ - $(SLO)$/dp_sfwk.obj - -.INCLUDE : ..$/..$/target.pmk -.INCLUDE : target.mk - diff --git a/desktop/source/deployment/target.pmk b/desktop/source/deployment/target.pmk deleted file mode 100755 index 82b41766b253..000000000000 --- a/desktop/source/deployment/target.pmk +++ /dev/null @@ -1,36 +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. -# -#************************************************************************* - -.IF "$(debug)" != "" - -# MSVC: no inlining -.IF "$(COM)" == "MSC" -CFLAGS += /Ob0 -.ENDIF - -.ENDIF - diff --git a/desktop/source/deployment/unopkg/makefile.mk b/desktop/source/deployment/unopkg/makefile.mk deleted file mode 100755 index 64fe173f4597..000000000000 --- a/desktop/source/deployment/unopkg/makefile.mk +++ /dev/null @@ -1,44 +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 = desktop -TARGET = deployment_unopkg -ENABLE_EXCEPTIONS = TRUE - -.INCLUDE : settings.mk - -SRS1NAME = $(TARGET) -SRC1FILES = \ - unopkg.src - -SLOFILES = - -.INCLUDE : ..$/target.pmk -.INCLUDE : target.mk - diff --git a/desktop/source/inc/desktopdllapi.h b/desktop/source/inc/desktopdllapi.h new file mode 100644 index 000000000000..a97f4d429a04 --- /dev/null +++ b/desktop/source/inc/desktopdllapi.h @@ -0,0 +1,41 @@ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * Major Contributor(s): + * Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer) + * + * All Rights Reserved. + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#ifndef INCLUDED_DESKTOP_SOURCE_INC_DESKTOPDLLAPI_H + +#include <sal/config.h> +#include <sal/types.h> + +#if defined(DESKTOP_DLLIMPLEMENTATION) +# define DESKTOP_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +# define DESKTOP_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif + +#endif + +/* vim: set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/migration/makefile.mk b/desktop/source/migration/makefile.mk deleted file mode 100755 index b20b4c57974f..000000000000 --- a/desktop/source/migration/makefile.mk +++ /dev/null @@ -1,52 +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=desktop -TARGET=mig -AUTOSEG=true -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -RSCEXTINC=..$/app - -# hacky - is no define -CDEFS+=-I..$/app -CDEFS+=-I$(PRJ)/inc - -SLOFILES = \ - $(SLO)$/migration.obj - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk diff --git a/desktop/source/migration/services/makefile.mk b/desktop/source/migration/services/makefile.mk deleted file mode 100755 index f74dec646b1d..000000000000 --- a/desktop/source/migration/services/makefile.mk +++ /dev/null @@ -1,131 +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=desktop -TARGET = migrationoo2.uno -ENABLE_EXCEPTIONS=TRUE -COMP1TYPELIST = migrationoo2 -LIBTARGET=NO - -# --- Settings ----------------------------------------------------- - -.INCLUDE : ..$/..$/deployment/inc/dp_misc.mk -.INCLUDE : settings.mk -DLLPRE = - -# ------------------------------------------------------------------ - -.INCLUDE : cppumaker.mk - -CFLAGS+= $(SYSTEM_DB_CFLAGS) - -SLOFILES= \ - $(SLO)$/jvmfwk.obj \ - $(SLO)$/cexports.obj \ - $(SLO)$/basicmigration.obj \ - $(SLO)$/wordbookmigration.obj \ - $(SLO)$/autocorrmigration.obj \ - $(SLO)$/oo3extensionmigration.obj \ - $(SLO)$/cexportsoo3.obj - -SHL1OBJS= \ - $(SLO)$/jvmfwk.obj \ - $(SLO)$/cexports.obj \ - $(SLO)$/basicmigration.obj \ - $(SLO)$/wordbookmigration.obj \ - $(SLO)$/autocorrmigration.obj - -SHL1TARGET=$(TARGET) -SHL1VERSIONMAP = $(SOLARENV)/src/component.map - -SHL1STDLIBS= \ - $(DEPLOYMENTMISCLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) \ - $(UCBHELPERLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(I18NISOLANGLIB) \ - $(JVMFWKLIB) \ - $(XMLSCRIPTLIB) \ - $(BERKELEYLIB) - -SHL1DEPN= -SHL1IMPLIB=imigrationoo2 -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) - -COMP2TYPELIST = migrationoo3 -SHL2TARGET=migrationoo3.uno -SHL2VERSIONMAP = $(SOLARENV)/src/component.map - -SHL2OBJS= \ - $(SLO)$/cexportsoo3.obj \ - $(SLO)$/oo3extensionmigration.obj - -SHL2STDLIBS= \ - $(DEPLOYMENTMISCLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(SALLIB) \ - $(UCBHELPERLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(I18NISOLANGLIB) \ - $(JVMFWKLIB) \ - $(XMLSCRIPTLIB) \ - $(BERKELEYLIB) - -SHL2DEPN= -SHL2IMPLIB=imigrationoo3 -SHL2DEF=$(MISC)$/$(SHL2TARGET).def - -DEF2NAME=$(SHL2TARGET) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/migrationoo3.component - -$(MISC)/migrationoo3.component .ERRREMOVE : \ - $(SOLARENV)/bin/createcomponent.xslt migrationoo3.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt migrationoo3.component - -ALLTAR : $(MISC)/migrationoo2.component - -$(MISC)/migrationoo2.component .ERRREMOVE : \ - $(SOLARENV)/bin/createcomponent.xslt migrationoo2.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt migrationoo2.component diff --git a/desktop/source/offacc/makefile.mk b/desktop/source/offacc/makefile.mk deleted file mode 100755 index 809c28414bef..000000000000 --- a/desktop/source/offacc/makefile.mk +++ /dev/null @@ -1,70 +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=desktop -TARGET=offacc -LIBTARGET=NO - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -SLOFILES = $(SLO)$/acceptor.obj - -SHL1DEPN= makefile.mk -SHL1OBJS= $(SLOFILES) - -SHL1TARGET= $(TARGET)$(DLLPOSTFIX) -SHL1IMPLIB= i$(TARGET) - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -SHL1STDLIBS= \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - - -ALLTAR : $(MISC)/offacc.component - -$(MISC)/offacc.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - offacc.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt offacc.component diff --git a/desktop/source/pagein/makefile.mk b/desktop/source/pagein/makefile.mk deleted file mode 100755 index 1125e45b1a41..000000000000 --- a/desktop/source/pagein/makefile.mk +++ /dev/null @@ -1,169 +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=desktop -TARGET=pagein - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -.INCLUDE .IGNORE : icuversion.mk - -# --- Targets ------------------------------------------------------ - -ALL: \ - $(MISC)$/$(TARGET)-calc \ - $(MISC)$/$(TARGET)-draw \ - $(MISC)$/$(TARGET)-impress \ - $(MISC)$/$(TARGET)-writer \ - $(MISC)$/$(TARGET)-common \ - ALLTAR - -.INCLUDE : target.mk - -ICUDLLPOST=$(DLLPOST).$(ICU_MAJOR)$(ICU_MINOR) -UDKDLLPOST=$(DLLPOST).$(UDK_MAJOR) -UNODLLPOST=.uno$(DLLPOST) -DFTDLLPOST=$(DLLPOSTFIX)$(DLLPOST) # Default - -URELIBPATH=..$/ure-link$/lib -UREMISCPATH=..$/ure-link$/share$/misc - -$(MISC)$/$(TARGET)-calc : makefile.mk - @echo Making: $@ - @-echo $(DLLPRE)sc$(DFTDLLPOST) > $@ - @-echo $(DLLPRE)scui$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)svx$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)svxcore$(DFTDLLPOST) >> $@ - -$(MISC)$/$(TARGET)-draw : makefile.mk - @echo Making: $@ - @-echo $(DLLPRE)sd$(DFTDLLPOST) > $@ - @-echo $(DLLPRE)sdui$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)svx$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)svxcore$(DFTDLLPOST) >> $@ - -$(MISC)$/$(TARGET)-impress : makefile.mk - @echo Making: $@ - @-echo $(DLLPRE)sd$(DFTDLLPOST) > $@ - @-echo $(DLLPRE)sdui$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)svx$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)svxcore$(DFTDLLPOST) >> $@ - -$(MISC)$/$(TARGET)-writer : makefile.mk - @echo Making: $@ - @-echo $(DLLPRE)sw$(DFTDLLPOST) > $@ - @-echo $(DLLPRE)swui$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)svx$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)svxcore$(DFTDLLPOST) >> $@ - -# sorted in approx. reverse load order (ld.so.1) -$(MISC)$/$(TARGET)-common : makefile.mk - @echo Making: $@ - @-echo i18npool$(UNODLLPOST) > $@ -.IF "$(SYSTEM_ICU)" != "YES" - @-echo $(DLLPRE)icui18n$(ICUDLLPOST) >> $@ - @-echo $(DLLPRE)icule$(ICUDLLPOST) >> $@ - @-echo $(DLLPRE)icuuc$(ICUDLLPOST) >> $@ -# @-echo $(DLLPRE)icudata$(ICUDLLPOST) >> $@ - a huge dll, almost none of it used -.ENDIF # SYSTEM_ICU -# - @-echo $(DLLPRE)lng$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)xo$(DFTDLLPOST) >> $@ -# - - @-echo $(DLLPRE)fwe$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)fwk$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)fwi$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)fwl$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)package2$(DLLPOST) >> $@ - @-echo $(DLLPRE)ucpfile1$(DLLPOST) >> $@ - @-echo $(DLLPRE)ucb1$(DLLPOST) >> $@ - @-echo configmgr$(UNODLLPOST) >> $@ -# - @-echo $(DLLPRE)vclplug_gen$(DFTDLLPOST) >> $@ -.IF "$(ENABLE_GTK)" != "" - @-echo $(DLLPRE)vclplug_gtk$(DFTDLLPOST) >> $@ -.ENDIF # ENABLE_GTK -.IF "$(ENABLE_KDE)" != "" - @-echo $(DLLPRE)vclplug_kde$(DFTDLLPOST) >> $@ -.ENDIF # ENABLE_KDE -# - @-echo $(DLLPRE)basegfx$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)sot$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)xcr$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)sb$(DFTDLLPOST) >> $@ -# -# uno runtime environment -# - @-echo $(URELIBPATH)$/stocservices$(UNODLLPOST) >> $@ - @-echo $(URELIBPATH)$/bootstrap$(UNODLLPOST) >> $@ - @-echo $(URELIBPATH)$/$(DLLPRE)reg$(UDKDLLPOST) >> $@ - @-echo $(URELIBPATH)$/$(DLLPRE)store$(UDKDLLPOST) >> $@ - @-echo $(URELIBPATH)$/reflection$(UNODLLPOST) >> $@ - @-echo $(URELIBPATH)$/$(DLLPRE)uno_cppuhelper$(COMID)$(UDKDLLPOST) >> $@ - @-echo $(URELIBPATH)$/$(DLLPRE)uno_cppu$(UDKDLLPOST) >> $@ - @-echo $(URELIBPATH)$/$(DLLPRE)uno_sal$(UDKDLLPOST) >> $@ -# - @-echo $(DLLPRE)ucbhelper$(UCBHELPER_MAJOR)$(COMID)$(DLLPOST) >> $@ - @-echo $(DLLPRE)comphelp$(COMPHLP_MAJOR)$(COMID)$(DLLPOST) >> $@ - @-echo $(DLLPRE)tl$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)utl$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)svl$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)vcl$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)tk$(DFTDLLPOST) >> $@ - @-echo $(UREMISCPATH)$/types.rdb >> $@ - @-echo services.rdb >> $@ - @-echo oovbaapi.rdb >> $@ - @-echo deployment$(DLLPOSTFIX)$(UNODLLPOST) >> $@ - @-echo $(DLLPRE)deploymentmisc$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)ucb1$(DLLPOST) >> $@ - @-echo $(DLLPRE)xstor$(DLLPOST) >> $@ - @-echo $(DLLPRE)package2$(DLLPOST) >> $@ - @-echo $(DLLPRE)filterconfig1$(DLLPOST) >> $@ - @-echo $(DLLPRE)uui$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)lng$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)svt$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)spl$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)basegfx$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)avmedia$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)helplinker$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)vclplug_gen$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)icule$(ICUDLLPOST) >> $@ - @-echo sax$(UNODLLPOST) >> $@ - @-echo gconfbe1$(UNODLLPOST) >> $@ - @-echo fsstorage$(UNODLLPOST) >> $@ - @-echo desktopbe1$(UNODLLPOST) >> $@ - @-echo localebe1$(UNODLLPOST) >> $@ - @-echo ucpexpand1$(UNODLLPOST) >> $@ -# stoc bits - @-echo $(DLLPRE)sfx$(DFTDLLPOST) >> $@ - @-echo $(DLLPRE)sofficeapp$(DLLPOST) >> $@ - diff --git a/desktop/source/pkgchk/unopkg/makefile.mk b/desktop/source/pkgchk/unopkg/makefile.mk deleted file mode 100755 index e96cf60f0f42..000000000000 --- a/desktop/source/pkgchk/unopkg/makefile.mk +++ /dev/null @@ -1,98 +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 = desktop -TARGET = unopkg -TARGETTYPE = GUI -ENABLE_EXCEPTIONS = TRUE -LIBTARGET=NO - -PRJINC += ..$/..$/deployment ..$/.. -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/source$/deployment$/inc$/dp_misc.mk - -CFLAGS+= $(SYSTEM_DB_CFLAGS) - -.IF "$(LINK_SO)"!="" -APP1TARGET = so$/unopkg -APP1OBJS = $(OBJFILES) -APP1STDLIBS = $(SALLIB) $(UNOPKGAPPLIB) -APP1DEPN = $(SHL1TARGETN) -APP1NOSAL = TRUE -APP1RPATH = BRAND -.IF "$(OS)" == "WNT" -APP1ICON = $(SOLARRESDIR)$/icons/so9_main_app.ico -APP1LINKRES = $(MISC)$/$(TARGET)1.res -.ENDIF -.ENDIF # "$(LINK_SO)"!="" - -APP2TARGET = unopkg -APP2OBJS = $(OBJFILES) -APP2STDLIBS = $(SALLIB) $(UNOPKGAPPLIB) -APP2DEPN = $(SHL1TARGETN) -APP2NOSAL = TRUE -APP2RPATH = BRAND -.IF "$(OS)" == "WNT" -APP2ICON = $(SOLARRESDIR)$/icons/ooo3_main_app.ico -APP2LINKRES = $(MISC)$/$(TARGET)2.res -.ENDIF - -SHL1TARGET = unopkgapp -SHL1OBJS = $(SLOFILES) $(SLO)$/lockfile.obj -SHL1STDLIBS = \ - $(SALLIB) \ - $(CPPULIB) \ - $(CPPUHELPERLIB) \ - $(COMPHELPERLIB) \ - $(UCBHELPERLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(VCLLIB) \ - $(DEPLOYMENTMISCLIB) -SHL1VERSIONMAP = version.map -SHL1IMPLIB = i$(SHL1TARGET) -DEF1NAME = $(SHL1TARGET) - -SLOFILES = \ - $(SLO)$/unopkg_app.obj \ - $(SLO)$/unopkg_cmdenv.obj \ - $(SLO)$/unopkg_misc.obj - -OBJFILES = $(OBJ)$/unopkg_main.obj - -.INCLUDE : target.mk - -.IF "$(APP1TARGETN)" != "" # not set during depend=x -$(APP1TARGETN) : $(MISC)$/binso_created.flg -.ENDIF # "$(APP1TARGETN)"!="" - -$(MISC)$/binso_created.flg: - @@-$(MKDIRHIER) $(BIN)$/so && $(TOUCH) $@ - @@-$(MKDIRHIER) $(MISC)$/so && $(TOUCH) $@ - diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx index 5411e40a91ca..82af6dc402e0 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx @@ -28,6 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove +#include "desktopdllapi.h" #include "dp_misc.h" #include "unopkg_main.h" #include "unopkg_shared.h" @@ -222,7 +223,7 @@ void disposeBridges(Reference<css::uno::XComponentContext> ctx) } } -extern "C" int unopkg_main() +extern "C" DESKTOP_DLLPUBLIC int unopkg_main() { tools::extendApplicationEnvironment(); DisposeGuard disposeGuard; diff --git a/desktop/source/pkgchk/unopkg/unopkg_main.c b/desktop/source/pkgchk/unopkg/unopkg_main.c index 07e310c3b402..6f3d5d3b9a93 100755 --- a/desktop/source/pkgchk/unopkg/unopkg_main.c +++ b/desktop/source/pkgchk/unopkg/unopkg_main.c @@ -26,8 +26,6 @@ * ************************************************************************/ -#include "sal/config.h" - #include "sal/main.h" #include "unopkg_main.h" diff --git a/desktop/source/pkgchk/unopkg/unopkg_main.h b/desktop/source/pkgchk/unopkg/unopkg_main.h index a4d66cf17c05..3714e6fda445 100755 --- a/desktop/source/pkgchk/unopkg/unopkg_main.h +++ b/desktop/source/pkgchk/unopkg/unopkg_main.h @@ -29,13 +29,13 @@ #ifndef INCLUDED_DESKTOP_SOURCE_PKGCHK_UNOPKG_UNOPKG_MAIN_H #define INCLUDED_DESKTOP_SOURCE_PKGCHK_UNOPKG_UNOPKG_MAIN_H -#include "sal/config.h" +#include "desktopdllapi.h" #if defined __cplusplus extern "C" { #endif -int unopkg_main(void); +DESKTOP_DLLPUBLIC int unopkg_main(void); #if defined __cplusplus } diff --git a/desktop/source/splash/makefile.mk b/desktop/source/splash/makefile.mk deleted file mode 100755 index 8db499d7c913..000000000000 --- a/desktop/source/splash/makefile.mk +++ /dev/null @@ -1,80 +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=desktop -TARGET=spl -LIBTARGET=NO - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files -------------------------------------------------------- - -SLOFILES = $(SLO)$/splash.obj \ - $(SLO)$/services_spl.obj - -SHL1DEPN= makefile.mk -SHL1OBJS= $(SLOFILES) \ - $(SLO)$/migration.obj - - -SHL1TARGET=$(TARGET)$(DLLPOSTFIX) -SHL1IMPLIB=i$(TARGET) - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -SHL1STDLIBS= \ - $(VCLLIB) \ - $(SVLLIB) \ - $(SVTOOLLIB) \ - $(COMPHELPERLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(UCBHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(SFXLIB) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/spl.component - -$(MISC)/spl.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - spl.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt spl.component |