Kaydet (Commit) b7776040 authored tarafından David Tardon's avatar David Tardon

drop pointless build of a resource file

Change-Id: Ic3d554bbcc8bdbad85c868c06d451bd6f12def54
üst bda4c6ab
# -*- 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_AllLangResTarget_AllLangResTarget,hsqldb))
$(eval $(call gb_AllLangResTarget_set_reslocation,hsqldb,database))
$(eval $(call gb_AllLangResTarget_add_srs,hsqldb,\
hsqldb/res \
))
$(eval $(call gb_SrsTarget_SrsTarget,hsqldb/res))
$(eval $(call gb_SrsTarget_set_include,hsqldb/res,\
-I$(SRCDIR)/connectivity/source/drivers/hsqldb \
$$(INCLUDE) \
))
$(eval $(call gb_SrsTarget_add_nonlocalized_files,hsqldb/res,\
connectivity/source/drivers/hsqldb/hsqlui.src \
))
# vim: set noet sw=4 ts=4:
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* 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 .
*/
#include "hsqlui.hrc"
// Note:
// The resource file built here (hsqldb.res, finally) is *not* included
// in the final OOo installation. Instead, it is only built to ensure that
// the image below is included in the application-wide image repository
// (images.zip). This way, they can be accessed at runtime, but without the
// indirection via a resource file - the GraphicProvider service supports
// a "private:imagerepository/*" protocol meanwhile, which allows this.
//
// If there were another possibility to ensure that the images are
// put into the repository, instead of creating a resource file for them,
// then we would use this other way ...
Image 1000
{
ImageBitmap = Bitmap { File = LINKED_TEXT_TABLE_IMAGE_RESOURCE; };
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -31,6 +31,7 @@ $(packimages_DIR)/%.zip : \
$(packimages_DIR)/sorted.lst \
$(packimages_DIR)/commandimagelist.ilst \
$(call gb_Helper_optional,HELP,$(helpimages_DIR)/helpimg.ilst) \
$(call gb_Helper_optional,DBCONNECTIVITY,$(if $(SOLAR_JAVA),$(SRCDIR)/connectivity/source/drivers/hsqldb/hsqlui.ilst)) \
$(call gb_Postprocess_get_target,AllResources) \
$(call gb_Postprocess_get_target,AllUIConfigs)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
......@@ -47,6 +48,7 @@ $(packimages_DIR)/%.zip : \
-l $(dir $(call gb_ResTarget_get_imagelist_target)) \
-l $(dir $(call gb_UIConfig_get_imagelist_target)) \
-l $(dir $(call gb_UIConfig_get_imagelist_target,modules/)) \
$(call gb_Helper_optional,DBCONNECTIVITY,$(if $(SOLAR_JAVA),-l $(SRCDIR)/connectivity/source/drivers/hsqldb)) \
-s $< -o $@ \
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
......
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