[Libreoffice-commits] core.git: 12 commits - configure.ac cppu/CppunitTest_cppu_checkapi.mk cppu/CustomTarget_cppu_allheaders.mk cppuhelper/CppunitTest_cppuhelper_checkapi.mk cppuhelper/CustomTarget_cppuhelper_allheaders.mk cppuhelper/Module_cppuhelper.mk cppuhelper/Package_cppuhelper_odk_headers.mk cppuhelper/ZipPackage_cppuhelper_odk_headers.mk cppu/Module_cppu.mk cppu/Package_cppu_odk_headers.mk cppu/ZipPackage_cppu_odk_headers.mk desktop/Pyuno_passive_python.mk epm/ExternalProject_epm.mk extras/AllLangPackage_accessoriessamplesadvertisement.mk extras/AllLangPackage_accessoriessamplesdocumentation.mk extras/AllLangPackage_accessoriessamples.mk extras/AllLangPackage_accessoriessamplesnonfreeadvertisement.mk extras/AllLangPackage_accessoriessamplesnonfreedocumentation.mk extras/AllLangPackage_accessoriessamplesnonfree.mk extras/AllLangPackage_accessoriestemplateseducate.mk extras/AllLangPackage_accessoriestemplatesfinance.mk extras/AllLangPackage_accessoriestemplatesforms.mk extras/AllLa ngPackage_accessoriestemplateslabels.mk extras/AllLangPackage_accessoriestemplateslayout.mk extras/AllLangPackage_accessoriestemplatesmisc.mk extras/AllLangPackage_accessoriestemplates.mk extras/AllLangPackage_accessoriestemplatesnonfreeeducate.mk extras/AllLangPackage_accessoriestemplatesnonfreefinance.mk extras/AllLangPackage_accessoriestemplatesnonfreeforms.mk extras/AllLangPackage_accessoriestemplatesnonfreelabels.mk extras/AllLangPackage_accessoriestemplatesnonfreelayout.mk extras/AllLangPackage_accessoriestemplatesnonfreemisc.mk extras/AllLangPackage_accessoriestemplatesnonfree.mk extras/AllLangPackage_accessoriestemplatesnonfreeofficorr.mk extras/AllLangPackage_accessoriestemplatesnonfreeoffimisc.mk extras/AllLangPackage_accessoriestemplatesnonfreepersonal.mk extras/AllLangPackage_accessoriestemplatesnonfreepresent.mk extras/AllLangPackage_accessoriestemplatesofficorr.mk extras/AllLangPackage_accessoriestemplatesoffimisc.mk extras/AllLangPackage_accessoriestemplatespe rsonal.mk extras/AllLangPackage_accessoriestemplatespresent.mk extras/AllLangPackage_autotextshare.mk extras/AllLangZip_accessoriessamplesadvertisement.mk extras/AllLangZip_accessoriessamplesdocumentation.mk extras/AllLangZip_accessoriessamples.mk extras/AllLangZip_accessoriessamplesnonfreeadvertisement.mk extras/AllLangZip_accessoriessamplesnonfreedocumentation.mk extras/AllLangZip_accessoriessamplesnonfree.mk extras/AllLangZip_accessoriestemplateseducate.mk extras/AllLangZip_accessoriestemplatesfinance.mk extras/AllLangZip_accessoriestemplatesforms.mk extras/AllLangZip_accessoriestemplateslabels.mk extras/AllLangZip_accessoriestemplateslayout.mk extras/AllLangZip_accessoriestemplatesmisc.mk extras/AllLangZip_accessoriestemplates.mk extras/AllLangZip_accessoriestemplatesnonfreeeducate.mk extras/AllLangZip_accessoriestemplatesnonfreefinance.mk extras/AllLangZip_accessoriestemplatesnonfreeforms.mk extras/AllLangZip_accessoriestemplatesnonfreelabels.mk extras/AllLangZip_access oriestemplatesnonfreelayout.mk extras/AllLangZip_accessoriestemplatesnonfreemisc.mk extras/AllLangZip_accessoriestemplatesnonfree.mk extras/AllLangZip_accessoriestemplatesnonfreeofficorr.mk extras/AllLangZip_accessoriestemplatesnonfreeoffimisc.mk extras/AllLangZip_accessoriestemplatesnonfreepersonal.mk extras/AllLangZip_accessoriestemplatesnonfreepresent.mk extras/AllLangZip_accessoriestemplatesofficorr.mk extras/AllLangZip_accessoriestemplatesoffimisc.mk extras/AllLangZip_accessoriestemplatespersonal.mk extras/AllLangZip_accessoriestemplatespresent.mk extras/AllLangZip_autotextshare.mk extras/Module_extras.mk sal/CppunitTest_sal_checkapi.mk sal/CustomTarget_sal_allheaders.mk salhelper/CppunitTest_salhelper_checkapi.mk salhelper/CustomTarget_salhelper_allheaders.mk salhelper/Module_salhelper.mk salhelper/Package_salhelper_odk_headers.mk salhelper/ZipPackage_salhelper_odk_headers.mk sal/Module_sal.mk sal/Package_sal_generated.mk sal/Package_sal_odk_headers.mk sal/ZipPackage_s al_generated.mk sal/ZipPackage_sal_odk_headers.mk scp2/source scripting/Pyuno_mailmerge.mk solenv/gbuild wizards/Pyuno_agenda.mk wizards/Pyuno_commonwizards.mk wizards/Pyuno_fax.mk wizards/Pyuno_letter.mk wizards/Pyuno_web.mk
David Tardon
dtardon at redhat.com
Sat Apr 13 00:26:47 PDT 2013
configure.ac | 20
cppu/CppunitTest_cppu_checkapi.mk | 15
cppu/CustomTarget_cppu_allheaders.mk | 18
cppu/Module_cppu.mk | 2
cppu/Package_cppu_odk_headers.mk | 85 ++
cppu/ZipPackage_cppu_odk_headers.mk | 83 --
cppuhelper/CppunitTest_cppuhelper_checkapi.mk | 15
cppuhelper/CustomTarget_cppuhelper_allheaders.mk | 18
cppuhelper/Module_cppuhelper.mk | 2
cppuhelper/Package_cppuhelper_odk_headers.mk | 90 ++
cppuhelper/ZipPackage_cppuhelper_odk_headers.mk | 88 --
desktop/Pyuno_passive_python.mk | 2
epm/ExternalProject_epm.mk | 11
extras/AllLangPackage_accessoriessamples.mk | 35 +
extras/AllLangPackage_accessoriessamplesadvertisement.mk | 39 +
extras/AllLangPackage_accessoriessamplesdocumentation.mk | 34 +
extras/AllLangPackage_accessoriessamplesnonfree.mk | 33
extras/AllLangPackage_accessoriessamplesnonfreeadvertisement.mk | 33
extras/AllLangPackage_accessoriessamplesnonfreedocumentation.mk | 33
extras/AllLangPackage_accessoriestemplates.mk | 32
extras/AllLangPackage_accessoriestemplateseducate.mk | 48 +
extras/AllLangPackage_accessoriestemplatesfinance.mk | 106 +++
extras/AllLangPackage_accessoriestemplatesforms.mk | 85 ++
extras/AllLangPackage_accessoriestemplateslabels.mk | 74 ++
extras/AllLangPackage_accessoriestemplateslayout.mk | 333 +++++++++
extras/AllLangPackage_accessoriestemplatesmisc.mk | 262 +++++++
extras/AllLangPackage_accessoriestemplatesnonfree.mk | 33
extras/AllLangPackage_accessoriestemplatesnonfreeeducate.mk | 53 +
extras/AllLangPackage_accessoriestemplatesnonfreefinance.mk | 45 +
extras/AllLangPackage_accessoriestemplatesnonfreeforms.mk | 33
extras/AllLangPackage_accessoriestemplatesnonfreelabels.mk | 33
extras/AllLangPackage_accessoriestemplatesnonfreelayout.mk | 33
extras/AllLangPackage_accessoriestemplatesnonfreemisc.mk | 54 +
extras/AllLangPackage_accessoriestemplatesnonfreeofficorr.mk | 34 +
extras/AllLangPackage_accessoriestemplatesnonfreeoffimisc.mk | 33
extras/AllLangPackage_accessoriestemplatesnonfreepersonal.mk | 35 +
extras/AllLangPackage_accessoriestemplatesnonfreepresent.mk | 33
extras/AllLangPackage_accessoriestemplatesofficorr.mk | 170 +++++
extras/AllLangPackage_accessoriestemplatesoffimisc.mk | 151 ++++
extras/AllLangPackage_accessoriestemplatespersonal.mk | 138 ++++
extras/AllLangPackage_accessoriestemplatespresent.mk | 94 ++
extras/AllLangPackage_autotextshare.mk | 93 ++
extras/AllLangZip_accessoriessamples.mk | 37 -
extras/AllLangZip_accessoriessamplesadvertisement.mk | 41 -
extras/AllLangZip_accessoriessamplesdocumentation.mk | 36 -
extras/AllLangZip_accessoriessamplesnonfree.mk | 35 -
extras/AllLangZip_accessoriessamplesnonfreeadvertisement.mk | 35 -
extras/AllLangZip_accessoriessamplesnonfreedocumentation.mk | 35 -
extras/AllLangZip_accessoriestemplates.mk | 34 -
extras/AllLangZip_accessoriestemplateseducate.mk | 50 -
extras/AllLangZip_accessoriestemplatesfinance.mk | 108 ---
extras/AllLangZip_accessoriestemplatesforms.mk | 87 --
extras/AllLangZip_accessoriestemplateslabels.mk | 76 --
extras/AllLangZip_accessoriestemplateslayout.mk | 335 ----------
extras/AllLangZip_accessoriestemplatesmisc.mk | 264 -------
extras/AllLangZip_accessoriestemplatesnonfree.mk | 35 -
extras/AllLangZip_accessoriestemplatesnonfreeeducate.mk | 55 -
extras/AllLangZip_accessoriestemplatesnonfreefinance.mk | 47 -
extras/AllLangZip_accessoriestemplatesnonfreeforms.mk | 35 -
extras/AllLangZip_accessoriestemplatesnonfreelabels.mk | 35 -
extras/AllLangZip_accessoriestemplatesnonfreelayout.mk | 35 -
extras/AllLangZip_accessoriestemplatesnonfreemisc.mk | 56 -
extras/AllLangZip_accessoriestemplatesnonfreeofficorr.mk | 36 -
extras/AllLangZip_accessoriestemplatesnonfreeoffimisc.mk | 35 -
extras/AllLangZip_accessoriestemplatesnonfreepersonal.mk | 37 -
extras/AllLangZip_accessoriestemplatesnonfreepresent.mk | 35 -
extras/AllLangZip_accessoriestemplatesofficorr.mk | 172 -----
extras/AllLangZip_accessoriestemplatesoffimisc.mk | 153 ----
extras/AllLangZip_accessoriestemplatespersonal.mk | 140 ----
extras/AllLangZip_accessoriestemplatespresent.mk | 96 --
extras/AllLangZip_autotextshare.mk | 93 --
extras/Module_extras.mk | 58 -
sal/CppunitTest_sal_checkapi.mk | 15
sal/CustomTarget_sal_allheaders.mk | 27
sal/Module_sal.mk | 4
sal/Package_sal_generated.mk | 34 +
sal/Package_sal_odk_headers.mk | 109 +++
sal/ZipPackage_sal_generated.mk | 32
sal/ZipPackage_sal_odk_headers.mk | 107 ---
salhelper/CppunitTest_salhelper_checkapi.mk | 15
salhelper/CustomTarget_salhelper_allheaders.mk | 18
salhelper/Module_salhelper.mk | 2
salhelper/Package_salhelper_odk_headers.mk | 44 +
salhelper/ZipPackage_salhelper_odk_headers.mk | 42 -
scp2/source/accessories/file_samples_accessories.scp | 36 -
scp2/source/accessories/file_templates_accessories.scp | 132 +--
scp2/source/ooo/file_extra_ooo.scp | 6
scp2/source/ooo/file_ooo.scp | 35 -
scp2/source/sdkoo/sdkoo.scp | 30
scripting/Pyuno_mailmerge.mk | 2
solenv/gbuild/AllLangPackage.mk | 110 +++
solenv/gbuild/AllLangZip.mk | 100 --
solenv/gbuild/CppunitTest.mk | 1
solenv/gbuild/Package.mk | 1
solenv/gbuild/Pyuno.mk | 42 -
solenv/gbuild/TargetLocations.mk | 9
solenv/gbuild/ZipPackage.mk | 47 -
solenv/gbuild/gbuild.mk | 3
solenv/gbuild/platform/IOS_ARM_GCC.mk | 4
solenv/gbuild/platform/WNT_INTEL_GCC.mk | 4
solenv/gbuild/platform/com_MSC_class.mk | 4
solenv/gbuild/platform/macosx.mk | 4
solenv/gbuild/platform/solaris.mk | 4
solenv/gbuild/platform/unxgcc.mk | 4
wizards/Pyuno_agenda.mk | 2
wizards/Pyuno_commonwizards.mk | 4
wizards/Pyuno_fax.mk | 2
wizards/Pyuno_letter.mk | 2
wizards/Pyuno_web.mk | 2
109 files changed, 2969 insertions(+), 3057 deletions(-)
New commits:
commit 5cd3da2246bba2e2902010e023922ece2fffbd1e
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 13 08:52:45 2013 +0200
simplify makefiles
Change-Id: I11ea8814d36cdc6d6838ec80b0bbb272d3116b2d
diff --git a/cppu/CppunitTest_cppu_checkapi.mk b/cppu/CppunitTest_cppu_checkapi.mk
index bfd4dad..fe2c40f 100644
--- a/cppu/CppunitTest_cppu_checkapi.mk
+++ b/cppu/CppunitTest_cppu_checkapi.mk
@@ -27,6 +27,10 @@
$(eval $(call gb_CppunitTest_CppunitTest,cppu_checkapi))
+$(eval $(call gb_CppunitTest_use_custom_headers,cppu_checkapi,\
+ cppu/allheaders \
+))
+
$(eval $(call gb_CppunitTest_add_exception_objects,cppu_checkapi,\
cppu/qa/checkapi/strings \
))
@@ -36,12 +40,6 @@ $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_checkapi, \
udkapi \
))
-# strings.cxx includes generated strings.hxx
-$(call gb_CxxObject_get_target,cppu/qa/checkapi/strings) : \
- INCLUDE += -I$(call gb_CustomTarget_get_workdir,cppu/allheaders)
-$(call gb_CxxObject_get_target,cppu/qa/checkapi/strings) :| \
- $(call gb_CustomTarget_get_workdir,cppu/allheaders)/cppu_allheaders.hxx
-
$(eval $(call gb_CppunitTest_use_libraries,cppu_checkapi,\
cppu \
$(gb_UWINAPI) \
diff --git a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk
index 5e933d3..f8042b7 100644
--- a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk
@@ -27,6 +27,10 @@
$(eval $(call gb_CppunitTest_CppunitTest,cppuhelper_checkapi))
+$(eval $(call gb_CppunitTest_use_custom_headers,cppuhelper_checkapi,\
+ cppuhelper/allheaders \
+))
+
$(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_checkapi,\
cppuhelper/qa/checkapi/strings \
))
@@ -36,12 +40,6 @@ $(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppuhelper_checkapi,
udkapi \
))
-# strings.cxx includes generated strings.hxx
-$(call gb_CxxObject_get_target,cppuhelper/qa/checkapi/strings) : \
- INCLUDE += -I$(call gb_CustomTarget_get_workdir,cppuhelper/allheaders)
-$(call gb_CxxObject_get_target,cppuhelper/qa/checkapi/strings) :| \
- $(call gb_CustomTarget_get_workdir,cppuhelper/allheaders)/cppuhelper_allheaders.hxx
-
$(eval $(call gb_CppunitTest_use_libraries,cppuhelper_checkapi,\
cppuhelper \
$(gb_UWINAPI) \
diff --git a/sal/CppunitTest_sal_checkapi.mk b/sal/CppunitTest_sal_checkapi.mk
index 4feec9b..42fd5e3 100644
--- a/sal/CppunitTest_sal_checkapi.mk
+++ b/sal/CppunitTest_sal_checkapi.mk
@@ -27,18 +27,16 @@
$(eval $(call gb_CppunitTest_CppunitTest,sal_checkapi))
+$(eval $(call gb_CppunitTest_use_custom_headers,sal_checkapi,\
+ sal/allheaders \
+))
+
$(eval $(call gb_CppunitTest_add_exception_objects,sal_checkapi,\
sal/qa/checkapi/strings \
))
$(eval $(call gb_CppunitTest_use_external,sal_checkapi,boost_headers))
-# strings.cxx includes generated strings.hxx
-$(call gb_CxxObject_get_target,sal/qa/checkapi/strings) : \
- INCLUDE += -I$(call gb_CustomTarget_get_workdir,sal/allheaders)
-$(call gb_CxxObject_get_target,sal/qa/checkapi/strings) :| \
- $(call gb_CustomTarget_get_workdir,sal/allheaders)/sal_allheaders.hxx
-
$(eval $(call gb_CppunitTest_use_libraries,sal_checkapi,\
sal \
$(gb_UWINAPI) \
diff --git a/salhelper/CppunitTest_salhelper_checkapi.mk b/salhelper/CppunitTest_salhelper_checkapi.mk
index 3fd3178..fed7e58 100644
--- a/salhelper/CppunitTest_salhelper_checkapi.mk
+++ b/salhelper/CppunitTest_salhelper_checkapi.mk
@@ -27,18 +27,16 @@
$(eval $(call gb_CppunitTest_CppunitTest,salhelper_checkapi))
+$(eval $(call gb_CppunitTest_use_custom_headers,salhelper_checkapi,\
+ salhelper/allheaders \
+))
+
$(eval $(call gb_CppunitTest_use_external,salhelper_checkapi,boost_headers))
$(eval $(call gb_CppunitTest_add_exception_objects,salhelper_checkapi,\
salhelper/qa/checkapi/strings \
))
-# strings.cxx includes generated strings.hxx
-$(call gb_CxxObject_get_target,salhelper/qa/checkapi/strings) : \
- INCLUDE += -I$(call gb_CustomTarget_get_workdir,salhelper/allheaders)
-$(call gb_CxxObject_get_target,salhelper/qa/checkapi/strings) :| \
- $(call gb_CustomTarget_get_workdir,salhelper/allheaders)/salhelper_allheaders.hxx
-
$(eval $(call gb_CppunitTest_use_libraries,salhelper_checkapi,\
salhelper \
$(gb_UWINAPI) \
commit a7fb41886ad729361721b59b2bf2fec218674f53
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 13 08:48:16 2013 +0200
add gb_CppunitTest_use_custom_headers
Change-Id: I6bca241552bb6f8fa84cf8b45e91e9a86e12dc41
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index e9669b0..61cd717 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -385,6 +385,7 @@ $(eval $(foreach method,\
set_objcxxflags \
use_external \
use_externals \
+ use_custom_headers \
set_visibility_default \
,\
$(call gb_CppunitTest__forward_to_Linktarget,$(method))\
commit 71e52f37ac87256f81c8da1c66e858df0fa6fe8c
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 13 08:17:09 2013 +0200
simplify generation of *_allheaders.hxx
There are some differences in the generated headers:
cppu_allheaders.hxx now explicitly includes
#include <com/sun/star/uno/Any.h>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/genfunc.h>
#include <com/sun/star/uno/genfunc.hxx>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Type.h>
#include <com/sun/star/uno/Type.hxx>
sal_allheaders.hxx now does not (explicitly) include
#include <cppunittester/protectorfactory.hxx>
#include <internal/rtllifecycle.h>
#include <osl/detail/android-bootstrap.h>
#include <osl/detail/component-mapping.h>
#include <osl/detail/file.h>
#include <osl/detail/ios-bootstrap.h>
#include <pch/precompiled_sal.hxx>
Change-Id: Ide3c708ac66f23b360b8e130790f8fa8f1911082
diff --git a/cppu/CppunitTest_cppu_checkapi.mk b/cppu/CppunitTest_cppu_checkapi.mk
index c47643a..bfd4dad 100644
--- a/cppu/CppunitTest_cppu_checkapi.mk
+++ b/cppu/CppunitTest_cppu_checkapi.mk
@@ -31,11 +31,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_checkapi,\
cppu/qa/checkapi/strings \
))
-$(eval $(call gb_CppunitTest_set_include,cppu_checkapi,\
- $$(INCLUDE) \
- -I$(SRCDIR)/cppu/inc \
-))
-
$(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppu_checkapi, \
cppu \
udkapi \
diff --git a/cppu/CustomTarget_cppu_allheaders.mk b/cppu/CustomTarget_cppu_allheaders.mk
index f7573f7..6959f5f 100644
--- a/cppu/CustomTarget_cppu_allheaders.mk
+++ b/cppu/CustomTarget_cppu_allheaders.mk
@@ -32,21 +32,13 @@ cppu_allheaders_DIR := $(call gb_CustomTarget_get_workdir,cppu/allheaders)
$(call gb_CustomTarget_get_target,cppu/allheaders) : \
$(cppu_allheaders_DIR)/cppu_allheaders.hxx
-# dependency on Package_cppu_odk_headers.mk should ensure this is
-# updated whenever a new public header is added
$(cppu_allheaders_DIR)/cppu_allheaders.hxx : \
- $(SRCDIR)/cppu/CustomTarget_cppu_allheaders.mk \
- $(SRCDIR)/cppu/Package_cppu_odk_headers.mk \
+ $(call gb_Package_get_target,cppu_odk_headers) \
| $(cppu_allheaders_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
- printf '// Generated list of all cppu/ includes\n' > $@
- $(foreach file, $(wildcard $(SRCDIR)/cppu/inc/*.h) $(wildcard $(SRCDIR)/cppu/inc/*.hxx) \
- $(wildcard $(SRCDIR)/cppu/inc/*/*.h) $(wildcard $(SRCDIR)/cppu/inc/*/*.hxx) \
- $(wildcard $(SRCDIR)/cppu/inc/*/*/*.h) $(wildcard $(SRCDIR)/cppu/inc/*/*/*.hxx) \
- $(wildcard $(SRCDIR)/cppu/inc/*/*/*/*.h) $(wildcard $(SRCDIR)/cppu/inc/*/*/*/*.hxx), \
- $(if $(findstring /win32/, $(file)), printf '#ifdef WNT\n' >> $@ &&) \
- printf '#include <%s>\n' $(subst $(SRCDIR)/cppu/inc/,,$(file)) >> $@ && \
- $(if $(findstring /win32/, $(file)), printf '#endif // WNT\n' >> $@ &&) \
- ) :
+ printf '// Generated list of cppu includes\n' > $@ \
+ $(foreach file,$(shell cat $<),\
+ && printf '#include <%s>\n' $(subst $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/,,$(file)) >> $@ \
+ )
# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk
index 68fd0ec..5e933d3 100644
--- a/cppuhelper/CppunitTest_cppuhelper_checkapi.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_checkapi.mk
@@ -31,11 +31,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_checkapi,\
cppuhelper/qa/checkapi/strings \
))
-$(eval $(call gb_CppunitTest_set_include,cppuhelper_checkapi,\
- $$(INCLUDE) \
- -I$(SRCDIR)/cppuhelper/inc \
-))
-
$(eval $(call gb_CppunitTest_use_internal_comprehensive_api,cppuhelper_checkapi, \
cppu \
udkapi \
diff --git a/cppuhelper/CustomTarget_cppuhelper_allheaders.mk b/cppuhelper/CustomTarget_cppuhelper_allheaders.mk
index a6d83d4..08c8ee3 100644
--- a/cppuhelper/CustomTarget_cppuhelper_allheaders.mk
+++ b/cppuhelper/CustomTarget_cppuhelper_allheaders.mk
@@ -32,21 +32,13 @@ cppuhelper_allheaders_DIR := $(call gb_CustomTarget_get_workdir,cppuhelper/allhe
$(call gb_CustomTarget_get_target,cppuhelper/allheaders) : \
$(cppuhelper_allheaders_DIR)/cppuhelper_allheaders.hxx
-# dependency on Package_cppuheaders_odk_headers.mk should ensure this is
-# updated whenever a new public header is added
$(cppuhelper_allheaders_DIR)/cppuhelper_allheaders.hxx : \
- $(SRCDIR)/cppuhelper/CustomTarget_cppuhelper_allheaders.mk \
- $(SRCDIR)/cppuhelper/Package_cppuhelper_odk_headers.mk \
+ $(call gb_Package_get_target,cppuhelper_odk_headers) \
| $(cppuhelper_allheaders_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
- printf '// Generated list of all cppuhelper/ includes\n' > $@
- $(foreach file, $(wildcard $(SRCDIR)/cppuhelper/inc/*.h) $(wildcard $(SRCDIR)/cppuhelper/inc/*.hxx) \
- $(wildcard $(SRCDIR)/cppuhelper/inc/*/*.h) $(wildcard $(SRCDIR)/cppuhelper/inc/*/*.hxx) \
- $(wildcard $(SRCDIR)/cppuhelper/inc/*/*/*.h) $(wildcard $(SRCDIR)/cppuhelper/inc/*/*/*.hxx) \
- $(wildcard $(SRCDIR)/cppuhelper/inc/*/*/*/*.h) $(wildcard $(SRCDIR)/cppuhelper/inc/*/*/*/*.hxx), \
- $(if $(findstring /win32/, $(file)), printf '#ifdef WNT\n' >> $@ &&) \
- printf '#include <%s>\n' $(subst $(SRCDIR)/cppuhelper/inc/,,$(file)) >> $@ && \
- $(if $(findstring /win32/, $(file)), printf '#endif // WNT\n' >> $@ &&) \
- ) :
+ printf '// Generated list of cppuhelper includes\n' > $@ \
+ $(foreach file,$(shell cat $<),\
+ && printf '#include <%s>\n' $(subst $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/,,$(file)) >> $@ \
+ )
# vim: set noet sw=4 ts=4:
diff --git a/sal/CppunitTest_sal_checkapi.mk b/sal/CppunitTest_sal_checkapi.mk
index b21f1ec..4feec9b 100644
--- a/sal/CppunitTest_sal_checkapi.mk
+++ b/sal/CppunitTest_sal_checkapi.mk
@@ -31,11 +31,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sal_checkapi,\
sal/qa/checkapi/strings \
))
-$(eval $(call gb_CppunitTest_set_include,sal_checkapi,\
- $$(INCLUDE) \
- -I$(SRCDIR)/sal/inc \
-))
-
$(eval $(call gb_CppunitTest_use_external,sal_checkapi,boost_headers))
# strings.cxx includes generated strings.hxx
diff --git a/sal/CustomTarget_sal_allheaders.mk b/sal/CustomTarget_sal_allheaders.mk
index 3beeb29..808f54f 100644
--- a/sal/CustomTarget_sal_allheaders.mk
+++ b/sal/CustomTarget_sal_allheaders.mk
@@ -32,23 +32,18 @@ sal_allheaders_DIR := $(call gb_CustomTarget_get_workdir,sal/allheaders)
$(call gb_CustomTarget_get_target,sal/allheaders) : \
$(sal_allheaders_DIR)/sal_allheaders.hxx
-# dependency on Package_inc.mk should ensure this is updated whenever a new public header is added
-$(sal_allheaders_DIR)/sal_allheaders.hxx : $(SRCDIR)/sal/CustomTarget_sal_allheaders.mk \
- $(SRCDIR)/sal/Package_sal_odk_headers.mk \
- $(SRCDIR)/sal/Package_inc.mk \
+$(sal_allheaders_DIR)/sal_allheaders.hxx : \
+ $(call gb_Package_get_target,sal_odk_headers) \
| $(sal_allheaders_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
- printf '// Generated list of all sal/ includes\n' > $@
- printf '#ifdef WNT\n' >> $@
- printf '#include <windows.h>\n' >> $@
- printf '#endif\n' >> $@
- $(foreach file, $(wildcard $(SRCDIR)/sal/inc/*.h) $(wildcard $(SRCDIR)/sal/inc/*.hxx) \
- $(wildcard $(SRCDIR)/sal/inc/*/*.h) $(wildcard $(SRCDIR)/sal/inc/*/*.hxx) \
- $(wildcard $(SRCDIR)/sal/inc/*/*/*.h) $(wildcard $(SRCDIR)/sal/inc/*/*/*.hxx) \
- $(wildcard $(SRCDIR)/sal/inc/*/*/*/*.h) $(wildcard $(SRCDIR)/sal/inc/*/*/*/*.hxx), \
- $(if $(findstring /win32/, $(file)), printf '#ifdef WNT\n' >> $@ &&) \
- printf '#include <%s>\n' $(subst $(SRCDIR)/sal/inc/,,$(file)) >> $@ && \
- $(if $(findstring /win32/, $(file)), printf '#endif // WNT\n' >> $@ &&) \
- ) :
+ printf '// Generated list of sal includes\n' > $@ && \
+ printf '#ifdef WNT\n' >> $@ && \
+ printf '#include <windows.h>\n' >> $@ && \
+ printf '#endif\n' >> $@ \
+ $(foreach file,$(shell cat $^),\
+ $(if $(findstring /win32/,$(file)),&& printf '#ifdef WNT\n' >> $@) \
+ && printf '#include <%s>\n' $(subst $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/,,$(file)) >> $@ \
+ $(if $(findstring /win32/,$(file)),&& printf '#endif // WNT\n' >> $@) \
+ )
# vim: set noet sw=4 ts=4:
diff --git a/salhelper/CppunitTest_salhelper_checkapi.mk b/salhelper/CppunitTest_salhelper_checkapi.mk
index dd5a08e..3fd3178 100644
--- a/salhelper/CppunitTest_salhelper_checkapi.mk
+++ b/salhelper/CppunitTest_salhelper_checkapi.mk
@@ -33,11 +33,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,salhelper_checkapi,\
salhelper/qa/checkapi/strings \
))
-$(eval $(call gb_CppunitTest_set_include,salhelper_checkapi,\
- $$(INCLUDE) \
- -I$(SRCDIR)/salhelper/inc \
-))
-
# strings.cxx includes generated strings.hxx
$(call gb_CxxObject_get_target,salhelper/qa/checkapi/strings) : \
INCLUDE += -I$(call gb_CustomTarget_get_workdir,salhelper/allheaders)
diff --git a/salhelper/CustomTarget_salhelper_allheaders.mk b/salhelper/CustomTarget_salhelper_allheaders.mk
index fd2e8d0..0415ccf 100644
--- a/salhelper/CustomTarget_salhelper_allheaders.mk
+++ b/salhelper/CustomTarget_salhelper_allheaders.mk
@@ -32,21 +32,13 @@ salhelper_allheaders_DIR := $(call gb_CustomTarget_get_workdir,salhelper/allhead
$(call gb_CustomTarget_get_target,salhelper/allheaders) : \
$(salhelper_allheaders_DIR)/salhelper_allheaders.hxx
-# dependency on Package_salhelper_odk_headers.mk should ensure this is
-# updated whenever a new public header is added
$(salhelper_allheaders_DIR)/salhelper_allheaders.hxx : \
- $(SRCDIR)/salhelper/CustomTarget_salhelper_allheaders.mk \
- $(SRCDIR)/salhelper/Package_salhelper_odk_headers.mk \
+ $(call gb_Package_get_target,salhelper_odk_headers) \
| $(salhelper_allheaders_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
- printf '// Generated list of all salhelper/ includes\n' > $@
- $(foreach file, $(wildcard $(SRCDIR)/salhelper/inc/*.h) $(wildcard $(SRCDIR)/salhelper/inc/*.hxx) \
- $(wildcard $(SRCDIR)/salhelper/inc/*/*.h) $(wildcard $(SRCDIR)/salhelper/inc/*/*.hxx) \
- $(wildcard $(SRCDIR)/salhelper/inc/*/*/*.h) $(wildcard $(SRCDIR)/salhelper/inc/*/*/*.hxx) \
- $(wildcard $(SRCDIR)/salhelper/inc/*/*/*/*.h) $(wildcard $(SRCDIR)/salhelper/inc/*/*/*/*.hxx), \
- $(if $(findstring /win32/, $(file)), printf '#ifdef _WIN32\n' >> $@ &&) \
- printf '#include <%s>\n' $(subst $(SRCDIR)/salhelper/inc/,,$(file)) >> $@ && \
- $(if $(findstring /win32/, $(file)), printf '#endif // _WIN32\n' >> $@ &&) \
- ) :
+ printf '// Generated list of salhelper includes\n' > $@ \
+ $(foreach file,$(shell cat $<),\
+ && printf '#include <%s>\n' $(subst $(INSTDIR)/$(gb_Package_SDKDIRNAME)/include/,,$(file)) >> $@ \
+ )
# vim: set noet sw=4 ts=4:
commit 6aca2a3d0eac2c01e487e15ba599f8237b9eef61
Author: David Tardon <dtardon at redhat.com>
Date: Sat Apr 13 07:43:35 2013 +0200
drop trailing /
Change-Id: I1f699f9e0294209478680ae3e2e12ae9085c91fc
diff --git a/cppu/Package_cppu_odk_headers.mk b/cppu/Package_cppu_odk_headers.mk
index 3b203fc..15459f7 100644
--- a/cppu/Package_cppu_odk_headers.mk
+++ b/cppu/Package_cppu_odk_headers.mk
@@ -52,7 +52,7 @@ $(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/inc
cppu/unotype.hxx \
))
-$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/cppu/helper/purpenv/,\
+$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/cppu/helper/purpenv,\
cppu/helper/purpenv/Environment.hxx \
cppu/helper/purpenv/Mapping.hxx \
))
commit 2ca2e8e7b4cd7530024d131918739b9b6fac96af
Author: David Tardon <dtardon at redhat.com>
Date: Fri Apr 12 16:00:19 2013 +0200
rebuild Package when a file is added
Change-Id: I58b8ad5393a4ca01c0131847f220f8c094609b69
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 8b51186..0c5f0ff 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -87,6 +87,7 @@ gb_Package_OUTDIR_$(1) := $(OUTDIR)
$(call gb_Package_get_target,$(1)) : FILES :=
$(call gb_Package_get_clean_target,$(1)) : FILES := $(call gb_Package_get_target,$(1)) $(call gb_Package_get_preparation_target,$(1))
$(call gb_Package_get_target,$(1)) : $(call gb_Package_get_preparation_target,$(1))
+$(call gb_Package_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
$(call gb_Package_get_target,$(1)) :| $(dir $(call gb_Package_get_target,$(1))).dir
endef
commit d3e93f256e5125b0948c89943b6c9bde6aa0d125
Author: David Tardon <dtardon at redhat.com>
Date: Fri Apr 12 12:08:03 2013 +0200
install SDK headers from filelists
... which allows us to drop gb_ZipPackage.
Change-Id: Ib19f774c63d9b83ec07e99f963533eee431cc53a
diff --git a/cppu/CustomTarget_cppu_allheaders.mk b/cppu/CustomTarget_cppu_allheaders.mk
index 6d5ebeb..f7573f7 100644
--- a/cppu/CustomTarget_cppu_allheaders.mk
+++ b/cppu/CustomTarget_cppu_allheaders.mk
@@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_target,cppu/allheaders) : \
# updated whenever a new public header is added
$(cppu_allheaders_DIR)/cppu_allheaders.hxx : \
$(SRCDIR)/cppu/CustomTarget_cppu_allheaders.mk \
- $(SRCDIR)/cppu/ZipPackage_cppu_odk_headers.mk \
+ $(SRCDIR)/cppu/Package_cppu_odk_headers.mk \
| $(cppu_allheaders_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
printf '// Generated list of all cppu/ includes\n' > $@
diff --git a/cppu/Module_cppu.mk b/cppu/Module_cppu.mk
index 6a5bf32..c957320 100644
--- a/cppu/Module_cppu.mk
+++ b/cppu/Module_cppu.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Module_add_targets,cppu,\
Library_log_uno \
Library_purpenvhelper \
Library_unsafe_uno \
- ZipPackage_cppu_odk_headers \
+ Package_cppu_odk_headers \
))
$(eval $(call gb_Module_add_check_targets,cppu,\
diff --git a/cppu/Package_cppu_odk_headers.mk b/cppu/Package_cppu_odk_headers.mk
new file mode 100644
index 0000000..3b203fc
--- /dev/null
+++ b/cppu/Package_cppu_odk_headers.mk
@@ -0,0 +1,85 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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 Matúš Kukan <matus.kukan at gmail.com>
+#
+# 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_Package_Package,cppu_odk_headers,$(SRCDIR)/cppu/inc))
+
+$(eval $(call gb_Package_set_outdir,cppu_odk_headers,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/com/sun/star/uno,\
+ com/sun/star/uno/Any.h \
+ com/sun/star/uno/Any.hxx \
+ com/sun/star/uno/genfunc.h \
+ com/sun/star/uno/genfunc.hxx \
+ com/sun/star/uno/Reference.h \
+ com/sun/star/uno/Reference.hxx \
+ com/sun/star/uno/Sequence.h \
+ com/sun/star/uno/Sequence.hxx \
+ com/sun/star/uno/Type.h \
+ com/sun/star/uno/Type.hxx \
+))
+
+$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/cppu,\
+ cppu/cppudllapi.h \
+ cppu/EnvDcp.hxx \
+ cppu/Enterable.hxx \
+ cppu/EnvGuards.hxx \
+ cppu/macros.hxx \
+ cppu/Map.hxx \
+ cppu/unotype.hxx \
+))
+
+$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/cppu/helper/purpenv/,\
+ cppu/helper/purpenv/Environment.hxx \
+ cppu/helper/purpenv/Mapping.hxx \
+))
+
+$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/typelib,\
+ typelib/typeclass.h \
+ typelib/typedescription.h \
+ typelib/typedescription.hxx \
+ typelib/uik.h \
+))
+
+$(eval $(call gb_Package_add_files,cppu_odk_headers,$(gb_Package_SDKDIRNAME)/include/uno,\
+ uno/any2.h \
+ uno/current_context.h \
+ uno/current_context.hxx \
+ uno/data.h \
+ uno/dispatcher.h \
+ uno/dispatcher.hxx \
+ uno/Enterable.h \
+ uno/EnvDcp.h \
+ uno/environment.h \
+ uno/environment.hxx \
+ uno/lbnames.h \
+ uno/mapping.h \
+ uno/mapping.hxx \
+ uno/sequence2.h \
+ uno/threadpool.h \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppu/ZipPackage_cppu_odk_headers.mk b/cppu/ZipPackage_cppu_odk_headers.mk
deleted file mode 100644
index 0b7c9dc..0000000
--- a/cppu/ZipPackage_cppu_odk_headers.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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 Matúš Kukan <matus.kukan at gmail.com>
-#
-# 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_ZipPackage_ZipPackage,cppu_odk_headers,$(SRCDIR)/cppu/inc))
-
-$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/com/sun/star/uno,include/com/sun/star/uno,\
- com/sun/star/uno/Any.h \
- com/sun/star/uno/Any.hxx \
- com/sun/star/uno/genfunc.h \
- com/sun/star/uno/genfunc.hxx \
- com/sun/star/uno/Reference.h \
- com/sun/star/uno/Reference.hxx \
- com/sun/star/uno/Sequence.h \
- com/sun/star/uno/Sequence.hxx \
- com/sun/star/uno/Type.h \
- com/sun/star/uno/Type.hxx \
-))
-
-$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/cppu,include/cppu,\
- cppu/cppudllapi.h \
- cppu/EnvDcp.hxx \
- cppu/Enterable.hxx \
- cppu/EnvGuards.hxx \
- cppu/macros.hxx \
- cppu/Map.hxx \
- cppu/unotype.hxx \
-))
-
-$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/cppu/helper/purpenv/,include/cppu/helper/purpenv/,\
- cppu/helper/purpenv/Environment.hxx \
- cppu/helper/purpenv/Mapping.hxx \
-))
-
-$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/typelib,include/typelib,\
- typelib/typeclass.h \
- typelib/typedescription.h \
- typelib/typedescription.hxx \
- typelib/uik.h \
-))
-
-$(eval $(call gb_ZipPackage_add_files,cppu_odk_headers,inc/uno,include/uno,\
- uno/any2.h \
- uno/current_context.h \
- uno/current_context.hxx \
- uno/data.h \
- uno/dispatcher.h \
- uno/dispatcher.hxx \
- uno/Enterable.h \
- uno/EnvDcp.h \
- uno/environment.h \
- uno/environment.hxx \
- uno/lbnames.h \
- uno/mapping.h \
- uno/mapping.hxx \
- uno/sequence2.h \
- uno/threadpool.h \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/CustomTarget_cppuhelper_allheaders.mk b/cppuhelper/CustomTarget_cppuhelper_allheaders.mk
index e5f9081..a6d83d4 100644
--- a/cppuhelper/CustomTarget_cppuhelper_allheaders.mk
+++ b/cppuhelper/CustomTarget_cppuhelper_allheaders.mk
@@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_target,cppuhelper/allheaders) : \
# updated whenever a new public header is added
$(cppuhelper_allheaders_DIR)/cppuhelper_allheaders.hxx : \
$(SRCDIR)/cppuhelper/CustomTarget_cppuhelper_allheaders.mk \
- $(SRCDIR)/cppuhelper/ZipPackage_cppuhelper_odk_headers.mk \
+ $(SRCDIR)/cppuhelper/Package_cppuhelper_odk_headers.mk \
| $(cppuhelper_allheaders_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
printf '// Generated list of all cppuhelper/ includes\n' > $@
diff --git a/cppuhelper/Module_cppuhelper.mk b/cppuhelper/Module_cppuhelper.mk
index 2a917fe..96fd971 100644
--- a/cppuhelper/Module_cppuhelper.mk
+++ b/cppuhelper/Module_cppuhelper.mk
@@ -31,9 +31,9 @@ $(eval $(call gb_Module_add_targets,cppuhelper,\
CustomTarget_cppuhelper_allheaders \
InternalUnoApi_cppuhelper \
Library_cppuhelper \
+ Package_cppuhelper_odk_headers \
Package_unorc \
StaticLibrary_findsofficepath \
- ZipPackage_cppuhelper_odk_headers \
))
$(eval $(call gb_Module_add_check_targets,cppuhelper,\
diff --git a/cppuhelper/Package_cppuhelper_odk_headers.mk b/cppuhelper/Package_cppuhelper_odk_headers.mk
new file mode 100644
index 0000000..93fac81
--- /dev/null
+++ b/cppuhelper/Package_cppuhelper_odk_headers.mk
@@ -0,0 +1,90 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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 Matúš Kukan <matus.kukan at gmail.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_Package_Package,cppuhelper_odk_headers,$(SRCDIR)/cppuhelper/inc))
+
+$(eval $(call gb_Package_set_outdir,cppuhelper_odk_headers,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,cppuhelper_odk_headers,$(gb_Package_SDKDIRNAME)/include/cppuhelper,\
+ cppuhelper/cppuhelperdllapi.h \
+ cppuhelper/access_control.hxx \
+ cppuhelper/basemutex.hxx \
+ cppuhelper/bootstrap.hxx \
+ cppuhelper/compbase10.hxx \
+ cppuhelper/compbase11.hxx \
+ cppuhelper/compbase12.hxx \
+ cppuhelper/compbase1.hxx \
+ cppuhelper/compbase2.hxx \
+ cppuhelper/compbase3.hxx \
+ cppuhelper/compbase4.hxx \
+ cppuhelper/compbase5.hxx \
+ cppuhelper/compbase6.hxx \
+ cppuhelper/compbase7.hxx \
+ cppuhelper/compbase8.hxx \
+ cppuhelper/compbase9.hxx \
+ cppuhelper/compbase_ex.hxx \
+ cppuhelper/compbase.hxx \
+ cppuhelper/component_context.hxx \
+ cppuhelper/component.hxx \
+ cppuhelper/exc_hlp.hxx \
+ cppuhelper/factory.hxx \
+ cppuhelper/findsofficepath.h \
+ cppuhelper/implbase10.hxx \
+ cppuhelper/implbase11.hxx \
+ cppuhelper/implbase12.hxx \
+ cppuhelper/implbase13.hxx \
+ cppuhelper/implbase1.hxx \
+ cppuhelper/implbase2.hxx \
+ cppuhelper/implbase3.hxx \
+ cppuhelper/implbase4.hxx \
+ cppuhelper/implbase5.hxx \
+ cppuhelper/implbase6.hxx \
+ cppuhelper/implbase7.hxx \
+ cppuhelper/implbase8.hxx \
+ cppuhelper/implbase9.hxx \
+ cppuhelper/implbase_ex.hxx \
+ cppuhelper/implbase_ex_post.hxx \
+ cppuhelper/implbase_ex_pre.hxx \
+ cppuhelper/implbase.hxx \
+ cppuhelper/implementationentry.hxx \
+ cppuhelper/interfacecontainer.h \
+ cppuhelper/interfacecontainer.hxx \
+ cppuhelper/propertysetmixin.hxx \
+ cppuhelper/propshlp.hxx \
+ cppuhelper/proptypehlp.h \
+ cppuhelper/proptypehlp.hxx \
+ cppuhelper/queryinterface.hxx \
+ cppuhelper/shlib.hxx \
+ cppuhelper/supportsservice.hxx \
+ cppuhelper/typeprovider.hxx \
+ cppuhelper/unourl.hxx \
+ cppuhelper/weakagg.hxx \
+ cppuhelper/weak.hxx \
+ cppuhelper/weakref.hxx \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/cppuhelper/ZipPackage_cppuhelper_odk_headers.mk b/cppuhelper/ZipPackage_cppuhelper_odk_headers.mk
deleted file mode 100644
index 2a95b6b..0000000
--- a/cppuhelper/ZipPackage_cppuhelper_odk_headers.mk
+++ /dev/null
@@ -1,88 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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 Matúš Kukan <matus.kukan at gmail.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_ZipPackage_ZipPackage,cppuhelper_odk_headers,$(SRCDIR)/cppuhelper/inc))
-
-$(eval $(call gb_ZipPackage_add_files,cppuhelper_odk_headers,inc/cppuhelper,include/cppuhelper,\
- cppuhelper/cppuhelperdllapi.h \
- cppuhelper/access_control.hxx \
- cppuhelper/basemutex.hxx \
- cppuhelper/bootstrap.hxx \
- cppuhelper/compbase10.hxx \
- cppuhelper/compbase11.hxx \
- cppuhelper/compbase12.hxx \
- cppuhelper/compbase1.hxx \
- cppuhelper/compbase2.hxx \
- cppuhelper/compbase3.hxx \
- cppuhelper/compbase4.hxx \
- cppuhelper/compbase5.hxx \
- cppuhelper/compbase6.hxx \
- cppuhelper/compbase7.hxx \
- cppuhelper/compbase8.hxx \
- cppuhelper/compbase9.hxx \
- cppuhelper/compbase_ex.hxx \
- cppuhelper/compbase.hxx \
- cppuhelper/component_context.hxx \
- cppuhelper/component.hxx \
- cppuhelper/exc_hlp.hxx \
- cppuhelper/factory.hxx \
- cppuhelper/findsofficepath.h \
- cppuhelper/implbase10.hxx \
- cppuhelper/implbase11.hxx \
- cppuhelper/implbase12.hxx \
- cppuhelper/implbase13.hxx \
- cppuhelper/implbase1.hxx \
- cppuhelper/implbase2.hxx \
- cppuhelper/implbase3.hxx \
- cppuhelper/implbase4.hxx \
- cppuhelper/implbase5.hxx \
- cppuhelper/implbase6.hxx \
- cppuhelper/implbase7.hxx \
- cppuhelper/implbase8.hxx \
- cppuhelper/implbase9.hxx \
- cppuhelper/implbase_ex.hxx \
- cppuhelper/implbase_ex_post.hxx \
- cppuhelper/implbase_ex_pre.hxx \
- cppuhelper/implbase.hxx \
- cppuhelper/implementationentry.hxx \
- cppuhelper/interfacecontainer.h \
- cppuhelper/interfacecontainer.hxx \
- cppuhelper/propertysetmixin.hxx \
- cppuhelper/propshlp.hxx \
- cppuhelper/proptypehlp.h \
- cppuhelper/proptypehlp.hxx \
- cppuhelper/queryinterface.hxx \
- cppuhelper/shlib.hxx \
- cppuhelper/supportsservice.hxx \
- cppuhelper/typeprovider.hxx \
- cppuhelper/unourl.hxx \
- cppuhelper/weakagg.hxx \
- cppuhelper/weak.hxx \
- cppuhelper/weakref.hxx \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sal/CustomTarget_sal_allheaders.mk b/sal/CustomTarget_sal_allheaders.mk
index 3374568..3beeb29 100644
--- a/sal/CustomTarget_sal_allheaders.mk
+++ b/sal/CustomTarget_sal_allheaders.mk
@@ -34,7 +34,7 @@ $(call gb_CustomTarget_get_target,sal/allheaders) : \
# dependency on Package_inc.mk should ensure this is updated whenever a new public header is added
$(sal_allheaders_DIR)/sal_allheaders.hxx : $(SRCDIR)/sal/CustomTarget_sal_allheaders.mk \
- $(SRCDIR)/sal/ZipPackage_sal_odk_headers.mk \
+ $(SRCDIR)/sal/Package_sal_odk_headers.mk \
$(SRCDIR)/sal/Package_inc.mk \
| $(sal_allheaders_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index b5c84b1..59a40a7 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -41,8 +41,8 @@ $(eval $(call gb_Module_add_targets,sal,\
Library_uwinapi) \
Package_inc \
StaticLibrary_salcpprt \
- ZipPackage_sal_generated \
- ZipPackage_sal_odk_headers \
+ Package_sal_generated \
+ Package_sal_odk_headers \
))
ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
diff --git a/sal/Package_sal_generated.mk b/sal/Package_sal_generated.mk
new file mode 100644
index 0000000..86578da
--- /dev/null
+++ b/sal/Package_sal_generated.mk
@@ -0,0 +1,34 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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 Matúš Kukan <matus.kukan at gmail.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_Package_Package,sal_generated,$(BUILDDIR)/config_$(gb_Side)))
+
+$(eval $(call gb_Package_set_outdir,sal_generated,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,sal_generated,$(gb_Package_SDKDIRNAME)/include/sal/typesizes.h,config_typesizes.h))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sal/Package_sal_odk_headers.mk b/sal/Package_sal_odk_headers.mk
new file mode 100644
index 0000000..613eebc
--- /dev/null
+++ b/sal/Package_sal_odk_headers.mk
@@ -0,0 +1,109 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,sal_odk_headers,$(SRCDIR)/sal/inc))
+
+$(eval $(call gb_Package_set_outdir,sal_odk_headers,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,sal_odk_headers,$(gb_Package_SDKDIRNAME)/include/sal,\
+ sal/alloca.h \
+ sal/ByteBufferWrapper.hxx \
+ sal/config.h \
+ sal/log.hxx \
+ sal/macros.h \
+ sal/main.h \
+ sal/mathconf.h \
+ sal/saldllapi.h \
+ sal/types.h \
+))
+
+$(eval $(call gb_Package_add_files,sal_odk_headers,$(gb_Package_SDKDIRNAME)/include/sal/detail,\
+ sal/detail/log.h \
+))
+
+$(eval $(call gb_Package_add_files,sal_odk_headers,$(gb_Package_SDKDIRNAME)/include/rtl,\
+ rtl/allocator.hxx \
+ rtl/alloc.h \
+ rtl/bootstrap.h \
+ rtl/bootstrap.hxx \
+ rtl/byteseq.h \
+ rtl/byteseq.hxx \
+ rtl/character.hxx \
+ rtl/cipher.h \
+ rtl/crc.h \
+ rtl/digest.h \
+ rtl/instance.hxx \
+ rtl/locale.h \
+ rtl/logfile.h \
+ rtl/logfile.hxx \
+ rtl/malformeduriexception.hxx \
+ rtl/math.h \
+ rtl/math.hxx \
+ rtl/process.h \
+ rtl/random.h \
+ rtl/ref.hxx \
+ rtl/strbuf.h \
+ rtl/strbuf.hxx \
+ rtl/string.h \
+ rtl/string.hxx \
+ rtl/stringconcat.hxx \
+ rtl/stringutils.hxx \
+ rtl/tencinfo.h \
+ rtl/textcvt.h \
+ rtl/textenc.h \
+ rtl/unload.h \
+ rtl/uri.h \
+ rtl/uri.hxx \
+ rtl/ustrbuf.h \
+ rtl/ustrbuf.hxx \
+ rtl/ustring.h \
+ rtl/ustring.hxx \
+ rtl/uuid.h \
+))
+
+$(eval $(call gb_Package_add_files,sal_odk_headers,$(gb_Package_SDKDIRNAME)/include/osl,\
+ osl/conditn.h \
+ osl/conditn.hxx \
+ osl/diagnose.h \
+ osl/diagnose.hxx \
+ osl/doublecheckedlocking.h \
+ osl/endian.h \
+ osl/file.h \
+ osl/file.hxx \
+ osl/getglobalmutex.hxx \
+ osl/interlck.h \
+ osl/module.h \
+ osl/module.hxx \
+ osl/mutex.h \
+ osl/mutex.hxx \
+ osl/nlsupport.h \
+ osl/pipe_decl.hxx \
+ osl/pipe.h \
+ osl/pipe.hxx \
+ osl/process.h \
+ osl/profile.h \
+ osl/profile.hxx \
+ osl/security_decl.hxx \
+ osl/security.h \
+ osl/security.hxx \
+ osl/signal.h \
+ osl/socket_decl.hxx \
+ osl/socket.h \
+ osl/socket.hxx \
+ osl/thread.h \
+ osl/thread.hxx \
+ osl/time.h \
+ osl/util.h \
+))
+
+$(eval $(call gb_Package_add_files,sal_odk_headers,$(gb_Package_SDKDIRNAME)/include/systools/win32,\
+ systools/win32/snprintf.h \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sal/ZipPackage_sal_generated.mk b/sal/ZipPackage_sal_generated.mk
deleted file mode 100644
index 0cd7442..0000000
--- a/sal/ZipPackage_sal_generated.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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 Matúš Kukan <matus.kukan at gmail.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_ZipPackage_ZipPackage,sal_generated,$(BUILDDIR)/config_$(gb_Side)))
-
-$(eval $(call gb_ZipPackage_add_file,sal_generated,inc/sal/typesizes.h,include/sal/typesizes.h,config_typesizes.h))
-
-# vim: set noet sw=4 ts=4:
diff --git a/sal/ZipPackage_sal_odk_headers.mk b/sal/ZipPackage_sal_odk_headers.mk
deleted file mode 100644
index 696bc60..0000000
--- a/sal/ZipPackage_sal_odk_headers.mk
+++ /dev/null
@@ -1,107 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ZipPackage_ZipPackage,sal_odk_headers,$(SRCDIR)/sal/inc))
-
-$(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/sal,include/sal,\
- sal/alloca.h \
- sal/ByteBufferWrapper.hxx \
- sal/config.h \
- sal/log.hxx \
- sal/macros.h \
- sal/main.h \
- sal/mathconf.h \
- sal/saldllapi.h \
- sal/types.h \
-))
-
-$(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/sal/detail,include/sal/detail,\
- sal/detail/log.h \
-))
-
-$(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/rtl,include/rtl,\
- rtl/allocator.hxx \
- rtl/alloc.h \
- rtl/bootstrap.h \
- rtl/bootstrap.hxx \
- rtl/byteseq.h \
- rtl/byteseq.hxx \
- rtl/character.hxx \
- rtl/cipher.h \
- rtl/crc.h \
- rtl/digest.h \
- rtl/instance.hxx \
- rtl/locale.h \
- rtl/logfile.h \
- rtl/logfile.hxx \
- rtl/malformeduriexception.hxx \
- rtl/math.h \
- rtl/math.hxx \
- rtl/process.h \
- rtl/random.h \
- rtl/ref.hxx \
- rtl/strbuf.h \
- rtl/strbuf.hxx \
- rtl/string.h \
- rtl/string.hxx \
- rtl/stringconcat.hxx \
- rtl/stringutils.hxx \
- rtl/tencinfo.h \
- rtl/textcvt.h \
- rtl/textenc.h \
- rtl/unload.h \
- rtl/uri.h \
- rtl/uri.hxx \
- rtl/ustrbuf.h \
- rtl/ustrbuf.hxx \
- rtl/ustring.h \
- rtl/ustring.hxx \
- rtl/uuid.h \
-))
-
-$(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/osl,include/osl,\
- osl/conditn.h \
- osl/conditn.hxx \
- osl/diagnose.h \
- osl/diagnose.hxx \
- osl/doublecheckedlocking.h \
- osl/endian.h \
- osl/file.h \
- osl/file.hxx \
- osl/getglobalmutex.hxx \
- osl/interlck.h \
- osl/module.h \
- osl/module.hxx \
- osl/mutex.h \
- osl/mutex.hxx \
- osl/nlsupport.h \
- osl/pipe_decl.hxx \
- osl/pipe.h \
- osl/pipe.hxx \
- osl/process.h \
- osl/profile.h \
- osl/profile.hxx \
- osl/security_decl.hxx \
- osl/security.h \
- osl/security.hxx \
- osl/signal.h \
- osl/socket_decl.hxx \
- osl/socket.h \
- osl/socket.hxx \
- osl/thread.h \
- osl/thread.hxx \
- osl/time.h \
- osl/util.h \
-))
-
-$(eval $(call gb_ZipPackage_add_files,sal_odk_headers,inc/systools/win32,include/systools/win32,\
- systools/win32/snprintf.h \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/salhelper/CustomTarget_salhelper_allheaders.mk b/salhelper/CustomTarget_salhelper_allheaders.mk
index 60498aa..fd2e8d0 100644
--- a/salhelper/CustomTarget_salhelper_allheaders.mk
+++ b/salhelper/CustomTarget_salhelper_allheaders.mk
@@ -36,7 +36,7 @@ $(call gb_CustomTarget_get_target,salhelper/allheaders) : \
# updated whenever a new public header is added
$(salhelper_allheaders_DIR)/salhelper_allheaders.hxx : \
$(SRCDIR)/salhelper/CustomTarget_salhelper_allheaders.mk \
- $(SRCDIR)/salhelper/ZipPackage_salhelper_odk_headers.mk \
+ $(SRCDIR)/salhelper/Package_salhelper_odk_headers.mk \
| $(salhelper_allheaders_DIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
printf '// Generated list of all salhelper/ includes\n' > $@
diff --git a/salhelper/Module_salhelper.mk b/salhelper/Module_salhelper.mk
index 31f3f22..7ba68a9 100644
--- a/salhelper/Module_salhelper.mk
+++ b/salhelper/Module_salhelper.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Module_Module,salhelper))
$(eval $(call gb_Module_add_targets,salhelper,\
CustomTarget_salhelper_allheaders \
Library_salhelper \
- ZipPackage_salhelper_odk_headers \
+ Package_salhelper_odk_headers \
))
$(eval $(call gb_Module_add_check_targets,salhelper,\
diff --git a/salhelper/Package_salhelper_odk_headers.mk b/salhelper/Package_salhelper_odk_headers.mk
new file mode 100644
index 0000000..89ae614
--- /dev/null
+++ b/salhelper/Package_salhelper_odk_headers.mk
@@ -0,0 +1,44 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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 Matúš Kukan <matus.kukan at gmail.com>
+#
+# 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_Package_Package,salhelper_odk_headers,$(SRCDIR)/salhelper/inc/salhelper))
+
+$(eval $(call gb_Package_set_outdir,salhelper_odk_headers,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,salhelper_odk_headers,$(gb_Package_SDKDIRNAME)/include/salhelper,\
+ salhelperdllapi.h \
+ condition.hxx \
+ dynload.hxx \
+ linkhelper.hxx \
+ refobj.hxx \
+ simplereferenceobject.hxx \
+ singletonref.hxx \
+ thread.hxx \
+ timer.hxx \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/salhelper/ZipPackage_salhelper_odk_headers.mk b/salhelper/ZipPackage_salhelper_odk_headers.mk
deleted file mode 100644
index 8de4d5f..0000000
--- a/salhelper/ZipPackage_salhelper_odk_headers.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
-#
-# 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 Matúš Kukan <matus.kukan at gmail.com>
-#
-# 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_ZipPackage_ZipPackage,salhelper_odk_headers,$(SRCDIR)/salhelper/inc/salhelper))
-
-$(eval $(call gb_ZipPackage_add_files,salhelper_odk_headers,inc/salhelper,include/salhelper,\
- salhelperdllapi.h \
- condition.hxx \
- dynload.hxx \
- linkhelper.hxx \
- refobj.hxx \
- simplereferenceobject.hxx \
- singletonref.hxx \
- thread.hxx \
- timer.hxx \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index ff64264..b1eb1dd 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -147,37 +147,37 @@ End
File gid_File_Zip_Odkheaders_sal_generated
TXT_FILE_BODY;
- Dir = gid_Dir_Basis_Sdk;
- Name = "sal_generated.zip";
- Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+ Dir = FILELIST_SDK_DIR;
+ Name = "sal_generated.filelist";
+ Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End
File gid_File_Zip_Odkheaders_sal
TXT_FILE_BODY;
- Dir = gid_Dir_Basis_Sdk;
- Name = "sal_odk_headers.zip";
- Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+ Dir = FILELIST_SDK_DIR;
+ Name = "sal_odk_headers.filelist";
+ Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End
File gid_File_Zip_Odkheaders_salhelper
TXT_FILE_BODY;
- Dir = gid_Dir_Basis_Sdk;
- Name = "salhelper_odk_headers.zip";
- Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+ Dir = FILELIST_SDK_DIR;
+ Name = "salhelper_odk_headers.filelist";
+ Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End
File gid_File_Zip_Odkheaders_cppu
TXT_FILE_BODY;
- Dir = gid_Dir_Basis_Sdk;
- Name = "cppu_odk_headers.zip";
- Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+ Dir = FILELIST_SDK_DIR;
+ Name = "cppu_odk_headers.filelist";
+ Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End
File gid_File_Zip_Odkheaders_cppuhelper
TXT_FILE_BODY;
- Dir = gid_Dir_Basis_Sdk;
- Name = "cppuhelper_odk_headers.zip";
- Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+ Dir = FILELIST_SDK_DIR;
+ Name = "cppuhelper_odk_headers.filelist";
+ Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End
#if (!defined(WNT) && !defined( MACOSX) )
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index d872878..f56d9b2 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -235,7 +235,6 @@ gb_XcuMergeTarget_get_target = $(WORKDIR)/XcuMergeTarget/$(1)
gb_XcuResTarget_get_target = $(WORKDIR)/XcuResTarget/$(1)
gb_Zip_get_target = $(WORKDIR)/Zip/$(1).zip
gb_Zip_get_final_target = $(WORKDIR)/Zip/$(1).done
-gb_ZipPackage_get_target = $(WORKDIR)/ZipPackage/$(1)
gb_Library__get_final_target = $(WORKDIR)/Dummy/$(1)
diff --git a/solenv/gbuild/ZipPackage.mk b/solenv/gbuild/ZipPackage.mk
deleted file mode 100644
index 612486c..0000000
--- a/solenv/gbuild/ZipPackage.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-# ZipPackage class
-# this is a bit of a hack, hopefully needed only temporarily because
-# scp2 can easily deal with zip files but not so easily with 100s of
-# individual files; ideally the Package itself should be sufficient.
-
-define gb_ZipPackage_ZipPackage
-$(call gb_Package_Package,$(1),$(2))
-$(call gb_Zip_Zip_internal,$(1),$(WORKDIR)/Zip/$(1))
-$(call gb_Package_get_target,$(1)) : $(call gb_Zip_get_final_target,$(1))
-$(call gb_Package_get_clean_target,$(1)) : $(call gb_Zip_get_clean_target,$(1))
-$(call gb_ZipPackage_get_target,$(1)) : $(call gb_Package_get_target,$(1))
-$(call gb_Helper_make_userfriendly_targets,$(1),ZipPackage)
-
-endef
-
-# sadly Package delivers to inc/ but ODK path is include/ so need to
-# copy files twice
-# $(1) package
-# $(2) dir in package
-# $(3) dir in zip
-# $(4) file list
-define gb_ZipPackage_add_files
-$(call gb_Package_add_files,$(1),$(2),$(4))
-$(foreach file,$(4),$(call gb_Zip_add_file,$(1),$(3)/$(notdir $(file)),$(gb_Package_SOURCEDIR_$(1))/$(file)))
-
-endef
-
-# $(1) package
-# $(2) file in package
-# $(3) file in zip
-# $(4) file source
-define gb_ZipPackage_add_file
-$(call gb_Package_add_file,$(1),$(2),$(4))
-$(call gb_Zip_add_file,$(1),$(3),$(gb_Package_SOURCEDIR_$(1))/$(4))
-
-endef
-
-# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 3853618..87a5c65 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -331,7 +331,6 @@ include $(foreach class, \
CliNativeLibrary \
CliUnoApi \
Zip \
- ZipPackage \
AllLangPackage \
Configuration \
HelpTarget \
commit ea09e0352a82dabc26c713adc1825d89ff824178
Author: David Tardon <dtardon at redhat.com>
Date: Fri Apr 12 09:51:36 2013 +0200
add extra inc. dir for URE headers
This is in preparation for removing gb_ZipPackage. It is only a
temporary workaround, as the URE headers can be used directly from
$(SRCDIR), once we do the migration of public headers to top-level.
This commit should be reverted then.
Change-Id: I26b7ad6eb7b33797c174573e3c2f69d295408657
diff --git a/configure.ac b/configure.ac
index 23e3ca4..1d00ebb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3371,11 +3371,20 @@ AC_SUBST(x_OBJCFLAGS)
AC_SUBST(x_OBJCXXFLAGS)
AC_SUBST(x_LDFLAGS)
+dnl ===================================================================
+dnl Product version
+dnl ===================================================================
+AC_MSG_CHECKING([for product version])
+PRODUCTVERSION=AC_PACKAGE_VERSION
+AC_MSG_RESULT([$PRODUCTVERSION])
+AC_SUBST(PRODUCTVERSION)
+
#
# determine CPU, CPUNAME, GUI, GUIBASE, ...
#
LIB64="lib"
SOLARINC=
+SDKDIR="sdk"
case "$host_os" in
@@ -3434,6 +3443,7 @@ darwin*)
OS=MACOSX
RTL_OS=MacOSX
P_SEP=:
+ SDKDIR="LibreOffice${PRODUCTVERSION}_SDK"
case "$host_cpu" in
arm*)
@@ -3918,7 +3928,7 @@ else
INSTDIR=${BUILDDIR}/instdir/${INPATH}
fi
OUTDIR="${SOLARVER}/${INPATH}"
-SOLARINC="-I. -I${SOLARVER}/$INPATH/inc/external -I${SOLARVER}/$INPATH/inc -I$SRC_ROOT/solenv/inc $SOLARINC"
+SOLARINC="-I. -I${SOLARVER}/$INPATH/inc/external -I${SOLARVER}/$INPATH/inc -I${INSTDIR}/${SDKDIR}/include -I$SRC_ROOT/solenv/inc $SOLARINC"
AC_SUBST(COM)
AC_SUBST(CPU)
AC_SUBST(CPUNAME)
@@ -11249,14 +11259,6 @@ AC_SUBST(CURL)
AC_SUBST(MD5SUM)
dnl ===================================================================
-dnl Product version
-dnl ===================================================================
-AC_MSG_CHECKING([for product version])
-PRODUCTVERSION=AC_PACKAGE_VERSION
-AC_MSG_RESULT([$PRODUCTVERSION])
-AC_SUBST(PRODUCTVERSION)
-
-dnl ===================================================================
dnl Dealing with l10n options
dnl ===================================================================
AC_MSG_CHECKING([which languages to be built])
commit ddd9e1257562486f1d5e1e58f5287b14633f7995
Author: David Tardon <dtardon at redhat.com>
Date: Thu Apr 11 17:25:40 2013 +0200
add some comments
Change-Id: Ife488b476fff54872aa830cff218d4a642f528fc
diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
index 6ec1d49..c6b61f5 100644
--- a/solenv/gbuild/Pyuno.mk
+++ b/solenv/gbuild/Pyuno.mk
@@ -25,6 +25,15 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
+# class Pyuno
+#
+# Handles creation and delivery of Python UNO components.
+#
+# Provides one filelist, called Pyuno/<name>.
+
+# platform
+# gb_Pyuno_PROGRAMDIRNAME
+
$(dir $(call gb_Pyuno_get_target,%)).dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
@@ -42,6 +51,7 @@ $(call gb_Pyuno_get_clean_target,%) :
gb_Pyuno_get_packagename = Pyuno/$(1)
+# gb_Pyuno_Pyuno component
define gb_Pyuno_Pyuno
$(call gb_Package_Package_internal,$(call gb_Pyuno_get_packagename,$(1)),$(2))
$(call gb_Package_set_outdir,$(call gb_Pyuno_get_packagename,$(1)),$(INSTDIR))
@@ -55,11 +65,13 @@ $(call gb_Helper_make_userfriendly_targets,$(1),Pyuno)
endef
+# gb_Pyuno_add_file component destination source
define gb_Pyuno_add_file
$(call gb_Package_add_file,$(call gb_Pyuno_get_packagename,$(1)),$(gb_Pyuno_PROGRAMDIRNAME)/$(2),$(3))
endef
+# gb_Pyuno_add_files component destdir source
define gb_Pyuno_add_files
$(foreach file,$(3),$(call gb_Pyuno_add_file,$(1),$(if $(strip $(2)),$(strip $(2))/)$(file),$(file)))
@@ -74,6 +86,7 @@ $(call gb_Pyuno_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_tar
endef
+# Set .component file for the component.
define gb_Pyuno_set_componentfile
$(call gb_Pyuno_set_componentfile_full,$(1),$(2),$(gb_Pyuno__COMPONENTPREFIX),$(1))
commit b80f40c56a87e82e29327aa11c920269d01e7f72
Author: David Tardon <dtardon at redhat.com>
Date: Thu Apr 11 16:22:18 2013 +0200
keep filename in sync with the Pyuno name
Change-Id: I7f171e3908eeddb5f24fd82fe7eb5cfbce77affe
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 38a9eb8..c5b8fc4 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -486,7 +486,7 @@ File gid_File_Wizards_Common
Dir = FILELIST_DIR;
TXT_FILE_BODY;
Styles = (FILELIST);
- Name = "Pyuno/wizards.filelist";
+ Name = "Pyuno/commonwizards.filelist";
End
File gid_File_Wizards_Fax
diff --git a/wizards/Pyuno_commonwizards.mk b/wizards/Pyuno_commonwizards.mk
index c3a9672..ead94f2 100644
--- a/wizards/Pyuno_commonwizards.mk
+++ b/wizards/Pyuno_commonwizards.mk
@@ -25,9 +25,9 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_Pyuno_Pyuno,wizards,$(SRCDIR)/wizards/com/sun/star/wizards))
+$(eval $(call gb_Pyuno_Pyuno,commonwizards,$(SRCDIR)/wizards/com/sun/star/wizards))
-$(eval $(call gb_Pyuno_add_files,wizards,wizards,\
+$(eval $(call gb_Pyuno_add_files,commonwizards,wizards,\
__init__.py \
common/__init__.py \
common/ConfigGroup.py \
commit d01478a87aaf7c61d6be5d6eae9812c218497239
Author: David Tardon <dtardon at redhat.com>
Date: Thu Apr 11 16:20:36 2013 +0200
install Pyuno using Package
Change-Id: Iabc029091096c82ff2dc79f0fad8f2bf9ee89514
diff --git a/desktop/Pyuno_passive_python.mk b/desktop/Pyuno_passive_python.mk
index d13431d..348de4a 100644
--- a/desktop/Pyuno_passive_python.mk
+++ b/desktop/Pyuno_passive_python.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Pyuno_Pyuno,passive_python,$(SRCDIR)/desktop/test/deployment/passive))
-$(eval $(call gb_Pyuno_add_files,passive_python, \
+$(eval $(call gb_Pyuno_add_files,passive_python,,\
passive_python.py \
))
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 93f8923..38a9eb8 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -483,33 +483,38 @@ End
#ifndef DISABLE_PYUNO
File gid_File_Wizards_Common
- Dir = gid_Dir_Wizards;
- ARCHIVE_TXT_FILE_BODY;
- Name = "wizards.zip";
+ Dir = FILELIST_DIR;
+ TXT_FILE_BODY;
+ Styles = (FILELIST);
+ Name = "Pyuno/wizards.filelist";
End
File gid_File_Wizards_Fax
- Dir = gid_Dir_Wizards_Fax;
- ARCHIVE_TXT_FILE_BODY;
- Name = "fax.zip";
+ Dir = FILELIST_DIR;
+ TXT_FILE_BODY;
+ Styles = (FILELIST);
+ Name = "Pyuno/fax.filelist";
End
File gid_File_Wizards_Letter
- Dir = gid_Dir_Wizards_Letter;
- ARCHIVE_TXT_FILE_BODY;
- Name = "letter.zip";
+ Dir = FILELIST_DIR;
+ TXT_FILE_BODY;
+ Styles = (FILELIST);
+ Name = "Pyuno/letter.filelist";
End
File gid_File_Wizards_Agenda
- Dir = gid_Dir_Wizards_Agenda;
- ARCHIVE_TXT_FILE_BODY;
- Name = "agenda.zip";
+ Dir = FILELIST_DIR;
+ TXT_FILE_BODY;
+ Styles = (FILELIST);
+ Name = "Pyuno/agenda.filelist";
End
File gid_File_Pymailmerge
- Dir = gid_Brand_Dir_Program;
- ARCHIVE_TXT_FILE_BODY;
- Name = "mailmerge.zip";
+ Dir = FILELIST_DIR;
+ TXT_FILE_BODY;
+ Styles = (FILELIST);
+ Name = "Pyuno/mailmerge.filelist";
End
#endif
#endif
diff --git a/scripting/Pyuno_mailmerge.mk b/scripting/Pyuno_mailmerge.mk
index ae814f4..aa4e77f 100644
--- a/scripting/Pyuno_mailmerge.mk
+++ b/scripting/Pyuno_mailmerge.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Pyuno_Pyuno,mailmerge,$(SRCDIR)/scripting/source/pyprov))
$(eval $(call gb_Pyuno_set_componentfile,mailmerge,scripting/source/pyprov/mailmerge))
-$(eval $(call gb_Pyuno_add_files,mailmerge,\
+$(eval $(call gb_Pyuno_add_files,mailmerge,,\
mailmerge.py \
msgbox.py \
officehelper.py \
diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
index 3384eed8..6ec1d49 100644
--- a/solenv/gbuild/Pyuno.mk
+++ b/solenv/gbuild/Pyuno.mk
@@ -25,34 +25,43 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
+$(dir $(call gb_Pyuno_get_target,%)).dir :
+ $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_Pyuno_get_target,%))%/.dir :
+ $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
$(call gb_Pyuno_get_target,%) :
$(call gb_Output_announce,$*,$(true),PYU,3)
- mkdir -p $(dir $@) && touch $@
+ touch $@
.PHONY : $(call gb_Pyuno_get_clean_target,%)
$(call gb_Pyuno_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),PYU,3)
- rm -f $(call gb_Pyuno_get_target,$*) $(call gb_Pyuno_get_outdir_target,$*)
+ rm -f $(call gb_Pyuno_get_target,$*)
+
+gb_Pyuno_get_packagename = Pyuno/$(1)
define gb_Pyuno_Pyuno
-$(call gb_Zip_Zip_internal_nodeliver,Pyuno/$(1),$(2))
+$(call gb_Package_Package_internal,$(call gb_Pyuno_get_packagename,$(1)),$(2))
+$(call gb_Package_set_outdir,$(call gb_Pyuno_get_packagename,$(1)),$(INSTDIR))
+
+$(call gb_Pyuno_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_Pyuno_get_packagename,$(1)))
+$(call gb_Pyuno_get_target,$(1)) :| $(dir $(call gb_Pyuno_get_target,$(1))).dir
+$(call gb_Pyuno_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_Pyuno_get_packagename,$(1)))
+
$$(eval $$(call gb_Module_register_target,$(call gb_Pyuno_get_target,$(1)),$(call gb_Pyuno_get_clean_target,$(1))))
$(call gb_Helper_make_userfriendly_targets,$(1),Pyuno)
-$(call gb_Deliver_add_deliverable,$(call gb_Pyuno_get_outdir_target,$(1)),$(call gb_Zip_get_target,Pyuno/$(1)),$(1))
-$(call gb_Pyuno_get_target,$(1)) : $(call gb_Pyuno_get_outdir_target,$(1))
-$(call gb_Pyuno_get_outdir_target,$(1)) : $(call gb_Zip_get_target,Pyuno/$(1))
-$(call gb_Pyuno_get_outdir_target,$(1)) :| $(dir $(call gb_Pyuno_get_outdir_target,$(1))).dir
-$(call gb_Pyuno_get_clean_target,$(1)) : $(call gb_Zip_get_clean_target,Pyuno/$(1))
endef
define gb_Pyuno_add_file
-$(call gb_Zip_add_file,Pyuno/$(1),$(2))
+$(call gb_Package_add_file,$(call gb_Pyuno_get_packagename,$(1)),$(gb_Pyuno_PROGRAMDIRNAME)/$(2),$(3))
endef
define gb_Pyuno_add_files
-$(foreach file,$(2),$(call gb_Pyuno_add_file,$(1),$(file)))
+$(foreach file,$(3),$(call gb_Pyuno_add_file,$(1),$(if $(strip $(2)),$(strip $(2))/)$(file),$(file)))
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index ffc5a93..d872878 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -171,9 +171,7 @@ gb_Postprocess_get_target = $(WORKDIR)/Postprocess/$(1)
gb_PrecompiledHeader_get_dep_target = $(WORKDIR)/Dep/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.gch.d
gb_PrecompiledHeader_get_target = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.gch
gb_PrecompiledHeader_get_timestamp = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/Timestamps/$(1)
-gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1).zip
-gb_Pyuno_get_outdir_target = $(OUTDIR)/bin/$(1).zip
-gb_PyunoFile_get_target = $(WORKDIR)/Pyuno/$(1)/contents/$(2)
+gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1).done
gb_Rdb_get_target = $(WORKDIR)/Rdb/$(1).rdb
gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst
gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index fa070ca..78ba92d 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -295,6 +295,10 @@ endef
gb_UIMenubarTarget_UIMenubarTarget_platform :=
+# Pyuno class
+
+gb_Pyuno_PROGRAMDIRNAME := program
+
# Python
gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 469bb5f..ce4b1b7 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -429,6 +429,10 @@ endef
gb_UIMenubarTarget_UIMenubarTarget_platform :=
+# Pyuno class
+
+gb_Pyuno_PROGRAMDIRNAME := program
+
# Python
gb_PYTHON_PRECOMMAND := PATH="$${PATH}:$(OUTDIR_FOR_BUILD)/bin" PYTHONHOME="$(OUTDIR_FOR_BUILD)/lib/python" PYTHONPATH="$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload"
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index e3fc4d7..a14a871 100755
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -608,6 +608,10 @@ endef
gb_UIMenubarTarget_UIMenubarTarget_platform :=
+# Pyuno class
+
+gb_Pyuno_PROGRAMDIRNAME := program
+
# Python
gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME="$(OUTDIR_FOR_BUILD)/lib/python" PYTHONPATH="$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload"
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 88e0953..a780c59 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -377,6 +377,10 @@ endef
# Python
gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+# Pyuno class
+
+gb_Pyuno_PROGRAMDIRNAME := MacOS
+
include $(GBUILDDIR)/platform/com_GCC_class.mk
# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index d8bb1c8..d4780aeb 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -421,6 +421,10 @@ endef
gb_UIMenubarTarget_UIMenubarTarget_platform :=
+# Pyuno class
+
+gb_Pyuno_PROGRAMDIRNAME := program
+
# Python
gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index ae9081f..01b0790 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -419,6 +419,10 @@ endef
gb_UIMenubarTarget_UIMenubarTarget_platform :=
+# Pyuno class
+
+gb_Pyuno_PROGRAMDIRNAME := program
+
# Python
gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload
diff --git a/wizards/Pyuno_agenda.mk b/wizards/Pyuno_agenda.mk
index f844303..2c46553 100644
--- a/wizards/Pyuno_agenda.mk
+++ b/wizards/Pyuno_agenda.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Pyuno_Pyuno,agenda,$(SRCDIR)/wizards/com/sun/star/wizards/agenda))
-$(eval $(call gb_Pyuno_add_files,agenda,\
+$(eval $(call gb_Pyuno_add_files,agenda,wizards/agenda,\
AgendaDocument.py \
AgendaWizardDialogConst.py \
AgendaWizardDialogImpl.py \
diff --git a/wizards/Pyuno_commonwizards.mk b/wizards/Pyuno_commonwizards.mk
index f213bb1..c3a9672 100644
--- a/wizards/Pyuno_commonwizards.mk
+++ b/wizards/Pyuno_commonwizards.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Pyuno_Pyuno,wizards,$(SRCDIR)/wizards/com/sun/star/wizards))
-$(eval $(call gb_Pyuno_add_files,wizards,\
+$(eval $(call gb_Pyuno_add_files,wizards,wizards,\
__init__.py \
common/__init__.py \
common/ConfigGroup.py \
diff --git a/wizards/Pyuno_fax.mk b/wizards/Pyuno_fax.mk
index a5a1c1d..78e5f8f 100644
--- a/wizards/Pyuno_fax.mk
+++ b/wizards/Pyuno_fax.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Pyuno_Pyuno,fax,$(SRCDIR)/wizards/com/sun/star/wizards/fax))
-$(eval $(call gb_Pyuno_add_files,fax,\
+$(eval $(call gb_Pyuno_add_files,fax,wizards/fax,\
__init__.py \
CallWizard.py \
CGFax.py \
diff --git a/wizards/Pyuno_letter.mk b/wizards/Pyuno_letter.mk
index 5231849..508b705 100644
--- a/wizards/Pyuno_letter.mk
+++ b/wizards/Pyuno_letter.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Pyuno_Pyuno,letter,$(SRCDIR)/wizards/com/sun/star/wizards/letter))
-$(eval $(call gb_Pyuno_add_files,letter,\
+$(eval $(call gb_Pyuno_add_files,letter,wizards/letter,\
CallWizard.py \
CGLetter.py \
CGLetterWizard.py \
diff --git a/wizards/Pyuno_web.mk b/wizards/Pyuno_web.mk
index 93b312f..3bfc4d0 100644
--- a/wizards/Pyuno_web.mk
+++ b/wizards/Pyuno_web.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Pyuno_Pyuno,web,$(SRCDIR)/wizards/com/sun/star/wizards/web))
-$(eval $(call gb_Pyuno_add_files,web,\
+$(eval $(call gb_Pyuno_add_files,web,wizards/web,\
CallWizard.py \
BackgroundsDialog.py \
ErrorHandler.py \
commit 47f9150848d0829fc2cf257ccb48a0ced9d28bec
Author: David Tardon <dtardon at redhat.com>
Date: Thu Apr 11 14:45:22 2013 +0200
silence build of epm
Change-Id: I439032a384e75815db050d5468d78496267f665b
diff --git a/epm/ExternalProject_epm.mk b/epm/ExternalProject_epm.mk
index ca81384..bfb46ba 100644
--- a/epm/ExternalProject_epm.mk
+++ b/epm/ExternalProject_epm.mk
@@ -16,10 +16,11 @@ $(eval $(call gb_ExternalProject_register_targets,epm,\
))
$(call gb_ExternalProject_get_state_target,epm,build) :
- cd $(EXTERNAL_WORKDIR) \
- && ./configure --disable-fltk \
- $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________NONE) \
- && $(MAKE) \
- && touch $@
+ $(call gb_ExternalProject_run,build,\
+ ./configure --disable-fltk \
+ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________NONE) \
+ && $(MAKE) \
+ && touch $@ \
+ )
# vim: set noet sw=4 ts=4:
commit 8f0997c3a2af42d826f787ffb381ba82480c42be
Author: David Tardon <dtardon at redhat.com>
Date: Thu Apr 11 12:25:07 2013 +0200
convert AllLangZip to install using Packages
... and also rename it to AllLangPackage.
Change-Id: I5bbc3847f2806221a5e3e4fa063ccc5a3b60a3fb
diff --git a/extras/AllLangPackage_accessoriessamples.mk b/extras/AllLangPackage_accessoriessamples.mk
new file mode 100644
index 0000000..29a89ce
--- /dev/null
+++ b/extras/AllLangPackage_accessoriessamples.mk
@@ -0,0 +1,35 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriessamples,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples/lang))
+
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriessamples,samples-pack))
+
+$(eval $(call gb_AllLangPackage_add_files,accessoriessamples,share/samples,\
+ cs/.nametranslation.table \
+ de/.nametranslation.table \
+ en-US/JacketPotato.odb \
+ en-US/.nametranslation.table \
+ es/.nametranslation.table \
+ fi/.nametranslation.table \
+ fr/.nametranslation.table \
+ hu/.nametranslation.table \
+ hu/naptar.ods \
+ it/.nametranslation.table \
+ ja/.nametranslation.table \
+ ka/.nametranslation.table \
+ nl/.nametranslation.table \
+ pl/dummy_samples.txt \
+ pt-BR/.nametranslation.table \
+ sv/.nametranslation.table \
+ tr/.nametranslation.table \
+ zh-CN/.nametranslation.table \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/AllLangPackage_accessoriessamplesadvertisement.mk b/extras/AllLangPackage_accessoriessamplesadvertisement.mk
new file mode 100644
index 0000000..363f154
--- /dev/null
+++ b/extras/AllLangPackage_accessoriessamplesadvertisement.mk
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriessamplesadvertisement,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples/advertisement/lang))
+
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriessamplesadvertisement,samples-pack))
+
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriessamplesadvertisement,share/samples,Advertisement,\
+ cs/dummy_samples.txt \
+ de/dummy_samples.txt \
+ en-US/ooo2prodflyera3en.odt \
+ en-US/ooo2prodflyera4en.odt \
+ en-US/ooo2prodintroen.odp \
+ en-US/ooo2prodspeca4en.odt \
+ es/dummy_samples.txt \
+ fi/dummy_samples.txt \
+ fr/dummy_samples.txt \
+ hu/ooo2prodflyera3hu.odt \
+ hu/ooo2prodspeca4hu.odt \
+ hu/OOo_Ossszehasonlitas.odt \
+ hu/OOo_Reklam4.odt \
+ it/dummy_samples.txt \
+ ja/dummy_samples.txt \
+ ka/dummy_samples.txt \
+ nl/dummy_samples.txt \
+ pl/dummy_samples.txt \
+ pt-BR/dummy_samples.txt \
+ sv/dummy_samples.txt \
+ tr/dummy_samples.txt \
+ zh-CN/dummy_samples.txt \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/AllLangPackage_accessoriessamplesdocumentation.mk b/extras/AllLangPackage_accessoriessamplesdocumentation.mk
new file mode 100644
index 0000000..fb903da
--- /dev/null
+++ b/extras/AllLangPackage_accessoriessamplesdocumentation.mk
@@ -0,0 +1,34 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriessamplesdocumentation,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples/documentation/lang))
+
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriessamplesdocumentation,samples-pack))
+
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriessamplesdocumentation,share/samples,Documentations,\
+ cs/dummy_samples.txt \
+ de/dummy_samples.txt \
+ en-US/Connect_to_Postgres.odt \
+ en-US/ooo2.odt \
+ es/dummy_samples.txt \
+ fi/dummy_samples.txt \
+ fr/dummy_samples.txt \
+ hu/ooo2.odt \
+ it/dummy_samples.txt \
+ ja/dummy_samples.txt \
+ ka/dummy_samples.txt \
+ nl/dummy_samples.txt \
+ pl/dummy_samples.txt \
+ pt-BR/dummy_samples.txt \
+ sv/dummy_samples.txt \
+ tr/dummy_samples.txt \
+ zh-CN/dummy_samples.txt \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/AllLangPackage_accessoriessamplesnonfree.mk b/extras/AllLangPackage_accessoriessamplesnonfree.mk
new file mode 100644
index 0000000..9fcfa2d
--- /dev/null
+++ b/extras/AllLangPackage_accessoriessamplesnonfree.mk
@@ -0,0 +1,33 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriessamplesnonfree,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples-nonfree/lang))
+
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriessamplesnonfree,samples-pack))
+
+$(eval $(call gb_AllLangPackage_add_files,accessoriessamplesnonfree,share/samples,\
+ cs/dummy_samples-nonfree.txt \
+ de/dummy_samples-nonfree.txt \
+ en-US/dummy_samples-nonfree.txt \
+ es/dummy_samples-nonfree.txt \
+ fi/dummy_samples-nonfree.txt \
+ fr/dummy_samples-nonfree.txt \
+ hu/dummy_samples-nonfree.txt \
+ it/dummy_samples-nonfree.txt \
+ ja/dummy_samples-nonfree.txt \
+ ka/dummy_samples-nonfree.txt \
+ nl/dummy_samples-nonfree.txt \
+ pl/dummy_samples-nonfree.txt \
+ pt-BR/dummy_samples-nonfree.txt \
+ sv/dummy_samples-nonfree.txt \
+ tr/dummy_samples-nonfree.txt \
+ zh-CN/dummy_samples-nonfree.txt \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/AllLangPackage_accessoriessamplesnonfreeadvertisement.mk b/extras/AllLangPackage_accessoriessamplesnonfreeadvertisement.mk
new file mode 100644
index 0000000..b33ec00
--- /dev/null
+++ b/extras/AllLangPackage_accessoriessamplesnonfreeadvertisement.mk
@@ -0,0 +1,33 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriessamplesnonfreeadvertisement,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples-nonfree/advertisement/lang))
+
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriessamplesnonfreeadvertisement,samples-pack))
+
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriessamplesnonfreeadvertisement,share/samples,Advertisement,\
+ cs/dummy_samples-nonfree.txt \
+ de/dummy_samples-nonfree.txt \
+ en-US/dummy_samples-nonfree.txt \
+ es/dummy_samples-nonfree.txt \
+ fi/dummy_samples-nonfree.txt \
+ fr/dummy_samples-nonfree.txt \
+ hu/dummy_samples-nonfree.txt \
+ it/dummy_samples-nonfree.txt \
+ ja/dummy_samples-nonfree.txt \
+ ka/dummy_samples-nonfree.txt \
+ nl/dummy_samples-nonfree.txt \
+ pl/dummy_samples-nonfree.txt \
+ pt-BR/dummy_samples-nonfree.txt \
+ sv/dummy_samples-nonfree.txt \
+ tr/dummy_samples-nonfree.txt \
+ zh-CN/dummy_samples-nonfree.txt \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/AllLangPackage_accessoriessamplesnonfreedocumentation.mk b/extras/AllLangPackage_accessoriessamplesnonfreedocumentation.mk
new file mode 100644
index 0000000..0b44b09
--- /dev/null
+++ b/extras/AllLangPackage_accessoriessamplesnonfreedocumentation.mk
@@ -0,0 +1,33 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriessamplesnonfreedocumentation,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples-nonfree/documentation/lang))
+
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriessamplesnonfreedocumentation,samples-pack))
+
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriessamplesnonfreedocumentation,share/samples,Documentations,\
+ cs/dummy_samples-nonfree.txt \
+ de/dummy_samples-nonfree.txt \
+ en-US/dummy_samples-nonfree.txt \
+ es/dummy_samples-nonfree.txt \
+ fi/dummy_samples-nonfree.txt \
+ fr/dummy_samples-nonfree.txt \
+ hu/dummy_samples-nonfree.txt \
+ it/dummy_samples-nonfree.txt \
+ ja/dummy_samples-nonfree.txt \
+ ka/dummy_samples-nonfree.txt \
+ nl/dummy_samples-nonfree.txt \
+ pl/dummy_samples-nonfree.txt \
+ pt-BR/dummy_samples-nonfree.txt \
+ sv/dummy_samples-nonfree.txt \
+ tr/dummy_samples-nonfree.txt \
+ zh-CN/dummy_samples-nonfree.txt \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/AllLangPackage_accessoriestemplates.mk b/extras/AllLangPackage_accessoriestemplates.mk
new file mode 100644
index 0000000..b544838
--- /dev/null
+++ b/extras/AllLangPackage_accessoriestemplates.mk
@@ -0,0 +1,32 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplates,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/lang))
+
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplates,templates-pack))
+
+$(eval $(call gb_AllLangPackage_add_files,accessoriestemplates,share/template,\
+ cs/dummy_templates.txt \
+ de/dummy_templates.txt \
+ en-US/dummy_templates.txt \
+ es/dummy_templates.txt \
+ fi/dummy_templates.txt \
+ fr/dummy_templates.txt \
+ hu/dummy_templates.txt \
+ it/dummy_templates.txt \
+ ja/dummy_templates.txt \
+ ka/dummy_templates.txt \
+ pl/dummy_templates.txt \
+ pt-BR/dummy_templates.txt \
+ sv/dummy_templates.txt \
+ tr/dummy_templates.txt \
+ zh-CN/dummy_templates.txt \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/AllLangPackage_accessoriestemplateseducate.mk b/extras/AllLangPackage_accessoriestemplateseducate.mk
new file mode 100644
index 0000000..ac6ed60
--- /dev/null
+++ b/extras/AllLangPackage_accessoriestemplateseducate.mk
@@ -0,0 +1,48 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplateseducate,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/educate/lang))
+
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplateseducate,templates-pack))
+
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplateseducate,share/template,educate,\
+ cs/dummy_templates.txt \
+ de/Jahres_Schulnoten.ots \
+ de/Klassen-Schulnoten-Verwaltung_Noten_1-6.ots \
+ de/Kursnoten_15_Punkte.ots \
+ de/Meine_Schulnoten.ots \
+ de/Schulnoten.ots \
+ de/Stundenplan.ots \
+ de/stundenplan_und_vorlesungsplan.ots \
+ en-US/apa_4thEd.ott \
+ en-US/bookmark_1.ott \
+ en-US/bookmark_2.ott \
+ en-US/classroom_schedule.ott \
+ en-US/Crystal.ots \
+ en-US/disciplinary_assignment.ott \
+ en-US/disciplinary_referral.ott \
+ en-US/grades.ots \
+ en-US/lesson_plan_1.ott \
+ en-US/lesson_plan_2.ott \
+ en-US/name_badge_1.ott \
+ en-US/student_schedule.ott \
+ en-US/table_tent_1.ott \
+ en-US/Thesis.ott \
+ fr/AgendaSemaine1.1.ots \
+ fr/carnet_de_notes.ots \
+ fr/documentfinalTP-1.1.ott \
+ fr/note_moyenne.ots \
+ hu/essze.ott \
+ hu/Meresi_jegyzokonyv_-_Iskolai.ott \
+ hu/osztalynevsor.ott \
+ hu/thesis_k.ott \
+ ja/timetable_for_school.ots \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/AllLangPackage_accessoriestemplatesfinance.mk b/extras/AllLangPackage_accessoriestemplatesfinance.mk
new file mode 100644
index 0000000..7a41b74
--- /dev/null
+++ b/extras/AllLangPackage_accessoriestemplatesfinance.mk
@@ -0,0 +1,106 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesfinance,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/finance/lang))
+
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesfinance,templates-pack))
+
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesfinance,share/template,finance,\
+ cs/podaci_kniha.ots \
+ de/arbeitszeiterfassung.ots \
+ de/az.ots \
+ de/BudgetAufDeutsch.ots \
+ de/business_indebtedness_schedule.ots \
+ de/business_trip_budget.ots \
+ de/discount_zertifikate_rechner.ots \
+ de/energie_verbrauchstabelle.ots \
+ de/fahrtenbuch.ots \
+ de/Finanzuebersicht.ots \
+ de/Haushaltsbuch.ots \
+ de/Haushaltsbuch_vordruck.ots \
+ de/hypothekenberechnung.ots \
+ de/Invoice-Rechnung.ots \
+ de/Kassenbuch_2006.ots \
+ de/Kassenbuch_2007.ots \
+ de/kassenbuch2.ots \
+ de/kassenbuch.ots \
+ de/Kassenbuch_Vordruck.ots \
+ de/Kassenbuch_vorlage_Netto.ots \
+ de/Kassenbuch_vorlage.ots \
+ de/Konto.ots \
+ de/konto.ott \
+ de/Kraftstoff_Kilometer_Kostenrechner_2006.ots \
+ de/Kraftstoff_Kilometer_Kostenrechner_2007.ots \
+ de/Kraftstoff_Kilometer_Kostenrechner_2008.ots \
+ de/Kraftstoff_Kilometer_Kostenrechner_2009.ots \
+ de/Kraftstoff_Kilometer_Kostenrechner_2010.ots \
+ de/Lastschrift.ott \
+ de/marketing_budget_plan.ots \
+ de/Mwstbruttonetto.ots \
+ de/OOoReise.ots \
+ de/project_planning.ots \
+ de/quittung.ott \
+ de/Rechnung.ots \
+ de/Rechnungs_Vorlage.ots \
+ de/start-up_capital_estimate.ots \
+ de/taetigkeitsbericht.ots \
+ de/Ueberweisungsformular.ott \
+ en-US/advloan.ots \
+ en-US/Amortization-Schedule.ots \
+ en-US/armcalculation.ots \
+ en-US/BalanceSheet1.ots \
+ en-US/Bank_Account.ots \
+ en-US/Budget.ots \
+ en-US/business_indebtedness_schedule.ots \
+ en-US/business_plan.ott \
+ en-US/business_trip_budget.ots \
+ en-US/CheckBookRegister.ots \
+ en-US/Compare_Loan_Conditions.ots \
+ en-US/Compare_Two_Years_with_Graphs.ots \
+ en-US/Deposit_Template_-_US_DOLLAR.ots \
+ en-US/DialogSheetEg.ots \
+ en-US/Giro_en.ott \
+ en-US/job_bid.ott \
+ en-US/loan.ots \
+ en-US/marketing_budget_plan.ots \
+ en-US/marketing_plan.ott \
+ en-US/mortgage_buster.ots \
+ en-US/PettyCash.ots \
+ en-US/portfolio_manager.ots \
+ en-US/pos.ots \
+ en-US/project_planning.ots \
+ en-US/rental_returns.ots \
+ en-US/RunningBudget.ots \
+ en-US/SalesTargets.ots \
+ en-US/start-up_capital_estimate.ots \
+ es/dummy_templates.txt \
+ fi/dummy_templates.txt \
+ fr/dummy_templates.txt \
+ hu/afas_szamla.ott \
+ hu/Banki_atutalas.ots \
+ hu/Csekkminta.ott \
+ hu/eves_beszamolo_eredmenykimutatas_egyszerusitett.ots \
+ hu/Hazi_koltsegvetes.ots \
+ hu/msz16124.ots \
+ hu/msz16177.ots \
+ hu/Napi_kiadas.ots \
+ hu/Olvass.el \
+ it/notaspese.ots \
+ ja/cost_statement.ots \
+ ja/journal_book.ots \
+ ka/dummy_templates.txt \
+ nl/dummy_templates.txt \
+ pl/dummy_templates.txt \
+ pt-BR/dummy_templates.txt \
+ sv/dummy_templates.txt \
+ tr/dummy_templates.txt \
+ zh-CN/dummy_templates.txt \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/AllLangPackage_accessoriestemplatesforms.mk b/extras/AllLangPackage_accessoriestemplatesforms.mk
new file mode 100644
index 0000000..0ca6da9
--- /dev/null
+++ b/extras/AllLangPackage_accessoriestemplatesforms.mk
@@ -0,0 +1,85 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesforms,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/forms/lang))
+
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesforms,templates-pack))
+
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesforms,share/template,forms,\
+ cs/seznam_pohledavek.ots \
+ de/Ausbildungsnachweis2.ott \
+ de/Ausbildungsnachweis.ott \
+ de/ausgabebelege.ott \
+ de/Checkliste_Hauswartung.ots \
+ de/dienstreiseantrag.ott \
+ de/einnahmebelege.ott \
+ de/Fahrtenbuch.ots \
+ de/Fax_privat_formlich_dringend.ott \
+ de/Fax_privat_formlich.ott \
+ de/Fax_privat_personlich.ott \
+ de/Gesprachsnotiz.ott \
+ de/kariertes_blatt_a4_5mm.ots \
+ de/kurz_begleitschreiben.ott \
+ de/Kurz-Begleitschreiben.ott \
+ de/kurzbrief.ott \
+ de/lernkarteikarten_4x10_stueck.ott \
+ de/pkw_kaufvertrag.ott \
+ de/protokoll.ott \
+ de/quittungen.ott \
+ de/quittung.ots \
+ de/rechnung.ots \
+ de/reisekostenabrechnung.ott \
+ de/smily_calender.ots \
+ de/ueberweisungstraeger.ott \
+ de/urlaubsplaner_2006.ots \
+ de/zeichenblatt_din_en_iso_5457_einfach_ohne_din_schrift.ott \
+ en-US/cap1107.ott \
+ en-US/Confidentiality_Agreement.ott \
+ en-US/contract.ott \
+ en-US/Joint_venture.ott \
+ en-US/maintenance_agreement.ott \
+ en-US/Note_Template.ott \
+ en-US/partnership.ott \
+ en-US/PleadingGeneric.ott \
+ en-US/Pleading.ott \
+ en-US/System_maint_tmpl.ott \
+ es/dummy_templates.txt \
+ fi/dummy_templates.txt \
+ fr/dummy_templates.txt \
+ hu/Alairasi_cimpeldany.ott \
+ hu/Auto_berbeadasi_megallapodas.ott \
+ hu/Autokolcsonzes.ott \
+ hu/Beszelgetesi_jegyzet.ott \
+ hu/BT_tarsasagi_szerzodes_1.ott \
+ hu/Ingatlan-adasveteli_eloszerzodes.ott \
+ hu/Ingatlan-adasveteli_szerzodes_haszonelvezet.ott \
+ hu/Ingatlan-adasveteli_szerzodes.ott \
+ hu/Ingatlan-adasveteli_szerzodes_tarsashaz.ott \
+ hu/Ingatlancsere_szerzodes.ott \
+ hu/Kiadoi_szerzodes.ott \
+ hu/Meghatalmazas_penzfelvetel.ott \
+ hu/Reklammu_atruhazasi_szerzodes.ott \
+ hu/Szoftver_felhasznalasi_szerzodes.ott \
+ hu/Szoftverlegalizacio_alkalmazotti_nyilatkozat.ott \
+ hu/Szoftverlegalizacio_etikai_kodex.ott \
+ hu/Vegrendelet.ott \
+ hu/Veszelyes_allat_tartasi_engedely_kerelem.ott \
+ it/lettera_legale.ott \
+ it/SchedaCarburante.ott \
+ ja/resume.ots \
+ ka/dummy_templates.txt \
+ nl/dummy_templates.txt \
+ pl/dummy_templates.txt \
+ pt-BR/dummy_templates.txt \
+ sv/dummy_templates.txt \
+ tr/dummy_templates.txt \
+ zh-CN/dummy_templates.txt \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/AllLangPackage_accessoriestemplateslabels.mk b/extras/AllLangPackage_accessoriestemplateslabels.mk
new file mode 100644
index 0000000..5f761c3
--- /dev/null
+++ b/extras/AllLangPackage_accessoriestemplateslabels.mk
@@ -0,0 +1,74 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplateslabels,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/labels/lang))
+
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplateslabels,templates-pack))
+
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplateslabels,share/template,labels,\
+ cs/dummy_templates.txt \
+ de/dummy_templates.txt \
+ en-US/address12-WL-OL875.ott \
+ en-US/address15-festival-WL-OL875.ott \
+ en-US/address21-animals-WL-OL875.ott \
+ en-US/address22-animals-WL-OL875.ott \
+ en-US/address23-animals-WL-OL875.ott \
+ en-US/Address-label10.ott \
+ en-US/Address_label7.ott \
+ en-US/Alphabetical-1-filling-labels.ott \
+ en-US/Alphabetical-2-Filling-labels.ott \
+ en-US/Alphabetical-3-Filling-labels.ott \
+ en-US/BasicAddress3sameAvery5160.ott \
+ en-US/BasicAddressSameAvery5160.ott \
+ en-US/BasicMailing3sameAvery5162.ott \
+ en-US/BasicMailing4sameAvery5162.ott \
+ en-US/BasicMailingSame2Avery5161.ott \
+ en-US/BasicMailingSameAvery5161.ott \
+ en-US/BasicReturnAddress2SameAvery5167.ott \
+ en-US/BasicreturnaddresssameAvery5167.ott \
+ en-US/BasicShippingsame2Avery5164.ott \
+ en-US/BasicShippingsameAvery5164.ott \
+ en-US/Basictext2sameAvery5160.ott \
+ en-US/blue-shpWL-OL150.ott \
+ en-US/ClasicMailingsameAvery5163.ott \
+ en-US/color-bars-2-filling-labels.ott \
+ en-US/Fragile-Handle-with-Care-red-background.ott \
+ en-US/Fragrance_02_Address_Label.ott \
+ en-US/frame-filling-labels.ott \
+ en-US/Gemini_label_01.ott \
+ en-US/Mailing-Label-01.ott \
+ en-US/Mailing_Label-Buss_with-Logo-011.ott \
+ en-US/MailingLabelFlowerSameAvery5163.ott \
+ en-US/Mailing_Label-General_Theme_01-WL-OL125.ott \
+ en-US/miniaddapple-adrsWL-OL875.ott \
+ en-US/miniaddflower-adrsWL-OL875.ott \
+ en-US/miniaddfruits-adrsWL-OL875.ott \
+ en-US/miniaddressbasket-adrsWL-OL875.ott \
+ en-US/miniaddrose-adrsWL-OL875.ott \
+ en-US/miniaddyellow-adrsWL-OL875.ott \
+ en-US/SeasonsShippingLabel.ott \
+ en-US/ShippinglabelSameAvery5164.ott \
+ en-US/Shipping-std-design3.ott \
+ en-US/Shipping-std-design9.ott \
+ es/dummy_templates.txt \
+ fi/dummy_templates.txt \
+ fr/dummy_templates.txt \
+ hu/dummy_templates.txt \
+ it/dummy_templates.txt \
+ ja/dummy_templates.txt \
+ ka/dummy_templates.txt \
+ nl/dummy_templates.txt \
+ pl/dummy_templates.txt \
+ pt-BR/dummy_templates.txt \
+ sv/dummy_templates.txt \
+ tr/dummy_templates.txt \
+ zh-CN/dummy_templates.txt \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/AllLangPackage_accessoriestemplateslayout.mk b/extras/AllLangPackage_accessoriestemplateslayout.mk
new file mode 100644
index 0000000..c830138
--- /dev/null
+++ b/extras/AllLangPackage_accessoriestemplateslayout.mk
@@ -0,0 +1,333 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplateslayout,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/layout/lang,$(true)))
+
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplateslayout,templates-pack))
+
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplateslayout,share/template,layout,\
+ cs/dummy_templates.txt \
+ de/A4-kariert.otp \
+ de/BlueBoxes.otp \
+ de/BlueSilver.otp \
+ de/bluesquares.otp \
+ de/BlueWavesTempl-1.otp \
+ de/Butterflies.otp \
+ de/coolspace.otp \
+ de/Cubes_1x.otp \
+ de/DABlueChecker.otp \
+ de/DABlueCircle.otp \
+ de/DABlueCloud.otp \
+ de/DABlueStars.otp \
+ de/DABlueWhiteFlower.otp \
+ de/DALetters.otp \
+ de/DAMultiStars2.otp \
+ de/DAOrangeTexture.otp \
+ de/DAPinkCloud.otp \
+ de/DASnowFlacks.otp \
+ de/DASparkle.otp \
+ de/dummy_templates.txt \
+ de/earthlight.otp \
+ de/edu1.otp \
+ de/email.otp \
+ de/Espai.otp \
+ de/Foral-Studio_A01.otp \
+ de/jp-temple.otp \
+ de/karteikarte.otp \
+ de/lamp.otp \
+ de/landscape.otp \
+ de/lay_wood.otp \
+ de/lyt-acryl.otp \
+ de/lyt-aquarell2.otp \
+ de/lyt-aquarell.otp \
+ de/lyt-bluecrystals.otp \
+ de/lyt-bluegradback.otp \
+ de/lyt-bluelightning.otp \
+ de/lyt-bluelines.otp \
+ de/lyt-blueripplewave.otp \
+ de/lyt-bluesmoke.otp \
+ de/lyt-brightcirc.otp \
+ de/lyt-brightlines.otp \
+ de/lyt-brightpainting.otp \
+ de/lyt-colorfulchars.otp \
+ de/lyt-colornumbers.otp \
+ de/lyt-colorpainting.otp \
+ de/lyt-darkcirc.otp \
+ de/lyt-darkpainting.otp \
+ de/lyt-fractalspiral.otp \
+ de/lyt-frozen.otp \
+ de/lyt-glow.otp \
+ de/lyt-golddown.otp \
+ de/lyt-golddrop.otp \
+ de/lyt-gradshad.otp \
+ de/lyt-greenlines.otp \
+ de/lyt-greenmosaic.otp \
+ de/lyt-greenwaterpainting.otp \
+ de/lyt-mezzo.otp \
+ de/lyt-numbeffect.otp \
+ de/lyt-orange.otp \
+ de/lyt-organic_black.otp \
+ de/lyt-paintingred.otp \
+ de/lyt-paintwaves.otp \
+ de/lyt-papertop.otp \
+ de/lyt-pastell_pyr.otp \
+ de/lyt-plastic.otp \
+ de/lyt-raster.otp \
+ de/lyt-rectbright.otp \
+ de/lyt-rednoise.otp \
+ de/lyt-redstorm.otp \
+ de/lyt-redsunrise.otp \
+ de/lyt-reyellin.otp \
+ de/lyt-simblue.otp \
+ de/lyt-simpleblue.otp \
+ de/lyt-sunrise_lines.otp \
+ de/lyt-techborder.otp \
+ de/lyt-technical.otp \
+ de/lyt-typography.otp \
+ de/lyt-violetlightning.otp \
+ de/lyt-watercolor.otp \
+ de/lyt-waterstorm.otp \
+ de/lyt-whitemountains.otp \
+ de/lyt-yereblend.otp \
+ de/MarbleTempl-2.otp \
+ de/mondo_cyan.otp \
+ de/mondo_green.otp \
+ de/mondo_yellow.otp \
+ de/ooo_20_basis.otp \
+ de/ooo_blue.otp \
+ de/ooo_red.otp \
+ de/openblue.otp \
+ de/Ortra.otp \
+ de/Plantilla_Fresas.otp \
+ de/redStar.otp \
+ de/relief.otp \
+ de/sidepanel_blue.otp \
+ de/sidepanel_cloud.otp \
+ de/sidepanel_green.otp \
+ de/sidepanel_red.otp \
+ de/Simple.otp \
+ de/soleil.otp \
+ de/steps.otp \
+ de/techno_sphere_template.otp \
+ de/UserGroup_agenda.otp \
+ de/vortrag_blau.otp \
+ en-US/A4-kariert.otp \
+ en-US/apothecaryBottles.otp \
+ en-US/Beach.otp \
+ en-US/Black-cyan-yellow.otp \
+ en-US/Black-orange.otp \
+ en-US/BlueBend.otp \
+ en-US/BlueBoxes.otp \
+ en-US/Blue_Dots.otp \
+ en-US/BlueSilver.otp \
+ en-US/BlueSkyLine.otp \
+ en-US/bluesquares.otp \
+ en-US/BlueWavesTempl-1.otp \
+ en-US/Blue-yellow-white.otp \
+ en-US/brasil.otp \
+ en-US/BTC.otp \
+ en-US/Butterflies.otp \
+ en-US/Candy.otp \
+ en-US/Chalkboard_2.otp \
+ en-US/Chalkboard.otp \
+ en-US/Cheesy.otp \
+ en-US/circular.otp \
+ en-US/coolspace.otp \
+ en-US/Cubes_1x.otp \
+ en-US/Cultural.otp \
+ en-US/DABlueChecker.otp \
+ en-US/DABlueCircle.otp \
+ en-US/DABlueCloud.otp \
+ en-US/DABlueStars.otp \
+ en-US/DABlueWhiteFlower.otp \
+ en-US/DALetters.otp \
+ en-US/DAMultiStars2.otp \
+ en-US/DAOrangeTexture.otp \
+ en-US/DAPinkCloud.otp \
+ en-US/DASnowFlacks.otp \
+ en-US/DASparkle.otp \
+ en-US/Desert.otp \
+ en-US/dummy_templates.txt \
+ en-US/earthlight.otp \
+ en-US/edu1.otp \
+ en-US/email.otp \
+ en-US/Espai.otp \
+ en-US/Foot-prints.otp \
+ en-US/Foral-Studio_A01.otp \
+ en-US/Globe_-_Presentation_1.otp \
+ en-US/Globe_-_Presentation_2.otp \
+ en-US/Grad-blue_2.otp \
+ en-US/Grad-blue_3.otp \
+ en-US/Grad-blue.otp \
+ en-US/Grad-cyan-black.otp \
+ en-US/Grad-gray-blue.otp \
+ en-US/Grad-lightblue_2.otp \
+ en-US/Grad-lightblue.otp \
+ en-US/Grad-mediumblue.otp \
+ en-US/Grad-purple.otp \
+ en-US/grapefruit.otp \
+ en-US/Gray-green.otp \
+ en-US/Green_Dots.otp \
+ en-US/Green_leaf.otp \
+ en-US/GreenMosaics.otp \
+ en-US/GreenNGray.otp \
+ en-US/informatica2.otp \
+ en-US/informatica.otp \
+ en-US/jp-temple.otp \
+ en-US/karteikarte.otp \
+ en-US/Keynote_template.otp \
+ en-US/lamp.otp \
+ en-US/landscape.otp \
+ en-US/lay_wood.otp \
+ en-US/listras.otp \
+ en-US/lyt-acryl.otp \
+ en-US/lyt-aquarell2.otp \
+ en-US/lyt-aquarell.otp \
+ en-US/lyt-bluecrystals.otp \
+ en-US/lyt-bluegradback.otp \
+ en-US/lyt-bluelightning.otp \
+ en-US/lyt-bluelines.otp \
+ en-US/lyt-blueripplewave.otp \
+ en-US/lyt-bluesmoke.otp \
+ en-US/lyt-brightcirc.otp \
+ en-US/lyt-brightlines.otp \
+ en-US/lyt-brightpainting.otp \
+ en-US/lyt-colorfulchars.otp \
+ en-US/lyt-colornumbers.otp \
+ en-US/lyt-colorpainting.otp \
+ en-US/lyt-darkcirc.otp \
+ en-US/lyt-darkpainting.otp \
+ en-US/lyt-fractalspiral.otp \
+ en-US/lyt-frozen.otp \
+ en-US/lyt-glow.otp \
+ en-US/lyt-golddown.otp \
+ en-US/lyt-golddrop.otp \
+ en-US/lyt-gradshad.otp \
+ en-US/lyt-greenlines.otp \
+ en-US/lyt-greenmosaic.otp \
+ en-US/lyt-greenwaterpainting.otp \
+ en-US/lyt-mezzo.otp \
+ en-US/lyt-numbeffect.otp \
+ en-US/lyt-orange.otp \
+ en-US/lyt-organic_black.otp \
+ en-US/lyt-paintingred.otp \
+ en-US/lyt-paintwaves.otp \
+ en-US/lyt-papertop.otp \
+ en-US/lyt-pastell_pyr.otp \
+ en-US/lyt-plastic.otp \
+ en-US/lyt-raster.otp \
+ en-US/lyt-rectbright.otp \
+ en-US/lyt-rednoise.otp \
+ en-US/lyt-redstorm.otp \
+ en-US/lyt-redsunrise.otp \
+ en-US/lyt-reyellin.otp \
+ en-US/lyt-simblue.otp \
+ en-US/lyt-simpleblue.otp \
+ en-US/lyt-sunrise_lines.otp \
+ en-US/lyt-techborder.otp \
+ en-US/lyt-technical.otp \
+ en-US/lyt-typography.otp \
+ en-US/lyt-violetlightning.otp \
+ en-US/lyt-watercolor.otp \
+ en-US/lyt-waterstorm.otp \
+ en-US/lyt-whitemountains.otp \
+ en-US/lyt-yereblend.otp \
+ en-US/Marble2.otp \
+ en-US/mondo_cyan.otp \
+ en-US/mondo_green.otp \
+ en-US/mondo_yellow.otp \
+ en-US/Music.otp \
+ en-US/ooo_20_basis.otp \
+ en-US/OOo_Professional.otp \
+ en-US/openblue.otp \
+ en-US/orangebook.otp \
+ en-US/Ortra.otp \
+ en-US/Pixels.otp \
+ en-US/Plantilla_Fresas.otp \
+ en-US/quadrados_coloridos2.otp \
+ en-US/quadrados_coloridos.otp \
+ en-US/Red_Dots.otp \
+ en-US/redStar.otp \
+ en-US/relief.otp \
+ en-US/Roses.otp \
+ en-US/sidepanel_blue.otp \
+ en-US/sidepanel_cloud.otp \
+ en-US/sidepanel_green.otp \
+ en-US/sidepanel_red.otp \
+ en-US/simbologia.otp \
+ en-US/Simple.otp \
+ en-US/slides_blue-penrose_nojhan.otp \
+ en-US/soleil.otp \
+ en-US/squares.otp \
+ en-US/SteelDesign.otp \
+ en-US/steps.otp \
+ en-US/technology.otp \
+ en-US/techno_sphere_template.otp \
+ en-US/Toulumne.otp \
+ en-US/UserGroup_agenda.otp \
+ en-US/White-blue.otp \
+ en-US/White-blue_sky.otp \
+ en-US/White-red_2.otp \
+ en-US/White-red_3.otp \
+ en-US/White-red.otp \
+ en-US/Wire_Gulls_-_Blue.otp \
+ en-US/Wire_Gulls_-_White.otp \
+ en-US/With-year-2003.otp \
+ en-US/With-year-2004.otp \
+ en-US/With-year-2005.otp \
+ en-US/With-years.otp \
+ es/dummy_templates.txt \
+ fi/dummy_templates.txt \
+ fr/dummy_templates.txt \
+ hu/compladients_1.otp \
+ hu/compladients_2.otp \
+ hu/compladients_3.otp \
+ hu/compladients_4.otp \
+ hu/compladients_5.otp \
+ hu/Cross-color.otp \
+ hu/Cross-gray.otp \
+ hu/Cross-green.otp \
+ hu/Cross-orange.otp \
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list