scp2: move fonts to AutoInstall

Add new PACKAGE_FILELIST_FONT

The DONT_DELETE style has no effect for files.

The FONT_WARN_IF_EXISTS style has no effect.

Change-Id: Id062ada0a680341c01827e457b1166d625afe8cc

7 files changed, 35 insertions, 119 deletions

diff --git a/Repository.mk b/Repository.mk
index de4cded208c5..3e8fccfcdc36 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -799,10 +799,8 @@ $(eval $(call gb_Helper_register_packages, \
 	cli_basetypes_copy \
 	desktop_install \
 	$(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \
-	extras_fonts \
 	extras_wordbook \
 	$(if $(filter MSC,$(COM)),msvc_dlls) \
-	more_fonts_conf \
 	instsetoo_native_setup \
 	$(if $(ENABLE_OOENV),instsetoo_native_ooenv) \
 	odk_headers_generated \
@@ -955,6 +953,25 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
     $(if $(filter OPENCL,$(BUILD_TYPE)),sc_opencl_runtimetest) \
 ))
 
+$(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\
+	extras_fonts \
+	$(call gb_Helper_optional,MORE_FONTS,\
+		fonts_caladea \
+		fonts_carlito \
+		fonts_dejavu \
+		fonts_emojione_color \
+		fonts_gentium \
+		fonts_liberation \
+		fonts_liberation_narrow \
+		fonts_libertineg \
+		fonts_opensans \
+		fonts_ptserif \
+		fonts_sourcecode \
+		fonts_sourcesans \
+		$(if $(filter-out WNT,$(OS)),more_fonts_conf) \
+	) \
+))
+
 $(eval $(call gb_Helper_register_packages_for_install,ooo_images,\
 	postprocess_images \
 	$(call gb_Helper_optional,HELP,helpcontent2_helpimages) \
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index e13d6367f501..bc9731878ee3 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_AutoInstall_add_module,math_brand,,LIBO_EXECUTABLE,,PACKAGE_FIL
 $(eval $(call gb_AutoInstall_add_module,ogltrans,LIBO_LIB_FILE,,,PACKAGE_FILELIST))
 $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,LIBO_EXECUTABLE_COMPONENTCONDITION,,PACKAGE_FILELIST,"ISCHECKFORPRODUCTUPDATES=1"))
 $(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,ooo_fonts,,,,PACKAGE_FILELIST_FONT))
 $(eval $(call gb_AutoInstall_add_module,ooo_images,,,,PACKAGE_FILELIST))
 $(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE))
 $(eval $(call gb_AutoInstall_add_module,python,LIBO_LIB_FILE,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 7242f4c088f7..ce564a51c130 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\
 	brand \
 	libreofficekit \
 	ooo \
+	ooo_fonts \
 	ooo_images \
 	ooobinarytable \
 	pdfimport \
@@ -61,7 +62,6 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
     scp2/source/ooo/directory_ooo \
     scp2/source/ooo/directory_ooo_macosx \
     scp2/source/ooo/file_extra_ooo \
-    scp2/source/ooo/file_font_ooo \
     scp2/source/ooo/file_library_ooo \
     scp2/source/ooo/file_ooo \
     scp2/source/ooo/file_resource_ooo \
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index d55084c8bcdb..fc17096b7f48 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -120,6 +120,17 @@ File id \
     Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED); \
 End
 
+#ifdef WNT
+#define PACKAGE_FILELIST_FONT(id,name) \
+File id \
+    Dir = FILELIST_DIR; \
+    Name = name; \
+    Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED, FONT); \
+End
+#else
+#define PACKAGE_FILELIST_FONT PACKAGE_FILELIST
+#endif // WNT
+
 #define SDK_PACKAGE_FILELIST(id,name) \
 File id \
     Dir = FILELIST_SDK_DIR; \
@@ -199,26 +210,6 @@ End
         Styles  = (PACKED); \
     End
 
