[Libreoffice-commits] .: 4 commits - configure.in Makefile.in RepositoryFixes.mk Repository.mk scp2/source scp2/util set_soenv.in solenv/bin
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Jun 30 03:36:35 PDT 2011
Makefile.in | 22 +++++++++++-----------
Repository.mk | 1 +
RepositoryFixes.mk | 6 ++++++
configure.in | 8 --------
scp2/source/canvas/makefile.mk | 6 +++++-
scp2/source/ooo/file_library_ooo.scp | 2 +-
scp2/source/ooo/makefile.mk | 16 +++++-----------
scp2/util/makefile.mk | 5 ++++-
set_soenv.in | 2 --
solenv/bin/modules/installer/scriptitems.pm | 3 +++
10 files changed, 36 insertions(+), 35 deletions(-)
New commits:
commit b9862b5d7ccba2ea25bfce73e93c7318e882e0d6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Jun 30 11:01:43 2011 +0100
cache output
diff --git a/Makefile.in b/Makefile.in
index 20c404f..82147b4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -177,16 +177,16 @@ findunusedcode:
# experimental callcatcher target
# http://www.skynet.ie/~caolan/Packages/callcatcher.html
@which callcatcher > /dev/null 2>&1 || \
- (echo "callcatcher not installed" && false)
+ (echo "callcatcher not installed" && false)
@. ./*Env.Set.sh && \
- source <(sed -e s,$$INPATH,callcatcher,g ./*Env.Set.sh) && \
- . ./solenv/bin/callcatchEnv.Set.sh && \
- cd instsetoo_native && \
- build.pl $(GBUILD_OPT) --all
+ source <(sed -e s,$$INPATH,callcatcher,g ./*Env.Set.sh) && \
+ . ./solenv/bin/callcatchEnv.Set.sh && \
+ cd instsetoo_native && \
+ build.pl $(GBUILD_OPT) --all
@. ./*Env.Set.sh && \
- . ./solenv/bin/callcatchEnv.Set.sh && \
- callanalyse \
- $$OUTDIR/lib/* \
- $$OUTDIR/bin/* \
- */$$OUTPATH/bin/* \
- */$$OUTPATH/lib/*
+ source <(sed -e s,$$INPATH,callcatcher,g ./*Env.Set.sh) && \
+ callanalyse \
+ $$OUTDIR/lib/* \
+ $$OUTDIR/bin/* \
+ */$$OUTPATH/bin/* \
+ */$$OUTPATH/lib/* > unusedcode
commit c287b8aec6d2e5951f748039e58937190de28ec5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jun 29 22:33:49 2011 +0100
remove trailing - ourselves
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index f78980c..edd34fa 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -806,6 +806,9 @@ sub replace_setup_variables
if (!$buildidstring) {
$buildidstring = $localbuild . $localminor . "(Build:" . $installer::globals::buildid . ")";
}
+ else {
+ $buildidstring = substr($buildidstring, 0, -1);
+ }
# the environment variable CWS_WORK_STAMP is set only in CWS
if ( $ENV{'CWS_WORK_STAMP'} ) { $buildidstring = $buildidstring . "\[CWS\:" . $ENV{'CWS_WORK_STAMP'} . "\]"; }
commit 4713862461d696898b9f9d2e3da189cdbba1a498
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jun 29 16:26:07 2011 +0100
fix stray define
diff --git a/set_soenv.in b/set_soenv.in
index 6f3076b..62283e1 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1548,7 +1548,6 @@ ToFile( "GTHREAD_CFLAGS", "@GTHREAD_CFLAGS@", "e" );
ToFile( "GTHREAD_LIBS", "@GTHREAD_LIBS@", "e" );
ToFile( "ENABLE_SYSTRAY_GTK", "@ENABLE_SYSTRAY_GTK@", "e" );
ToFile( "ENABLE_STATIC_GTK", "@ENABLE_STATIC_GTK@", "e" );
-ToFile( "ENABLE_CAIRO", "@ENABLE_CAIRO@", "e" );
ToFile( "ENABLE_OPENGL", "@ENABLE_OPENGL@", "e" );
ToFile( "ENABLE_PDFIMPORT", "@ENABLE_PDFIMPORT@", "e" );
ToFile( "ENABLE_MINIMIZER", "@ENABLE_MINIMIZER@","e" );
commit 3cd9f059f9ae8817bf692a3c8b4b4ded4c453b7d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jun 29 16:22:25 2011 +0100
make cairo an unconditional requirement for text rendering
diff --git a/Repository.mk b/Repository.mk
index f01ace1..4e00fb4 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -133,6 +133,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
test \
+ cairo \
cppunit \
crypto \
fileacc \
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 0aa4467..4d2939b 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -45,6 +45,7 @@ endif
ifeq ($(OS),WNT)
ifeq ($(COM),GCC)
+gb_Library_FILENAMES := $(patsubst cairo:icairo%,cairo:libcairo$(gb_Library_IARCEXT),$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
@@ -76,6 +77,7 @@ gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
else
+gb_Library_FILENAMES := $(patsubst cairo:icairo%,cairo:libcairo%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:icppunit_dll%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst crypto:libcrypto%,crypto:libcrypto_static%,$(gb_Library_FILENAMES))
@@ -147,6 +149,10 @@ gb_Library_FILENAMES := $(patsubst writerfilter_uno:writerfilter_uno%,writerfilt
# we do not require a known rule for these, when using system libs
+ifeq ($(SYSTEM_CAIRO),YES)
+gb_Library_TARGETS := $(filter-out cairo,$(gb_Library_TARGETS))
+endif
+
ifeq ($(SYSTEM_LIBXML),YES)
gb_Library_TARGETS := $(filter-out xml2,$(gb_Library_TARGETS))
endif
diff --git a/configure.in b/configure.in
index bda4ece..e21c5fe 100755
--- a/configure.in
+++ b/configure.in
@@ -6520,10 +6520,6 @@ dnl ===================================================================
dnl Test whether to build cairo or rely on the system version
dnl ===================================================================
-dnl ENABLE_CAIRO will be set to empty later when necessary
-ENABLE_CAIRO="TRUE"
-
-BUILD_PIXMAN=""
SYSTEM_CAIRO=""
AC_MSG_CHECKING([whether to use the system cairo])
@@ -6554,11 +6550,8 @@ int main(int argc, char **argv) {
else
AC_MSG_RESULT([no])
BUILD_TYPE="$BUILD_TYPE CAIRO"
- BUILD_PIXMAN=YES
fi
-AC_SUBST(ENABLE_CAIRO)
-AC_SUBST(BUILD_PIXMAN)
AC_SUBST(SYSTEM_CAIRO)
AC_SUBST(CAIRO_CFLAGS)
AC_SUBST(CAIRO_LIBS)
@@ -8048,7 +8041,6 @@ internal)
no)
ENABLE_LIBRSVG=NO
SYSTEM_LIBRSVG=NO
- ENABLE_CAIRO=
;;
*)
diff --git a/scp2/source/canvas/makefile.mk b/scp2/source/canvas/makefile.mk
index fe6d564..8e59d77 100644
--- a/scp2/source/canvas/makefile.mk
+++ b/scp2/source/canvas/makefile.mk
@@ -43,9 +43,13 @@ PARFILES= canvascommons.par \
vclcanvas.par \
mtfrenderer.par
-.IF "$(ENABLE_CAIRO)" == "TRUE"
+.IF "$(GUI)"=="UNX"
+#X11 MacOSX has no cairo-canvas
+.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua"
PARFILES+= cairocanvas.par
.ENDIF
+.ENDIF
+
.IF "$(ENABLE_DIRECTX)" != ""
.IF "$(USE_DIRECTX5)" != ""
SCPDEFS+=-DUSE_DIRECTX5
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index d7c81a6..905bbaa 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -572,7 +572,7 @@ SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_office.uno )
SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fpicker, fpicker.uno )
-#if (defined(ENABLE_CAIRO) && ! defined (SYSTEM_CAIRO))
+#ifndef SYSTEM_CAIRO
File gid_File_Lib_Cairo
TXT_FILE_BODY;
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 1504a2a..8fc9ad5 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -95,18 +95,17 @@ SCPDEFS+=-DENABLE_EVOAB2
SCPDEFS+=-DENABLE_DIRECTX
.ENDIF
-.IF "$(SYSTEM_FREETYPE)" == "YES"
-SCPDEFS+=-DSYSTEM_FREETYPE
+.IF "$(GUI)"=="UNX"
+#X11 MacOSX has no cairo-canvas
+.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua"
+SCPDEFS+=-DENABLE_CAIROCANVAS
+.ENDIF
.ENDIF
.IF "$(SYSTEM_CAIRO)" == "YES"
SCPDEFS+=-DSYSTEM_CAIRO
.ENDIF
-.IF "$(ENABLE_CAIRO)" == "YES"
-SCPDEFS+=-DENABLE_CAIRO
-.ENDIF
-
.IF "$(SYSTEM_LIBXML)" == "YES"
SCPDEFS+=-DSYSTEM_LIBXML
.ENDIF
@@ -184,11 +183,6 @@ SCPDEFS+=-DSYSTEM_SAXON -DSAXON_JAR=\""file://$(SAXON_JAR)"\"
SCPDEFS+=-DGCJ
.ENDIF
-
-.IF "$(ENABLE_CAIRO)" == "TRUE"
-SCPDEFS+=-DENABLE_CAIRO
-.ENDIF
-
.IF "$(SYSTEM_LUCENE)" == "YES"
SCPDEFS+=-DSYSTEM_LUCENE
.ENDIF
diff --git a/scp2/util/makefile.mk b/scp2/util/makefile.mk
index 9030699..8e1c8f2 100644
--- a/scp2/util/makefile.mk
+++ b/scp2/util/makefile.mk
@@ -207,9 +207,12 @@ SCP1FILES += \
vclcanvas.par \
mtfrenderer.par
-.IF "$(ENABLE_CAIRO)" == "TRUE"
+.IF "$(GUI)"=="UNX"
+#X11 MacOSX has no cairo-canvas
+.IF "$(OS)" != "MACOSX" || "$(GUIBASE)" == "aqua"
SCP1FILES += cairocanvas.par
.ENDIF
+.ENDIF
.IF "$(ENABLE_LAYOUT)" == "TRUE"
SCP1FILES += layout.par
diff --git a/set_soenv.in b/set_soenv.in
index 4378bb8..6f3076b 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1930,7 +1930,6 @@ ToFile( "POPPLER_LIBS", "@POPPLER_LIBS@", "e" );
ToFile( "GSTREAMER_CFLAGS", "@GSTREAMER_CFLAGS@", "e" );
ToFile( "GSTREAMER_LIBS", "@GSTREAMER_LIBS@", "e" );
ToFile( "SYSTEM_CAIRO", "@SYSTEM_CAIRO@", "e" );
-ToFile( "BUILD_PIXMAN", "@BUILD_PIXMAN@", "e" );
ToFile( "CAIRO_CFLAGS", "@CAIRO_CFLAGS@", "e" );
ToFile( "CAIRO_LIBS", "@CAIRO_LIBS@", "e" );
ToFile( "XRANDR_CFLAGS", "@XRANDR_CFLAGS@", "e" );
More information about the Libreoffice-commits
mailing list