From f61b01cc849c16f04605c457d5a30cec373c8880 Mon Sep 17 00:00:00 2001 From: "Andrzej J.R. Hunt" Date: Thu, 20 Jun 2013 15:19:06 +0100 Subject: Setup Firebird installation / scp2 details. Change-Id: I03393b08db5878b099a2e71b9b515b707a386e3f --- firebird/ExternalPackage_firebird.mk | 32 ++++++++++++++++++++--- scp2/InstallModule_firebird.mk | 17 ++++++++++++ scp2/InstallScript_setup_osl.mk | 1 + scp2/Module_scp2.mk | 1 + scp2/source/firebird/file_firebird.scp | 30 +++++++++++++++++++++ scp2/source/firebird/module_firebird.scp | 33 ++++++++++++++++++++++++ setup_native/source/packinfo/packinfo_office.txt | 15 +++++++++++ 7 files changed, 126 insertions(+), 3 deletions(-) create mode 100644 scp2/InstallModule_firebird.mk create mode 100644 scp2/source/firebird/file_firebird.scp create mode 100644 scp2/source/firebird/module_firebird.scp diff --git a/firebird/ExternalPackage_firebird.mk b/firebird/ExternalPackage_firebird.mk index c385b59c15d9..4d72c9b86dbe 100644 --- a/firebird/ExternalPackage_firebird.mk +++ b/firebird/ExternalPackage_firebird.mk @@ -39,9 +39,35 @@ $(eval $(call gb_ExternalPackage_use_external_project,firebird,firebird)) # gen/firebird/security2.fdb \ # )) +$(eval $(call gb_ExternalPackage_set_outdir,firebird,$(INSTDIR))) + +$(eval $(call gb_ExternalPackage_add_file,firebird,libfbembed.so.2.5.2,gen/firebird/lib/libfbembed.so.2.5.2)) +$(eval $(call gb_ExternalPackage_add_file,firebird,libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5)) +$(eval $(call gb_ExternalPackage_add_file,firebird,libfbembed.so,gen/firebird/lib/libfbembed.so)) + +$(eval $(call gb_ExternalPackage_add_files,firebird,firebird,\ + gen/firebird/firebird.msg \ + gen/firebird/security2.fdb \ +)) + +$(eval $(call gb_ExternalPackage_add_files,firebird,firebird/bin,\ + gen/firebird/bin/isql \ +)) + +$(eval $(call gb_ExternalPackage_add_files,firebird,firebird/lib,\ + gen/firebird/lib/libfbembed.so.2.5.2 \ + gen/firebird/lib/libfbembed.so.2.5 \ + gen/firebird/lib/libfbembed.so \ + gen/firebird/lib/libicudata.so \ + gen/firebird/lib/libicudata.so.30 \ + gen/firebird/lib/libicudata.so.30.0 \ + gen/firebird/lib/libicuuc.so \ + gen/firebird/lib/libicuuc.so.30 \ + gen/firebird/lib/libicuuc.so.30.0 \ + gen/firebird/lib/libicui18n.so \ + gen/firebird/lib/libicui18n.so.30 \ + gen/firebird/lib/libicui18n.so.30.0 \ +)) -$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so.2.5.2,gen/firebird/lib/libfbembed.so.2.5.2)) -$(eval $(call gb_ExternalPackage_add_library_for_install,firebird,lib/libfbembed.so.2.5.2,gen/firebird/lib/libfbembed.so.2.5.2)) -$(eval $(call gb_ExternalPackage_add_file,firebird,lib/libfbembed.so,gen/firebird/lib/libfbembed.so.2.5.2)) # vim: set noet sw=4 ts=4: diff --git a/scp2/InstallModule_firebird.mk b/scp2/InstallModule_firebird.mk new file mode 100644 index 000000000000..b11169ffc2c8 --- /dev/null +++ b/scp2/InstallModule_firebird.mk @@ -0,0 +1,17 @@ +# -*- 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 \ +)) + +# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk index ecc4ee90c83d..59369b99a171 100644 --- a/scp2/InstallScript_setup_osl.mk +++ b/scp2/InstallScript_setup_osl.mk @@ -18,6 +18,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\ scp2/impress \ scp2/math \ scp2/ooo \ + scp2/firebird \ scp2/python \ scp2/ure \ scp2/writer \ diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 0712d4a42e1e..dcec65682fe7 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -17,6 +17,7 @@ $(eval $(call gb_Module_add_targets,scp2,\ InstallModule_calc \ InstallModule_draw \ InstallModule_extensions \ + InstallModule_firebird \ InstallModule_graphicfilter \ InstallModule_impress \ InstallModule_math \ diff --git a/scp2/source/firebird/file_firebird.scp b/scp2/source/firebird/file_firebird.scp new file mode 100644 index 000000000000..f1e4bc0b5d14 --- /dev/null +++ b/scp2/source/firebird/file_firebird.scp @@ -0,0 +1,30 @@ +/* + * 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; + Dir = gid_Brand_Dir_Program; + Name = "firebird.filelist"; + Styles = (FILELIST,USE_INTERNAL_RIGHTS); +End + +#endif diff --git a/scp2/source/firebird/module_firebird.scp b/scp2/source/firebird/module_firebird.scp new file mode 100644 index 000000000000..586f7dfbd57d --- /dev/null +++ b/scp2/source/firebird/module_firebird.scp @@ -0,0 +1,33 @@ +/* + * 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 + +Module gid_Module_Firebird + PackageInfo = "packinfo_office.txt"; + ParentID = gid_Module_Root_Brand; + Dirs = (); + Files = (gid_File_Lib_Firebird, + gid_File_Firebird); + Unixlinks = (); + Styles = (HIDDEN_ROOT); +End + +#endif \ No newline at end of file diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt index 4fbad6351d05..578b6f8b7f25 100644 --- a/setup_native/source/packinfo/packinfo_office.txt +++ b/setup_native/source/packinfo/packinfo_office.txt @@ -192,6 +192,21 @@ destpath = "/opt" packageversion = "%ABOUTBOXPRODUCTVERSION" End +Start +module = "gid_Module_Firebird" +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-Firebird" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core01" +packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-firebird" +freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01" +requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core01" +copyright = "2013 The Document Foundation" +solariscopyright = "solariscopyrightfile" +vendor = "The Document Foundation" +description = "Firebird module for %PRODUCTNAME %PRODUCTVERSION" +destpath = "/opt" +packageversion = "%ABOUTBOXPRODUCTVERSION" +End + Start module = "gid_Module_Optional_Grfflt" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-graphicfilter" -- cgit v1.2.3