[Libreoffice-commits] core.git: 4 commits - ct2n/ExternalPackage_ct2n.mk odk/Module_odk.mk odk/Package_examples.mk odk/Zip_odkexamples.mk postprocess/CustomTarget_images.mk scp2/source solenv/gbuild

David Tardon dtardon at redhat.com
Tue Apr 16 04:40:09 PDT 2013


 ct2n/ExternalPackage_ct2n.mk       |    2 
 odk/Module_odk.mk                  |    2 
 odk/Package_examples.mk            |  533 +++++++++++++++++++++++++++++++++++++
 odk/Zip_odkexamples.mk             |   28 -
 postprocess/CustomTarget_images.mk |    2 
 scp2/source/ooo/file_ooo.scp       |  288 +++++++++----------
 scp2/source/sdkoo/sdkoo.scp        |    6 
 solenv/gbuild/Dictionary.mk        |  236 ++++++++++++++--
 solenv/gbuild/TargetLocations.mk   |    8 
 9 files changed, 904 insertions(+), 201 deletions(-)

New commits:
commit 0c814ad1b40824376b02f177a9e54437064763fb
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Apr 15 18:51:08 2013 +0200

    install dicts using filelists
    
    Change-Id: Ib803d36ce2dfc0821004c4841566880a929a4246

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 8a308d8..a15e58c 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1367,432 +1367,432 @@ End
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Af
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Af;
-	Name = "dict-af.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-af.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_An
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_An;
-	Name = "dict-an.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-an.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Ar
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Ar;
-	Name = "dict-ar.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-ar.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Be
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Be;
-	Name = "dict-be.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-be.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Bg
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Bg;
-	Name = "dict-bg.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-bg.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Bn
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Bn;
-	Name = "dict-bn.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-bn.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Br
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Br;
-	Name = "dict-br.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-br.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Bs
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Bs;
-	Name = "dict-bs.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-bs.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Ca
-    Dir = gid_Brand_Dir_Share_Extensions_Dict_Ca;
-    Name = "dict-ca.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+    Dir = FILELIST_DIR;
+    Name = "Dictionary/dict-ca.filelist";
+    Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
     UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Cs
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Cs;
-	Name = "dict-cs.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-cs.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Da
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Da;
-	Name = "dict-da.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-da.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_De
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_De;
-	Name = "dict-de.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-de.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_En
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_En;
-	Name = "dict-en.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-en.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_El
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_El;
-	Name = "dict-el.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-el.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Es
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Es;
-	Name = "dict-es.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-es.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Et
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Et;
-	Name = "dict-et.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-et.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Fr
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Fr;
-	Name = "dict-fr.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-fr.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Gd
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Gd;
-	Name = "dict-gd.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-gd.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Gl
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Gl;
-	Name = "dict-gl.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-gl.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Gu
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Gu;
-	Name = "dict-gu.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-gu.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_He
-    Dir = gid_Brand_Dir_Share_Extensions_Dict_He;
-    Name = "dict-he.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+    Dir = FILELIST_DIR;
+    Name = "Dictionary/dict-he.filelist";
+    Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
     UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Hi
-    Dir = gid_Brand_Dir_Share_Extensions_Dict_Hi;
-    Name = "dict-hi.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+    Dir = FILELIST_DIR;
+    Name = "Dictionary/dict-hi.filelist";
+    Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
     UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Hu
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Hu;
-	Name = "dict-hu.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-hu.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Hr
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Hr;
-	Name = "dict-hr.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-hr.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_It
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_It;
-	Name = "dict-it.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-it.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Ku_Tr
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Ku_Tr;
-	Name = "dict-ku-TR.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-ku-TR.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Lt
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Lt;
-	Name = "dict-lt.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-lt.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Lv
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Lv;
-	Name = "dict-lv.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-lv.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Ne
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Ne;
-	Name = "dict-ne.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-ne.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Nl
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Nl;
-	Name = "dict-nl.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-nl.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_No
-    Dir = gid_Brand_Dir_Share_Extensions_Dict_No;
-    Name = "dict-no.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+    Dir = FILELIST_DIR;
+    Name = "Dictionary/dict-no.filelist";
+    Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
     UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Oc
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Oc;
-	Name = "dict-oc.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-oc.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Pl
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Pl;
-	Name = "dict-pl.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-pl.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Pt_Br
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Pt_Br;
-	Name = "dict-pt-BR.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-pt-BR.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Pt_Pt
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Pt_Pt;
-	Name = "dict-pt-PT.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-pt-PT.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Ro
-    Dir = gid_Brand_Dir_Share_Extensions_Dict_Ro;
-    Name = "dict-ro.oxt";
-    Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+    Dir = FILELIST_DIR;
+    Name = "Dictionary/dict-ro.filelist";
+    Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
     UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Ru
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Ru;
-	Name = "dict-ru.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-ru.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Si
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Si;
-	Name = "dict-si.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-si.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Sk
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sk;
-	Name = "dict-sk.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-sk.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Sl
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sl;
-	Name = "dict-sl.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-sl.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Sr
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sr;
-	Name = "dict-sr.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-sr.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Sv
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sv;
-	Name = "dict-sv.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-sv.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Sw
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Sw;
-	Name = "dict-sw.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-sw.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Te
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Te;
-	Name = "dict-te.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-te.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Th
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Th;
-	Name = "dict-th.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-th.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Uk
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Uk;
-	Name = "dict-uk.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-uk.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Vi
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Vi;
-	Name = "dict-vi.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-vi.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
 
 #if defined WITH_MYSPELL_DICTS
 File gid_File_Extension_Dictionary_Zu
-	Dir = gid_Brand_Dir_Share_Extensions_Dict_Zu;
-	Name = "dict-zu.oxt";
-	Styles = (PACKED, FORCELANGUAGEPACK, ARCHIVE);
+	Dir = FILELIST_DIR;
+	Name = "Dictionary/dict-zu.filelist";
+	Styles = (PACKED, FORCELANGUAGEPACK, FILELIST);
 	UnixRights = 444;
 End
 #endif
diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk
index dceefe1..a59ba5a 100644
--- a/solenv/gbuild/Dictionary.mk
+++ b/solenv/gbuild/Dictionary.mk
@@ -50,37 +50,209 @@ $(call gb_ThesaurusIndexTarget_get_target,$(1)) :| $(dir $(call gb_ThesaurusInde
 
 endef
 
+# PropertiesTranslateTarget class
+
+# Handles translation of .properties files in dictionaries.
+
+gb_PropertiesTranslateTarget_COMMAND := $(call gb_Executable_get_command,propex)
+gb_PropertiesTranslateTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,propex)
+
+define gb_PropertiesTranslateTarget__command
+$(call gb_Output_announce,$(2),$(true),PRP,1)
+$(call gb_Helper_abbreviate_dirs,\
+	MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILE)) && \
+	$(gb_PropertiesTranslateTarget_COMMAND) \
+		-i $(PROPERTIES_FILE) \
+		-l $(LANG) \
+		-m $${MERGEINPUT} \
+		-o $(1) && \
+	rm -f $${MERGEINPUT} \
+)
+endef
+
+$(dir $(call gb_PropertiesTranslateTarget_get_target,%)).dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_PropertiesTranslateTarget_get_target,%))%/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(call gb_PropertiesTranslateTarget_get_target,%) : $(gb_PropertiesTranslateTarget_DEPS)
+	$(call gb_PropertiesTranslateTarget__command,$@,$*)
+
+.PHONY : $(call gb_PropertiesTranslateTarget_get_clean_target,%)
+$(call gb_PropertiesTranslateTarget_get_clean_target,%) :
+	$(call gb_Output_announce,$*,$(false),PRP,1)
+	rm -f $(call gb_PropertiesTranslateTarget_get_target,$*)
+
+# gb_PropertiesTranslateTarget_PropertiesTranslateTarget target source lang
+define gb_PropertiesTranslateTarget_PropertiesTranslateTarget
+$(call gb_PropertiesTranslateTarget_get_target,$(1)) : LANG := $(3)
+$(call gb_PropertiesTranslateTarget_get_target,$(1)) : POFILE := $(gb_POLOCATION)/$(3)/$(patsubst %/,%,$(dir $(2))).po
+$(call gb_PropertiesTranslateTarget_get_target,$(1)) : PROPERTIES_FILE := $(SRCDIR)/$(2)
+
+$(call gb_PropertiesTranslateTarget_get_target,$(1)) : $(SRCDIR)/$(2)
+$(call gb_PropertiesTranslateTarget_get_target,$(1)) :| $(dir $(call gb_PropertiesTranslateTarget_get_target,$(1))).dir
+
+$(if $(filter-out qtz,$(3)),\
+	$(call gb_PropertiesTranslateTarget__PropertiesTranslateTarget_onelang,$(1),$(gb_POLOCATION)/$(3)/$(patsubst %/,%,$(dir $(2))).po) \
+)
+
+endef
+
+# gb_PropertiesTranslateTarget__PropertiesTranslateTarget_onelang target pofile
+define gb_PropertiesTranslateTarget__PropertiesTranslateTarget_onelang
+$(call gb_PropertiesTranslateTarget_get_target,$(1)) : $(2)
+$(2) :
+
+endef
+
+# DescriptionTranslateTarget class
+
+# Handles translation of description.xml files in dictionaries.
+
+gb_DescriptionTranslateTarget_COMMAND := $(call gb_Executable_get_command,xrmex)
+gb_DescriptionTranslateTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,xrmex)
+
+define gb_DescriptionTranslateTarget__command
+$(call gb_Output_announce,$(2),$(true),XRM,1)
+$(call gb_Helper_abbreviate_dirs,\
+	MERGEINPUT=$(call var2file,$(shell $(gb_MKTEMP)),100,$(POFILES)) && \
+	$(gb_DescriptionTranslateTarget_COMMAND) \
+		-i $(DESCRIPTION_XML) \
+		-l all \
+		-m $${MERGEINPUT} \
+		-o $(1) && \
+	rm -f $${MERGEINPUT} \
+)
+endef
+
+$(dir $(call gb_DescriptionTranslateTarget_get_target,%)).dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_DescriptionTranslateTarget_get_target,%))%/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(call gb_DescriptionTranslateTarget_get_target,%) : $(gb_DescriptionTranslateTarget_DEPS)
+	$(call gb_DescriptionTranslateTarget__command,$@,$*)
+
+.PHONY : $(call gb_DescriptionTranslateTarget_get_clean_target,%)
+$(call gb_DescriptionTranslateTarget_get_clean_target,%) :
+	$(call gb_Output_announce,$*,$(false),XRM,1)
+	rm -f $(call gb_DescriptionTranslateTarget_get_target,$*)
+
+# gb_DescriptionTranslateTarget_DescriptionTranslateTarget target source langs
+define gb_DescriptionTranslateTarget_DescriptionTranslateTarget
+$(call gb_DescriptionTranslateTarget_get_target,$(1)) : DESCRIPTION_XML := $(SRCDIR)/$(2)
+$(call gb_DescriptionTranslateTarget_get_target,$(1)) : POFILES :=
+
+$(call gb_DescriptionTranslateTarget_get_target,$(1)) : $(SRCDIR)/$(2)
+$(call gb_DescriptionTranslateTarget_get_target,$(1)) :| $(dir $(call gb_DescriptionTranslateTarget_get_target,$(1))).dir
+
+$(foreach lang,$(3),\
+	$(call gb_DescriptionTranslateTarget__DescriptionTranslateTarget_onelang,$(1),$(patsubst %/,%,$(dir $(2))),$(lang)) \
+)
+
+endef
+
+# gb_DescriptionTranslateTarget__DescriptionTranslateTarget_onelang target pobase lang
+define gb_DescriptionTranslateTarget__DescriptionTranslateTarget_onelang
+$(call gb_DescriptionTranslateTarget_get_target,$(1)) : POFILES += $(gb_POLOCATION)/$(3)/$(2).po
+$(if $(filter-out qtz,$(3)),\
+	$(call gb_DescriptionTranslateTarget__DescriptionTranslateTarget_onelang_podeps,$(1),$(gb_POLOCATION)/$(3)/$(2).po))
+
+endef
+
+# gb_DescriptionTranslateTarget__DescriptionTranslateTarget_onelang_podeps target pofile
+define gb_DescriptionTranslateTarget__DescriptionTranslateTarget_onelang_podeps
+$(call gb_DescriptionTranslateTarget_get_target,$(1)) : $(2)
+$(2) :
+
+endef
+
 # Dictionary class
 
 # Handles creation and delivery of dictionary extensions.
+#
+# This class provides a filelist called Dictionary/<name> that contains
+# all installed files of the dictionary.
+
+gb_Dictionary_ALL_LANGS := $(filter-out en-US,$(gb_WITH_LANG))
+gb_Dictionary_INSTDIR := share/extensions
+
+$(dir $(call gb_Dictionary_get_target,%)).dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
-gb_Dictionary_CONFIGURATION_FILE := dictionaries.xcu
+$(dir $(call gb_Dictionary_get_target,%))%/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(call gb_Dictionary_get_target,%) :
+	$(call gb_Output_announce,$*,$(true),DIC,3)
+	touch $@
+
+.PHONY : $(call gb_Dictionary_get_clean_target,%)
+$(call gb_Dictionary_get_clean_target,%) :
+	$(call gb_Output_announce,$*,$(false),DIC,3)
+	rm -f $(call gb_Dictionary_get_target,$*)
 
-gb_Dictionary_extensionname = Dictionary/$(1)
+gb_Dictionary_get_packagename = Dictionary/$(1)
+gb_Dictionary_get_packagesetname = Dictionary/$(1)
 
 # Creates a dictionary extension
 #
 # gb_Dictionary_Dictionary dictionary srcdir
 define gb_Dictionary_Dictionary
-$(call gb_ExtensionTarget_ExtensionTarget,$(call gb_Dictionary_extensionname,$(1)),$(2))
-$(call gb_Dictionary_add_root_file,$(1),$(2)/$(gb_Dictionary_CONFIGURATION_FILE))
-
-$(call gb_Dictionary_get_target,$(1)) : $(call gb_ExtensionTarget_get_target,$(call gb_Dictionary_extensionname,$(1)))
+$(call gb_Package_Package_internal,$(call gb_Dictionary_get_packagename,$(1)),$(SRCDIR))
+$(call gb_Package_Package_internal,$(call gb_Dictionary_get_packagename,$(1)_generated),$(WORKDIR))
+$(call gb_PackageSet_PackageSet_internal,$(call gb_Dictionary_get_packagesetname,$(1)))
+
+$(call gb_Package_set_outdir,$(call gb_Dictionary_get_packagename,$(1)),$(INSTDIR))
+$(call gb_Package_set_outdir,$(call gb_Dictionary_get_packagename,$(1)_generated),$(INSTDIR))
+$(call gb_PackageSet_add_package,$(call gb_Dictionary_get_packagesetname,$(1)),$(call gb_Dictionary_get_packagename,$(1)))
+
+ifeq (,$(gb_Dictionary_ALL_LANGS))
+$(call gb_Dictionary_add_root_file,$(1),$(2)/description.xml)
+else
+$(call gb_Dictionary__add_description_translations,$(1),$(2)/description.xml)
+endif
+$(call gb_Dictionary_add_root_file,$(1),$(2)/dictionaries.xcu)
+$(call gb_Dictionary_add_file,$(1),META-INF/manifest.xml,$(2)/META-INF/manifest.xml)
+
+$(call gb_Dictionary_get_target,$(1)) : $(call gb_PackageSet_get_target,$(call gb_Dictionary_get_packagesetname,$(1)))
 $(call gb_Dictionary_get_target,$(1)) :| $(dir $(call gb_Dictionary_get_target,$(1))).dir
