[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 4 commits - avmedia/source nss/makefile.mk postprocess/packcomponents scp2/source solenv/bin solenv/doc solenv/gbuild solenv/inc vcl/Library_vcl.mk vcl/util
Herbert Dürr
hdu at apache.org
Wed Jan 8 10:07:54 PST 2014
avmedia/source/quicktime/makefile.mk | 6 ++++--
nss/makefile.mk | 26 ++------------------------
postprocess/packcomponents/makefile.mk | 4 +++-
scp2/source/ooo/file_library_ooo.scp | 6 +++---
scp2/source/ooo/makefile.mk | 3 +++
solenv/bin/srcrelease.xml | 2 +-
solenv/doc/gbuild/solenv/gbuild/types.mk | 2 ++
solenv/gbuild/LinkTarget.mk | 4 ++++
solenv/inc/unxmaccx.mk | 1 +
vcl/Library_vcl.mk | 7 ++++---
vcl/util/makefile.mk | 8 ++++++--
11 files changed, 33 insertions(+), 36 deletions(-)
New commits:
commit 90302f3cdff7ac895fbc64209aaa57a9e743b6b7
Author: Herbert Dürr <hdu at apache.org>
Date: Wed Jan 8 17:51:35 2014 +0000
#i122301# use the BUILD64 flag to simplify the NSS makefile
diff --git a/nss/makefile.mk b/nss/makefile.mk
index b9e482f..ce00499 100644
--- a/nss/makefile.mk
+++ b/nss/makefile.mk
@@ -56,31 +56,11 @@ BUILD_OPT=1
.EXPORT: BUILD_OPT
.ENDIF
-.IF "$(GUI)"=="UNX"
-.IF "$(OS)$(COM)"=="LINUXGCC"
.IF "$(BUILD64)"=="1"
-# force 64-bit buildmode
+# force the 64-bit build mode for 64bit targets
USE_64:=1
.EXPORT : USE_64
-.ENDIF # "$(CPU)"=="X"
-.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
-
-.IF "$(OS)$(COM)"=="FREEBSDGCC"
-.IF "$(CPU)"=="X"
-# force 64-bit buildmode
-USE_64:=1
-.EXPORT : USE_64
-.ENDIF # "$(CPU)"=="X"
-.ENDIF # "$(OS)$(COM)"=="LINUXGCC"
-
-.IF "$(OS)"=="MACOSX"
-.IF "$(EXTRA_CFLAGS)"!=""
-CPP:=gcc -E $(EXTRA_CFLAGS)
-CXX:=g++ $(EXTRA_CFLAGS)
-CC:=gcc $(EXTRA_CFLAGS)
-.EXPORT : CPP
-.ENDIF # "$(EXTRA_CFLAGS)"!=""
-.ENDIF # "$(OS)"=="MACOSX"
+.ENDIF # "$(BUILD64)"=="1"
OUT2LIB=mozilla$/dist$/out$/lib$/*$(DLLPOST)
@@ -92,8 +72,6 @@ BUILD_ACTION+=FREEBL_NO_DEPEND=1 FREEBL_LOWHASH=1
PATCH_FILES+=nss_linux.patch
.ENDIF
-.ENDIF # "$(GUI)"=="UNX"
-
.IF "$(GUI)"=="WNT"
commit 17b4e3f22addf30cd6758a571cd1351d454c3ada
Author: Herbert Dürr <hdu at apache.org>
Date: Wed Jan 8 17:45:05 2014 +0000
#i122301# set the BUILD64 flag for the 64bit Mac build
diff --git a/solenv/inc/unxmaccx.mk b/solenv/inc/unxmaccx.mk
index 575c720..b9b3afd 100644
--- a/solenv/inc/unxmaccx.mk
+++ b/solenv/inc/unxmaccx.mk
@@ -22,6 +22,7 @@
# Mac OSX specific defines
PROCESSOR_DEFINES=-DX86_64
+BUILD64=1
DLLPOSTFIX=
commit b3280a1c8624530cbe119ddf81c23de302c1a10a
Author: Herbert Dürr <hdu at apache.org>
Date: Wed Jan 8 17:03:23 2014 +0000
#i114728# the quicktime framework is is no longer available in OSX SDKs>=10.7
diff --git a/avmedia/source/quicktime/makefile.mk b/avmedia/source/quicktime/makefile.mk
index 9a56849..7d386b1 100644
--- a/avmedia/source/quicktime/makefile.mk
+++ b/avmedia/source/quicktime/makefile.mk
@@ -25,7 +25,8 @@ PRJ=..$/..
PRJNAME=avmedia
TARGET=avmediaQuickTime
-.IF "$(GUIBASE)"=="aqua"
+# the QuickTime API has been removed in OSX SDK 10.7
+.IF "$(GUIBASE)"=="aqua" && "${MACOSX_DEPLOYMENT_TARGET:s/.//}"<"107"
# --- Settings ----------------------------------
@@ -43,10 +44,10 @@ SLOFILES= \
$(SLO)$/quicktimeuno.obj \
$(SLO)$/manager.obj \
$(SLO)$/window.obj \
- $(SLO)$/framegrabber.obj \
$(SLO)$/player.obj
EXCEPTIONSFILES= \
+ $(SLO)$/framegrabber.obj \
$(SLO)$/quicktimeuno.obj
SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
@@ -87,3 +88,4 @@ $(MISC)/avmediaQuickTime.component .ERRREMOVE : \
$(XSLTPROC) --nonet --stringparam uri \
'$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
$(SOLARENV)/bin/createcomponent.xslt avmediaQuickTime.component
+
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 52c7800..090a83b 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -310,11 +310,13 @@ my_components += \
.IF "$(OS)" == "MACOSX"
my_components += \
- avmediaQuickTime \
fps_aqua \
macab1 \
macbe1 \
MacOSXSpell
+.IF "${MACOSX_DEPLOYMENT_TARGET:s/.//}"<"107"
+ my_components += avmediaQuickTime
+.END
.END
.IF "$(OS)" == "WNT"
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index cd94075..cc3d874 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -586,7 +586,6 @@ End
#endif
#ifdef MACOSX
-#ifdef QUARTZ
File gid_File_Lib_Fps_Aqua
TXT_FILE_BODY;
Styles = (PACKED);
@@ -601,14 +600,15 @@ File gid_File_Lib_MacOSXSpell
Dir = SCP2_OOO_BIN_DIR;
End
+#if MACOSX_DEPLOYMENT_TARGET<107
File gid_File_Lib_avmediaQuickTime
TXT_FILE_BODY;
Styles = (PACKED);
Name = LIBNAME(avmediaQuickTime);
Dir = SCP2_OOO_BIN_DIR;
End
-#endif
-#endif
+#endif // MACOSX_DEPLOYMENT_TARGET
+#endif // MACOSX
#ifdef OS2
SPECIAL_COMPONENT_LIB_FILE( gid_File_Lib_Fps_Office, fps_offi )
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 857012a..eeede14 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -306,6 +306,9 @@ SCPDEFS+=-DSYSTEM_LIBJPEG
SCPDEFS+=-DSYSTEM_PANGO
.ENDIF
+.IF "${MACOSX_DEPLOYMENT_TARGET}" != ""
+SCPDEFS+=-DMACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET:s/.//}
+.ENDIF
# The variables ENABLE_ONLINE_UPDATE, WITHOUT_MATHMLDTD, WITH_CATA_FONTS, WITH_CATB_FONTS,
# and WITHOUT_PPDS are added (or not) in configure to SCPDEFS.
diff --git a/solenv/doc/gbuild/solenv/gbuild/types.mk b/solenv/doc/gbuild/solenv/gbuild/types.mk
index e17706d..697f6d3 100644
--- a/solenv/doc/gbuild/solenv/gbuild/types.mk
+++ b/solenv/doc/gbuild/solenv/gbuild/types.mk
@@ -122,6 +122,8 @@ namespace gb { namespace types
void set_dll_target(Path dlltarget);
/// Set additional flags for the link command.
void set_ldflags(List<Path> ldflags);
+ /// Add additional flags for the link command.
+ void add_ldflags(List<Path> ldflags);
};
/// A target that delivers headers of some kind.
class DeliversHeaders
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 3dfd2df..2e8e2d3 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -448,6 +448,10 @@ define gb_LinkTarget_set_ldflags
$(call gb_LinkTarget_get_target,$(1)) : LDFLAGS := $(2)
endef
+define gb_LinkTarget_add_ldflags
+$(call gb_LinkTarget_get_target,$(1)) : LDFLAGS:=$$(LDFLAGS) $(2)
+endef
+
define gb_LinkTarget_add_linked_libs
ifneq (,$$(filter-out $(gb_Library_KNOWNLIBS),$(2)))
$$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Library_KNOWNLIBS)),ALL))
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index af55c75..761eaa2 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -510,13 +510,14 @@ ifeq ($(GUIBASE),aqua)
$(eval $(call gb_Library_add_linked_libs,vcl,\
AppleRemote \
))
-$(eval $(call gb_Library_set_ldflags,vcl,\
- $$(LDFLAGS) \
- -framework QuickTime \
+$(eval $(call gb_Library_add_ldflags,vcl,\
-framework Cocoa \
-framework Carbon \
-framework CoreFoundation \
))
+ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.7)
+$(eval $(call gb_Library_add_ldflags,vcl, -framework QuickTime ))
+endif
endif
ifeq ($(OS),WNT)
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk
index be5f690..00bd996 100644
--- a/vcl/util/makefile.mk
+++ b/vcl/util/makefile.mk
@@ -193,8 +193,12 @@ SHL1USE_EXPORTS=name
.IF "$(GUIBASE)"=="aqua"
SHL1STDLIBS+= \
$(BASEBMPLIB) \
- -lAppleRemote$(DLLPOSTFIX) \
- -framework QuickTime
+ -lAppleRemote$(DLLPOSTFIX)
+
+# the QuickTime API has been removed in OSX SDK 10.7
+.IF "${MACOSX_DEPLOYMENT_TARGET:s/.//}"<"107"
+SHL1STDLIBS+= -framework QuickTime
+.ENDIF
LIB1FILES+= \
$(SLB)$/sala11y.lib
commit 713ddef1d8c8bfc05690621eebe2a005cc9e4506
Author: Jürgen Schmidt <jsc at apache.org>
Date: Wed Jan 8 16:44:22 2014 +0000
adapt src release version number
diff --git a/solenv/bin/srcrelease.xml b/solenv/bin/srcrelease.xml
index dc76da3..0049952 100644
--- a/solenv/bin/srcrelease.xml
+++ b/solenv/bin/srcrelease.xml
@@ -27,7 +27,7 @@
<property name="out.dir" value="."/>
<property name="aoo.name" value="apache-openoffice"/>
<property name="aoo.short.name" value="aoo"/>
- <property name="aoo.ver" value="4.0.0"/>
+ <property name="aoo.ver" value="4.1.0"/>
<property name="excludes.list" value="configure, moz/zipped/*.zip, **/.svn **/.gitignore, **/.git, warn, set_soenv, solver/**, makefile.mk, config.log, config.parms, config.status, bootstrap, autom4te.cache/**, MacOSXX86Env.*, external/unowinreg/unowinreg.dll" />
<property name="excludes.executables" value="solenv/bin/macosx-create-bundle, solenv/bin/linkoo, solenv/bin/localize, solenv/bin/createpdbrelocators, solenv/bin/langwrap, solenv/bin/makedepn, solenv/bin/packmodule, solenv/bin/rpm-wrapper, solenv/bin/relocate, solenv/bin/receditor, solenv/bin/subsequenttests, **/*.sh, **/*.bat, **/*.exe, configure.cmd, oowintool, config.sub, config.guess, **/*.pl"/>
More information about the Libreoffice-commits
mailing list