[Libreoffice-commits] .: 4 commits - cli_ure/source embedserv/source embedserv/util
Tor Lillqvist
tml at kemper.freedesktop.org
Wed Aug 17 13:37:08 PDT 2011
cli_ure/source/climaker/makefile.mk | 19 ++++---------------
cli_ure/source/native/makefile.mk | 33 ++++++---------------------------
cli_ure/source/uno_bridge/makefile.mk | 16 ++++------------
embedserv/source/embed/esdll.cxx | 3 ---
embedserv/source/inc/embeddoc.hxx | 3 ---
embedserv/source/inc/servprov.hxx | 4 ----
embedserv/util/makefile.mk | 12 ++++++------
7 files changed, 20 insertions(+), 70 deletions(-)
New commits:
commit f3423eab7815827857149995e69d00c7b641282d
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Aug 17 23:21:24 2011 +0300
Fix MSVC build against debugging runtime
diff --git a/cli_ure/source/climaker/makefile.mk b/cli_ure/source/climaker/makefile.mk
index 3362c6a..45dfc60 100644
--- a/cli_ure/source/climaker/makefile.mk
+++ b/cli_ure/source/climaker/makefile.mk
@@ -96,8 +96,13 @@ APP1STDLIBS = \
$(SALLIB) \
mscoree.lib
+.IF "$(USE_DEBUG_RUNTIME)" == ""
APP1STDLIBS += \
msvcmrt.lib
+.ELSE
+APP1STDLIBS += \
+ msvcmrtd.lib
+.ENDIF
.ENDIF
diff --git a/cli_ure/source/native/makefile.mk b/cli_ure/source/native/makefile.mk
index e912bff..a4e2a5f 100644
--- a/cli_ure/source/native/makefile.mk
+++ b/cli_ure/source/native/makefile.mk
@@ -100,8 +100,13 @@ SHL1STDLIBS = \
mscoree.lib \
Advapi32.lib
+.IF "$(USE_DEBUG_RUNTIME)" == ""
SHL1STDLIBS += \
msvcmrt.lib
+.ELSE
+SHL1STDLIBS += \
+ msvcmrtd.lib
+.ENDIF
SHL1VERSIONMAP = msvc.map
diff --git a/cli_ure/source/uno_bridge/makefile.mk b/cli_ure/source/uno_bridge/makefile.mk
index 459d32b..74ffa58 100644
--- a/cli_ure/source/uno_bridge/makefile.mk
+++ b/cli_ure/source/uno_bridge/makefile.mk
@@ -65,8 +65,13 @@ SHL1STDLIBS = \
$(SALLIB) \
mscoree.lib
+.IF "$(USE_DEBUG_RUNTIME)" == ""
SHL1STDLIBS += \
msvcmrt.lib
+.ELSE
+SHL1STDLIBS += \
+ msvcmrtd.lib
+.ENDIF
SHL1VERSIONMAP = bridge_exports.map
commit a50103a7028254a2113c2e21b31cc372dfc77570
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Aug 17 23:00:00 2011 +0300
Bin stuff for compiler versions we don't use
diff --git a/cli_ure/source/climaker/makefile.mk b/cli_ure/source/climaker/makefile.mk
index b001a15..3362c6a 100644
--- a/cli_ure/source/climaker/makefile.mk
+++ b/cli_ure/source/climaker/makefile.mk
@@ -80,11 +80,7 @@ CFLAGSCXX +=-AI$(BIN)
# When compiling for CLR, disable "warning C4339: use of undefined type detected
# in CLR meta-data - use of this type may lead to a runtime exception":
-.IF "$(COMEX)"=="10"
-CFLAGSCXX += -clr:noAssembly -wd4339
-.ELSE
CFLAGSCXX += -clr:oldSyntax -LN -wd4339 -wd4715
-.ENDIF
OBJFILES = \
$(OBJ)$/climaker_app.obj \
@@ -100,15 +96,11 @@ APP1STDLIBS = \
$(SALLIB) \
mscoree.lib
-.IF "$(CCNUMVER)" >= "001399999999"
APP1STDLIBS += \
msvcmrt.lib
-.ENDIF
.ENDIF
-
-
.INCLUDE : $(PRJ)$/util$/target.pmk
.INCLUDE : target.mk
@@ -116,22 +108,14 @@ CLIMAKER_CONFIG = $(BIN)$/climaker.exe.config
ALLTAR: \
$(CLIMAKER_CONFIG)
-
-
#Create the config file that is used with the policy assembly
$(CLIMAKER_CONFIG): climaker.exe.config
$(COPY) $< $@
chmod +x $@
-
.IF "$(BUILD_FOR_CLI)" != ""
$(OBJFILES): $(BIN)$/cli_basetypes.dll
-
.ENDIF
-
-
-
-
diff --git a/cli_ure/source/native/makefile.mk b/cli_ure/source/native/makefile.mk
index d0b87e6..e912bff 100644
--- a/cli_ure/source/native/makefile.mk
+++ b/cli_ure/source/native/makefile.mk
@@ -79,19 +79,13 @@ UNOTYPES = \
#loader lock was solved as of VS 2005 (CCNUMVER = 0014..)
# When compiling for CLR, disable "warning C4339: use of undefined type detected
# in CLR meta-data - use of this type may lead to a runtime exception":
-.IF "$(CCNUMVER)" >= "001399999999"
CFLAGSCXX += -clr:oldSyntax -AI $(BIN) -wd4339
-.ELSE
-CFLAGSCXX += -clr -AI $(BIN) -wd4339
-#see Microsoft Knowledge Base Article - 814472
-LINKFLAGS += -NOENTRY -NODEFAULTLIB:nochkclr.obj -INCLUDE:__DllMainCRTStartup at 12
-.ENDIF
SLOFILES = \
$(SLO)$/native_bootstrap.obj \
$(SLO)$/path.obj \
$(SLO)$/assembly_cppuhelper.obj
-
+
SHL1OBJS = $(SLOFILES)
@@ -106,10 +100,8 @@ SHL1STDLIBS = \
mscoree.lib \
Advapi32.lib
-.IF "$(CCNUMVER)" >= "001399999999"
SHL1STDLIBS += \
msvcmrt.lib
-.ENDIF
SHL1VERSIONMAP = msvc.map
@@ -127,10 +119,7 @@ ALLTAR: \
$(SIGN)
-
-.IF "$(CCNUMVER)" >= "001399999999"
CFLAGSCXX += -clr:oldSyntax
-.ENDIF
$(ASSEMBLY_ATTRIBUTES) : assembly.cxx $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk
@echo $(ASSEMBLY_KEY_X)
@@ -141,20 +130,14 @@ $(ASSEMBLY_ATTRIBUTES) : assembly.cxx $(BIN)$/cliuno.snk $(BIN)$/cliureversion.m
echo \
'[assembly:System::Reflection::AssemblyKeyFile($(ASSEMBLY_KEY_X))];' \
>> $(OUT)$/misc$/assembly_cppuhelper.cxx
-
-
#make sure we build cli_cppuhelper after the version changed
$(SHL1OBJS) : $(BIN)$/cli_cppuhelper.config
-
-
$(SIGN): $(SHL1TARGETN)
$(WRAPCMD) sn.exe -R $(BIN)$/$(TARGET).dll $(BIN)$/cliuno.snk && $(TOUCH) $@
#do not forget to deliver cli_cppuhelper.config. It is NOT embedded in the policy file.
-.IF "$(CCNUMVER)" >= "001399999999"
-#.NET 2 and higher
# If the x86 switch is ommitted then the system assumes the assembly to be MSIL.
# The policy file is still found when an application tries to load an older
# cli_cppuhelper.dll but the system cannot locate it. It possibly assumes that the
@@ -165,19 +148,10 @@ $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_cppuhelper.config
-keyfile:$(BIN)$/cliuno.snk \
-link:$(BIN)$/cli_cppuhelper.config \
-platform:x86
-.ELSE
-#.NET 1.1: platform flag not needed
-$(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_cppuhelper.config
- $(WRAPCMD) AL.exe -out:$@ \
- -version:$(CLI_CPPUHELPER_POLICY_VERSION) \
- -keyfile:$(BIN)$/cliuno.snk \
- -link:$(BIN)$/cli_cppuhelper.config
-.ENDIF
#Create the config file that is used with the policy assembly
$(BIN)$/cli_cppuhelper.config: cli_cppuhelper_config $(BIN)$/cliureversion.mk
$(PERL) $(SOLARENV)$/bin$/clipatchconfig.pl \
$< $@
-
-.ENDIF # "$(BUILD_FOR_CLI)" != ""
+.ENDIF # "$(BUILD_FOR_CLI)" != ""
diff --git a/cli_ure/source/uno_bridge/makefile.mk b/cli_ure/source/uno_bridge/makefile.mk
index b7682ae..459d32b 100644
--- a/cli_ure/source/uno_bridge/makefile.mk
+++ b/cli_ure/source/uno_bridge/makefile.mk
@@ -38,26 +38,15 @@ USE_DEFFILE = TRUE
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
.IF "$(COM)" == "MSC"
# When compiling for CLR, disable "warning C4339: use of undefined type detected
# in CLR meta-data - use of this type may lead to a runtime exception":
-.IF "$(CCNUMVER)" <= "001399999999"
-CFLAGSCXX += -clr -AI $(DLLDEST) -AI $(SOLARBINDIR) -wd4339
-.ELSE
CFLAGSCXX += -clr:oldSyntax -AI $(DLLDEST) -AI $(SOLARBINDIR) -wd4339
-.ENDIF
.IF "$(debug)" != ""
CFLAGS += -Ob0
.ENDIF
-
-
-.IF "$(CCNUMVER)" <= "001399999999"
-#see Microsoft Knowledge Base Article - 814472
-LINKFLAGS += -NOENTRY -NODEFAULTLIB:nochkclr.obj -INCLUDE:__DllMainCRTStartup at 12
-.ENDIF
# --- Files --------------------------------------------------------
SLOFILES = \
@@ -76,10 +65,8 @@ SHL1STDLIBS = \
$(SALLIB) \
mscoree.lib
-.IF "$(CCNUMVER)" >= "001399999999"
SHL1STDLIBS += \
msvcmrt.lib
-.ENDIF
SHL1VERSIONMAP = bridge_exports.map
commit 94fb4e55c8f83442e79c99515b8cdf33997f56c4
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Aug 17 22:03:54 2011 +0300
Fix MSVC build with debugging C/C++ runtime, i.e. with --enable-dbgutil
Whether this stuff actually works with the debugging runtime is
another question... The reason why the .cxx and .hxx files in this
commit explicitly undefined _DEBUG is unknown. As usual the old commit
message doesn't give any clue. Hamburg apparently didn't use the debug
runtime in their "dbgutil" a.k.a. "non-pro" builds?
diff --git a/embedserv/source/embed/esdll.cxx b/embedserv/source/embed/esdll.cxx
index 56ee550..ab92a97 100644
--- a/embedserv/source/embed/esdll.cxx
+++ b/embedserv/source/embed/esdll.cxx
@@ -29,9 +29,6 @@
#define STRICT
#define _WIN32_WINNT 0x0400
#define _WIN32_DCOM
-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
-#undef _DEBUG
-#endif
#if defined(_MSC_VER) && (_MSC_VER > 1310)
#pragma warning(disable : 4917 4555)
#endif
diff --git a/embedserv/source/inc/embeddoc.hxx b/embedserv/source/inc/embeddoc.hxx
index 40081ab..fef44f1 100644
--- a/embedserv/source/inc/embeddoc.hxx
+++ b/embedserv/source/inc/embeddoc.hxx
@@ -28,9 +28,6 @@
#ifndef _EMBEDDOC_HXX_
#define _EMBEDDOC_HXX_
-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
-#undef _DEBUG
-#endif
#if defined(_MSC_VER) && (_MSC_VER > 1310)
#pragma warning(disable : 4917 4555)
#endif
diff --git a/embedserv/source/inc/servprov.hxx b/embedserv/source/inc/servprov.hxx
index cc861d2..963170c 100644
--- a/embedserv/source/inc/servprov.hxx
+++ b/embedserv/source/inc/servprov.hxx
@@ -29,10 +29,6 @@
#ifndef _SERVPROV_HXX
#define _SERVPROV_HXX
-#if defined(_MSC_VER) && (_MSC_VER >= 1300)
-#undef _DEBUG
-#endif
-
#include "common.h"
#include <oleidl.h>
#include <com/sun/star/uno/Reference.h>
diff --git a/embedserv/util/makefile.mk b/embedserv/util/makefile.mk
index 0051d7a..ce4b08b 100644
--- a/embedserv/util/makefile.mk
+++ b/embedserv/util/makefile.mk
@@ -69,8 +69,14 @@ SHL1STDLIBS=\
.IF "$(COM)"=="MSC"
SHL1STDLIBS+=\
- $(ADVAPI32LIB) \
+ $(ADVAPI32LIB)
+.IF "$(USE_DEBUG_RUNTIME)" == ""
+SHL1STDLIBS+=\
$(ATL_LIB)$/atls.lib
+.ELSE
+SHL1STDLIBS+=\
+ $(ATL_LIB)$/atlsd.lib
+.ENDIF
.ENDIF # "$(COM)"=="MSC"
commit 2e9c7ef2b065aff27f1f53ade9e5c9ba57b19f75
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Aug 17 22:00:42 2011 +0300
Bin a couple of duplicated and unneeded lines
diff --git a/embedserv/util/makefile.mk b/embedserv/util/makefile.mk
index 1f8ad8a..0051d7a 100644
--- a/embedserv/util/makefile.mk
+++ b/embedserv/util/makefile.mk
@@ -68,12 +68,6 @@ SHL1STDLIBS=\
$(OLEAUT32LIB)
.IF "$(COM)"=="MSC"
-.IF "$(CCNUMVER)" >= "001300000000" && "$(CCNUMVER)" <= "001399999999"
-SHL1STDLIBS+=\
- $(ADVAPI32LIB) \
- $(ATL_LIB)$/atls.lib
-.ENDIF
-
SHL1STDLIBS+=\
$(ADVAPI32LIB) \
$(ATL_LIB)$/atls.lib
More information about the Libreoffice-commits
mailing list