instsetoo_native: convert to gbuild

Removes:
 * instsetoo_native/util/update.xml
      - gen_update_info.pl can be removed ?

      On Windows the binary artifacts are created now in:
      workdir/*/installation/LibreOffice_Dev/native/install/en-US/*.msi

Change-Id: I1c82ea9cb9d297cdd0e4f4b9b44606259eeeed49
Reviewed-on: https://gerrit.libreoffice.org/2242Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: David Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: David Ostrovsky <David.Ostrovsky@gmx.de>

Makefile.in

@@ -67,7 +67,7 @@ $(WORKDIR)/modules.mk: $(wildcard */Module_*.mk) $(wildcard */prj/dmake) $(BUILD
 	echo "gbuild_modules:= tail_build \\" > $@
 	for m in */Module_*.mk; do echo $$m | sed -e 's/\/.*$$/ \\/'; done >> $@
 	echo >> $@
-	echo -n "dmake_modules:= helpcontent2 instsetoo_native" >> $@
+	echo -n "dmake_modules:= helpcontent2" >> $@
 	echo >> $@
 
 -include $(WORKDIR)/modules.mk
@@ -257,7 +257,7 @@ $(WORKDIR)/bootstrap:
 #
 # Build
 #
-build-postprocess: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
+build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
 ifeq ($(DISABLE_SCRIPTING),TRUE)
 # We must get the headers from vbahelper "delivered" because
 # as we don't link to any libs from there they won't otherwise be, or
@@ -270,16 +270,9 @@ ifeq ($(DISABLE_DBCONNECTIVITY),TRUE)
 # Ditto for dbconnectivity in the --disable-database-connectivity case
 	$(GNUMAKE) connectivity
 endif
-	cd $(SRC_ROOT)/postprocess && unset MAKEFLAGS && \
+	cd $(SRCDIR)/postprocess && unset MAKEFLAGS && \
 		$(SOLARENV)/bin/build.pl -P$(PARALLELISM) --all -- -P$(PARALLELISM)
-
-build: build-postprocess
-ifeq ($(OS_FOR_BUILD),WNT)
-	cd $(SRC_ROOT)/instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl
-else
-	cd $(SRC_ROOT)/instsetoo_native && unset MAKEFLAGS && \
-        $(SOLARENV)/bin/build.pl -P$(PARALLELISM) -- -P$(PARALLELISM)
-endif
+	cd $(SRCDIR)/instsetoo_native && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
 ifeq ($(OS),ANDROID)
 	cd android && $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS)
 endif
@@ -322,9 +315,7 @@ dev-install: build
 	@rm -rf $(DEVINSTALLDIR)
 	@mkdir $(DEVINSTALLDIR)
 ifeq ($(OS_FOR_BUILD),WNT)
