From 3df5304ada4cec75072bc71f24ab82fe9b48d97c Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 29 Oct 2013 21:43:41 +0100 Subject: sysui: remove Package_icons - rename main_app.ico to soffice.ico (in case the name is relevant?) - installer: hard-code path to sysui/desktop/icons/soffice.ico Change-Id: Iacd6e28201c3f8e69375e0bfc516542e86131912 --- desktop/WinResTarget_quickstart.mk | 2 +- desktop/WinResTarget_soffice.mk | 4 ++-- desktop/WinResTarget_sofficebin.mk | 4 ++-- desktop/win32/source/QuickStart/QuickStart.rc | 2 +- solenv/bin/modules/installer/windows/shortcut.pm | 10 +++++----- sysui/Module_sysui.mk | 5 ----- sysui/Package_icons.mk | 16 ---------------- sysui/desktop/icons/main_app.ico | Bin 35123 -> 0 bytes sysui/desktop/icons/soffice.ico | Bin 0 -> 35123 bytes 9 files changed, 11 insertions(+), 32 deletions(-) delete mode 100644 sysui/Package_icons.mk delete mode 100644 sysui/desktop/icons/main_app.ico create mode 100644 sysui/desktop/icons/soffice.ico diff --git a/desktop/WinResTarget_quickstart.mk b/desktop/WinResTarget_quickstart.mk index 9f80cf68a093..0c06f599032e 100644 --- a/desktop/WinResTarget_quickstart.mk +++ b/desktop/WinResTarget_quickstart.mk @@ -16,7 +16,7 @@ $(eval $(call gb_WinResTarget_set_include,quickstart/QuickStart,\ )) $(eval $(call gb_WinResTarget_add_dependencies,quickstart/QuickStart,\ - sysui/desktop/icons/main_app.ico \ + sysui/desktop/icons/soffice.ico \ )) $(eval $(call gb_WinResTarget_set_rcfile,quickstart/QuickStart,desktop/win32/source/QuickStart/QuickStart)) diff --git a/desktop/WinResTarget_soffice.mk b/desktop/WinResTarget_soffice.mk index d9e870c1f2aa..e3b7927e2999 100644 --- a/desktop/WinResTarget_soffice.mk +++ b/desktop/WinResTarget_soffice.mk @@ -17,13 +17,13 @@ $(eval $(call gb_WinResTarget_set_include,soffice/launcher,\ $(eval $(call gb_WinResTarget_add_defs,soffice/launcher,\ -DRES_APP_NAME=soffice \ -DRES_APP_FILEDESC="$(PRODUCTNAME)" \ - -DRES_APP_ICON=icons/main_app.ico \ + -DRES_APP_ICON=icons/soffice.ico \ -DVERVARIANT=$(LIBO_VERSION_PATCH) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) $(eval $(call gb_WinResTarget_add_dependencies,soffice/launcher,\ - sysui/desktop/icons/main_app.ico \ + sysui/desktop/icons/soffice.ico \ )) $(eval $(call gb_WinResTarget_set_rcfile,soffice/launcher,desktop/win32/source/applauncher/launcher)) diff --git a/desktop/WinResTarget_sofficebin.mk b/desktop/WinResTarget_sofficebin.mk index d194ef5acbbd..e10c259ca2ff 100644 --- a/desktop/WinResTarget_sofficebin.mk +++ b/desktop/WinResTarget_sofficebin.mk @@ -17,13 +17,13 @@ $(eval $(call gb_WinResTarget_set_include,sofficebin/officeloader,\ $(eval $(call gb_WinResTarget_add_defs,sofficebin/officeloader,\ -DRES_APP_NAME=soffice \ -DRES_APP_FILEDESC="$(PRODUCTNAME)" \ - -DRES_APP_ICON=icons/main_app.ico \ + -DRES_APP_ICON=icons/soffice.ico \ -DVERVARIANT=$(LIBO_VERSION_PATCH) \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \ )) $(eval $(call gb_WinResTarget_add_dependencies,sofficebin/officeloader,\ - sysui/desktop/icons/main_app.ico \ + sysui/desktop/icons/soffice.ico \ sysui/desktop/icons/oasis-database.ico \ sysui/desktop/icons/oasis-drawing-template.ico \ sysui/desktop/icons/oasis-drawing.ico \ diff --git a/desktop/win32/source/QuickStart/QuickStart.rc b/desktop/win32/source/QuickStart/QuickStart.rc index 7c2819eda349..cf9131479495 100644 --- a/desktop/win32/source/QuickStart/QuickStart.rc +++ b/desktop/win32/source/QuickStart/QuickStart.rc @@ -1,3 +1,3 @@ #include "resource.h" -ICON_ACTIVE ICON DISCARDABLE "icons/main_app.ico" +ICON_ACTIVE ICON DISCARDABLE "icons/soffice.ico" diff --git a/solenv/bin/modules/installer/windows/shortcut.pm b/solenv/bin/modules/installer/windows/shortcut.pm index 421a649fb56e..c3469085c244 100644 --- a/solenv/bin/modules/installer/windows/shortcut.pm +++ b/solenv/bin/modules/installer/windows/shortcut.pm @@ -633,17 +633,17 @@ sub create_shortcut_table my $onefile = ""; my $sofficefile = "soffice.ico"; - my $sourcepathref = installer::scriptitems::get_sourcepath_from_filename_and_includepath_classic(\$sofficefile, $includepatharrayref, 0); + my $sourcepathref = $ENV{'SRCDIR'} . "/sysui/desktop/icons/" . $sofficefile; - if ($$sourcepathref eq "") { installer::exiter::exit_program("ERROR: Could not find $sofficefile as icon!", "create_shortcut_table"); } + if (! -f $sourcepathref) { installer::exiter::exit_program("ERROR: Could not find $sofficefile ($sourcepathref) as icon!", "create_shortcut_table"); } - if (! grep {$_ eq $$sourcepathref} @{$iconfilecollector}) + if (! grep {$_ eq $sourcepathref} @{$iconfilecollector}) { - unshift(@{$iconfilecollector}, $$sourcepathref); + unshift(@{$iconfilecollector}, $sourcepathref); $installer::globals::sofficeiconadded = 1; } - my $localinfoline = "Added icon file $$sourcepathref for language pack into icon file collector.\n"; + my $localinfoline = "Added icon file $sourcepathref for language pack into icon file collector.\n"; push(@installer::globals::logfileinfo, $localinfoline); # Saving the file diff --git a/sysui/Module_sysui.mk b/sysui/Module_sysui.mk index 9744ba864130..99ea359348e2 100644 --- a/sysui/Module_sysui.mk +++ b/sysui/Module_sysui.mk @@ -19,7 +19,6 @@ $(eval $(call gb_Module_add_targets,sysui,\ $(if $(filter deb,$(PKGFORMAT)),CustomTarget_deb) \ $(if $(filter SOLARIS,$(OS)),CustomTarget_solaris) \ )) - else # OS=MACOSX $(eval $(call gb_Module_add_targets,sysui,\ Package_osxicons \ @@ -27,10 +26,6 @@ $(eval $(call gb_Module_add_targets,sysui,\ Package_infoplist \ )) endif -else # OS=WNT -$(eval $(call gb_Module_add_targets,sysui,\ - Package_icons \ -)) endif # vim: set noet sw=4 ts=4: diff --git a/sysui/Package_icons.mk b/sysui/Package_icons.mk deleted file mode 100644 index e4d60c94f159..000000000000 --- a/sysui/Package_icons.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -*- 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_Package_Package,sysui/icons,$(SRCDIR)/sysui/desktop/icons)) - -$(eval $(call gb_Package_set_outdir,sysui/icons,$(OUTDIR))) - -$(eval $(call gb_Package_add_file,sysui/icons,bin/soffice.ico,main_app.ico)) - -# vim: set noet sw=4 ts=4: diff --git a/sysui/desktop/icons/main_app.ico b/sysui/desktop/icons/main_app.ico deleted file mode 100644 index ec11e8fe579a..000000000000 Binary files a/sysui/desktop/icons/main_app.ico and /dev/null differ diff --git a/sysui/desktop/icons/soffice.ico b/sysui/desktop/icons/soffice.ico new file mode 100644 index 000000000000..ec11e8fe579a Binary files /dev/null and b/sysui/desktop/icons/soffice.ico differ -- cgit v1.2.3