-$(call gb_Dictionary_get_clean_target,$(1)) : $(call gb_ExtensionTarget_get_clean_target,$(call gb_Dictionary_extensionname,$(1)))
-
-$(call gb_Deliver_add_deliverable,$(call gb_Dictionary_get_target,$(1)),$(call gb_ExtensionTarget_get_target,$(call gb_Dictionary_extensionname,$(1))),$(1))
+$(call gb_Dictionary_get_clean_target,$(1)) : $(call gb_PackageSet_get_clean_target,$(call gb_Dictionary_get_packagesetname,$(1)))
 
 $$(eval $$(call gb_Module_register_target,$(call gb_Dictionary_get_target,$(1)),$(call gb_Dictionary_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),Dictionary)
 
 endef
 
+# gb_Dictionary__add_description_translation_impl dictionary desctarget descxml
+define gb_Dictionary__add_description_translation_impl
+$(call gb_DescriptionTranslateTarget_DescriptionTranslateTarget,$(2),$(3),$(gb_Dictionary_ALL_LANGS))
+$(call gb_Dictionary_add_generated_file,$(1),description.xml,$(call gb_DescriptionTranslateTarget_get_target,$(2)))
+
+$(call gb_Dictionary_get_target,$(1)) : $(call gb_DescriptionTranslateTarget_get_target,$(2))
+$(call gb_Dictionary_get_clean_target,$(1)) : $(call gb_DescriptionTranslateTarget_get_clean_target,$(2))
+
+endef
+
+# gb_Dictionary__add_description_translations dictionary descxml
+define gb_Dictionary__add_description_translations
+$(call gb_Dictionary__add_description_translation_impl,$(1),$(basename $(2)),$(2))
+
+endef
+
+# gb_Dictionary__add_file dictionary package-base destfile sourcefile
+define gb_Dictionary__add_file
+$(call gb_Package_add_file,$(call gb_Dictionary_get_packagename,$(2)),$(gb_Dictionary_INSTDIR)/$(1)/$(3),$(4))
+
+endef
+
 # Adds a file from $(SRCDIR) to the dictionary under chosen name
 #
 # gb_Dictionary_add_file dictionary destfile sourcefile
 define gb_Dictionary_add_file
-$(call gb_ExtensionTarget_add_file,$(call gb_Dictionary_extensionname,$(1)),$(2),$(SRCDIR)/$(3))
+$(call gb_Dictionary__add_file,$(1),$(1),$(2),$(3))
 
 endef
 
@@ -90,7 +262,7 @@ endef
 #
 # gb_Dictionary_add_files dictionary destdir file(s)
 define gb_Dictionary_add_files
-$(call gb_ExtensionTarget_add_files,$(call gb_Dictionary_extensionname,$(1)),$(2),$(addprefix $(SRCDIR)/,$(3)))
+$(foreach file,$(3),$(call gb_Dictionary_add_file,$(1),$(2)/$(notdir $(file)),$(file)))
 
 endef
 
@@ -98,7 +270,8 @@ endef
 #
 # gb_Dictionary_add_file dictionary destfile sourcefile
 define gb_Dictionary_add_generated_file
-$(call gb_ExtensionTarget_add_file,$(call gb_Dictionary_extensionname,$(1)),$(2),$(3))
+$(call gb_Dictionary__add_file,$(1),$(1)_generated,$(2),$(subst $(WORKDIR)/,,$(3)))
+$(call gb_PackageSet_add_package,$(call gb_Dictionary_get_packagesetname,$(1)),$(call gb_Dictionary_get_packagename,$(1)_generated))
 
 endef
 
@@ -108,12 +281,7 @@ endef
 #
 # gb_Dictionary_add_files dictionary destdir file(s)
 define gb_Dictionary_add_generated_files
-$(call gb_ExtensionTarget_add_files,$(call gb_Dictionary_extensionname,$(1)),$(2),$(3))
-
-endef
-
-define gb_Dictionary__add_root_file
-$(call gb_ExtensionTarget_add_file,$(call gb_Dictionary_extensionname,$(1)),$(notdir $(2)),$(2))
+$(foreach file,$(3),$(call gb_Dictionary_add_generated_file,$(1),$(2)/$(notdir $(file)),$(file)))
 
 endef
 
@@ -121,7 +289,7 @@ endef
 #
 # gb_Dictionary_add_root_file dictionary file
 define gb_Dictionary_add_root_file
-$(call gb_Dictionary__add_root_file,$(1),$(SRCDIR)/$(2))
+$(call gb_Dictionary_add_file,$(1),$(notdir $(2)),$(2))
 
 endef
 
@@ -133,6 +301,12 @@ $(foreach file,$(2),$(call gb_Dictionary_add_root_file,$(1),$(file)))
 
 endef
 
+define gb_Dictionary__add_thesaurus
+$(call gb_Dictionary__add_file,$(1),$(1)_generated,$(notdir $(3)),$(subst $(WORKDIR)/,,$(3)))
+$(call gb_PackageSet_add_package,$(call gb_Dictionary_get_packagesetname,$(1)),$(call gb_Dictionary_get_packagename,$(1)_generated))
+
+endef
+
 # Adds a thesaurus to the dictionary
 #
 # An index for the thesaurus is generated and added to the dictionary as
@@ -142,7 +316,7 @@ endef
 define gb_Dictionary_add_thesaurus
 $(call gb_ThesaurusIndexTarget_ThesaurusIndexTarget,$(2))
 $(call gb_Dictionary_add_root_file,$(1),$(2))
-$(call gb_Dictionary__add_root_file,$(1),$(call gb_ThesaurusIndexTarget_get_target,$(2)))
+$(call gb_Dictionary__add_thesaurus,$(1),$(2),$(call gb_ThesaurusIndexTarget_get_target,$(2)))
 
 endef
 
@@ -157,13 +331,33 @@ $(foreach thesaurus,$(2),$(call gb_Dictionary_add_thesaurus,$(1),$(thesaurus)))
 
 endef
 
+# gb_Dictionary__translate_propertyfile_impl dictionary destfile propertyfile propertyname lang
+define gb_Dictionary__translate_propertyfile_impl
+$(call gb_PropertiesTranslateTarget_PropertiesTranslateTarget,$(4),$(3),$(5))
+$(call gb_Dictionary_add_generated_file,$(1),$(2),$(call gb_PropertiesTranslateTarget_get_target,$(4)))
+
+endef
+
+# gb_Dictionary__translate_propertyfile dictionary destdir propertyfile propertyname lang
+define gb_Dictionary__translate_propertyfile
+$(call gb_Dictionary__translate_propertyfile_impl,$(1),$(2)$(notdir $(4)).properties,$(3),$(4),$(5))
+
+endef
+
+# gb_Dictionary__add_propertyfile_translations dictionary destfile propertyfile
+define gb_Dictionary__add_propertyfile_translations
+$(foreach lang,$(gb_Dictionary_ALL_LANGS),$(call gb_Dictionary__translate_propertyfile,$(1),$(dir $(2)),$(3),$(subst en_US,$(subst -,_,$(lang)),$(basename $(3))),$(lang)))
+
+endef
+
 # Adds a .property file to the dictionary under chosen name
 #
 # The file is localized automatically.
 #
 # gb_Dictionary_add_propertyfile dictionary destfile propertyfile
 define gb_Dictionary_add_propertyfile
-$(call gb_ExtensionTarget_localize_properties,$(call gb_Dictionary_extensionname,$(1)),$(2),$(SRCDIR)/$(3))
+$(call gb_Dictionary__add_file,$(1),$(1),$(2),$(3))
+$(call gb_Dictionary__add_propertyfile_translations,$(1),$(2),$(3))
 
 endef
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 5338fd3..43c9dc3 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -32,7 +32,6 @@ gb_CliLibrary_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliLibrary_EXT)
 gb_CliNativeLibrary_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliNativeLibrary_EXT)
 gb_CliUnoApi_get_target = $(gb_Helper_OUTDIRLIBDIR)/$(1)$(gb_CliUnoApi_EXT)
 gb_ComponentTarget_get_outdir_target = $(OUTDIR)/xml/component/$(1).component