-	cd $(SRC_ROOT)/instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl LIBO_DEV_INSTALL=TRUE
-	unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibreOffice*_archive.zip"
-	mv "$(DEVINSTALLDIR)"/LibreOffice*_archive/* "$(DEVINSTALLDIR)"/opt
+	cd $(SRCDIR)/instsetoo_native && $(GNUMAKE) LIBO_DEV_INSTALL=TRUE $(GMAKE_OPTIONS)
 else
 ifeq ($(DISABLE_LINKOO),TRUE)
 	@ooinstall $(DEVINSTALLDIR)/opt
@@ -413,9 +404,7 @@ install-tb:
 	@rm -rf $(DEVINSTALLDIR)
 	@mkdir $(DEVINSTALLDIR)
 ifeq ($(OS_FOR_BUILD),WNT)
-	cd $(SRC_ROOT)/instsetoo_native && unset MAKEFLAGS && $(SOLARENV)/bin/build.pl LIBO_DEV_INSTALL=TRUE
-	unzip -q -d "$(DEVINSTALLDIR)" "$(SRCDIR)/instsetoo_native/$(INPATH)/LibreOffice/archive/install/en-US/LibreOffice*_archive.zip"
-	mv "$(DEVINSTALLDIR)"/LibreOffice*_archive/* "$(DEVINSTALLDIR)"/opt
+	cd $(SRCDIR)/instsetoo_native && $(GNUMAKE) LIBO_DEV_INSTALL=TRUE $(GMAKE_OPTIONS)
 else
 	@ooinstall $(DEVINSTALLDIR)/opt
 	@install-gdb-printers

instsetoo_native/CustomTarget_install.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/.
+#
+
+instsetoo_ULFLIST := ActionTe \
+	Control \
+	CustomAc \
+	Error \
+	LaunchCo \
+	Property \
+	RadioBut \
+	UIText
+
+$(eval $(call gb_CustomTarget_CustomTarget,instsetoo_native/install))
+
+$(eval $(call gb_CustomTarget_register_targets,instsetoo_native/install,\
+	install.phony \
+	$(if $(filter-out WNT,$(OS)),\
+	bin/find-requires-gnome.sh \
+	bin/find-requires-x11.sh) \
+	$(foreach ulf,$(instsetoo_ULFLIST),win_ulffiles/$(ulf).ulf) \
+))
+
+$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: \
+	$(SOLARENV)/bin/make_installer.pl \
+	$(foreach ulf,$(instsetoo_ULFLIST),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf)
+
+$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/bin/find-requires-%.sh: $(SRCDIR)/instsetoo_native/inc_openoffice/unix/find-requires-%.sh
+	cat $< | tr -d "\015" > $@
+	chmod a+x $@
+
+ifneq ($(WITH_LANG),)
+$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.mlf: \
+		$(SRCDIR)/instsetoo_native/inc_openoffice/windows/msi_languages/%.ulf | \
+		$(call gb_Executable_get_runtime_dependencies,ulfex)
+	$(call gb_Output_announce,$@,$(true),SUM,1)
+        MERGEINPUT=`$(gb_MKTEMP)` && \
+        echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $@)).po) > $${MERGEINPUT} && \
+        $(call gb_Helper_abbreviate_dirs,\
+        $(call gb_Executable_get_command,ulfex) -p instsetoo_native -i $< -o $@ -m $${MERGEINPUT} -l all ) && \
+        rm -rf $${MERGEINPUT}
+else
+$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/%.ulf: \
+	$(SRCDIR)/instsetoo_native/inc_openoffice/windows/msi_languages/%.ulf
+	cp $< $@
+endif
+
+export ENABLE_DOWNLOADSETS ?= TRUE
+ifeq ($(OS),LINUX)
+export DONT_REMOVE_PACKAGE := TRUE
+endif
+export instsetoo_OUT := $(WORKDIR)/installation
+export LOCAL_OUT := $(instsetoo_OUT)
+export LOCAL_COMMON_OUT := $(instsetoo_OUT)
+
+instsetoo_native_WITH_LANG := en-US $(filter-out en-US,$(gb_WITH_LANG))
+
+ifeq (WNT,$(OS))
+define instsetoo_native_msitemplates
+TEMPLATE_DIR=$(dir $@)msi_templates \
+&& rm -rf $${TEMPLATE_DIR} \
+&& mkdir -p $${TEMPLATE_DIR}/Binary \
+&& $(GNUCOPY) $(SRCDIR)/instsetoo_native/inc_$(1)/windows/msi_templates/*.* $${TEMPLATE_DIR} \
+&& $(GNUCOPY) $(SRCDIR)/instsetoo_native/inc_common/windows/msi_templates/Binary/*.* $${TEMPLATE_DIR}/Binary
+endef
+else
+instsetoo_native_msitemplates :=
+endif
+
+define instsetoo_native_install_command
+$(call instsetoo_native_msitemplates,$(1))
+cd $(dir $@) \
+$(foreach pkgformat,$(5),\
+&& $(PERL) -w $< \
+	-f $(SRCDIR)/instsetoo_native/util/openoffice.lst \
+	-l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \
+	-p LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)$(3) \
+	-u $(instsetoo_OUT) \
+	-buildid $(BUILD) \
+	$(if $(filter WNT,$(OS)), \
+		-msitemplate $(dir $@)msi_templates \
+		-msilanguage $(dir $@)win_ulffiles \
+	) \
+	$(4) \
+	-format $(pkgformat) \
+	$(if $(filter TRUE,$(VERBOSE)),-verbose, \
+		$(if $(findstring s,$(MAKEFLAGS)),-quiet)) \
+)
+endef
+
+$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony:
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
+	rm -rf $(instsetoo_OUT)
+ifeq (TRUE,$(LIBO_DEV_INSTALL))
+	$(call instsetoo_native_install_command,openoffice,en-US,,,archive)
+	unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice/archive/install/en-US/LibreOffice*_archive.zip
+	mv $(DEVINSTALLDIR)/LibreOffice*_archive/* $(DEVINSTALLDIR)/opt
+else # LIBO_DEV_INSTALL
+	$(call instsetoo_native_install_command,openoffice,$(instsetoo_native_WITH_LANG),,,$(PKGFORMAT))
+ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
+	$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,$(PKGFORMAT))
+endif
+ifeq (,$(filter WNT MACOSX,$(OS)))
+	$(call instsetoo_native_install_command,not-used,en-US,_Test,,$(PKGFORMAT))
+endif
+ifeq (HELP,$(filter HELP,$(BUILD_TYPE))$(filter MACOSX,$(OS)))
+	$(foreach lang,$(filter-out $(WITH_POOR_HELP_LOCALIZATIONS),$(instsetoo_native_WITH_LANG)), \
+		$(call instsetoo_native_install_command,ooohelppack,$(lang),,-helppack,$(PKGFORMAT)))
+endif
+ifneq (WNT,$(OS))
+	$(foreach lang,$(instsetoo_native_WITH_LANG),\
+		$(call instsetoo_native_install_command,ooolangpack,$(lang),,-languagepack,$(PKGFORMAT)))
+endif
+endif # LIBO_DEV_INSTALL
+
+# vim: set noet sw=4 ts=4:

instsetoo_native/Makefile

+# -*- 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/.
+#
+
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
+
+include $(module_directory)/../solenv/gbuild/partial_build.mk
+
+# vim: set noet sw=4 ts=4:

instsetoo_native/Module_instsetoo_native.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_Module_Module,instsetoo_native))
+
+ifneq (,$(filter WNT,$(OS))$(filter-out NO,$(EPM)))
+
+$(eval $(call gb_Module_add_targets,instsetoo_native,\
+	CustomTarget_install \
+))
+
+endif
+
+# vim: set noet sw=4 ts=4:

instsetoo_native/README

@@ -3,6 +3,6 @@ native install-set creation
 This is where you will find your natively packaged builds after the
 build has completed. On windows these would live in:
 
-instsetoo_native/wntmsci12.pro/LibreOffice_Dev/native/install/en-US/*.msi
+workdir/*/installation/LibreOffice_Dev/native/install/en-US/*.msi
 
-for example (nothing like a few long directory names before breakfast).
\ No newline at end of file
+for example (nothing like a few long directory names before breakfast).

instsetoo_native/inc_openoffice/unix/makefile.mk

-#
-# 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 .
-#
-
-PRJ=..$/..
-
-PRJNAME=instsetoo_native
-TARGET=find-requires
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-FINDREQUIRES = \
-    $(BIN)$/find-requires-gnome.sh \
-    $(BIN)$/find-requires-x11.sh
-    
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
-.IF "$(RPM)" != ""
-
-ALLTAR : $(FINDREQUIRES)
-
-$(FINDREQUIRES) : $$(@:f)
-    @cat $(@:f) | tr -d "\015" > $@
-    @chmod a+x $@
-
-.ENDIF

instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk

-#
-# 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 .
-#
-
-PRJ=..$/..$/..
-
-PRJNAME=instsetoo_native
-TARGET=win_ulffiles
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# ------------------------------------------------------------------
-
-ULFFILES = \
-    ActionTe.ulf \
-    Control.ulf  \
-    CustomAc.ulf \
-    Error.ulf    \
-    LaunchCo.ulf \
-    Property.ulf \
-    RadioBut.ulf \
-    UIText.ulf 
-    
-MLFFILES = $(foreach,i,$(ULFFILES) $(MISC)$/$(TARGET)$/$(i:b).mlf)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(OS)"=="WNT"
-
-ALLTAR : $(MLFFILES)
-
-.ENDIF

instsetoo_native/prj/build.lst

-oon	instsetoo_native	::	postprocess NULL
-oon	instsetoo_native						usr1	-	all	oon_mkout NULL
-oon	instsetoo_native\inc_openoffice\unix	nmake	-	u	oon_unix NULL
-oon	instsetoo_native\inc_openoffice\windows\msi_languages	nmake	-	all	oon_msilang NULL
-oon	instsetoo_native\util					nmake	-	all	oon_util oon_msilang oon_unix.u NULL

instsetoo_native/prj/d.lst

-mkdir: %_DEST%\pus
-..\%COMMON_OUTDIR%\bin\hid\userfeedback_VCL_names.csv %COMMON_DEST%\bin\userfeedback_VCL_names.csv
-..\%__SRC%\misc\*.update.xml %_DEST%\pus\*.update.xml

instsetoo_native/util/update.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * 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 .
--->
-<inst:description xmlns:inst="http://installation.openoffice.org/description">
-  <inst:id></inst:id>
-  <inst:name></inst:name>
-  <inst:version></inst:version>
-  <inst:buildid></inst:buildid>
-  <inst:os></inst:os>
-  <inst:arch></inst:arch>
-  <inst:update type="text/html" src="http://update.libreoffice.org/ooo/snapshot.html" />
-</inst:description>

scp2/source/python/file_python.scp

@@ -68,21 +68,21 @@ End
 File gid_File_Py_Unohelper
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
-    Name = "unohelper.py";
+    Name = "pyuno/unohelper.py";
     Styles = (PACKED);
 End
 
 File gid_File_Py_Uno
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
-    Name = "uno.py";
+    Name = "pyuno/uno.py";
     Styles = (PACKED);
 End
 
 File gid_File_Py_Pythonloader
     TXT_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
-    Name = "pythonloader.py";
+    Name = "pyuno/pythonloader.py";
     Styles = (PACKED);
 End
 

solenv/bin/modules/installer/control.pm

@@ -327,7 +327,6 @@ sub check_logfile
 
         my $compareline = $line;
         $compareline =~ s/Error\.idt//g;    # removing all occurrences of "Error.idt"
-        $compareline =~ s/Error\.mlf//g;    # removing all occurrences of "Error.mlf"
         $compareline =~ s/Error\.ulf//g;    # removing all occurrences of "Error.ulf"
         $compareline =~ s/Error\.idl//g;    # removing all occurrences of "Error.idl"
         $compareline =~ s/Error\.html//g;   # removing all occurrences of "Error.html"

solenv/bin/modules/installer/windows/idtglobal.pm

@@ -606,7 +606,7 @@ sub get_languagefilename
 {
     my ($idtfilename, $basedir) = @_;
 
-    $idtfilename =~ s/\.idt/\.mlf/;
+    $idtfilename =~ s/\.idt/\.ulf/;
 
     my $languagefilename = $basedir . $installer::globals::separator . $idtfilename;