final solution of the ARCHIVE question

Change-Id: I70da65e08c75cd732000597a09ed113b3075c5a8

pyuno/GeneratedPackage_python-core.mk

+# -*- 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_GeneratedPackage_GeneratedPackage,python-core,$(MINGW_SYSROOT)/lib))
+
+# NOTE: The original code excluded *.pyc, *.py~, *.orig and *_failed . I
+# assume it was just a size optimization. If their presence actually
+# causes a problem, an extension of GeneratedPackage is is left as an
+# excercise for the poor misguided person who wants to cross-compile
+# with mingw and system python and actually use the results for
+# something.
+$(eval $(call gb_GeneratedPackage_add_dir,python-core,$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib,python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)))
+
+# vim: set noet sw=4 ts=4:

pyuno/Module_pyuno.mk

@@ -32,7 +32,7 @@ endif
 # that why it makes sense to handle the next 3 targets
 # with SYSTEM_PYTHON=TRUE and SYSTEM_PYTHON=
 
-# zipcore: pyuno/python.exe on Windows
+# python-core: pyuno/python.exe on Windows
 ifeq ($(OS),WNT)
 $(eval $(call gb_Module_add_targets,pyuno,\
     Executable_python \
@@ -41,7 +41,7 @@ endif
 
 ifeq ($(SYSTEM_PYTHON),)
 
-# zipcore: python.sh on Unix
+# python-core: python.sh on Unix
 ifneq ($(OS),WNT)
 $(eval $(call gb_Module_add_targets,pyuno,\
     CustomTarget_python_shell \
@@ -55,8 +55,7 @@ else # SYSTEM_PYTHON
 # FIXME remove this
 ifeq ($(OS)$(COM),WNTGCC)
 $(eval $(call gb_Module_add_targets,pyuno,\
-    CustomTarget_zipcore \
-    Package_zipcore \
+    GeneratedPackage_python-core \
 ))
 endif
 

scp2/source/python/file_python.scp

@@ -81,9 +81,9 @@ End
 
 File gid_File_Py_Python_Core
     TXT_FILE_BODY;
-    Dir = gid_Dir_Py_PythonCore_Lib;
-    Name = STRING(CONCAT3(python-core-,PYVERSION,.zip));
-    Styles = (ARCHIVE);
+    Dir = FILELIST_DIR;
+    Name = "python-core.filelist";
+    Styles = (FILELIST);
 End
 
 Directory gid_Dir_Py_PythonCore_Bin

solenv/bin/modules/installer.pm

@@ -24,7 +24,6 @@ use Cwd;
 use Data::Dumper;
 use File::Copy;
 use List::Util qw(shuffle);
-use installer::archivefiles;
 use installer::control;
 use installer::converter;
 use installer::copyproject;
@@ -604,16 +603,6 @@ sub run {
 
         installer::scriptitems::make_filename_language_specific($filesinproductlanguageresolvedarrayref);
 
-        ######################################################################################
-        # Unzipping files with flag ARCHIVE and putting all included files into the file list
-        ######################################################################################
-
-        installer::logger::print_message( "... analyzing files with flag ARCHIVE ...\n" );
-
-        my @additional_paths_from_zipfiles = ();
-
-        $filesinproductlanguageresolvedarrayref = installer::archivefiles::resolving_archive_flag($filesinproductlanguageresolvedarrayref, \@additional_paths_from_zipfiles, $languagestringref, $loggingdir);
-
         ######################################################################################
         # Processing files with flag FILELIST and putting listed files into the file list
         ######################################################################################