diff options
author | Michael Stahl <mstahl@redhat.com> | 2011-12-14 19:57:14 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2011-12-14 19:57:14 +0100 |
commit | ba1f609d0dd77c5adc2504e90e341c306b5ee8f5 (patch) | |
tree | 534dac52a3c012aefd2ac5b45ba8652b25820300 | |
parent | extensions/stardiv considered obsolete (diff) | |
download | core-ba1f609d0dd77c5adc2504e90e341c306b5ee8f5.tar.gz core-ba1f609d0dd77c5adc2504e90e341c306b5ee8f5.zip |
extensions: convert update stuff to gbuild
The updchk is renamed to updatecheckui so it does not collide with
updchk.uno.
20 files changed, 309 insertions, 306 deletions
diff --git a/Repository.mk b/Repository.mk index d2b5c49373ef..815ab70349e2 100644 --- a/Repository.mk +++ b/Repository.mk @@ -224,6 +224,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ tl \ unordf \ unoxml \ + updatecheckui \ utl \ uui \ vbahelper \ @@ -351,6 +352,8 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \ slideshow \ stocservices \ stringresource \ + updatefeed \ + updchk \ vbaevents \ vbaobj \ vbaswobj \ diff --git a/extensions/AllLangResTarget_upd.mk b/extensions/AllLangResTarget_upd.mk new file mode 100644 index 000000000000..872e49df0aab --- /dev/null +++ b/extensions/AllLangResTarget_upd.mk @@ -0,0 +1,41 @@ +# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +# +# 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 Red Hat, Inc., Michael Stahl <mstahl@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. +# + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,upd)) + +$(eval $(call gb_AllLangResTarget_add_srs,upd,\ + upd/res \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,upd/res)) + +$(eval $(call gb_SrsTarget_add_files,upd/res,\ + extensions/source/update/check/updatehdl.src \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/AllLangResTarget_updchk.mk b/extensions/AllLangResTarget_updchk.mk new file mode 100644 index 000000000000..c3cd02cb20a0 --- /dev/null +++ b/extensions/AllLangResTarget_updchk.mk @@ -0,0 +1,43 @@ +# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +# +# 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 Red Hat, Inc., Michael Stahl <mstahl@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. +# + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,updchk)) + +$(eval $(call gb_AllLangResTarget_set_reslocation,updchk,extensions/source/update/ui)) + +$(eval $(call gb_AllLangResTarget_add_srs,updchk,\ + updchk/res \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,updchk/res)) + +$(eval $(call gb_SrsTarget_add_files,updchk/res,\ + extensions/source/update/ui/updatecheckui.src \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Configuration_updchk.mk b/extensions/Configuration_updchk.mk new file mode 100644 index 000000000000..2f392228fedf --- /dev/null +++ b/extensions/Configuration_updchk.mk @@ -0,0 +1,37 @@ +# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +# +# 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 Red Hat, Inc., Michael Stahl <mstahl@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. +# + +# TODO is this really supposed to be delivered to the officecfg registry? +$(eval $(call gb_Configuration_Configuration_nozip,updchk)) + +$(eval $(call gb_Configuration_add_spool_modules,updchk,extensions/source/update/check,\ + org/openoffice/Office/Jobs-onlineupdate.xcu \ + org/openoffice/Office/Addons-onlineupdate.xcu \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk index 3db886b0a524..36721e720fc1 100644 --- a/extensions/CppunitTest_extensions_test_update.mk +++ b/extensions/CppunitTest_extensions_test_update.mk @@ -73,7 +73,7 @@ $(eval $(call gb_CppunitTest_add_components,extensions_test_update,\ $(eval $(call gb_CppunitTest_add_old_components,extensions_test_update,\ ucb1 \ ucpfile1 \ - updatefeed \ + component/extensions/source/update/feed/updatefeed \ )) $(eval $(call gb_CppunitTest_set_args,extensions_test_update,\ diff --git a/extensions/Library_updatecheckui.mk b/extensions/Library_updatecheckui.mk new file mode 100644 index 000000000000..825142759352 --- /dev/null +++ b/extensions/Library_updatecheckui.mk @@ -0,0 +1,51 @@ +# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +# +# 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 Red Hat, Inc., Michael Stahl <mstahl@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. +# + +$(eval $(call gb_Library_Library,updatecheckui)) + +$(eval $(call gb_Library_set_componentfile,updatecheckui,extensions/source/update/ui/updchk)) + +$(eval $(call gb_Library_add_api,updatecheckui,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,updatecheckui,\ + vcl \ + tl \ + comphelper \ + cppuhelper \ + cppu \ + sal \ +)) + +$(eval $(call gb_Library_add_exception_objects,updatecheckui,\ + extensions/source/update/ui/updatecheckui \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_updatefeed.mk b/extensions/Library_updatefeed.mk new file mode 100644 index 000000000000..01374b5f91fe --- /dev/null +++ b/extensions/Library_updatefeed.mk @@ -0,0 +1,48 @@ +# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +# +# 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 Red Hat, Inc., Michael Stahl <mstahl@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. +# + +$(eval $(call gb_Library_Library,updatefeed)) + +$(eval $(call gb_Library_set_componentfile,updatefeed,extensions/source/update/feed/updatefeed)) + +$(eval $(call gb_Library_add_api,updatefeed,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,updatefeed,\ + cppuhelper \ + cppu \ + sal \ +)) + +$(eval $(call gb_Library_add_exception_objects,updatefeed,\ + extensions/source/update/feed/updatefeed \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk new file mode 100644 index 000000000000..ba6d7364e7b0 --- /dev/null +++ b/extensions/Library_updchk.mk @@ -0,0 +1,63 @@ +# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +# +# 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 Red Hat, Inc., Michael Stahl <mstahl@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. +# + +$(eval $(call gb_Library_Library,updchk)) + +$(eval $(call gb_Library_set_componentfile,updchk,extensions/source/update/check/updchk.uno)) + +$(eval $(call gb_Library_add_api,updchk,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,updchk,\ + comphelper \ + cppuhelper \ + cppu \ + sal \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,updchk,\ + ole32 \ + shell32 \ +)) +endif # OS WNT + +$(eval $(call gb_Library_use_external,updchk,curl)) + +$(eval $(call gb_Library_add_exception_objects,updchk,\ + extensions/source/update/check/download \ + extensions/source/update/check/updatecheck \ + extensions/source/update/check/updatecheckconfig \ + extensions/source/update/check/updatecheckjob \ + extensions/source/update/check/updatehdl \ + extensions/source/update/check/updateprotocol \ +)) + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index cf44b2d8a7db..179170a6a9a6 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -26,6 +26,15 @@ $(eval $(call gb_Module_Module,extensions)) +$(eval $(call gb_Module_add_targets,extensions,\ + AllLangResTarget_upd \ + AllLangResTarget_updchk \ + Configuration_updchk \ + Library_updatecheckui \ + Library_updatefeed \ + Library_updchk \ +)) + $(eval $(call gb_Module_add_check_targets,extensions,\ CppunitTest_extensions_test_update \ )) diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst index f29d117d3dc8..cc629f4f4ef8 100644 --- a/extensions/prj/build.lst +++ b/extensions/prj/build.lst @@ -26,10 +26,8 @@ ex extensions\source\logging nmake - all ex_logging ex_in ex extensions\source\config\ldap nmake - all ex_ldap ex_inc NULL ex extensions\source\nsplugin\source nmake - u ex_nsplugin ex_inc NULL ex extensions\source\nsplugin\source nmake - w ex_nsplugin ex_inc NULL -ex extensions\source\update\feed nmake - all ex_updchkfeed ex_inc NULL -ex extensions\source\update\check nmake - all ex_updchk ex_inc NULL -ex extensions\source\update\ui nmake - all ex_updchkui ex_inc NULL ex extensions\util nmake - all ex_util ex_abpilot ex_dbpilots ex_logging ex_ldap ex_propctrlr ex_bib ex_plutil NULL +ex extensions\prj nmake - all ex_prj NULL # Fails at the moment # ex extensions\qa\complex\extensions nmake - all ex_complex ex_util NULL diff --git a/extensions/prj/makefile.mk b/extensions/prj/makefile.mk new file mode 100644 index 000000000000..0997622e00f6 --- /dev/null +++ b/extensions/prj/makefile.mk @@ -0,0 +1 @@ +.INCLUDE : gbuildbridge.mk diff --git a/extensions/source/update/check/makefile.mk b/extensions/source/update/check/makefile.mk deleted file mode 100644 index 47da869ea11e..000000000000 --- a/extensions/source/update/check/makefile.mk +++ /dev/null @@ -1,142 +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=extensions -TARGET=updchk -PACKAGE=org.openoffice.Office - -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -ABSXCSROOT=$(SOLARXMLDIR) -XCSROOT=.. -DTDDIR=$(ABSXCSROOT) -XSLDIR=$(ABSXCSROOT)$/processing -PROCESSOUT=$(MISC)$/$(TARGET) -PROCESSORDIR=$(SOLARBINDIR) - -# no validation by inspector class -NO_INSPECTION=TRUE - -# --- Settings --- - -.INCLUDE : settings.mk - -# no "lib" prefix -DLLPRE = - -# --- Files --- - -SRS2NAME=$(TARGET) -SRC2FILES=\ - updatehdl.src - -RESLIB2NAME=upd -RESLIB2SRSFILES= $(SRS)$/updchk.srs -RESLIB2DEPN= updatehdl.src updatehdl.hrc - -SLOFILES=\ - $(SLO)$/download.obj \ - $(SLO)$/updatecheck.obj \ - $(SLO)$/updatecheckjob.obj \ - $(SLO)$/updatecheckconfig.obj \ - $(SLO)$/updateprotocol.obj \ - $(SLO)$/updatehdl.obj - -SHL1NOCHECK=TRUE -SHL1TARGET=$(TARGET).uno -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1IMPLIB=i$(SHL1TARGET) -SHL1STDLIBS= \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(CURLLIB) \ - $(SALLIB) \ - $(SHELL32LIB) \ - $(OLE32LIB) - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -PACKAGEDIR=$(subst,.,$/ $(PACKAGE)) -SPOOLDIR=$(MISC)$/registry$/spool - -XCUFILES= \ - Addons.xcu \ - Jobs.xcu - -MYXCUFILES= \ - $(SPOOLDIR)$/$(PACKAGEDIR)$/Addons$/Addons-onlineupdate.xcu \ - $(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-onlineupdate.xcu - -LOCALIZEDFILES= \ - Addons.xcu \ - Jobs.xcu - -.IF "$(test)" != "" -APP1TARGET=updateprotocoltest -APP1STDLIBS= $(SHL1STDLIBS) -APP1OBJS= \ - $(SLO)$/updateprotocol.obj \ - $(SLO)$/updateprotocoltest.obj - - -.ENDIF # "$(test)" != "" - -# --- Targets --- - -.INCLUDE : target.mk - -ALLTAR : $(MYXCUFILES) - -.IF "$(WITH_LANG)"!="" -XCU_SOURCEDIR:=$(PROCESSOUT)$/merge$/$(PACKAGEDIR) -.ELSE # "$(WITH_LANG)"!="" -XCU_SOURCEDIR:=. -.ENDIF # "$(WITH_LANG)"!="" - -$(SPOOLDIR)$/$(PACKAGEDIR)$/Addons$/Addons-onlineupdate.xcu : $(XCU_SOURCEDIR)$/Addons.xcu - @-$(MKDIRHIER) $(@:d) - @$(COPY) $< $@ - -$(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-onlineupdate.xcu : $(XCU_SOURCEDIR)$/Jobs.xcu - @-$(MKDIRHIER) $(@:d) - @$(COPY) $< $@ -# @$(PERL) transform.pl < $< > $@ - - -ALLTAR : $(MISC)/updchk.uno.component - -$(MISC)/updchk.uno.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - updchk.uno.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt updchk.uno.component diff --git a/extensions/source/update/check/Addons.xcu b/extensions/source/update/check/org/openoffice/Office/Addons.xcu index 8794ce858073..8794ce858073 100644 --- a/extensions/source/update/check/Addons.xcu +++ b/extensions/source/update/check/org/openoffice/Office/Addons.xcu diff --git a/extensions/source/update/check/Jobs.xcu b/extensions/source/update/check/org/openoffice/Office/Jobs.xcu index 840d630698cb..840d630698cb 100644 --- a/extensions/source/update/check/Jobs.xcu +++ b/extensions/source/update/check/org/openoffice/Office/Jobs.xcu diff --git a/extensions/source/update/feed/makefile.mk b/extensions/source/update/feed/makefile.mk deleted file mode 100644 index 6361f20bdd73..000000000000 --- a/extensions/source/update/feed/makefile.mk +++ /dev/null @@ -1,72 +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=extensions -TARGET=updatefeed - -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -# --- Settings --- - -.INCLUDE : settings.mk - -# no "lib" prefix -DLLPRE = - -# --- Files --- - -SLOFILES=\ - $(SLO)$/updatefeed.obj \ - -SHL1NOCHECK=TRUE -SHL1TARGET=$(TARGET).uno -SHL1OBJS=$(SLOFILES) - -SHL1IMPLIB=i$(SHL1TARGET) -SHL1STDLIBS= \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -# --- Targets --- - -.INCLUDE : target.mk - - -ALLTAR : $(MISC)/updatefeed.component - -$(MISC)/updatefeed.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - updatefeed.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt updatefeed.component diff --git a/extensions/source/update/ui/makefile.mk b/extensions/source/update/ui/makefile.mk deleted file mode 100644 index 5ea6994d3d22..000000000000 --- a/extensions/source/update/ui/makefile.mk +++ /dev/null @@ -1,82 +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=extensions -TARGET=updchkui - -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE - -# --- Settings --- - -.INCLUDE : settings.mk - -# --- Files --- - -SLOFILES=\ - $(SLO)$/updatecheckui.obj - -SRS1NAME=$(TARGET) -SRC1FILES=\ - updatecheckui.src - -RESLIB1NAME=updchk -RESLIB1IMAGES=$(PRJ)$/source$/update$/ui -RESLIB1SRSFILES= $(SRS)$/updchkui.srs -RESLIB1DEPN= updatecheckui.src updatecheckui.hrc - -SHL1NOCHECK=TRUE -SHL1TARGET=updchk$(DLLPOSTFIX) -SHL1OBJS=$(SLOFILES) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1IMPLIB=i$(SHL1TARGET) -SHL1STDLIBS= \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) \ - $(VCLLIB) \ - $(TOOLSLIB) - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -DEF1NAME=$(SHL1TARGET) - -# --- Targets --- - -.INCLUDE : target.mk - - -ALLTAR : $(MISC)/updchk.component - -$(MISC)/updchk.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - updchk.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt updchk.component diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index fe829fa4799f..74dbb16f9d39 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -173,6 +173,9 @@ my_components += \ component/desktop/source/migration/services/migrationoo3 \ component/desktop/source/offacc/offacc \ component/desktop/source/splash/spl \ + component/extensions/source/update/check/updchk.uno \ + component/extensions/source/update/feed/updatefeed \ + component/extensions/source/update/ui/updchk \ dbp \ fpicker \ fps_office \ @@ -183,9 +186,6 @@ my_components += \ syssh \ tvhlp1 \ ucpchelp1 \ - updatefeed \ - updchk \ - updchk.uno \ xmx .ENDIF diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index 84cbfa114f59..2041bbda8ee6 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -356,8 +356,8 @@ MY_FILES_math = \ .IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)" MY_DEPS_onlineupdate = main MY_FILES_onlineupdate = \ - $(MY_MOD)/org/openoffice/Office/Addons/Addons-onlineupdate.xcu \ - $(MY_MOD)/org/openoffice/Office/Jobs/Jobs-onlineupdate.xcu + $(MY_MOD)/org/openoffice/Office/Addons-onlineupdate.xcu \ + $(MY_MOD)/org/openoffice/Office/Jobs-onlineupdate.xcu .ENDIF MY_DEPS_palm = main diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 7b20c242bd32..cf94b1892f2f 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1475,7 +1475,7 @@ End STD_LIB_FILE( gid_File_Lib_Guesslang, guesslang ) -STD_LIB_FILE( gid_File_Lib_Updchkui , updchk ) +STD_LIB_FILE( gid_File_Lib_Updchkui , updatecheckui ) SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Updatefeed , updatefeed.uno ) diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index b0134c02e910..0674837c1311 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -309,6 +309,11 @@ $(call gb_Configuration_get_target,%) : $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $@) && touch $@) +# TODO: ? +define gb_Configuration_Configuration_nozip +$$(eval $$(call gb_Module_register_target,$(call gb_Configuration_get_target,$(1)),$(call gb_Configuration_get_clean_target,$(1)))) +endef + # $(call gb_Configuration_Configuration,zipfile,repo,nodeliver) # cannot use target local variable for REPO because it's needed in prereq # last parameter may be used to turn off delivering of files |