-gb_Dictionary_get_target = $(OUTDIR)/pck/$(1).oxt
 gb_Executable_get_target = $(OUTDIR)/bin/$(1)$(gb_Executable_EXT)
 gb_Executable_get_target_for_build = $(OUTDIR_FOR_BUILD)/bin/$(1)$(gb_Executable_EXT_for_build)
 gb_Extension_get_target = $(OUTDIR)/bin/$(1).oxt
@@ -105,6 +104,8 @@ gb_CppunitTestFakeExecutable_get_target = \
 gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done
 gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done
 gb_CustomTarget_get_workdir = $(WORKDIR)/CustomTarget/$(1)
+gb_DescriptionTranslateTarget_get_target = $(WORKDIR)/DescriptionTranslateTarget/$(1).xml
+gb_Dictionary_get_target = $(WORKDIR)/Dictionary/$(1).done
 gb_CxxObject_get_target = $(WORKDIR)/CxxObject/$(1).o
 gb_GenCxxObject_get_target = $(WORKDIR)/GenCxxObject/$(1).o
 gb_Executable_get_external_headers_target = $(WORKDIR)/ExternalHeaders/Executable/$(1)
@@ -170,6 +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_PropertiesTranslateTarget_get_target = $(WORKDIR)/PropertiesTranslateTarget/$(1).properties
 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
