Kaydet (Commit) 9c40b2d6 authored tarafından Michael Stahl's avatar Michael Stahl

sysui: remove Package_desktop

... put the CustomTarget dir on the search path instead.

Change-Id: I2888e10bfa58d3c5b0f39958328efb14c3ce92a9
üst 9aa6fbb5
......@@ -78,7 +78,7 @@ LibreOffice
downloadname LibreOffice_{productversion}_{os}_install_{languages}
langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages}
include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir}
include {solarpath}/bin.{minor}/osl,{customtargetpath}/sysui/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir}
}
}
......@@ -131,7 +131,7 @@ LibreOffice_Dev
downloadname LibreOfficeDev_{productversion}_{os}_install_{languages}
langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages}
helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages}
include {solarpath}/bin.{minor}/osl,{solarpath}/bin.{minor}/desktop-integration/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir}
include {solarpath}/bin.{minor}/osl,{customtargetpath}/sysui/{pkgtype},{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir}
}
}
......
......@@ -64,6 +64,9 @@ sub create_pathvariables
my $extensionsdir = $environment->{'WORKDIR'} . $installer::globals::separator . "Extension";
$variables{'extensionsdir'} = $extensionsdir;
my $customtargetpath = $environment->{'WORKDIR'} . $installer::globals::separator . "CustomTarget";
$variables{'customtargetpath'} = $customtargetpath;
my $filelistpath = $environment->{'WORKDIR'};
$variables{'filelistpath'} = $filelistpath;
......
......@@ -14,7 +14,6 @@ ifneq ($(OS),MACOSX)
$(eval $(call gb_Module_add_targets,sysui,\
CustomTarget_share \
Package_share \
Package_desktop \
$(if $(filter rpm,$(PKGFORMAT)),CustomTarget_rpm) \
$(if $(filter deb,$(PKGFORMAT)),CustomTarget_deb) \
$(if $(filter SOLARIS,$(OS)),CustomTarget_solaris) \
......
# -*- 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/.
#
include $(SRCDIR)/sysui/productlist.mk
$(eval $(call gb_Package_Package,desktop,$(WORKDIR)/CustomTarget))
$(eval $(call gb_Package_set_outdir,desktop,$(OUTDIR)))
ifneq ($(filter deb,$(PKGFORMAT)),)
$(eval $(call gb_Package_add_files,desktop,bin/desktop-integration/deb,\
$(foreach product,$(PRODUCTLIST),\
sysui/deb/$(product)-desktop-integration.tar.gz) \
))
endif
ifneq ($(filter rpm,$(PKGFORMAT)),)
$(eval $(call gb_Package_add_files,desktop,bin/desktop-integration/rpm,\
$(foreach product,$(PRODUCTLIST),\
sysui/rpm/$(product)-desktop-integration.tar.gz) \
))
endif
ifeq ($(OS),SOLARIS)
$(eval $(call gb_Package_add_files,desktop,bin/desktop-integration/pkg,\
$(foreach product,$(PRODUCTLIST),\
sysui/solaris/$(product)-desktop-integration.tar.gz) \
))
endif
# vim: set noet sw=4 ts=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment