diff options
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/stdlib.scp | 59 | ||||
| -rw-r--r-- | scp2/source/ooo/ure.scp | 30 | ||||
| -rwxr-xr-x | setup_native/source/packinfo/packinfo_ure.txt | 12 |
4 files changed, 72 insertions, 30 deletions
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 244cf558d9df..08ba316e2b96 100644 --- a/scp2/source/ooo/makefile.mk +++ b/scp2/source/ooo/makefile.mk @@ -328,6 +328,7 @@ PARFILES= \ profile_ooo.par \ profileitem_ooo.par \ ure.par \ + stdlib.par \ ure_into_ooo.par \ ure_standalone.par \ common_brand.par \ diff --git a/scp2/source/ooo/stdlib.scp b/scp2/source/ooo/stdlib.scp new file mode 100644 index 000000000000..700b35b10063 --- /dev/null +++ b/scp2/source/ooo/stdlib.scp @@ -0,0 +1,59 @@ +/************************************************************************* + * + * 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" + +#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \ + || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY)) +File gid_File_Dl_GccS + LIB_FILE_BODY; + Dir = SCP2_URE_DL_DIR; +#ifdef AIX + Name = "libgcc_s.a"; +#else + Name = SCP2_URE_DL_VER("gcc_s", STRING(SHORTSTDC3)); +#endif + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); + // CompID = "C601D04B-2194-4F1B-BB09-7B4930D6E1DB"; +End +#endif + +#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \ + || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY)) +File gid_File_Dl_Stdcpp + Dir = SCP2_URE_DL_DIR; + LIB_FILE_BODY; +#ifdef AIX + Name = "libstdc++.a"; +#else + Name = SCP2_URE_DL_VER("stdc++", STRING(SHORTSTDCPP3)); +#endif + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); + // CompID = "89740D6A-38EE-41AF-A6A2-A8F7ABBE4996"; +End +#endif + diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 3667ed4c09e7..6993a796e614 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -880,36 +880,6 @@ File gid_File_Dl_Stlport End #endif -#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \ - || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY)) -File gid_File_Dl_GccS - LIB_FILE_BODY; - Dir = SCP2_URE_DL_DIR; -#ifdef AIX - Name = "libgcc_s.a"; -#else - Name = SCP2_URE_DL_VER("gcc_s", STRING(SHORTSTDC3)); -#endif - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "C601D04B-2194-4F1B-BB09-7B4930D6E1DB"; -End -#endif - -#if defined _gcc3 && !(defined FREEBSD || defined NETBSD || defined OPENBSD \ - || defined MACOSX || defined SYSTEM_STDLIBS || defined(WNT) || defined(DRAGONFLY)) -File gid_File_Dl_Stdcpp - Dir = SCP2_URE_DL_DIR; - LIB_FILE_BODY; -#ifdef AIX - Name = "libstdc++.a"; -#else - Name = SCP2_URE_DL_VER("stdc++", STRING(SHORTSTDCPP3)); -#endif - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "89740D6A-38EE-41AF-A6A2-A8F7ABBE4996"; -End -#endif - #if defined(WNT) && defined( _gcc3 ) #if defined(MINGW_GCCDLL) diff --git a/setup_native/source/packinfo/packinfo_ure.txt b/setup_native/source/packinfo/packinfo_ure.txt index a6c3435671c1..a597d5f5fac7 100755 --- a/setup_native/source/packinfo/packinfo_ure.txt +++ b/setup_native/source/packinfo/packinfo_ure.txt @@ -50,3 +50,15 @@ description = "UNO Runtime Environment" destpath = "/opt" packageversion = "%UREPACKAGEVERSION" End + +Start +module = "gid_Module_Optional_Stdlib" +solarispackagename = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlib" +packagename = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlib" +copyright = "2012 by LibreOffice" +solariscopyright = "solariscopyrightfile" +vendor = "The Document Foundation" +description = "UNO Runtime Environment" +destpath = "/opt" +packageversion = "%UREPACKAGEVERSION" +End |