[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 5 commits - comphelper/Library_comphelp.mk tools/Executable_mkunroll.mk tools/Executable_rscdep.mk tools/Executable_so_checksum.mk tools/Executable_sspretty.mk tools/Library_tl.mk tools/source
Tor Lillqvist
tml at kemper.freedesktop.org
Wed Mar 16 08:32:01 PDT 2011
comphelper/Library_comphelp.mk | 4 ++--
tools/Executable_mkunroll.mk | 6 +++---
tools/Executable_rscdep.mk | 6 +++---
tools/Executable_so_checksum.mk | 6 +++---
tools/Executable_sspretty.mk | 6 +++---
tools/Library_tl.mk | 6 +++---
tools/source/string/reversemap.hxx | 2 ++
7 files changed, 19 insertions(+), 17 deletions(-)
New commits:
commit 8c09b911f64b81b5f9ec7d28a5b5912b1ac63eee
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Mar 16 17:07:11 2011 +0200
Use realpath to avoid -I options containing symlinks on Cygwin
diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk
index 7dbb613..16cc39f 100644
--- a/tools/Executable_mkunroll.mk
+++ b/tools/Executable_mkunroll.mk
@@ -29,9 +29,9 @@ $(eval $(call gb_Executable_Executable,mkunroll))
$(eval $(call gb_Executable_set_include,mkunroll,\
$$(INCLUDE) \
- -I$(SRCDIR)/tools/inc/ \
- -I$(SRCDIR)/tools/inc/pch \
- -I$(SRCDIR)/tools/bootstrp/ \
+ -I$(realpath $(SRCDIR)/tools/inc) \
+ -I$(realpath $(SRCDIR)/tools/inc/pch) \
+ -I$(realpath $(SRCDIR)/tools/bootstrp) \
))
$(eval $(call gb_Executable_set_cxxflags,mkunroll,\
diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk
index 9185b94..f12a092 100644
--- a/tools/Executable_rscdep.mk
+++ b/tools/Executable_rscdep.mk
@@ -29,9 +29,9 @@ $(eval $(call gb_Executable_Executable,rscdep))
$(eval $(call gb_Executable_set_include,rscdep,\
$$(INCLUDE) \
- -I$(SRCDIR)/tools/inc/ \
- -I$(SRCDIR)/tools/inc/pch \
- -I$(SRCDIR)/tools/bootstrp/ \
+ -I$(realpath $(SRCDIR)/tools/inc) \
+ -I$(realpath $(SRCDIR)/tools/inc/pch) \
+ -I$(realpath $(SRCDIR)/tools/bootstrp) \
))
$(eval $(call gb_Executable_set_cxxflags,rscdep,\
diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk
index 32b95be..7adf7a9 100644
--- a/tools/Executable_so_checksum.mk
+++ b/tools/Executable_so_checksum.mk
@@ -29,9 +29,9 @@ $(eval $(call gb_Executable_Executable,so_checksum))
$(eval $(call gb_Executable_set_include,so_checksum,\
$$(INCLUDE) \
- -I$(SRCDIR)/tools/inc/ \
- -I$(SRCDIR)/tools/inc/pch \
- -I$(SRCDIR)/tools/bootstrp/ \
+ -I$(realpath $(SRCDIR)/tools/inc) \
+ -I$(realpath $(SRCDIR)/tools/inc/pch) \
+ -I$(realpath $(SRCDIR)/tools/bootstrp) \
))
$(eval $(call gb_Executable_set_cxxflags,so_checksum,\
diff --git a/tools/Executable_sspretty.mk b/tools/Executable_sspretty.mk
index e560d75..5cfd087 100644
--- a/tools/Executable_sspretty.mk
+++ b/tools/Executable_sspretty.mk
@@ -29,9 +29,9 @@ $(eval $(call gb_Executable_Executable,sspretty))
$(eval $(call gb_Executable_set_include,sspretty,\
$$(INCLUDE) \
- -I$(SRCDIR)/tools/inc/ \
- -I$(SRCDIR)/tools/inc/pch \
- -I$(SRCDIR)/tools/bootstrp/ \
+ -I$(realpath $(SRCDIR)/tools/inc) \
+ -I$(realpath $(SRCDIR)/tools/inc/pch) \
+ -I$(realpath $(SRCDIR)/tools/bootstrp) \
))
$(eval $(call gb_Executable_set_cxxflags,sspretty,\
commit 1b44b5e0d81e79d18d3d7069dbcb5cc42a71d8e6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Mar 16 17:06:49 2011 +0200
No #warning in MSVC
diff --git a/tools/source/string/reversemap.hxx b/tools/source/string/reversemap.hxx
index 84b9dde..f5511bf 100644
--- a/tools/source/string/reversemap.hxx
+++ b/tools/source/string/reversemap.hxx
@@ -4,7 +4,9 @@
* can generate .cxx files nicely
*/
+#ifndef _MSC_VER
#warning "checked in generated file - urgh"
+#endif
//Do not edit manually, generated from bestreversemap.cxx
rtl_TextEncoding getBestMSEncodingByChar(sal_Unicode c)
commit ac474602b115a6f7e32570420008e6fca2284606
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Mar 16 16:57:49 2011 +0200
Use realpath to avoid -I options containing symlinks on Cygwin
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index eb832ac..405ba1e 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -142,7 +142,7 @@ ifeq ($(OS),WNT)
$(eval $(call gb_Library_set_include,tl,\
$$(INCLUDE) \
- -I$(SRCDIR)/tools/win/inc \
+ -I$(realpath $(SRCDIR)/tools/win/inc) \
))
$(eval $(call gb_Library_add_exception_objects,tl,\
commit 0568113c984307b315efbef112d5f32aa56abfa1
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Mar 16 15:53:01 2011 +0200
Revert "Revert "Use realpath to avoid -I options containing symlinks on Cygwin""
This reverts commit 00bfbcf96e5a5bbabe5cfe1811fecc96304a19fe.
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 180b7bb..eb832ac 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -33,8 +33,8 @@ $(eval $(call gb_Library_add_precompiled_header,tl,$(SRCDIR)/tools/inc/pch/preco
$(eval $(call gb_Library_set_include,tl,\
$$(INCLUDE) \
- -I$(SRCDIR)/tools/inc \
- -I$(SRCDIR)/tools/inc/pch \
+ -I$(realpath $(SRCDIR)/tools/inc) \
+ -I$(realpath $(SRCDIR)/tools/inc/pch) \
-I$(SRCDIR)/solenv/inc \
-I$(SRCDIR)/solenv/inc/Xp31 \
-I$(OUTDIR)/inc/offuh \
commit 52dce550541d9248c63f74368caac23c4f30628f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Mar 16 15:52:55 2011 +0200
Revert "Revert "Use realpath to avoid pathnames containing symlinks on Cygwin""
This reverts commit bac18077450aec272f108bf7e700bfd7fafa33ff.
diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk
index 22258a1..7c365bc 100644
--- a/comphelper/Library_comphelp.mk
+++ b/comphelper/Library_comphelp.mk
@@ -34,8 +34,8 @@ $(eval $(call gb_Library_add_precompiled_header,comphelper,$(SRCDIR)/comphelper/
$(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp))
$(eval $(call gb_Library_set_include,comphelper,\
- -I$(SRCDIR)/comphelper/inc/pch \
- -I$(SRCDIR)/comphelper/source/inc \
+ -I$(realpath $(SRCDIR)/comphelper/inc/pch) \
+ -I$(realpath $(SRCDIR)/comphelper/source/inc) \
$$(INCLUDE) \
-I$(OUTDIR)/inc/offuh \
))
More information about the Libreoffice-commits
mailing list