[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 72 commits - animations/Library_animcore.mk animations/Makefile animations/Module_animations.mk animations/Package_inc.mk animations/Package_xml.mk animations/prj animations/source automation/inc automation/Library_communi.mk automation/Library_communi.mk.old automation/Library_simplecm.mk automation/Library_sts.mk automation/Makefile automation/Module_automation.mk automation/Package_hid.mk automation/Package_inc.mk automation/prj automation/source automation/util avmedia/AllLangResTarget_avmedia.mk avmedia/inc avmedia/Jar_avmedia.mk avmedia/Library_avmediagst.mk avmedia/Library_avmediaMacAVF.mk avmedia/Library_avmedia.mk avmedia/Library_avmediaQuickTime.mk avmedia/Library_avmediawin.mk avmedia/Makefile avmedia/Module_avmedia.mk avmedia/Package_avmedia_jar.mk avmedia/Package_inc.mk avmedia/prj avmedia/source avmedia/util basebmp/prj basegfx/prj binaryurp/GoogleTest_cache.mk binaryurp/GoogleTest_unmarshal.mk binaryurp/Library_binaryurp.mk binar yurp/Makefile binaryurp/Module_binaryurp.mk binaryurp/prj binaryurp/qa binaryurp/source bootstrap.1 bridges/source canvas/prj configmgr/JunitTest_configmgr_unoapi.mk configmgr/Library_configmgr.mk configmgr/Makefile configmgr/Module_configmgr.mk configmgr/prj connectivity/source cppcanvas/prj dbaccess/prj desktop/source dtrans/inc dtrans/Library_dnd.mk dtrans/Library_dtrans.mk dtrans/Library_ftransl.mk dtrans/Library_mcnttype.mk dtrans/Library_sysdtrans_os2.mk dtrans/Library_sysdtrans_win.mk dtrans/Makefile dtrans/Module_dtrans.mk dtrans/Package_xml.mk dtrans/prj dtrans/source dtrans/util embeddedobj/inc embeddedobj/Library_embobj.mk embeddedobj/Library_emboleobj.mk embeddedobj/Makefile embeddedobj/Module_embeddedobj.mk embeddedobj/prj embeddedobj/source embeddedobj/util eventattacher/Library_evtatt.mk eventattacher/Makefile eventattacher/Module_eventattacher.mk eventattacher/prj eventattacher/source external_deps.lst fileaccess/Module_fileaccess.mk fileaccess/Package_xml.mk fileacc ess/source fpicker/AllLangResTarget_fps_office.mk fpicker/inc fpicker/Library_fop.mk fpicker/Library_fpicker.mk fpicker/Library_fps_aqua.mk fpicker/Library_fps_gnome.mk fpicker/Library_fps_kde4.mk fpicker/Library_fps.mk fpicker/Library_fps_office.mk fpicker/Makefile fpicker/Module_fpicker.mk fpicker/Package_xml.mk fpicker/prj fpicker/source fpicker/util fpicker/WinResTarget_fpicker.mk idl/prj io/inc io/Library_acceptor.mk io/Library_connector.mk io/Library_streams.mk io/Library_textinstream.mk io/Library_textoutstream.mk io/Makefile io/Module_io.mk io/Package_xml.mk io/prj io/source javaunohelper/com javaunohelper/inc javaunohelper/Jar_juh.mk javaunohelper/Library_juh.mk javaunohelper/Library_juhx.mk javaunohelper/Makefile javaunohelper/Module_javaunohelper.mk javaunohelper/prj javaunohelper/source javaunohelper/util javaunohelper/Zip_juh_src.mk jurt/com linguistic/prj MathMLDTD/Makefile MathMLDTD/Module_MathMLDTD.mk MathMLDTD/Package_dtd.mk MathMLDTD/Package_html.mk MathMLDTD/prj M odule_ooo.mk o3tl/GoogleTest_o3tl.mk o3tl/Makefile o3tl/Module_o3tl.mk o3tl/Package_inc.mk o3tl/prj o3tl/qa odk/pack odk/settings offapi/prj oovbaapi/prj oox/prj package/inc package/Library_package2.mk package/Library_xstor.mk package/Makefile package/Module_package.mk package/Package_dtd.mk package/prj package/source package/util padmin/prj postprocess/packcomponents qadevOOo/runner README remotebridges/Library_uuresolver.mk remotebridges/Makefile remotebridges/Module_remotebridges.mk remotebridges/prj remotebridges/source reportdesign/prj Repository.mk ridljar/com sal/inc sal/osl sal/qa sax/prj sd/prj sd/source setup_native/source sfx2/inc sfx2/source slideshow/qa solenv/bin solenv/gbuild solenv/inc solenv/javadownloader soltools/cpp starmath/prj svl/Library_passwordcontainer.mk svl/source sw/source testtools/source ucbhelper/prj udkapi/prj udm/Makefile udm/Module_udm.mk udm/Package_inc.mk udm/prj udm/source udm/StaticLibrary_udm.mk unotools/prj unoxml/prj ure/source uui/AllLangRe sTarget_uui.mk uui/Library_uui.mk uui/Makefile uui/Module_uui.mk uui/Package_xml.mk uui/prj uui/source uui/util vcl/prj vcl/unx wizards/prj writerfilter/prj x11_extensions/Makefile x11_extensions/Module_x11_extensions.mk x11_extensions/Package_inc.mk x11_extensions/prj xmlreader/prj xmlscript/prj
Pedro Giffuni
pfg at apache.org
Fri Dec 23 18:08:46 UTC 2016
MathMLDTD/Makefile | 32
MathMLDTD/Module_MathMLDTD.mk | 31
MathMLDTD/Package_dtd.mk | 25
MathMLDTD/Package_html.mk | 25
MathMLDTD/prj/build.lst | 3
MathMLDTD/prj/d.lst | 2
MathMLDTD/prj/makefile.mk | 44
Module_ooo.mk | 19
README | 2
Repository.mk | 38
animations/Library_animcore.mk | 53
animations/Makefile | 32
animations/Module_animations.mk | 32
animations/Package_inc.mk | 26
animations/Package_xml.mk | 26
animations/prj/build.lst | 3
animations/prj/d.lst | 10
animations/prj/makefile.mk | 44
animations/source/animcore/factreg.cxx | 6
animations/source/animcore/makefile.mk | 74
automation/Library_communi.mk | 68
automation/Library_communi.mk.old | 99
automation/Library_simplecm.mk | 60
automation/Library_sts.mk | 105
automation/Makefile | 32
automation/Module_automation.mk | 34
automation/Package_hid.mk | 26
automation/Package_inc.mk | 31
automation/inc/automation/automation.hxx | 4
automation/inc/automation/automationdllapi.h | 39
automation/inc/automation/communi.hxx | 15
automation/inc/automation/simplecm.hxx | 19
automation/inc/makefile.mk | 43
automation/prj/build.lst | 8
automation/prj/d.lst | 27
automation/prj/makefile.mk | 44
automation/source/communi/makefile.mk | 40
automation/source/server/makefile.mk | 67
automation/source/simplecm/makefile.mk | 42
automation/util/makefile.mk | 173
avmedia/AllLangResTarget_avmedia.mk | 41
avmedia/Jar_avmedia.mk | 52
avmedia/Library_avmedia.mk | 77
avmedia/Library_avmediaMacAVF.mk | 68
avmedia/Library_avmediaQuickTime.mk | 68
avmedia/Library_avmediagst.mk | 71
avmedia/Library_avmediawin.mk | 81
avmedia/Makefile | 32
avmedia/Module_avmedia.mk | 66
avmedia/Package_avmedia_jar.mk | 27
avmedia/Package_inc.mk | 30
avmedia/inc/avmedia/avmediadllapi.h | 39
avmedia/inc/avmedia/mediaitem.hxx | 3
avmedia/inc/avmedia/mediaplayer.hxx | 5
avmedia/inc/avmedia/mediatoolbox.hxx | 3
avmedia/inc/avmedia/mediawindow.hxx | 3
avmedia/prj/build.lst | 12
avmedia/prj/d.lst | 25
avmedia/prj/makefile.mk | 44
avmedia/source/framework/makefile.mk | 54
avmedia/source/framework/soundhandler.cxx | 4
avmedia/source/gstreamer/exports.dxp | 2
avmedia/source/gstreamer/gstuno.cxx | 4
avmedia/source/gstreamer/makefile.mk | 77
avmedia/source/java/avmedia.jar.processed.component | 2
avmedia/source/java/makefile.mk | 65
avmedia/source/macavf/macavf_macavfuno.cxx | 4
avmedia/source/macavf/makefile.mk | 89
avmedia/source/quicktime/makefile.mk | 92
avmedia/source/quicktime/qt_uno.cxx | 4
avmedia/source/viewer/makefile.mk | 53
avmedia/source/win/exports.dxp | 3
avmedia/source/win/makefile.mk | 84
avmedia/source/win/winuno.cxx | 4
avmedia/util/makefile.mk | 83
basebmp/prj/makefile.mk | 14
basegfx/prj/makefile.mk | 14
binaryurp/GoogleTest_cache.mk | 47
binaryurp/GoogleTest_unmarshal.mk | 61
binaryurp/Library_binaryurp.mk | 61
binaryurp/Makefile | 32
binaryurp/Module_binaryurp.mk | 37
binaryurp/prj/build.lst | 3
binaryurp/prj/d.lst | 4
binaryurp/prj/makefile.mk | 44
binaryurp/qa/makefile.mk | 77
binaryurp/source/makefile.mk | 65
bootstrap.1 | 8
bridges/source/cpp_uno/gcc3_freebsd_powerpc64/makefile.mk | 2
bridges/source/cpp_uno/gcc3_freebsd_powerpc64/uno2cpp.cxx | 2
canvas/prj/makefile.mk | 14
configmgr/JunitTest_configmgr_unoapi.mk | 45
configmgr/Library_configmgr.mk | 84
configmgr/Makefile | 32
configmgr/Module_configmgr.mk | 38
configmgr/prj/build.lst | 4
configmgr/prj/d.lst | 4
configmgr/prj/makefile.mk | 44
connectivity/source/drivers/file/FConnection.cxx | 4
cppcanvas/prj/makefile.mk | 14
dbaccess/prj/makefile.mk | 14
desktop/source/deployment/misc/dp_platform.cxx | 5
dtrans/Library_dnd.mk | 97
dtrans/Library_dtrans.mk | 54
dtrans/Library_ftransl.mk | 58
dtrans/Library_mcnttype.mk | 60
dtrans/Library_sysdtrans_os2.mk | 56
dtrans/Library_sysdtrans_win.mk | 103
dtrans/Makefile | 32
dtrans/Module_dtrans.mk | 46
dtrans/Package_xml.mk | 37
dtrans/inc/makefile.mk | 43
dtrans/prj/build.lst | 15
dtrans/prj/d.lst | 14
dtrans/prj/makefile.mk | 44
dtrans/source/cnttype/exports.dxp | 2
dtrans/source/cnttype/makefile.mk | 49
dtrans/source/cnttype/mctfentry.cxx | 4
dtrans/source/cnttype/wbench/makefile.mk | 49
dtrans/source/generic/dtrans.cxx | 4
dtrans/source/generic/exports.dxp | 2
dtrans/source/generic/makefile.mk | 71
dtrans/source/os2/clipb/Os2Service.cxx | 4
dtrans/source/os2/clipb/exports.dxp | 3
dtrans/source/os2/clipb/makefile.mk | 51
dtrans/source/test/makefile.mk | 49
dtrans/source/win32/clipb/exports.dxp | 3
dtrans/source/win32/clipb/makefile.mk | 55
dtrans/source/win32/clipb/wcbentry.cxx | 4
dtrans/source/win32/dnd/dndentry.cxx | 6
dtrans/source/win32/dnd/exports.dxp | 2
dtrans/source/win32/dnd/makefile.mk | 62
dtrans/source/win32/dtobj/makefile.mk | 72
dtrans/source/win32/ftransl/exports.dxp | 2
dtrans/source/win32/ftransl/ftranslentry.cxx | 4
dtrans/source/win32/ftransl/makefile.mk | 47
dtrans/source/win32/misc/makefile.mk | 56
dtrans/source/win32/mtaole/makefile.mk | 50
dtrans/source/win32/workbench/makefile.mk | 92
dtrans/util/exports.dxp | 2
dtrans/util/makefile.mk | 210 -
embeddedobj/Library_embobj.mk | 65
embeddedobj/Library_emboleobj.mk | 96
embeddedobj/Makefile | 32
embeddedobj/Module_embeddedobj.mk | 31
embeddedobj/inc/makefile.mk | 43
embeddedobj/prj/build.lst | 7
embeddedobj/prj/d.lst | 8
embeddedobj/prj/makefile.mk | 44
embeddedobj/source/commonembedding/makefile.mk | 52
embeddedobj/source/commonembedding/register.cxx | 4
embeddedobj/source/general/makefile.mk | 56
embeddedobj/source/msole/exports.dxp | 2
embeddedobj/source/msole/makefile.mk | 139
embeddedobj/source/msole/oleregister.cxx | 4
embeddedobj/util/exports.dxp | 2
embeddedobj/util/makefile.mk | 93
eventattacher/Library_evtatt.mk | 48
eventattacher/Makefile | 32
eventattacher/Module_eventattacher.mk | 30
eventattacher/prj/build.lst | 4
eventattacher/prj/d.lst | 4
eventattacher/prj/makefile.mk | 44
eventattacher/source/eventattacher.cxx | 4
eventattacher/source/makefile.mk | 67
external_deps.lst | 11
fileaccess/Module_fileaccess.mk | 1
fileaccess/Package_xml.mk | 26
fileaccess/source/makefile.mk | 72
fpicker/AllLangResTarget_fps_office.mk | 44
fpicker/Library_fop.mk | 82
fpicker/Library_fpicker.mk | 55
fpicker/Library_fps.mk | 106
fpicker/Library_fps_aqua.mk | 62
fpicker/Library_fps_gnome.mk | 65
fpicker/Library_fps_kde4.mk | 71
fpicker/Library_fps_office.mk | 68
fpicker/Makefile | 32
fpicker/Module_fpicker.mk | 62
fpicker/Package_xml.mk | 30
fpicker/WinResTarget_fpicker.mk | 33
fpicker/inc/makefile.mk | 43
fpicker/prj/build.lst | 11
fpicker/prj/d.lst | 18
fpicker/prj/makefile.mk | 44
fpicker/source/aqua/FPentry.cxx | 4
fpicker/source/aqua/makefile.mk | 89
fpicker/source/generic/makefile.mk | 66
fpicker/source/office/makefile.mk | 92
fpicker/source/unx/gnome/FPentry.cxx | 4
fpicker/source/unx/gnome/makefile.mk | 102
fpicker/source/unx/kde4/KDE4FPEntry.cxx | 4
fpicker/source/unx/kde4/KDE4FilePicker.cxx | 2
fpicker/source/unx/kde4/makefile.mk | 86
fpicker/source/win32/filepicker/FPentry.cxx | 4
fpicker/source/win32/filepicker/makefile.mk | 80
fpicker/source/win32/filepicker/workbench/makefile.mk | 58
fpicker/source/win32/folderpicker/Fopentry.cxx | 4
fpicker/source/win32/folderpicker/makefile.mk | 47
fpicker/source/win32/folderpicker/workbench/makefile.mk | 58
fpicker/source/win32/misc/makefile.mk | 53
fpicker/util/exports.dxp | 2
fpicker/util/makefile.mk | 111
idl/prj/makefile.mk | 14
io/Library_acceptor.mk | 54
io/Library_connector.mk | 54
io/Library_streams.mk | 57
io/Library_textinstream.mk | 52
io/Library_textoutstream.mk | 52
io/Makefile | 32
io/Module_io.mk | 35
io/Package_xml.mk | 28
io/inc/makefile.mk | 45
io/prj/build.lst | 8
io/prj/d.lst | 12
io/prj/makefile.mk | 44
io/source/TextInputStream/TextInputStream.cxx | 6
io/source/TextInputStream/makefile.mk | 65
io/source/TextOutputStream/TextOutputStream.cxx | 6
io/source/TextOutputStream/makefile.mk | 66
io/source/acceptor/acceptor.cxx | 6
io/source/acceptor/makefile.mk | 77
io/source/connector/connector.cxx | 6
io/source/connector/makefile.mk | 77
io/source/stm/factreg.cxx | 6
io/source/stm/makefile.mk | 80
javaunohelper/Jar_juh.mk | 72
javaunohelper/Library_juh.mk | 43
javaunohelper/Library_juhx.mk | 53
javaunohelper/Makefile | 32
javaunohelper/Module_javaunohelper.mk | 33
javaunohelper/Zip_juh_src.mk | 53
javaunohelper/com/sun/star/comp/helper/makefile.mk | 50
javaunohelper/com/sun/star/comp/juhtest/makefile.mk | 46
javaunohelper/com/sun/star/comp/makefile.mk | 45
javaunohelper/com/sun/star/lib/uno/adapter/makefile.mk | 50
javaunohelper/com/sun/star/lib/uno/helper/makefile.mk | 45
javaunohelper/inc/makefile.mk | 43
javaunohelper/prj/build.lst | 10
javaunohelper/prj/d.lst | 7
javaunohelper/prj/makefile.mk | 44
javaunohelper/source/makefile.mk | 141
javaunohelper/util/makefile.mk | 54
javaunohelper/util/settings.pmk | 24
jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java | 2
jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java | 2
jurt/com/sun/star/comp/connections/PipedConnection.java | 2
jurt/com/sun/star/comp/loader/FactoryHelper.java | 2
jurt/com/sun/star/comp/servicemanager/ServiceManager.java | 6
jurt/com/sun/star/lib/connections/pipe/PipeConnection.java | 2
jurt/com/sun/star/lib/connections/socket/SocketConnection.java | 2
jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java | 2
jurt/com/sun/star/lib/uno/environments/remote/IReceiver.java | 2
jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java | 2
jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java | 2
jurt/com/sun/star/lib/uno/environments/remote/Job.java | 2
jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java | 2
jurt/com/sun/star/uno/Ascii.java | 2
jurt/com/sun/star/uno/AsciiString.java | 2
jurt/com/sun/star/uno/MappingException.java | 2
linguistic/prj/makefile.mk | 14
o3tl/GoogleTest_o3tl.mk | 45
o3tl/Makefile | 32
o3tl/Module_o3tl.mk | 36
o3tl/Package_inc.mk | 30
o3tl/prj/build.lst | 5
o3tl/prj/d.lst | 2
o3tl/prj/makefile.mk | 44
o3tl/qa/makefile.mk | 67
odk/pack/gendocu/makefile.mk | 6
odk/settings/platform.mk | 3
odk/settings/settings.mk | 7
offapi/prj/makefile.mk | 14
oovbaapi/prj/makefile.mk | 14
oox/prj/makefile.mk | 14
package/Library_package2.mk | 86
package/Library_xstor.mk | 68
package/Makefile | 32
package/Module_package.mk | 32
package/Package_dtd.mk | 25
package/inc/makefile.mk | 43
package/inc/package/dllapi.h | 36
package/prj/build.lst | 9
package/prj/d.lst | 7
package/prj/makefile.mk | 44
package/source/manifest/ManifestDefines.hxx | 76
package/source/manifest/ManifestExport.cxx | 388 --
package/source/manifest/ManifestExport.hxx | 42
package/source/manifest/ManifestImport.cxx | 405 --
package/source/manifest/ManifestImport.hxx | 111
package/source/manifest/ManifestReader.cxx | 146
package/source/manifest/ManifestReader.hxx | 69
package/source/manifest/ManifestWriter.cxx | 131
package/source/manifest/ManifestWriter.hxx | 70
package/source/manifest/UnoRegister.cxx | 88
package/source/manifest/makefile.mk | 50
package/source/package/manifest/ManifestDefines.hxx | 76
package/source/package/manifest/ManifestExport.cxx | 388 ++
package/source/package/manifest/ManifestExport.hxx | 42
package/source/package/manifest/ManifestImport.cxx | 405 ++
package/source/package/manifest/ManifestImport.hxx | 111
package/source/package/manifest/ManifestReader.cxx | 146
package/source/package/manifest/ManifestReader.hxx | 69
package/source/package/manifest/ManifestWriter.cxx | 131
package/source/package/manifest/ManifestWriter.hxx | 70
package/source/package/manifest/UnoRegister.cxx | 88
package/source/package/manifest/makefile.mk | 50
package/source/package/zipapi/ByteChucker.cxx | 108
package/source/package/zipapi/ByteGrabber.cxx | 187
package/source/package/zipapi/CRC32.cxx | 92
package/source/package/zipapi/Deflater.cxx | 208 +
package/source/package/zipapi/Inflater.cxx | 158
package/source/package/zipapi/MemoryByteGrabber.hxx | 173
package/source/package/zipapi/XUnbufferedStream.cxx | 370 +
package/source/package/zipapi/XUnbufferedStream.hxx | 109
package/source/package/zipapi/ZipEnumeration.cxx | 49
package/source/package/zipapi/ZipFile.cxx | 1085 +++++
package/source/package/zipapi/ZipOutputStream.cxx | 448 ++
package/source/package/zipapi/blowfishcontext.cxx | 118
package/source/package/zipapi/blowfishcontext.hxx | 54
package/source/package/zipapi/makefile.mk | 57
package/source/package/zipapi/sha1context.cxx | 93
package/source/package/zipapi/sha1context.hxx | 53
package/source/package/zippackage/ContentInfo.hxx | 65
package/source/package/zippackage/ZipPackage.cxx | 1882 ++++++++++
package/source/package/zippackage/ZipPackageBuffer.cxx | 132
package/source/package/zippackage/ZipPackageEntry.cxx | 132
package/source/package/zippackage/ZipPackageFolder.cxx | 851 ++++
package/source/package/zippackage/ZipPackageFolderEnumeration.cxx | 75
package/source/package/zippackage/ZipPackageFolderEnumeration.hxx | 64
package/source/package/zippackage/ZipPackageSink.cxx | 44
package/source/package/zippackage/ZipPackageSink.hxx | 44
package/source/package/zippackage/ZipPackageStream.cxx | 940 ++++
package/source/package/zippackage/wrapstreamforshare.cxx | 176
package/source/package/zippackage/wrapstreamforshare.hxx | 69
package/source/package/zippackage/zipfileaccess.cxx | 489 ++
package/source/xstor/makefile.mk | 79
package/source/xstor/register.cxx | 5
package/source/xstor/xstor.dxp | 2
package/source/zipapi/ByteChucker.cxx | 108
package/source/zipapi/ByteGrabber.cxx | 187
package/source/zipapi/CRC32.cxx | 92
package/source/zipapi/Deflater.cxx | 208 -
package/source/zipapi/Inflater.cxx | 158
package/source/zipapi/MemoryByteGrabber.hxx | 173
package/source/zipapi/XUnbufferedStream.cxx | 370 -
package/source/zipapi/XUnbufferedStream.hxx | 109
package/source/zipapi/ZipEnumeration.cxx | 49
package/source/zipapi/ZipFile.cxx | 1085 -----
package/source/zipapi/ZipOutputStream.cxx | 448 --
package/source/zipapi/blowfishcontext.cxx | 118
package/source/zipapi/blowfishcontext.hxx | 54
package/source/zipapi/makefile.mk | 57
package/source/zipapi/sha1context.cxx | 93
package/source/zipapi/sha1context.hxx | 53
package/source/zippackage/ContentInfo.hxx | 65
package/source/zippackage/ZipPackage.cxx | 1882 ----------
package/source/zippackage/ZipPackageBuffer.cxx | 132
package/source/zippackage/ZipPackageEntry.cxx | 132
package/source/zippackage/ZipPackageFolder.cxx | 851 ----
package/source/zippackage/ZipPackageFolderEnumeration.cxx | 75
package/source/zippackage/ZipPackageFolderEnumeration.hxx | 64
package/source/zippackage/ZipPackageSink.cxx | 44
package/source/zippackage/ZipPackageSink.hxx | 44
package/source/zippackage/ZipPackageStream.cxx | 940 ----
package/source/zippackage/makefile.mk | 59
package/source/zippackage/wrapstreamforshare.cxx | 176
package/source/zippackage/wrapstreamforshare.hxx | 69
package/source/zippackage/zipfileaccess.cxx | 489 --
package/util/exports.dxp | 2
package/util/makefile.mk | 82
padmin/prj/makefile.mk | 2
postprocess/packcomponents/makefile.mk | 76
qadevOOo/runner/makefile.mk | 2
remotebridges/Library_uuresolver.mk | 48
remotebridges/Makefile | 32
remotebridges/Module_remotebridges.mk | 30
remotebridges/prj/build.lst | 2
remotebridges/prj/d.lst | 4
remotebridges/prj/makefile.mk | 44
remotebridges/source/unourl_resolver/makefile.mk | 68
remotebridges/source/unourl_resolver/unourl_resolver.cxx | 6
reportdesign/prj/makefile.mk | 14
ridljar/com/sun/star/uno/Any.java | 2
ridljar/com/sun/star/uno/Enum.java | 2
ridljar/com/sun/star/uno/Union.java | 2
sal/inc/osl/endian.h | 6
sal/osl/unx/system.h | 8
sal/qa/helper/gcov/gcov_filter.pl | 2
sal/qa/helper/gcov/gcov_result.pl | 2
sal/qa/helper/gcov/gcov_resultcompare.pl | 2
sal/qa/helper/gcov/gcov_resultinterpreter.pl | 2
sax/prj/makefile.mk | 14
sd/prj/makefile.mk | 14
sd/source/core/drawdoc.cxx | 156
setup_native/source/mac/ooo/osxdndinstall.png |binary
setup_native/source/mac/ooo/osxdndinstall_beta.png |binary
setup_native/source/mac/ooo/osxdndinstall_lang.png |binary
setup_native/source/mac/ooo/osxdndinstall_lang_beta.png |binary
setup_native/source/mac/sdk/osxdndinstall_sdk.png |binary
setup_native/source/mac/sdk/osxdndinstall_sdk_beta.png |binary
setup_native/source/win32/nsis/ooobitmap.bmp |binary
setup_native/source/win32/nsis/ooosdkbitmap.bmp |binary
sfx2/inc/sfx2/linkmgr.hxx | 51
sfx2/source/appl/linkmgr2.cxx | 53
slideshow/qa/debug/nodetree.sh | 2
slideshow/qa/debug/timings.pl | 2
solenv/bin/download_external_dependencies.pl | 103
solenv/bin/langwrap | 2
solenv/bin/modules/ExtensionsLst.pm | 60
solenv/gbuild/platform/freebsd.mk | 10
solenv/gbuild/platform/linux.mk | 1
solenv/gbuild/platform/windows.mk | 2
solenv/gbuild/platform/winmingw.mk | 2
solenv/gbuild/templates/makefile.mk | 10
solenv/inc/libs.mk | 3
solenv/inc/minor.mk | 2
solenv/inc/unx.mk | 4
solenv/inc/unxfbsd.mk | 3
solenv/javadownloader/AOOJavaDownloader.java | 156
soltools/cpp/_cpp.c | 2
soltools/cpp/cpp.h | 2
starmath/prj/makefile.mk | 14
svl/Library_passwordcontainer.mk | 11
svl/source/misc/mediatyp.src | 2
sw/source/core/doc/doc.cxx | 169
sw/source/core/doc/docdesc.cxx | 169
testtools/source/bridgetest/makefile.mk | 2
ucbhelper/prj/makefile.mk | 14
udkapi/prj/makefile.mk | 14
udm/Makefile | 32
udm/Module_udm.mk | 31
udm/Package_inc.mk | 27
udm/StaticLibrary_udm.mk | 47
udm/prj/build.lst | 12
udm/prj/d.lst | 9
udm/prj/makefile.mk | 44
udm/source/html/makefile.mk | 52
udm/source/mkinc/fullcpp.mk | 56
udm/source/xml/makefile.mk | 52
unotools/prj/makefile.mk | 14
unoxml/prj/makefile.mk | 2
ure/source/makefile.mk | 16
uui/AllLangResTarget_uui.mk | 57
uui/Library_uui.mk | 84
uui/Makefile | 32
uui/Module_uui.mk | 32
uui/Package_xml.mk | 26
uui/prj/build.lst | 4
uui/prj/d.lst | 10
uui/prj/makefile.mk | 44
uui/source/makefile.mk | 83
uui/source/services.cxx | 5
uui/util/makefile.mk | 68
vcl/prj/makefile.mk | 2
vcl/unx/kde4/KDEXLib.cxx | 9
wizards/prj/makefile.mk | 14
writerfilter/prj/makefile.mk | 14
x11_extensions/Makefile | 32
x11_extensions/Module_x11_extensions.mk | 32
x11_extensions/Package_inc.mk | 31
x11_extensions/prj/build.lst | 2
x11_extensions/prj/d.lst | 5
x11_extensions/prj/makefile.mk | 44
xmlreader/prj/makefile.mk | 14
xmlscript/prj/makefile.mk | 14
466 files changed, 16789 insertions(+), 16151 deletions(-)
New commits:
commit a264476563664ef1f594ab2f3e26ca30758e0d38
Author: Pedro Giffuni <pfg at apache.org>
Date: Fri Dec 23 16:20:05 2016 +0000
Re-enable some Date svn:keywords.
These all pre-existed in the code and it0s convenient to let Subversion
handle them directly.
These should have no effect on the build.
diff --git a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java b/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
index cd81243..45d4efa 100644
--- a/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
+++ b/jurt/com/sun/star/comp/bridgefactory/BridgeFactory.java
@@ -52,7 +52,7 @@ import com.sun.star.uno.UnoRuntime;
* <p>
* This component is only usable for remote bridges.
* <p>
- * @version $Revision: 1.11 $ $ $Date: 2008-04-11 11:07:51 $
+ * @version $Revision: 1.11 $ $ $Date$
* @author Kay Ramme
* @see com.sun.star.uno.UnoRuntime
* @since UDK1.0
diff --git a/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java b/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java
index f6446d3..63ec50a 100644
--- a/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java
+++ b/jurt/com/sun/star/comp/connections/ConstantInstanceProvider.java
@@ -37,7 +37,7 @@ import com.sun.star.comp.loader.FactoryHelper;
* The <code>ConstantInstanceProvider</code> is a component
* that implements the <code>XInstanceProvider</code> Interface.
* <p>
- * @version $Revision: 1.3 $ $ $Date: 2008-04-11 11:08:55 $
+ * @version $Revision: 1.3 $ $ $Date$
* @author Kay Ramme
* @see com.sun.star.bridge.XBridge
* @see com.sun.star.bridge.XBridgeFactory
diff --git a/jurt/com/sun/star/comp/connections/PipedConnection.java b/jurt/com/sun/star/comp/connections/PipedConnection.java
index 9da3748..7f23f8c 100644
--- a/jurt/com/sun/star/comp/connections/PipedConnection.java
+++ b/jurt/com/sun/star/comp/connections/PipedConnection.java
@@ -39,7 +39,7 @@ import com.sun.star.registry.XRegistryKey;
* It is useful for <code>Thread</code> communication
* in one Process.
* <p>
- * @version $Revision: 1.3 $ $ $Date: 2008-04-11 11:09:30 $
+ * @version $Revision: 1.3 $ $ $Date$
* @author Kay Ramme
* @see com.sun.star.connections.XConnection
* @see com.sun.star.loader.JavaLoader
diff --git a/jurt/com/sun/star/comp/loader/FactoryHelper.java b/jurt/com/sun/star/comp/loader/FactoryHelper.java
index 2f9dfe0..95e923e 100644
--- a/jurt/com/sun/star/comp/loader/FactoryHelper.java
+++ b/jurt/com/sun/star/comp/loader/FactoryHelper.java
@@ -47,7 +47,7 @@ import com.sun.star.uno.Type;
* This class has default implementations for <code>getServiceFactory</code>
* and <code>writeRegistryServiceInfo</code>.
* <p>
- * @version $Revision: 1.9 $ $ $Date: 2008-04-11 11:10:09 $
+ * @version $Revision: 1.9 $ $ $Date$
* @author Kay Ramme
* @see com.sun.star.lang.XMultiServiceFactory
* @see com.sun.star.lang.XServiceInfo
diff --git a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
index b10755f..35addc2 100644
--- a/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
+++ b/jurt/com/sun/star/comp/servicemanager/ServiceManager.java
@@ -54,7 +54,7 @@ import java.lang.reflect.InvocationTargetException;
* calls to the implementing objects and are used instead of casts
* and identity comparisons.
* <p>
- * @version $Revision: 1.10 $ $ $Date: 2008-04-11 11:11:46 $
+ * @version $Revision: 1.10 $ $ $Date$
* @author Markus Herzog
* @see com.sun.star.lang.XMultiServiceFactory
* @see com.sun.star.container.XSet
@@ -739,7 +739,7 @@ public class ServiceManager implements XMultiServiceFactory,
* implementation of the @see com.sun.star.container.XEnumeration interface.
* It is a inner wrapper for a java.util.Enumeration object.
* <p>
- * @version $Revision: 1.10 $ $ $Date: 2008-04-11 11:11:46 $
+ * @version $Revision: 1.10 $ $ $Date$
* @author Markus Herzog
* @see com.sun.star.lang.XSingleServiceFactory
* @see com.sun.star.lang.XServiceInfo
@@ -810,7 +810,7 @@ public class ServiceManager implements XMultiServiceFactory,
* com.sun.star.lang.XSingleServiceFactory and the com.sun.star.lang.XServiceInfo
* interfaces.
* <p>
- * @version $Revision: 1.10 $ $ $Date: 2008-04-11 11:11:46 $
+ * @version $Revision: 1.10 $ $ $Date$
* @author Markus Herzog
* @see com.sun.star.lang.XSingleServiceFactory
* @see com.sun.star.lang.XServiceInfo
diff --git a/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java b/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java
index 6ccd453..faf6d51 100644
--- a/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java
+++ b/jurt/com/sun/star/lib/connections/pipe/PipeConnection.java
@@ -40,7 +40,7 @@ import com.sun.star.connection.XConnectionBroadcaster;
* and is uses by the <code>PipeConnector</code> and the <code>PipeAcceptor</code>.
* This class is not part of the provided <code>api</code>.
* <p>
- * @version $Revision: 1.7 $ $ $Date: 2008-04-11 11:13:00 $
+ * @version $Revision: 1.7 $ $ $Date$
* @author Kay Ramme
* @see com.sun.star.comp.connections.PipeAcceptor
* @see com.sun.star.comp.connections.PipeConnector
diff --git a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java b/jurt/com/sun/star/lib/connections/socket/SocketConnection.java
index f870849..90837a3d 100644
--- a/jurt/com/sun/star/lib/connections/socket/SocketConnection.java
+++ b/jurt/com/sun/star/lib/connections/socket/SocketConnection.java
@@ -45,7 +45,7 @@ import com.sun.star.connection.XConnectionBroadcaster;
* and is uses by the <code>SocketConnector</code> and the <code>SocketAcceptor</code>.
* This class is not part of the provided <code>api</code>.
* <p>
- * @version $Revision: 1.6 $ $ $Date: 2008-04-11 11:14:31 $
+ * @version $Revision: 1.6 $ $ $Date$
* @author Kay Ramme
* @see com.sun.star.comp.connections.SocketAcceptor
* @see com.sun.star.comp.connections.SocketConnector
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
index 51e8ba9..65decd7 100644
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
+++ b/jurt/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge.java
@@ -76,7 +76,7 @@ import com.sun.star.uno.Any;
* The protocol to used is passed by name, the bridge
* then looks for it under <code>com.sun.star.lib.uno.protocols</code>.
* <p>
- * @version $Revision: 1.45 $ $ $Date: 2008-04-11 11:18:08 $
+ * @version $Revision: 1.45 $ $ $Date$
* @author Kay Ramme
* @since UDK1.0
*/
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/IReceiver.java b/jurt/com/sun/star/lib/uno/environments/remote/IReceiver.java
index 6acd63d..ee7c02e 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/IReceiver.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/IReceiver.java
@@ -26,7 +26,7 @@ package com.sun.star.lib.uno.environments.remote;
/**
* An abstraction for giving back a reply for a request.
*
- * @version $Revision: 1.6 $ $ $Date: 2008-04-11 11:19:43 $
+ * @version $Revision: 1.6 $ $ $Date$
* @author Kay Ramme
* @see com.sun.star.uno.IQueryInterface
*/
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java b/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java
index 09438c8..d24385c 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/IThreadPool.java
@@ -27,7 +27,7 @@ package com.sun.star.lib.uno.environments.remote;
* This interface is an abstraction of the various
* threadpool implementations.
* <p>
- * @version $Revision: 1.7 $ $ $Date: 2008-04-11 11:20:01 $
+ * @version $Revision: 1.7 $ $ $Date$
* @author Joerg Budischewski
* @author Kay Ramme
* @see com.sun.star.lib.uno.environments.remote.ThreadPoolFactory
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java b/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java
index 0114d8f..27eb34a 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/JavaThreadPool.java
@@ -26,7 +26,7 @@ package com.sun.star.lib.uno.environments.remote;
/**
* This class implements a java thread pool.
* <p>
- * @version $Revision: 1.13 $ $ $Date: 2008-04-11 11:20:22 $
+ * @version $Revision: 1.13 $ $ $Date$
* @author Kay Ramme
* @see com.sun.star.uno.UnoRuntime
* @see com.sun.star.lib.uno.environments.remote.ThreadPool
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/Job.java b/jurt/com/sun/star/lib/uno/environments/remote/Job.java
index e248629..265330b 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/Job.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/Job.java
@@ -41,7 +41,7 @@ import com.sun.star.uno.XCurrentContext;
* The Job is an abstraction for tasks which have to be done
* remotely because of a method invocation.
* <p>
- * @version $Revision: 1.17 $ $ $Date: 2008-04-11 11:21:00 $
+ * @version $Revision: 1.17 $ $ $Date$
* @author Kay Ramme
* @see com.sun.star.lib.uno.environments.remote.ThreadID
* @see com.sun.star.lib.uno.environments.remote.IReceiver
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
index 0516781..0ffc991 100644
--- a/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
+++ b/jurt/com/sun/star/lib/uno/environments/remote/JobQueue.java
@@ -34,7 +34,7 @@ import com.sun.star.lang.DisposedException;
* (put by <code>putjob</code>) into the async queue, which is only
* known by the sync queue.
* <p>
- * @version $Revision: 1.19 $ $ $Date: 2008-04-11 11:21:18 $
+ * @version $Revision: 1.19 $ $ $Date$
* @author Kay Ramme
* @see com.sun.star.lib.uno.environments.remote.ThreadPool
* @see com.sun.star.lib.uno.environments.remote.Job
diff --git a/jurt/com/sun/star/uno/Ascii.java b/jurt/com/sun/star/uno/Ascii.java
index e925b57..c742de0 100644
--- a/jurt/com/sun/star/uno/Ascii.java
+++ b/jurt/com/sun/star/uno/Ascii.java
@@ -26,7 +26,7 @@ package com.sun.star.uno;
/**
* The Ascii class represents the IDL build in type <code>ascii</code>.
* <p>
- * @version $Revision: 1.5 $ $ $Date: 2008-04-11 11:27:21 $
+ * @version $Revision: 1.5 $ $ $Date$
* @author Markus Meyer
* @deprecated do not use
*/
diff --git a/jurt/com/sun/star/uno/AsciiString.java b/jurt/com/sun/star/uno/AsciiString.java
index 5ddb119..b37539c 100644
--- a/jurt/com/sun/star/uno/AsciiString.java
+++ b/jurt/com/sun/star/uno/AsciiString.java
@@ -26,7 +26,7 @@ package com.sun.star.uno;
/**
* The Ascii class represents the IDL build in type <code>asciistring</code>.
* <p>
- * @version $Revision: 1.5 $ $ $Date: 2008-04-11 11:27:42 $
+ * @version $Revision: 1.5 $ $ $Date$
* @author Markus Meyer
* @deprecated do not use
*/
diff --git a/jurt/com/sun/star/uno/MappingException.java b/jurt/com/sun/star/uno/MappingException.java
index 9f2fe1a..d22aad3 100644
--- a/jurt/com/sun/star/uno/MappingException.java
+++ b/jurt/com/sun/star/uno/MappingException.java
@@ -29,7 +29,7 @@ package com.sun.star.uno;
* The exception is replaced by the com.sun.star.lang.DisposedException.
* @deprecated since UDK 3.0.2
* <p>
- * @version $Revision: 1.6 $ $ $Date: 2008-04-11 11:28:00 $
+ * @version $Revision: 1.6 $ $ $Date$
* @see com.sun.star.uno.UnoRuntime
* @see com.sun.star.uno.IQueryInterface
* @see com.sun.star.uno.IBridge
diff --git a/ridljar/com/sun/star/uno/Any.java b/ridljar/com/sun/star/uno/Any.java
index 7e8bbb6..81d6f56 100644
--- a/ridljar/com/sun/star/uno/Any.java
+++ b/ridljar/com/sun/star/uno/Any.java
@@ -34,7 +34,7 @@ package com.sun.star.uno;
* an explicit interface type, so the remote counterpart doesn't need to invoke
* a queryInterface).
* <p>
- * @version $Revision: 1.11 $ $ $Date: 2008-04-11 11:11:43 $
+ * @version $Revision: 1.11 $ $ $Date$
*/
public class Any {
/**
diff --git a/ridljar/com/sun/star/uno/Enum.java b/ridljar/com/sun/star/uno/Enum.java
index 73a876c..4a1406e 100644
--- a/ridljar/com/sun/star/uno/Enum.java
+++ b/ridljar/com/sun/star/uno/Enum.java
@@ -31,7 +31,7 @@ package com.sun.star.uno;
* You cannot create a object of this class or subclass direct, to
* avoid enum values with integer values outside the defined range.
* <p>
- * @version $Revision: 1.5 $ $ $Date: 2008-04-11 11:11:59 $
+ * @version $Revision: 1.5 $ $ $Date$
*/
public abstract class Enum {
private int m_value;
diff --git a/ridljar/com/sun/star/uno/Union.java b/ridljar/com/sun/star/uno/Union.java
index ba1b2fe..9fa424a 100644
--- a/ridljar/com/sun/star/uno/Union.java
+++ b/ridljar/com/sun/star/uno/Union.java
@@ -30,7 +30,7 @@ package com.sun.star.uno;
* Note: The idl type <code>union</code> is currently not fully
* integrated into the UNO framework, so don't use it.
*
- * @version $Revision: 1.5 $ $ $Date: 2008-04-11 11:15:07 $
+ * @version $Revision: 1.5 $ $ $Date$
*/
public class Union {
/**
diff --git a/slideshow/qa/debug/nodetree.sh b/slideshow/qa/debug/nodetree.sh
index fc75a6e..bfb0ad3 100644
--- a/slideshow/qa/debug/nodetree.sh
+++ b/slideshow/qa/debug/nodetree.sh
@@ -22,7 +22,7 @@
#
# $Revision: 1.3 $
#
-# Last changes: $Author: kz $ $Date: 2005-01-21 16:54:21 $
+# Last changes: $Author$ $Date$
#
# Generate node tree from verbose logfile
#
diff --git a/slideshow/qa/debug/timings.pl b/slideshow/qa/debug/timings.pl
index d6b276d..ad7f70b 100644
--- a/slideshow/qa/debug/timings.pl
+++ b/slideshow/qa/debug/timings.pl
@@ -26,7 +26,7 @@ eval 'exec perl -wS $0 ${1+"$@"}'
=head1 PROGRAM NAME AND AUTHOR
Timings - $Revision: 1.2 $
-Last changes: $Author: rt $ $Date: 2004-11-26 18:43:32 $
+Last changes: $Author$ $Date$
=head1 WHAT IT IS
diff --git a/soltools/cpp/_cpp.c b/soltools/cpp/_cpp.c
index 3afa979..1734a20 100644
--- a/soltools/cpp/_cpp.c
+++ b/soltools/cpp/_cpp.c
@@ -38,7 +38,7 @@ int ifdepth;
int ifsatisfied[NIF];
int skipping;
-char rcsid[] = "$Version 1.2 $ $Revision: 1.5 $ $Date: 2006-06-20 05:05:46 $";
+char rcsid[] = "$Version 1.2 $ $Revision: 1.5 $ $Date$";
int
#ifdef _WIN32
diff --git a/svl/source/misc/mediatyp.src b/svl/source/misc/mediatyp.src
index 9b76d78..548ea71 100644
--- a/svl/source/misc/mediatyp.src
+++ b/svl/source/misc/mediatyp.src
@@ -24,7 +24,7 @@
//
// Internet Media Type Presentations
//
-// $Author: rt $ $Date: 2008-04-10 21:44:39 $ $Revision: 1.7 $
+// $Author$ $Date$ $Revision: 1.7 $
//============================================================================
#ifndef _SVTOOLS_HRC
commit b27e6920d1d3f9c5e18109c24107dbd33a773414
Author: Pedro Giffuni <pfg at apache.org>
Date: Fri Dec 23 15:24:20 2016 +0000
Update/remove references to the incubator.
diff --git a/README b/README
index 1555075..179872d 100644
--- a/README
+++ b/README
@@ -26,7 +26,7 @@ Getting the latest sources via Subversion
You can always checkout the latest source via subversion using the following
command:
- svn co https://svn.apache.org/repos/asf/incubator/ooo/trunk aoo
+ svn co https://svn.apache.org/repos/asf/openoffice/trunk aoo
For further information visit http://openoffice.apache.org/source.html
diff --git a/external_deps.lst b/external_deps.lst
index 63a8414..0eb7931b 100644
--- a/external_deps.lst
+++ b/external_deps.lst
@@ -28,9 +28,6 @@
# OOO_EXTRAS=http://ooo-extras.apache-extras.org.codespot.com/files/
OOO_EXTRAS=http://sourceforge.net/projects/oooextras.mirror/files/
-# Must not fallback to svn
-# SVN_TRUNK=http://svn.apache.org/repos/asf/!svn/bc/1336449/incubator/ooo/trunk/ext_sources/
-
###############################################################################
# Libraries with category A license
commit c9f8cfd2b72b689c638d15ca089c05b655446e7f
Author: Damjan Jovanovic <damjan at apache.org>
Date: Fri Dec 23 01:53:29 2016 +0000
Build fixes for main/fpicker on Windows:
* add comdlg32 to the list of known libraries for Windows
* fix the postprocess/packcomponents paths to the fps and fop components
* fix the WinResTarget name in Module_fpicker.mk
* hack for calling $(shell) (recipe before target error)
* only try to build fps_gnome on *nix
* link to the stl library where necessary
* link to the user32 DLL where necessary
* fi -> endif typos
* fix capitalization of filenames
* move fps and fop to the OOOLIBS layer where they belong
Patch by: me
diff --git a/Repository.mk b/Repository.mk
index 3aa2f2e..d50ac8d 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -73,8 +73,10 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
evtatt \
file \
fileacc \
+ fop \
for \
forui \
+ fps \
ftransl \
fwe \
fwi \
@@ -178,9 +180,7 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
directx9canvas \
expwrap \
fastsax \
- fop \
fpicker \
- fps \
fps_aqua \
fps_gnome \
fps_kde4 \
diff --git a/fpicker/Library_fop.mk b/fpicker/Library_fop.mk
index 1640df8..0ebb6d8 100644
--- a/fpicker/Library_fop.mk
+++ b/fpicker/Library_fop.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_add_linked_libs,fop,\
cppu \
cppuhelper \
sal \
+ stl \
tl \
vcl \
$(gb_STDLIBS) \
@@ -51,13 +52,14 @@ $(eval $(call gb_Library_add_linked_libs,fop,\
ole32 \
oleaut32 \
shell32 \
+ user32 \
uwinapi \
))
$(eval $(call gb_Library_add_exception_objects,fop,\
- fpicker/source/win32/folderpicker/fopentry \
- fpicker/source/win32/folderpicker/folderpicker \
- fpicker/source/win32/folderpicker/WinFopImpl \
+ fpicker/source/win32/folderpicker/Fopentry \
+ fpicker/source/win32/folderpicker/FolderPicker \
+ fpicker/source/win32/folderpicker/WinFOPImpl \
fpicker/source/win32/folderpicker/MtaFop \
))
@@ -75,6 +77,6 @@ $(eval $(call gb_Library_add_cxxobjects,fop,\
fpicker/source/win32/misc/resourceprovider \
, -DUNICODE -D_UNICODE $(gb_LinkTarget_EXCEPTIONFLAGS) \
))
-fi
+endif
# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index 720cb41..d09a3a0 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_add_linked_libs,fps,\
cppu \
cppuhelper \
sal \
+ stl \
tl \
vcl \
$(gb_STDLIBS) \
@@ -53,6 +54,7 @@ $(eval $(call gb_Library_add_linked_libs,fps,\
ole32 \
oleaut32 \
shell32 \
+ user32\
uuid \
uwinapi \
))
@@ -99,6 +101,6 @@ $(eval $(call gb_Library_add_cxxobjects,fps,\
fpicker/source/win32/misc/resourceprovider \
, -DUNICODE -D_UNICODE $(gb_LinkTarget_EXCEPTIONFLAGS) \
))
-fi
+endif
# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk
index de253ed..ba04527 100644
--- a/fpicker/Library_fps_office.mk
+++ b/fpicker/Library_fps_office.mk
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_add_linked_libs,fps_office,\
cppuhelper \
ootk \
sal \
+ stl \
svl \
svt \
tl \
diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk
index facc517..dcd4070 100644
--- a/fpicker/Module_fpicker.mk
+++ b/fpicker/Module_fpicker.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Module_add_targets,fpicker,\
Package_xml \
))
+ifeq ($(GUIBASE),unx)
ifeq ($(ENABLE_GTK),TRUE)
GTK_TWO_FOUR:=$(shell pkg-config --exists 'gtk+-2.0 >= 2.4.0' && echo ok)
ifeq ($(GTK_TWO_FOUR),ok)
@@ -37,7 +38,8 @@ $(eval $(call gb_Module_add_targets,fpicker,\
Library_fps_gnome \
))
else
- $(shell pkg-config --print-errors --exists 'gtk+-2.0 >= 2.4.0')
+ _GTK_VERSION_ERR := $(shell pkg-config --print-errors --exists 'gtk+-2.0 >= 2.4.0')
+endif
endif
endif
@@ -53,9 +55,8 @@ ifeq ($(GUI),WNT)
$(eval $(call gb_Module_add_targets,fpicker,\
Library_fps \
Library_fop \
- WinResTarget_vcl \
+ WinResTarget_fpicker \
))
-$(eval
endif
# vim: set noet sw=4 ts=4:
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index e86420f..8fc6409 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -331,8 +331,8 @@ my_components += \
component/dtrans/util/dnd \
component/dtrans/util/ftransl \
component/dtrans/util/sysdtrans \
- component/fpicker/source/win32/folderpicker/fop \
- component/fpicker/source/win32/filepicker/fps \
+ component/fpicker/util/fop \
+ component/fpicker/util/fps \
java_uno_accessbridge \
sysmail \
winaccessibility \
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index a4ee8fb..5f6a1d4 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -441,6 +441,7 @@ gb_Library_PLAINEXT := .lib
gb_Library_PLAINLIBS_NONE += \
advapi32 \
+ comdlg32 \
d3d9 \
d3dx \
ddraw \
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index f332231..a52f039 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -462,6 +462,7 @@ gb_Library_PLAINLIBS_NONE += \
$(gb_MINGW_LIBSTDCPP) \
$(gb_MINGW_LIBGCC) \
advapi32 \
+ comdlg32 \
d3d9 \
d3dx \
ddraw \
commit 2cebc0187b6bb8ea09e0d4566b76ee28eab793b5
Author: Pedro Giffuni <pfg at apache.org>
Date: Thu Dec 22 22:00:21 2016 +0000
Re-enable some Id svn:keywords.
Most of these pre-existed in the code for some reason. New Id keywords
were only added in these files:
main/solenv/inc/minor.mk
main/vcl/unx/kde4/KDEXLib.cxx
The latter two are important as the keep release information and we want
to keep a reference when new versions are bumped.
While here update the information for KDE.
diff --git a/sal/qa/helper/gcov/gcov_filter.pl b/sal/qa/helper/gcov/gcov_filter.pl
index c5d5758..861fdb8 100755
--- a/sal/qa/helper/gcov/gcov_filter.pl
+++ b/sal/qa/helper/gcov/gcov_filter.pl
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
#
-# $Id: gcov_filter.pl,v 1.4 2005-11-02 17:23:57 kz Exp $
+# $Id$
#
# *************************************************************
#
diff --git a/sal/qa/helper/gcov/gcov_result.pl b/sal/qa/helper/gcov/gcov_result.pl
index 5e7f46e..d9b8064 100644
--- a/sal/qa/helper/gcov/gcov_result.pl
+++ b/sal/qa/helper/gcov/gcov_result.pl
@@ -20,7 +20,7 @@
#
# *************************************************************
#
-# $Id: gcov_result.pl,v 1.2 2003-06-11 16:36:30 vg Exp $
+# $Id$
#
# GCOV_RESULT
diff --git a/sal/qa/helper/gcov/gcov_resultcompare.pl b/sal/qa/helper/gcov/gcov_resultcompare.pl
index 183a12f..88a1add 100644
--- a/sal/qa/helper/gcov/gcov_resultcompare.pl
+++ b/sal/qa/helper/gcov/gcov_resultcompare.pl
@@ -20,7 +20,7 @@
#
# *************************************************************
#
-# $Id: gcov_resultcompare.pl,v 1.2 2004-03-19 14:46:51 obo Exp $
+# $Id$
#
# GCOV_RESULTCOMPARE
diff --git a/sal/qa/helper/gcov/gcov_resultinterpreter.pl b/sal/qa/helper/gcov/gcov_resultinterpreter.pl
index 35a9fdc..ecf4810 100644
--- a/sal/qa/helper/gcov/gcov_resultinterpreter.pl
+++ b/sal/qa/helper/gcov/gcov_resultinterpreter.pl
@@ -20,7 +20,7 @@
#
# *************************************************************
#
-# $Id: gcov_resultinterpreter.pl,v 1.3 2005-11-02 17:24:12 kz Exp $
+# $Id$
#
# GCOV_RESULTINTERPRETER
diff --git a/solenv/bin/langwrap b/solenv/bin/langwrap
index cdff929..6409e70 100755
--- a/solenv/bin/langwrap
+++ b/solenv/bin/langwrap
@@ -22,7 +22,7 @@
#
# langwrap - language wrapper for building resources
#
-# $Id: langwrap,v 1.2 2008-08-18 13:10:41 vg Exp $
+# $Id$
use Getopt::Std;
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index cdc095a..7cdc1a2 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -18,6 +18,8 @@
# under the License.
#
# *************************************************************
+# $Id$
+
RSCVERSION=420
RSCREVISION=420m1(Build:9800)
BUILD=9800
diff --git a/soltools/cpp/cpp.h b/soltools/cpp/cpp.h
index 0a84132..82ece02 100644
--- a/soltools/cpp/cpp.h
+++ b/soltools/cpp/cpp.h
@@ -18,7 +18,7 @@
* under the License.
*
*************************************************************/
-/* $Id: cpp.h,v 1.4 2006-06-20 05:07:28 hr Exp $ */
+/* $Id$ */
#define INS 32768 /* input buffer */
#define OBS 8092 /* outbut buffer */
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index b6573cd..556893a 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -18,8 +18,7 @@
* under the License.
*
*************************************************************/
-
-
+/* $Id$ */
#include <vos/process.hxx>
@@ -77,13 +76,13 @@ void KDEXLib::Init()
KAboutData *kAboutData = new KAboutData("OpenOffice",
"kdelibs4",
ki18n( "Apache OpenOffice" ),
- "3.4.0",
+ "4.2.0",
ki18n( "Apache OpenOffice with KDE Native Widget Support." ),
KAboutData::License_File,
ki18n( "Joint Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Novell, Inc and Apache Software Foundation"),
ki18n( "Apache OpenOffice is an office suite.\n" ),
"http://openoffice.apache.org/",
- "ooo-issues at incubator.apache.org" );
+ "issues at openoffice.apache.org" );
kAboutData->addAuthor( ki18n( "Jan Holesovsky" ),
ki18n( "Original author and maintainer of the KDE NWF." ),
commit 3941fcce893193b24c0fd089666e57e23412bdaa
Author: Damjan Jovanovic <damjan at apache.org>
Date: Thu Dec 22 03:13:55 2016 +0000
Port main/fpicker to gbuild.
Patch by: me
diff --git a/Module_ooo.mk b/Module_ooo.mk
index 1eab4e2..e4a0568 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
eventattacher \
fileaccess \
formula \
+ fpicker \
framework \
idl \
io \
diff --git a/Repository.mk b/Repository.mk
index a13f823..3aa2f2e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -178,6 +178,13 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
directx9canvas \
expwrap \
fastsax \
+ fop \
+ fpicker \
+ fps \
+ fps_aqua \
+ fps_gnome \
+ fps_kde4 \
+ fps_office \
fsstorage \
gdipluscanvas \
hatchwindowfactory \
diff --git a/fpicker/source/win32/folderpicker/makefile.mk b/fpicker/AllLangResTarget_fps_office.mk
similarity index 65%
rename from fpicker/source/win32/folderpicker/makefile.mk
rename to fpicker/AllLangResTarget_fps_office.mk
index bdd040b..ba90e8c 100644
--- a/fpicker/source/win32/folderpicker/makefile.mk
+++ b/fpicker/AllLangResTarget_fps_office.mk
@@ -21,27 +21,24 @@
-PRJ=..$/..$/..
-PRJNAME=fpicker
-TARGET=fop
-#LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST=$(TARGET)
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,fps_office))
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_AllLangResTarget_set_reslocation,fps_office,fpicker))
-.INCLUDE : settings.mk
+$(eval $(call gb_AllLangResTarget_add_srs,fps_office,\
+ fps_office/res \
+))
-# --- Files --------------------------------------------------------
+$(eval $(call gb_SrsTarget_SrsTarget,fps_office/res))
-# enable rtti
-CFLAGS+=-GR
+$(eval $(call gb_SrsTarget_set_include,fps_office/res,\
+ $$(INCLUDE) \
+ -I$(WORKDIR)/inc \
+))
-SLOFILES=$(SLO)$/fopentry.obj\
- $(SLO)$/folderpicker.obj\
- $(SLO)$/WinFopImpl.obj\
- $(SLO)$/MtaFop.obj
+$(eval $(call gb_SrsTarget_add_files,fps_office/res,\
+ fpicker/source/office/iodlg.src \
+ fpicker/source/office/OfficeFilePicker.src \
+))
-# --- Targets ------------------------------------------------------
-.INCLUDE : target.mk
diff --git a/fpicker/Library_fop.mk b/fpicker/Library_fop.mk
new file mode 100644
index 0000000..1640df8
--- /dev/null
+++ b/fpicker/Library_fop.mk
@@ -0,0 +1,80 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,fop))
+
+$(eval $(call gb_Library_set_componentfile,fop,fpicker/util/fop))
+
+$(eval $(call gb_Library_set_include,fop,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/fpicker/inc/pch \
+))
+
+$(eval $(call gb_Library_add_api,fop,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fop,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ tl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fop,\
+ advapi32 \
+ gdi32 \
+ ole32 \
+ oleaut32 \
+ shell32 \
+ uwinapi \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fop,\
+ fpicker/source/win32/folderpicker/fopentry \
+ fpicker/source/win32/folderpicker/folderpicker \
+ fpicker/source/win32/folderpicker/WinFopImpl \
+ fpicker/source/win32/folderpicker/MtaFop \
+))
+
+ifeq ($(COM),GCC)
+$(eval $(call gb_Library_add_cxxobjects,fop,\
+ fpicker/source/win32/misc/WinImplHelper \
+ fpicker/source/win32/misc/AutoBuffer \
+ fpicker/source/win32/misc/resourceprovider \
+ , -fexceptions -fno-enforce-eh-specs -DUNICODE -D_UNICODE $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+else
+$(eval $(call gb_Library_add_cxxobjects,fop,\
+ fpicker/source/win32/misc/WinImplHelper \
+ fpicker/source/win32/misc/AutoBuffer \
+ fpicker/source/win32/misc/resourceprovider \
+ , -DUNICODE -D_UNICODE $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+fi
+
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/source/win32/filepicker/workbench/makefile.mk b/fpicker/Library_fpicker.mk
similarity index 59%
rename from fpicker/source/win32/filepicker/workbench/makefile.mk
rename to fpicker/Library_fpicker.mk
index 1d5f186..31c5f3d 100644
--- a/fpicker/source/win32/filepicker/workbench/makefile.mk
+++ b/fpicker/Library_fpicker.mk
@@ -21,38 +21,35 @@
-PRJ=..$/..$/..$/..
+$(eval $(call gb_Library_Library,fpicker))
-PRJNAME=sysui
-TARGET=testfps
-LIBTARGET=NO
-TARGETTYPE=CUI
+$(eval $(call gb_Library_add_precompiled_header,fpicker,$(SRCDIR)/fpicker/inc/pch/precompiled_fpicker))
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_Library_set_componentfile,fpicker,fpicker/source/generic/fpicker))
-.INCLUDE : settings.mk
+$(eval $(call gb_Library_set_include,fpicker,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/fpicker/inc/pch \
+))
-CFLAGS+=-GR -GX
+$(eval $(call gb_Library_add_api,fpicker,\
+ offapi \
+ udkapi \
+))
-# --- Files --------------------------------------------------------
+$(eval $(call gb_Library_add_linked_libs,fpicker,\
+ cppu \
+ cppuhelper \
+ sal \
+ svl \
+ vcl \
+ svt \
+ $(gb_STDLIBS) \
+))
-
-OBJFILES=$(OBJ)$/test_fps.obj
-
-APP1TARGET=$(TARGET)
-APP1OBJS=$(OBJFILES)
-
-APP1STDLIBS+=\
- $(CPPULIB)\
- $(CPPUHELPERLIB)\
- $(SALLIB)\
- $(USER32LIB)\
- $(OLE32LIB)
-
-APP1DEF=$(MISC)$/$(APP1TARGET).def
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
+$(eval $(call gb_Library_add_exception_objects,fpicker,\
+ fpicker/source/generic/fpicker \
+))
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
new file mode 100644
index 0000000..720cb41
--- /dev/null
+++ b/fpicker/Library_fps.mk
@@ -0,0 +1,104 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,fps))
+
+$(eval $(call gb_Library_set_componentfile,fps,fpicker/util/fps))
+
+$(eval $(call gb_Library_set_include,fps,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/fpicker/inc/pch \
+))
+
+$(eval $(call gb_Library_add_api,fps,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fps,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ tl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fps,\
+ advapi32 \
+ comdlg32 \
+ gdi32 \
+ kernel32 \
+ ole32 \
+ oleaut32 \
+ shell32 \
+ uuid \
+ uwinapi \
+))
+
+$(eval $(call gb_Library_add_cxxobjects,fps,\
+ fpicker/source/win32/filepicker/FileOpenDlg \
+ fpicker/source/win32/filepicker/FPentry \
+ fpicker/source/win32/filepicker/FilePicker \
+ fpicker/source/win32/filepicker/WinFileOpenImpl \
+ fpicker/source/win32/filepicker/FilterContainer \
+ fpicker/source/win32/filepicker/controlaccess \
+ fpicker/source/win32/filepicker/dibpreview \
+ fpicker/source/win32/filepicker/helppopupwindow \
+ fpicker/source/win32/filepicker/controlcommand \
+ fpicker/source/win32/filepicker/filepickerstate \
+ fpicker/source/win32/filepicker/getfilenamewrapper \
+ fpicker/source/win32/filepicker/asynceventnotifier \
+ fpicker/source/win32/filepicker/previewadapter \
+ fpicker/source/win32/filepicker/previewbase \
+ fpicker/source/win32/filepicker/filepickereventnotification \
+ fpicker/source/win32/filepicker/customcontrol \
+ fpicker/source/win32/filepicker/customcontrolcontainer \
+ fpicker/source/win32/filepicker/customcontrolfactory \
+ fpicker/source/win32/filepicker/dialogcustomcontrols \
+ fpicker/source/win32/filepicker/asyncrequests \
+ fpicker/source/win32/filepicker/VistaFilePickerEventHandler \
+ fpicker/source/win32/filepicker/VistaFilePickerImpl \
+ fpicker/source/win32/filepicker/VistaFilePicker \
+ fpicker/source/win32/filepicker/SolarMutex \
+ , -D_UNICODE -DUNICODE -U_WIN32_WINNT -D_WIN32_WINNT=0x0600 $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+
+ifeq ($(COM),GCC)
+$(eval $(call gb_Library_add_cxxobjects,fps,\
+ fpicker/source/win32/misc/WinImplHelper \
+ fpicker/source/win32/misc/AutoBuffer \
+ fpicker/source/win32/misc/resourceprovider \
+ , -fexceptions -fno-enforce-eh-specs -DUNICODE -D_UNICODE $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+else
+$(eval $(call gb_Library_add_cxxobjects,fps,\
+ fpicker/source/win32/misc/WinImplHelper \
+ fpicker/source/win32/misc/AutoBuffer \
+ fpicker/source/win32/misc/resourceprovider \
+ , -DUNICODE -D_UNICODE $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+fi
+
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk
new file mode 100644
index 0000000..96efa4d
--- /dev/null
+++ b/fpicker/Library_fps_aqua.mk
@@ -0,0 +1,62 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,fps_aqua))
+
+$(eval $(call gb_Library_set_componentfile,fps_aqua,fpicker/source/aqua/fps_aqua))
+
+$(eval $(call gb_Library_set_include,fps_aqua,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/fpicker/inc/pch \
+))
+
+$(eval $(call gb_Library_add_api,fps_aqua,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fps_aqua,\
+ cppu \
+ cppuhelper \
+ sal \
+ tl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fps_aqua,\
+ fpicker/source/aqua/resourceprovider \
+ fpicker/source/aqua/FPentry \
+ fpicker/source/aqua/SalAquaPicker \
+ fpicker/source/aqua/SalAquaFilePicker \
+ fpicker/source/aqua/SalAquaFolderPicker \
+ fpicker/source/aqua/CFStringUtilities \
+ fpicker/source/aqua/FilterHelper \
+ fpicker/source/aqua/ControlHelper \
+ fpicker/source/aqua/NSString_OOoAdditions \
+ fpicker/source/aqua/NSURL_OOoAdditions \
+ fpicker/source/aqua/AquaFilePickerDelegate \
+))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Library_fps_gnome.mk b/fpicker/Library_fps_gnome.mk
new file mode 100644
index 0000000..1eb1f56
--- /dev/null
+++ b/fpicker/Library_fps_gnome.mk
@@ -0,0 +1,65 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,fps_gnome))
+
+$(eval $(call gb_Library_set_componentfile,fps_gnome,fpicker/source/unx/gnome/fps_gnome))
+
+$(eval $(call gb_Library_set_include,fps_gnome,\
+ $$(INCLUDE) \
+ $(filter -I%,$(GTK_CFLAGS)) \
+ -I$(SRCDIR)/fpicker/inc/pch \
+))
+
+$(eval $(call gb_Library_add_cflags,gps_gnome,\
+ $(filter-out -I%,$(GTK_CFLAGS)) \
+))
+
+$(eval $(call gb_Library_add_api,fps_gnome,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fps_gnome,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ tl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_libs,fps_gnome,\
+ $(GTK_LIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fps_gnome,\
+ fpicker/source/unx/gnome/SalGtkPicker \
+ fpicker/source/unx/gnome/SalGtkFilePicker \
+ fpicker/source/unx/gnome/SalGtkFolderPicker \
+ fpicker/source/unx/gnome/resourceprovider \
+ fpicker/source/unx/gnome/FPentry \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Library_fps_kde4.mk b/fpicker/Library_fps_kde4.mk
new file mode 100644
index 0000000..cc00476
--- /dev/null
+++ b/fpicker/Library_fps_kde4.mk
@@ -0,0 +1,71 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,fps_kde4))
+
+$(eval $(call gb_Library_set_componentfile,fps_kde4,fpicker/source/unx/kde4/fps_kde4))
+
+$(eval $(call gb_Library_set_include,fps_kde4,\
+ $$(INCLUDE) \
+ $(filter -I%,$(KDE4_CFLAGS)) \
+ -I$(SRCDIR)/fpicker/inc/pch \
+))
+
+$(eval $(call gb_Library_add_cflags,fps_kde4,\
+ $(filter-out -I%,$(KDE4_CFLAGS)) \
+))
+
+$(eval $(call gb_Library_add_api,fps_kde4,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fps_kde4,\
+ cppu \
+ cppuhelper \
+ sal \
+ tl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_libs,fps_kde4,\
+ $(KDE4_LIBS) \
+ -lkio \
+ -lkfile \
+))
+
+$(eval $(call gb_Library_add_exception_objects,fps_kde4,\
+ fpicker/source/unx/kde4/KDE4FilePicker \
+ fpicker/source/unx/kde4/KDE4FPEntry \
+))
+
+$(WORKDIR)/CustomTarget/fpicker/source/unx/kde4/KDE4FilePicker.moc.cxx : fpicker/source/unx/kde4/KDE4FilePicker.hxx
+ mkdir -p $(dir $@) && \
+ $(MOC4) $< -o $@
+
+$(eval $(call gb_StaticLibrary_add_generated_exception_objects,fps_kde4,\
+ CustomTarget/fpicker/source/unx/kde4/KDE4FilePicker.moc.cxx \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk
new file mode 100644
index 0000000..de253ed
--- /dev/null
+++ b/fpicker/Library_fps_office.mk
@@ -0,0 +1,67 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,fps_office))
+
+$(eval $(call gb_Library_set_componentfile,fps_office,fpicker/source/office/fps_office))
+
+$(eval $(call gb_Library_set_include,fps_office,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/fpicker/inc/pch \
+))
+
+$(eval $(call gb_Library_add_api,fps_office,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,fps_office,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ ootk \
+ sal \
+ svl \
+ svt \
+ tl \
+ ucbhelper \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,fps_office,\
+ fpicker/source/office/asyncfilepicker \
+ fpicker/source/office/commonpicker \
+ fpicker/source/office/OfficeControlAccess \
+ fpicker/source/office/OfficeFilePicker \
+ fpicker/source/office/OfficeFolderPicker \
+ fpicker/source/office/fpinteraction \
+ fpicker/source/office/fpsmartcontent \
+ fpicker/source/office/fps_office \
+ fpicker/source/office/iodlg \
+ fpicker/source/office/iodlgimp \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Makefile b/fpicker/Makefile
new file mode 100644
index 0000000..c1d144c
--- /dev/null
+++ b/fpicker/Makefile
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/source/win32/folderpicker/workbench/makefile.mk b/fpicker/Module_fpicker.mk
similarity index 56%
rename from fpicker/source/win32/folderpicker/workbench/makefile.mk
rename to fpicker/Module_fpicker.mk
index 460dc4d..facc517 100644
--- a/fpicker/source/win32/folderpicker/workbench/makefile.mk
+++ b/fpicker/Module_fpicker.mk
@@ -21,38 +21,41 @@
-PRJ=..$/..$/..$/..
-
-PRJNAME= sysui
-TARGET= testfops
-LIBTARGET= NO
-TARGETTYPE= CUI
-
-
-# --- Settings -----------------------------------------------------
-#.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-.INCLUDE : settings.mk
-
-CFLAGS+=-GR -EHa
-
-# --- Files --------------------------------------------------------
-
-
-OBJFILES= $(OBJ)$/test_fops.obj
-
-APP1TARGET= test_fops
-
-APP1OBJS= $(OBJ)$/test_fops.obj
-
-APP1STDLIBS+= $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(SALLIB) \
- $(USER32LIB)\
- $(OLE32LIB)
-
-APP1DEF= $(MISC)$/$(APP1TARGET).def
-
-# --- Targets ------------------------------------------------------
-.INCLUDE : target.mk
-
+$(eval $(call gb_Module_Module,fpicker))
+
+$(eval $(call gb_Module_add_targets,fpicker,\
+ AllLangResTarget_fps_office \
+ Library_fpicker \
+ Library_fps_office \
+ Package_xml \
+))
+
+ifeq ($(ENABLE_GTK),TRUE)
+GTK_TWO_FOUR:=$(shell pkg-config --exists 'gtk+-2.0 >= 2.4.0' && echo ok)
+ifeq ($(GTK_TWO_FOUR),ok)
+$(eval $(call gb_Module_add_targets,fpicker,\
+ Library_fps_gnome \
+))
+else
+ $(shell pkg-config --print-errors --exists 'gtk+-2.0 >= 2.4.0')
+endif
+endif
+
+ifeq ($(GUIBASE),unx)
+ifeq ($(ENABLE_KDE4),TRUE)
+$(eval $(call gb_Module_add_targets,fpicker,\
+ Library_fps_kde4 \
+))
+endif
+endif
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Module_add_targets,fpicker,\
+ Library_fps \
+ Library_fop \
+ WinResTarget_vcl \
+))
+$(eval
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/fpicker/Package_xml.mk b/fpicker/Package_xml.mk
new file mode 100644
index 0000000..d3c48cb
--- /dev/null
+++ b/fpicker/Package_xml.mk
@@ -0,0 +1,30 @@
+###############################################################
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+###############################################################
+
+
+
+$(eval $(call gb_Package_Package,fpicker_xml,$(SRCDIR)/fpicker/source))
+
+$(eval $(call gb_Package_add_file,fpicker_xml,xml/fps_aqua.xml,aqua/fps_aqua.xml))
+$(eval $(call gb_Package_add_file,fpicker_xml,xml/fps_gnome.xml,unx/gnome/fps_gnome.xml))
+$(eval $(call gb_Package_add_file,fpicker_xml,xml/fps_kde4.xml,unx/kde4/fps_kde4.xml))
+$(eval $(call gb_Package_add_file,fpicker_xml,xml/fps.xml,win32/filepicker/fps.xml))
+$(eval $(call gb_Package_add_file,fpicker_xml,xml/fop.xml,win32/folderpicker/fop.xml))
diff --git a/fpicker/source/win32/misc/makefile.mk b/fpicker/WinResTarget_fpicker.mk
similarity index 61%
rename from fpicker/source/win32/misc/makefile.mk
rename to fpicker/WinResTarget_fpicker.mk
index 3b69d45..e3aff40 100644
--- a/fpicker/source/win32/misc/makefile.mk
+++ b/fpicker/WinResTarget_fpicker.mk
@@ -21,33 +21,13 @@
-PRJ=..$/..$/..
-PRJNAME=fpicker
-TARGET=utils
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(COM)"=="GCC"
-CFLAGSAPPEND+=-fexceptions -fno-enforce-eh-specs -DUNICODE -D_UNICODE
-.ELSE
-CFLAGS+=-EHa -DUNICODE -D_UNICODE
-.ENDIF
-
-# --- Files -------------------------------------
-
-SLOFILES=$(SLO)$/WinImplHelper.obj\
- $(SLO)$/AutoBuffer.obj\
- $(SLO)$/resourceprovider.obj
-
-LIB1TARGET=$(SLB)$/$(TARGET).lib
-LIB1OBJFILES=$(SLOFILES)
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
+$(eval $(call gb_WinResTarget_WinResTarget,fpicker/src))
+$(eval $(call gb_WinResTarget_set_include,fpicker/src,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/fpicker/inc \
+))
+$(eval $(call gb_WinResTarget_add_file,fpicker/src,\
+ fpicker/source/win32/filepicker/Fps \
+))
diff --git a/fpicker/prj/build.lst b/fpicker/prj/build.lst
index 1be09c5..b63e34c 100644
--- a/fpicker/prj/build.lst
+++ b/fpicker/prj/build.lst
@@ -1,11 +1,2 @@
fp fpicker : LIBXSLT:libxslt L10N:l10n rdbmaker svtools NULL
-fp fpicker\inc nmake - all fp_inc NULL
-fp fpicker\source\generic nmake - all fp_generic fp_inc NULL
-fp fpicker\source\office nmake - all fp_office fp_inc NULL
-fp fpicker\source\unx\gnome nmake - u fp_gnome_filepicker fp_inc NULL
-fp fpicker\source\unx\kde4 nmake - u fp_kde4_filepicker fp_inc NULL
-fp fpicker\source\aqua nmake - u fp_macosx_filepicker NULL
-fp fpicker\source\win32\filepicker nmake - w fp_win32_filepicker fp_inc NULL
-fp fpicker\source\win32\folderpicker nmake - w fp_win32_folderpicker fp_inc NULL
-fp fpicker\source\win32\misc nmake - w fp_win32_misc fp_win32_filepicker.w fp_win32_folderpicker.w fp_inc NULL
-fp fpicker\util nmake - all fp_util fp_win32_filepicker.w fp_win32_misc.w fp_win32_folderpicker.w NULL
+fp fpicker\prj nmake - all fp_prj NULL
diff --git a/fpicker/prj/d.lst b/fpicker/prj/d.lst
index 4fff046..e69de29 100644
--- a/fpicker/prj/d.lst
+++ b/fpicker/prj/d.lst
@@ -1,18 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-
-..\%__SRC%\bin\f*.res %_DEST%\bin%_EXT%\
-..\%__SRC%\bin\f*.dll %_DEST%\bin%_EXT%\
-..\%__SRC%\lib\f*.so %_DEST%\lib%_EXT%\
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-
-..\source\win32\filepicker\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\win32\folderpicker\*.xml %_DEST%\xml%_EXT%\*.xml
-..\%__SRC%\misc\fop.component %_DEST%\xml%_EXT%\fop.component
-..\%__SRC%\misc\fpicker.component %_DEST%\xml%_EXT%\fpicker.component
-..\%__SRC%\misc\fps.component %_DEST%\xml%_EXT%\fps.component
-..\%__SRC%\misc\fps_aqua.component %_DEST%\xml%_EXT%\fps_aqua.component
-..\%__SRC%\misc\fps_gnome.component %_DEST%\xml%_EXT%\fps_gnome.component
-..\%__SRC%\misc\fps_kde4.component %_DEST%\xml%_EXT%\fps_kde4.component
-..\%__SRC%\misc\fps_office.component %_DEST%\xml%_EXT%\fps_office.component
diff --git a/fpicker/inc/makefile.mk b/fpicker/prj/makefile.mk
similarity index 69%
rename from fpicker/inc/makefile.mk
rename to fpicker/prj/makefile.mk
index 0c42bf6..c62c6a6 100644
--- a/fpicker/inc/makefile.mk
+++ b/fpicker/prj/makefile.mk
@@ -20,24 +20,25 @@
#**************************************************************
-PRJ=..
-
-PRJNAME=fpicker
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/fpicker/source/aqua/FPentry.cxx b/fpicker/source/aqua/FPentry.cxx
index d2a93e1..57d79ca 100644
--- a/fpicker/source/aqua/FPentry.cxx
+++ b/fpicker/source/aqua/FPentry.cxx
@@ -81,7 +81,7 @@ extern "C"
// component_getImplementationEnvironment
//------------------------------------------------
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -91,7 +91,7 @@ void SAL_CALL component_getImplementationEnvironment(
//
//------------------------------------------------
-void* SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ )
{
void* pRet = 0;
diff --git a/fpicker/source/aqua/makefile.mk b/fpicker/source/aqua/makefile.mk
deleted file mode 100644
index f069fd1..0000000
--- a/fpicker/source/aqua/makefile.mk
+++ /dev/null
@@ -1,89 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=..$/..
-
-PRJNAME=fpicker
-TARGET=fps_aqua.uno
-TARGETTYPE=GUI
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-DLLPRE=
-
-# ------------------------------------------------------------------
-
-.IF "$(GUIBASE)" != "aqua"
-
-dummy:
- @echo "Nothing to build. GUIBASE == $(GUIBASE)"
-
-.ELSE # we build for aqua
-CFLAGSCXX+=$(OBJCXXFLAGS)
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =\
- $(SLO)$/resourceprovider.obj \
- $(SLO)$/FPentry.obj \
- $(SLO)$/SalAquaPicker.obj \
- $(SLO)$/SalAquaFilePicker.obj \
- $(SLO)$/SalAquaFolderPicker.obj \
- $(SLO)$/CFStringUtilities.obj \
- $(SLO)$/FilterHelper.obj \
- $(SLO)$/ControlHelper.obj \
- $(SLO)$/NSString_OOoAdditions.obj \
- $(SLO)$/NSURL_OOoAdditions.obj \
- $(SLO)$/AquaFilePickerDelegate.obj
-
-SHL1NOCHECK=TRUE
-SHL1TARGET= $(TARGET)
-SHL1OBJS= $(SLOFILES)
-SHL1STDLIBS=\
- $(VCLLIB) \
- $(TOOLSLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-
-.ENDIF # "$(GUIBASE)" != "aqua"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/fps_aqua.component
-
-$(MISC)/fps_aqua.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- fps_aqua.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt fps_aqua.component
diff --git a/fpicker/source/generic/makefile.mk b/fpicker/source/generic/makefile.mk
deleted file mode 100644
index 3cc1690..0000000
--- a/fpicker/source/generic/makefile.mk
+++ /dev/null
@@ -1,66 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=..$/..
-
-PRJNAME=fpicker
-TARGET=fpicker.uno
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE=
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/fpicker.obj
-
-SHL1TARGET= $(TARGET)
-SHL1IMPLIB= i$(TARGET)
-SHL1OBJS= $(SLOFILES)
-SHL1STDLIBS=\
- $(VCLLIB) \
- $(SVLLIB) \
- $(SVTOOLLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-DEF1NAME= $(SHL1TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/fpicker.component
-
-$(MISC)/fpicker.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- fpicker.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt fpicker.component
diff --git a/fpicker/source/office/makefile.mk b/fpicker/source/office/makefile.mk
deleted file mode 100644
index 656511f..0000000
--- a/fpicker/source/office/makefile.mk
+++ /dev/null
@@ -1,92 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=..$/..
-
-PRJNAME=fpicker
-TARGET=fps_office
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-GEN_HID=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE=
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=\
- $(SLO)$/asyncfilepicker.obj \
- $(SLO)$/commonpicker.obj \
- $(SLO)$/OfficeControlAccess.obj \
- $(SLO)$/OfficeFilePicker.obj \
- $(SLO)$/OfficeFolderPicker.obj \
- $(SLO)$/fpinteraction.obj \
- $(SLO)$/fpsmartcontent.obj \
- $(SLO)$/fps_office.obj \
- $(SLO)$/iodlg.obj \
- $(SLO)$/iodlgimp.obj
-
-SHL1TARGET= $(TARGET).uno
-SHL1IMPLIB= i$(TARGET)
-SHL1OBJS= $(SLOFILES)
-SHL1STDLIBS=\
- $(SVTOOLLIB) \
- $(TKLIB) \
- $(VCLLIB) \
- $(SVLLIB) \
- $(UNOTOOLSLIB) \
- $(TOOLSLIB) \
- $(UCBHELPERLIB) \
- $(COMPHELPERLIB) \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB)
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-DEF1NAME= $(SHL1TARGET)
-
-SRS1NAME= $(TARGET)
-SRC1FILES= \
- OfficeFilePicker.src \
- iodlg.src
-
-RESLIB1NAME=$(TARGET)
-RESLIB1IMAGES=$(PRJ)$/res
-RESLIB1SRSFILES=\
- $(SRS)$/fps_office.srs
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/fps_office.component
-
-$(MISC)/fps_office.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- fps_office.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt fps_office.component
diff --git a/fpicker/source/unx/gnome/FPentry.cxx b/fpicker/source/unx/gnome/FPentry.cxx
index f8b2aba..7192ff2 100644
--- a/fpicker/source/unx/gnome/FPentry.cxx
+++ b/fpicker/source/unx/gnome/FPentry.cxx
@@ -85,7 +85,7 @@ extern "C"
// component_getImplementationEnvironment
//------------------------------------------------
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -95,7 +95,7 @@ void SAL_CALL component_getImplementationEnvironment(
//
//------------------------------------------------
-void* SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* /*pRegistryKey*/ )
{
void* pRet = 0;
diff --git a/fpicker/source/unx/gnome/makefile.mk b/fpicker/source/unx/gnome/makefile.mk
deleted file mode 100644
index 8ed2edf..0000000
--- a/fpicker/source/unx/gnome/makefile.mk
+++ /dev/null
@@ -1,102 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=..$/..$/..
-
-PRJNAME=fpicker
-TARGET=fps_gnome.uno
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE=
-
-# ------------------------------------------------------------------
-
-.IF "$(ENABLE_GTK)" != "TRUE"
-
-dummy:
- @echo "Nothing to build. GUIBASE == $(GUIBASE), WITH_WIDGETSET == $(WITH_WIDGETSET)"
-
-.ELSE # we build for GNOME
-
-PKGCONFIG_MODULES=gtk+-2.0
-.INCLUDE : pkg_config.mk
-
-# check gtk version
-GTK_TWO_FOUR:=$(shell @$(PKG_CONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo ok)
-.IF "$(GTK_TWO_FOUR)" != "ok"
-
-dummy:
- @echo "Cannot build gtk filepicker because"
- @$(PKG_CONFIG) --print-errors --exists 'gtk+-2.0 >= 2.4.0'
-
-.ELSE
-
-CFLAGS+= $(WIDGETSET_CFLAGS)
-CFLAGS+= $(PKGCONFIG_CFLAGS)
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =\
- $(SLO)$/SalGtkPicker.obj \
- $(SLO)$/SalGtkFilePicker.obj \
- $(SLO)$/SalGtkFolderPicker.obj \
- $(SLO)$/resourceprovider.obj \
- $(SLO)$/FPentry.obj
-
-SHL1NOCHECK=TRUE
-SHL1TARGET= $(TARGET)
-SHL1OBJS= $(SLOFILES)
-SHL1STDLIBS=\
- $(VCLLIB) \
- $(TOOLSLIB) \
- $(CPPUHELPERLIB) \
- $(COMPHELPERLIB) \
- $(CPPULIB) \
- $(SALLIB) \
- $(PKGCONFIG_LIBS)
-
-.IF "$(OS)"=="SOLARIS"
-LINKFLAGSDEFS=
-.ENDIF # "$(OS)"=="SOLARIS"
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-DEF1NAME=$(SHL1TARGET)
-
-.ENDIF # GTK_TWO_FOUR
-.ENDIF # "$(GUIBASE)" != "unx" || "$(WITH_WIDGETSET)" != "gnome"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/fps_gnome.component
-
-$(MISC)/fps_gnome.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- fps_gnome.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt fps_gnome.component
diff --git a/fpicker/source/unx/kde4/KDE4FPEntry.cxx b/fpicker/source/unx/kde4/KDE4FPEntry.cxx
index 6249702..bcaa380 100644
--- a/fpicker/source/unx/kde4/KDE4FPEntry.cxx
+++ b/fpicker/source/unx/kde4/KDE4FPEntry.cxx
@@ -46,12 +46,12 @@ static Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiS
// the three uno functions that will be exported
extern "C"
{
- void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
+ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
- void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* )
+ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* )
{
void* pRet = 0;
diff --git a/fpicker/source/unx/kde4/makefile.mk b/fpicker/source/unx/kde4/makefile.mk
deleted file mode 100644
index 95909c0..0000000
--- a/fpicker/source/unx/kde4/makefile.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=..$/..$/..
-
-PRJNAME=fpicker
-TARGET=fps_kde4.uno
-LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-DLLPRE=
-
-# ------------------------------------------------------------------
-
-# Currently just KDE is supported...
-.IF "$(GUIBASE)" != "unx" || "$(ENABLE_KDE4)" != "TRUE"
-
-dummy:
- @echo "Nothing to build. GUIBASE == $(GUIBASE), ENABLE_KDE4 is not set"
-
-.ELSE # we build for KDE
-
-CFLAGS+= $(KDE4_CFLAGS)
-
-# --- Files --------------------------------------------------------
-
-SLOFILES =\
- $(SLO)$/KDE4FilePicker.obj \
- $(SLO)$/KDE4FilePicker.moc.obj \
- $(SLO)$/KDE4FPEntry.obj
-
-SHL1NOCHECK=TRUE
-SHL1TARGET=$(TARGET)
-SHL1STDLIBS=$(CPPULIB)\
- $(CPPUHELPERLIB)\
- $(SALLIB)\
- $(VCLLIB)\
- $(TOOLSLIB) \
- $(KDE4_LIBS) -lkio -lkfile
-
-
-SHL1OBJS=$(SLOFILES)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-DEF1VERSIONMAP=exports.map
-
-.ENDIF
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-$(MISC)$/KDE4FilePicker.moc.cxx : KDE4FilePicker.hxx
- $(MOC4) $< -o $@
-
-ALLTAR : $(MISC)/fps_kde4.component
-
-$(MISC)/fps_kde4.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- fps_kde4.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt fps_kde4.component
diff --git a/fpicker/source/win32/filepicker/FPentry.cxx b/fpicker/source/win32/filepicker/FPentry.cxx
index 2ec99db..0a877e4 100644
--- a/fpicker/source/win32/filepicker/FPentry.cxx
+++ b/fpicker/source/win32/filepicker/FPentry.cxx
@@ -90,7 +90,7 @@ extern "C"
// component_getImplementationEnvironment
//------------------------------------------------
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -100,7 +100,7 @@ void SAL_CALL component_getImplementationEnvironment(
//
//------------------------------------------------
-void* SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* )
{
void* pRet = 0;
diff --git a/fpicker/source/win32/filepicker/makefile.mk b/fpicker/source/win32/filepicker/makefile.mk
deleted file mode 100644
index 408aa8d..0000000
--- a/fpicker/source/win32/filepicker/makefile.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=..$/..$/..
-
-PRJNAME=fpicker
-TARGET=fps
-#LIBTARGET=NO
-ENABLE_EXCEPTIONS=TRUE
-COMP1TYPELIST=$(TARGET)
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# ------------------------------------------------------------------
-
-CDEFS+=-D_UNICODE
-CDEFS+=-DUNICODE
-#CDEFS+=-DWIN32_LEAN_AND_MEAN
-#CDEFS+=-DWIN32
-CDEFS+=-U_WIN32_WINNT -D_WIN32_WINNT=0x0600
-
-
-# --- Resources ----------------------------------------------------
-
-.IF "$(GUI)" == "WNT"
-RCFILES=fps.rc
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-SLOFILES=$(SLO)$/FileOpenDlg.obj\
- $(SLO)$/FPentry.obj\
- $(SLO)$/FilePicker.obj\
- $(SLO)$/WinFileOpenImpl.obj\
- $(SLO)$/FilterContainer.obj\
- $(SLO)$/controlaccess.obj\
- $(SLO)$/dibpreview.obj\
- $(SLO)$/helppopupwindow.obj\
- $(SLO)$/controlcommand.obj\
- $(SLO)$/filepickerstate.obj\
- $(SLO)$/getfilenamewrapper.obj\
- $(SLO)$/asynceventnotifier.obj\
- $(SLO)$/previewadapter.obj\
- $(SLO)$/previewbase.obj\
- $(SLO)$/filepickereventnotification.obj\
- $(SLO)$/customcontrol.obj\
- $(SLO)$/customcontrolcontainer.obj\
- $(SLO)$/customcontrolfactory.obj\
- $(SLO)$/dialogcustomcontrols.obj\
- $(SLO)$/asyncrequests.obj\
- $(SLO)$/VistaFilePickerEventHandler.obj\
- $(SLO)$/VistaFilePickerImpl.obj\
- $(SLO)$/VistaFilePicker.obj\
- $(SLO)$/SolarMutex.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/fpicker/source/win32/folderpicker/Fopentry.cxx b/fpicker/source/win32/folderpicker/Fopentry.cxx
index 79670b8..108ecce 100644
--- a/fpicker/source/win32/folderpicker/Fopentry.cxx
+++ b/fpicker/source/win32/folderpicker/Fopentry.cxx
@@ -77,7 +77,7 @@ extern "C"
// component_getImplementationEnvironment
//----------------------------------------------------------------------
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
@@ -88,7 +88,7 @@ void SAL_CALL component_getImplementationEnvironment(
// returns a factory to create XFilePicker-Services
//----------------------------------------------------------------------
-void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* )
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* )
{
void* pRet = 0;
diff --git a/fpicker/util/exports.dxp b/fpicker/util/exports.dxp
deleted file mode 100644
index f0e1c69..0000000
--- a/fpicker/util/exports.dxp
+++ /dev/null
@@ -1,2 +0,0 @@
-component_getImplementationEnvironment
-component_getFactory
diff --git a/fpicker/util/makefile.mk b/fpicker/util/makefile.mk
deleted file mode 100644
index 111002a..0000000
--- a/fpicker/util/makefile.mk
+++ /dev/null
@@ -1,111 +0,0 @@
-#**************************************************************
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=..
-
-PRJNAME=fpicker
-TARGET=fpicker
-TARGET1=fps
-TARGET2=fop
-USE_LDUMP2=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- fps dynlib ----------------------------------------------
-
-COMMON_LIBS=$(CPPULIB)\
- $(CPPUHELPERLIB)\
- $(COMPHELPERLIB)\
- $(SALLIB)\
- $(VCLLIB)\
- $(TOOLSLIB)
-
-.IF "$(GUI)"=="WNT"
-
-SHL1TARGET=$(TARGET1)
-SHL1STDLIBS= $(COMMON_LIBS) \
- $(UWINAPILIB) \
- $(ADVAPI32LIB) \
- $(SHELL32LIB)\
- $(OLE32LIB)\
- $(GDI32LIB)\
- $(OLEAUT32LIB)\
- $(COMDLG32LIB)\
- $(KERNEL32LIB)\
- $(UUIDLIB)
-
-SHL1DEPN=
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1LIBS=$(SLB)$/fps.lib\
- $(SLB)$/utils.lib
-SHL1RES=$(RES)$/$(TARGET1).res
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-DEF1EXPORTFILE= exports.dxp
-
-.ENDIF # "$(GUI)"=="WNT"
-
-# --- fop dynlib --------------------------------------------------
-
-.IF "$(GUI)"=="WNT"
-SHL2NOCHECK=TRUE
-SHL2TARGET=$(TARGET2)
-
-SHL2STDLIBS= $(COMMON_LIBS) \
- $(UWINAPILIB) \
- $(ADVAPI32LIB) \
- $(OLE32LIB)\
- $(GDI32LIB)\
- $(SHELL32LIB)\
- $(OLEAUT32LIB)
-
-SHL2DEPN=
-SHL2IMPLIB=i$(SHL2TARGET)
-SHL2LIBS=$(SLB)$/fop.lib\
- $(SLB)$/utils.lib
-SHL2DEF=$(MISC)$/$(SHL2TARGET).def
-
-DEF2NAME=$(SHL2TARGET)
-DEF2EXPORTFILE= exports.dxp
-
-.ENDIF # "$(GUI)"=="WNT"
-
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/fop.component $(MISC)/fps.component
-
-$(MISC)/fop.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- fop.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt fop.component
-
-$(MISC)/fps.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- fps.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt fps.component
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index d4c5234..e86420f 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -77,6 +77,8 @@ my_components = \
component/eventattacher/source/evtatt \
component/fileaccess/util/fileacc \
component/formula/util/for \
+ component/fpicker/source/generic/fpicker \
+ component/fpicker/source/office/fps_office \
component/framework/util/fwk \
component/framework/util/fwl \
component/framework/util/fwm \
@@ -137,8 +139,6 @@ my_components = \
filterconfig1 \
flash \
flat \
- fpicker \
- fps_office \
frm \
guesslang \
i18npool \
@@ -317,7 +317,7 @@ my_components += \
my_components += \
component/avmedia/source/macavf/avmediaMacAVF \
component/avmedia/source/quicktime/avmediaQuickTime \
- fps_aqua \
+ components/fpicker/source/aqua/fps_aqua \
macab1 \
macbe1 \
MacOSXSpell
@@ -331,8 +331,8 @@ my_components += \
component/dtrans/util/dnd \
component/dtrans/util/ftransl \
component/dtrans/util/sysdtrans \
- fop \
- fps \
+ component/fpicker/source/win32/folderpicker/fop \
+ component/fpicker/source/win32/filepicker/fps \
java_uno_accessbridge \
sysmail \
winaccessibility \
@@ -371,11 +371,11 @@ my_components += desktopbe1
.END
.IF "$(GTK_TWO_FOUR)" != ""
-my_components += fps_gnome
+my_components += component/fpicker/source/unx/gnome/fps_gnome
.END
.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(ENABLE_KDE4)" != ""
-my_components += fps_kde4
+my_components += component/fpicker/source/unx/kde4/fps_kde4
.END
.IF "$(OS)" != "WNT"
commit e882f6ef292dada2facd5e7f7086a45ba5eb6dab
Author: Damjan Jovanovic <damjan at apache.org>
Date: Wed Dec 21 16:58:47 2016 +0000
Use "OpenOffice" instead of "soffice" as our KDE appName.
Patch by: pfg
Reviewed by: me
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 1ab17fc..b6573cd 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -74,7 +74,7 @@ void KDEXLib::Init()
pInputMethod->SetLocale();
XrmInitialize();
- KAboutData *kAboutData = new KAboutData("soffice",
+ KAboutData *kAboutData = new KAboutData("OpenOffice",
"kdelibs4",
ki18n( "Apache OpenOffice" ),
"3.4.0",
commit 11d0cb2b2116a262b54b898ee85be4df1f066f86
Author: Damjan Jovanovic <damjan at apache.org>
Date: Wed Dec 21 02:11:03 2016 +0000
AOO was failing to start on KDE4 with
"Couldn't register name ... with D-BUS - another process owns it already!",
(which is the wrong error on KDE's part), as the appName passed to KAboutData's
constructor was "Apache OpenOffice" and spaces and slashes are not allowed
(see https://forum.kde.org/viewtopic.php?f=64&t=62521).
Let's use "soffice" instead, as appName is an internal name after all.
Patch by: me
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index c2e36cb..1ab17fc 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -74,7 +74,7 @@ void KDEXLib::Init()
pInputMethod->SetLocale();
XrmInitialize();
- KAboutData *kAboutData = new KAboutData("Apache OpenOffice",
+ KAboutData *kAboutData = new KAboutData("soffice",
"kdelibs4",
ki18n( "Apache OpenOffice" ),
"3.4.0",
commit b1d859da47a092df8c817b5769cc44e53b025971
Author: Damjan Jovanovic <damjan at apache.org>
Date: Wed Dec 21 01:05:48 2016 +0000
Fix build errors in the KDE file picker caused by defines
duplicated between KDE4 and AOO.
Patch by: me
diff --git a/fpicker/source/unx/kde4/KDE4FilePicker.cxx b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
index 07d803b..6efb704 100644
--- a/fpicker/source/unx/kde4/KDE4FilePicker.cxx
+++ b/fpicker/source/unx/kde4/KDE4FilePicker.cxx
@@ -52,6 +52,8 @@
//kde has an enum that uses this...OO does too
#undef SETTINGS_MOUSE
+#undef SETTINGS_LOCALE
+#undef SETTINGS_STYLE
#include <kfiledialog.h>
#include <kwindowsystem.h>
commit 04c569c49faf2943bcb3f96aac372d2befd26ebb
Author: Damjan Jovanovic <damjan at apache.org>
Date: Mon Dec 19 16:30:54 2016 +0000
Add a missing bridge prj/makefile.mk for main/automation.
Patch by: me
diff --git a/automation/prj/makefile.mk b/automation/prj/makefile.mk
new file mode 100644
index 0000000..c62c6a6
--- /dev/null
+++ b/automation/prj/makefile.mk
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
commit 1c351998ef21744766aba5766290ce5c8daab637
Author: Damjan Jovanovic <damjan at apache.org>
Date: Mon Dec 19 04:23:33 2016 +0000
Fix a typo in automation/prj/build.lst.
Patch by: me
diff --git a/automation/prj/build.lst b/automation/prj/build.lst
index 5c9af35..34429fe 100644
--- a/automation/prj/build.lst
+++ b/automation/prj/build.lst
@@ -1,2 +1,2 @@
-au automation : basic fpicker NULLx
+au automation : basic fpicker NULL
au automation\prj nmake - all au_prj NULL
commit 38367c55834e7d26f37f859709b852bdd499aba0
Author: Damjan Jovanovic <damjan at apache.org>
Date: Mon Dec 19 04:05:35 2016 +0000
Port main/automation to gbuild.
Patch by: me
diff --git a/Module_ooo.mk b/Module_ooo.mk
index 3fa6f02..1eab4e2 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_Module_Module,ooo))
$(eval $(call gb_Module_add_moduledirs,ooo,\
MathMLDTD \
animations \
+ automation \
avmedia \
basebmp \
basegfx \
diff --git a/Repository.mk b/Repository.mk
index 2ad8820..a13f823 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
basebmp \
basegfx \
canvastools \
+ communi \
cppcanvas \
cui \
dba \
@@ -100,10 +101,12 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
sdbc \
sdbt \
sfx \
+ simplecm \
sm \
smd \
sot \
spa \
+ sts \
svl \
svt \
svx \
diff --git a/automation/source/server/makefile.mk b/automation/Library_communi.mk
similarity index 50%
rename from automation/source/server/makefile.mk
rename to automation/Library_communi.mk
index 7e48cc4..ebfe1e3 100644
--- a/automation/source/server/makefile.mk
+++ b/automation/Library_communi.mk
@@ -20,48 +20,49 @@
#**************************************************************
-PRJ=..$/..
-PRJNAME=automation
-TARGET=server
+$(eval $(call gb_Library_Library,communi))
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_Library_add_precompiled_header,communi,$(SRCDIR)/automation/inc/pch/precompiled_automation))
-.INCLUDE : settings.mk
+$(eval $(call gb_Library_add_package_headers,communi,automation_inc))
-# --- Files --------------------------------------------------------
+$(eval $(call gb_Library_set_include,communi,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/automation/inc \
+ -I$(SRCDIR)/automation/inc/pch \
+ -I$(SRCDIR)/automation/source/inc \
+))
-SLOFILES = \
- $(SLO)$/XMLParser.obj \
- $(SLO)$/recorder.obj \
- $(SLO)$/svcommstream.obj \
- $(SLO)$/cmdbasestream.obj \
- $(SLO)$/scmdstrm.obj \
- $(SLO)$/statemnt.obj \
- $(SLO)$/sta_list.obj \
- $(SLO)$/editwin.obj \
- $(SLO)$/server.obj \
- $(SLO)$/retstrm.obj \
- $(SLO)$/profiler.obj
+$(eval $(call gb_Library_add_defs,communi,\
+ -DAUTOMATION_DLLIMPLEMENTATION \
+))
+$(eval $(call gb_Library_add_api,communi,\
+ offapi \
+ udkapi \
+))
-OBJFILES = \
- $(OBJ)$/cmdbasestream.obj \
- $(OBJ)$/svcommstream.obj
+$(eval $(call gb_Library_add_linked_libs,communi,\
+ sal \
+ simplecm \
+ svl \
+ tl \
+ vcl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
-EXCEPTIONSFILES = \
- $(SLO)$/statemnt.obj \
- $(SLO)$/server.obj \
- $(SLO)$/XMLParser.obj
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Library_add_linked_libs,communi,\
+ advapi32 \
+ gdi32 \
+))
+endif
-NOOPTFILES = $(SLO)$/statemnt.obj
+$(eval $(call gb_Library_add_noexception_objects,communi,\
+ automation/source/communi/communi \
+))
-.IF "$(OS)"=="SOLARIS"
-SLOFILES += $(SLO)$/prof_usl.obj
-.ELSE
-SLOFILES += $(SLO)$/prof_nul.obj
-.ENDIF
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE : target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/automation/Library_communi.mk.old b/automation/Library_communi.mk.old
new file mode 100644
index 0000000..a890e45
--- /dev/null
+++ b/automation/Library_communi.mk.old
@@ -0,0 +1,99 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,communi))
+
+$(eval $(call gb_Library_add_precompiled_header,communi,$(SRCDIR)/automation/inc/pch/precompiled_automation))
+
+$(eval $(call gb_Library_add_package_headers,communi,automation_inc))
+
+$(eval $(call gb_Library_set_include,communi,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/automation/inc \
+ -I$(SRCDIR)/automation/inc/pch \
+ -I$(SRCDIR)/automation/source/inc \
+))
+
+#$(eval $(call gb_Library_add_defs,communi,\
+# -DAVMEDIA_DLLIMPLEMENTATION \
+#))
+
+$(eval $(call gb_Library_add_api,communi,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,communi,\
+ sal \
+ simplecm \
+ svl \
+ tl \
+ vcl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Library_add_linked_libs,communi,\
+ advapi32 \
+ gdi32 \
+))
+endif
+
+$(eval $(call gb_Library_add_noexception_objects,communi,\
+ automation/source/communi/communi \
+ automation/source/server/recorder \
+ automation/source/server/svcommstream \
+ automation/source/server/cmdbasestream \
+ automation/source/server/scmdstrm \
+ automation/source/server/sta_list \
+ automation/source/server/editwin \
+ automation/source/server/retstrm \
+ automation/source/server/profiler \
+ automation/source/simplecm/tcpio \
+ automation/source/simplecm/packethandler \
+ automation/source/simplecm/simplecm \
+))
+
+ifeq ($(OS),SOLARIS)
+$(eval $(call gb_Library_add_noexception_objects,communi,\
+ automation/source/server/prof_usl \
+))
+else
+$(eval $(call gb_Library_add_noexception_objects,communi,\
+ automation/source/server/prof_nul \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,communi,\
+ automation/source/server/XMLParser \
+ automation/source/server/server \
+))
+
+$(eval $(call gb_Library_add_cxxobjects,dnd,\
+ automation/source/server/statemnt \
+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/automation/Library_simplecm.mk b/automation/Library_simplecm.mk
new file mode 100644
index 0000000..21c127e
--- /dev/null
+++ b/automation/Library_simplecm.mk
@@ -0,0 +1,60 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,simplecm))
+
+$(eval $(call gb_Library_add_precompiled_header,simplecm,$(SRCDIR)/automation/inc/pch/precompiled_automation))
+
+$(eval $(call gb_Library_add_package_headers,simplecm,automation_inc))
+
+$(eval $(call gb_Library_set_include,simplecm,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/automation/inc \
+ -I$(SRCDIR)/automation/inc/pch \
+ -I$(SRCDIR)/automation/source/inc \
+))
+
+$(eval $(call gb_Library_add_defs,simplecm,\
+ -DAUTOMATION_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_api,simplecm,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,simplecm,\
+ sal \
+ tl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,simplecm,\
+ automation/source/simplecm/tcpio \
+ automation/source/simplecm/packethandler \
+ automation/source/simplecm/simplecm \
+))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/automation/Library_sts.mk b/automation/Library_sts.mk
new file mode 100644
index 0000000..16a4af3
--- /dev/null
+++ b/automation/Library_sts.mk
@@ -0,0 +1,105 @@
+#**************************************************************
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,sts))
+
+$(eval $(call gb_Library_add_precompiled_header,sts,$(SRCDIR)/automation/inc/pch/precompiled_automation))
+
+$(eval $(call gb_Library_add_package_headers,sts,automation_inc))
+
+$(eval $(call gb_Library_set_include,sts,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/automation/inc \
+ -I$(SRCDIR)/automation/inc/pch \
+ -I$(SRCDIR)/automation/source/inc \
+))
+
+$(eval $(call gb_Library_add_defs,sts,\
+ -DAUTOMATION_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_api,sts,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sts,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ sb \
+ sot \
+ svl \
+ svt \
+ tl \
+ vcl \
+ utl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Library_add_linked_libs,sts,\
+ advapi32 \
+ gdi32 \
+))
+endif
+
+$(eval $(call gb_Library_add_noexception_objects,sts,\
+ automation/source/communi/communi \
+ automation/source/server/recorder \
+ automation/source/server/svcommstream \
+ automation/source/server/cmdbasestream \
+ automation/source/server/scmdstrm \
+ automation/source/server/sta_list \
+ automation/source/server/editwin \
+ automation/source/server/retstrm \
+ automation/source/server/profiler \
+ automation/source/simplecm/tcpio \
+ automation/source/simplecm/packethandler \
+ automation/source/simplecm/simplecm \
+))
+
+ifeq ($(OS),SOLARIS)
+$(eval $(call gb_Library_add_noexception_objects,sts,\
+ automation/source/server/prof_usl \
+))
+else
+$(eval $(call gb_Library_add_noexception_objects,sts,\
+ automation/source/server/prof_nul \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,sts,\
+ automation/source/server/XMLParser \
+ automation/source/server/server \
+))
+
+$(eval $(call gb_Library_add_cxxobjects,sts,\
+ automation/source/server/statemnt \
+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/automation/inc/makefile.mk b/automation/Makefile
similarity index 68%
rename from automation/inc/makefile.mk
rename to automation/Makefile
index 72c0dc8..c1d144c 100644
--- a/automation/inc/makefile.mk
+++ b/automation/Makefile
@@ -19,25 +19,14 @@
#
#**************************************************************
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
-PRJ=..
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
-PRJNAME=automation
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+# vim: set noet sw=4 ts=4:
diff --git a/automation/source/communi/makefile.mk b/automation/Module_automation.mk
similarity index 70%
rename from automation/source/communi/makefile.mk
rename to automation/Module_automation.mk
index fcfda32..41f7d77 100644
--- a/automation/source/communi/makefile.mk
+++ b/automation/Module_automation.mk
@@ -21,20 +21,14 @@
-PRJ=..$/..
+$(eval $(call gb_Module_Module,automation))
-PRJNAME=automation
-TARGET=communi
+$(eval $(call gb_Module_add_targets,automation,\
+ Library_communi \
+ Library_simplecm \
+ Library_sts \
+ Package_hid \
+ Package_inc \
+))
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/communi.obj
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
+# vim: set noet sw=4 ts=4:
diff --git a/automation/source/simplecm/makefile.mk b/automation/Package_hid.mk
similarity index 65%
rename from automation/source/simplecm/makefile.mk
rename to automation/Package_hid.mk
index 0ebcf8a..6626186 100644
--- a/automation/source/simplecm/makefile.mk
+++ b/automation/Package_hid.mk
@@ -21,22 +21,6 @@
-PRJ=..$/..
+$(eval $(call gb_Package_Package,automation_hid,$(SRCDIR)/automation/util))
-PRJNAME=automation
-TARGET=simplecm
-
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list