ea91c7d90d
The immediate trigger was 5e5c11c664 "fdo#42070
Fix RTL support in presenter console" causing build failures on Mac OS X when
linking the extension against vcl, but there should be more benefits of going
from a bundled-anyway extension to plain code. (Not the least to get rid of the
com.sun.star.drawing.XPresenterHelper hack.)
To avoid unnecessary confusion between the newly plain code and any instance of
the old extension still installed (per-user or shared), I renamed all relevant
identifiers as follows:
* UNO implementation com.sun.star.comp.Draw.framework.PresenterScreenJob ->
org.libreoffice.comp.PresenterScreenJob
* UNO implementation com.sun.star.sdext.presenter.PresenterProtocolHandler ->
org.libreoffice.comp.PresenterScreenProtocolHandler
* protocol handler schema vnd.com.sun.star.comp.PresenterScreen ->
vnd.org.libreoffice.presenterscreen
* configuration schema /org.openoffice.Office.extension.PresenterScreen ->
/org.openoffice.Office.PresenterScreen (it appears this contains little to no
user-changeable data anyway, so not migrating it to a new user profile due to
the schema name change should not be problematic)
* job ID onDocumentOpenedJob -> org.libreoffice.PresenterScreen
Even with these precautions, having the presenter screen installed both as plain
code and as a (per-user or shared) extension still leads to a crash when
activating presentation mode (likely due to how both codes want to take control
of the screen). To mitigate this, existing installations of the extension are
explicitly not migrated to new user profiles.
The sdext/source/presenter/bitmaps/*.png files were moved to
icon-themes/galaxy/sd/res/presenterscreen-*.png and are now accessed via SdResId
(adding the relevant data to sd/source/ui/inc/res_bmp.hrc and
sd/source/ui/app/res_bmp.src; not sure whether these locations are already
ideal).
The code itself has been left mostly unchanged in sdext/source/presenter/, and
it still clumsily communicates with sd core code via XPresenterHelper. There is
a lot of room for improvement here.
The help data is left untouched at sdext/source/presenter/help/ and needs to
be incorporated properly into helpcontent2 in a follow-up commit.
The --disable-ext-presenter-console configure switch is gone.
Change-Id: I71adb7ae6dcdbd1802151fce6e3871d8a2026332
760 lines
12 KiB
Makefile
Executable file
760 lines
12 KiB
Makefile
Executable file
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#*************************************************************************
|
|
#
|
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
#
|
|
# Copyright 2009 by Sun Microsystems, Inc.
|
|
#
|
|
# OpenOffice.org - a multi-platform office productivity suite
|
|
#
|
|
# This file is part of OpenOffice.org.
|
|
#
|
|
# OpenOffice.org is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU Lesser General Public License version 3
|
|
# only, as published by the Free Software Foundation.
|
|
#
|
|
# OpenOffice.org is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU Lesser General Public License version 3 for more details
|
|
# (a copy is included in the LICENSE file that accompanied this code).
|
|
#
|
|
# You should have received a copy of the GNU Lesser General Public License
|
|
# version 3 along with OpenOffice.org. If not, see
|
|
# <http://www.openoffice.org/license.html>
|
|
# for a copy of the LGPLv3 License.
|
|
#
|
|
#*************************************************************************
|
|
|
|
$(eval $(call gb_Helper_register_executables,NONE, \
|
|
HelpIndexer \
|
|
HelpLinker \
|
|
adjustvisibility \
|
|
bestreversemap \
|
|
bmp \
|
|
bmpsum \
|
|
cfgex \
|
|
checkdll \
|
|
checksingleton \
|
|
cpp \
|
|
cppunit/cppunittester \
|
|
g2g \
|
|
gencoll_rule \
|
|
genconv_dict \
|
|
gendict \
|
|
genindex_data \
|
|
gsicheck \
|
|
helpex \
|
|
idxdict \
|
|
javadepend \
|
|
ldump4 \
|
|
lngconvex \
|
|
localize \
|
|
makedepend \
|
|
mkunroll \
|
|
mork_helper \
|
|
osl_process_child \
|
|
pdf2xml \
|
|
pdfunzip \
|
|
propex \
|
|
regsingleton \
|
|
regsvrex \
|
|
renewpo \
|
|
rsc \
|
|
rscdep \
|
|
saxparser \
|
|
so_checksum \
|
|
sp2bv \
|
|
svg2odf \
|
|
svidl \
|
|
transex3 \
|
|
treex \
|
|
typesconfig \
|
|
$(if $(filter UCPP,$(BUILD_TYPE)),\
|
|
ucpp \
|
|
) \
|
|
uiex \
|
|
ulfconv \
|
|
ulfex \
|
|
xpdfimport \
|
|
xrmex \
|
|
))
|
|
|
|
$(eval $(call gb_Helper_register_executables,SDK, \
|
|
idlc \
|
|
))
|
|
|
|
ifneq ($(OS),IOS)
|
|
|
|
$(eval $(call gb_Helper_register_executables,SDK, \
|
|
autodoc \
|
|
climaker \
|
|
cppumaker \
|
|
javamaker \
|
|
regcompare \
|
|
uno-skeletonmaker \
|
|
))
|
|
|
|
endif
|
|
|
|
$(eval $(call gb_Helper_register_executables,OOO, \
|
|
gnome-open-url.bin \
|
|
spadmin.bin \
|
|
$(if $(filter $(GUIBASE)$(ENABLE_TDE),unxTRUE), \
|
|
tdefilepicker \
|
|
) \
|
|
uri-encode \
|
|
$(if $(filter $(GUIBASE)$(ENABLE_KDE),unxTRUE), \
|
|
kdefilepicker \
|
|
) \
|
|
ui-previewer \
|
|
))
|
|
|
|
ifeq ($(OS),WNT)
|
|
|
|
$(eval $(call gb_Helper_register_executables,OOO,\
|
|
crashrep_com \
|
|
gengal \
|
|
guiloader \
|
|
guistdio \
|
|
langsupport \
|
|
odbcconfig \
|
|
officeloader \
|
|
pyuno/python \
|
|
quickstart \
|
|
sbase \
|
|
scalc \
|
|
sdraw \
|
|
senddoc \
|
|
simpress \
|
|
soffice \
|
|
soffice_bin \
|
|
smath \
|
|
sweb \
|
|
swriter \
|
|
unoinfo \
|
|
unopkg \
|
|
unopkg_bin \
|
|
unopkg_com \
|
|
unopkgio \
|
|
))
|
|
|
|
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
|
|
directxcanvas \
|
|
winextendloaderenv \
|
|
winlauncher \
|
|
))
|
|
|
|
else
|
|
|
|
$(eval $(call gb_Helper_register_executables,OOO,\
|
|
langsupport \
|
|
soffice.bin \
|
|
unopkg.bin \
|
|
gengal.bin \
|
|
liboapprover \
|
|
))
|
|
|
|
ifeq ($(OS),MACOSX)
|
|
|
|
$(eval $(call gb_Helper_register_executables,OOO,\
|
|
officeloader \
|
|
))
|
|
|
|
else
|
|
|
|
$(eval $(call gb_Helper_register_executables,OOO,\
|
|
oosplash \
|
|
))
|
|
|
|
endif
|
|
|
|
endif
|
|
|
|
ifneq ($(OS),IOS)
|
|
|
|
$(eval $(call gb_Helper_register_executables,UREBIN,\
|
|
regcomp \
|
|
regmerge \
|
|
regview \
|
|
uno \
|
|
))
|
|
|
|
endif
|
|
|
|
ifneq ($(OS),MACOSX)
|
|
|
|
$(eval $(call gb_Helper_register_executables,UREBIN,\
|
|
javaldx \
|
|
))
|
|
|
|
endif
|
|
|
|
ifeq ($(ENABLE_NPAPI_FROM_BROWSER),YES)
|
|
$(eval $(call gb_Helper_register_executables,OOO,\
|
|
pluginapp.bin \
|
|
))
|
|
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
|
|
pl \
|
|
))
|
|
endif
|
|
|
|
ifeq ($(ENABLE_NPAPI_INTO_BROWSER),YES)
|
|
$(eval $(call gb_Helper_register_executables,OOO,\
|
|
nsplugin \
|
|
))
|
|
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
|
|
npsoplugin \
|
|
))
|
|
endif
|
|
|
|
ifeq ($(OS),MACOSX)
|
|
|
|
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
|
|
OOoSpotlightImporter \
|
|
))
|
|
|
|
endif
|
|
|
|
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
|
|
abp \
|
|
acc \
|
|
adabas \
|
|
adabasui \
|
|
ado \
|
|
agg \
|
|
analysis \
|
|
animcore \
|
|
basctl \
|
|
$(if $(filter $(OS),ANDROID),, \
|
|
basebmp \
|
|
) \
|
|
bib \
|
|
canvastools \
|
|
communi \
|
|
date \
|
|
evtatt \
|
|
forui \
|
|
odbc \
|
|
odbcbase \
|
|
oox \
|
|
ooxml \
|
|
sdbc \
|
|
AppleRemote \
|
|
avmedia \
|
|
avmediaQuickTime \
|
|
basegfx \
|
|
calc \
|
|
chartcontroller \
|
|
chartcore \
|
|
cppcanvas \
|
|
ctl \
|
|
cui \
|
|
dba \
|
|
dbase \
|
|
dbaxml \
|
|
dbmm \
|
|
dbp \
|
|
dbtools \
|
|
dbu \
|
|
deploymentmisc \
|
|
desktop_detector \
|
|
drawinglayer \
|
|
editeng \
|
|
egi \
|
|
eme \
|
|
emser \
|
|
epb \
|
|
epg \
|
|
epp \
|
|
eps \
|
|
ept \
|
|
era \
|
|
eti \
|
|
evoab \
|
|
exp \
|
|
file \
|
|
filterconfig \
|
|
filtertracer \
|
|
flash \
|
|
flat \
|
|
for \
|
|
frm \
|
|
fwe \
|
|
fwi \
|
|
fwk \
|
|
fwl \
|
|
fwm \
|
|
guesslang \
|
|
helplinker \
|
|
hwp \
|
|
hyphen \
|
|
icd \
|
|
icg \
|
|
idx \
|
|
ime \
|
|
ipb \
|
|
ipd \
|
|
ips \
|
|
ipt \
|
|
ipx \
|
|
ira \
|
|
itg \
|
|
iti \
|
|
jdbc \
|
|
kab1 \
|
|
kabdrv1 \
|
|
lng \
|
|
lnth \
|
|
log \
|
|
lwpft \
|
|
MacOSXSpell \
|
|
merged \
|
|
mork \
|
|
mozab2 \
|
|
mozabdrv \
|
|
msfilter \
|
|
msword \
|
|
mysql \
|
|
odfflatxml \
|
|
offacc \
|
|
pcr \
|
|
pdffilter \
|
|
placeware \
|
|
protocolhandler \
|
|
qstart_gtk \
|
|
res \
|
|
rpt \
|
|
rptui \
|
|
rptxml \
|
|
sax \
|
|
sb \
|
|
sc \
|
|
scd \
|
|
scfilt \
|
|
scn \
|
|
scui \
|
|
sd \
|
|
sdbt \
|
|
sdd \
|
|
sdfilt \
|
|
sdui \
|
|
sfx \
|
|
simplecm \
|
|
sm \
|
|
smd \
|
|
solver \
|
|
sot \
|
|
spa \
|
|
spell \
|
|
spl \
|
|
sts \
|
|
svgfilter \
|
|
svgio \
|
|
svl \
|
|
svt \
|
|
svx \
|
|
svxcore \
|
|
sw \
|
|
swd \
|
|
swui \
|
|
t602filter \
|
|
tdeab1 \
|
|
tdeabdrv1 \
|
|
textconversiondlgs \
|
|
textfd \
|
|
tk \
|
|
tl \
|
|
tubes \
|
|
unordf \
|
|
unoxml \
|
|
updatecheckui \
|
|
utl \
|
|
uui \
|
|
vbahelper \
|
|
vcl \
|
|
vclplug_gen \
|
|
vclplug_gtk \
|
|
vclplug_gtk3 \
|
|
vclplug_tde \
|
|
vclplug_kde \
|
|
vclplug_kde4 \
|
|
vclplug_svp \
|
|
wpftdraw \
|
|
wpftwriter \
|
|
writerfilter \
|
|
xmlscript \
|
|
xmlfa \
|
|
xmlfd \
|
|
xo \
|
|
xof \
|
|
xsltdlg \
|
|
xsltfilter \
|
|
))
|
|
|
|
ifneq (,$(filter ANDROID IOS,$(OS)))
|
|
|
|
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
|
|
libotouch \
|
|
))
|
|
|
|
endif
|
|
|
|
ifeq ($(filter MACOSX WNT,$(OS)),)
|
|
|
|
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
|
|
spl_unx \
|
|
))
|
|
|
|
endif
|
|
|
|
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
|
|
affine_uno \
|
|
cli_cppuhelper \
|
|
cli_uno \
|
|
gcc3_uno \
|
|
java_uno \
|
|
jpipe \
|
|
juh \
|
|
juhx \
|
|
log_uno \
|
|
sal_textenc \
|
|
sunjavaplugin \
|
|
sunpro5_uno \
|
|
unsafe_uno \
|
|
xmlreader \
|
|
))
|
|
|
|
ifeq ($(OS),WNT)
|
|
|
|
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
|
|
jpipx \
|
|
msci_uno \
|
|
mscx_uno \
|
|
))
|
|
|
|
endif
|
|
|
|
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
|
|
avmediagst \
|
|
avmediagst_0_10 \
|
|
avmediawin \
|
|
bluez_bluetooth \
|
|
cached1 \
|
|
collator_data \
|
|
dbpool2 \
|
|
deployment \
|
|
deploymentgui \
|
|
dict_ja \
|
|
dict_zh \
|
|
embobj \
|
|
emboleobj \
|
|
fileacc \
|
|
hsqldb \
|
|
index_data \
|
|
java_uno_accessbridge \
|
|
localedata_en \
|
|
localedata_es \
|
|
localedata_euro \
|
|
localedata_others \
|
|
macab1 \
|
|
macabdrv1 \
|
|
mcnttype \
|
|
mozbootstrap \
|
|
officebean \
|
|
package2 \
|
|
pyuno \
|
|
pyuno_wrapper \
|
|
recentfile \
|
|
scriptframe \
|
|
sdbc2 \
|
|
smoketest \
|
|
sofficeapp \
|
|
srtrs1 \
|
|
subsequenttest \
|
|
test \
|
|
textconv_dict \
|
|
tvhlp1 \
|
|
ucb1 \
|
|
ucpdav1 \
|
|
ucpfile1 \
|
|
ucpftp1 \
|
|
ucpchelp1 \
|
|
ucphier1 \
|
|
ucppkg1 \
|
|
unobootstrapprotector \
|
|
unoexceptionprotector \
|
|
unopkgapp \
|
|
unotest \
|
|
updchk \
|
|
xmlsecurity \
|
|
xsec_fw \
|
|
xsec_xmlsec \
|
|
xstor \
|
|
$(if $(filter $(OS),ANDROID), \
|
|
lo-bootstrap \
|
|
) \
|
|
$(if $(filter $(OS),WNT), \
|
|
ucpodma1 \
|
|
uwinapi \
|
|
) \
|
|
))
|
|
|
|
ifeq ($(OS),WNT)
|
|
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
|
|
dnd \
|
|
dtrans \
|
|
fop \
|
|
fps \
|
|
ftransl \
|
|
inprocserv \
|
|
ooofilt \
|
|
ooofilt_x64 \
|
|
propertyhdl \
|
|
propertyhdl_x64 \
|
|
shlxthdl \
|
|
shlxthdl_x64 \
|
|
so_activex \
|
|
so_activex_x64 \
|
|
sysdtrans \
|
|
))
|
|
endif
|
|
|
|
$(eval $(call gb_Helper_register_libraries,RTLIBS, \
|
|
comphelper \
|
|
i18nisolang1 \
|
|
i18nutil \
|
|
ucbhelper \
|
|
))
|
|
|
|
$(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
|
|
cppuhelper \
|
|
jvmaccess \
|
|
purpenvhelper \
|
|
salhelper \
|
|
))
|
|
|
|
$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
|
|
PresenterScreen \
|
|
basprov \
|
|
cairocanvas \
|
|
canvasfactory \
|
|
cmdmail \
|
|
configmgr \
|
|
desktopbe1 \
|
|
directx5canvas \
|
|
directx9canvas \
|
|
dlgprov \
|
|
expwrap \
|
|
fastsax \
|
|
fpicker \
|
|
fps_office \
|
|
fsstorage \
|
|
gconfbe1 \
|
|
gdipluscanvas \
|
|
hatchwindowfactory \
|
|
i18npool \
|
|
i18nsearch \
|
|
kdebe1 \
|
|
kde4be1 \
|
|
ldapbe2 \
|
|
localebe1 \
|
|
lomenubar \
|
|
losessioninstall \
|
|
macbe1 \
|
|
migrationoo2 \
|
|
migrationoo3 \
|
|
msforms \
|
|
mtfrenderer \
|
|
nullcanvas \
|
|
OGLTrans \
|
|
passwordcontainer \
|
|
pythonloader \
|
|
postgresql-sdbc \
|
|
postgresql-sdbc-impl \
|
|
simplecanvas \
|
|
slideshow \
|
|
stringresource \
|
|
syssh \
|
|
tdebe1 \
|
|
ucpcmis1 \
|
|
ucpexpand1 \
|
|
ucpext \
|
|
ucpgio1 \
|
|
ucpgvfs1 \
|
|
ucptdoc1 \
|
|
updatefeed \
|
|
vbaevents \
|
|
vbaobj \
|
|
vbaswobj \
|
|
vclcanvas \
|
|
$(if $(filter $(GUIBASE),aqua), \
|
|
fps_aqua \
|
|
) \
|
|
$(if $(filter $(OS),WNT), \
|
|
fps_odma \
|
|
) \
|
|
))
|
|
|
|
ifeq ($(OS),WNT)
|
|
$(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
|
|
oleautobridge \
|
|
oleautobridge2 \
|
|
smplmail \
|
|
wininetbe1 \
|
|
))
|
|
endif
|
|
|
|
$(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
|
|
acceptor \
|
|
binaryurp \
|
|
bootstrap \
|
|
connector \
|
|
introspection \
|
|
invocadapt \
|
|
invocation \
|
|
javaloader \
|
|
javavm \
|
|
namingservice \
|
|
proxyfac \
|
|
reflection \
|
|
stocservices \
|
|
streams \
|
|
testtools_cppobj \
|
|
testtools_bridgetest \
|
|
testtools_constructors \
|
|
textinstream \
|
|
textoutstream \
|
|
uuresolver \
|
|
))
|
|
|
|
$(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
|
|
cppu \
|
|
jvmfwk \
|
|
reg \
|
|
sal \
|
|
store \
|
|
))
|
|
|
|
$(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \
|
|
pdfimport \
|
|
SunPresentationMinimizer \
|
|
))
|
|
|
|
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
|
|
$(if $(filter $(OS),ANDROID), \
|
|
basebmp \
|
|
) \
|
|
basegfx_s \
|
|
codemaker \
|
|
codemaker_cpp \
|
|
codemaker_java \
|
|
cosv \
|
|
dtobj \
|
|
findsofficepath \
|
|
headless \
|
|
libeay32 \
|
|
npsoenv \
|
|
nputils \
|
|
pdfimport_s \
|
|
plugcon \
|
|
ssleay32 \
|
|
ooopathutils \
|
|
sample \
|
|
sax_shared \
|
|
simplemapi \
|
|
shell_xmlparser \
|
|
shell_xmlparser_x64 \
|
|
shlxthandler_common \
|
|
shlxthandler_common_x64 \
|
|
salcpprt \
|
|
testtools_bridgetest_s \
|
|
transex \
|
|
udm \
|
|
ulingu \
|
|
vclmain \
|
|
writerperfect \
|
|
$(if $(filter-out $(OS),IOS), \
|
|
registry_helper \
|
|
) \
|
|
$(if $(filter $(OS),IOS), \
|
|
uno \
|
|
) \
|
|
$(if $(filter $(OS),WNT), \
|
|
odma_lib \
|
|
) \
|
|
))
|
|
|
|
ifeq ($(OS),WNT)
|
|
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
|
|
xmlsec1 \
|
|
xmlsec1-nss \
|
|
))
|
|
ifneq ($(CROSS_COMPILING),YES)
|
|
$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
|
|
xmlsec1-mscrypto \
|
|
))
|
|
endif
|
|
else
|
|
$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
|
|
xmlsec1 \
|
|
xmlsec1-nss \
|
|
))
|
|
endif
|
|
|
|
$(eval $(call gb_Helper_register_jars,URE, \
|
|
java_uno \
|
|
juh \
|
|
jurt \
|
|
ridl \
|
|
testComponent \
|
|
unoil \
|
|
unoloader \
|
|
))
|
|
|
|
$(eval $(call gb_Helper_register_jars,OOO, \
|
|
ConnectivityTools \
|
|
FCFGMerge \
|
|
HelloWorld \
|
|
Highlight \
|
|
MemoryUsage \
|
|
OOoRunner \
|
|
ScriptFramework \
|
|
ScriptProviderForBeanShell \
|
|
ScriptProviderForJava \
|
|
ScriptProviderForJavaScript \
|
|
TestExtension \
|
|
OOoRunnerLight \
|
|
XMergeBridge \
|
|
XSLTFilter \
|
|
XSLTValidate \
|
|
commonwizards \
|
|
agenda \
|
|
aportisdoc \
|
|
fax \
|
|
form \
|
|
htmlsoff \
|
|
java_uno_accessbridge \
|
|
letter \
|
|
officebean \
|
|
pexcel \
|
|
pocketword \
|
|
query \
|
|
report \
|
|
reportbuilderwizard \
|
|
sdbc_hsqldb \
|
|
table \
|
|
test \
|
|
test-tools \
|
|
web \
|
|
xmerge \
|
|
))
|
|
|
|
$(eval $(call gb_Helper_register_jars,OXT, \
|
|
EvolutionarySolver \
|
|
mediawiki \
|
|
nlpsolver \
|
|
sun-report-builder \
|
|
))
|
|
|
|
# vim: set noet sw=4 ts=4:
|