-#ifdef UNX
-#define STD_FONT_FILELIST(id,name) \
-    File id \
-        TXT_FILE_BODY; \
-        Dir       = FILELIST_DIR; \
-        Styles    = (FILELIST, PACKED, FONT_WARN_IF_EXISTS); \
-        Name      = name; \
-    End
-#endif
-
-#ifdef WNT
-#define STD_FONT_FILELIST(id,name) \
-    File id \
-        TXT_FILE_BODY; \
-        Dir       = FILELIST_DIR; \
-        Styles   = (FILELIST,PACKED,FONT,DONT_DELETE,FONT_WARN_IF_EXISTS); \
-        Name      = name; \
-    End
-#endif
-
 #define LIBO_JAR_FILE(id,name) \
     File id \
         TXT_FILE_BODY; \
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
deleted file mode 100644
index 6dfe05538c10..000000000000
--- a/scp2/source/ooo/file_font_ooo.scp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-// OpenSymbol
-
-STD_FONT_FILELIST( gid_File_Fnt_Opensymb, "extras_fonts.filelist" )
-
-#ifndef WITHOUT_FONTS
-
-// DejaVu fonts
-STD_FONT_FILELIST(gid_File_Fnt_DejaVu, "fonts_dejavu.filelist")
-
-// Liberation fonts
-STD_FONT_FILELIST(gid_File_Fnt_LibSansNarrow, "fonts_liberation_narrow.filelist")
-STD_FONT_FILELIST(gid_File_Fnt_Liberation, "fonts_liberation.filelist")
-
-// Gentium fonts
-STD_FONT_FILELIST(gid_File_Fnt_Gentium, "fonts_gentium.filelist")
-
-// Linux Libertine G and Linux Biolinum G fonts
-STD_FONT_FILELIST(gid_File_Fnt_LinuxLibertineG, "fonts_libertineg.filelist")
-
-// PT Serif fonts
-STD_FONT_FILELIST(gid_File_Fnt_PtSerif, "fonts_ptserif.filelist")
-
-// Open Sans fonts
-STD_FONT_FILELIST(gid_File_Fnt_OpenSans, "fonts_opensans.filelist")
-
-// Source Sans Pro fonts
-STD_FONT_FILELIST(gid_File_Fnt_SourceSans, "fonts_sourcesans.filelist")
-
-// Source Code Pro fonts
-STD_FONT_FILELIST(gid_File_Fnt_SourceCode, "fonts_sourcecode.filelist")
-
-//Carlito and Caladea fonts
-STD_FONT_FILELIST(gid_File_Fnt_Carlito, "fonts_carlito.filelist")
-STD_FONT_FILELIST(gid_File_Fnt_Caladea, "fonts_caladea.filelist")
-
-// EmojiOne_Color font
-STD_FONT_FILELIST(gid_File_Fnt_EmojiOne_Color, "fonts_emojione_color.filelist")
-
-#endif
-
-// fontconfig updates to allow proper use of local fonts
-
-#ifdef UNX
-#ifndef WITHOUT_FONTS
-File gid_File_FcLocal_Conf
-    Dir = FILELIST_DIR;
-    USER_FILE_BODY;
-    Styles = (FILELIST);
-    Name = "more_fonts_conf.filelist";
-End
-#endif
-#endif
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 48644f36c600..cff32e16930d 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -18,6 +18,7 @@
 
 #include "macros.inc"
 #include "AutoInstall/ooo"
+#include "AutoInstall/ooo_fonts"
 #include "AutoInstall/ooo_images"
 #include "AutoInstall/ooobinarytable"
 
@@ -98,20 +99,7 @@ Module gid_Module_Root_Fonts_OOo_Hidden
 	Sortkey = "2100";
 	Default = YES;
 	Styles = (HIDDEN_ROOT);
-	Files = (gid_File_Fnt_Opensymb,
-	gid_File_Fnt_Caladea,
-	gid_File_Fnt_Carlito,
-	gid_File_Fnt_DejaVu,
-	gid_File_Fnt_Gentium,
-	gid_File_Fnt_LibSansNarrow,
-	gid_File_Fnt_Liberation,
-	gid_File_Fnt_LinuxLibertineG,
-	gid_File_Fnt_PtSerif,
-	gid_File_Fnt_OpenSans,
-	gid_File_Fnt_SourceSans,
-	gid_File_Fnt_SourceCode,
-    gid_File_Fnt_EmojiOne_Color,
-	gid_File_FcLocal_Conf);
+	Files = (auto_ooo_fonts_ALL);
 End
 #endif
 
diff --git a/solenv/gbuild/gen-autoinstall.py b/solenv/gbuild/gen-autoinstall.py
index e47b762bba93..117cbd2b5f02 100644
--- a/solenv/gbuild/gen-autoinstall.py
+++ b/solenv/gbuild/gen-autoinstall.py
@@ -91,7 +91,7 @@ for (gid, jarfile) in autojars:
         raise Exception("invalid scp2jartemplate \"" + scp2jartemplate + "\"")
     print(scp2jartemplate + "(" + gid + "," + jarfile + scp2componentcondition + ")")
 
-scp2pkgtemplates = { "PACKAGE_FILELIST", "SDK_PACKAGE_FILELIST" }
+scp2pkgtemplates = { "PACKAGE_FILELIST", "PACKAGE_FILELIST_FONT", "SDK_PACKAGE_FILELIST" }
 for (gid, pkgfilelist) in autopkgs:
     if not(scp2pkgtemplate in scp2pkgtemplates):
         raise Exception("invalid scp2pkgtemplate \"" + scp2pkgtemplate + "\"")