[Libreoffice-commits] .: Branch 'feature/gnumake4' - 6 commits - canvas/Library_cairocanvas.mk comphelper/JunitTest_comphelper_complex.mk cppcanvas/Library_cppcanvas.mk padmin/Executable_spadmin.bin.mk sax/Library_expwrap.mk sax/Library_fastsax.mk sax/Library_sax.mk sot/JunitTest_sot_complex.mk svl/JunitTest_svl_complex.mk svtools/JunitTest_svtools_unoapi.mk svtools/Library_svt.mk toolkit/JunitTest_toolkit_unoapi.mk toolkit/Library_tk.mk tools/Executable_mkunroll.mk tools/Executable_rscdep.mk tools/Executable_so_checksum.mk tools/Executable_sspretty.mk tools/Library_tl.mk unotools/JunitTest_unotools_complex.mk vcl/aqua
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Fri Jun 17 02:15:40 PDT 2011
canvas/Library_cairocanvas.mk | 23 --------
comphelper/JunitTest_comphelper_complex.mk | 2
cppcanvas/Library_cppcanvas.mk | 1
padmin/Executable_spadmin.bin.mk | 4 -
sax/Library_expwrap.mk | 26 ---------
sax/Library_fastsax.mk | 15 -----
sax/Library_sax.mk | 4 +
sot/JunitTest_sot_complex.mk | 2
svl/JunitTest_svl_complex.mk | 2
svtools/JunitTest_svtools_unoapi.mk | 2
svtools/Library_svt.mk | 15 +----
toolkit/JunitTest_toolkit_unoapi.mk | 2
toolkit/Library_tk.mk | 5 +
tools/Executable_mkunroll.mk | 3 -
tools/Executable_rscdep.mk | 6 --
tools/Executable_so_checksum.mk | 3 -
tools/Executable_sspretty.mk | 3 -
tools/Library_tl.mk | 14 -----
unotools/JunitTest_unotools_complex.mk | 2
vcl/aqua/source/gdi/salprn.cxx | 79 ++---------------------------
20 files changed, 32 insertions(+), 181 deletions(-)
New commits:
commit b9ea35d5eaa6dd953d15d1572027370253ec4c3c
Author: Philipp Lohmann [pl] <Philipp.Lohmann at Oracle.COM>
Date: Mon Mar 28 14:33:53 2011 +0200
ooo34gslstop1 [hg:c6da340e613c]
diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index f51e161..1bd7fcb 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -185,74 +185,6 @@ sal_Bool AquaSalInfoPrinter::Setup( SalFrame*, ImplJobSetup* )
// -----------------------------------------------------------------------
-static struct PaperSizeEntry
-{
- double fWidth;
- double fHeight;
- Paper nPaper;
-} aPaperSizes[] =
-{
- { 842, 1191, PAPER_A3 },
- { 595, 842, PAPER_A4 },
- { 420, 595, PAPER_A5 },
- { 612, 792, PAPER_LETTER },
- { 612, 1008, PAPER_LEGAL },
- { 728, 1032, PAPER_B4_JIS },
- { 516, 729, PAPER_B5_JIS },
- { 792, 1224, PAPER_TABLOID }
-};
-
-static bool getPaperSize( double& o_fWidth, double& o_fHeight, const Paper i_ePaper )
-{
- for(unsigned int i = 0; i < sizeof(aPaperSizes)/sizeof(aPaperSizes[0]); i++ )
- {
- if( aPaperSizes[i].nPaper == i_ePaper )
- {
- o_fWidth = aPaperSizes[i].fWidth;
- o_fHeight = aPaperSizes[i].fHeight;
- return true;
- }
- }
- return false;
-}
-
-static Paper recognizePaper( double i_fWidth, double i_fHeight )
-{
- Paper aPaper = PAPER_USER;
- sal_uInt64 nPaperDesc = 1000000*sal_uInt64(i_fWidth) + sal_uInt64(i_fHeight);
- switch( nPaperDesc )
- {
- case 842001191: aPaper = PAPER_A3; break;
- case 595000842: aPaper = PAPER_A4; break;
- case 420000595: aPaper = PAPER_A5; break;
- case 612000792: aPaper = PAPER_LETTER; break;
- case 728001032: aPaper = PAPER_B4_JIS; break;
- case 516000729: aPaper = PAPER_B5_JIS; break;
- case 612001008: aPaper = PAPER_LEGAL; break;
- case 792001224: aPaper = PAPER_TABLOID; break;
- default:
- aPaper = PAPER_USER;
- break;
- }
-
- if( aPaper == PAPER_USER )
- {
- // search with fuzz factor
- for( unsigned int i = 0; i < sizeof(aPaperSizes)/sizeof(aPaperSizes[0]); i++ )
- {
- double w = (i_fWidth > aPaperSizes[i].fWidth) ? i_fWidth - aPaperSizes[i].fWidth : aPaperSizes[i].fWidth - i_fWidth;
- double h = (i_fHeight > aPaperSizes[i].fHeight) ? i_fHeight - aPaperSizes[i].fHeight : aPaperSizes[i].fHeight - i_fHeight;
- if( w < 3 && h < 3 )
- {
- aPaper = aPaperSizes[i].nPaper;
- break;
- }
- }
- }
-
- return aPaper;
-}
-
sal_Bool AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData )
{
// FIXME: implement driver data
@@ -271,7 +203,9 @@ sal_Bool AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData )
NSSize aPaperSize = [mpPrintInfo paperSize];
double width = aPaperSize.width, height = aPaperSize.height;
// set paper
- io_pSetupData->mePaperFormat = recognizePaper( width, height );
+ PaperInfo aInfo( PtTo10Mu( width ), PtTo10Mu( height ) );
+ aInfo.doSloppyFit();
+ io_pSetupData->mePaperFormat = aInfo.getPaper();
if( io_pSetupData->mePaperFormat == PAPER_USER )
{
io_pSetupData->mnPaperWidth = PtTo10Mu( width );
@@ -347,10 +281,9 @@ sal_Bool AquaSalInfoPrinter::SetData( sal_uLong i_nFlags, ImplJobSetup* io_pSetu
}
else
{
- double w = 595, h = 842;
- getPaperSize( w, h, io_pSetupData->mePaperFormat );
- width = static_cast<long>(PtTo10Mu( w ));
- height = static_cast<long>(PtTo10Mu( h ));
+ PaperInfo aInfo( io_pSetupData->mePaperFormat );
+ width = aInfo.getWidth();
+ height = aInfo.getHeight();
}
setPaperSize( width, height, mePageOrientation );
commit 966c1eca05715de1756d359766110a4bcbbc2ba5
Author: Michael Stahl <mst at openoffice.org>
Date: Mon Apr 11 14:02:22 2011 +0000
gnumake4: merge DEV300_m106 [hg:5102137bfe1e]
diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk
index c330a54..c772811 100644
--- a/cppcanvas/Library_cppcanvas.mk
+++ b/cppcanvas/Library_cppcanvas.mk
@@ -78,6 +78,7 @@ $(eval $(call gb_Library_add_exception_objects,cppcanvas,\
cppcanvas/source/mtfrenderer/lineaction \
cppcanvas/source/mtfrenderer/pointaction \
cppcanvas/source/mtfrenderer/polypolyaction \
+ cppcanvas/source/mtfrenderer/rendergraphicaction \
cppcanvas/source/mtfrenderer/textaction \
cppcanvas/source/mtfrenderer/implrenderer \
cppcanvas/source/mtfrenderer/mtftools \
commit 8ed375ad02b29d8befd8724f1a3c0d54cecfcddd
Author: Michael Stahl <mst at openoffice.org>
Date: Mon Apr 11 13:23:37 2011 +0000
gnumake4: #i116959#: rename target local variables {C,CXX,OBJCXX}FLAGS: [hg:8801515221cf]
add a T_ prefix, so we don't need to use override.
also introduce gb_LinkTarget_add_{c,cxx,objcxx}flags.
diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk
index 1197c4d..e63edb2 100644
--- a/padmin/Executable_spadmin.bin.mk
+++ b/padmin/Executable_spadmin.bin.mk
@@ -33,10 +33,6 @@ $(eval $(call gb_Executable_set_include,spadmin.bin,\
-I$(OUTDIR)/inc/offuh \
))
-$(eval $(call gb_Executable_set_cxxflags,spadmin.bin,\
- $$(CXXFLAGS) \
-))
-
$(eval $(call gb_Executable_add_linked_static_libs,spadmin.bin,\
vclmain \
))
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index caf1c04..b370793 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -160,8 +160,9 @@ $(eval $(call gb_Library_add_exception_objects,tk,\
))
ifeq ($(GUIBASE),aqua)
-$(eval $(call gb_Library_set_cxxflags,tk,\
- $$(CXXFLAGS) $(gb_OBJCXXFLAGS)))
+$(eval $(call gb_Library_add_cxxflags,tk,\
+ $(gb_OBJCXXFLAGS) \
+))
endif
ifeq ($(OS),LINUX)
diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk
index 60c6e67..88d2396 100644
--- a/tools/Executable_mkunroll.mk
+++ b/tools/Executable_mkunroll.mk
@@ -34,8 +34,7 @@ $(eval $(call gb_Executable_set_include,mkunroll,\
-I$(SRCDIR)/tools/bootstrp/ \
))
-$(eval $(call gb_Executable_set_cxxflags,mkunroll,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,mkunroll,\
-D_TOOLS_STRINGLIST \
))
diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk
index 8d8c55f..eae6304 100644
--- a/tools/Executable_rscdep.mk
+++ b/tools/Executable_rscdep.mk
@@ -34,8 +34,7 @@ $(eval $(call gb_Executable_set_include,rscdep,\
-I$(SRCDIR)/tools/bootstrp/ \
))
-$(eval $(call gb_Executable_set_cxxflags,rscdep,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,rscdep,\
-D_TOOLS_STRINGLIST \
))
@@ -57,8 +56,7 @@ $(eval $(call gb_Executable_add_exception_objects,rscdep,\
ifeq ($(OS),WNT)
ifeq ($(HAVE_GETOPT),YES)
-$(eval $(call gb_Executable_set_cxxflags,rscdep,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,rscdep,\
-DHAVE_GETOPT \
))
else
diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk
index 32b95be..431787d 100644
--- a/tools/Executable_so_checksum.mk
+++ b/tools/Executable_so_checksum.mk
@@ -34,8 +34,7 @@ $(eval $(call gb_Executable_set_include,so_checksum,\
-I$(SRCDIR)/tools/bootstrp/ \
))
-$(eval $(call gb_Executable_set_cxxflags,so_checksum,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,so_checksum,\
-D_TOOLS_STRINGLIST \
))
diff --git a/tools/Executable_sspretty.mk b/tools/Executable_sspretty.mk
index ab8379b..e1eea22 100644
--- a/tools/Executable_sspretty.mk
+++ b/tools/Executable_sspretty.mk
@@ -34,8 +34,7 @@ $(eval $(call gb_Executable_set_include,sspretty,\
-I$(SRCDIR)/tools/bootstrp/ \
))
-$(eval $(call gb_Executable_set_cxxflags,sspretty,\
- $$(CXXFLAGS) \
+$(eval $(call gb_Executable_add_defs,sspretty,\
-D_TOOLS_STRINGLIST \
))
commit d3196cb78a4e184c4498901c9e8bcec33d804f12
Author: Michael Stahl <mst at openoffice.org>
Date: Fri Apr 1 20:49:35 2011 +0000
gnumake4: #i117610#: add RepositoryExternal.mk, and use it. [hg:62e2f8dc95a7]
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index 1bfd3c7..02b7fc3 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -47,22 +47,6 @@ $(eval $(call gb_Library_set_defs,cairocanvas,\
))
endif
-ifeq ($(SYSTEM_CAIRO),YES)
-# FREETYPE_CLAGS from environment if ENABLE_CAIRO is used
-# $(CAIRO_CFLAGS) currently not set; taking usr/include directly
-$(eval $(call gb_Library_set_include,cairocanvas,\
- $$(INCLUDE) \
- $(FREETYPE_CFLAGS) \
- -I/usr/include \
-))
-else
-$(eval $(call gb_Library_set_include,cairocanvas,\
- $$(INCLUDE) \
- -I$(OUTDIR)/inc/cairo \
- $(FREETYPE_CFLAGS) \
-))
-endif
-
$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
sal \
stl \
@@ -96,6 +80,7 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\
canvas/source/cairo/cairo_textlayout \
))
+$(call gb_Library_use_external,cairocanvas,cairo)
ifeq ($(OS),WNT)
@@ -103,18 +88,12 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\
canvas/source/cairo/cairo_win32_cairo \
))
$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
- cairo \
gdi32 \
user32 \
))
else
-$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
- cairo \
- pixman-1 \
-))
-
ifeq ($(OS),MACOSX)
$(eval $(call gb_Library_add_exception_objects,cairocanvas,\
canvas/source/cairo/cairo_quartz_cairo \
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index 2c03ccf..6bea2f3 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -39,13 +39,6 @@ $(eval $(call gb_Library_set_defs,expwrap,\
$$(DEFS) \
))
-ifeq ($(SYSTEM_ZLIB),YES)
-$(eval $(call gb_Library_set_defs,expwrap,\
- $$(DEFS) \
- -DSYSTEM_ZLIB \
-))
-endif
-
$(eval $(call gb_Library_add_linked_libs,expwrap,\
sal \
cppu \
@@ -54,24 +47,7 @@ $(eval $(call gb_Library_add_linked_libs,expwrap,\
$(gb_STDLIBS) \
))
-ifeq ($(SYSTEM_EXPAT),YES)
-$(eval $(call gb_Library_set_defs,expwrap,\
- $$(DEFS) \
- -DSYSTEM_EXPAT \
-))
-$(eval $(call gb_Library_add_linked_libs,expwrap,\
- expat \
-))
-else
-$(eval $(call gb_Library_set_defs,expwrap,\
- $$(DEFS) \
- -DXML_UNICODE \
-))
-$(eval $(call gb_Library_add_linked_static_libs,expwrap,\
- expat_xmlparse \
- expat_xmltok \
-))
-endif
+$(call gb_Library_use_external,expwrap,expat_utf16)
$(eval $(call gb_Library_add_exception_objects,expwrap,\
sax/source/expatwrap/attrlistimpl \
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
index 1ee51ee..e45fa50 100644
--- a/sax/Library_fastsax.mk
+++ b/sax/Library_fastsax.mk
@@ -55,20 +55,7 @@ $(eval $(call gb_Library_set_defs,fastsax,\
))
endif
-ifeq ($(SYSTEM_EXPAT),YES)
-$(eval $(call gb_Library_set_defs,fastsax,\
- $$(DEFS) \
- -DSYSTEM_EXPAT \
-))
-$(eval $(call gb_Library_add_linked_libs,fastsax,\
- expat \
-))
-else
-$(eval $(call gb_Library_add_linked_static_libs,fastsax,\
- expat_xmlparse \
- expat_xmltok \
-))
-endif
+$(call gb_Library_use_external,fastsax,expat_utf8)
# re-uses xml2utf object from sax.uno lib (see below)
$(eval $(call gb_Library_add_exception_objects,fastsax,\
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index c7dab0f..a06a238 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -58,7 +58,6 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
cppuhelper \
i18nisolang1 \
i18nutil \
- icuuc \
jvmfwk \
sal \
sot \
@@ -73,18 +72,10 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
$(gb_STDLIBS) \
))
-ifeq ($(SYSTEM_JPEG),YES)
-$(eval $(call gb_Library_add_linked_libs,svt,\
+$(call gb_Library_use_externals,svt,\
+ icuuc \
jpeg \
-))
-$(eval $(call gb_Library_set_ldflags,svt,\
- $$(filter-out -L/usr/lib/jvm%,$$(LDFLAGS)) \
-))
-else
-$(eval $(call gb_Library_add_linked_static_libs,svt,\
- jpeglib \
-))
-endif
+)
$(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/brwbox/brwbox1 \
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 4e676f2..234ff7c 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -126,19 +126,7 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
))
endif
-ifeq ($(SYSTEM_ZLIB),YES)
-$(eval $(call gb_Library_set_cxxflags,tl,\
- $$(CXXFLAGS) \
- -DSYSTEM_ZLIB \
-))
-$(eval $(call gb_Library_add_linked_libs,tl,\
- z \
-))
-else
-$(eval $(call gb_Library_add_linked_static_libs,tl,\
- zlib \
-))
-endif
+$(call gb_Library_use_external,tl,zlib)
ifeq ($(OS),WNT)
commit 6e6f293a6b93af9ba62f6f1be49e6e43338510fe
Author: Michael Stahl <mst at openoffice.org>
Date: Fri Apr 1 20:47:04 2011 +0000
gnumake4: #i117340#: JavaClassSet: adapt users [hg:efb3d33ce8ca]
diff --git a/comphelper/JunitTest_comphelper_complex.mk b/comphelper/JunitTest_comphelper_complex.mk
index 5da6f2c..652b03c 100644
--- a/comphelper/JunitTest_comphelper_complex.mk
+++ b/comphelper/JunitTest_comphelper_complex.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_JunitTest_JunitTest,comphelper_complex))
+$(eval $(call gb_JunitTest_JunitTest,comphelper_complex,SRCDIR))
$(eval $(call gb_JunitTest_add_sourcefiles,comphelper_complex,\
comphelper/qa/complex/comphelper/Map \
diff --git a/sot/JunitTest_sot_complex.mk b/sot/JunitTest_sot_complex.mk
index e515ab5..507d3b7 100644
--- a/sot/JunitTest_sot_complex.mk
+++ b/sot/JunitTest_sot_complex.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_JunitTest_JunitTest,sot_complex))
+$(eval $(call gb_JunitTest_JunitTest,sot_complex,SRCDIR))
$(eval $(call gb_JunitTest_add_sourcefiles,sot_complex,\
sot/qa/complex/olesimplestorage/OLESimpleStorageTest \
diff --git a/svl/JunitTest_svl_complex.mk b/svl/JunitTest_svl_complex.mk
index f141dad..357a902 100755
--- a/svl/JunitTest_svl_complex.mk
+++ b/svl/JunitTest_svl_complex.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_JunitTest_JunitTest,svl_complex))
+$(eval $(call gb_JunitTest_JunitTest,svl_complex,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,svl_complex,\
$$(DEFS) \
diff --git a/svtools/JunitTest_svtools_unoapi.mk b/svtools/JunitTest_svtools_unoapi.mk
index baaefc8..3f0ec67 100755
--- a/svtools/JunitTest_svtools_unoapi.mk
+++ b/svtools/JunitTest_svtools_unoapi.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_JunitTest_JunitTest,svtools_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,svtools_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,svtools_unoapi,\
$$(DEFS) \
diff --git a/toolkit/JunitTest_toolkit_unoapi.mk b/toolkit/JunitTest_toolkit_unoapi.mk
index 27dc89e..8c61923 100755
--- a/toolkit/JunitTest_toolkit_unoapi.mk
+++ b/toolkit/JunitTest_toolkit_unoapi.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_JunitTest_JunitTest,toolkit_unoapi))
+$(eval $(call gb_JunitTest_JunitTest,toolkit_unoapi,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,toolkit_unoapi,\
$$(DEFS) \
diff --git a/unotools/JunitTest_unotools_complex.mk b/unotools/JunitTest_unotools_complex.mk
index b34ea5f..3f23994 100644
--- a/unotools/JunitTest_unotools_complex.mk
+++ b/unotools/JunitTest_unotools_complex.mk
@@ -25,7 +25,7 @@
#
#*************************************************************************
-$(eval $(call gb_JunitTest_JunitTest,unotools_complex))
+$(eval $(call gb_JunitTest_JunitTest,unotools_complex,SRCDIR))
$(eval $(call gb_JunitTest_set_defs,unotools_complex,\
$$(DEFS) \
commit 7e9f7174c1dec90b830e5c290915fc73ad41e873
Author: Michael Stahl <mst at openoffice.org>
Date: Fri Apr 1 20:47:03 2011 +0000
gnumake4: sax: add missing package dependency [hg:f5e59f9cc073]
diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk
index 70492fb..36e0066 100644
--- a/sax/Library_sax.mk
+++ b/sax/Library_sax.mk
@@ -27,6 +27,10 @@
$(eval $(call gb_Library_Library,sax))
+$(eval $(call gb_Library_add_package_headers,sax,\
+ sax_inc \
+))
+
$(eval $(call gb_Library_set_include,sax,\
$$(INCLUDE) \
-I$(OUTDIR)/inc/offuh \
More information about the Libreoffice-commits
mailing list