[Libreoffice-commits] core.git: 15 commits - apache-commons/ExternalPackage_apache_commons_logging.mk apache-commons/Module_apache-commons.mk apache-commons/Package_apache_commons_logging.mk beanshell/ExternalPackage_beanshell.mk beanshell/Module_beanshell.mk beanshell/Package_beanshell.mk cairo/ExternalPackage_cairo.mk cairo/ExternalPackage_pixman.mk curl/ExternalPackage_curl.mk filter/Module_filter.mk filter/Package_docbook.mk filter/Package_xhtml.mk filter/Package_xslt.mk hsqldb/ExternalPackage_hsqldb.mk hsqldb/Module_hsqldb.mk hsqldb/Package_hsqldb.mk icu/ExternalPackage_icu.mk jfreereport/ExternalPackage_jfreereport_flow_engine.mk jfreereport/ExternalPackage_jfreereport_flute.mk jfreereport/ExternalPackage_jfreereport_libbase.mk jfreereport/ExternalPackage_jfreereport_libfonts.mk jfreereport/ExternalPackage_jfreereport_libformula.mk jfreereport/ExternalPackage_jfreereport_liblayout.mk jfreereport/ExternalPackage_jfreereport_libloader.mk jfreereport/ExternalPackage_jfreereport_librepo sitory.mk jfreereport/ExternalPackage_jfreereport_libserializer.mk jfreereport/ExternalPackage_jfreereport_libxml.mk jfreereport/ExternalPackage_jfreereport_sac.mk jfreereport/Module_jfreereport.mk jfreereport/Package_jfreereport_flow_engine.mk jfreereport/Package_jfreereport_flute.mk jfreereport/Package_jfreereport_libbase.mk jfreereport/Package_jfreereport_libfonts.mk jfreereport/Package_jfreereport_libformula.mk jfreereport/Package_jfreereport_liblayout.mk jfreereport/Package_jfreereport_libloader.mk jfreereport/Package_jfreereport_librepository.mk jfreereport/Package_jfreereport_libserializer.mk jfreereport/Package_jfreereport_libxml.mk jfreereport/Package_jfreereport_sac.mk lcms2/ExternalPackage_lcms2.mk libxml2/ExternalPackage_xml2.mk libxslt/ExternalPackage_xslt.mk lpsolve/ExternalPackage_lpsolve.mk nss/ExternalPackage_nss.mk officecfg/Package_misc.mk redland/ExternalPackage_raptor.mk redland/ExternalPackage_rasqal.mk redland/ExternalPackage_redland.mk RepositoryExter nal.mk Repository.mk rhino/ExternalPackage_rhino.mk rhino/Module_rhino.mk rhino/Package_rhino.mk scp2/source sd/Package_web.mk sd/res solenv/gbuild
David Tardon
dtardon at redhat.com
Wed May 1 07:56:21 PDT 2013
Repository.mk | 21
RepositoryExternal.mk | 2
apache-commons/ExternalPackage_apache_commons_logging.mk | 16
apache-commons/Module_apache-commons.mk | 2
apache-commons/Package_apache_commons_logging.mk | 16
beanshell/ExternalPackage_beanshell.mk | 16
beanshell/Module_beanshell.mk | 2
beanshell/Package_beanshell.mk | 16
cairo/ExternalPackage_cairo.mk | 2
cairo/ExternalPackage_pixman.mk | 2
curl/ExternalPackage_curl.mk | 10
filter/Module_filter.mk | 1
filter/Package_docbook.mk | 10
filter/Package_xhtml.mk | 28 +
filter/Package_xslt.mk | 104 ++--
hsqldb/ExternalPackage_hsqldb.mk | 16
hsqldb/Module_hsqldb.mk | 2
hsqldb/Package_hsqldb.mk | 16
icu/ExternalPackage_icu.mk | 26 -
jfreereport/ExternalPackage_jfreereport_flow_engine.mk | 19
jfreereport/ExternalPackage_jfreereport_flute.mk | 19
jfreereport/ExternalPackage_jfreereport_libbase.mk | 19
jfreereport/ExternalPackage_jfreereport_libfonts.mk | 19
jfreereport/ExternalPackage_jfreereport_libformula.mk | 19
jfreereport/ExternalPackage_jfreereport_liblayout.mk | 19
jfreereport/ExternalPackage_jfreereport_libloader.mk | 19
jfreereport/ExternalPackage_jfreereport_librepository.mk | 19
jfreereport/ExternalPackage_jfreereport_libserializer.mk | 19
jfreereport/ExternalPackage_jfreereport_libxml.mk | 19
jfreereport/ExternalPackage_jfreereport_sac.mk | 16
jfreereport/Module_jfreereport.mk | 54 +-
jfreereport/Package_jfreereport_flow_engine.mk | 19
jfreereport/Package_jfreereport_flute.mk | 19
jfreereport/Package_jfreereport_libbase.mk | 19
jfreereport/Package_jfreereport_libfonts.mk | 19
jfreereport/Package_jfreereport_libformula.mk | 19
jfreereport/Package_jfreereport_liblayout.mk | 19
jfreereport/Package_jfreereport_libloader.mk | 19
jfreereport/Package_jfreereport_librepository.mk | 19
jfreereport/Package_jfreereport_libserializer.mk | 19
jfreereport/Package_jfreereport_libxml.mk | 19
jfreereport/Package_jfreereport_sac.mk | 16
lcms2/ExternalPackage_lcms2.mk | 11
libxml2/ExternalPackage_xml2.mk | 8
libxslt/ExternalPackage_xslt.mk | 16
lpsolve/ExternalPackage_lpsolve.mk | 6
nss/ExternalPackage_nss.mk | 6
officecfg/Package_misc.mk | 13
redland/ExternalPackage_raptor.mk | 8
redland/ExternalPackage_rasqal.mk | 8
redland/ExternalPackage_redland.mk | 8
rhino/ExternalPackage_rhino.mk | 16
rhino/Module_rhino.mk | 2
rhino/Package_rhino.mk | 16
scp2/source/ooo/directory_ooo.scp | 82 ---
scp2/source/ooo/file_extra_ooo.scp | 164 -------
scp2/source/ooo/file_ooo.scp | 333 ---------------
scp2/source/ooo/module_hidden_ooo.scp | 77 ---
scp2/source/xsltfilter/file_xsltfilter.scp | 51 --
scp2/source/xsltfilter/module_xsltfilter.scp | 12
sd/Package_web.mk | 60 +-
sd/res/webview/webcast.asp | 45 ++
sd/res/webview/webcast.pl | 38 +
sd/res/webview/webview.asp | 45 --
sd/res/webview/webview.pl | 38 -
solenv/gbuild/AllLangResTarget.mk | 2
solenv/gbuild/Executable.mk | 2
solenv/gbuild/ExternalPackage.mk | 75 +++
solenv/gbuild/Helper.mk | 2
solenv/gbuild/Jar.mk | 28 +
solenv/gbuild/Library.mk | 8
solenv/gbuild/gbuild.mk | 2
72 files changed, 724 insertions(+), 1232 deletions(-)
New commits:
commit 3c790299c29a45fdf0d5d7c6ffdb9be82d74d367
Author: David Tardon <dtardon at redhat.com>
Date: Wed May 1 16:26:01 2013 +0200
install officecfg_misc using filelist
Change-Id: I05594cd52332e863ac23a8255cd291b16b9b034c
diff --git a/officecfg/Package_misc.mk b/officecfg/Package_misc.mk
index 9e84225..b4e8bd5 100644
--- a/officecfg/Package_misc.mk
+++ b/officecfg/Package_misc.mk
@@ -19,7 +19,9 @@
$(eval $(call gb_Package_Package,officecfg_misc,$(SRCDIR)/officecfg))
-$(eval $(call gb_Package_add_file,officecfg_misc,xml/oo-ldap.xcd.sample,registry/schema/oo-ldap.xcd.sample))
-$(eval $(call gb_Package_add_file,officecfg_misc,xml/oo-ad-ldap.xcd.sample,registry/schema/oo-ad-ldap.xcd.sample))
+$(eval $(call gb_Package_set_outdir,officecfg_misc,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,officecfg_misc,share/registry/oo-ldap.xcd.sample,registry/schema/oo-ldap.xcd.sample))
+$(eval $(call gb_Package_add_file,officecfg_misc,share/registry/oo-ad-ldap.xcd.sample,registry/schema/oo-ad-ldap.xcd.sample))
# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 2830382..fb2b35e 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -634,18 +634,11 @@ End
#endif
-File gid_File_Oo_Ldap_Xcd_Sample
+File gid_File_officecfg_misc
TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Brand_Dir_Share_Registry;
- Name = "oo-ldap.xcd.sample";
-End
-
-File gid_File_Oo_Ad_Ldap_Xcd_Sample
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Brand_Dir_Share_Registry;
- Name = "oo-ad-ldap.xcd.sample";
+ Styles = (FILELIST, PACKED);
+ Dir = FILELIST_DIR;
+ Name = "officecfg_misc.filelist";
End
File gid_File_Rdb_Offapi
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 0590f9c..ddd1157d 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -455,8 +455,7 @@ Module gid_Module_Root_Files_6
gid_File_Mod_Style,
gid_File_Mod_Table,
gid_File_Mod_Text,
- gid_File_Oo_Ldap_Xcd_Sample,
- gid_File_Oo_Ad_Ldap_Xcd_Sample,
+ gid_File_officecfg_misc,
gid_File_Share_Glade_Xml,
gid_File_Share_Labels_Xml,
gid_File_Share_Registry_Main_Xcd,
commit d82ab86b2edcb7a91e0669910fe59f21c738e09e
Author: David Tardon <dtardon at redhat.com>
Date: Wed May 1 16:23:14 2013 +0200
add modelines
Change-Id: I940a5dbf68b9480479095ea447ff125e4a42d211
diff --git a/officecfg/Package_misc.mk b/officecfg/Package_misc.mk
index cb87254..9e84225 100644
--- a/officecfg/Package_misc.mk
+++ b/officecfg/Package_misc.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# This file is part of the LibreOffice project.
#
@@ -20,3 +21,5 @@ $(eval $(call gb_Package_Package,officecfg_misc,$(SRCDIR)/officecfg))
$(eval $(call gb_Package_add_file,officecfg_misc,xml/oo-ldap.xcd.sample,registry/schema/oo-ldap.xcd.sample))
$(eval $(call gb_Package_add_file,officecfg_misc,xml/oo-ad-ldap.xcd.sample,registry/schema/oo-ad-ldap.xcd.sample))
+
+# vim: set noet sw=4 ts=4:
commit 8b3807dbc925e69afcf20bf619986e832ee19845
Author: David Tardon <dtardon at redhat.com>
Date: Wed May 1 16:20:22 2013 +0200
do not deliver unused files
I have not removed them from sources, because I have no idea if they
might be useful to someone.
Change-Id: I66becb723ae5f4be008c58edc99936788a67238e
diff --git a/officecfg/Package_misc.mk b/officecfg/Package_misc.mk
index 972b644..cb87254 100644
--- a/officecfg/Package_misc.mk
+++ b/officecfg/Package_misc.mk
@@ -20,9 +20,3 @@ $(eval $(call gb_Package_Package,officecfg_misc,$(SRCDIR)/officecfg))
$(eval $(call gb_Package_add_file,officecfg_misc,xml/oo-ldap.xcd.sample,registry/schema/oo-ldap.xcd.sample))
$(eval $(call gb_Package_add_file,officecfg_misc,xml/oo-ad-ldap.xcd.sample,registry/schema/oo-ad-ldap.xcd.sample))
-$(eval $(call gb_Package_add_file,officecfg_misc,pck/oo-ldap-attr-map.properties,registry/schema/oo-ldap-attr-map.properties))
-$(eval $(call gb_Package_add_file,officecfg_misc,pck/oo-org-map.properties,registry/schema/oo-org-map.properties))
-$(eval $(call gb_Package_add_file,officecfg_misc,pck/oo-common.ldif,registry/schema/oo-common.ldif))
-$(eval $(call gb_Package_add_file,officecfg_misc,pck/oo-common-ad.ldf,registry/schema/oo-common-ad.ldf))
-$(eval $(call gb_Package_add_file,officecfg_misc,pck/oo-common.conf,registry/schema/oo-common.conf))
-
commit 33cb866969098a26afeaaa3ec57f12428546a237
Author: David Tardon <dtardon at redhat.com>
Date: Wed May 1 16:10:46 2013 +0200
install webview files using filelist
Change-Id: Ib4501e1171f3940a6909ce4f0c05a669d708b93a
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index c2cbc7a..5b946f5 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -186,16 +186,6 @@ Directory gid_Dir_Share_Config_Wizard
DosName = "wizard";
End
-Directory gid_Dir_Share_Config_Wizard_Web
- ParentID = gid_Dir_Share_Config_Wizard;
- DosName = "web";
-End
-
-Directory gid_Dir_Share_Config_Wizard_Web_Buttons
- ParentID = gid_Dir_Share_Config_Wizard_Web;
- DosName = "buttons";
-End
-
Directory gid_Dir_Share_Config_Sofficecfg
ParentID = gid_Brand_Dir_Share_Config;
DosName = "soffice.cfg";
@@ -279,11 +269,6 @@ Directory gid_Dir_Share_Scripts
DosName = "Scripts";
End
-Directory gid_Dir_Config_Webcast
- ParentID = gid_Brand_Dir_Share_Config;
- DosName = "webcast";
-End
-
Directory gid_Dir_Gallery
ParentID = gid_Brand_Dir_Share;
DosName = "gallery";
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index 96cffcc..a654ecb 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -74,16 +74,11 @@ File gid_File_Extra_Cfgsrv
Patchfiles = ();
End
-File gid_File_Extra_Common_Inc
- Dir = gid_Dir_Config_Webcast;
- PACKED_TXT_FILE_BODY;
- Name = "common.inc";
-End
-
-File gid_File_Extra_Common_Pl
- Dir = gid_Dir_Config_Webcast;
- PACKED_TXT_FILE_BODY;
- Name = "common.pl";
+File gid_File_sd_web
+ Dir = FILELIST_DIR;
+ TXT_FILE_BODY;
+ Styles = (FILELIST, PACKED);
+ Name = "sd_web.filelist";
End
File gid_File_Extra_Database
@@ -100,51 +95,6 @@ File gid_File_Extra_Databasebiblio
Name = "extras_databasebiblio.filelist";
End
-File gid_File_Extra_Edit_Asp
- Dir = gid_Dir_Config_Webcast;
- PACKED_TXT_FILE_BODY;
- Name = "edit.asp";
-End
-
-File gid_File_Extra_Edit_Pl
- Dir = gid_Dir_Config_Webcast;
- PACKED_TXT_FILE_BODY;
- Name = "edit.pl";
-End
-
-File gid_File_Extra_Editpic_Asp
- Dir = gid_Dir_Config_Webcast;
- PACKED_TXT_FILE_BODY;
- Name = "editpic.asp";
-End
-
-File gid_File_Extra_Editpic_Pl
- Dir = gid_Dir_Config_Webcast;
- PACKED_TXT_FILE_BODY;
- Name = "editpic.pl";
-End
-
-File gid_File_Extra_Glas_Blue_Zip
- Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
- USER_FILE_BODY;
- Styles = ();
- Name = "glas-blue.zip";
-End
-
-File gid_File_Extra_Glas_Green_Zip
- Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
- USER_FILE_BODY;
- Styles = ();
- Name = "glas-green.zip";
-End
-
-File gid_File_Extra_Glas_Red_Zip
- Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
- USER_FILE_BODY;
- Styles = ();
- Name = "glas-red.zip";
-End
-
#if defined( ENABLE_LIBLANGTAG ) && !defined( SYSTEM_LIBLANGTAG )
File gid_File_Extra_Liblangtag
Dir = FILELIST_DIR;
@@ -154,56 +104,6 @@ File gid_File_Extra_Liblangtag
End
#endif
-File gid_File_Extra_Round_Gorilla_Zip
- Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
- USER_FILE_BODY;
- Styles = ();
- Name = "round-gorilla.zip";
-End
-
-File gid_File_Extra_Round_White_Zip
- Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
- USER_FILE_BODY;
- Styles = ();
- Name = "round-white.zip";
-End
-File gid_File_Extra_Simple_Zip
- Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
- USER_FILE_BODY;
- Styles = ();
- Name = "simple.zip";
-End
-File gid_File_Extra_Square_Blue_Zip
- Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
- USER_FILE_BODY;
- Styles = ();
- Name = "square-blue.zip";
-End
-File gid_File_Extra_Square_Gray_Zip
- Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
- USER_FILE_BODY;
- Styles = ();
- Name = "square-gray.zip";
-End
-File gid_File_Extra_Square_Green_Zip
- Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
- USER_FILE_BODY;
- Styles = ();
- Name = "square-green.zip";
-End
-File gid_File_Extra_Square_Red_Zip
- Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
- USER_FILE_BODY;
- Styles = ();
- Name = "square-red.zip";
-End
-File gid_File_Extra_Square_Yellow_Zip
- Dir = gid_Dir_Share_Config_Wizard_Web_Buttons;
- USER_FILE_BODY;
- Styles = ();
- Name = "square-yellow.zip";
-End
-
#ifdef UNX
#ifndef WITHOUT_AFMS
@@ -298,12 +198,6 @@ File gid_File_Extra_Gallwwwgraf
Name = "extras_gallwwwgraf.filelist";
End
-File gid_File_Extra_Index_Pl
- Dir = gid_Dir_Config_Webcast;
- PACKED_TXT_FILE_BODY;
- Name = "index.pl";
-End
-
File gid_File_Extra_Palettes
Dir = FILELIST_DIR;
USER_FILE_BODY;
@@ -312,42 +206,6 @@ File gid_File_Extra_Palettes
Patchfiles = ();
End
-File gid_File_Extra_Poll_Asp
- Dir = gid_Dir_Config_Webcast;
- PACKED_TXT_FILE_BODY;
- Name = "poll.asp";
-End
-
-File gid_File_Extra_Poll_Pl
- Dir = gid_Dir_Config_Webcast;
- PACKED_TXT_FILE_BODY;
- Name = "poll.pl";
-End
-
-File gid_File_Extra_Savepic_Asp
- Dir = gid_Dir_Config_Webcast;
- PACKED_TXT_FILE_BODY;
- Name = "savepic.asp";
-End
-
-File gid_File_Extra_Savepic_Pl
- Dir = gid_Dir_Config_Webcast;
- PACKED_TXT_FILE_BODY;
- Name = "savepic.pl";
-End
-
-File gid_File_Extra_Show_Asp
- Dir = gid_Dir_Config_Webcast;
- PACKED_TXT_FILE_BODY;
- Name = "show.asp";
-End
-
-File gid_File_Extra_Show_Pl
- Dir = gid_Dir_Config_Webcast;
- PACKED_TXT_FILE_BODY;
- Name = "show.pl";
-End
-
File gid_File_Extra_Tpllayoutimpr
Dir = FILELIST_DIR;
TXT_FILE_BODY;
@@ -404,18 +262,6 @@ File gid_File_Extra_Tplwizstyles
Name = "extras_tplwizstyles.filelist";
End
-File gid_File_Extra_Webcast_Asp
- Dir = gid_Dir_Config_Webcast;
- PACKED_TXT_FILE_BODY;
- Name = "webcast.asp";
-End
-
-File gid_File_Extra_Webcast_Pl
- Dir = gid_Dir_Config_Webcast;
- PACKED_TXT_FILE_BODY;
- Name = "webcast.pl";
-End
-
File gid_File_Extra_Wordbook
Dir = gid_Dir_Wordbook;
PACKED_TXT_FILE_BODY;
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 7cc2636..0590f9c 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -386,32 +386,7 @@ Module gid_Module_Root_Files_6
gid_File_Basic_Tutorials,
gid_File_Extra_Cfgsrv,
gid_File_Extra_Cfgsrv_Bitmap_Unx,
- gid_File_Extra_Common_Inc,
- gid_File_Extra_Common_Pl,
- gid_File_Extra_Edit_Asp,
- gid_File_Extra_Edit_Pl,
- gid_File_Extra_Editpic_Asp,
- gid_File_Extra_Editpic_Pl,
- gid_File_Extra_Index_Pl,
- gid_File_Extra_Poll_Asp,
- gid_File_Extra_Poll_Pl,
- gid_File_Extra_Savepic_Asp,
- gid_File_Extra_Savepic_Pl,
- gid_File_Extra_Show_Asp,
- gid_File_Extra_Show_Pl,
- gid_File_Extra_Webcast_Asp,
- gid_File_Extra_Webcast_Pl,
- gid_File_Extra_Square_Yellow_Zip,
- gid_File_Extra_Square_Red_Zip,
- gid_File_Extra_Square_Green_Zip,
- gid_File_Extra_Square_Gray_Zip,
- gid_File_Extra_Square_Blue_Zip,
- gid_File_Extra_Simple_Zip,
- gid_File_Extra_Round_White_Zip,
- gid_File_Extra_Round_Gorilla_Zip,
- gid_File_Extra_Glas_Red_Zip,
- gid_File_Extra_Glas_Green_Zip,
- gid_File_Extra_Glas_Blue_Zip,
+ gid_File_sd_web,
gid_File_Share_Config_Sofficecfg_uiconfig_basicide,
gid_File_Share_Config_Sofficecfg_uiconfig_cui,
#ifdef DBCONNECTIVITY
diff --git a/sd/Package_web.mk b/sd/Package_web.mk
index 1db0b18..d4507ab 100644
--- a/sd/Package_web.mk
+++ b/sd/Package_web.mk
@@ -9,32 +9,38 @@
$(eval $(call gb_Package_Package,sd_web,$(SRCDIR)/sd/res))
-$(eval $(call gb_Package_add_file,sd_web,pck/glas-blue.zip,buttons/glas-blue.zip))
-$(eval $(call gb_Package_add_file,sd_web,pck/glas-green.zip,buttons/glas-green.zip))
-$(eval $(call gb_Package_add_file,sd_web,pck/glas-red.zip,buttons/glas-red.zip))
-$(eval $(call gb_Package_add_file,sd_web,pck/round-gorilla.zip,buttons/round-gorilla.zip))
-$(eval $(call gb_Package_add_file,sd_web,pck/round-white.zip,buttons/round-white.zip))
-$(eval $(call gb_Package_add_file,sd_web,pck/simple.zip,buttons/simple.zip))
-$(eval $(call gb_Package_add_file,sd_web,pck/square-blue.zip,buttons/square-blue.zip))
-$(eval $(call gb_Package_add_file,sd_web,pck/square-gray.zip,buttons/square-gray.zip))
-$(eval $(call gb_Package_add_file,sd_web,pck/square-green.zip,buttons/square-green.zip))
-$(eval $(call gb_Package_add_file,sd_web,pck/square-red.zip,buttons/square-red.zip))
-$(eval $(call gb_Package_add_file,sd_web,pck/square-yellow.zip,buttons/square-yellow.zip))
-$(eval $(call gb_Package_add_file,sd_web,pck/common.inc,webview/common.inc))
-$(eval $(call gb_Package_add_file,sd_web,pck/common.pl,webview/common.pl))
-$(eval $(call gb_Package_add_file,sd_web,pck/edit.asp,webview/edit.asp))
-$(eval $(call gb_Package_add_file,sd_web,pck/editpic.asp,webview/editpic.asp))
-$(eval $(call gb_Package_add_file,sd_web,pck/editpic.pl,webview/editpic.pl))
-$(eval $(call gb_Package_add_file,sd_web,pck/edit.pl,webview/edit.pl))
-$(eval $(call gb_Package_add_file,sd_web,pck/index.pl,webview/index.pl))
-$(eval $(call gb_Package_add_file,sd_web,pck/poll.asp,webview/poll.asp))
-$(eval $(call gb_Package_add_file,sd_web,pck/poll.pl,webview/poll.pl))
-$(eval $(call gb_Package_add_file,sd_web,pck/savepic.asp,webview/savepic.asp))
-$(eval $(call gb_Package_add_file,sd_web,pck/savepic.pl,webview/savepic.pl))
-$(eval $(call gb_Package_add_file,sd_web,pck/show.asp,webview/show.asp))
-$(eval $(call gb_Package_add_file,sd_web,pck/show.pl,webview/show.pl))
-# the following two files are really renamed
-$(eval $(call gb_Package_add_file,sd_web,pck/webcast.asp,webview/webview.asp))
-$(eval $(call gb_Package_add_file,sd_web,pck/webcast.pl,webview/webview.pl))
+$(eval $(call gb_Package_set_outdir,sd_web,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,sd_web,share/config/webcast,\
+ webview/common.inc \
+ webview/common.pl \
+ webview/edit.asp \
+ webview/editpic.asp \
+ webview/editpic.pl \
+ webview/edit.pl \
+ webview/index.pl \
+ webview/poll.asp \
+ webview/poll.pl \
+ webview/savepic.asp \
+ webview/savepic.pl \
+ webview/show.asp \
+ webview/show.pl \
+ webview/webcast.asp \
+ webview/webcast.pl \
+))
+
+$(eval $(call gb_Package_add_files,sd_web,share/config/wizard/web/buttons,\
+ buttons/glas-blue.zip \
+ buttons/glas-green.zip \
+ buttons/glas-red.zip \
+ buttons/round-gorilla.zip \
+ buttons/round-white.zip \
+ buttons/simple.zip \
+ buttons/square-blue.zip \
+ buttons/square-gray.zip \
+ buttons/square-green.zip \
+ buttons/square-red.zip \
+ buttons/square-yellow.zip \
+))
# vim: set noet sw=4 ts=4:
diff --git a/sd/res/webview/webview.asp b/sd/res/webview/webcast.asp
similarity index 100%
rename from sd/res/webview/webview.asp
rename to sd/res/webview/webcast.asp
diff --git a/sd/res/webview/webview.pl b/sd/res/webview/webcast.pl
similarity index 100%
rename from sd/res/webview/webview.pl
rename to sd/res/webview/webcast.pl
commit 0822a4c84a0d55bb45d646642b9c24f945d8c1bf
Author: David Tardon <dtardon at redhat.com>
Date: Wed May 1 15:29:43 2013 +0200
install xslt filters using filelist
Change-Id: Id84765285b1ace19442ec13d7212e4121f77dabd
diff --git a/filter/Module_filter.mk b/filter/Module_filter.mk
index 5fd6c07..559fb65 100644
--- a/filter/Module_filter.mk
+++ b/filter/Module_filter.mk
@@ -64,6 +64,7 @@ $(eval $(call gb_Module_add_targets,filter,\
Library_xsltdlg \
Library_xsltfilter \
Package_docbook \
+ Package_xhtml \
Package_xslt \
UIConfig_xsltdlg \
))
diff --git a/filter/Package_docbook.mk b/filter/Package_docbook.mk
index 3dce825..070ebe1 100644
--- a/filter/Package_docbook.mk
+++ b/filter/Package_docbook.mk
@@ -18,8 +18,12 @@
$(eval $(call gb_Package_Package,filter_docbook,$(SRCDIR)/filter/source/docbook))
-$(eval $(call gb_Package_add_file,filter_docbook,bin/DocBookTemplate.stw,DocBookTemplate.stw))
-$(eval $(call gb_Package_add_file,filter_docbook,bin/docbooktosoffheadings.xsl,docbooktosoffheadings.xsl))
-$(eval $(call gb_Package_add_file,filter_docbook,bin/sofftodocbookheadings.xsl,sofftodocbookheadings.xsl))
+$(eval $(call gb_Package_set_outdir,filter_docbook,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,filter_docbook,share/xslt/docbook,\
+ DocBookTemplate.stw \
+ docbooktosoffheadings.xsl \
+ sofftodocbookheadings.xsl \
+))
# vim: set noet sw=4 ts=4:
diff --git a/filter/Package_xhtml.mk b/filter/Package_xhtml.mk
new file mode 100644
index 0000000..39da72b
--- /dev/null
+++ b/filter/Package_xhtml.mk
@@ -0,0 +1,28 @@
+#
+# 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/.
+#
+# This file incorporates work covered by the following license notice:
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to you under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.apache.org/licenses/LICENSE-2.0 .
+#
+
+$(eval $(call gb_Package_Package,filter_xhtml,$(SRCDIR)/filter/source/xslt))
+
+$(eval $(call gb_Package_set_outdir,filter_xhtml,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,filter_xhtml,share/xslt/export/xhtml/body.xsl,odf2xhtml/export/xhtml/body.xsl))
+$(eval $(call gb_Package_add_file,filter_xhtml,share/xslt/export/xhtml/header.xsl,odf2xhtml/export/xhtml/header.xsl))
+$(eval $(call gb_Package_add_file,filter_xhtml,share/xslt/export/xhtml/opendoc2xhtml.xsl,odf2xhtml/export/xhtml/opendoc2xhtml.xsl))
+$(eval $(call gb_Package_add_file,filter_xhtml,share/xslt/export/xhtml/table.xsl,odf2xhtml/export/xhtml/table.xsl))
+
+# vim: set noet sw=4 ts=4:
diff --git a/filter/Package_xslt.mk b/filter/Package_xslt.mk
index b19d13c..1d193f7 100644
--- a/filter/Package_xslt.mk
+++ b/filter/Package_xslt.mk
@@ -18,56 +18,58 @@
$(eval $(call gb_Package_Package,filter_xslt,$(SRCDIR)/filter/source/xslt))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/common/copy.xsl,common/copy.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/common/math.xsl,common/math.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/common/measure_conversion.xsl,common/measure_conversion.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/common/ooo2ms_docpr.xsl,export/common/ooo2ms_docpr.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/spreadsheetml/formular.xsl,export/spreadsheetml/formular.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl,export/spreadsheetml/ooo2spreadsheetml.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/spreadsheetml/style_mapping.xsl,export/spreadsheetml/style_mapping.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/spreadsheetml/styles.xsl,export/spreadsheetml/styles.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/spreadsheetml/table.xsl,export/spreadsheetml/table.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/uof/odf2uof_presentation.xsl,export/uof/odf2uof_presentation.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/uof/odf2uof_spreadsheet.xsl,export/uof/odf2uof_spreadsheet.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/uof/odf2uof_text.xsl,export/uof/odf2uof_text.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/wordml/ooo2wordml.xsl,export/wordml/ooo2wordml.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/wordml/ooo2wordml_border.xsl,export/wordml/ooo2wordml_border.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/wordml/ooo2wordml_custom_draw.xsl,export/wordml/ooo2wordml_custom_draw.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/wordml/ooo2wordml_draw.xsl,export/wordml/ooo2wordml_draw.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/wordml/ooo2wordml_field.xsl,export/wordml/ooo2wordml_field.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/wordml/ooo2wordml_list.xsl,export/wordml/ooo2wordml_list.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/wordml/ooo2wordml_page.xsl,export/wordml/ooo2wordml_page.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/wordml/ooo2wordml_path.xsl,export/wordml/ooo2wordml_path.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/wordml/ooo2wordml_settings.xsl,export/wordml/ooo2wordml_settings.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/wordml/ooo2wordml_table.xsl,export/wordml/ooo2wordml_table.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/wordml/ooo2wordml_text.xsl,export/wordml/ooo2wordml_text.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/common/ms2ooo_docpr.xsl,import/common/ms2ooo_docpr.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl,import/spreadsheetml/spreadsheetml2ooo.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/uof/uof2odf_presentation.xsl,import/uof/uof2odf_presentation.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/uof/uof2odf_spreadsheet.xsl,import/uof/uof2odf_spreadsheet.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/uof/uof2odf_text.xsl,import/uof/uof2odf_text.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/wordml/wordml2ooo.xsl,import/wordml/wordml2ooo.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/wordml/wordml2ooo_custom_draw.xsl,import/wordml/wordml2ooo_custom_draw.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/wordml/wordml2ooo_draw.xsl,import/wordml/wordml2ooo_draw.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/wordml/wordml2ooo_field.xsl,import/wordml/wordml2ooo_field.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/wordml/wordml2ooo_list.xsl,import/wordml/wordml2ooo_list.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/wordml/wordml2ooo_page.xsl,import/wordml/wordml2ooo_page.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/wordml/wordml2ooo_path.xsl,import/wordml/wordml2ooo_path.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/wordml/wordml2ooo_props.xsl,import/wordml/wordml2ooo_props.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/wordml/wordml2ooo_settings.xsl,import/wordml/wordml2ooo_settings.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/wordml/wordml2ooo_table.xsl,import/wordml/wordml2ooo_table.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/import/wordml/wordml2ooo_text.xsl,import/wordml/wordml2ooo_text.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/common/body.xsl,odf2xhtml/export/common/body.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/common/styles/style_collector.xsl,odf2xhtml/export/common/styles/style_collector.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/common/styles/style_mapping_css.xsl,odf2xhtml/export/common/styles/style_mapping_css.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/common/table/table.xsl,odf2xhtml/export/common/table/table.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/common/table/table_cells.xsl,odf2xhtml/export/common/table/table_cells.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/common/table/table_columns.xsl,odf2xhtml/export/common/table/table_columns.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/common/table/table_rows.xsl,odf2xhtml/export/common/table/table_rows.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/common/table_of_content.xsl,odf2xhtml/export/common/table_of_content.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/xhtml/body.xsl,odf2xhtml/export/xhtml/body.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/xhtml/header.xsl,odf2xhtml/export/xhtml/header.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/xhtml/opendoc2xhtml.xsl,odf2xhtml/export/xhtml/opendoc2xhtml.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,bin/xslt/export/xhtml/table.xsl,odf2xhtml/export/xhtml/table.xsl))
+$(eval $(call gb_Package_set_outdir,filter_xslt,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/common/copy.xsl,common/copy.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/common/math.xsl,common/math.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/common/measure_conversion.xsl,common/measure_conversion.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/ooo2ms_docpr.xsl,export/common/ooo2ms_docpr.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/spreadsheetml/formular.xsl,export/spreadsheetml/formular.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl,export/spreadsheetml/ooo2spreadsheetml.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/spreadsheetml/style_mapping.xsl,export/spreadsheetml/style_mapping.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/spreadsheetml/styles.xsl,export/spreadsheetml/styles.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/spreadsheetml/table.xsl,export/spreadsheetml/table.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/uof/odf2uof_presentation.xsl,export/uof/odf2uof_presentation.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/uof/odf2uof_spreadsheet.xsl,export/uof/odf2uof_spreadsheet.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/uof/odf2uof_text.xsl,export/uof/odf2uof_text.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml.xsl,export/wordml/ooo2wordml.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_border.xsl,export/wordml/ooo2wordml_border.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_custom_draw.xsl,export/wordml/ooo2wordml_custom_draw.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_draw.xsl,export/wordml/ooo2wordml_draw.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_field.xsl,export/wordml/ooo2wordml_field.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_list.xsl,export/wordml/ooo2wordml_list.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_page.xsl,export/wordml/ooo2wordml_page.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_path.xsl,export/wordml/ooo2wordml_path.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_settings.xsl,export/wordml/ooo2wordml_settings.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_table.xsl,export/wordml/ooo2wordml_table.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_text.xsl,export/wordml/ooo2wordml_text.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/common/ms2ooo_docpr.xsl,import/common/ms2ooo_docpr.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl,import/spreadsheetml/spreadsheetml2ooo.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/uof/uof2odf_presentation.xsl,import/uof/uof2odf_presentation.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/uof/uof2odf_spreadsheet.xsl,import/uof/uof2odf_spreadsheet.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/uof/uof2odf_text.xsl,import/uof/uof2odf_text.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo.xsl,import/wordml/wordml2ooo.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_custom_draw.xsl,import/wordml/wordml2ooo_custom_draw.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_draw.xsl,import/wordml/wordml2ooo_draw.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_field.xsl,import/wordml/wordml2ooo_field.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_list.xsl,import/wordml/wordml2ooo_list.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_page.xsl,import/wordml/wordml2ooo_page.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_path.xsl,import/wordml/wordml2ooo_path.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_props.xsl,import/wordml/wordml2ooo_props.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_settings.xsl,import/wordml/wordml2ooo_settings.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_table.xsl,import/wordml/wordml2ooo_table.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_text.xsl,import/wordml/wordml2ooo_text.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/body.xsl,odf2xhtml/export/common/body.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/styles/style_collector.xsl,odf2xhtml/export/common/styles/style_collector.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/styles/style_mapping_css.xsl,odf2xhtml/export/common/styles/style_mapping_css.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/table/table.xsl,odf2xhtml/export/common/table/table.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/table/table_cells.xsl,odf2xhtml/export/common/table/table_cells.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/table/table_columns.xsl,odf2xhtml/export/common/table/table_columns.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/table/table_rows.xsl,odf2xhtml/export/common/table/table_rows.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/table_of_content.xsl,odf2xhtml/export/common/table_of_content.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/xhtml/body.xsl,odf2xhtml/export/xhtml/body.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/xhtml/header.xsl,odf2xhtml/export/xhtml/header.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/xhtml/opendoc2xhtml.xsl,odf2xhtml/export/xhtml/opendoc2xhtml.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/xhtml/table.xsl,odf2xhtml/export/xhtml/table.xsl))
# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index f1b412d..c2cbc7a 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -156,73 +156,6 @@ Directory gid_Dir_Share_Xslt_Docbook
DosName = "docbook";
End
-Directory gid_Dir_Share_Xslt_Common
- ParentID = gid_Dir_Share_Xslt;
- DosName = "common";
-End
-
-Directory gid_Dir_Share_Xslt_Export
- ParentID = gid_Dir_Share_Xslt;
- DosName = "export";
-End
-
-Directory gid_Dir_Share_Xslt_Export_Common
- ParentID = gid_Dir_Share_Xslt_Export;
- DosName = "common";
-End
-
-Directory gid_Dir_Share_Xslt_Export_Common_Styles
- ParentID = gid_Dir_Share_Xslt_Export_Common;
- DosName = "styles";
-End
-
-Directory gid_Dir_Share_Xslt_Export_Common_Table
- ParentID = gid_Dir_Share_Xslt_Export_Common;
- DosName = "table";
-End
-
-Directory gid_Dir_Share_Xslt_Export_Spreadsheetml
- ParentID = gid_Dir_Share_Xslt_Export;
- DosName = "spreadsheetml";
-End
-Directory gid_Dir_Share_Xslt_Export_uof
- ParentID = gid_Dir_Share_Xslt_Export;
- DosName = "uof";
-End
-Directory gid_Dir_Share_Xslt_Import_uof
- ParentID = gid_Dir_Share_Xslt_Import;
- DosName = "uof";
-End
-Directory gid_Dir_Share_Xslt_Export_Wordml
- ParentID = gid_Dir_Share_Xslt_Export;
- DosName = "wordml";
-End
-
-Directory gid_Dir_Share_Xslt_Export_Xhtml
- ParentID = gid_Dir_Share_Xslt_Export;
- DosName = "xhtml";
-End
-
-Directory gid_Dir_Share_Xslt_Import
- ParentID = gid_Dir_Share_Xslt;
- DosName = "import";
-End
-
-Directory gid_Dir_Share_Xslt_Import_Spreadsheetml
- ParentID = gid_Dir_Share_Xslt_Import;
- DosName = "spreadsheetml";
-End
-
-Directory gid_Dir_Share_Xslt_Import_Wordml
- ParentID = gid_Dir_Share_Xslt_Import;
- DosName = "wordml";
-End
-
-Directory gid_Dir_Share_Xslt_Import_Common
- ParentID = gid_Dir_Share_Xslt_Import;
- DosName = "common";
-End
-
Directory gid_Dir_Share_Dtd
ParentID = gid_Brand_Dir_Share;
DosName = "dtd";
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index f073b97..2830382 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -861,321 +861,11 @@ End
#endif
-File gid_File_Xsl_Common_Measure_Conversion
+File gid_File_filter_xslt
TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Common;
- Name = "/xslt/common/measure_conversion.xsl";
-End
-
-File gid_File_Xsl_Common_Math_Functions
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Common;
- Name = "/xslt/common/math.xsl";
-End
-
-File gid_File_Xsl_Export_Common_Body
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Common;
- Name = "/xslt/export/common/body.xsl";
-End
-
-File gid_File_Xsl_Export_Common_Table_Of_Content
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Common;
- Name = "/xslt/export/common/table_of_content.xsl";
-End
-
-File gid_File_Xsl_Export_Common_Ooo2ms_Docpr
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Common;
- Name = "/xslt/export/common/ooo2ms_docpr.xsl";
-End
-
-File gid_File_Xsl_Export_Common_Styles_Styles_Collector
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Common_Styles;
- Name = "/xslt/export/common/styles/style_collector.xsl";
-End
-
-File gid_File_Xsl_Export_Common_Styles_Style_Mapping_Css
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Common_Styles;
- Name = "/xslt/export/common/styles/style_mapping_css.xsl";
-End
-
-File gid_File_Xsl_Export_Common_Table_Table
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Common_Table;
- Name = "/xslt/export/common/table/table.xsl";
-End
-
-File gid_File_Xsl_Export_Common_Table_Table_Cells
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Common_Table;
- Name = "/xslt/export/common/table/table_cells.xsl";
-End
-
-File gid_File_Xsl_Export_Common_Table_Table_Columns
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Common_Table;
- Name = "/xslt/export/common/table/table_columns.xsl";
-End
-
-File gid_File_Xsl_Export_Common_Table_Table_Rows
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Common_Table;
- Name = "/xslt/export/common/table/table_rows.xsl";
-End
-
-File gid_File_Xsl_Export_Spreadsheetml_Formular
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Spreadsheetml;
- Name = "/xslt/export/spreadsheetml/formular.xsl";
-End
-
-File gid_File_Xsl_Export_Spreadsheetml_Ooo2spreadsheetml
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Spreadsheetml;
- Name = "/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl";
-End
-
-File gid_File_Xsl_Export_Spreadsheetml_Style_Mapping
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Spreadsheetml;
- Name = "/xslt/export/spreadsheetml/style_mapping.xsl";
-End
-
-File gid_File_Xsl_Export_Spreadsheetml_Styles
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Spreadsheetml;
- Name = "/xslt/export/spreadsheetml/styles.xsl";
-End
-
-File gid_File_Xsl_Export_Spreadsheetml_Table
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Spreadsheetml;
- Name = "/xslt/export/spreadsheetml/table.xsl";
-End
-
-File gid_File_Xsl_Export_Wordml_Ooo2wordml
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Wordml;
- Name = "/xslt/export/wordml/ooo2wordml.xsl";
-End
-File gid_File_Xsl_Export_uof_odf2uof_text
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_uof;
- Name = "/xslt/export/uof/odf2uof_text.xsl";
-End
-File gid_File_Xsl_Export_uof_odf2uof_spreadsheet
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_uof;
- Name = "/xslt/export/uof/odf2uof_spreadsheet.xsl";
-End
-File gid_File_Xsl_Export_uof_odf2uof_presentation
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_uof;
- Name = "/xslt/export/uof/odf2uof_presentation.xsl";
-End
-File gid_File_Xsl_Import_uof_uof2odf_text
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Import_uof;
- Name = "/xslt/import/uof/uof2odf_text.xsl";
-End
-File gid_File_Xsl_Import_uof_uof2odf_spreadsheet
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Import_uof;
- Name = "/xslt/import/uof/uof2odf_spreadsheet.xsl";
-End
-File gid_File_Xsl_Import_uof_uof2odf_presentation
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Import_uof;
- Name = "/xslt/import/uof/uof2odf_presentation.xsl";
-End
-File gid_File_Xsl_Export_Wordml_Ooo2wordml_Border
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Wordml;
- Name = "/xslt/export/wordml/ooo2wordml_border.xsl";
-End
-
-File gid_File_Xsl_Export_Wordml_Ooo2wordml_Custom_Draw
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Wordml;
- Name = "/xslt/export/wordml/ooo2wordml_custom_draw.xsl";
-End
-
-File gid_File_Xsl_Export_Wordml_Ooo2wordml_Draw
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Wordml;
- Name = "/xslt/export/wordml/ooo2wordml_draw.xsl";
-End
-
-File gid_File_Xsl_Export_Wordml_Ooo2wordml_Field
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Wordml;
- Name = "/xslt/export/wordml/ooo2wordml_field.xsl";
-End
-
-File gid_File_Xsl_Export_Wordml_Ooo2wordml_List
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Wordml;
- Name = "/xslt/export/wordml/ooo2wordml_list.xsl";
-End
-
-File gid_File_Xsl_Export_Wordml_Ooo2wordml_Page
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Wordml;
- Name = "/xslt/export/wordml/ooo2wordml_page.xsl";
-End
-
-File gid_File_Xsl_Export_Wordml_Ooo2wordml_Path
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Wordml;
- Name = "/xslt/export/wordml/ooo2wordml_path.xsl";
-End
-
-File gid_File_Xsl_Export_Wordml_Ooo2wordml_Settings
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Wordml;
- Name = "/xslt/export/wordml/ooo2wordml_settings.xsl";
-End
-
-File gid_File_Xsl_Export_Wordml_Ooo2wordml_Table
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Wordml;
- Name = "/xslt/export/wordml/ooo2wordml_table.xsl";
-End
-
-File gid_File_Xsl_Export_Wordml_Ooo2wordml_Text
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Wordml;
- Name = "/xslt/export/wordml/ooo2wordml_text.xsl";
-End
-
-File gid_File_Xsl_Import_Common_Ms2ooo_Docpr
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Import_Common;
- Name = "/xslt/import/common/ms2ooo_docpr.xsl";
-End
-
-File gid_File_Xsl_Import_Spreadsheetml_Spreadsheetml2ooo
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Import_Spreadsheetml;
- Name = "/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl";
-End
-
-File gid_File_Xsl_Import_Wordml_Wordml2ooo
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Import_Wordml;
- Name = "/xslt/import/wordml/wordml2ooo.xsl";
-End
-
-File gid_File_Xsl_Import_Wordml_Wordml2ooo_Custom_Draw
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Import_Wordml;
- Name = "/xslt/import/wordml/wordml2ooo_custom_draw.xsl";
-End
-
-
-File gid_File_Xsl_Import_Wordml_Wordml2ooo_Draw
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Import_Wordml;
- Name = "/xslt/import/wordml/wordml2ooo_draw.xsl";
-End
-
-File gid_File_Xsl_Import_Wordml_Wordml2ooo_Field
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Import_Wordml;
- Name = "/xslt/import/wordml/wordml2ooo_field.xsl";
-End
-
-File gid_File_Xsl_Import_Wordml_Wordml2ooo_List
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Import_Wordml;
- Name = "/xslt/import/wordml/wordml2ooo_list.xsl";
-End
-
-File gid_File_Xsl_Import_Wordml_Wordml2ooo_Page
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Import_Wordml;
- Name = "/xslt/import/wordml/wordml2ooo_page.xsl";
-End
-
-File gid_File_Xsl_Import_Wordml_Wordml2ooo_Settings
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Import_Wordml;
- Name = "/xslt/import/wordml/wordml2ooo_settings.xsl";
-End
-
-File gid_File_Xsl_Import_Wordml_Wordml2ooo_Table
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Import_Wordml;
- Name = "/xslt/import/wordml/wordml2ooo_table.xsl";
-End
-
-File gid_File_Xsl_Import_Wordml_Wordml2ooo_Text
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Import_Wordml;
- Name = "/xslt/import/wordml/wordml2ooo_text.xsl";
-End
-
-File gid_File_Xsl_Import_Wordml_Wordml2ooo_Path
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Import_Wordml;
- Name = "/xslt/import/wordml/wordml2ooo_path.xsl";
-End
-
-
-File gid_File_Xsl_Import_Wordml_Wordml2ooo_Props
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Import_Wordml;
- Name = "/xslt/import/wordml/wordml2ooo_props.xsl";
+ Styles = (FILELIST, PACKED);
+ Dir = FILELIST_DIR;
+ Name = "filter_xslt.filelist";
End
File gid_Starregistry_Services_Rdb
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 774f998..7cc2636 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -487,52 +487,7 @@ Module gid_Module_Root_Files_6
gid_File_Share_Registry_Main_Xcd,
gid_File_Share_Registry_Forcedefault_Xcd,
gid_File_Pymailmerge,
- gid_File_Xsl_Common_Measure_Conversion,
- gid_File_Xsl_Common_Math_Functions,
- gid_File_Xsl_Export_Common_Body,
- gid_File_Xsl_Export_Common_Table_Of_Content,
- gid_File_Xsl_Export_Common_Ooo2ms_Docpr,
- gid_File_Xsl_Export_Common_Styles_Styles_Collector,
- gid_File_Xsl_Export_Common_Styles_Style_Mapping_Css,
- gid_File_Xsl_Export_Common_Table_Table,
- gid_File_Xsl_Export_Common_Table_Table_Cells,
- gid_File_Xsl_Export_Common_Table_Table_Columns,
- gid_File_Xsl_Export_Common_Table_Table_Rows,
- gid_File_Xsl_Export_Spreadsheetml_Formular,
- gid_File_Xsl_Export_Spreadsheetml_Ooo2spreadsheetml,
- gid_File_Xsl_Export_Spreadsheetml_Style_Mapping,
- gid_File_Xsl_Export_Spreadsheetml_Styles,
- gid_File_Xsl_Export_Spreadsheetml_Table,
- gid_File_Xsl_Export_uof_odf2uof_text,
- gid_File_Xsl_Export_uof_odf2uof_spreadsheet,
- gid_File_Xsl_Export_uof_odf2uof_presentation,
- gid_File_Xsl_Import_uof_uof2odf_text,
- gid_File_Xsl_Import_uof_uof2odf_spreadsheet,
- gid_File_Xsl_Import_uof_uof2odf_presentation,
- gid_File_Xsl_Export_Wordml_Ooo2wordml,
- gid_File_Xsl_Export_Wordml_Ooo2wordml_Border,
- gid_File_Xsl_Export_Wordml_Ooo2wordml_Custom_Draw,
- gid_File_Xsl_Export_Wordml_Ooo2wordml_Draw,
- gid_File_Xsl_Export_Wordml_Ooo2wordml_Field,
- gid_File_Xsl_Export_Wordml_Ooo2wordml_List,
- gid_File_Xsl_Export_Wordml_Ooo2wordml_Page,
- gid_File_Xsl_Export_Wordml_Ooo2wordml_Path,
- gid_File_Xsl_Export_Wordml_Ooo2wordml_Settings,
- gid_File_Xsl_Export_Wordml_Ooo2wordml_Table,
- gid_File_Xsl_Export_Wordml_Ooo2wordml_Text,
- gid_File_Xsl_Import_Common_Ms2ooo_Docpr,
- gid_File_Xsl_Import_Spreadsheetml_Spreadsheetml2ooo,
- gid_File_Xsl_Import_Wordml_Wordml2ooo_Props,
- gid_File_Xsl_Import_Wordml_Wordml2ooo,
- gid_File_Xsl_Import_Wordml_Wordml2ooo_Custom_Draw,
- gid_File_Xsl_Import_Wordml_Wordml2ooo_Draw,
- gid_File_Xsl_Import_Wordml_Wordml2ooo_Field,
- gid_File_Xsl_Import_Wordml_Wordml2ooo_List,
- gid_File_Xsl_Import_Wordml_Wordml2ooo_Page,
- gid_File_Xsl_Import_Wordml_Wordml2ooo_Settings,
- gid_File_Xsl_Import_Wordml_Wordml2ooo_Table,
- gid_File_Xsl_Import_Wordml_Wordml2ooo_Text,
- gid_File_Xsl_Import_Wordml_Wordml2ooo_Path,
+ gid_File_filter_xslt,
gid_File_Extra_Fontunxpsprint,
gid_File_Extra_Fontunxppds,
gid_File_Extra_Fontunxafm);
diff --git a/scp2/source/xsltfilter/file_xsltfilter.scp b/scp2/source/xsltfilter/file_xsltfilter.scp
index d71b521..6031b31 100644
--- a/scp2/source/xsltfilter/file_xsltfilter.scp
+++ b/scp2/source/xsltfilter/file_xsltfilter.scp
@@ -34,51 +34,16 @@ File gid_File_Share_Registry_Xsltfilter_Xcd
Name = "xsltfilter.xcd";
End
-File gid_File_Stw_Docbooktemplate
+File gid_File_filter_docbook
TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Docbook;
- Name = "DocBookTemplate.stw";
-End
-
-File gid_File_Xsl_Docbooktosoffheadings
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Docbook;
- Name = "docbooktosoffheadings.xsl";
-End
-
-File gid_File_Xsl_Sofftodocbookheadings
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Docbook;
- Name = "sofftodocbookheadings.xsl";
-End
-
-File gid_File_Xsl_Export_Xhtml_Body
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Xhtml;
- Name = "/xslt/export/xhtml/body.xsl";
-End
-
-File gid_File_Xsl_Export_Xhtml_Header
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Xhtml;
- Name = "/xslt/export/xhtml/header.xsl";
+ Styles = (FILELIST, PACKED);
+ Dir = FILELIST_DIR;
+ Name = "filter_docbook.filelist";
End
-File gid_File_Xsl_Export_Xhtml_Ooo2xhtml
+File gid_File_filter_xhtml
TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Xhtml;
- Name = "/xslt/export/xhtml/opendoc2xhtml.xsl";
-End
-
-File gid_File_Xsl_Export_Xhtml_Table
- TXT_FILE_BODY;
- Styles = (PACKED);
- Dir = gid_Dir_Share_Xslt_Export_Xhtml;
- Name = "/xslt/export/xhtml/table.xsl";
+ Styles = (FILELIST, PACKED);
+ Dir = FILELIST_DIR;
+ Name = "filter_xhtml.filelist";
End
diff --git a/scp2/source/xsltfilter/module_xsltfilter.scp b/scp2/source/xsltfilter/module_xsltfilter.scp
index a3206b0..b5efca5 100644
--- a/scp2/source/xsltfilter/module_xsltfilter.scp
+++ b/scp2/source/xsltfilter/module_xsltfilter.scp
@@ -33,16 +33,8 @@ Module gid_Module_Optional_Xsltfiltersamples
MOD_NAME_DESC(MODULE_OPTIONAL_XSLTFILTERSAMPLES);
Sortkey = "700";
ParentID = gid_Module_Optional;
- Files = ( gid_File_Xsl_Sofftodocbookheadings,gid_File_Xsl_Docbooktosoffheadings,
- gid_File_Stw_Docbooktemplate,
- gid_File_Xsl_Export_Xhtml_Body,
- gid_File_Xsl_Export_Xhtml_Header,
- gid_File_Xsl_Export_Xhtml_Master_Chapter_Numbering,
- gid_File_Xsl_Export_Xhtml_Master_Document,
- gid_File_Xsl_Export_Xhtml_Master_Refs_Workaround,
- gid_File_Xsl_Export_Xhtml_Master_Usability_Links,
- gid_File_Xsl_Export_Xhtml_Ooo2xhtml,
- gid_File_Xsl_Export_Xhtml_Table,
+ Files = ( gid_File_filter_docbook,
+ gid_File_filter_xhtml,
gid_File_Share_Registry_Xsltfilter_Xcd );
Minimal = NO;
Default = YES;
commit af12920f0f72d32ee6d3e6c0133ef1c774495100
Author: David Tardon <dtardon at redhat.com>
Date: Wed May 1 15:08:16 2013 +0200
unoil.jar is not part of URE
Change-Id: I8a370e14751ff1720b27f9c1787d8411bebb17ff
diff --git a/Repository.mk b/Repository.mk
index 26d95f4..70b7c4c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -725,7 +725,6 @@ $(eval $(call gb_Helper_register_jars,URE, \
jurt \
ridl \
testComponent \
- unoil \
unoloader \
))
@@ -755,6 +754,7 @@ $(eval $(call gb_Helper_register_jars,OOO, \
reportbuilderwizard \
sdbc_hsqldb \
table \
+ unoil \
web \
xmerge \
))
commit 0773c8c77af0ea1e884b2498ea8a5ed7d7dfa9ef
Author: David Tardon <dtardon at redhat.com>
Date: Wed May 1 15:04:48 2013 +0200
gbuild: add group NONE for jars without comp. file
This is mainly to avoid polluting instdir because these jars are only
used during build.
Change-Id: Ia5bab3155787b690bd915f3e83e6b6144715948b
diff --git a/Repository.mk b/Repository.mk
index 76d6662..26d95f4 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -731,16 +731,10 @@ $(eval $(call gb_Helper_register_jars,URE, \
$(eval $(call gb_Helper_register_jars,OOO, \
ConnectivityTools \
- HelloWorld \
- Highlight \
- MemoryUsage \
- OOoRunner \
ScriptFramework \
ScriptProviderForBeanShell \
ScriptProviderForJava \
ScriptProviderForJavaScript \
- TestExtension \
- OOoRunnerLight \
XMergeBridge \
XSLTFilter \
XSLTValidate \
@@ -761,8 +755,6 @@ $(eval $(call gb_Helper_register_jars,OOO, \
reportbuilderwizard \
sdbc_hsqldb \
table \
- test \
- test-tools \
web \
xmerge \
))
@@ -774,6 +766,17 @@ $(eval $(call gb_Helper_register_jars,OXT, \
passive_java \
))
+$(eval $(call gb_Helper_register_jars,NONE,\
+ HelloWorld \
+ Highlight \
+ MemoryUsage \
+ OOoRunner \
+ OOoRunnerLight \
+ TestExtension \
+ test \
+ test-tools \
+))
+
# External executables
$(eval $(call gb_ExternalExecutable_register_executables,\
genbrk \
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 3130bf7..e0a61cc 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -120,7 +120,7 @@ gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE
gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS
gb_Library_VALIDINSTALLMODULES := OOO URE WRITER
gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
-gb_Jar_VALIDGROUPS := URE OOO OXT
+gb_Jar_VALIDGROUPS := URE OOO OXT NONE
$$(foreach group,$$(gb_Executable_VALIDGROUPS),$$(eval gb_Executable_$$(group) :=))
$$(foreach group,$$(gb_Library_VALIDGROUPS),$$(eval gb_Library_$$(group) :=))
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index cdc6813..17dfd3d 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -113,7 +113,7 @@ $(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1))
$(call gb_Jar_get_outdir_target,$(1)) :| $(dir $(call gb_Jar_get_outdir_target,$(1))).dir
ifneq ($(gb_RUNNABLE_INSTDIR),)
-$(if $(filter-out OXT,$(call gb_Jar__get_layer,$(1))),\
+$(if $(filter OOO URE,$(call gb_Jar__get_layer,$(1))),\
$(call gb_Jar__Jar_package,$(1),$(call gb_Jar_get_packagename,$(1)),$(notdir $(call gb_Jar_get_target,$(1)))) \
)
endif
commit f45c3418d11009dbe9a78e59aa9e5fcbbdad5f91
Author: David Tardon <dtardon at redhat.com>
Date: Wed May 1 14:49:15 2013 +0200
sort the list
Change-Id: I46793895764e720534a3e8f713054d92e220f36e
diff --git a/jfreereport/Module_jfreereport.mk b/jfreereport/Module_jfreereport.mk
index 9df40cb..4390ad0 100644
--- a/jfreereport/Module_jfreereport.mk
+++ b/jfreereport/Module_jfreereport.mk
@@ -12,39 +12,39 @@ $(eval $(call gb_Module_Module,jfreereport))
ifneq ($(SOLAR_JAVA),)
ifneq ($(filter JFREEREPORT,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_targets,jfreereport,\
- UnpackedTarball_jfreereport_sac \
- ExternalProject_jfreereport_sac \
- ExternalPackage_jfreereport_sac \
- UnpackedTarball_jfreereport_libbase \
- ExternalProject_jfreereport_libbase \
- ExternalPackage_jfreereport_libbase \
- UnpackedTarball_jfreereport_flute \
- ExternalProject_jfreereport_flute \
+ ExternalPackage_jfreereport_flow_engine \
ExternalPackage_jfreereport_flute \
- UnpackedTarball_jfreereport_libloader \
- ExternalProject_jfreereport_libloader \
+ ExternalPackage_jfreereport_libbase \
+ ExternalPackage_jfreereport_libfonts \
+ ExternalPackage_jfreereport_libformula \
+ ExternalPackage_jfreereport_liblayout \
ExternalPackage_jfreereport_libloader \
- UnpackedTarball_jfreereport_libxml \
- ExternalProject_jfreereport_libxml \
+ ExternalPackage_jfreereport_librepository \
+ ExternalPackage_jfreereport_libserializer \
ExternalPackage_jfreereport_libxml \
- UnpackedTarball_jfreereport_libformula \
- ExternalProject_jfreereport_libformula \
- ExternalPackage_jfreereport_libformula \
- UnpackedTarball_jfreereport_libfonts \
+ ExternalPackage_jfreereport_sac \
+ ExternalProject_jfreereport_flow_engine \
+ ExternalProject_jfreereport_flute \
+ ExternalProject_jfreereport_libbase \
ExternalProject_jfreereport_libfonts \
- ExternalPackage_jfreereport_libfonts \
+ ExternalProject_jfreereport_libformula \
+ ExternalProject_jfreereport_liblayout \
+ ExternalProject_jfreereport_libloader \
ExternalProject_jfreereport_librepository \
- UnpackedTarball_jfreereport_librepository \
- ExternalPackage_jfreereport_librepository \
- UnpackedTarball_jfreereport_libserializer \
ExternalProject_jfreereport_libserializer \
- ExternalPackage_jfreereport_libserializer \
- UnpackedTarball_jfreereport_liblayout \
- ExternalProject_jfreereport_liblayout \
- ExternalPackage_jfreereport_liblayout \
+ ExternalProject_jfreereport_libxml \
+ ExternalProject_jfreereport_sac \
UnpackedTarball_jfreereport_flow_engine \
- ExternalProject_jfreereport_flow_engine \
- ExternalPackage_jfreereport_flow_engine \
+ UnpackedTarball_jfreereport_flute \
+ UnpackedTarball_jfreereport_libbase \
+ UnpackedTarball_jfreereport_libfonts \
+ UnpackedTarball_jfreereport_libformula \
+ UnpackedTarball_jfreereport_liblayout \
+ UnpackedTarball_jfreereport_libloader \
+ UnpackedTarball_jfreereport_librepository \
+ UnpackedTarball_jfreereport_libserializer \
+ UnpackedTarball_jfreereport_libxml \
+ UnpackedTarball_jfreereport_sac \
))
endif
endif
commit f7c55abf4f80b3c7228b6fe416e3e548e8adcd26
Author: David Tardon <dtardon at redhat.com>
Date: Wed May 1 14:44:13 2013 +0200
copy external jars to instdir
Change-Id: Ibbae216975bf8e066f24c1a4885394e346e2eaec
diff --git a/apache-commons/ExternalPackage_apache_commons_logging.mk b/apache-commons/ExternalPackage_apache_commons_logging.mk
new file mode 100644
index 0000000..41cd2c6
--- /dev/null
+++ b/apache-commons/ExternalPackage_apache_commons_logging.mk
@@ -0,0 +1,16 @@
+# -*- 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_ExternalPackage_ExternalPackage,apache_commons_logging_inc,apache_commons_logging))
+
+$(eval $(call gb_ExternalPackage_use_external_project,apache_commons_logging_inc,apache_commons_logging))
+
+$(eval $(call gb_ExternalPackage_add_jar_for_install,apache_commons_logging_inc,bin/commons-logging-1.1.1.jar,target/commons-logging-1.1.1-SNAPSHOT.jar))
+
+# vim: set noet sw=4 ts=4:
diff --git a/apache-commons/Module_apache-commons.mk b/apache-commons/Module_apache-commons.mk
index a89f69e..4bb62cb 100644
--- a/apache-commons/Module_apache-commons.mk
+++ b/apache-commons/Module_apache-commons.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_Module_Module,apache_commons))
ifneq ($(SOLAR_JAVA),)
ifneq ($(filter APACHE_COMMONS,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_targets,apache_commons,\
+ ExternalPackage_apache_commons_logging \
ExternalProject_apache_commons_codec \
ExternalProject_apache_commons_httpclient \
ExternalProject_apache_commons_lang \
@@ -19,7 +20,6 @@ $(eval $(call gb_Module_add_targets,apache_commons,\
Package_apache_commons_codec \
Package_apache_commons_httpclient \
Package_apache_commons_lang \
- Package_apache_commons_logging \
UnpackedTarball_apache_commons_codec \
UnpackedTarball_apache_commons_httpclient \
UnpackedTarball_apache_commons_lang \
diff --git a/apache-commons/Package_apache_commons_logging.mk b/apache-commons/Package_apache_commons_logging.mk
deleted file mode 100644
index 24a14ea..0000000
--- a/apache-commons/Package_apache_commons_logging.mk
+++ /dev/null
@@ -1,16 +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_Package_Package,apache_commons_logging_inc,$(call gb_UnpackedTarball_get_dir,apache_commons_logging)))
-
-$(eval $(call gb_Package_use_external_project,apache_commons_logging_inc,apache_commons_logging))
-
-$(eval $(call gb_Package_add_file,apache_commons_logging_inc,bin/commons-logging-1.1.1.jar,target/commons-logging-1.1.1-SNAPSHOT.jar))
-
-# vim: set noet sw=4 ts=4:
diff --git a/beanshell/Package_beanshell.mk b/beanshell/ExternalPackage_beanshell.mk
similarity index 59%
rename from beanshell/Package_beanshell.mk
rename to beanshell/ExternalPackage_beanshell.mk
index bb4b829..1346b88 100644
--- a/beanshell/Package_beanshell.mk
+++ b/beanshell/ExternalPackage_beanshell.mk
@@ -7,10 +7,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,beanshell,$(call gb_UnpackedTarball_get_dir,beanshell)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,beanshell,beanshell))
-$(eval $(call gb_Package_use_external_project,beanshell,beanshell))
+$(eval $(call gb_ExternalPackage_use_external_project,beanshell,beanshell))
-$(eval $(call gb_Package_add_file,beanshell,bin/bsh.jar,dist/bsh-2.0b1.jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,beanshell,bin/bsh.jar,dist/bsh-2.0b1.jar))
# vim: set noet sw=4 ts=4:
diff --git a/beanshell/Module_beanshell.mk b/beanshell/Module_beanshell.mk
index e739b36..035529a 100644
--- a/beanshell/Module_beanshell.mk
+++ b/beanshell/Module_beanshell.mk
@@ -12,8 +12,8 @@ $(eval $(call gb_Module_Module,beanshell))
ifneq ($(SOLAR_JAVA),)
ifneq ($(filter BSH,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_targets,beanshell,\
+ ExternalPackage_beanshell \
ExternalProject_beanshell \
- Package_beanshell \
UnpackedTarball_beanshell \
))
endif
diff --git a/hsqldb/Package_hsqldb.mk b/hsqldb/ExternalPackage_hsqldb.mk
similarity index 58%
rename from hsqldb/Package_hsqldb.mk
rename to hsqldb/ExternalPackage_hsqldb.mk
index 2088d6f..770ca06 100644
--- a/hsqldb/Package_hsqldb.mk
+++ b/hsqldb/ExternalPackage_hsqldb.mk
@@ -7,10 +7,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,hsqldb_project,$(call gb_UnpackedTarball_get_dir,hsqldb)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,hsqldb_project,hsqldb))
-$(eval $(call gb_Package_use_external_project,hsqldb_project,hsqldb))
+$(eval $(call gb_ExternalPackage_use_external_project,hsqldb_project,hsqldb))
-$(eval $(call gb_Package_add_file,hsqldb_project,bin/hsqldb.jar,lib/hsqldb.jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,hsqldb_project,bin/hsqldb.jar,lib/hsqldb.jar))
# vim: set noet sw=4 ts=4:
diff --git a/hsqldb/Module_hsqldb.mk b/hsqldb/Module_hsqldb.mk
index ef31358..8772621 100644
--- a/hsqldb/Module_hsqldb.mk
+++ b/hsqldb/Module_hsqldb.mk
@@ -11,8 +11,8 @@ $(eval $(call gb_Module_Module,hsqldb))
ifneq ($(SOLAR_JAVA),)
$(eval $(call gb_Module_add_targets,hsqldb,\
+ ExternalPackage_hsqldb \
ExternalProject_hsqldb \
- Package_hsqldb \
UnpackedTarball_hsqldb \
))
endif
diff --git a/jfreereport/Package_jfreereport_flow_engine.mk b/jfreereport/ExternalPackage_jfreereport_flow_engine.mk
similarity index 53%
rename from jfreereport/Package_jfreereport_flow_engine.mk
rename to jfreereport/ExternalPackage_jfreereport_flow_engine.mk
index eacddb3..00e8ded 100644
--- a/jfreereport/Package_jfreereport_flow_engine.mk
+++ b/jfreereport/ExternalPackage_jfreereport_flow_engine.mk
@@ -10,10 +10,10 @@
# for VERSION
include $(SRCDIR)/jfreereport/version.mk
-$(eval $(call gb_Package_Package,jfreereport_flow_engine,$(call gb_UnpackedTarball_get_dir,jfreereport_flow_engine)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_flow_engine,jfreereport_flow_engine))
-$(eval $(call gb_Package_use_external_project,jfreereport_flow_engine,jfreereport_flow_engine))
+$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_flow_engine,jfreereport_flow_engine))
-$(eval $(call gb_Package_add_file,jfreereport_flow_engine,bin/flow-engine-$(FLOW_ENGINE_VERSION).jar,build/lib/flow-engine.jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_flow_engine,bin/flow-engine-$(FLOW_ENGINE_VERSION).jar,build/lib/flow-engine.jar))
# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_flute.mk b/jfreereport/ExternalPackage_jfreereport_flute.mk
similarity index 56%
copy from jfreereport/Package_jfreereport_flute.mk
copy to jfreereport/ExternalPackage_jfreereport_flute.mk
index eddb428..2892342 100644
--- a/jfreereport/Package_jfreereport_flute.mk
+++ b/jfreereport/ExternalPackage_jfreereport_flute.mk
@@ -10,10 +10,10 @@
# for VERSION
include $(SRCDIR)/jfreereport/version.mk
-$(eval $(call gb_Package_Package,jfreereport_flute,$(call gb_UnpackedTarball_get_dir,jfreereport_flute)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_flute,jfreereport_flute))
-$(eval $(call gb_Package_use_external_project,jfreereport_flute,jfreereport_flute))
+$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_flute,jfreereport_flute))
-$(eval $(call gb_Package_add_file,jfreereport_flute,bin/flute-$(FLUTE_VERSION).jar,dist/flute-$(FLUTE_VERSION).jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_flute,bin/flute-$(FLUTE_VERSION).jar,dist/flute-$(FLUTE_VERSION).jar))
# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_libbase.mk b/jfreereport/ExternalPackage_jfreereport_libbase.mk
similarity index 54%
rename from jfreereport/Package_jfreereport_libbase.mk
rename to jfreereport/ExternalPackage_jfreereport_libbase.mk
index 073cce5..ee42a44 100644
--- a/jfreereport/Package_jfreereport_libbase.mk
+++ b/jfreereport/ExternalPackage_jfreereport_libbase.mk
@@ -10,10 +10,10 @@
# for VERSION
include $(SRCDIR)/jfreereport/version.mk
-$(eval $(call gb_Package_Package,jfreereport_libbase,$(call gb_UnpackedTarball_get_dir,jfreereport_libbase)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libbase,jfreereport_libbase))
-$(eval $(call gb_Package_use_external_project,jfreereport_libbase,jfreereport_libbase))
+$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libbase,jfreereport_libbase))
-$(eval $(call gb_Package_add_file,jfreereport_libbase,bin/libbase-$(LIBBASE_VERSION).jar,dist/libbase-$(LIBBASE_VERSION).jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libbase,bin/libbase-$(LIBBASE_VERSION).jar,dist/libbase-$(LIBBASE_VERSION).jar))
# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_liblayout.mk b/jfreereport/ExternalPackage_jfreereport_libfonts.mk
similarity index 54%
rename from jfreereport/Package_jfreereport_liblayout.mk
rename to jfreereport/ExternalPackage_jfreereport_libfonts.mk
index d06c3a3..fd89ded 100644
--- a/jfreereport/Package_jfreereport_liblayout.mk
+++ b/jfreereport/ExternalPackage_jfreereport_libfonts.mk
@@ -10,10 +10,10 @@
# for VERSION
include $(SRCDIR)/jfreereport/version.mk
-$(eval $(call gb_Package_Package,jfreereport_liblayout,$(call gb_UnpackedTarball_get_dir,jfreereport_liblayout)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libfonts,jfreereport_libfonts))
-$(eval $(call gb_Package_use_external_project,jfreereport_liblayout,jfreereport_liblayout))
+$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libfonts,jfreereport_libfonts))
-$(eval $(call gb_Package_add_file,jfreereport_liblayout,bin/liblayout-$(LIBLAYOUT_VERSION).jar,build/lib/liblayout.jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libfonts,bin/libfonts-$(LIBFONTS_VERSION).jar,dist/libfonts-$(LIBFONTS_VERSION).jar))
# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_flute.mk b/jfreereport/ExternalPackage_jfreereport_libformula.mk
similarity index 53%
copy from jfreereport/Package_jfreereport_flute.mk
copy to jfreereport/ExternalPackage_jfreereport_libformula.mk
index eddb428..674d4b2 100644
--- a/jfreereport/Package_jfreereport_flute.mk
+++ b/jfreereport/ExternalPackage_jfreereport_libformula.mk
@@ -10,10 +10,10 @@
# for VERSION
include $(SRCDIR)/jfreereport/version.mk
-$(eval $(call gb_Package_Package,jfreereport_flute,$(call gb_UnpackedTarball_get_dir,jfreereport_flute)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libformula,jfreereport_libformula))
-$(eval $(call gb_Package_use_external_project,jfreereport_flute,jfreereport_flute))
+$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libformula,jfreereport_libformula))
-$(eval $(call gb_Package_add_file,jfreereport_flute,bin/flute-$(FLUTE_VERSION).jar,dist/flute-$(FLUTE_VERSION).jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libformula,bin/libformula-$(LIBFORMULA_VERSION).jar,dist/libformula-$(LIBFORMULA_VERSION).jar))
# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_libfonts.mk b/jfreereport/ExternalPackage_jfreereport_liblayout.mk
similarity index 54%
rename from jfreereport/Package_jfreereport_libfonts.mk
rename to jfreereport/ExternalPackage_jfreereport_liblayout.mk
index 22152c0..84f5636 100644
--- a/jfreereport/Package_jfreereport_libfonts.mk
+++ b/jfreereport/ExternalPackage_jfreereport_liblayout.mk
@@ -10,10 +10,10 @@
# for VERSION
include $(SRCDIR)/jfreereport/version.mk
-$(eval $(call gb_Package_Package,jfreereport_libfonts,$(call gb_UnpackedTarball_get_dir,jfreereport_libfonts)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_liblayout,jfreereport_liblayout))
-$(eval $(call gb_Package_use_external_project,jfreereport_libfonts,jfreereport_libfonts))
+$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_liblayout,jfreereport_liblayout))
-$(eval $(call gb_Package_add_file,jfreereport_libfonts,bin/libfonts-$(LIBFONTS_VERSION).jar,dist/libfonts-$(LIBFONTS_VERSION).jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_liblayout,bin/liblayout-$(LIBLAYOUT_VERSION).jar,build/lib/liblayout.jar))
# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_flute.mk b/jfreereport/ExternalPackage_jfreereport_libloader.mk
similarity index 53%
copy from jfreereport/Package_jfreereport_flute.mk
copy to jfreereport/ExternalPackage_jfreereport_libloader.mk
index eddb428..3a8c1fd 100644
--- a/jfreereport/Package_jfreereport_flute.mk
+++ b/jfreereport/ExternalPackage_jfreereport_libloader.mk
@@ -10,10 +10,10 @@
# for VERSION
include $(SRCDIR)/jfreereport/version.mk
-$(eval $(call gb_Package_Package,jfreereport_flute,$(call gb_UnpackedTarball_get_dir,jfreereport_flute)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libloader,jfreereport_libloader))
-$(eval $(call gb_Package_use_external_project,jfreereport_flute,jfreereport_flute))
+$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libloader,jfreereport_libloader))
-$(eval $(call gb_Package_add_file,jfreereport_flute,bin/flute-$(FLUTE_VERSION).jar,dist/flute-$(FLUTE_VERSION).jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libloader,bin/libloader-$(LIBLOADER_VERSION).jar,dist/libloader-$(LIBLOADER_VERSION).jar))
# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_flute.mk b/jfreereport/ExternalPackage_jfreereport_librepository.mk
similarity index 51%
copy from jfreereport/Package_jfreereport_flute.mk
copy to jfreereport/ExternalPackage_jfreereport_librepository.mk
index eddb428..4a671d5 100644
--- a/jfreereport/Package_jfreereport_flute.mk
+++ b/jfreereport/ExternalPackage_jfreereport_librepository.mk
@@ -10,10 +10,10 @@
# for VERSION
include $(SRCDIR)/jfreereport/version.mk
-$(eval $(call gb_Package_Package,jfreereport_flute,$(call gb_UnpackedTarball_get_dir,jfreereport_flute)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_librepository,jfreereport_librepository))
-$(eval $(call gb_Package_use_external_project,jfreereport_flute,jfreereport_flute))
+$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_librepository,jfreereport_librepository))
-$(eval $(call gb_Package_add_file,jfreereport_flute,bin/flute-$(FLUTE_VERSION).jar,dist/flute-$(FLUTE_VERSION).jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_librepository,bin/librepository-$(LIBREPOSITORY_VERSION).jar,dist/librepository-$(LIBREPOSITORY_VERSION).jar))
# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_flute.mk b/jfreereport/ExternalPackage_jfreereport_libserializer.mk
similarity index 51%
rename from jfreereport/Package_jfreereport_flute.mk
rename to jfreereport/ExternalPackage_jfreereport_libserializer.mk
index eddb428..4202856 100644
--- a/jfreereport/Package_jfreereport_flute.mk
+++ b/jfreereport/ExternalPackage_jfreereport_libserializer.mk
@@ -10,10 +10,10 @@
# for VERSION
include $(SRCDIR)/jfreereport/version.mk
-$(eval $(call gb_Package_Package,jfreereport_flute,$(call gb_UnpackedTarball_get_dir,jfreereport_flute)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libserializer,jfreereport_libserializer))
-$(eval $(call gb_Package_use_external_project,jfreereport_flute,jfreereport_flute))
+$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libserializer,jfreereport_libserializer))
-$(eval $(call gb_Package_add_file,jfreereport_flute,bin/flute-$(FLUTE_VERSION).jar,dist/flute-$(FLUTE_VERSION).jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libserializer,bin/libserializer-$(LIBBASE_VERSION).jar,dist/libserializer-$(LIBBASE_VERSION).jar))
# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_libxml.mk b/jfreereport/ExternalPackage_jfreereport_libxml.mk
similarity index 55%
rename from jfreereport/Package_jfreereport_libxml.mk
rename to jfreereport/ExternalPackage_jfreereport_libxml.mk
index 6669f33..1db31f4 100644
--- a/jfreereport/Package_jfreereport_libxml.mk
+++ b/jfreereport/ExternalPackage_jfreereport_libxml.mk
@@ -10,10 +10,10 @@
# for VERSION
include $(SRCDIR)/jfreereport/version.mk
-$(eval $(call gb_Package_Package,jfreereport_libxml,$(call gb_UnpackedTarball_get_dir,jfreereport_libxml)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_libxml,jfreereport_libxml))
-$(eval $(call gb_Package_use_external_project,jfreereport_libxml,jfreereport_libxml))
+$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_libxml,jfreereport_libxml))
-$(eval $(call gb_Package_add_file,jfreereport_libxml,bin/libxml-$(LIBXML_VERSION).jar,dist/libxml-$(LIBXML_VERSION).jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_libxml,bin/libxml-$(LIBXML_VERSION).jar,dist/libxml-$(LIBXML_VERSION).jar))
# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_sac.mk b/jfreereport/ExternalPackage_jfreereport_sac.mk
similarity index 56%
rename from jfreereport/Package_jfreereport_sac.mk
rename to jfreereport/ExternalPackage_jfreereport_sac.mk
index d4c0f86..1f8df20 100644
--- a/jfreereport/Package_jfreereport_sac.mk
+++ b/jfreereport/ExternalPackage_jfreereport_sac.mk
@@ -7,10 +7,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,jfreereport_sac,$(call gb_UnpackedTarball_get_dir,jfreereport_sac)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,jfreereport_sac,jfreereport_sac))
-$(eval $(call gb_Package_use_external_project,jfreereport_sac,jfreereport_sac))
+$(eval $(call gb_ExternalPackage_use_external_project,jfreereport_sac,jfreereport_sac))
-$(eval $(call gb_Package_add_file,jfreereport_sac,bin/sac.jar,build/lib/sac.jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,jfreereport_sac,bin/sac.jar,build/lib/sac.jar))
# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Module_jfreereport.mk b/jfreereport/Module_jfreereport.mk
index 55537a8..9df40cb 100644
--- a/jfreereport/Module_jfreereport.mk
+++ b/jfreereport/Module_jfreereport.mk
@@ -14,37 +14,37 @@ ifneq ($(filter JFREEREPORT,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_targets,jfreereport,\
UnpackedTarball_jfreereport_sac \
ExternalProject_jfreereport_sac \
- Package_jfreereport_sac \
+ ExternalPackage_jfreereport_sac \
UnpackedTarball_jfreereport_libbase \
ExternalProject_jfreereport_libbase \
- Package_jfreereport_libbase \
+ ExternalPackage_jfreereport_libbase \
UnpackedTarball_jfreereport_flute \
ExternalProject_jfreereport_flute \
- Package_jfreereport_flute \
+ ExternalPackage_jfreereport_flute \
UnpackedTarball_jfreereport_libloader \
ExternalProject_jfreereport_libloader \
- Package_jfreereport_libloader \
+ ExternalPackage_jfreereport_libloader \
UnpackedTarball_jfreereport_libxml \
ExternalProject_jfreereport_libxml \
- Package_jfreereport_libxml \
+ ExternalPackage_jfreereport_libxml \
UnpackedTarball_jfreereport_libformula \
ExternalProject_jfreereport_libformula \
- Package_jfreereport_libformula \
+ ExternalPackage_jfreereport_libformula \
UnpackedTarball_jfreereport_libfonts \
ExternalProject_jfreereport_libfonts \
- Package_jfreereport_libfonts \
+ ExternalPackage_jfreereport_libfonts \
ExternalProject_jfreereport_librepository \
UnpackedTarball_jfreereport_librepository \
- Package_jfreereport_librepository \
+ ExternalPackage_jfreereport_librepository \
UnpackedTarball_jfreereport_libserializer \
ExternalProject_jfreereport_libserializer \
- Package_jfreereport_libserializer \
+ ExternalPackage_jfreereport_libserializer \
UnpackedTarball_jfreereport_liblayout \
ExternalProject_jfreereport_liblayout \
- Package_jfreereport_liblayout \
+ ExternalPackage_jfreereport_liblayout \
UnpackedTarball_jfreereport_flow_engine \
ExternalProject_jfreereport_flow_engine \
- Package_jfreereport_flow_engine \
+ ExternalPackage_jfreereport_flow_engine \
))
endif
endif
diff --git a/jfreereport/Package_jfreereport_libformula.mk b/jfreereport/Package_jfreereport_libformula.mk
deleted file mode 100644
index 87538b8..0000000
--- a/jfreereport/Package_jfreereport_libformula.mk
+++ /dev/null
@@ -1,19 +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/.
-#
-
-# for VERSION
-include $(SRCDIR)/jfreereport/version.mk
-
-$(eval $(call gb_Package_Package,jfreereport_libformula,$(call gb_UnpackedTarball_get_dir,jfreereport_libformula)))
-
-$(eval $(call gb_Package_use_external_project,jfreereport_libformula,jfreereport_libformula))
-
-$(eval $(call gb_Package_add_file,jfreereport_libformula,bin/libformula-$(LIBFORMULA_VERSION).jar,dist/libformula-$(LIBFORMULA_VERSION).jar))
-
-# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_libloader.mk b/jfreereport/Package_jfreereport_libloader.mk
deleted file mode 100644
index e67c1e4..0000000
--- a/jfreereport/Package_jfreereport_libloader.mk
+++ /dev/null
@@ -1,19 +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/.
-#
-
-# for VERSION
-include $(SRCDIR)/jfreereport/version.mk
-
-$(eval $(call gb_Package_Package,jfreereport_libloader,$(call gb_UnpackedTarball_get_dir,jfreereport_libloader)))
-
-$(eval $(call gb_Package_use_external_project,jfreereport_libloader,jfreereport_libloader))
-
-$(eval $(call gb_Package_add_file,jfreereport_libloader,bin/libloader-$(LIBLOADER_VERSION).jar,dist/libloader-$(LIBLOADER_VERSION).jar))
-
-# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_librepository.mk b/jfreereport/Package_jfreereport_librepository.mk
deleted file mode 100644
index ec5f837..0000000
--- a/jfreereport/Package_jfreereport_librepository.mk
+++ /dev/null
@@ -1,19 +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/.
-#
-
-# for VERSION
-include $(SRCDIR)/jfreereport/version.mk
-
-$(eval $(call gb_Package_Package,jfreereport_librepository,$(call gb_UnpackedTarball_get_dir,jfreereport_librepository)))
-
-$(eval $(call gb_Package_use_external_project,jfreereport_librepository,jfreereport_librepository))
-
-$(eval $(call gb_Package_add_file,jfreereport_librepository,bin/librepository-$(LIBREPOSITORY_VERSION).jar,dist/librepository-$(LIBREPOSITORY_VERSION).jar))
-
-# vim: set noet sw=4 ts=4:
diff --git a/jfreereport/Package_jfreereport_libserializer.mk b/jfreereport/Package_jfreereport_libserializer.mk
deleted file mode 100644
index 3ac26a9..0000000
--- a/jfreereport/Package_jfreereport_libserializer.mk
+++ /dev/null
@@ -1,19 +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/.
-#
-
-# for VERSION
-include $(SRCDIR)/jfreereport/version.mk
-
-$(eval $(call gb_Package_Package,jfreereport_libserializer,$(call gb_UnpackedTarball_get_dir,jfreereport_libserializer)))
-
-$(eval $(call gb_Package_use_external_project,jfreereport_libserializer,jfreereport_libserializer))
-
-$(eval $(call gb_Package_add_file,jfreereport_libserializer,bin/libserializer-$(LIBBASE_VERSION).jar,dist/libserializer-$(LIBBASE_VERSION).jar))
-
-# vim: set noet sw=4 ts=4:
diff --git a/rhino/Package_rhino.mk b/rhino/ExternalPackage_rhino.mk
similarity index 60%
rename from rhino/Package_rhino.mk
rename to rhino/ExternalPackage_rhino.mk
index 075c49c..45ccf14 100644
--- a/rhino/Package_rhino.mk
+++ b/rhino/ExternalPackage_rhino.mk
@@ -7,10 +7,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-$(eval $(call gb_Package_Package,rhino,$(call gb_UnpackedTarball_get_dir,rhino)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,rhino,rhino))
-$(eval $(call gb_Package_use_external_project,rhino,rhino))
+$(eval $(call gb_ExternalPackage_use_external_project,rhino,rhino))
-$(eval $(call gb_Package_add_file,rhino,bin/js.jar,build/rhino1_5R5/js.jar))
+$(eval $(call gb_ExternalPackage_add_jar_for_install,rhino,bin/js.jar,build/rhino1_5R5/js.jar))
# vim: set noet sw=4 ts=4:
diff --git a/rhino/Module_rhino.mk b/rhino/Module_rhino.mk
index 5fccae4..d63ee3f 100644
--- a/rhino/Module_rhino.mk
+++ b/rhino/Module_rhino.mk
@@ -12,8 +12,8 @@ $(eval $(call gb_Module_Module,rhino))
ifneq ($(SOLAR_JAVA),)
ifneq ($(filter RHINO,$(BUILD_TYPE)),)
$(eval $(call gb_Module_add_targets,rhino,\
+ ExternalPackage_rhino \
ExternalProject_rhino \
- Package_rhino \
UnpackedTarball_rhino \
))
endif
commit 617d89384947223e41bf2ed613af247e2bb7db82
Author: David Tardon <dtardon at redhat.com>
Date: Wed May 1 14:32:22 2013 +0200
add spec. handling of jars to ExternalPackage
Change-Id: Ib6561120f1c6f9804e5bf9ca36b6a655f1449d4f
diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk
index 858367d..ab2cd26 100644
--- a/solenv/gbuild/ExternalPackage.mk
+++ b/solenv/gbuild/ExternalPackage.mk
@@ -208,6 +208,18 @@ gb_ExternalPackage_PROJECT_$(1) := $(2)
endef
+# gb_ExternalPackage__add_file_for_install package package-inst dest dest-inst src
+define gb_ExternalPackage__add_file_for_install
+$(call gb_ExternalPackage_add_file,$(1),$(3),$(5))
+
+ifneq ($(gb_RUNNABLE_INSTDIR),)
+$(call gb_ExternalPackage_add_file,$(2),$(4),$(5))
+$(call gb_ExternalPackage_get_target,$(1)) : $(call gb_Package_get_target,$(2))
+$(call gb_ExternalPackage_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(2))
+endif
+
+endef
+
# Add a (dynamic) library that is a part of the installation.
#
# This function is very similar to gb_ExternalPackage_add_file, except
@@ -219,13 +231,7 @@ endef
#
# gb_ExternalPackage_add_library_for_install package dest src library?
define gb_ExternalPackage_add_library_for_install
-$(call gb_ExternalPackage_add_file,$(1),$(2),$(3))
-
-ifneq ($(gb_RUNNABLE_INSTDIR),)
-$(call gb_ExternalPackage_add_file,$(call gb_ExternalPackage_get_packagename,$(1)),$(if $(4),$(call gb_Library_get_instdir,$(4)),program)/$(notdir $(2)),$(3))
-$(call gb_ExternalPackage_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_ExternalPackage_get_packagename,$(1)))
-$(call gb_ExternalPackage_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_ExternalPackage_get_packagename,$(1)))
-endif
+$(call gb_ExternalPackage__add_file_for_install,$(1),$(call gb_ExternalPackage_get_packagename,$(1)),$(2),$(if $(4),$(call gb_Library_get_instdir,$(4)),program)/$(notdir $(2)),$(3))
endef
@@ -237,4 +243,24 @@ $(foreach file,$(3),$(call gb_ExternalPackage_add_library_for_install,$(1),$(2)/
endef
+# Add a jar that is a part of the installation.
+#
+# This function works just like to gb_ExternalPackage_add_file, except
+# that it also allows to deliver the jar to its proper place in
+# $(INSTDIR).
+#
+# gb_ExternalPackage_add_jar_for_install package dest src
+define gb_ExternalPackage_add_jar_for_install
+$(call gb_ExternalPackage__add_file_for_install,$(1),$(call gb_ExternalPackage_get_packagename,$(1)),$(2),program/classes/$(notdir $(2)),$(3))
+
+endef
+
+# Add several jars for install at once.
+#
+# gb_ExternalPackage_add_jars_for_install package destdir file(s)
+define gb_ExternalPackage_add_jars_for_install
+$(foreach file,$(3),$(call gb_ExternalPackage_add_jar_for_install,$(1),$(2)/$(notdir $(file)),$(file)))
+
+endef
+
# vim: set noet sw=4 ts=4:
commit df0a34ada954b0486611ca7bafd90fc6e2bc5d04
Author: David Tardon <dtardon at redhat.com>
Date: Wed May 1 14:16:46 2013 +0200
let gbuild pick gb_RUNNABLE_INSTDIR from env.
Change-Id: I0cf96aa137a33662c5713886dd6b2649e4dd01bc
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index c71cb40..50bba72 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -275,7 +275,9 @@ gb_GLOBALDEFS += \
gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
+ifeq ($(origin gb_RUNNABLE_INSTDIR),undefined)
gb_RUNNABLE_INSTDIR :=
+endif
include $(GBUILDDIR)/Deliver.mk
commit 7527ca6b79d710d2ec05121fb78e92d69618e3a3
Author: David Tardon <dtardon at redhat.com>
Date: Wed May 1 13:39:03 2013 +0200
copy jars into instdir
Change-Id: I52d69be6b3b4208c90fd8e3ed4271f48fdc1ed47
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 12b9d16..cdc6813 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -31,6 +31,10 @@
gb_Jar_JAVACOMMAND := $(JAVAINTERPRETER)
gb_Jar_JARCOMMAND := jar
+gb_Jar_LAYER_DIRS := \
+ OOO:program/classes \
+ URE:ure/share/java
+
# location of files going to be packed into .jar file
define gb_Jar_get_workdir
$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,$(1)))
@@ -41,6 +45,12 @@ define gb_Jar_get_manifest_target
$(call gb_Jar_get_workdir,$(1))/META-INF/MANIFEST.MF
endef
+gb_Jar_get_packagename = Jar/$(1)
+
+gb_Jar__get_layer = $(strip $(foreach group,$(gb_Jar_VALIDGROUPS),$(if $(filter $(1),$(gb_Jar_$(group))),$(group))))
+gb_Jar__get_dir_for_layer = $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Jar_LAYER_DIRS)))
+gb_Jar__get_instdir = $(call gb_Jar__get_dir_for_layer,$(call gb_Jar__get_layer,$(1)))
+
# creates classset and META-INF folders if they don't exist
# adds manifest version, class path, solarversion and content from sources to manifest file
# creates the target folder of the jar file if it doesn't exist
@@ -102,6 +112,24 @@ $(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call g
$(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Jar_get_target,$(1))
$(call gb_Jar_get_outdir_target,$(1)) :| $(dir $(call gb_Jar_get_outdir_target,$(1))).dir
+ifneq ($(gb_RUNNABLE_INSTDIR),)
+$(if $(filter-out OXT,$(call gb_Jar__get_layer,$(1))),\
+ $(call gb_Jar__Jar_package,$(1),$(call gb_Jar_get_packagename,$(1)),$(notdir $(call gb_Jar_get_target,$(1)))) \
+)
+endif
+
+endef
+
+# gb_Jar__Jar_package jar package filename
+define gb_Jar__Jar_package
+$(call gb_Package_Package_internal,$(2),$(WORKDIR)/Jar)
+$(call gb_Package_set_outdir,$(2),$(INSTDIR))
+$(call gb_Package_add_file,$(2),$(call gb_Jar__get_instdir,$(1))/$(3),$(3))
+
+$(call gb_Package_get_target,$(2)) : $(call gb_Jar_get_target,$(1))
+$(call gb_Jar_get_outdir_target,$(1)) : $(call gb_Package_get_target,$(2))
+$(call gb_Jar_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(2))
+
endef
# source files are forwarded to the ClassSet
commit 491dea0a1fd16547a61d6045a8bfaa83e58aa93d
Author: David Tardon <dtardon at redhat.com>
Date: Wed May 1 11:23:50 2013 +0200
use gb_ExternalPackage_add_runtime_library for adding libs
Change-Id: I7be80bbef306db8f7ad585e95bfa4b6da0b30067
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 322e914..819e171 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -927,6 +927,8 @@ endef
ifneq ($(OS),ANDROID)
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ raptor2 \
+ rasqal \
rdf \
))
diff --git a/cairo/ExternalPackage_cairo.mk b/cairo/ExternalPackage_cairo.mk
index e61cbb1..9be4caa 100644
--- a/cairo/ExternalPackage_cairo.mk
+++ b/cairo/ExternalPackage_cairo.mk
@@ -12,6 +12,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,cairo,cairo))
$(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo))
$(eval $(call gb_ExternalPackage_add_file,cairo,lib/libcairo.so,src/.libs/libcairo.so.2.11000.2))
-$(eval $(call gb_ExternalPackage_add_file,cairo,lib/libcairo.so.2,src/.libs/libcairo.so.2.11000.2))
+$(eval $(call gb_ExternalPackage_add_library_for_install,cairo,lib/libcairo.so.2,src/.libs/libcairo.so.2.11000.2))
# vim: set noet sw=4 ts=4:
diff --git a/cairo/ExternalPackage_pixman.mk b/cairo/ExternalPackage_pixman.mk
index f7816fd..3ce67f5 100644
--- a/cairo/ExternalPackage_pixman.mk
+++ b/cairo/ExternalPackage_pixman.mk
@@ -12,6 +12,6 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,pixman,pixman))
$(eval $(call gb_ExternalPackage_use_external_project,pixman,pixman))
$(eval $(call gb_ExternalPackage_add_file,pixman,lib/libpixman-1.so,pixman/.libs/libpixman-1.so.0.24.4))
-$(eval $(call gb_ExternalPackage_add_file,pixman,lib/libpixman-1.so.0,pixman/.libs/libpixman-1.so.0.24.4))
+$(eval $(call gb_ExternalPackage_add_library_for_install,pixman,lib/libpixman-1.so.0,pixman/.libs/libpixman-1.so.0.24.4))
# vim: set noet sw=4 ts=4:
diff --git a/curl/ExternalPackage_curl.mk b/curl/ExternalPackage_curl.mk
index f7881ea..5f55260 100644
--- a/curl/ExternalPackage_curl.mk
+++ b/curl/ExternalPackage_curl.mk
@@ -22,21 +22,23 @@ $(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.a,lib/.libs/libcurl.a
else ifeq ($(OS),ANDROID)
$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so))
else ifeq ($(OS),AIX)
-$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so.4))
+$(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so,lib/.libs/libcurl.so.4))
else
-$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so,lib/.libs/libcurl.so.4.2.0))
+# TODO: Do we really want the unversioned library in the installation?
+# And if that's true, why do we need to deliver the versioned one at all?
+$(eval $(call gb_ExternalPackage_add_library_for_install,curl,lib/libcurl.so,lib/.libs/libcurl.so.4.2.0))
$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.so.4,lib/.libs/libcurl.so.4.2.0))
endif
else ifeq ($(OS)$(COM),WNTGCC)
$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.a,lib/.libs/libcurl.a))
-$(eval $(call gb_ExternalPackage_add_file,curl,bin/libcurl.dll,lib/.libs/libcurl.dll))
+$(eval $(call gb_ExternalPackage_add_library_for_install,curl,bin/libcurl.dll,lib/.libs/libcurl.dll))
else ifeq ($(COM),MSC)
$(eval $(call gb_ExternalPackage_add_file,curl,lib/libcurl.lib,lib/libcurl.lib))
-$(eval $(call gb_ExternalPackage_add_file,curl,bin/libcurl.dll,lib/libcurl.dll))
+$(eval $(call gb_ExternalPackage_add_library_for_install,curl,bin/libcurl.dll,lib/libcurl.dll))
endif
diff --git a/icu/ExternalPackage_icu.mk b/icu/ExternalPackage_icu.mk
index 169e81c..11ba2eb 100644
--- a/icu/ExternalPackage_icu.mk
+++ b/icu/ExternalPackage_icu.mk
@@ -20,12 +20,14 @@ $(eval $(call gb_ExternalPackage_add_file,icu,lib/libicuuc.dll.a,source/lib/icuu
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicui18n.dll.a,source/lib/icuin.lib))
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicule.dll.a,source/lib/icule.lib))
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu.dll.a,source/lib/icutu.lib))
-$(eval $(call gb_ExternalPackage_add_files,icu,bin,\
+$(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\
source/lib/icudt$(ICU_MAJOR).dll \
source/lib/icuuc$(ICU_MAJOR).dll \
source/lib/icuin$(ICU_MAJOR).dll \
source/lib/icule$(ICU_MAJOR).dll \
source/lib/icutu$(ICU_MAJOR).dll \
+))
+$(eval $(call gb_ExternalPackage_add_files,icu,bin,\
source/bin/genccode.exe \
source/bin/genbrk.exe \
source/bin/gencmn.exe \
@@ -39,12 +41,14 @@ $(eval $(call gb_ExternalPackage_add_files,icu,lib,\
source/lib/icule$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib \
source/lib/icutu$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib\
))
-$(eval $(call gb_ExternalPackage_add_files,icu,bin,\
+$(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\
source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \
source/lib/icuuc$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \
source/lib/icuin$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \
source/lib/icule$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \
source/lib/icutu$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \
+))
+$(eval $(call gb_ExternalPackage_add_files,icu,bin,\
source/bin/genccode.exe \
source/bin/genbrk.exe \
source/bin/gencmn.exe \
@@ -60,7 +64,7 @@ $(eval $(call gb_ExternalPackage_add_files,icu,lib,\
source/lib/libicutu.a \
))
else ifeq ($(OS),ANDROID)
-$(eval $(call gb_ExternalPackage_add_files,icu,lib,\
+$(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,lib,\
source/lib/libicudatalo.so \
source/lib/libicuuclo.so \
source/lib/libicui18nlo.so \
@@ -68,17 +72,17 @@ $(eval $(call gb_ExternalPackage_add_files,icu,lib,\
source/lib/libicutulo.so \
))
else
-$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION),source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION)))
-$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION)))
+$(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION),source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION)))
+$(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicudata$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicudata$(gb_Library_DLLEXT),source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION)))
-$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION),source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION)))
-$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION)))
+$(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION),source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION)))
+$(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicuuc$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicuuc$(gb_Library_DLLEXT),source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION)))
-$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION),source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION)))
-$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION)))
+$(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION),source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION)))
+$(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicui18n$(gb_Library_DLLEXT),source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION)))
-$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicule$(gb_Library_DLLEXT).$(icu_VERSION),source/lib/libicule$(gb_Library_DLLEXT).$(icu_VERSION)))
-$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicule$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicule$(gb_Library_DLLEXT).$(icu_VERSION)))
+$(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicule$(gb_Library_DLLEXT).$(icu_VERSION),source/lib/libicule$(gb_Library_DLLEXT).$(icu_VERSION)))
+$(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicule$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicule$(gb_Library_DLLEXT).$(icu_VERSION)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicule$(gb_Library_DLLEXT),source/lib/libicule$(gb_Library_DLLEXT).$(icu_VERSION)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION),source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION)))
$(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION)))
diff --git a/lcms2/ExternalPackage_lcms2.mk b/lcms2/ExternalPackage_lcms2.mk
index 08a5b7b..790c590 100644
--- a/lcms2/ExternalPackage_lcms2.mk
+++ b/lcms2/ExternalPackage_lcms2.mk
@@ -12,22 +12,23 @@ $(eval $(call gb_ExternalPackage_use_external_project,lcms2,lcms2))
ifeq ($(OS),MACOSX)
$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.dylib,src/.libs/liblcms2.dylib))
-$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.2.dylib,src/.libs/liblcms2.2.dylib))
+$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.2.dylib,src/.libs/liblcms2.2.dylib))
else ifeq ($(filter-out IOS ANDROID,$(OS)),)
$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.a,src/.libs/liblcms2.a))
else ifeq ($(OS),WNT)
ifeq ($(COM),GCC)
$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.dll.a,src/.libs/liblcms2.dll.a))
-$(eval $(call gb_ExternalPackage_add_file,lcms2,bin/liblcms2-2.dll,src/.libs/liblcms2-2.dll))
+$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,bin/liblcms2-2.dll,src/.libs/liblcms2-2.dll))
else ifeq ($(COM),MSC)
$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).lib,bin/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),$(if $(filter-out 13 14,$(COMEX)),d)).lib))
# note: the lcms2d.lib references LCMS2.DLL (without D!) but the dll is
# actually called LCMS2D.DLL then
-$(eval $(call gb_ExternalPackage_add_file,lcms2,bin/lcms2.dll,bin/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll))
+$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,bin/lcms2.dll,bin/lcms2$(if $(MSVC_USE_DEBUG_RUNTIME),d).dll))
endif
else
$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so,src/.libs/liblcms2.so))
-$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so.2,src/.libs/liblcms2.so.2))
-$(eval $(call gb_ExternalPackage_add_file,lcms2,lib/liblcms2.so.2.0.4,src/.libs/liblcms2.so.2.0.4))
+# NOTE: this is a symlink
+$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so.2,src/.libs/liblcms2.so.2))
+$(eval $(call gb_ExternalPackage_add_library_for_install,lcms2,lib/liblcms2.so.2.0.4,src/.libs/liblcms2.so.2.0.4))
endif
# vim: set noet sw=4 ts=4:
diff --git a/libxml2/ExternalPackage_xml2.mk b/libxml2/ExternalPackage_xml2.mk
index e6a048e..c3d9a1b 100644
--- a/libxml2/ExternalPackage_xml2.mk
+++ b/libxml2/ExternalPackage_xml2.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_ExternalPackage_add_file,xml2,bin/xml2-config,xml2-config))
endif
ifeq ($(OS),MACOSX)
-$(eval $(call gb_ExternalPackage_add_file,xml2,lib/libxml2.2.dylib,.libs/libxml2.2.7.6.dylib))
+$(eval $(call gb_ExternalPackage_add_library_for_install,xml2,lib/libxml2.2.dylib,.libs/libxml2.2.7.6.dylib,xml2))
$(eval $(call gb_ExternalPackage_add_file,xml2,lib/libxml2.dylib,.libs/libxml2.2.7.6.dylib))
$(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint,.libs/xmllint))
else ifeq ($(DISABLE_DYNLOADING),TRUE)
@@ -27,16 +27,16 @@ endif
else ifeq ($(OS),WNT)
ifeq ($(COM),GCC)
$(eval $(call gb_ExternalPackage_add_file,xml2,lib/libxml2.dll.a,.libs/libxml2.dll.a))
-$(eval $(call gb_ExternalPackage_add_file,xml2,bin/libxml2.dll,.libs/libxml2.dll))
+$(eval $(call gb_ExternalPackage_add_library_for_install,xml2,bin/libxml2.dll,.libs/libxml2.dll,xml2))
$(eval $(call gb_ExternalPackage_add_file,xml2,bin/xmllint.exe,.libs/xmllint.exe))
else # COM=MSC
$(eval $(call gb_ExternalPackage_add_file,xml2,lib/libxml2.lib,win32/bin.msvc/libxml2.lib))
-$(eval $(call gb_ExternalPackage_add_file,xml2,bin/libxml2.dll,win32/bin.msvc/libxml2.dll))
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list