[Libreoffice-commits] .: 3 commits - Repository.mk scp2/inc solenv/gbuild solenv/inc
David Tardon
dtardon at kemper.freedesktop.org
Wed Feb 22 02:01:44 PST 2012
Repository.mk | 14 +++++++-------
scp2/inc/macros.inc | 3 +--
solenv/gbuild/platform/WNT_INTEL_GCC.mk | 8 ++++----
solenv/inc/libs.mk | 14 +++++++++++---
4 files changed, 23 insertions(+), 16 deletions(-)
New commits:
commit 9116f5fdeb305561e24ed4ed3e0e6ffa23e86b05
Author: David Tardon <dtardon at redhat.com>
Date: Wed Feb 22 10:22:11 2012 +0100
jvmfwk is versioned
This reverts commit 1e4961b82554bcac4e7103345354ed8fb7782472.
Conflicts:
Repository.mk
diff --git a/Repository.mk b/Repository.mk
index a2188a9..9e7907a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -327,7 +327,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
jpipe \
juh \
juhx \
- jvmfwk \
log_uno \
reg \
sal_textenc \
@@ -504,6 +503,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
$(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
cppu \
+ jvmfwk \
sal \
))
commit 2dea294025d3468ca4afffe04ce697dcfe72de36
Author: David Tardon <dtardon at redhat.com>
Date: Wed Feb 22 10:15:34 2012 +0100
put version number in all versioned URE libs' names on MinGW
It does not make sense to do it for some of them, but not all. It is
also inconsistent with other platforms.
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 0ceb511..690a21d 100755
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -515,16 +515,15 @@ End
#define SCP2_URE_DL_COMID_VER(n, v) n v STRING(COMID) ".dll"
#define SCP2_URE_DL_COMID_NORMAL(n) n STRING(COMID) ".dll"
#define SCP2_URE_DL_UNO_VER(n, v) n v ".dll"
+#define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll"
#define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure
#if defined _MSC_VER
-#define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll"
#if defined _DEBUG_RUNTIME
#define SCP2_STDLP_DEBUG "d"
#else
#define SCP2_STDLP_DEBUG ""
#endif
#else // GCC
-#define SCP2_URE_DL_UNO_COMID_VER(n, v) n STRING(COMID) ".dll"
#define SCP2_STDLP_DEBUG ""
#endif
#else
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index e1401db..43d0d28 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -225,7 +225,7 @@ gb_Library_UDK_MAJORVER := 3
gb_Library_PLAINEXT := .dll.a
gb_Library_RTEXT := gcc3$(gb_Library_PLAINEXT)
-gb_Library_RTVEREXT := $(gb_Library_RTEXT)
+gb_Library_RTVEREXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_RTEXT)
gb_Library_OOOEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_PLAINEXT)
gb_Library_UNOEXT := .uno$(gb_Library_PLAINEXT)
gb_Library_UNOVEREXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_PLAINEXT)
@@ -233,7 +233,7 @@ gb_Library_UNOVEREXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_PLAINEXT)
gb_Library_DLLEXT := .dll
gb_Library_RTDLLEXT := gcc3$(gb_Library_DLLEXT)
-gb_Library_RTVERDLLEXT := $(gb_Library_RTDLLEXT)
+gb_Library_RTVERDLLEXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_RTDLLEXT)
gb_Library_OOODLLEXT := $(gb_Library_DLLPOSTFIX)$(gb_Library_DLLEXT)
gb_Library_UNODLLEXT := .uno$(gb_Library_DLLEXT)
gb_Library_UNOVERDLLEXT := $(gb_Library_UDK_MAJORVER)$(gb_Library_DLLEXT)
@@ -292,7 +292,7 @@ gb_Library_FILENAMES :=\
$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_PLAINEXT)) \
$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
- $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTEXT)) \
+ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(gb_Library_SYSPRE)$(lib)$(gb_Library_RTVEREXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNOEXT)) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(gb_Library_UNOVERPRE)$(lib)$(gb_Library_PLAINEXT)) \
@@ -304,7 +304,7 @@ gb_Library_DLLFILENAMES :=\
$(foreach lib,$(gb_Library_PLAINLIBS_URE),$(lib):$(lib)$(gb_Library_DLLEXT)) \
$(foreach lib,$(gb_Library_PLAINLIBS_OOO),$(lib):$(lib)$(gb_Library_DLLEXT)) \
$(foreach lib,$(gb_Library_RTLIBS),$(lib):$(lib)$(gb_Library_RTDLLEXT)) \
- $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTDLLEXT)) \
+ $(foreach lib,$(gb_Library_RTVERLIBS),$(lib):$(lib)$(gb_Library_RTVERDLLEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_URE),$(lib):$(lib)$(gb_Library_UNODLLEXT)) \
$(foreach lib,$(gb_Library_UNOLIBS_OOO),$(lib):$(lib)$(gb_Library_UNODLLEXT)) \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):$(lib)$(gb_Library_UNOVERDLLEXT)) \
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 12db54a..4ef0707 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -34,6 +34,14 @@ LIBSMKREV!:="$$Revision: 1.134.2.3 $$"
.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
+# workaround for MinGW to get the same DLL names as with MSC
+# e.g., uno_salhelper3gcc3.dll (vs. uno_salhelpergcc3.dll)
+.IF "$(GUI)" == "WNT"
+COMID_WITH_VERSION = $(UDK_MAJOR)$(COMID)
+.ELSE
+COMID_WITH_VERSION = $(COMID)
+.ENDIF
+
.IF "$(GUI)" == "WNT"
ODMA_LIB_LIB=-lodma_lib
.ENDIF
@@ -63,7 +71,7 @@ I18NUTILLIB=-li18nutil$(COMID)
I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID)
I18NPAPERLIB=-li18npaper$(DLLPOSTFIX)
I18NREGEXPLIB=-li18nregexp$(DLLPOSTFIX)
-SALHELPERLIB=-luno_salhelper$(COMID)
+SALHELPERLIB=-luno_salhelper$(COMID_WITH_VERSION)
XMLSCRIPTLIB =-lxcr$(DLLPOSTFIX)
COMPHELPERLIB=-lcomphelp$(COMID)
CONNECTIVITYLIB=-lconnectivity
@@ -72,7 +80,7 @@ TOOLSLIBST=-latools
BPICONVLIB=-lbpiconv
TOOLSLIB=-ltl$(DLLPOSTFIX)
CPPULIB=-luno_cppu
-CPPUHELPERLIB=-luno_cppuhelper$(COMID)
+CPPUHELPERLIB=-luno_cppuhelper$(COMID_WITH_VERSION)
UCBHELPERLIB=-lucbhelper4$(COMID)
.IF "$(SYSTEM_OPENSSL)" == "YES"
OPENSSLLIB=$(OPENSSL_LIBS)
@@ -236,7 +244,7 @@ ISCLIB=-lsc$(DLLPOSTFIX)
ISDLIB=-lsd$(DLLPOSTFIX)
PKGCHKLIB=-lpkgchk$(DLLPOSTFIX)
HELPLINKERLIB=-lhelplinker$(DLLPOSTFIX)
-JVMACCESSLIB = -ljvmaccess$(COMID)
+JVMACCESSLIB = -ljvmaccess$(COMID_WITH_VERSION)
.IF "$(SYSTEM_CPPUNIT)"=="YES"
CPPUNITLIB = $(CPPUNIT_LIBS)
.ELSE
commit 0e981390fb8000c0a5d2bb98917f4ffff6ad636a
Author: David Tardon <dtardon at redhat.com>
Date: Wed Feb 22 07:26:42 2012 +0100
these libs belong to URE
diff --git a/Repository.mk b/Repository.mk
index e164ac4..a2188a9 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -323,12 +323,17 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
endif
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
+ affine_uno \
jpipe \
juh \
juhx \
jvmfwk \
+ log_uno \
+ reg \
sal_textenc \
+ store \
sunjavaplugin \
+ unsafe_uno \
xmlreader \
))
@@ -341,7 +346,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
endif
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- affine_uno \
avmediagst \
avmediawin \
cached1 \
@@ -358,15 +362,12 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
localedata_es \
localedata_euro \
localedata_others \
- log_uno \
mcnttype \
package2 \
- reg \
scriptframe \
smoketest \
sofficeapp \
srtrs1 \
- store \
subsequenttest \
test \
textconv_dict \
@@ -379,7 +380,6 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
unoexceptionprotector \
unopkgapp \
unotest \
- unsafe_uno \
updchk \
xmlsecurity \
xsec_fw \
@@ -429,7 +429,6 @@ $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
basprov \
- bootstrap \
cairocanvas \
canvasfactory \
configmgr \
@@ -500,6 +499,7 @@ endif
$(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
binaryurp \
+ bootstrap \
))
$(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
More information about the Libreoffice-commits
mailing list