Kaydet (Commit) f01792dd authored tarafından Andrzej Hunt's avatar Andrzej Hunt

scp2: move firebird into base.

Change-Id: I35f9b2dcb821bda0ea97de12a8ae8d27915f6b3e
üst 53a0914c
......@@ -14,6 +14,8 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/base,base))
$(eval $(call gb_InstallModule_define_if_set,scp2/base,\
ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \
ENABLE_MACOSX_SANDBOX \
ENABLE_FIREBIRD_SDBC \
SYSTEM_FIREBIRD \
))
$(eval $(call gb_InstallModule_add_templates,scp2/base,\
......@@ -22,6 +24,7 @@ $(eval $(call gb_InstallModule_add_templates,scp2/base,\
$(eval $(call gb_InstallModule_add_scpfiles,scp2/base,\
scp2/source/base/file_base \
scp2/source/base/firebird \
))
$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/base,\
......
# -*- 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_InstallModule_InstallModule,scp2/firebird))
$(eval $(call gb_InstallModule_add_scpfiles,scp2/firebird,\
scp2/source/firebird/file_firebird \
scp2/source/firebird/module_firebird \
))
$(eval $(call gb_InstallModule_define_if_set,scp2/firebird,\
ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \
ENABLE_MACOSX_SANDBOX \
SYSTEM_FIREBIRD \
))
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
......@@ -18,9 +18,6 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
scp2/impress \
scp2/math \
scp2/ooo \
$(if $(filter TRUE,$(ENABLE_FIREBIRD_SDBC)),\
scp2/firebird \
) \
scp2/python \
scp2/ure \
scp2/writer \
......
......@@ -17,9 +17,6 @@ $(eval $(call gb_Module_add_targets,scp2,\
InstallModule_calc \
InstallModule_draw \
InstallModule_extensions \
$(if $(filter TRUE,$(ENABLE_FIREBIRD_SDBC)),\
InstallModule_firebird \
) \
InstallModule_graphicfilter \
InstallModule_impress \
InstallModule_math \
......
......@@ -18,11 +18,11 @@
#include "macros.inc"
#ifndef SYSTEM_FIREBIRD
#if defined( ENABLE_FIREBIRD_SDBC ) && !defined( SYSTEM_FIREBIRD )
Module gid_Module_Firebird
Module gid_Module_Optional_Firebird
Name = "Firebird";
Description = "Firebird";
Description = "Firebird embedded database";
PackageInfo = "packinfo_office.txt";
ParentID = gid_Module_Root_Brand;
Files = (
......@@ -31,4 +31,11 @@ Module gid_Module_Firebird
Styles = (HIDDEN_ROOT);
End
File gid_File_Firebird
TXT_FILE_BODY;
Styles = (FILELIST, PACKED);
Dir = FILELIST_DIR;
Name = "firebird.filelist";
End
#endif
/*
* 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 "macros.inc"
#ifndef SYSTEM_FIREBIRD
File gid_File_Firebird
TXT_FILE_BODY;
Styles = (FILELIST, PACKED);
Dir = FILELIST_DIR;
Name = "firebird.filelist";
End
#endif
......@@ -192,7 +192,7 @@ packageversion = "%PACKAGEVERSION"
End
Start
module = "gid_Module_Firebird"
module = "gid_Module_Optional_Firebird"
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-Firebird"
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01"
packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-firebird"
......
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