[Libreoffice-commits] .: 6 commits - chart2/JunitTest_chart2_unoapi.mk chart2/Library_charttools.mk chart2/Library_chartview.mk .gitattributes sc/Library_scd.mk sc/Library_scfilt.mk sc/Library_sc.mk sc/Library_scui.mk sc/Library_sd.mk sc/Library_vbaobj.mk
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Sun Jul 24 11:48:38 PDT 2011
.gitattributes | 1 +
chart2/JunitTest_chart2_unoapi.mk | 2 +-
chart2/Library_charttools.mk | 3 +--
chart2/Library_chartview.mk | 3 +--
sc/Library_sc.mk | 3 +--
sc/Library_scd.mk | 4 ----
sc/Library_scfilt.mk | 4 ----
sc/Library_scui.mk | 4 ----
sc/Library_vbaobj.mk | 6 +-----
9 files changed, 6 insertions(+), 24 deletions(-)
New commits:
commit 478c04b447a51563b60478518c55e829379328c9
Merge: 437225b... 8dca87b...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sun Jul 24 19:22:58 2011 +0200
Merge branch 'master' into feature/gnumake4
commit 437225b84734243b1fb0ff048126d6b291eded0c
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Jul 22 21:28:17 2011 +0200
postmerge fixes for gnumake4
diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk
index deb0753..058476f 100644
--- a/sc/Library_scd.mk
+++ b/sc/Library_scd.mk
@@ -32,11 +32,11 @@ $(eval $(call gb_Library_set_include,scd,\
$$(INCLUDE) \
))
-))
-
$(eval $(call gb_Library_add_api,scd,\
offapi \
udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,scd,\
cppu \
cppuhelper \
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 26fae54..9d9b413 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -36,11 +36,11 @@ $(eval $(call gb_Library_set_include,scfilt,\
-I$(OUTDIR)/inc \
))
-))
-
$(eval $(call gb_Library_add_api,scfilt,\
offapi \
udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,scfilt,\
basegfx \
comphelper \
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index c124087..f2e4056 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -32,11 +32,11 @@ $(eval $(call gb_Library_set_include,scui,\
$$(INCLUDE) \
))
-))
-
$(eval $(call gb_Library_add_api,scui,\
offapi \
udkapi \
+))
+
$(eval $(call gb_Library_add_linked_libs,scui,\
comphelper \
cppu \
commit 1a0979c6012b44a3b4ef8aca7c59ad3a0e0af54e
Merge: aedf5d7... 1bae003...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Thu Jul 21 18:32:46 2011 +0200
resyncing to master
diff --cc chart2/Library_charttools.mk
index 6f4660b,9eac639..e88a27d
--- a/chart2/Library_charttools.mk
+++ b/chart2/Library_charttools.mk
@@@ -34,10 -34,10 +34,9 @@@ $(eval $(call gb_Library_set_include,ch
-I$(realpath $(SRCDIR)/chart2/inc/pch) \
-I$(realpath $(SRCDIR)/chart2/source/inc) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,charttools,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,charttools,\
-DOOO_DLLIMPLEMENTATION_CHARTTOOLS \
))
diff --cc chart2/Library_chartview.mk
index 82f29ac,9fc0e50..a905456
--- a/chart2/Library_chartview.mk
+++ b/chart2/Library_chartview.mk
@@@ -35,10 -35,10 +35,9 @@@ $(eval $(call gb_Library_set_include,ch
-I$(realpath $(SRCDIR)/chart2/source/view/inc) \
-I$(realpath $(SRCDIR)/chart2/source/inc) \
-I$(OUTDIR)/inc \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,chartview,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,chartview,\
-DOOO_DLLIMPLEMENTATION_CHARTVIEW \
))
diff --cc sc/Library_sc.mk
index 7f1f36a,3b82fd0..dcb105d
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@@ -36,10 -36,10 +36,9 @@@ $(eval $(call gb_Library_set_include,sc
-I$(WORKDIR)/SdiTarget/sc/sdi \
-I$(WORKDIR)/Misc/sc/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,sc,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sc,\
-DSC_DLLIMPLEMENTATION \
-DSC_INFO_OSVERSION=\"$(OS)\" \
))
diff --cc sc/Library_scd.mk
index 6286845,5b4aa84..deb0753
--- a/sc/Library_scd.mk
+++ b/sc/Library_scd.mk
@@@ -30,9 -30,17 +30,13 @@@ $(eval $(call gb_Library_set_include,sc
-I$(realpath $(SRCDIR)/sc/inc) \
-I$(WORKDIR)/Misc/sc/ \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,scd,\
- $$(DEFS) \
+ ))
+
+ $(eval $(call gb_Library_add_api,scd,\
+ offapi \
+ udkapi \
-))
-
$(eval $(call gb_Library_add_linked_libs,scd,\
cppu \
cppuhelper \
diff --cc sc/Library_scfilt.mk
index 5c74d09,04e6dba..26fae54
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@@ -36,7 -36,15 +36,11 @@@ $(eval $(call gb_Library_set_include,sc
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_set_defs,scfilt,\
- $$(DEFS) \
+ ))
+
+ $(eval $(call gb_Library_add_api,scfilt,\
+ offapi \
+ udkapi \
-))
-
$(eval $(call gb_Library_add_linked_libs,scfilt,\
basegfx \
comphelper \
diff --cc sc/Library_scui.mk
index 3473fa7,ce806b4..c124087
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@@ -30,9 -30,17 +30,13 @@@ $(eval $(call gb_Library_set_include,sc
-I$(WORKDIR)/SdiTarget/sc/sdi \
-I$(WORKDIR)/Misc/sc \
$$(INCLUDE) \
- -I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,scui,\
- $$(DEFS) \
+ ))
+
+ $(eval $(call gb_Library_add_api,scui,\
+ offapi \
+ udkapi \
-))
-
$(eval $(call gb_Library_add_linked_libs,scui,\
comphelper \
cppu \
diff --cc sc/Library_vbaobj.mk
index 437607d,58dc936..eb66b69
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@@ -132,6 -137,20 +136,17 @@@ $(eval $(call gb_Library_add_exception_
sc/source/ui/vba/vbawsfunction \
))
+ #32bit Fedora gcc 4.6.1 fails to link sc without this
+ #TO-DO: make standalone reproducer for this and file
+ #gcc bug
+ ifeq ($(strip $(COM)),GCC)
+ $(eval $(call gb_Library_add_cxxobjects,vbaobj,\
+ sc/source/ui/vba/vbasheetobjects \
+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+ ))
+ else
+ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
+ sc/source/ui/vba/vbasheetobjects \
-))
-endif
-
ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_linked_libs,vbaobj,\
advapi32 \
commit aedf5d7f42f7adafa201fbe811e663d5340e4cd3
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Jun 21 12:54:01 2011 +0200
gnumake4: postmerge fixes in sc
diff --git a/chart2/JunitTest_chart2_unoapi.mk b/chart2/JunitTest_chart2_unoapi.mk
index 1571f3d..da35eea 100644
--- a/chart2/JunitTest_chart2_unoapi.mk
+++ b/chart2/JunitTest_chart2_unoapi.mk
@@ -25,7 +25,7 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-$(eval $(call gb_JunitTest_JunitTest,chart2_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,chart2_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,chart2_unoapi,\
$$(DEFS) \
diff --git a/chart2/Library_charttools.mk b/chart2/Library_charttools.mk
index 2bf40ca..6f4660b 100644
--- a/chart2/Library_charttools.mk
+++ b/chart2/Library_charttools.mk
@@ -37,8 +37,7 @@ $(eval $(call gb_Library_set_include,charttools,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,charttools,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,charttools,\
-DOOO_DLLIMPLEMENTATION_CHARTTOOLS \
))
diff --git a/chart2/Library_chartview.mk b/chart2/Library_chartview.mk
index 802a13d..82f29ac 100644
--- a/chart2/Library_chartview.mk
+++ b/chart2/Library_chartview.mk
@@ -38,8 +38,7 @@ $(eval $(call gb_Library_set_include,chartview,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,chartview,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,chartview,\
-DOOO_DLLIMPLEMENTATION_CHARTVIEW \
))
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 5e93753..7f1f36a 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -39,8 +39,7 @@ $(eval $(call gb_Library_set_include,sc,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,sc,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,sc,\
-DSC_DLLIMPLEMENTATION \
-DSC_INFO_OSVERSION=\"$(OS)\" \
))
diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk
index 0331df2..6286845 100644
--- a/sc/Library_scd.mk
+++ b/sc/Library_scd.mk
@@ -33,10 +33,6 @@ $(eval $(call gb_Library_set_include,scd,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,scd,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,scd,\
cppu \
cppuhelper \
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index edcfd7c..5c74d09 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -37,10 +37,6 @@ $(eval $(call gb_Library_set_include,scfilt,\
-I$(OUTDIR)/inc \
))
-$(eval $(call gb_Library_set_defs,scfilt,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,scfilt,\
basegfx \
comphelper \
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index c85de9f..3473fa7 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -33,10 +33,6 @@ $(eval $(call gb_Library_set_include,scui,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Library_set_defs,scui,\
- $$(DEFS) \
-))
-
$(eval $(call gb_Library_add_linked_libs,scui,\
comphelper \
cppu \
diff --git a/sc/Library_sd.mk b/sc/Library_sd.mk
new file mode 100644
index 0000000..e69de29
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index 6ef54b3..437607d 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -35,8 +35,7 @@ $(eval $(call gb_Library_set_include,vbaobj,\
$(eval $(call gb_Library_set_componentfile,vbaobj,sc/util/vbaobj))
-$(eval $(call gb_Library_set_defs,vbaobj,\
- $$(DEFS) \
+$(eval $(call gb_Library_add_defs,vbaobj,\
-DVBA_OOBUILD_HACK \
))
@@ -133,13 +132,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
sc/source/ui/vba/vbawsfunction \
))
-ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
-$(eval $(call gb_Library_set_ldflags,vbaobj,\
- $$(LDFLAGS) \
- -Wl$(COMMA)-z$(COMMA)noexecstack \
-))
-endif
-
ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_linked_libs,vbaobj,\
advapi32 \
commit 1214b4fb81bcacac872c743a8d4388b5c5aa4fa0
Merge: 0846d67... 7286ac7...
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Mon Jun 20 09:35:01 2011 +0200
Merge branch 'master' into feature/gnumake4
commit 0846d67dd3c051df87b5ea5ee49817338b888502
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Sat Jun 18 14:12:16 2011 +0200
fixing rebase errors
diff --git a/.gitattributes b/.gitattributes
new file mode 120000
index 0000000..f18402b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+/striped/bjoern/.jenkins/jobs/gnumake4/workspace/.gitattributes
\ No newline at end of file
More information about the Libreoffice-commits
mailing list