[ooo-build-commit] Branch 'ooo/master' - 5 commits - scp2/source solenv/bin solenv/config solenv/inc
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Oct 14 17:18:30 PDT 2009
scp2/source/ooo/file_library_ooo.scp | 4 ++--
scp2/source/ooo/file_ooo.scp | 20 +++++++++-----------
scp2/source/ooo/module_hidden_ooo.scp | 12 +++++++++++-
solenv/bin/rpm-wrapper | 6 ++++++
solenv/config/sdev300.ini | 12 ++++++------
solenv/inc/libs.mk | 2 +-
solenv/inc/wntgcci.mk | 33 ++++++++++++++++++++++++++-------
7 files changed, 61 insertions(+), 28 deletions(-)
New commits:
commit 4e3be4d97895a4cd628b6130449e7a30a1f4a24f
Author: Kurt Zenker <kz at openoffice.org>
Date: Wed Oct 14 17:56:00 2009 +0000
CWS-TOOLING: integrate CWS mingwport25
2009-10-06 23:23:24 +0200 tono r276730 : i#105542: mingw port merger fix
diff --git a/solenv/inc/wntgcci.mk b/solenv/inc/wntgcci.mk
index ef0c5ce..b45b659 100644
--- a/solenv/inc/wntgcci.mk
+++ b/solenv/inc/wntgcci.mk
@@ -81,7 +81,10 @@ CFLAGSNOOPT=-O0
# Compiler flags for describing the output path
CFLAGSOUTOBJ=-o
#plattform hart setzen
-CDEFS+=-DWIN32 -DWINVER=0x500 -D_WIN32_IE=0x500 -D_DLL -D_M_IX86 -DSTLPORT_VERSION=450 -D_NATIVE_WCHAR_T_DEFINED
+CDEFS+=-DWIN32 -DWINVER=0x500 -D_WIN32_IE=0x500 -D_M_IX86 -DSTLPORT_VERSION=450 -D_NATIVE_WCHAR_T_DEFINED
+.IF "$(DYNAMIC_CRT)"!=""
+CDEFS+=-D_DLL
+.ENDIF
# -Wshadow does not work for C with nested uses of pthread_cleanup_push:
CFLAGSWARNCC=-Wall -Wextra -Wendif-labels
@@ -117,6 +120,8 @@ MINGWLIBDIR=$(COMPATH)$/lib$/mingw
.ELSE
MINGWLIBDIR=$(COMPATH)$/lib
.ENDIF
+MINGWSSTDOBJ=$(MINGW_CLIB_DIR)$/crtbegin.o
+MINGWSSTDENDOBJ=$(MINGW_CLIB_DIR)$/crtend.o
LINKFLAGSAPPGUI=-mwindows $(MINGWLIBDIR)$/crt2.o
LINKFLAGSSHLGUI=--warn-once -mwindows -shared $(MINGWLIBDIR)$/dllcrt2.o
LINKFLAGSAPPCUI=-mconsole $(MINGWLIBDIR)$/crt2.o
@@ -126,19 +131,33 @@ LINKFLAGSPROF=
LINKFLAGSDEBUG=-g
LINKFLAGSOPT=
+.IF "$(MINGW_SHARED_GXXLIB)"=="YES" && "$(DYNAMIC_CRT)"!=""
+STDLIBCPP=-lstdc++_s
+.ELSE
STDLIBCPP=-lstdc++
+.ENDIF
UWINAPILIB*=$(DYNAMIC) -luwinapi
+.IF "$(MINGW_SHARED_GCCLIB)"=="YES" && "$(DYNAMIC_CRT)"!=""
+MINGW_LIBGCC=-lgcc_s -lgcc
+LINKFLAGS+=-shared-libgcc
+.ELSE
+.IF "$(MINGW_GCCLIB_EH)"=="YES"
+MINGW_LIBGCC=-lgcc_eh -lgcc
+.ELSE
+MINGW_LIBGCC=-lgcc
+.ENDIF
+.ENDIF
STDOBJVCL=$(L)$/salmain.obj
STDOBJGUI=
STDSLOGUI=
STDOBJCUI=
STDSLOCUI=
-STDLIBGUIMT=-Wl,--start-group CPPRUNTIME -lgcc
-STDLIBCUIMT=-Wl,--start-group CPPRUNTIME -lgcc
-STDSHLGUIMT=-Wl,--start-group CPPRUNTIME -lgcc
-STDSHLCUIMT=-Wl,--start-group CPPRUNTIME -lgcc
-.IF "$(MINGW_NODLL)"==""
+STDLIBGUIMT=-Wl,--start-group CPPRUNTIME $(MINGW_LIBGCC)
+STDLIBCUIMT=-Wl,--start-group CPPRUNTIME $(MINGW_LIBGCC)
+STDSHLGUIMT=-Wl,--start-group CPPRUNTIME $(MINGW_LIBGCC)
+STDSHLCUIMT=-Wl,--start-group CPPRUNTIME $(MINGW_LIBGCC)
+.IF "$(DYNAMIC_CRT)"!=""
STDLIBGUIMT+=-lmingwthrd
STDLIBCUIMT+=-lmingwthrd
STDSHLGUIMT+=-lmingwthrd
@@ -150,7 +169,7 @@ STDSHLGUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -l
STDSHLCUIMT+=-lmingw32 -lmoldname -lmingwex -Wl,--end-group $(UWINAPILIB) -lm -lkernel32 -luser32 -lmsvcrt
LIBSTLPORT=-lstlport_gcc
-LIBSTLPORTST=-lstlport_gcc_static
+LIBSTLPORTST=-lstlport_gcc_static $(STDLIBCPP)
LIBMGR=ar
LIBFLAGS=-rsu
commit 8a42c26831ae591812d81e9f30b1239851e75965
Author: Kurt Zenker <kz at openoffice.org>
Date: Wed Oct 14 17:49:00 2009 +0000
CWS-TOOLING: integrate CWS rpm4lngx
2009-10-06 14:38:50 +0200 vg r276703 : #160779# new environment for unxlngx6
diff --git a/solenv/bin/rpm-wrapper b/solenv/bin/rpm-wrapper
index 1b523bb..1c94bc0 100755
--- a/solenv/bin/rpm-wrapper
+++ b/solenv/bin/rpm-wrapper
@@ -40,6 +40,12 @@ then
LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${LIBRARY_PATH?} \
${BUILD_TOOLS?}/rpmbuild "$@"
else
+if [ "$OUTPATH" = "unxlngx6" ]
+then
+LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${LIBRARY_PATH?} \
+ ${BUILD_TOOLS?}/rpmbuild "$@"
+else
LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${COMPATH?}/lib \
${BUILD_TOOLS?}/rpm "$@"
fi
+fi
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index 8b65e8b..6d3a096 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -933,7 +933,7 @@ unxlngx6
COPYALL TRUE
DEVROOT %SOL_TMP%$/r
PCLEAN_PATH %SOLARROOT%/etools
- PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
+ PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
SOLARROOT %SOL_TMP%$/r
SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
@@ -945,7 +945,7 @@ unxlngx6
COPY_PACKED TRUE
DEVROOT %SOL_TMP%$/r
PCLEAN_PATH %SOLARROOT%/etools
- PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
+ PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
SOLARROOT %SOL_TMP%$/r
SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
@@ -957,7 +957,7 @@ unxlngx6
COPYALL FALSE
DEVROOT %SOL_TMP%$/r
PCLEAN_PATH %SOL_TMP%$/r/etools
- PERL %SOL_TMP%$/r$/bt_linux_libc2.11$/%WORK_STAMP%$/bin$/perl
+ PERL %SOL_TMP%$/r$/bt_linux_libc2.32$/%WORK_STAMP%$/bin$/perl
SOLARENV %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%$/%WORK_STAMP%$/src%UPDMINOREXT%$/solenv
SOLARROOT %SOL_TMP%$/r
SOLARVER %SOL_TMP%$/o%CWS_WORK_STAMP_EXT%/%WORK_STAMP%
@@ -998,7 +998,7 @@ unxlngx6
{
COMPATH %SOLAR_ENV_ROOT%$/gcc_4.2.3_linux64_libc3.4.6/
DEVROOT %SOLAR_ENV_ROOT%
- PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin/perl
+ PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl
PKGFORMAT rpm
PTHREAD_CFLAGS -DNPTL
SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/src%UPDMINOREXT%/solenv
@@ -1018,7 +1018,7 @@ unxlngx6
common2
{
ENABLE_GRAPHITE TRUE
- BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.11/%WORK_STAMP%/bin
+ BUILD_TOOLS %SOLARROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin
COM GCC
COMMON_BUILD_TOOLS %SOLARROOT%$/btools
COMMON_ENV_TOOLS %SOLARROOT%$/etools
@@ -1027,7 +1027,7 @@ unxlngx6
CVER C341
ENABLE_KAB TRUE
ENABLE_KDE TRUE
- ENV_TOOLS %SOLARROOT%/et_linux_libc2.11/%WORK_STAMP%/bin
+ ENV_TOOLS %SOLARROOT%/et_linux_libc2.32/%WORK_STAMP%/bin
GUI UNX
GUIBASE unx
GUIENV sal
commit edad2126fc58bdc988be25301fb642026482148d
Author: Kurt Zenker <kz at openoffice.org>
Date: Wed Oct 14 17:42:36 2009 +0000
CWS-TOOLING: integrate CWS mhremove01
2009-09-30 18:40:27 +0200 mh r276572 : del: superflous file
2009-09-30 18:37:25 +0200 mh r276571 : #i104152# remove test and result files, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=331534
2009-09-30 18:20:02 +0200 mh r276570 : #i105483# remove msfontextract
2009-09-30 18:19:33 +0200 mh r276569 : #i105483# remove msfontextract
2009-09-30 18:10:09 +0200 mh r276568 : #i105483# remove msfontextract
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 0db7e3a..7d1d8bb 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -178,17 +178,6 @@ End
#endif
-#ifndef WITHOUT_FONTOOO
-
-File gid_File_Exe_Msfontextract
- BIN_FILE_BODY;
- Dir = gid_Dir_Program;
- Name = EXENAME(msfontextract);
- Styles = (PACKED);
-End
-
-#endif
-
#ifdef UNX
File gid_File_Bin_Open_Url
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 764f7c0..9607c88 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -52,7 +52,6 @@ Module gid_Module_Root_Files_2
gid_File_Profile_Gengal,
gid_File_Bin_Spadmin_Bin,
gid_File_Bin_Uri_Encode,
- gid_File_Exe_Msfontextract,
gid_File_Exe_Nsplugin,
gid_File_Lib_Npsoplugin,
gid_File_Lib_Soffice,
commit c31458286a372af031557e29fa8babe245043ba7
Author: Kurt Zenker <kz at openoffice.org>
Date: Wed Oct 14 17:33:11 2009 +0000
CWS-TOOLING: integrate CWS sw32bf05
2009-10-08 12:41:26 +0200 tl r276785 : #ii102766# updated de_* hyphenation patterns
2009-10-08 11:09:24 +0200 tl r276775 : #i105715# update for hu_HU dictionary
2009-10-06 09:25:53 +0200 tl r276694 : #i105565# fix for dictionary.xcu in dict-de.oxt
2009-10-05 12:29:46 +0200 mst r276675 : #i105453#: hintids.hxx: change order of RES_TXTATR_WITHEND hints
2009-10-05 12:28:49 +0200 mst r276674 : unochart.cxx: fix warning on unxlngi6 debug=t
2009-10-05 11:46:18 +0200 tl r276672 : #i105490# Hebrew dictionary added
2009-10-05 11:39:41 +0200 tl r276670 : #i105490# Hebrew dictionary added
2009-10-05 11:33:56 +0200 tl r276669 : #i105490# Hebrew dictionary added
2009-10-05 11:21:02 +0200 tl r276667 : #i105490# Hebrew dictionary added
2009-10-05 11:17:37 +0200 tl r276666 : #i105565# de_* dictionay updates
2009-10-03 09:54:58 +0200 tl r276654 : #i105565# de_* dictionay updates
2009-10-03 08:52:38 +0200 tl r276653 : #i105564# pt_BR dictionaries updated
2009-10-03 08:46:42 +0200 tl r276652 : #i105510#, #i105278# outdated dictionary.lst removed
2009-10-02 14:17:03 +0200 tl r276644 : #i105510#, #i105278# fr_FR and da_DK dictionary updates
2009-10-01 10:05:28 +0200 od r276577 : #i105447# method <lcl_GetUndoIdAndName(..)>
- assure correct access to undo stack objects
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 519a2f8..0db7e3a 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -3047,6 +3047,15 @@ End
#endif
#ifndef WITHOUT_MYSPELL_DICTS
+File gid_File_Extension_Dictionary_He
+ Dir = gid_Brand_Dir_Share_Extension_Install;
+ Name = "dict-he.oxt";
+ Styles = (PACKED, FORCELANGUAGEPACK);
+ UnixRights = 444;
+End
+#endif
+
+#ifndef WITHOUT_MYSPELL_DICTS
File gid_File_Extension_Dictionary_Hu
Dir = gid_Brand_Dir_Share_Extension_Install;
Name = "dict-hu.oxt";
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 1d7e0f2..764f7c0 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -1061,6 +1061,17 @@ Module gid_Module_Root_Extension_Dictionary_Gl
Styles = (HIDDEN_ROOT);
End
+Module gid_Module_Root_Extension_Dictionary_He
+ Name = "gid_Module_Root_Extension_Dictionary_He";
+ Description = "gid_Module_Root_Extension_Dictionary_He";
+ Files = (gid_File_Extension_Dictionary_He);
+ InstallOrder = "2000";
+ Spellcheckerlanguage = "he";
+ PackageInfo = "packinfo_office.txt";
+ ParentID = gid_Module_Root;
+ Styles = (HIDDEN_ROOT);
+End
+
Module gid_Module_Root_Extension_Dictionary_Hu
Name = "gid_Module_Root_Extension_Dictionary_Hu";
Description = "gid_Module_Root_Extension_Dictionary_Hu";
commit a94b7170241593580604fd2e8cbd7c588d2a9e55
Author: Kurt Zenker <kz at openoffice.org>
Date: Wed Oct 14 16:21:13 2009 +0000
CWS-TOOLING: integrate CWS jl135_nss
2009-10-01 15:20:03 +0200 jl r276605 : #1004856# moved to xmlsec1-mingw32.patch
2009-10-01 10:51:24 +0200 jl r276580 : #1004856# build keymgr with mingw
2009-10-01 10:50:52 +0200 jl r276579 : #1004856# build keymgr with mingw
2009-10-01 10:37:28 +0200 jl r276578 : #1004856# do not build xmlsec1 app
2009-09-29 16:01:31 +0200 jl r276532 : #1004856# Using libxml2 from solver if available
2009-09-26 16:31:32 +0200 jl r276477 : #i104856# xmlsec1-mscrypto-1 is now xmlsec1-mscrypto
2009-09-25 17:05:26 +0200 jl r276470 : CWS-TOOLING: rebase CWS jl135_nss to trunk at 276429 (milestone: DEV300:m60)
2009-09-24 12:57:10 +0200 jl r276419 : #i104856# libxmlsec update
2009-09-24 12:46:58 +0200 jl r276418 : #i104856# fixing mac configure problem in configure.in and regenerating configure
2009-09-23 16:49:54 +0200 jl r276405 : i#104856# configure failed on mac
2009-09-23 10:21:35 +0200 jl r276369 : #i104856# adapting patches to apply cleanly and readme change
2009-09-21 13:45:47 +0200 jl r276326 : #i104856 updating to 1.2.12, using changes patches from cmc made on xmlsec1_2_12
2009-09-21 11:27:46 +0200 jl r276319 : #i105183# forget to uncomment PATCH_FILES
2009-09-18 17:41:20 +0200 jl r276296 : #i105183# update of nss libs
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 1a28d5d..1685510 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1720,7 +1720,7 @@ End
File gid_File_Lib_LibXMLSec_xmlseccore
TXT_FILE_BODY;
#ifdef _gcc3
- Name = "libxmlsec1-1.dll";
+ Name = "libxmlsec1.dll";
#else
Name = "libxmlsec.dll";
#endif
@@ -1731,7 +1731,7 @@ End
File gid_File_Lib_LibXMLSec_xmlsecmscrypto
TXT_FILE_BODY;
#ifdef _gcc3
- Name = "libxmlsec1-mscrypto-1.dll";
+ Name = "libxmlsec1-mscrypto.dll";
#else
Name = "libxmlsec-mscrypto.dll";
#endif
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index e93b23c..cce1aac 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -172,7 +172,7 @@ NSPR4LIB=-lnspr4
PLC4LIB=-lplc4
NSSCRYPTOLIBS=$(LIBXML2LIB) $(XMLSECLIB) $(XMLSECLIB-NSS) $(NSS3LIB) $(NSPR4LIB) $(PLC4LIB)
.IF "$(GUI)$(COM)"=="WNTGCC"
-XMLSECLIB-MS=-lxmlsec1-mscrypto-1
+XMLSECLIB-MS=-lxmlsec1-mscrypto
MSCRYPTOLIBS=$(LIBXML2LIB) $(XMLSECLIB) $(XMLSECLIB-MS) $(CRYPT32LIB) $(ADVAPI32LIB)
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
BROOKERLIB=-lbrooker$(DLLPOSTFIX)
More information about the ooo-build-commit
mailing list