Author: damjan
Date: Fri Dec 23 01:53:29 2016
New Revision: 1775782
URL: http://svn.apache.org/viewvc?rev=1775782&view=rev
Log:
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
Modified:
openoffice/trunk/main/Repository.mk
openoffice/trunk/main/fpicker/Library_fop.mk
openoffice/trunk/main/fpicker/Library_fps.mk
openoffice/trunk/main/fpicker/Library_fps_office.mk
openoffice/trunk/main/fpicker/Module_fpicker.mk
openoffice/trunk/main/postprocess/packcomponents/makefile.mk
openoffice/trunk/main/solenv/gbuild/platform/windows.mk
openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk
Modified: openoffice/trunk/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1775782&r1=1775781&r2=1775782&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Fri Dec 23 01:53:29 2016
@@ -73,8 +73,10 @@ $(eval $(call gb_Helper_register_librari
evtatt \
file \
fileacc \
+ fop \
for \
forui \
+ fps \
ftransl \
fwe \
fwi \
@@ -178,9 +180,7 @@ $(eval $(call gb_Helper_register_librari
directx9canvas \
expwrap \
fastsax \
- fop \
fpicker \
- fps \
fps_aqua \
fps_gnome \
fps_kde4 \
Modified: openoffice/trunk/main/fpicker/Library_fop.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/Library_fop.mk?rev=1775782&r1=1775781&r2=1775782&view=diff
==============================================================================
--- openoffice/trunk/main/fpicker/Library_fop.mk (original)
+++ openoffice/trunk/main/fpicker/Library_fop.mk Fri Dec 23 01:53:29 2016
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_add_linked_libs
cppu \
cppuhelper \
sal \
+ stl \
tl \
vcl \
$(gb_STDLIBS) \
@@ -51,13 +52,14 @@ $(eval $(call gb_Library_add_linked_libs
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,
fpicker/source/win32/misc/resourceprovider \
, -DUNICODE -D_UNICODE $(gb_LinkTarget_EXCEPTIONFLAGS) \
))
-fi
+endif
# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/fpicker/Library_fps.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/Library_fps.mk?rev=1775782&r1=1775781&r2=1775782&view=diff
==============================================================================
--- openoffice/trunk/main/fpicker/Library_fps.mk (original)
+++ openoffice/trunk/main/fpicker/Library_fps.mk Fri Dec 23 01:53:29 2016
@@ -40,6 +40,7 @@ $(eval $(call gb_Library_add_linked_libs
cppu \
cppuhelper \
sal \
+ stl \
tl \
vcl \
$(gb_STDLIBS) \
@@ -53,6 +54,7 @@ $(eval $(call gb_Library_add_linked_libs
ole32 \
oleaut32 \
shell32 \
+ user32\
uuid \
uwinapi \
))
@@ -99,6 +101,6 @@ $(eval $(call gb_Library_add_cxxobjects,
fpicker/source/win32/misc/resourceprovider \
, -DUNICODE -D_UNICODE $(gb_LinkTarget_EXCEPTIONFLAGS) \
))
-fi
+endif
# vim: set noet sw=4 ts=4:
Modified: openoffice/trunk/main/fpicker/Library_fps_office.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/Library_fps_office.mk?rev=1775782&r1=1775781&r2=1775782&view=diff
==============================================================================
--- openoffice/trunk/main/fpicker/Library_fps_office.mk (original)
+++ openoffice/trunk/main/fpicker/Library_fps_office.mk Fri Dec 23 01:53:29 2016
@@ -41,6 +41,7 @@ $(eval $(call gb_Library_add_linked_libs
cppuhelper \
ootk \
sal \
+ stl \
svl \
svt \
tl \
Modified: openoffice/trunk/main/fpicker/Module_fpicker.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/Module_fpicker.mk?rev=1775782&r1=1775781&r2=1775782&view=diff
==============================================================================
--- openoffice/trunk/main/fpicker/Module_fpicker.mk (original)
+++ openoffice/trunk/main/fpicker/Module_fpicker.mk Fri Dec 23 01:53:29 2016
@@ -30,6 +30,7 @@ $(eval $(call gb_Module_add_targets,fpic
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,fpic
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:
Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1775782&r1=1775781&r2=1775782&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Fri Dec 23
01:53:29 2016
@@ -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 \
Modified: openoffice/trunk/main/solenv/gbuild/platform/windows.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/windows.mk?rev=1775782&r1=1775781&r2=1775782&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/windows.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/windows.mk Fri Dec 23 01:53:29
2016
@@ -441,6 +441,7 @@ gb_Library_PLAINEXT := .lib
gb_Library_PLAINLIBS_NONE += \
advapi32 \
+ comdlg32 \
d3d9 \
d3dx \
ddraw \
Modified: openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk?rev=1775782&r1=1775781&r2=1775782&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk (original)
+++ openoffice/trunk/main/solenv/gbuild/platform/winmingw.mk Fri Dec 23
01:53:29 2016
@@ -462,6 +462,7 @@ gb_Library_PLAINLIBS_NONE += \
$(gb_MINGW_LIBSTDCPP) \
$(gb_MINGW_LIBGCC) \
advapi32 \
+ comdlg32 \
d3d9 \
d3dx \
ddraw \
