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).

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/makefile.mk

-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..
-PRJNAME=instsetoo_native
-TARGET=util
-
-.INCLUDE:  settings.mk
-
-# PERL:=@echo
-
-# watch for the path delimiter
-.IF "$(OS)"=="WNT"
-PYTHONPATH:=$(PWD)$/$(BIN);$(SOLARLIBDIR);$(SOLARLIBDIR)$/python;$(SOLARLIBDIR)$/python$/lib-dynload
-.ELSE			# "$(OS)"=="WNT"
-PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$/python$/lib-dynload
-.ENDIF			# "$(OS)"=="WNT"
-.EXPORT: PYTHONPATH
-
-ENABLE_DOWNLOADSETS*=TRUE
-
-.EXPORT: ENABLE_DOWNLOADSETS
-.EXPORT: LAST_MINOR
-.EXPORT: PRJ
-.EXPORT: PRJNAME
-
-.IF "$(OS)"=="LINUX"
-DONT_REMOVE_PACKAGE:=TRUE
-.EXPORT: DONT_REMOVE_PACKAGE
-.ENDIF          # "$(OS)"=="LINUX"
-
-.INCLUDE .IGNORE: $(SRC_ROOT)$/cwsname.mk
-
-SHARED_COM_SDK_PATH*:=.
-
-INSTALLDIR=$(OUT)
-
-.INCLUDE: target.mk
-
-.IF "$(DISABLE_PYTHON)" != "TRUE"
-LOCALPYFILES= \
-    $(BIN)$/uno.py \
-    $(BIN)$/unohelper.py \
-    $(BIN)$/pythonloader.py
-.ENDIF
-
-# We can be pretty sure that the "HELP" in BUILD_TYPE, if it is there,
-# is surrounded by spaces. We can't look for just "HELP" here because
-# then DBGHELP would match...
-.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ HELP //)"
-OOOHELPPACK=
-OOODEVHELPPACK=
-.ELSE
-OOOHELPPACK=ooohelppack
-OOODEVHELPPACK=ooodevhelppack
-.ENDIF
-
-help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2" 2>/dev/null | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US qtz
-
-# do not build KeyID pseudolanguage (qtz) for release builds
-.IF "$(ENABLE_RELEASE_BUILD)"=="TRUE"
-alllangiso:=$(alllangiso:s/qtz //)
-.ENDIF
-
-allhelplangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(help_exist) $(eq,$i,$j  $i $(NULL))))
-
-xxxx:
-    echo $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml
-
-.IF "$(LIBO_DEV_INSTALL)" == "TRUE"
-ALLTAR: openoffice_$(defaultlangiso).archive
-.ELSE
-.IF "$(OS)"!="WNT" && "$(EPM)"=="NO"
-ALLTAR  : $(LOCALPYFILES)
-    @echo "No EPM: do no packaging at this stage"
-.ELSE			# "$(OS)"!="WNT" && "$(EPM)"=="NO"
-.IF "$(ENABLE_RELEASE_BUILD)"=="TRUE"
-.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
-.IF "$(OS)"=="WNT"
-ALLTAR : openofficeall $(OOOHELPPACK)
-.ELSE
-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOOHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lotest_en-US)
-.ENDIF
-.ELSE
-.IF "$(OS)"=="WNT"
-ALLTAR : openofficeall $(OOOHELPPACK) sdkooall
-.ELSE
-ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOOHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lotest_en-US) sdkoo_en-US
-.ENDIF
-.ENDIF
-.ELSE # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
-.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
-.IF "$(OS)"=="WNT"
-ALLTAR : openofficedevall $(OOODEVHELPPACK)
-.ELSE
-ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOODEVHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US)
-.ENDIF
-.ELSE
-.IF "$(OS)"=="WNT"
-ALLTAR : openofficedevall $(OOODEVHELPPACK) sdkoodevall
-.ELSE
-ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) $(OOODEVHELPPACK)) $(eq,$(OS),MACOSX $(NULL) lodevtest_en-US) sdkoodev_en-US
-.ENDIF
-.ENDIF
-.ENDIF # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
-.ENDIF			# "$(OS)"!="WNT" && "$(EPM)"=="NO"
-.ENDIF # "$(LIBO_DEV_INSTALL)" == "TRUE"
-
-.IF "$(MAKETARGETS:e)"!=""
-PKGFORMAT+=$(MAKETARGETS:e:s/.//)
-.ENDIF			# "$(MAKETARGETS:e)"!=""
-
-.IF "$(VERBOSE)"=="TRUE"
-VERBOSESWITCH=-verbose
-.ENDIF
-.IF "$(VERBOSE)"=="FALSE"
-VERBOSESWITCH=-quiet
-.ENDIF
-
-updatepack:
-    $(PERL) -w $(SOLARENV)$/bin$/packager.pl
-
-.IF "$(alllangiso)"!=""
-
-openoffice: $(foreach,i,$(alllangiso) openoffice_$i)
-
-openofficedev: $(foreach,i,$(alllangiso) openofficedev_$i)
-
-ooolanguagepack : $(foreach,i,$(alllangiso) ooolanguagepack_$i)
-
-ooodevlanguagepack: $(foreach,i,$(alllangiso) ooodevlanguagepack_$i)
-
-ooohelppack : $(foreach,i,$(allhelplangiso) ooohelppack_$i)
-
-ooodevhelppack: $(foreach,i,$(allhelplangiso) ooodevhelppack_$i)
-
-sdkoo: $(foreach,i,$(alllangiso) sdkoo_$i)
-
-sdkoodev: $(foreach,i,$(alllangiso) sdkoodev_$i)
-
-lotest: $(foreach,i,$(alllangiso) lotest_$i)
-
-lodevtest: $(foreach,i,$(alllangiso) lodevtest_$i)
-
-oxygenoffice: $(foreach,i,$(alllangiso) oxygenoffice_$i)
-
-oxygenofficelanguagepack : $(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i)
-
-oxygenofficehelppack : $(foreach,i,$(allhelplangiso) oxygenofficehelppack_$i)
-
-MSIOFFICETEMPLATESOURCE=$(PRJ)$/inc_openoffice$/windows$/msi_templates
-MSIHELPPACKTEMPLATESOURCE=$(PRJ)$/inc_ooohelppack$/windows$/msi_templates
-MSISDKOOTEMPLATESOURCE=$(PRJ)$/inc_sdkoo$/windows$/msi_templates
-MSITESTTEMPLATESOURCE=$(PRJ)$/inc_lotest$/windows$/msi_templates
-MSICOMMONTEMPLATESOURCE=$(PRJ)$/inc_common$/windows$/msi_templates
-
-NOLOGOSPLASH:=$(BIN)$/intro.zip
-DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip
-MSIOFFICETEMPLATEDIR=$(MISC)$/openoffice$/msi_templates
-MSIHELPPACKTEMPLATEDIR=$(MISC)$/ooohelppack$/msi_templates
-MSISDKOOTEMPLATEDIR=$(MISC)$/sdkoo$/msi_templates
-MSITESTTEMPLATEDIR=$(MISC)$/lotest$/msi_templates
-
-ADDDEPS=$(NOLOGOSPLASH) $(DEVNOLOGOSPLASH)
-.IF "$(OS)" == "WNT"
-ADDDEPS+=hack_msitemplates
-.ENDIF
-
-$(foreach,i,$(alllangiso) openoffice_$i) : $(ADDDEPS)
-openoffice_$(defaultlangiso).archive : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) openofficedev_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $(ADDDEPS)
-
-$(foreach,i,$(allhelplangiso) ooohelppack_$i) : $(ADDDEPS)
-
-$(foreach,i,$(allhelplangiso) ooodevhelppack_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) sdkoo_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) sdkoodev_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) lotest_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) lodevtest_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) oxygenoffice_$i) : $(ADDDEPS)
-
-$(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) : $(ADDDEPS)
-
-$(foreach,i,$(allhelplangiso) oxygenofficehelppack_$i) : $(ADDDEPS)
-
-.IF "$(MAKETARGETS)"!=""
-$(MAKETARGETS) : $(ADDDEPS)
-.ENDIF			# "$(MAKETARGETS)"!=""
-
-$(foreach,i,$(alllangiso) openoffice_$i) : $$@{$(PKGFORMAT:^".")}
-.IF "$(MAKETARGETS)"!=""
-.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
-$(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
-$(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
-.ENDIF			# "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
-.ENDIF			# "$(MAKETARGETS)"!=""
-openoffice_%{$(PKGFORMAT:^".") .archive} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-    $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-
-$(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
-openofficedev_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-    $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-
-$(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
-ooolanguagepack_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice -u $(OUT) -buildid $(BUILD) -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-$(foreach,i,$(alllangiso) ooodevlanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
-ooodevlanguagepack_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev -u $(OUT) -buildid $(BUILD) -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-$(foreach,i,$(allhelplangiso) ooohelppack_$i) : $$@{$(PKGFORMAT:^".")}
-ooohelppack_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIHELPPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -helppack -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-$(foreach,i,$(allhelplangiso) ooodevhelppack_$i) : $$@{$(PKGFORMAT:^".")}
-ooodevhelppack_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIHELPPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -helppack -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-$(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")}
-sdkoo_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-$(foreach,i,$(alllangiso) sdkoodev_$i) : $$@{$(PKGFORMAT:^".")}
-sdkoodev_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev_SDK -u $(OUT) -buildid $(BUILD) -msitemplate $(MSISDKOOTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-$(foreach,i,$(alllangiso) lotest_$i) : $$@{$(PKGFORMAT:^".")}
-lotest_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Test -u $(OUT) -buildid $(BUILD) -msitemplate $(MSITESTTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-$(foreach,i,$(alllangiso) lodevtest_$i) : $$@{$(PKGFORMAT:^".")}
-lodevtest_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev_Test -u $(OUT) -buildid $(BUILD) -msitemplate $(MSITESTTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-
-$(foreach,i,$(alllangiso) oxygenoffice_$i) : $$@{$(PKGFORMAT:^".")}
-.IF "$(MAKETARGETS)"!=""
-.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
-$(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
-$(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
-.ENDIF			# "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
-.ENDIF			# "$(MAKETARGETS)"!=""
-oxygenoffice_%{$(PKGFORMAT:^".") .archive} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH)
-    $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OxygenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-
-$(foreach,i,$(alllangiso) oxygenofficelanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
-oxygenofficelanguagepack_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-$(foreach,i,$(allhelplangiso) oxygenofficehelppack_$i) : $$@{$(PKGFORMAT:^".")}
-oxygenofficehelppack_%{$(PKGFORMAT:^".")} :
-    $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OxygenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIHELPPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -helppack -format $(@:e:s/.//) $(VERBOSESWITCH)
-
-.ELSE			# "$(alllangiso)"!=""
-openoffice:
-    @echo cannot pack anything...
-
-.ENDIF			# "$(alllangiso)"!=""
-
-.IF "$(DISABLE_PYTHON)" != "TRUE"
-.IF "$(LOCALPYFILES)"!=""
-$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")} lotest_$i{$(PKGFORMAT:^".")} oxygenoffice_$i{$(PKGFORMAT:^".") .archive}) updatepack : $(LOCALPYFILES)
-.ENDIF			# "$(LOCALPYFILES)"!=""
-
-.IF "$(OS)"!="WNT"
-$(BIN)$/%.py : $(OUTDIR)$/lib$/pyuno$/%.py
-    $(COPY) $< $@
-.ELSE
-$(BIN)$/%.py : $(OUTDIR)$/bin$/pyuno$/%.py
-    $(COPY) $< $@
-.ENDIF
-.ENDIF			# "$(DISABLE_PYTHON)" != "TRUE"
-
-$(BIN)$/intro.zip : $(SOLARCOMMONPCKDIR)$/intro.zip
-    $(COPY) $< $@
-
-$(BIN)$/dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/brand_dev$/intro.zip
-    @-$(MKDIR) $(@:d)
-    $(COPY) $< $@
-
-hack_msitemplates .PHONY:
-    -$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)
-    -$(MKDIRHIER) $(MSIHELPPACKTEMPLATEDIR)
-    -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)
-    -$(MKDIRHIER) $(MSITESTTEMPLATEDIR)
-    -$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)$/Binary
-    -$(MKDIRHIER) $(MSIHELPPACKTEMPLATEDIR)$/Binary
-    -$(MKDIRHIER) $(MSISDKOOTEMPLATEDIR)$/Binary
-    -$(MKDIRHIER) $(MSITESTTEMPLATEDIR)$/Binary
-    $(GNUCOPY) -u $(MSIOFFICETEMPLATESOURCE)$/*.* $(MSIOFFICETEMPLATEDIR)
-    $(GNUCOPY) -u $(MSIHELPPACKTEMPLATESOURCE)$/*.* $(MSIHELPPACKTEMPLATEDIR)
-    $(GNUCOPY) -u $(MSISDKOOTEMPLATESOURCE)$/*.* $(MSISDKOOTEMPLATEDIR)
-    $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSIOFFICETEMPLATEDIR)$/Binary
-    $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSIHELPPACKTEMPLATEDIR)$/Binary
-    $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSISDKOOTEMPLATEDIR)$/Binary
-    $(GNUCOPY) -u $(MSICOMMONTEMPLATESOURCE)$/Binary$/*.* $(MSITESTTEMPLATEDIR)$/Binary
-    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
-    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Image.bmp
-    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
-    $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSITESTTEMPLATEDIR)$/Binary$/Image.bmp
-    $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
-    $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSIHELPPACKTEMPLATEDIR)$/Binary$/Banner.bmp
-    $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
-    $(COPY) $(PRJ)$/res$/nologobanner.bmp $(MSITESTTEMPLATEDIR)$/Binary$/Banner.bmp
-
-.IF "$(OS)" == "WNT"
-
-ALLLANGSTRING:=$(alllangiso)
-
-openofficeall: hack_msitemplates $(LOCALPYFILES) openoffice_$(ALLLANGSTRING:s/ /,/)$(PKGFORMAT:^".")
-
-openofficedevall: hack_msitemplates $(LOCALPYFILES) openofficedev_$(ALLLANGSTRING:s/ /,/)$(PKGFORMAT:^".")
-
-sdkooall: hack_msitemplates $(LOCALPYFILES) sdkoo_$(ALLLANGSTRING:s/ /,/)$(PKGFORMAT:^".")
-
-sdkoodevall: hack_msitemplates $(LOCALPYFILES) sdkoodev_$(ALLLANGSTRING:s/ /,/)$(PKGFORMAT:^".")
-
-lotestall: hack_msitemplates $(LOCALPYFILES) lotest_$(ALLLANGSTRING:s/ /,/)$(PKGFORMAT:^".")
-
-lodevtestall: hack_msitemplates $(LOCALPYFILES) lodevtest_$(ALLLANGSTRING:s/ /,/)$(PKGFORMAT:^".")
-
-.ENDIF			# "$(OS)" == "WNT"
-

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;