@@ -265,6 +267,8 @@ $(eval $(call gb_Helper_make_clean_targets,\
 	CliNativeLibraryTarget \
 	CliUnoApiTarget \
 	ComponentTarget \
+	DescriptionTranslateTarget \
+	Dictionary \
 	ExternalPackage \
 	ExtensionTarget \
 	HelpTarget \
@@ -289,6 +293,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
 	PackageSet \
 	Pagein \
 	PrecompiledHeader \
+	PropertiesTranslateTarget \
 	Pyuno \
 	PythonTest \
 	Rdb \
@@ -329,7 +334,6 @@ $(eval $(call gb_Helper_make_outdir_clean_targets,\
 	CliLibrary \
 	CliNativeLibrary \
 	CliUnoApi \
-	Dictionary \
 	Executable \
 	Extension \
 	InstallScript \
commit 2636236a5cbdf51170902b906b8f607c8c4fb1bb
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Apr 16 13:27:30 2013 +0200

    gbuild: use Package for odk examples
    
    Change-Id: I978573b792cf159b7c818ec20a14195bfd6605e5

diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 9a384d1..c18223c 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_Module_add_targets,odk,\
 	CustomTarget_settings \
 	CustomTarget_autodoc \
 	Executable_unoapploader \
-	Zip_odkexamples \
+	Package_examples \
 ))
 
 ifneq ($(SOLAR_JAVA),)
diff --git a/odk/Package_examples.mk b/odk/Package_examples.mk
new file mode 100644
index 0000000..0c8a705
--- /dev/null
+++ b/odk/Package_examples.mk
@@ -0,0 +1,533 @@
+# -*- 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,odk_examples,$(SRCDIR)/odk/examples))
+
+$(eval $(call gb_Package_set_outdir,odk_examples,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files_with_dir,odk_examples,$(gb_Package_SDKDIRNAME)/examples,\
+    CLI/CSharp/Spreadsheet/GeneralTableSample.cs \
+    CLI/CSharp/Spreadsheet/Makefile \
+    CLI/CSharp/Spreadsheet/SpreadsheetDocHelper.cs \
+    CLI/CSharp/Spreadsheet/SpreadsheetSample.cs \
+    CLI/CSharp/Spreadsheet/ViewSample.cs \
+    CLI/VB.NET/WriterDemo/Makefile \
+    CLI/VB.NET/WriterDemo/WriterDemo.vb \
+    DevelopersGuide/BasicAndDialogs/CreatingDialogs/CreatingDialogs.odt \
+    DevelopersGuide/BasicAndDialogs/CreatingDialogs/Makefile \
+    DevelopersGuide/BasicAndDialogs/CreatingDialogs/SampleDialog.java \
+    DevelopersGuide/BasicAndDialogs/FirstStepsBasic.odt \
+    DevelopersGuide/BasicAndDialogs/ToolkitControls/Makefile \
+    DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls.odt \
+    DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialog.xba \
+    DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/FileDialogDlg.xdl \
+    DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/MultiPage.xba \
+    DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/MultiPageDlg.xdl \
+    DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/ProgressBar.xba \
+    DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/ProgressBarDlg.xdl \
+    DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/ScrollBar.xba \
+    DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/ScrollBarDlg.xdl \
+    DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/dialog.xlb \
+    DevelopersGuide/BasicAndDialogs/ToolkitControls/ToolkitControls/script.xlb \
+    DevelopersGuide/Charts/AddInChart.ods \
+    DevelopersGuide/Charts/CalcHelper.java \
+    DevelopersGuide/Charts/ChartHelper.java \
+    DevelopersGuide/Charts/ChartInCalc.java \
+    DevelopersGuide/Charts/ChartInDraw.java \
+    DevelopersGuide/Charts/ChartInWriter.java \
+    DevelopersGuide/Charts/Helper.java \
+    DevelopersGuide/Charts/JavaSampleChartAddIn.components \
+    DevelopersGuide/Charts/JavaSampleChartAddIn.java \
+    DevelopersGuide/Charts/ListenAtCalcRangeInDraw.java \
+    DevelopersGuide/Charts/Makefile \
+    DevelopersGuide/Charts/SelectionChangeListener.java \
+    DevelopersGuide/Charts/bullet.gif \
+    DevelopersGuide/Components/Addons/JobsAddon/Addons.xcu \
+    DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.components \
+    DevelopersGuide/Components/Addons/JobsAddon/AsyncJob.java \
+    DevelopersGuide/Components/Addons/JobsAddon/Jobs.xcu \
+    DevelopersGuide/Components/Addons/JobsAddon/Makefile \
+    DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Addons.xcu \
+    DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/Makefile \
+    DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/ProtocolHandler.xcu \
+    DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.cxx \
+    DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/addon.hxx \
+    DevelopersGuide/Components/Addons/ProtocolHandlerAddon_cpp/component.cxx \
+    DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Addons.xcu \
+    DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/Makefile \
+    DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandler.xcu \
+    DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon.java \
+    DevelopersGuide/Components/Addons/ProtocolHandlerAddon_java/ProtocolHandlerAddon_java.components \
+    DevelopersGuide/Components/CppComponent/Makefile \
+    DevelopersGuide/Components/CppComponent/SimpleComponent.odt \
+    DevelopersGuide/Components/CppComponent/TestCppComponent.cxx \
+    DevelopersGuide/Components/CppComponent/service1_impl.cxx \
+    DevelopersGuide/Components/CppComponent/service2_impl.cxx \
+    DevelopersGuide/Components/CppComponent/some.idl \
+    DevelopersGuide/Components/JavaComponent/JavaComponent.components \
+    DevelopersGuide/Components/JavaComponent/Makefile \
+    DevelopersGuide/Components/JavaComponent/SomethingA.idl \
+    DevelopersGuide/Components/JavaComponent/SomethingB.idl \
+    DevelopersGuide/Components/JavaComponent/TestComponentA.java \
+    DevelopersGuide/Components/JavaComponent/TestComponentB.java \
+    DevelopersGuide/Components/JavaComponent/TestJavaComponent.java \
+    DevelopersGuide/Components/JavaComponent/TestServiceProvider.java \
+    DevelopersGuide/Components/JavaComponent/XSomethingA.idl \
+    DevelopersGuide/Components/JavaComponent/XSomethingB.idl \
+    DevelopersGuide/Components/SimpleLicense/LicenseTest.components \
+    DevelopersGuide/Components/SimpleLicense/LicenseTest.idl \
+    DevelopersGuide/Components/SimpleLicense/LicenseTest.java \
+    DevelopersGuide/Components/SimpleLicense/Makefile \
+    DevelopersGuide/Components/SimpleLicense/description.xml \
+    DevelopersGuide/Components/SimpleLicense/registration/license_de.txt \
+    DevelopersGuide/Components/SimpleLicense/registration/license_en_US.txt \
+    DevelopersGuide/Components/Thumbs/Makefile \
+    DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/ImageShrink.components \
+    DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/ImageShrink.java \
+    DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Makefile \
+    DevelopersGuide/Components/Thumbs/org/openoffice/comp/test/Thumbs.java \
+    DevelopersGuide/Components/Thumbs/org/openoffice/test/ImageShrink.idl \
+    DevelopersGuide/Components/Thumbs/org/openoffice/test/Makefile \
+    DevelopersGuide/Components/Thumbs/org/openoffice/test/XImageShrink.idl \
+    DevelopersGuide/Components/Thumbs/org/openoffice/test/XImageShrinkFilter.idl \
+    DevelopersGuide/Components/Thumbs/thumbs.mk \
+    DevelopersGuide/Components/dialogcomponent/DialogComponent.components \
+    DevelopersGuide/Components/dialogcomponent/DialogComponent.java \
+    DevelopersGuide/Components/dialogcomponent/DialogComponent.odt \
+    DevelopersGuide/Components/dialogcomponent/Makefile \
+    DevelopersGuide/Components/dialogcomponent/TestDialogHandler.idl \
+    DevelopersGuide/Components/dialogcomponent/XTestDialogHandler.idl \
+    DevelopersGuide/Config/ConfigExamples.java \
+    DevelopersGuide/Config/Makefile \
+    DevelopersGuide/Database/CodeSamples.java \
+    DevelopersGuide/Database/DriverSkeleton/How_to_write_my_own_driver.txt \
+    DevelopersGuide/Database/DriverSkeleton/Makefile \
+    DevelopersGuide/Database/DriverSkeleton/OSubComponent.hxx \
+    DevelopersGuide/Database/DriverSkeleton/OTypeInfo.hxx \
+    DevelopersGuide/Database/DriverSkeleton/SConnection.cxx \
+    DevelopersGuide/Database/DriverSkeleton/SConnection.hxx \
+    DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.cxx \
+    DevelopersGuide/Database/DriverSkeleton/SDatabaseMetaData.hxx \
+    DevelopersGuide/Database/DriverSkeleton/SDriver.cxx \
+    DevelopersGuide/Database/DriverSkeleton/SDriver.hxx \
+    DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.cxx \
+    DevelopersGuide/Database/DriverSkeleton/SPreparedStatement.hxx \
+    DevelopersGuide/Database/DriverSkeleton/SResultSet.cxx \
+    DevelopersGuide/Database/DriverSkeleton/SResultSet.hxx \
+    DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.cxx \
+    DevelopersGuide/Database/DriverSkeleton/SResultSetMetaData.hxx \
+    DevelopersGuide/Database/DriverSkeleton/SServices.cxx \
+    DevelopersGuide/Database/DriverSkeleton/SStatement.cxx \
+    DevelopersGuide/Database/DriverSkeleton/SStatement.hxx \
+    DevelopersGuide/Database/DriverSkeleton/propertyids.cxx \
+    DevelopersGuide/Database/DriverSkeleton/propertyids.hxx \
+    DevelopersGuide/Database/Makefile \
+    DevelopersGuide/Database/OpenQuery.java \
+    DevelopersGuide/Database/RowSet.java \
+    DevelopersGuide/Database/RowSetEventListener.java \
+    DevelopersGuide/Database/Sales.java \
+    DevelopersGuide/Database/SalesMan.java \
+    DevelopersGuide/Database/sdbcx.java \
+    DevelopersGuide/Drawing/ChangeOrderDemo.java \
+    DevelopersGuide/Drawing/ControlAndSelectDemo.java \
+    DevelopersGuide/Drawing/CustomShowDemo.java \
+    DevelopersGuide/Drawing/DrawViewDemo.java \
+    DevelopersGuide/Drawing/DrawingDemo.java \
+    DevelopersGuide/Drawing/FillAndLineStyleDemo.java \
+    DevelopersGuide/Drawing/GluePointDemo.java \
+    DevelopersGuide/Drawing/GraphicExportDemo.java \
+    DevelopersGuide/Drawing/Helper.java \
+    DevelopersGuide/Drawing/LayerDemo.java \
+    DevelopersGuide/Drawing/Makefile \
+    DevelopersGuide/Drawing/ObjectTransformationDemo.java \
+    DevelopersGuide/Drawing/Organigram.java \
+    DevelopersGuide/Drawing/PageHelper.java \
+    DevelopersGuide/Drawing/PresentationDemo.java \
+    DevelopersGuide/Drawing/ShapeHelper.java \
+    DevelopersGuide/Drawing/SimplePresentation.odp \
+    DevelopersGuide/Drawing/StyleDemo.java \
+    DevelopersGuide/Drawing/TextDemo.java \
+    DevelopersGuide/Extensions/DialogWithHelp/Addons.xcu \
+    DevelopersGuide/Extensions/DialogWithHelp/DialogWithHelp/Dialog1.xdl \
+    DevelopersGuide/Extensions/DialogWithHelp/DialogWithHelp/Module1.xba \
+    DevelopersGuide/Extensions/DialogWithHelp/DialogWithHelp/dialog.xlb \
+    DevelopersGuide/Extensions/DialogWithHelp/DialogWithHelp/script.xlb \
+    DevelopersGuide/Extensions/DialogWithHelp/META-INF/manifest.xml \
+    DevelopersGuide/Extensions/DialogWithHelp/Makefile \
+    DevelopersGuide/Extensions/DialogWithHelp/description.xml \
+    DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/page1.xhp \
+    DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/page2.xhp \
+    DevelopersGuide/Extensions/DialogWithHelp/help/de/com.foocorp.foo-ext/subfolder/anotherpage.xhp \
+    DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/page1.xhp \
+    DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/page2.xhp \
+    DevelopersGuide/Extensions/DialogWithHelp/help/en/com.foocorp.foo-ext/subfolder/anotherpage.xhp \
+    DevelopersGuide/FirstSteps/FirstConnection.java \
+    DevelopersGuide/FirstSteps/FirstLoadComponent.java \
+    DevelopersGuide/FirstSteps/FirstUnoContact.java \
+    DevelopersGuide/FirstSteps/HelloTextTableShape.java \
+    DevelopersGuide/FirstSteps/Makefile \
+    DevelopersGuide/FirstSteps/build_FirstUnoContact.xml \
+    DevelopersGuide/Forms/BooleanValidator.java \
+    DevelopersGuide/Forms/ButtonOperator.java \
+    DevelopersGuide/Forms/ComponentTreeTraversal.java \
+    DevelopersGuide/Forms/ControlLock.java \
+    DevelopersGuide/Forms/ControlValidation.java \
+    DevelopersGuide/Forms/ControlValidator.java \
+    DevelopersGuide/Forms/DataAwareness.java \
+    DevelopersGuide/Forms/DateValidator.java \
+    DevelopersGuide/Forms/DocumentBasedExample.java \
+    DevelopersGuide/Forms/DocumentHelper.java \
+    DevelopersGuide/Forms/DocumentType.java \
+    DevelopersGuide/Forms/DocumentViewHelper.java \
+    DevelopersGuide/Forms/FLTools.java \
+    DevelopersGuide/Forms/FormLayer.java \
+    DevelopersGuide/Forms/GridFieldValidator.java \
+    DevelopersGuide/Forms/HsqlDatabase.java \
+    DevelopersGuide/Forms/InteractionRequest.java \
+    DevelopersGuide/Forms/KeyGenerator.java \
+    DevelopersGuide/Forms/ListSelectionValidator.java \
+    DevelopersGuide/Forms/Makefile \
+    DevelopersGuide/Forms/NumericValidator.java \
+    DevelopersGuide/Forms/ProgrammaticScriptAssignment.odt \
+    DevelopersGuide/Forms/RowSet.java \
+    DevelopersGuide/Forms/SalesFilter.java \
+    DevelopersGuide/Forms/SingleControlValidation.java \
+    DevelopersGuide/Forms/SpreadsheetDocument.java \
+    DevelopersGuide/Forms/SpreadsheetValueBinding.java \
+    DevelopersGuide/Forms/SpreadsheetView.java \
+    DevelopersGuide/Forms/TableCellTextBinding.java \
+    DevelopersGuide/Forms/TextValidator.java \
+    DevelopersGuide/Forms/TimeValidator.java \
+    DevelopersGuide/Forms/UNO.java \
+    DevelopersGuide/Forms/URLHelper.java \
+    DevelopersGuide/Forms/ValueBinding.java \
+    DevelopersGuide/Forms/WaitForInput.java \
+    DevelopersGuide/GUI/DialogDocument.java \
+    DevelopersGuide/GUI/ImageControlSample.java \
+    DevelopersGuide/GUI/Makefile \
+    DevelopersGuide/GUI/MessageBox.java \
+    DevelopersGuide/GUI/RoadmapItemStateChangeListener.java \
+    DevelopersGuide/GUI/SystemDialog.java \
+    DevelopersGuide/GUI/UnoDialogSample.java \
+    DevelopersGuide/GUI/UnoDialogSample2.java \
+    DevelopersGuide/GUI/UnoMenu.java \
+    DevelopersGuide/GUI/UnoMenu2.java \
+    DevelopersGuide/GUI/oologo.gif \
+    DevelopersGuide/OfficeBean/Makefile \
+    DevelopersGuide/OfficeBean/OOoBeanViewer.java \
+    DevelopersGuide/OfficeBean/OfficeIconColor16.jpg \
+    DevelopersGuide/OfficeBean/OfficeIconColor32.jpg \
+    DevelopersGuide/OfficeBean/OfficeIconMono16.jpg \
+    DevelopersGuide/OfficeBean/OfficeIconMono32.jpg \
+    DevelopersGuide/OfficeDev/Clipboard/Clipboard.java \
+    DevelopersGuide/OfficeDev/Clipboard/ClipboardListener.java \
+    DevelopersGuide/OfficeDev/Clipboard/ClipboardOwner.java \
+    DevelopersGuide/OfficeDev/Clipboard/Makefile \
+    DevelopersGuide/OfficeDev/Clipboard/TextTransferable.java \
+    DevelopersGuide/OfficeDev/ContextMenuInterceptor.java \
+    DevelopersGuide/OfficeDev/DesktopEnvironment/CustomizeView.java \
+    DevelopersGuide/OfficeDev/DesktopEnvironment/Desk.java \
+    DevelopersGuide/OfficeDev/DesktopEnvironment/DocumentView.java \
+    DevelopersGuide/OfficeDev/DesktopEnvironment/FunctionHelper.java \
+    DevelopersGuide/OfficeDev/DesktopEnvironment/IOnewayLink.java \
+    DevelopersGuide/OfficeDev/DesktopEnvironment/IShutdownListener.java \
+    DevelopersGuide/OfficeDev/DesktopEnvironment/Install.txt \
+    DevelopersGuide/OfficeDev/DesktopEnvironment/Interceptor.java \
+    DevelopersGuide/OfficeDev/DesktopEnvironment/JavaWindowPeerFake.java \
+    DevelopersGuide/OfficeDev/DesktopEnvironment/Makefile \
+    DevelopersGuide/OfficeDev/DesktopEnvironment/NativeView.java \
+    DevelopersGuide/OfficeDev/DesktopEnvironment/OfficeConnect.java \
+    DevelopersGuide/OfficeDev/DesktopEnvironment/OnewayExecutor.java \
+    DevelopersGuide/OfficeDev/DesktopEnvironment/StatusListener.java \
+    DevelopersGuide/OfficeDev/DesktopEnvironment/StatusView.java \
+    DevelopersGuide/OfficeDev/DesktopEnvironment/ViewContainer.java \
+    DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/Makefile \
+    DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.c \
+    DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/unix/nativeview.h \
+    DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/Makefile \
+    DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.c \
+    DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.def \
+    DevelopersGuide/OfficeDev/DesktopEnvironment/nativelib/windows/nativeview.h \
+    DevelopersGuide/OfficeDev/DisableCommands/DisableCommandsTest.java \
+    DevelopersGuide/OfficeDev/DisableCommands/Makefile \
+    DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/AsciiReplaceFilter.java \
+    DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/FilterOptions.java \
+    DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/Makefile \
+    DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/SampleFilter.components \
+    DevelopersGuide/OfficeDev/FilterDevelopment/AsciiFilter/TypeDetection.xcu \
+    DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/FlatXmlTypeDetection.xcu \
+    DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/Makefile \
+    DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/fdcomp.cxx \
+    DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.cxx \
+    DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilterDetection/filterdetect.hxx \
+    DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx \
+    DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXmlFilter_cpp.xcu \
+    DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/Makefile \
+    DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXml.java \
+    DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXmlFilter_java.components \
+    DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/FlatXmlFilter_java.xcu \
+    DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_java/Makefile \
+    DevelopersGuide/OfficeDev/Linguistic/LinguisticExamples.java \
+    DevelopersGuide/OfficeDev/Linguistic/Makefile \
+    DevelopersGuide/OfficeDev/Linguistic/OneInstanceFactory.java \
+    DevelopersGuide/OfficeDev/Linguistic/PropChgHelper.java \
+    DevelopersGuide/OfficeDev/Linguistic/PropChgHelper_Hyph.java \
+    DevelopersGuide/OfficeDev/Linguistic/PropChgHelper_Spell.java \
+    DevelopersGuide/OfficeDev/Linguistic/SampleHyphenator.components \
+    DevelopersGuide/OfficeDev/Linguistic/SampleHyphenator.java \
+    DevelopersGuide/OfficeDev/Linguistic/SampleSpellChecker.components \
+    DevelopersGuide/OfficeDev/Linguistic/SampleSpellChecker.java \
+    DevelopersGuide/OfficeDev/Linguistic/SampleThesaurus.components \
+    DevelopersGuide/OfficeDev/Linguistic/SampleThesaurus.java \
+    DevelopersGuide/OfficeDev/Linguistic/XHyphenatedWord_impl.java \
+    DevelopersGuide/OfficeDev/Linguistic/XMeaning_impl.java \
+    DevelopersGuide/OfficeDev/Linguistic/XPossibleHyphens_impl.java \
+    DevelopersGuide/OfficeDev/Linguistic/XSpellAlternatives_impl.java \
+    DevelopersGuide/OfficeDev/Makefile \
+    DevelopersGuide/OfficeDev/MenuElement.java \
+    DevelopersGuide/OfficeDev/Number_Formats.java \
+    DevelopersGuide/OfficeDev/OfficeConnect.java \
+    DevelopersGuide/OfficeDev/PathSettings/Makefile \
+    DevelopersGuide/OfficeDev/PathSettings/PathSettingsTest.java \
+    DevelopersGuide/OfficeDev/PathSubstitution/Makefile \
+    DevelopersGuide/OfficeDev/PathSubstitution/PathSubstitutionTest.java \
+    DevelopersGuide/OfficeDev/TerminationTest/Makefile \
+    DevelopersGuide/OfficeDev/TerminationTest/TerminateListener.java \
+    DevelopersGuide/OfficeDev/TerminationTest/TerminationTest.java \
+    DevelopersGuide/ProfUNO/CppBinding/Makefile \
+    DevelopersGuide/ProfUNO/CppBinding/office_connect.cxx \
+    DevelopersGuide/ProfUNO/CppBinding/string_samples.cxx \
+    DevelopersGuide/ProfUNO/InterprocessConn/ConnectionAwareClient.java \
+    DevelopersGuide/ProfUNO/InterprocessConn/Makefile \
+    DevelopersGuide/ProfUNO/InterprocessConn/UrlResolver.java \
+    DevelopersGuide/ProfUNO/Lifetime/Makefile \
+    DevelopersGuide/ProfUNO/Lifetime/MyUnoObject.java \
+    DevelopersGuide/ProfUNO/Lifetime/object_lifetime.cxx \
+    DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/Makefile \
+    DevelopersGuide/ProfUNO/SimpleBootstrap_cpp/SimpleBootstrap_cpp.cxx \
+    DevelopersGuide/ProfUNO/SimpleBootstrap_java/Makefile \
+    DevelopersGuide/ProfUNO/SimpleBootstrap_java/SimpleBootstrap_java.java \
+    DevelopersGuide/ProfUNO/SimpleBootstrap_java/manifest.mf \
+    DevelopersGuide/ScriptingFramework/SayHello/META-INF/manifest.xml \
+    DevelopersGuide/ScriptingFramework/SayHello/Makefile \
+    DevelopersGuide/ScriptingFramework/SayHello/SayHello.odt \
+    DevelopersGuide/ScriptingFramework/SayHello/SayHello/SayHello.java \
+    DevelopersGuide/ScriptingFramework/SayHello/SayHello/parcel-descriptor.xml \
+    DevelopersGuide/ScriptingFramework/SayHello/build.xml \
+    DevelopersGuide/ScriptingFramework/ScriptSelector/META-INF/manifest.xml \
+    DevelopersGuide/ScriptingFramework/ScriptSelector/Makefile \
+    DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector.odt \
+    DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/ScriptSelector.java \
+    DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/container.gif \
+    DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/parcel-descriptor.xml \
+    DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/script.gif \
+    DevelopersGuide/ScriptingFramework/ScriptSelector/ScriptSelector/soffice.gif \
+    DevelopersGuide/ScriptingFramework/ScriptSelector/build.xml \
+    DevelopersGuide/Spreadsheet/DataPilotReadme.txt \
+    DevelopersGuide/Spreadsheet/ExampleAddIn.components \
+    DevelopersGuide/Spreadsheet/ExampleAddIn.java \
+    DevelopersGuide/Spreadsheet/ExampleAddIn.ods \
+    DevelopersGuide/Spreadsheet/ExampleDataPilotSource.components \
+    DevelopersGuide/Spreadsheet/ExampleDataPilotSource.java \
+    DevelopersGuide/Spreadsheet/GeneralTableSample.java \
+    DevelopersGuide/Spreadsheet/Makefile \
+    DevelopersGuide/Spreadsheet/SpreadsheetDocHelper.java \
+    DevelopersGuide/Spreadsheet/SpreadsheetSample.java \
+    DevelopersGuide/Spreadsheet/ViewSample.java \
+    DevelopersGuide/Spreadsheet/XExampleAddIn.idl \
+    DevelopersGuide/Text/Makefile \
+    DevelopersGuide/Text/PrintDemo.odt \
+    DevelopersGuide/Text/TextDocuments.java \
+    DevelopersGuide/Text/TextTemplateWithUserFields.odt \
+    DevelopersGuide/UCB/ChildrenRetriever.java \
+    DevelopersGuide/UCB/DataStreamComposer.java \
+    DevelopersGuide/UCB/DataStreamRetriever.java \
+    DevelopersGuide/UCB/Helper.java \
+    DevelopersGuide/UCB/Makefile \
+    DevelopersGuide/UCB/MyActiveDataSink.java \
+    DevelopersGuide/UCB/MyInputStream.java \
+    DevelopersGuide/UCB/PropertiesComposer.java \
+    DevelopersGuide/UCB/PropertiesRetriever.java \
+    DevelopersGuide/UCB/ResourceCreator.java \
+    DevelopersGuide/UCB/ResourceManager.java \
+    DevelopersGuide/UCB/ResourceRemover.java \
+    DevelopersGuide/UCB/data/data.txt \
+    OLE/activex/Makefile \
+    OLE/activex/README.txt \
+    OLE/activex/SOActiveX.cpp \
+    OLE/activex/SOActiveX.h \
+    OLE/activex/SOActiveX.rgs \
+    OLE/activex/SOComWindowPeer.cpp \
+    OLE/activex/SOComWindowPeer.h \
+    OLE/activex/SOComWindowPeer.rgs \
+    OLE/activex/StdAfx2.cpp \
+    OLE/activex/StdAfx2.h \
+    OLE/activex/example.html \
+    OLE/activex/resource.h \
+    OLE/activex/so_activex.cpp \
+    OLE/activex/so_activex.def \
+    OLE/activex/so_activex.idl \
+    OLE/activex/so_activex.rc \
+    OLE/vbscript/WriterDemo.vbs \
+    OLE/vbscript/readme.txt \
+    basic/drawing/dirtree.txt \
+    basic/drawing/importexportofasciifiles.odg \
+    basic/forms_and_controls/beef.wmf \
+    basic/forms_and_controls/burger.wmf \
+    basic/forms_and_controls/burger_factory.odt \
+    basic/forms_and_controls/chicken.wmf \
+    basic/forms_and_controls/fish.wmf \
+    basic/forms_and_controls/vegetable.wmf \
+    basic/sheet/adapting_to_euroland.ods \
+    basic/stock_quotes_updater/stock.ods \
+    basic/text/creating_an_index/index.odt \
+    basic/text/creating_an_index/indexlist.txt \
+    basic/text/modifying_text_automatically/changing_appearance.odt \
+    basic/text/modifying_text_automatically/inserting_bookmarks.odt \
+    basic/text/modifying_text_automatically/replacing_text.odt \
+    basic/text/modifying_text_automatically/using_regular_expressions.odt \
+    cpp/DocumentLoader/DocumentLoader.cxx \
+    cpp/DocumentLoader/Makefile \
+    cpp/DocumentLoader/test.odt \
+    cpp/complextoolbarcontrols/Addons.xcu \
+    cpp/complextoolbarcontrols/CalcListener.cxx \
+    cpp/complextoolbarcontrols/CalcWindowState.xcu \
+    cpp/complextoolbarcontrols/Jobs.xcu \
+    cpp/complextoolbarcontrols/ListenerHelper.cxx \
+    cpp/complextoolbarcontrols/ListenerHelper.h \
+    cpp/complextoolbarcontrols/Makefile \
+    cpp/complextoolbarcontrols/MyJob.cxx \
+    cpp/complextoolbarcontrols/MyJob.h \
+    cpp/complextoolbarcontrols/MyListener.cxx \
+    cpp/complextoolbarcontrols/MyListener.h \
+    cpp/complextoolbarcontrols/MyProtocolHandler.cxx \
+    cpp/complextoolbarcontrols/MyProtocolHandler.h \
+    cpp/complextoolbarcontrols/ProtocolHandler.xcu \
+    cpp/complextoolbarcontrols/WriterListener.cxx \
+    cpp/complextoolbarcontrols/WriterWindowState.xcu \
+    cpp/complextoolbarcontrols/exports.cxx \
+    cpp/complextoolbarcontrols/logo_big.png \
+    cpp/complextoolbarcontrols/logo_small.png \
+    cpp/counter/Makefile \
+    cpp/counter/XCountable.idl \
+    cpp/counter/counter.cxx \
+    cpp/counter/countermain.cxx \
+    cpp/remoteclient/Makefile \
+    cpp/remoteclient/remoteclient.cxx \
+    java/DocumentHandling/DocumentConverter.java \
+    java/DocumentHandling/DocumentLoader.java \
+    java/DocumentHandling/DocumentPrinter.java \
+    java/DocumentHandling/DocumentSaver.java \
+    java/DocumentHandling/Makefile \
+    java/DocumentHandling/test/test1.odt \
+    java/Drawing/Makefile \
+    java/Drawing/SDraw.java \
+    java/EmbedDocument/EmbeddedObject/EditorFrame.java \
+    java/EmbedDocument/EmbeddedObject/EmbeddedObject.odt \
+    java/EmbedDocument/EmbeddedObject/EmbeddedObject.xcu \
+    java/EmbedDocument/EmbeddedObject/Makefile \
+    java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.components \
+    java/EmbedDocument/EmbeddedObject/OwnEmbeddedObject.java \
+    java/EmbedDocument/EmbeddedObject/OwnEmbeddedObjectFactory.java \
+    java/Inspector/Addons.xcu \
+    java/Inspector/HideableMutableTreeNode.java \
+    java/Inspector/HideableTreeModel.java \
+    java/Inspector/Inspector.java \
+    java/Inspector/InspectorAddon.java \
+    java/Inspector/InspectorPane.java \
+    java/Inspector/InstanceInspector.idl \
+    java/Inspector/InstanceInspectorTest.odt \
+    java/Inspector/Introspector.java \
+    java/Inspector/Makefile \
+    java/Inspector/MethodParametersDialog.java \
+    java/Inspector/ObjectInspector.xcs \
+    java/Inspector/ObjectInspector.xcu \
+    java/Inspector/ProtocolHandler.xcu \
+    java/Inspector/ProtocolHandlerAddon.java \
+    java/Inspector/SourceCodeGenerator.java \
+    java/Inspector/SwingDialogProvider.java \
+    java/Inspector/SwingTreeControlProvider.java \
+    java/Inspector/SwingTreePathProvider.java \
+    java/Inspector/SwingUnoFacetteNode.java \
+    java/Inspector/SwingUnoMethodNode.java \
+    java/Inspector/SwingUnoNode.java \
+    java/Inspector/SwingUnoPropertyNode.java \
+    java/Inspector/TDocSupplier.java \
+    java/Inspector/TestInspector.java \
+    java/Inspector/UnoMethodNode.java \
+    java/Inspector/UnoNode.java \
+    java/Inspector/UnoPropertyNode.java \
+    java/Inspector/UnoTreeRenderer.java \
+    java/Inspector/XDialogProvider.java \
+    java/Inspector/XInstanceInspector.idl \
+    java/Inspector/XLanguageSourceCodeGenerator.java \
+    java/Inspector/XMethodParametersDialog.java \
+    java/Inspector/XTreeControlProvider.java \
+    java/Inspector/XTreePathProvider.java \
+    java/Inspector/XUnoFacetteNode.java \
+    java/Inspector/XUnoMethodNode.java \
+    java/Inspector/XUnoNode.java \
+    java/Inspector/XUnoPropertyNode.java \
+    java/Inspector/images/containers_16.png \
+    java/Inspector/images/content_16.png \
+    java/Inspector/images/interfaces_16.png \
+    java/Inspector/images/methods_16.png \
+    java/Inspector/images/properties_16.png \
+    java/Inspector/images/services_16.png \
+    java/Inspector/manifest.mf \
+    java/MinimalComponent/BuildMinimalComponent.xml \
+    java/MinimalComponent/Makefile \
+    java/MinimalComponent/MinimalComponent.components \
+    java/MinimalComponent/MinimalComponent.idl \
+    java/MinimalComponent/MinimalComponent.java \
+    java/MinimalComponent/TestMinimalComponent.java \
+    java/PropertySet/Makefile \
+    java/PropertySet/PropTest.components \
+    java/PropertySet/PropTest.java \
+    java/PropertySet/PropertySet.odt \
+    java/Spreadsheet/CalcAddins.components \
+    java/Spreadsheet/CalcAddins.java \
+    java/Spreadsheet/CalcAddins.ods \
+    java/Spreadsheet/ChartTypeChange.java \
+    java/Spreadsheet/EuroAdaption.java \
+    java/Spreadsheet/Makefile \
+    java/Spreadsheet/SCalc.java \
+    java/Spreadsheet/XCalcAddins.idl \
+    java/Text/BookmarkInsertion.java \
+    java/Text/GraphicsInserter.java \
+    java/Text/HardFormatting.java \
+    java/Text/Makefile \
+    java/Text/SWriter.java \
+    java/Text/StyleCreation.java \
+    java/Text/StyleInitialization.java \
+    java/Text/TextDocumentStructure.java \
+    java/Text/TextReplace.java \
+    java/Text/WriterSelector.java \
+    java/Text/oo_smiley.gif \
+    java/ToDo/Makefile \
+    java/ToDo/ToDo.components \
+    java/ToDo/ToDo.idl \
+    java/ToDo/ToDo.java \
+    java/ToDo/ToDo.ods \
+    java/ToDo/XToDo.idl \
+    python/toolpanel/CalcWindowState.xcu \
+    python/toolpanel/Factory.xcu \
+    python/toolpanel/META-INF/manifest.xml \
+    python/toolpanel/Makefile \
+    python/toolpanel/description.xml \
+    python/toolpanel/readme \
+    python/toolpanel/toolPanelPocBasic/Module1.xba \
+    python/toolpanel/toolPanelPocBasic/dialog.xlb \
+    python/toolpanel/toolPanelPocBasic/script.xlb \
+    python/toolpanel/toolpanel.component \
+    python/toolpanel/toolpanel.py \
+    python/toolpanel/toolpanels/poc.xdl \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/odk/Zip_odkexamples.mk b/odk/Zip_odkexamples.mk
deleted file mode 100644
index ed9ee29..0000000
--- a/odk/Zip_odkexamples.mk
+++ /dev/null
@@ -1,28 +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_Zip_Zip,odkexamples,$(SRCDIR)/odk))
-
-$(eval $(call gb_Zip_add_commandoptions,odkexamples,\
-	-r \
-	-x "*makefile.mk" \
-	-x "*Container1*" \
-	-x "*Storage*" \
-	-x "*register_component*" \
-	-x "*examples.html" \
-	-x "*ConverterServlet*" \
-	-x "*NotesAccess*" \
-	-x "*delphi*" \
-))
-
-$(eval $(call gb_Zip_add_files,odkexamples,\
-	examples \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index b1eb1dd..e640949 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -118,9 +118,9 @@ End
 
 File gid_File_Zip_Odkexamples
     TXT_FILE_BODY;
-    Dir = gid_Dir_Basis_Sdk;
-    Name = "odkexamples.zip";
-    Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
+    Dir = FILELIST_SDK_DIR;
+    Name = "odk_examples.filelist";
+    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
 End
 
 
commit b7e8a3e4156358d79826eab13054ae16408cbb34
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Apr 15 14:16:26 2013 +0200

    add missing dep on helpimg.ilst
    
    Change-Id: I051bbc0c3689d0111c9abecf2c74ab2c1afec7cc

diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index 31591b2..1533fd56 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_CustomTarget_register_targets,postprocess/images,\
 $(packimages_DIR)/images.zip : \
 		$(packimages_DIR)/sorted.lst \
 		$(packimages_DIR)/commandimagelist.ilst \
+		$(call gb_Helper_optional,HELP,$(helpimages_DIR)/helpimg.ilst) \
 		$(call gb_Postprocess_get_target,AllResources)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
 	$(call gb_Helper_abbreviate_dirs, \
@@ -58,6 +59,7 @@ $(packimages_DIR)/images.zip : \
 $(packimages_DIR)/images_%.zip : \
 		$(packimages_DIR)/sorted.lst \
 		$(packimages_DIR)/commandimagelist.ilst \
+		$(call gb_Helper_optional,HELP,$(helpimages_DIR)/helpimg.ilst) \
 		$(call gb_Postprocess_get_target,AllResources)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
 	$(call gb_Helper_abbreviate_dirs, \
commit 50d87e5ae2a1d8f07220c4f4f1177896bd4412b6
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Apr 16 12:59:37 2013 +0200

    drop use of undefined function
    
    Change-Id: I07988bbbc5cf2d407a30b2d16d54078b8d421af4

diff --git a/ct2n/ExternalPackage_ct2n.mk b/ct2n/ExternalPackage_ct2n.mk
index 6d2e6b6..68e3c92 100644
--- a/ct2n/ExternalPackage_ct2n.mk
+++ b/ct2n/ExternalPackage_ct2n.mk
@@ -11,8 +11,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,ct2n,ConvertTextToNumber))
 
 $(eval $(call gb_ExternalPackage_set_outdir,ct2n,$(INSTDIR)))
 
-$(eval $(call gb_ExternalPackage_use_unpacked,ct2n,ConvertTextToNumber))
-
 $(eval $(call gb_ExternalPackage_add_unpacked_files_with_dir,ct2n,share/extensions/ConvertTextToNumber,\
     Addons.xcu \
     CT2N/MainCode.xba \


More information about the Libreoffice-commits mailing list