summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
Diffstat (limited to 'solenv')
-rw-r--r--solenv/config/sdev300.ini (renamed from solenv/config/sooo330.ini)271
-rw-r--r--solenv/config/ssolar.cmn1
-rw-r--r--solenv/inc/minor.mk10
-rw-r--r--solenv/inc/unx.mk3
-rw-r--r--solenv/inc/unxlngx.mk2
5 files changed, 29 insertions, 258 deletions
diff --git a/solenv/config/sooo330.ini b/solenv/config/sdev300.ini
index dcd0c0564afe..b8a075737b22 100644
--- a/solenv/config/sooo330.ini
+++ b/solenv/config/sdev300.ini
@@ -67,7 +67,6 @@ common
}
common:3 IF %UPDATER% != YES
{
- ENABLE_CRASHDUMP DUMMY
}
crashdump
{
@@ -92,11 +91,10 @@ common
pro:0 IF %UPDATER% == YES
{
DELIVER_TO_ZIP TRUE
- ENABLE_CRASHDUMP TRUE
product full
PROEXT .pro
PROFULLSWITCH product=full
- WITH_LANG en-US af ar as ast be-BY bg bn bo br brx bs ca ca-XV cs cy da de dgo dz el en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kid kk km kn ko kok ks ku lt lv mai mk ml mn mni mr my nb ne nl nn nr ns oc om or pa-IN pap pl pt pt-BR ro ru rw sa-IN sat sd sh si sk sl sr ss st sv sw-TZ ta te tg th tn tr ts ug uk ur uz ve vi xh zh-CN zh-TW zu
+ WITH_LANG en-US de es fr hu it ja ko nl pl pt pt-BR ru sv th tr zh-CN zh-TW ar
}
pro:1 IF %UPDATER% != YES
{
@@ -603,7 +601,7 @@ unxlngi6
LIBRARY_PATH %SYSBASE%/usr/lib
MKOUT %PERL% %SOLARENV%/bin/mkout.pl
PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
- SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11
+ SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11 -I%SYSBASE%/include
SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib -L%SOLAR_STLLIBPATH%
SOLAR_JAVA TRUE
ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
@@ -633,10 +631,12 @@ unxlngi6
SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-i586
SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
+ PKG_CONFIG_LIBDIR %SOLAR_SYSBASE_ROOT%/usr/lib/pkgconfig
}
common2
{
ENABLE_GRAPHITE TRUE
+ ENABLE_GSTREAMER TRUE
BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.5/%WORK_STAMP%/bin
COM GCC
COMMON_BUILD_TOOLS %SOLARROOT%$/btools
@@ -824,6 +824,7 @@ unxlngi6
sysbaseroot
}
}
+
unxlngx6
{
environment
@@ -840,7 +841,7 @@ unxlngx6
COPY_PACKED TRUE
DEVROOT %SOL_TMP%$/r
PCLEAN_PATH %SOLARROOT%/etools
- PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
+ PERL %SOL_TMP%$/r$/bt_linux64_libc2.5$/%WORK_STAMP%$/bin$/perl
SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
SOLARROOT %SOL_TMP%$/r
SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
@@ -852,7 +853,7 @@ unxlngx6
COPYALL FALSE
DEVROOT %SOL_TMP%$/r
PCLEAN_PATH %SOL_TMP%$/r/etools
- PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
+ PERL %SOL_TMP%$/r$/bt_linux64_libc2.5$/%WORK_STAMP%$/bin$/perl
SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
SOLARROOT %SOL_TMP%$/r
SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
@@ -875,11 +876,11 @@ unxlngx6
HAVE_GCC_VISIBILITY_FEATURE TRUE
HAVE_LD_BSYMBOLIC_FUNCTIONS TRUE
HAVE_LD_HASH_STYLE TRUE
- LIBRARY_PATH %SYSBASE%/usr/lib
+ LIBRARY_PATH %SYSBASE%/usr/lib64
MKOUT %PERL% %SOLARENV%/bin/mkout.pl
PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
- SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11
- SOLAREXTRALIB -L../lib -L%SYSBASE%/usr/X11R6/lib -L%SYSBASE%/usr/lib -L/usr/X11R6/lib -L%SOLAR_STLLIBPATH%
+ SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include -I%SYSBASE%/usr/include/X11 -I%SYSBASE%/include
+ SOLAREXTRALIB -L../lib64 -L%SYSBASE%/usr/lib64 -L%SOLAR_STLLIBPATH%
SOLAR_JAVA TRUE
ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
}
@@ -887,13 +888,13 @@ unxlngx6
{
SOLAR_ENV_ROOT /so/env
SOLAR_SOURCE_ROOT %DRIVE_O%
- SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux64_libc3.4.6/glibc3.4.6
+ SOLAR_SYSBASE_ROOT /so/env/gcc_4.2.3_linux64_libc2.5/glibc2.5
}
common1
{
- COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc3.4.6/
+ COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc2.5
DEVROOT %SOLAR_ENV_ROOT%
- PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl
+ PERL %SOLAR_ENV_ROOT%/bt_linux64_libc2.5/%WORK_STAMP%/bin/perl
PKGFORMAT rpm
SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
@@ -908,11 +909,14 @@ unxlngx6
SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
USE_SYSTEM_STL YES
XAU_LIBS -lXau
+ PKG_CONFIG_LIBDIR %SOLAR_SYSBASE_ROOT%/usr/lib/pkgconfig
}
common2
{
+ PKG_CONFIG_PATH %COMPATH%/glibc2.5/usr/lib64/pkgconfig
ENABLE_GRAPHITE TRUE
- BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin
+ ENABLE_GSTREAMER TRUE
+ BUILD_TOOLS %SOLARROOT%/bt_linux64_libc2.5/%WORK_STAMP%/bin
COM GCC
COMMON_BUILD_TOOLS %SOLARROOT%$/btools
COMMON_ENV_TOOLS %SOLARROOT%$/etools
@@ -921,7 +925,7 @@ unxlngx6
CVER C341
ENABLE_KAB TRUE
ENABLE_KDE TRUE
- ENV_TOOLS %SOLARROOT%/et_linux_libc2.32/%WORK_STAMP%/bin
+ ENV_TOOLS %SOLARROOT%/et_linux64_libc2.5/%WORK_STAMP%/bin
GUI UNX
GUIBASE unx
GUIENV sal
@@ -929,7 +933,7 @@ unxlngx6
INPATH unxlngx6%PROEXT%
JDK14PATH %SOLAR_JDK14PATH%
JDK15PATH %SOLAR_JDK15PATH%
- KDE_ROOT /so/env/kde/linux/kde-3.2.2
+ KDE_ROOT /so/env/kde/linux-x64/kde-3.5.10
LIBMYSQL_PATH %SOLAR_ENV_ROOT%/mysql-connector-c-6.0.2/unxlngx6
NO_BSYMBOLIC True
OJDK16PATH %SOLAR_OJDK16PATH%
@@ -1100,6 +1104,7 @@ unxlngx6
sysbaseroot
}
}
+
unxmacxi
{
environment
@@ -2123,242 +2128,6 @@ unxsolu4
sysbaseroot
}
}
-unxubti8
-{
- environment
- {
- bs_sourceroot
- {
- SOLAR_SOURCE_ROOT %SOURCE_ROOT_TMP%
- SOURCE_ROOT %SOURCE_ROOT_TMP%
- SOURCE_ROOT_USED TRUE
- }
- cap
- {
- COPYALL TRUE
- COPY_PACKED TRUE
- DEVROOT %SOL_TMP%$/r
- PCLEAN_PATH %SOLARROOT%/etools
- PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
- SOLARROOT %SOL_TMP%$/r
- SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
- SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
- SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
- }
- cax
- {
- COPYALL FALSE
- DEVROOT %SOL_TMP%$/r
- PCLEAN_PATH %SOL_TMP%$/r/etools
- PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
- SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/ooo%UPDMINOREXT%$/solenv
- SOLARROOT %SOL_TMP%$/r
- SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
- SOLARVERSION %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
- SO_PACK %SOL_TMP%$/r$/pack$/%WORK_STAMP%
- }
- common
- {
- *build nice %PERL% %SOLARENV%/bin/build.pl %PROFULLSWITCH%
- *build_client nice %PERL% %SOLARENV%/bin/build_client.pl
- *copyprj %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
- *deliver %PERL% %SOLARENV%/bin/deliver.pl
- *mkout %PERL% %SOLARENV%/bin/mkout.pl
- *r: cd %SOLARROOT%
- *s: cd %SOLARVERSION%
- *zipdep %PERL% %SOLARENV%/bin/zipdep.pl
- COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
- DELIVER deliver.pl
- DMAKEROOT %SOLARENV%/inc/startup
- HAVE_GCC_VISIBILITY_FEATURE TRUE
- LD_LIBRARY_PATH .:/usr/lib:/usr/lib/jvm/java-6-openjdk/jre/lib/i386:/usr/lib/jvm/java-6-openjdk/jre/lib/i386/xawt:/usr/lib/jvm/java-6-openjdk/jre/lib/i386/client:/usr/lib/jvm/java-6-openjdk/jre/lib/i386/native_threads:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%:
- MKOUT mkout.pl
- SOLAREXTRAINC -I%SOLAR_STLPATH%
- SOLAREXTRALIB -L../lib
- SOLAR_JAVA TRUE
- ZIPDEP %PERL% %SOLARENV%/bin/zipdep.pl
- }
- common0
- {
- SOLAR_ENV_ROOT /so/env
- SOLAR_SOURCE_ROOT %DRIVE_O%
- }
- common1
- {
- AGG_VERSION 2300
- ANT /usr/share/ant/bin/ant
- ANT_HOME /usr/share/ant
- ANT_LIB /usr/share/ant/lib
- AWTLIB -ljawt
- CC gcc
- COMPATH /usr/bin
- CXX g++
- DEVROOT %SOLAR_ENV_ROOT%
- EXCEPTIONS dwarf2
- EXTERNAL_WARNINGS_NOT_ERRORS 1
- GNUMAKE make
- GXX_INCLUDE_PATH /usr/include/c++/4.2
- HAVE_LD_HASH_STYLE TRUE
- JAVACOMPILER /usr/bin/javac
- JAVADOC /usr/bin/javadoc
- JDK sun
- LFS_CFLAGS -D_FILE_OFFSET_BITS=64
- PAM YES
- PAM_LINK NO
- PERL /usr/bin/perl
- PKGFORMAT deb
- SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
- SOLARROOT %SOLAR_ENV_ROOT%
- SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
- SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
- SOLAR_OJDK16PATH %SOLAR_ENV_ROOT%/openjdk-6-b08-linux-i586
- SOLAR_PLUGIN TRUE
- SO_PACK %SOLAR_ENV_ROOT%/pack/%WORK_STAMP%
- SRC_ROOT %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%
- VBA_EXTENSION NO
- WITH_LANG en-US de
- XAU_LIBS -lXau
- XCLASSPATH /usr/lib/jvm/java-6-openjdk/jre/lib/rt.jar:.
- XINERAMA_LINK dynamic
- ZIPDEP zipdep.pl
- }
- common2
- {
- ENABLE_GRAPHITE TRUE
- BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin
- COM GCC
- COMMON_BUILD_TOOLS %SRC_ROOT%/external/common
- COMMON_ENV_TOOLS %SOLARROOT%$/etools
- CPU I
- CPUNAME INTEL
- CVER C341
- GUI UNX
- GUIBASE unx
- GVER VCL
- INPATH unxubti8%PROEXT%
- NO_BSYMBOLIC TRUE
- OJDK16PATH /usr/lib/jvm/java-6-openjdk
- OS LINUX
- OUTPATH unxubti8
- RPM /usr/bin/rpmbuild
- SOLAR_STLPATH %SOLARVERSION%$/unxubti8%PROEXT%$/inc%UPDMINOREXT%$/stl
- TEMP /tmp
- TMP /tmp
- }
- compath
- {
- COMPATH /usr/bin
- }
- debug
- {
- LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
- }
- distroot:0 if X%DIST_ROOT%X != XX
- {
- SOLARVER %DIST_ROOT%/%WORK_STAMP%
- SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
- }
- envroot:0 IF X%ENV_ROOT%X != XX
- {
- SOLAR_ENV_ROOT %ENV_ROOT%
- }
- jdk15
- {
- JAVA_HOME %OJDK16PATH%
- JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
- JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
- JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/jre/lib/i386/client:%OJDK16PATH%/jre/lib/i386/xawt
- JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/jre/lib/i386/client -L%OJDK16PATH%/jre/lib/i386/native_threads
- JDKPATH %OJDK16PATH%/bin
- XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
- }
- jdk15path:0 IF X%JDK_PATH%X != XX
- {
- SOLAR_JDK15PATH %JDK_PATH%
- }
- ojdk16
- {
- JAVA_HOME %OJDK16PATH%
- JDKINC %OJDK16PATH%/include:%OJDK16PATH%/include/linux
- JDKINCS -I%OJDK16PATH%/include -I%OJDK16PATH%/include/linux
- JDKLIB %OJDK16PATH%/jre/lib:%OJDK16PATH%/jre/lib/i386:%OJDK16PATH%/jre/lib/i386/client:%OJDK16PATH%/jre/lib/i386/xawt
- JDKLIBS -L%OJDK16PATH%/jre/lib -L%OJDK16PATH%/jre/lib/i386 -L%OJDK16PATH%/jre/lib/i386/client -L%OJDK16PATH%/jre/lib/i386/native_threads
- JDKPATH %OJDK16PATH%/bin
- XCLASSPATH .:%OJDK16PATH%/jre/lib/rt.jar
- }
- ojdk16path:0 IF X%JDK_PATH%X != XX
- {
- SOLAR_OJDK16PATH %JDK_PATH%
- }
- pro
- {
- PROSWITCH -DPRODUCT
- }
- sourceroot:0 IF X%SOURCE_ROOT%X != XX
- {
- SOLAR_SOURCE_ROOT %SOURCE_ROOT%
- SOURCE_ROOT_USED TRUE
- }
- }
- extern
- {
- DIST_ROOT
- ENV_ROOT
- HOME
- JDK_PATH
- LOCALINI
- SOL_TMP
- SOURCE_ROOT
- USER
- }
- order common0 bs_sourceroot envroot:0 sourceroot:0 common1 ojdk16path:0 distroot:0 cap cax compath common2 pro common jdk15 ojdk16 debug
- reset
- {
- CLASSPATH
- COPYALL
- ENABLE_CRASHDUMP
- }
- restore
- {
- INCLUDE
- }
- script
- {
- csh
- {
- 400: if ( ${?COPYALL} ) $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
- 600: umask 002
- 800: rehash
- 820: wrapfetch.sh
- }
- sh
- {
- 400: if [ $COPYALL ]; then
- 410: $SOLAR_ENV_ROOT/etools/lucopy.pl all $LU_HGFLAG $LU_RFLAG $LU_NOSOURCE
- 415: fi
- 600: umask 002
- 800: hash -r
- 820: wrapfetch.sh
- }
- }
- switches
- {
- bs_sourceroot SOURCE_ROOT_TMP
- bsclient
- cap
- cax
- debug
- distroot
- envroot
- jdk15
- l10n L10N_framework
- ojdk16
- ojdk16path
- pro
- sourceroot
- }
-}
wntgcci1
{
environment
diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn
index de332146a1f0..77b2f592ac67 100644
--- a/solenv/config/ssolar.cmn
+++ b/solenv/config/ssolar.cmn
@@ -169,6 +169,7 @@ common
PACKMS
PCLEAN_PATH
PKGCONFIG_ROOT
+ PKG_CONFIG_PATH
PKGFORMAT
PRE
PREBUILD_MOZAB
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index ef764a7ee545..0c06cef68b75 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
-RSCVERSION=330
-RSCREVISION=330m2(Build:9516)
-BUILD=9516
-LAST_MINOR=m2
-SOURCEVERSION=OOO330
+RSCVERSION=300
+RSCREVISION=300m86(Build:9518)
+BUILD=9518
+LAST_MINOR=m86
+SOURCEVERSION=DEV300
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index a05b4629755e..e558c9955d82 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -199,6 +199,9 @@ DLLPOST!:=$(DLLPOST).$($(UNIXVERSIONNAMES)_MAJOR)
KDE_CFLAGS:=-I$(KDE_ROOT)/include -DQT_CLEAN_NAMESPACE
KDE_LIBS:=-lkdeui -lkdecore -lqt-mt
SOLARLIB+=-L$(KDE_ROOT)/lib
+.IF "$(OS)$(CPU)" == "LINUXX"
+SOLARLIB+=-L$(KDE_ROOT)/lib64
+.ENDIF # "$(OS)$(CPU)" == "LINUXX"
.ENDIF # "$(KDE_ROOT)"!=""
.ENDIF # "$(ENABLE_KDE)" != ""
diff --git a/solenv/inc/unxlngx.mk b/solenv/inc/unxlngx.mk
index 1ced6c3912d0..414f15d0dc92 100644
--- a/solenv/inc/unxlngx.mk
+++ b/solenv/inc/unxlngx.mk
@@ -29,7 +29,5 @@
.INCLUDE : unxlng.mk
CDEFS+=-DX86_64
-MODULES_WITH_WARNINGS+=\
- svx
DLLPOSTFIX=lx
BUILD64=1
generated by cgit (git 2.34.1) at 2025-01-25 04:25:03 +0000