diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2013-01-12 13:25:10 +0100 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-01-16 14:29:24 +0100 |
commit | 33b05d5de716707e54ae09afe88a7e02c63e388d (patch) | |
tree | 2ef3ec9471942aa54361d1804ae153e1ddd1c16c /scp2 | |
parent | --with-nss-build-tools is not used anymore (diff) | |
download | core-33b05d5de716707e54ae09afe88a7e02c63e388d.tar.gz core-33b05d5de716707e54ae09afe88a7e02c63e388d.zip |
there is no standalone URE installation
..I hope :-). URE is part of normal installation.
- removes script from scp2 and unused stuff from instsetoo_native.
- removes also OxygenOffice mentioned in openoffice.lst.
Change-Id: I1673c06aa84ae0eb2adda2df78a50a5c5d0761c1
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/InstallModule_ure_standalone.mk | 34 | ||||
-rw-r--r-- | scp2/InstallScript_ure.mk | 35 | ||||
-rw-r--r-- | scp2/Module_scp2.mk | 4 | ||||
-rw-r--r-- | scp2/source/ooo/ure_standalone.scp | 108 |
4 files changed, 0 insertions, 181 deletions
diff --git a/scp2/InstallModule_ure_standalone.mk b/scp2/InstallModule_ure_standalone.mk deleted file mode 100644 index ef93ef619424..000000000000 --- a/scp2/InstallModule_ure_standalone.mk +++ /dev/null @@ -1,34 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_InstallModule_InstallModule,scp2/ure_standalone)) - -$(eval $(call gb_InstallModule_add_scpfiles,scp2/ure_standalone,\ - scp2/source/ooo/ure_standalone \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/InstallScript_ure.mk b/scp2/InstallScript_ure.mk deleted file mode 100644 index 5f09f0fb8745..000000000000 --- a/scp2/InstallScript_ure.mk +++ /dev/null @@ -1,35 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com> -# (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -$(eval $(call gb_InstallScript_InstallScript,ure)) - -$(eval $(call gb_InstallScript_use_modules,ure,\ - scp2/ure_standalone \ - scp2/ure \ -)) - -# vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk index 6a309b787e0f..0339ec379495 100644 --- a/scp2/Module_scp2.mk +++ b/scp2/Module_scp2.mk @@ -44,7 +44,6 @@ $(eval $(call gb_Module_add_targets,scp2,\ InstallModule_sdkoo \ InstallModule_smoketest \ InstallModule_ure \ - InstallModule_ure_standalone \ InstallModule_writer \ InstallModule_xsltfilter \ InstallScript_sdkoo \ @@ -76,9 +75,6 @@ $(eval $(call gb_Module_add_targets,scp2,\ $(if $(filter-out YES,$(SYSTEM_STDLIBS)),\ InstallModule_stdlibs \ ) \ - $(if $(filter-out MACOSX,$(OS)),\ - InstallScript_ure \ - ) \ )) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/source/ooo/ure_standalone.scp b/scp2/source/ooo/ure_standalone.scp deleted file mode 100644 index e187b57c7dec..000000000000 --- a/scp2/source/ooo/ure_standalone.scp +++ /dev/null @@ -1,108 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "macros.inc" - -Installation gid_Installation_Ure - ProductName = "${PRODUCTNAME}"; - ProductVersion = "${PRODUCTVERSION}"; - ProductExtension = "${PRODUCTEXTENSION}"; -#if defined WNT - DefaultDestPath = "<winprogpath>\%PRODUCTNAME"; -#else - DefaultDestPath = "/opt/%PRODUCTNAME"; -#endif -End - -Directory gid_Dir_Ooo_Openofficeorg - ParentID = PREDEFINED_PROGDIR; - #ifdef WNT - HostName = "LibreOffice"; - #else - HostName = "libreoffice"; - #endif - Styles = (ISINSTALLLOCATION); -End - -Directory gid_Dir_Common_Ure - ParentID = gid_Dir_Ooo_Openofficeorg; - #ifdef WNT - HostName = "URE"; - #else - HostName = "ure"; - #endif - Styles = (UREDIRECTORY); -End - -File gid_File_License_Ure - TXT_FILE_BODY; - Dir = gid_Dir_Common_Ure; - Name = "LICENSE"; - Styles = (PACKED); -End - -File gid_File_ThirdpartylicensereadmeHtml_Ure - TXT_FILE_BODY; - Dir = gid_Dir_Common_Ure; - Name = "THIRDPARTYLICENSEREADME.html"; - Styles = (PACKED); -End - -File gid_File_Readme_Ure - TXT_FILE_BODY; - Dir = gid_Dir_Common_Ure; - Name = "README"; - Styles = (PACKED); -End - -// Module - -Module gid_Module_Root - Name = "ure"; - Description = "ure"; -End - -// Windows Registry: -RegistryItem gid_Regitem_Ure_Software_Manufacturer_Productname_Productversion_Productcode_Install - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE"; - ModuleID = gid_Module_Root; - Name = "INSTALLLOCATION"; - Value = "[INSTALLLOCATION]"; - Styles = (ALWAYS_REQUIRED); -End - -RegistryItem gid_Regitem_Ure_Software_Manufacturer_Productname_Productversion_Upgradecode_Install - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE"; - ModuleID = gid_Module_Root; - Name = "INSTALLLOCATION"; - Value = "[INSTALLLOCATION]"; - Styles = (ALWAYS_REQUIRED); -End - - |