[Libreoffice-commits] .: 3 commits - scp2/source soldep/bootstrp soldep/inc soldep/source solenv/inc splitbuild/common.lst
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Mon Oct 25 19:26:36 PDT 2010
scp2/source/ooo/file_library_ooo.scp | 11 -----------
scp2/source/ooo/module_hidden_ooo.scp | 1 -
soldep/bootstrp/makefile.mk | 3 +--
soldep/bootstrp/prj.cxx | 2 +-
soldep/inc/soldep/prj.hxx | 4 ++--
soldep/source/makefile.mk | 2 --
solenv/inc/libs.mk | 4 +---
splitbuild/common.lst | 2 +-
8 files changed, 6 insertions(+), 23 deletions(-)
New commits:
commit d479d45dec347eabfaf83a0635b3d31adc76f235
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Oct 21 16:27:55 2010 -0500
Finally, gut the vos module out of the build
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 81fc177..d005e69 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1567,17 +1567,6 @@ File gid_File_Lib_Vcl
RegistryID = gid_Starregistry_Services_Rdb;
End
-File gid_File_Lib_Vos
- TXT_FILE_BODY;
- #ifdef UNX
- Name = STRING(CONCAT3(libvos3,COMID,UNXSUFFIX));
- #else
- Name = STRING(CONCAT3(vos3,COMID,.dll));
- #endif
- Dir = SCP2_OOO_BIN_DIR;
- Styles = (PACKED);
-End
-
// STD_UNO_LIB_FILE( gid_File_Lib_Wrp, wrp)
STD_UNO_LIB_FILE( gid_File_Lib_Xcr, xcr)
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index a2ca40c..69b3e7c 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -330,7 +330,6 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Tab,
gid_File_Lib_Tab2,
gid_File_Lib_Unoxml,
- gid_File_Lib_Vos,
gid_File_Lib_Localebe,
gid_File_Lib_Migrationoo2,
gid_File_Lib_Syssh,
diff --git a/soldep/bootstrp/makefile.mk b/soldep/bootstrp/makefile.mk
index 56d3fa1..60b2242 100644
--- a/soldep/bootstrp/makefile.mk
+++ b/soldep/bootstrp/makefile.mk
@@ -63,8 +63,7 @@ SHL1DEPN =$(SHL1LIBS)
SHL1STDLIBS=\
$(TOOLSLIB) \
$(BTSTRPLIB) \
- $(VOSLIB) \
- $(SALLIB)
+ $(SALLIB)
DEF1NAME =$(SHL1TARGET)
DEF1DEPN =$(MISC)$/$(SHL1TARGET).flt
diff --git a/soldep/source/makefile.mk b/soldep/source/makefile.mk
index 5261ee5..0e91135 100644
--- a/soldep/source/makefile.mk
+++ b/soldep/source/makefile.mk
@@ -70,7 +70,6 @@ SHL1STDLIBS = $(SVTOOLLIB) \
$(SOTLIB) \
$(BTSTRPLIB) \
$(TOOLSLIB) \
- $(VOSLIB) \
$(SALLIB) \
$(CPPULIB) \
$(PERL_LIB)
@@ -111,7 +110,6 @@ APP1STDLIBS= \
$(SOTLIB) \
$(BTSTRPLIB) \
$(TOOLSLIB) \
- $(VOSLIB) \
$(SALLIB) \
$(CPPULIB) \
$(PERL_LIB)
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 8f6ee22..06c720c 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -95,7 +95,6 @@ REGLIB=-lreg$(UDK_MAJOR)
REGLIB=-lreg
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
.INCLUDE .IGNORE : vos/version.mk
-VOSLIB=-lvos$(VOS_MAJOR)$(COMID)
XMLOFFLIB=-lxo$(DLLPOSTFIX)
XMLOFFLLIB=-lxol
.IF "$(GUI)$(COM)"=="WNTGCC"
@@ -324,7 +323,7 @@ BFSVTOOLLIB=-lbf_svt$(DLLPOSTFIX)
# Libraries
USED_OSL_LIBS =
USED_VOS_LIBS = $(OSLLIB)
-USED_UNO_LIBS = $(VOSLIB) $(OSLLIB)
+USED_UNO_LIBS = $(OSLLIB)
USED_TOOLS_LIBS =
USED_SOT_LIBS = $(TOOLSLIB)
USED_VCL_LIBS = $(SOTLIB) $(TOOLSLIB) $(USED_UNO_LIBS)
@@ -394,7 +393,6 @@ TOOLSLIB=itools.lib
TOOLSLIBST=atools.lib
BPICONVLIB=bpiconv.lib
SALLIB=isal.lib
-VOSLIB=ivos.lib
UNOTOOLSLIB=iutl.lib
RMCXTLIB=irmcxt.lib
XMLOFFLIB=ixo.lib
diff --git a/splitbuild/common.lst b/splitbuild/common.lst
index a82dc37..2b92492 100644
--- a/splitbuild/common.lst
+++ b/splitbuild/common.lst
@@ -1 +1 @@
-basebmp basegfx bean comphelper configmgr connectivity embeddedobj embedserv eventattacher fileaccess i18npool i18nutil linguistic lingucomponent o3tl officecfg oovbaapi package pyuno regexp rsc sax shell sot svl tools transex3 ucb ucbhelper unotools unoxml vos xmlhelp xmloff xmlscript wizards
+basebmp basegfx bean comphelper configmgr connectivity embeddedobj embedserv eventattacher fileaccess i18npool i18nutil linguistic lingucomponent o3tl officecfg oovbaapi package pyuno regexp rsc sax shell sot svl tools transex3 ucb ucbhelper unotools unoxml xmlhelp xmloff xmlscript wizards
commit 01db245fee554e3803dce1e8a1eb0df20d6ad3a6
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Oct 20 19:21:47 2010 -0500
remvove vos/macros.h usage
diff --git a/soldep/inc/soldep/prj.hxx b/soldep/inc/soldep/prj.hxx
index f02dbd8..25e0c00 100644
--- a/soldep/inc/soldep/prj.hxx
+++ b/soldep/inc/soldep/prj.hxx
@@ -380,7 +380,7 @@ private:
ByteString aStarName; // no idee what this should be
protected:
- NAMESPACE_VOS( OMutex ) aMutex;
+ osl::Mutex aMutex;
USHORT nStarMode;
SolarFileList aFileList;
commit 84fc610c17d4a0e9777c99a326b9673f4a8788d9
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Oct 16 03:14:13 2010 -0500
merge vosremoval-mutex.diff
In practice the changeset is 'inspired' by vosremoval-mutex.diff
but was essentially redone manually
diff --git a/soldep/bootstrp/prj.cxx b/soldep/bootstrp/prj.cxx
index dcc14e1..6654ba1 100644
--- a/soldep/bootstrp/prj.cxx
+++ b/soldep/bootstrp/prj.cxx
@@ -28,7 +28,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <bootstrp/sstring.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#define ENABLE_BYTESTRING_STREAM_OPERATORS
#include <tools/stream.hxx>
diff --git a/soldep/inc/soldep/prj.hxx b/soldep/inc/soldep/prj.hxx
index d9c2508..f02dbd8 100644
--- a/soldep/inc/soldep/prj.hxx
+++ b/soldep/inc/soldep/prj.hxx
@@ -31,7 +31,7 @@
#include <tools/fsys.hxx>
#include <tools/stream.hxx>
#include <bootstrp/listmacr.hxx>
-#include <vos/mutex.hxx>
+#include <osl/mutex.hxx>
#include <tools/string.hxx>
#define XML_EXT "xlist"
More information about the Libreoffice-commits
mailing list