Author: jim
Date: Thu Feb 14 14:26:57 2019
New Revision: 1853583
URL: http://svn.apache.org/viewvc?rev=1853583&view=rev
Log:
Merge r1852965 from trunk:
Port main/i18npool to gbuild.
Allow ICU's version.mk to be used by GNU make (= instead of *=).
Add support for building generated C files.
Reference ICU libraries using "gb_Library_use_externals" across the tree.
Also ICU is an external library, remove it from RepositoryFixes.mk
which is only for internal ones, and keep it in RepositoryExternal.mk
exclusively. Since we get to specify the full linker parameter over there,
remove the half-baked hacks for it from RepositoryFixes.mk.
Patch by: me
Submitted by: damjan
Reviewed by: jim
Added:
openoffice/branches/AOO42X/main/i18npool/Executable_gencoll_rule.mk
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/Executable_gencoll_rule.mk
openoffice/branches/AOO42X/main/i18npool/Executable_genconv_dict.mk
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/Executable_genconv_dict.mk
openoffice/branches/AOO42X/main/i18npool/Executable_gendict.mk
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/Executable_gendict.mk
openoffice/branches/AOO42X/main/i18npool/Executable_genindex_data.mk
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/Executable_genindex_data.mk
openoffice/branches/AOO42X/main/i18npool/Executable_saxparser.mk
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/Executable_saxparser.mk
openoffice/branches/AOO42X/main/i18npool/Library_collator_data.mk
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/Library_collator_data.mk
openoffice/branches/AOO42X/main/i18npool/Library_dict_ja.mk
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/Library_dict_ja.mk
openoffice/branches/AOO42X/main/i18npool/Library_dict_zh.mk
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/Library_dict_zh.mk
openoffice/branches/AOO42X/main/i18npool/Library_i18nisolang1.mk
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/Library_i18nisolang1.mk
openoffice/branches/AOO42X/main/i18npool/Library_i18npaper.mk
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/Library_i18npaper.mk
openoffice/branches/AOO42X/main/i18npool/Library_i18npool.mk
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/Library_i18npool.mk
openoffice/branches/AOO42X/main/i18npool/Library_i18nsearch.mk
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/Library_i18nsearch.mk
openoffice/branches/AOO42X/main/i18npool/Library_index_data.mk
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/Library_index_data.mk
openoffice/branches/AOO42X/main/i18npool/Library_localedata_en.mk
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/Library_localedata_en.mk
openoffice/branches/AOO42X/main/i18npool/Library_localedata_es.mk
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/Library_localedata_es.mk
openoffice/branches/AOO42X/main/i18npool/Library_localedata_euro.mk
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/Library_localedata_euro.mk
openoffice/branches/AOO42X/main/i18npool/Library_localedata_others.mk
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/Library_localedata_others.mk
openoffice/branches/AOO42X/main/i18npool/Library_textconv_dict.mk
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/Library_textconv_dict.mk
openoffice/branches/AOO42X/main/i18npool/Makefile
- copied unchanged from r1852965, openoffice/trunk/main/i18npool/Makefile
openoffice/branches/AOO42X/main/i18npool/Module_i18npool.mk
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/Module_i18npool.mk
openoffice/branches/AOO42X/main/i18npool/Package_inc.mk
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/Package_inc.mk
openoffice/branches/AOO42X/main/i18npool/Package_version.mk
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/Package_version.mk
openoffice/branches/AOO42X/main/i18npool/Package_xml.mk
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/Package_xml.mk
openoffice/branches/AOO42X/main/i18npool/inc/pch/precompiled_i18nisolang.cxx
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/inc/pch/precompiled_i18nisolang.cxx
openoffice/branches/AOO42X/main/i18npool/inc/pch/precompiled_i18nisolang.hxx
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/inc/pch/precompiled_i18nisolang.hxx
openoffice/branches/AOO42X/main/i18npool/inc/pch/precompiled_i18npaper.cxx
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/inc/pch/precompiled_i18npaper.cxx
openoffice/branches/AOO42X/main/i18npool/inc/pch/precompiled_i18npaper.hxx
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/inc/pch/precompiled_i18npaper.hxx
openoffice/branches/AOO42X/main/i18npool/inc/pch/precompiled_search.cxx
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/inc/pch/precompiled_search.cxx
openoffice/branches/AOO42X/main/i18npool/inc/pch/precompiled_search.hxx
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/inc/pch/precompiled_search.hxx
openoffice/branches/AOO42X/main/i18npool/prj/makefile.mk
- copied unchanged from r1852965,
openoffice/trunk/main/i18npool/prj/makefile.mk
Modified:
openoffice/branches/AOO42X/ (props changed)
openoffice/branches/AOO42X/main/Module_ooo.mk
openoffice/branches/AOO42X/main/Repository.mk
openoffice/branches/AOO42X/main/RepositoryExternal.mk
openoffice/branches/AOO42X/main/RepositoryFixes.mk
openoffice/branches/AOO42X/main/i18npool/prj/build.lst
openoffice/branches/AOO42X/main/i18npool/prj/d.lst
openoffice/branches/AOO42X/main/i18npool/source/breakiterator/gendict.cxx
openoffice/branches/AOO42X/main/i18npool/source/breakiterator/makefile.mk
openoffice/branches/AOO42X/main/i18npool/source/collator/gencoll_rule.cxx
openoffice/branches/AOO42X/main/i18npool/source/indexentry/genindex_data.cxx
openoffice/branches/AOO42X/main/i18npool/source/isolang/insys.cxx
openoffice/branches/AOO42X/main/i18npool/source/isolang/inunx.cxx
openoffice/branches/AOO42X/main/i18npool/source/isolang/inwnt.cxx
openoffice/branches/AOO42X/main/i18npool/source/isolang/isolang.cxx
openoffice/branches/AOO42X/main/i18npool/source/isolang/mslangid.cxx
openoffice/branches/AOO42X/main/i18npool/source/localedata/filewriter.cxx
openoffice/branches/AOO42X/main/i18npool/source/registerservices/registerservices.cxx
openoffice/branches/AOO42X/main/i18npool/source/search/levdis.cxx
openoffice/branches/AOO42X/main/i18npool/source/search/textsearch.cxx
openoffice/branches/AOO42X/main/i18npool/source/textconversion/genconv_dict.cxx
openoffice/branches/AOO42X/main/icu/icuversion.mk
openoffice/branches/AOO42X/main/lingucomponent/Library_spell.mk
openoffice/branches/AOO42X/main/postprocess/packcomponents/makefile.mk
openoffice/branches/AOO42X/main/solenv/gbuild/Executable.mk
openoffice/branches/AOO42X/main/solenv/gbuild/Library.mk
openoffice/branches/AOO42X/main/solenv/gbuild/LinkTarget.mk
openoffice/branches/AOO42X/main/solenv/gbuild/StaticLibrary.mk
openoffice/branches/AOO42X/main/solenv/gbuild/TargetLocations.mk
openoffice/branches/AOO42X/main/solenv/gbuild/platform/freebsd.mk
openoffice/branches/AOO42X/main/solenv/gbuild/platform/linux.mk
openoffice/branches/AOO42X/main/solenv/gbuild/platform/macosx.mk
openoffice/branches/AOO42X/main/solenv/gbuild/platform/os2.mk
openoffice/branches/AOO42X/main/solenv/gbuild/platform/solaris.mk
openoffice/branches/AOO42X/main/solenv/gbuild/platform/windows.mk
openoffice/branches/AOO42X/main/solenv/gbuild/platform/winmingw.mk
Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 14 14:26:57 2019
@@ -9,4 +9,4 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1853175,1853319,1853443-1853444,1853504
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853319,1853443-1853444,1853504
Modified: openoffice/branches/AOO42X/main/Module_ooo.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/Module_ooo.mk?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/Module_ooo.mk (original)
+++ openoffice/branches/AOO42X/main/Module_ooo.mk Thu Feb 14 14:26:57 2019
@@ -57,6 +57,7 @@ $(eval $(call gb_Module_add_moduledirs,o
formula \
fpicker \
framework \
+ i18npool \
i18nutil \
idl \
idlc \
Modified: openoffice/branches/AOO42X/main/Repository.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/Repository.mk?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/Repository.mk (original)
+++ openoffice/branches/AOO42X/main/Repository.mk Thu Feb 14 14:26:57 2019
@@ -29,6 +29,10 @@ $(eval $(call gb_Helper_register_executa
bmpsum \
checksingleton \
g2g \
+ gencoll_rule \
+ genconv_dict \
+ gendict \
+ genindex_data \
mkunroll \
rdbedit \
rdbmaker \
@@ -36,6 +40,7 @@ $(eval $(call gb_Helper_register_executa
rsc2 \
rscdep \
rscpp \
+ saxparser \
so_checksum \
srvdepy \
svidl \
@@ -85,6 +90,7 @@ $(eval $(call gb_Helper_register_librari
basegfx \
cached1 \
canvastools \
+ collator_data \
communi \
cppcanvas \
ctl \
@@ -97,6 +103,8 @@ $(eval $(call gb_Helper_register_librari
dbpool \
dbtools \
desktop_detector \
+ dict_ja \
+ dict_zh \
dnd \
drawinglayer \
dtrans \
@@ -119,10 +127,15 @@ $(eval $(call gb_Helper_register_librari
fwm \
guesslang \
i18npaper \
+ index_data \
java_uno_accessbridge \
juh \
juhx \
lng \
+ localedata_en \
+ localedata_es \
+ localedata_euro \
+ localedata_others \
mcnttype \
msfilter \
msword \
@@ -166,6 +179,7 @@ $(eval $(call gb_Helper_register_librari
sysdtrans \
textconversiondlgs \
ootk \
+ textconv_dict \
tl \
tvhlp1 \
ucpchelp1 \
@@ -250,6 +264,8 @@ $(eval $(call gb_Helper_register_librari
gdipluscanvas \
hatchwindowfactory \
hyphen_uno \
+ i18npool \
+ i18nsearch \
lnth \
nullcanvas \
passwordcontainer \
Modified: openoffice/branches/AOO42X/main/RepositoryExternal.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/RepositoryExternal.mk?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/RepositoryExternal.mk (original)
+++ openoffice/branches/AOO42X/main/RepositoryExternal.mk Thu Feb 14 14:26:57
2019
@@ -287,6 +287,12 @@ endif # SYSTEM_GRAPHITE
ifeq ($(SYSTEM_ICU),YES)
+define gb_LinkTarget__use_icudata
+$(call gb_LinkTarget_add_libs,$(1),-licudata)
+endef
+define gb_LinkTarget__use_icui18n
+$(call gb_LinkTarget_add_libs,$(1),-licui18n)
+endef
define gb_LinkTarget__use_icule
$(call gb_LinkTarget_add_libs,$(1),-licule)
endef
@@ -296,20 +302,48 @@ endef
else # !SYSTEM_ICU
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
- icule \
- icuuc \
-))
+define gb_LinkTarget__use_icudata
+ifeq ($(OS)$(COM),WNTMSC)
+$(call gb_LinkTarget_add_libs,$(1),icudata.lib)
+else ifeq ($(OS)$(COM),WNTGCC)
+$(call gb_LinkTarget_add_libs,$(1),-licudt40)
+else ifeq ($(OS),OS2)
+$(call gb_LinkTarget_add_libs,$(1),-licudt)
+else
+$(call gb_LinkTarget_add_libs,$(1),-licudata)
+endif
+endef
+
+define gb_LinkTarget__use_icui18n
+ifeq ($(OS)$(COM),WNTMSC)
+$(call gb_LinkTarget_add_libs,$(1),icuin.lib)
+else ifeq ($(OS)$(COM),WNTGCC)
+$(call gb_LinkTarget_add_libs,$(1),-licuin40)
+else ifeq ($(OS),OS2)
+$(call gb_LinkTarget_add_libs,$(1),-licuin)
+else
+$(call gb_LinkTarget_add_libs,$(1),-licui18n)
+endif
+endef
define gb_LinkTarget__use_icule
-$(call gb_LinkTarget_add_linked_libs,$(1),\
- icule \
-)
+ifeq ($(OS)$(COM),WNTMSC)
+$(call gb_LinkTarget_add_libs,$(1),icule.lib)
+else ifeq ($(OS)$(COM),WNTGCC)
+$(call gb_LinkTarget_add_libs,$(1),-licule40)
+else
+$(call gb_LinkTarget_add_libs,$(1),-licule)
+endif
endef
+
define gb_LinkTarget__use_icuuc
-$(call gb_LinkTarget_add_linked_libs,$(1),\
- icuuc \
-)
+ifeq ($(OS)$(COM),WNTMSC)
+$(call gb_LinkTarget_add_libs,$(1),icuuc.lib)
+else ifeq ($(OS)$(COM),WNTGCC)
+$(call gb_LinkTarget_add_libs,$(1),-licuuc40)
+else
+$(call gb_LinkTarget_add_libs,$(1),-licuuc)
+endif
endef
endif # SYSTEM_ICU
Modified: openoffice/branches/AOO42X/main/RepositoryFixes.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/RepositoryFixes.mk?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/RepositoryFixes.mk (original)
+++ openoffice/branches/AOO42X/main/RepositoryFixes.mk Thu Feb 14 14:26:57 2019
@@ -107,11 +107,6 @@ gb_Library_FILENAMES := $(patsubst stl:i
# all other libraries built by AOO and all platform libraries (exceptions see
below) are used without an import library
# we link against their dlls in gcc format directly
gb_Library_NOILIBFILENAMES:=\
- icudt \
- icuin \
- icule \
- icutu \
- icuuc \
uwinapi \
winmm \
@@ -130,11 +125,6 @@ gb_Library_DLLFILENAMES += $(foreach lib
gb_Library_DLLFILENAMES := $(patsubst
comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
hyphen_uno:hyphen_uno.uno%,hyphen_uno:hyphen.uno%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst
icudt:icudt%,icudt:icudt40%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst
icuin:icuin%,icuin:icuin40%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst
icule:icule%,icule:icule40%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst
icutu:icutu%,icutu:icutu40%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst
icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
jvmaccess:jvmaccess%,jvmaccess:jvmaccess$(gb_Library_MAJORVER)%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
@@ -163,12 +153,6 @@ gb_Library_FILENAMES := $(patsubst stl:i
# change the names of all import libraries that don't have an "i" prefix as in
our standard naming schema
gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE)
-gb_Library_NOILIBFILENAMES += \
- icudt \
- icuin \
- icule \
- icutu \
- icuuc
gb_Library_FILENAMES := $(filter-out $(foreach
lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
gb_Library_FILENAMES += $(foreach
lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
@@ -180,11 +164,6 @@ gb_Library_FILENAMES := $(patsubst z:z%,
gb_Library_DLLFILENAMES := $(patsubst
comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
hyphen_uno:hyphen_uno.uno%,hyphen_uno:hyphen.uno%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst
icudt:icudt%,icudt:icudt40%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst
icuin:icuin%,icuin:icuin40%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst
icule:icule%,icule:icule40%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst
icutu:icutu%,icutu:icutu40%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst
icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
endif # ifneq ($(USE_MINGW),)
@@ -255,12 +234,7 @@ gb_Library_DLLFILENAMES := $(patsubst uu
gb_Library_DLLFILENAMES := $(patsubst
ucpexpand1:ucpexpand1%,ucpexpand1:ucpexpan%,$(gb_Library_DLLFILENAMES))
gb_Library_NOILIBFILENAMES:=\
- ft2lib \
- icudt \
- icuin \
- icule \
- icutu \
- icuuc
+ ft2lib
gb_Library_ILIBFILENAMES:=\
ft2lib \
Modified: openoffice/branches/AOO42X/main/i18npool/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/i18npool/prj/build.lst?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/i18npool/prj/build.lst (original)
+++ openoffice/branches/AOO42X/main/i18npool/prj/build.lst Thu Feb 14 14:26:57
2019
@@ -1,26 +1,2 @@
inp i18npool : bridges sax stoc comphelper ICU:icu i18nutil
LIBXSLT:libxslt NULL
-inp i18npool usr1 - all inp_mkout NULL
-inp i18npool\inc nmake - all inp_inc NULL
-inp i18npool\source\registerservices nmake - all inp_rserv
inp_inc NULL
-inp i18npool\source\breakiterator nmake - all inp_brkit
inp_inc NULL
-inp i18npool\source\characterclassification nmake - all inp_chclass
inp_inc NULL
-inp i18npool\source\breakiterator\data nmake - all inp_dict
inp_brkit inp_inc NULL
-inp i18npool\source\transliteration nmake - all inp_translit
inp_inc NULL
-inp i18npool\source\isolang nmake - all inp_isolang
inp_inc NULL
-inp i18npool\source\localedata nmake - all inp_localedata
inp_isolang inp_inc NULL
-inp i18npool\source\localedata\data nmake - all
inp_locdata_data inp_localedata inp_inc NULL
-inp i18npool\source\paper nmake - all inp_paper
inp_isolang inp_inc NULL
-inp i18npool\source\calendar nmake - all inp_cal
inp_inc NULL
-inp i18npool\source\numberformatcode nmake - all inp_numformat
inp_inc NULL
-inp i18npool\source\defaultnumberingprovider nmake - all inp_dnum
inp_inc NULL
-inp i18npool\source\nativenumber nmake - all inp_natnum
inp_inc NULL
-inp i18npool\source\indexentry nmake - all inp_index
inp_inc NULL
-inp i18npool\source\indexentry\data nmake - all inp_index_data
inp_index inp_inc NULL
-inp i18npool\source\collator nmake - all inp_collator
inp_inc NULL
-inp i18npool\source\collator\data nmake - all
inp_collator_data inp_collator inp_inc NULL
-inp i18npool\source\inputchecker nmake - all
inp_inputchecker inp_inc NULL
-inp i18npool\source\textconversion nmake - all
inp_textconversion inp_inc NULL
-inp i18npool\source\textconversion\data nmake - all
inp_textconv_dict inp_textconversion inp_inc NULL
-inp i18npool\source\search nmake - all inp_search
inp_inc NULL
-inp i18npool\source\ordinalsuffix nmake - all
inp_ordinalsuffix NULL
-inp i18npool\util nmake - all inp_util
inp_brkit inp_dict inp_chclass inp_translit inp_cal inp_dnum inp_natnum
inp_localedata inp_locdata_data inp_numformat inp_rserv inp_index
inp_index_data inp_collator inp_collator_data inp_inputchecker
inp_textconversion inp_textconv_dict inp_search inp_isolang inp_paper
inp_ordinalsuffix NULL
+inp i18npool\prj nmake - all inp_prj NULL
Modified: openoffice/branches/AOO42X/main/i18npool/prj/d.lst
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/i18npool/prj/d.lst?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/i18npool/prj/d.lst (original)
+++ openoffice/branches/AOO42X/main/i18npool/prj/d.lst Thu Feb 14 14:26:57 2019
@@ -1,52 +0,0 @@
-mkdir: %_DEST%\xml%_EXT%
-..\xml\*.xml %_DEST%\xml%_EXT%\*.xml
-
-mkdir: %_DEST%\inc%_EXT%\i18npool
-
-..\inc\i18npool\*.* %_DEST%\inc%_EXT%\i18npool\*.*
-
-..\%__SRC%\bin\i18npoo*.dll %_DEST%\bin%_EXT%\i18npoo*.dll
-..\%__SRC%\lib\i18npool.uno.so %_DEST%\lib%_EXT%\i18npool.uno.so
-..\%__SRC%\lib\i18npool.uno.dylib %_DEST%\lib%_EXT%\i18npool.uno.dylib
-
-..\%__SRC%\bin\i18nsea*.dll %_DEST%\bin%_EXT%\i18nsea*.dll
-..\%__SRC%\lib\i18nsearch.uno.so %_DEST%\lib%_EXT%\i18nsearch.uno.so
-..\%__SRC%\lib\i18nsearch.uno.dylib %_DEST%\lib%_EXT%\i18nsearch.uno.dylib
-
-..\%__SRC%\bin\localedata_*.dll %_DEST%\bin%_EXT%\localedata_*.dll
-..\%__SRC%\bin\ld_*.dll %_DEST%\bin%_EXT%\ld_*.dll
-..\%__SRC%\lib\liblocaledata_*.so %_DEST%\lib%_EXT%\liblocaledata_*.so
-..\%__SRC%\lib\liblocaledata_*.dylib %_DEST%\lib%_EXT%\liblocaledata_*.dylib
-
-..\%__SRC%\bin\dict_*.dll %_DEST%\bin%_EXT%\dict_*.dll
-..\%__SRC%\lib\libdict_*.so %_DEST%\lib%_EXT%\libdict_*.so
-..\%__SRC%\lib\libdict_*.dylib %_DEST%\lib%_EXT%\libdict_*.dylib
-
-..\%__SRC%\bin\collator*.dll %_DEST%\bin%_EXT%\collator*.dll
-..\%__SRC%\lib\libcollator_data.so %_DEST%\lib%_EXT%\libcollator_data.so
-..\%__SRC%\lib\libcollator_data.dylib %_DEST%\lib%_EXT%\libcollator_data.dylib
-
-..\%__SRC%\bin\index_da*.dll %_DEST%\bin%_EXT%\index_da*.dll
-..\%__SRC%\lib\libindex_data.so %_DEST%\lib%_EXT%\libindex_data.so
-..\%__SRC%\lib\libindex_data.dylib %_DEST%\lib%_EXT%\libindex_data.dylib
-
-..\%__SRC%\bin\textconv*.dll %_DEST%\bin%_EXT%\textconv*.dll
-..\%__SRC%\lib\libtextconv_dict.so %_DEST%\lib%_EXT%\libtextconv_dict.so
-..\%__SRC%\lib\libtextconv_dict.dylib %_DEST%\lib%_EXT%\libtextconv_dict.dylib
-
-..\version.mk %_DEST%\inc%_EXT%\i18npool\version.mk
-
-..\%__SRC%\lib\ii18nisolang*.lib %_DEST%\lib%_EXT%\ii18nisolang*.lib
-..\%__SRC%\lib\i18nisolang*.lib %_DEST%\lib%_EXT%\i18nisolang*.lib
-..\%__SRC%\bin\i18nisol*.dll %_DEST%\bin%_EXT%\i18nisol*.dll
-..\%__SRC%\lib\libi18nisolang*.so %_DEST%\lib%_EXT%\libi18nisolang*.so
-..\%__SRC%\lib\libi18nisolang*.dylib %_DEST%\lib%_EXT%\libi18nisolang*.dylib
-
-..\%__SRC%\lib\ii18npaper*.lib %_DEST%\lib%_EXT%\ii18npaper*.lib
-..\%__SRC%\lib\i18npaper*.lib %_DEST%\lib%_EXT%\i18npaper*.lib
-..\%__SRC%\bin\i18npape*.dll %_DEST%\bin%_EXT%\i18npape*.dll
-..\%__SRC%\lib\libi18npaper*.so %_DEST%\lib%_EXT%\libi18npaper*.so
-..\%__SRC%\lib\libi18npaper*.dylib %_DEST%\lib%_EXT%\libi18npaper*.dylib
-
-..\%__SRC%\misc\i18npool.component %_DEST%\xml%_EXT%\i18npool.component
-..\%__SRC%\misc\i18nsearch.component %_DEST%\xml%_EXT%\i18nsearch.component
Modified:
openoffice/branches/AOO42X/main/i18npool/source/breakiterator/gendict.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/i18npool/source/breakiterator/gendict.cxx?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/i18npool/source/breakiterator/gendict.cxx
(original)
+++ openoffice/branches/AOO42X/main/i18npool/source/breakiterator/gendict.cxx
Thu Feb 14 14:26:57 2019
@@ -187,11 +187,11 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
fprintf (cfp, "\n};\n");
// create function to return arrays
- fprintf (cfp, "\tconst sal_uInt8* getExistMark() { return existMark;
}\n");
- fprintf (cfp, "\tconst sal_Int16* getIndex1() { return index1; }\n");
- fprintf (cfp, "\tconst sal_Int32* getIndex2() { return index2; }\n");
- fprintf (cfp, "\tconst sal_Int32* getLenArray() { return lenArray;
}\n");
- fprintf (cfp, "\tconst sal_Unicode* getDataArea() { return dataArea;
}\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_uInt8* getExistMark() {
return existMark; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_Int16* getIndex1() {
return index1; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_Int32* getIndex2() {
return index2; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_Int32* getLenArray() {
return lenArray; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_Unicode* getDataArea()
{ return dataArea; }\n");
fprintf (cfp, "}\n");
fclose(sfp);
Modified:
openoffice/branches/AOO42X/main/i18npool/source/breakiterator/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/i18npool/source/breakiterator/makefile.mk?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/i18npool/source/breakiterator/makefile.mk
(original)
+++ openoffice/branches/AOO42X/main/i18npool/source/breakiterator/makefile.mk
Thu Feb 14 14:26:57 2019
@@ -96,6 +96,8 @@ $(MISC)$/%_brk.c : $(MISC)$/%.brk
# so the output (OpenOffice_icu_dat.c) is changed here to include a pragma to
disable the warnings.
# Output of gencmn is redirected to OpenOffice_icu_tmp.c with the -t switch.
$(MISC)$/OpenOffice_%.c : $(MY_BRK_BRKFILES:s/.brk/_brk.c/)
+ echo $(GENCMN) -n OpenOffice -t tmp -S -d $(MISC) O $(mktmp
$(subst,$(MISC)$/, $(MY_BRK_BRKFILES:t"\n")))
+ cat $(mktmp $(subst,$(MISC)$/, $(MY_BRK_BRKFILES:t"\n")))
$(WRAPCMD) $(GENCMN) -n OpenOffice -t tmp -S -d $(MISC) O $(mktmp
$(subst,$(MISC)$/, $(MY_BRK_BRKFILES:t"\n")))
echo $(USQ)#ifdef _MSC_VER$(USQ) > $@
echo $(USQ)#pragma warning( disable : 4229 4668 )$(USQ) >> $@
Modified:
openoffice/branches/AOO42X/main/i18npool/source/collator/gencoll_rule.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/i18npool/source/collator/gencoll_rule.cxx?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/i18npool/source/collator/gencoll_rule.cxx
(original)
+++ openoffice/branches/AOO42X/main/i18npool/source/collator/gencoll_rule.cxx
Thu Feb 14 14:26:57 2019
@@ -68,7 +68,7 @@ void data_write(char* file, char* name,
}
fprintf(fp, "\n};\n\n");
- fprintf(fp, "const sal_uInt8* get_%s() { return %s; }\n\n", name, name);
+ fprintf(fp, "SAL_DLLPUBLIC_EXPORT const sal_uInt8* get_%s() { return %s;
}\n\n", name, name);
fprintf (fp, "}\n");
fclose(fp);
Modified:
openoffice/branches/AOO42X/main/i18npool/source/indexentry/genindex_data.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/i18npool/source/indexentry/genindex_data.cxx?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
---
openoffice/branches/AOO42X/main/i18npool/source/indexentry/genindex_data.cxx
(original)
+++
openoffice/branches/AOO42X/main/i18npool/source/indexentry/genindex_data.cxx
Thu Feb 14 14:26:57 2019
@@ -154,7 +154,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
fprintf(fp, "\n};\n\n");
}
- fprintf(fp, "const sal_uInt16** get_%s(sal_Int16 &max_index)\n{\n\tstatic
const sal_uInt16 *idx[]={idx1, idx2, idx3};\n\tmax_index=0x%x;\n\treturn
idx;\n}\n\n", argv[3], static_cast<unsigned int>(max_index));
+ fprintf(fp, "SAL_DLLPUBLIC_EXPORT const sal_uInt16** get_%s(sal_Int16
&max_index)\n{\n\tstatic const sal_uInt16 *idx[]={idx1, idx2,
idx3};\n\tmax_index=0x%x;\n\treturn idx;\n}\n\n", argv[3], static_cast<unsigned
int>(max_index));
fprintf (fp, "}\n");
fclose(fp);
Modified: openoffice/branches/AOO42X/main/i18npool/source/isolang/insys.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/i18npool/source/isolang/insys.cxx?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/i18npool/source/isolang/insys.cxx (original)
+++ openoffice/branches/AOO42X/main/i18npool/source/isolang/insys.cxx Thu Feb
14 14:26:57 2019
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_i18npool.hxx"
+#include "precompiled_i18nisolang.hxx"
#if defined( WNT )
Modified: openoffice/branches/AOO42X/main/i18npool/source/isolang/inunx.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/i18npool/source/isolang/inunx.cxx?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/i18npool/source/isolang/inunx.cxx (original)
+++ openoffice/branches/AOO42X/main/i18npool/source/isolang/inunx.cxx Thu Feb
14 14:26:57 2019
@@ -22,7 +22,7 @@
-// no include "precompiled_i18npool.hxx" because this file is included in
insys.cxx
+// no include "precompiled_i18nisolang.hxx" because this file is included in
insys.cxx
#include <stdlib.h> // for getenv()
#include <stdio.h>
Modified: openoffice/branches/AOO42X/main/i18npool/source/isolang/inwnt.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/i18npool/source/isolang/inwnt.cxx?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/i18npool/source/isolang/inwnt.cxx (original)
+++ openoffice/branches/AOO42X/main/i18npool/source/isolang/inwnt.cxx Thu Feb
14 14:26:57 2019
@@ -21,7 +21,7 @@
-// no include "precompiled_i18npool.hxx" because this file is included in
insys.cxx
+// no include "precompiled_i18nisolang.hxx" because this file is included in
insys.cxx
#include <sal/config.h>
Modified: openoffice/branches/AOO42X/main/i18npool/source/isolang/isolang.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/i18npool/source/isolang/isolang.cxx?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/i18npool/source/isolang/isolang.cxx
(original)
+++ openoffice/branches/AOO42X/main/i18npool/source/isolang/isolang.cxx Thu Feb
14 14:26:57 2019
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_i18npool.hxx"
+#include "precompiled_i18nisolang.hxx"
#include <rtl/ustring.hxx>
#include <rtl/string.hxx>
#include <rtl/ustrbuf.hxx>
Modified: openoffice/branches/AOO42X/main/i18npool/source/isolang/mslangid.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/i18npool/source/isolang/mslangid.cxx?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/i18npool/source/isolang/mslangid.cxx
(original)
+++ openoffice/branches/AOO42X/main/i18npool/source/isolang/mslangid.cxx Thu
Feb 14 14:26:57 2019
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_i18npool.hxx"
+#include "precompiled_i18nisolang.hxx"
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <rtl/string.hxx>
Modified:
openoffice/branches/AOO42X/main/i18npool/source/localedata/filewriter.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/i18npool/source/localedata/filewriter.cxx?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/i18npool/source/localedata/filewriter.cxx
(original)
+++ openoffice/branches/AOO42X/main/i18npool/source/localedata/filewriter.cxx
Thu Feb 14 14:26:57 2019
@@ -63,7 +63,7 @@ void OFileWriter::writeStringCharacters(
void OFileWriter::writeFunction(const char *func, const char *count, const
char *array) const
{
- fprintf(m_f, "sal_Unicode ** SAL_CALL %s%s(sal_Int16& count)\n{\n",
func, theLocale);
+ fprintf(m_f, "SAL_DLLPUBLIC_EXPORT sal_Unicode ** SAL_CALL
%s%s(sal_Int16& count)\n{\n", func, theLocale);
fprintf(m_f, "\tcount = %s;\n", count);
fprintf(m_f, "\treturn (sal_Unicode**)%s;\n}\n", array);
}
@@ -73,13 +73,13 @@ void OFileWriter::writeRefFunction(const
OString aRefLocale( OUStringToOString(useLocale,
RTL_TEXTENCODING_ASCII_US) );
const char* locale = aRefLocale.getStr();
fprintf(m_f, "extern sal_Unicode ** SAL_CALL %s%s(sal_Int16&
count);\n", func, locale);
- fprintf(m_f, "sal_Unicode ** SAL_CALL %s%s(sal_Int16& count)\n{\n",
func, theLocale);
+ fprintf(m_f, "SAL_DLLPUBLIC_EXPORT sal_Unicode ** SAL_CALL
%s%s(sal_Int16& count)\n{\n", func, theLocale);
fprintf(m_f, "\treturn %s%s(count);\n}\n", func, locale);
}
void OFileWriter::writeFunction(const char *func, const char *count, const
char *array, const char *from, const char *to) const
{
- fprintf(m_f, "sal_Unicode ** SAL_CALL %s%s(sal_Int16& count, const
sal_Unicode*& from, const sal_Unicode*& to)\n{\n", func, theLocale);
+ fprintf(m_f, "SAL_DLLPUBLIC_EXPORT sal_Unicode ** SAL_CALL
%s%s(sal_Int16& count, const sal_Unicode*& from, const sal_Unicode*& to)\n{\n",
func, theLocale);
fprintf(m_f, "\tcount = %s;\n", count);
fprintf(m_f, "\tfrom = %s;\n", from);
fprintf(m_f, "\tto = %s;\n", to);
@@ -91,7 +91,7 @@ void OFileWriter::writeRefFunction(const
OString aRefLocale( OUStringToOString(useLocale,
RTL_TEXTENCODING_ASCII_US) );
const char* locale = aRefLocale.getStr();
fprintf(m_f, "extern sal_Unicode ** SAL_CALL %s%s(sal_Int16& count,
const sal_Unicode*& from, const sal_Unicode*& to);\n", func, locale);
- fprintf(m_f, "sal_Unicode ** SAL_CALL %s%s(sal_Int16& count, const
sal_Unicode*& from, const sal_Unicode*& to)\n{\n", func, theLocale);
+ fprintf(m_f, "SAL_DLLPUBLIC_EXPORT sal_Unicode ** SAL_CALL
%s%s(sal_Int16& count, const sal_Unicode*& from, const sal_Unicode*& to)\n{\n",
func, theLocale);
fprintf(m_f, "\tto = %s;\n", to);
fprintf(m_f, "\tconst sal_Unicode* tmp;\n");
fprintf(m_f, "\treturn %s%s(count, from, tmp);\n}\n", func, locale);
@@ -99,7 +99,7 @@ void OFileWriter::writeRefFunction(const
void OFileWriter::writeFunction2(const char *func, const char *style, const
char* attr, const char *array) const
{
- fprintf(m_f, "const sal_Unicode *** SAL_CALL %s%s( sal_Int16& nStyles,
sal_Int16& nAttributes )\n{\n", func, theLocale);
+ fprintf(m_f, "SAL_DLLPUBLIC_EXPORT const sal_Unicode *** SAL_CALL
%s%s( sal_Int16& nStyles, sal_Int16& nAttributes )\n{\n", func, theLocale);
fprintf(m_f, "\tnStyles = %s;\n", style);
fprintf(m_f, "\tnAttributes = %s;\n", attr);
fprintf(m_f, "\treturn %s;\n}\n", array);
@@ -110,13 +110,13 @@ void OFileWriter::writeRefFunction2(cons
OString aRefLocale( OUStringToOString(useLocale,
RTL_TEXTENCODING_ASCII_US) );
const char* locale = aRefLocale.getStr();
fprintf(m_f, "extern const sal_Unicode *** SAL_CALL %s%s(sal_Int16&
nStyles, sal_Int16& nAttributes);\n", func, locale);
- fprintf(m_f, "const sal_Unicode *** SAL_CALL %s%s(sal_Int16& nStyles,
sal_Int16& nAttributes)\n{\n", func, theLocale);
+ fprintf(m_f, "SAL_DLLPUBLIC_EXPORT const sal_Unicode *** SAL_CALL
%s%s(sal_Int16& nStyles, sal_Int16& nAttributes)\n{\n", func, theLocale);
fprintf(m_f, "\treturn %s%s(nStyles, nAttributes);\n}\n", func, locale);
}
void OFileWriter::writeFunction3(const char *func, const char *style, const
char* levels, const char* attr, const char *array) const
{
- fprintf(m_f, "const sal_Unicode **** SAL_CALL %s%s( sal_Int16&
nStyles, sal_Int16& nLevels, sal_Int16& nAttributes )\n{\n", func, theLocale);
+ fprintf(m_f, "SAL_DLLPUBLIC_EXPORT const sal_Unicode **** SAL_CALL
%s%s( sal_Int16& nStyles, sal_Int16& nLevels, sal_Int16& nAttributes )\n{\n",
func, theLocale);
fprintf(m_f, "\tnStyles = %s;\n", style);
fprintf(m_f, "\tnLevels = %s;\n", levels);
fprintf(m_f, "\tnAttributes = %s;\n", attr);
@@ -128,7 +128,7 @@ void OFileWriter::writeRefFunction3(cons
OString aRefLocale( OUStringToOString(useLocale,
RTL_TEXTENCODING_ASCII_US) );
const char* locale = aRefLocale.getStr();
fprintf(m_f, "extern const sal_Unicode **** SAL_CALL %s%s(sal_Int16&
nStyles, sal_Int16& nLevels, sal_Int16& nAttributes);\n", func, locale);
- fprintf(m_f, "const sal_Unicode **** SAL_CALL %s%s(sal_Int16& nStyles,
sal_Int16& nLevels, sal_Int16& nAttributes)\n{\n", func, theLocale);
+ fprintf(m_f, "SAL_DLLPUBLIC_EXPORT const sal_Unicode **** SAL_CALL
%s%s(sal_Int16& nStyles, sal_Int16& nLevels, sal_Int16& nAttributes)\n{\n",
func, theLocale);
fprintf(m_f, "\treturn %s%s(nStyles, nLevels, nAttributes);\n}\n",
func, locale);
}
Modified:
openoffice/branches/AOO42X/main/i18npool/source/registerservices/registerservices.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/i18npool/source/registerservices/registerservices.cxx?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
---
openoffice/branches/AOO42X/main/i18npool/source/registerservices/registerservices.cxx
(original)
+++
openoffice/branches/AOO42X/main/i18npool/source/registerservices/registerservices.cxx
Thu Feb 14 14:26:57 2019
@@ -571,12 +571,12 @@ static const struct InstancesArray {
extern "C"
{
-void SAL_CALL component_getImplementationEnvironment( const sal_Char**
ppEnvTypeName, uno_Environment** /*ppEnv*/ )
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char** ppEnvTypeName, uno_Environment** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-void* SAL_CALL component_getFactory( const sal_Char* sImplementationName,
void* _pServiceManager, void* /*_pRegistryKey*/ )
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char*
sImplementationName, void* _pServiceManager, void* /*_pRegistryKey*/ )
{
void* pRet = NULL;
Modified: openoffice/branches/AOO42X/main/i18npool/source/search/levdis.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/i18npool/source/search/levdis.cxx?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/i18npool/source/search/levdis.cxx (original)
+++ openoffice/branches/AOO42X/main/i18npool/source/search/levdis.cxx Thu Feb
14 14:26:57 2019
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_i18npool.hxx"
+#include "precompiled_search.hxx"
/*************************************************************************
Weighted Levenshtein Distance
Modified: openoffice/branches/AOO42X/main/i18npool/source/search/textsearch.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/i18npool/source/search/textsearch.cxx?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/i18npool/source/search/textsearch.cxx
(original)
+++ openoffice/branches/AOO42X/main/i18npool/source/search/textsearch.cxx Thu
Feb 14 14:26:57 2019
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_i18npool.hxx"
+#include "precompiled_search.hxx"
#include "textsearch.hxx"
#include "levdis.hxx"
@@ -1007,13 +1007,13 @@ SAL_CALL TextSearch_CreateInstance(
extern "C"
{
-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;
}
-void* SAL_CALL component_getFactory( const sal_Char* sImplementationName,
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_Char*
sImplementationName,
void* _pServiceManager, void* /*_pRegistryKey*/ )
{
void* pRet = NULL;
Modified:
openoffice/branches/AOO42X/main/i18npool/source/textconversion/genconv_dict.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/i18npool/source/textconversion/genconv_dict.cxx?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
---
openoffice/branches/AOO42X/main/i18npool/source/textconversion/genconv_dict.cxx
(original)
+++
openoffice/branches/AOO42X/main/i18npool/source/textconversion/genconv_dict.cxx
Thu Feb 14 14:26:57 2019
@@ -171,11 +171,11 @@ void make_hhc_char(FILE *sfp, FILE *cfp)
fprintf(cfp, "\n};\n");
// create function to return arrays
- fprintf (cfp, "\tconst sal_Unicode* getHangul2HanjaData() { return
Hangul2HanjaData; }\n");
- fprintf (cfp, "\tconst com::sun::star::i18n::Hangul_Index*
getHangul2HanjaIndex() { return Hangul2HanjaIndex; }\n");
- fprintf (cfp, "\tsal_Int16 getHangul2HanjaIndexCount() { return
sizeof(Hangul2HanjaIndex) / sizeof(com::sun::star::i18n::Hangul_Index); }\n");
- fprintf (cfp, "\tconst sal_uInt16* getHanja2HangulIndex() { return
Hanja2HangulIndex; }\n");
- fprintf (cfp, "\tconst sal_Unicode* getHanja2HangulData() { return
Hanja2HangulData; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_Unicode*
getHangul2HanjaData() { return Hangul2HanjaData; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const
com::sun::star::i18n::Hangul_Index* getHangul2HanjaIndex() { return
Hangul2HanjaIndex; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT sal_Int16
getHangul2HanjaIndexCount() { return sizeof(Hangul2HanjaIndex) /
sizeof(com::sun::star::i18n::Hangul_Index); }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_uInt16*
getHanja2HangulIndex() { return Hanja2HangulIndex; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_Unicode*
getHanja2HangulData() { return Hanja2HangulData; }\n");
}
// Simplified/Traditional Chinese character conversion
@@ -321,12 +321,12 @@ void make_stc_char(FILE *sfp, FILE *cfp)
fprintf(cfp, "\n};\n");
// create function to return arrays
- fprintf (cfp, "\tconst sal_uInt16* getSTC_CharIndex_S2T() { return
STC_CharIndex_S2T; }\n");
- fprintf (cfp, "\tconst sal_Unicode* getSTC_CharData_S2T() { return
STC_CharData_S2T; }\n");
- fprintf (cfp, "\tconst sal_uInt16* getSTC_CharIndex_S2V() { return
STC_CharIndex_S2V; }\n");
- fprintf (cfp, "\tconst sal_Unicode* getSTC_CharData_S2V() { return
STC_CharData_S2V; }\n");
- fprintf (cfp, "\tconst sal_uInt16* getSTC_CharIndex_T2S() { return
STC_CharIndex_T2S; }\n");
- fprintf (cfp, "\tconst sal_Unicode* getSTC_CharData_T2S() { return
STC_CharData_T2S; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_uInt16*
getSTC_CharIndex_S2T() { return STC_CharIndex_S2T; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_Unicode*
getSTC_CharData_S2T() { return STC_CharData_S2T; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_uInt16*
getSTC_CharIndex_S2V() { return STC_CharIndex_S2V; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_Unicode*
getSTC_CharData_S2V() { return STC_CharData_S2V; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_uInt16*
getSTC_CharIndex_T2S() { return STC_CharIndex_T2S; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_Unicode*
getSTC_CharData_T2S() { return STC_CharData_T2S; }\n");
}
@@ -403,9 +403,9 @@ void make_stc_word(FILE *sfp, FILE *cfp)
fprintf(cfp, "\nstatic sal_Int32 STC_WordData_Count = %ld;\n",
sal::static_int_cast< long >(char_total));
// create function to return arrays
- fprintf (cfp, "\tconst sal_Unicode* getSTC_WordData(sal_Int32& count)
{ count = STC_WordData_Count; return STC_WordData; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_Unicode*
getSTC_WordData(sal_Int32& count) { count = STC_WordData_Count; return
STC_WordData; }\n");
} else {
- fprintf (cfp, "\tconst sal_Unicode* getSTC_WordData(sal_Int32& count)
{ count = 0; return NULL; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_Unicode*
getSTC_WordData(sal_Int32& count) { count = 0; return NULL; }\n");
}
sal_uInt16 STC_WordIndex[0x100];
@@ -436,11 +436,11 @@ void make_stc_word(FILE *sfp, FILE *cfp)
fprintf(cfp, "\n};\n");
fprintf(cfp, "\nstatic sal_Int32 STC_WordIndex_S2T_Count = %ld;\n",
sal::static_int_cast< long >(length));
- fprintf (cfp, "\tconst sal_uInt16* getSTC_WordEntry_S2T() { return
STC_WordEntry_S2T; }\n");
- fprintf (cfp, "\tconst sal_uInt16* getSTC_WordIndex_S2T(sal_Int32&
count) { count = STC_WordIndex_S2T_Count; return STC_WordIndex_S2T; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_uInt16*
getSTC_WordEntry_S2T() { return STC_WordEntry_S2T; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_uInt16*
getSTC_WordIndex_S2T(sal_Int32& count) { count = STC_WordIndex_S2T_Count;
return STC_WordIndex_S2T; }\n");
} else {
- fprintf (cfp, "\tconst sal_uInt16* getSTC_WordEntry_S2T() { return
NULL; }\n");
- fprintf (cfp, "\tconst sal_uInt16* getSTC_WordIndex_S2T(sal_Int32&
count) { count = 0; return NULL; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_uInt16*
getSTC_WordEntry_S2T() { return NULL; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_uInt16*
getSTC_WordIndex_S2T(sal_Int32& count) { count = 0; return NULL; }\n");
}
if (count_T2S > 0) {
@@ -469,11 +469,11 @@ void make_stc_word(FILE *sfp, FILE *cfp)
fprintf(cfp, "\n};\n");
fprintf(cfp, "\nstatic sal_Int32 STC_WordIndex_T2S_Count = %ld;\n\n",
sal::static_int_cast< long >(length));
- fprintf (cfp, "\tconst sal_uInt16* getSTC_WordEntry_T2S() { return
STC_WordEntry_T2S; }\n");
- fprintf (cfp, "\tconst sal_uInt16* getSTC_WordIndex_T2S(sal_Int32&
count) { count = STC_WordIndex_T2S_Count; return STC_WordIndex_T2S; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_uInt16*
getSTC_WordEntry_T2S() { return STC_WordEntry_T2S; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_uInt16*
getSTC_WordIndex_T2S(sal_Int32& count) { count = STC_WordIndex_T2S_Count;
return STC_WordIndex_T2S; }\n");
} else {
- fprintf (cfp, "\tconst sal_uInt16* getSTC_WordEntry_T2S() { return
NULL; }\n");
- fprintf (cfp, "\tconst sal_uInt16* getSTC_WordIndex_T2S(sal_Int32&
count) { count = 0; return NULL; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_uInt16*
getSTC_WordEntry_T2S() { return NULL; }\n");
+ fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_uInt16*
getSTC_WordIndex_T2S(sal_Int32& count) { count = 0; return NULL; }\n");
}
}
Modified: openoffice/branches/AOO42X/main/icu/icuversion.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/icu/icuversion.mk?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/icu/icuversion.mk (original)
+++ openoffice/branches/AOO42X/main/icu/icuversion.mk Thu Feb 14 14:26:57 2019
@@ -21,9 +21,9 @@
# major
-ICU_MAJOR*=4
+ICU_MAJOR=4
# minor
-ICU_MINOR*=0
+ICU_MINOR=0
# micro
-ICU_MICRO*=1
+ICU_MICRO=1
Modified: openoffice/branches/AOO42X/main/lingucomponent/Library_spell.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/lingucomponent/Library_spell.mk?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/lingucomponent/Library_spell.mk (original)
+++ openoffice/branches/AOO42X/main/lingucomponent/Library_spell.mk Thu Feb 14
14:26:57 2019
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_add_linked_libs
cppu \
cppuhelper \
i18nisolang1 \
- icuuc \
lng \
sal \
stl \
@@ -58,9 +57,10 @@ $(eval $(call gb_Library_add_linked_stat
ulingu \
))
-$(eval $(call gb_Library_use_externals,spell,\
+$(call gb_Library_use_externals,spell,\
hunspell \
-))
+ icuuc \
+)
ifneq ($(OS),MACOSX)
$(eval $(call gb_Library_add_exception_objects,spell,\
Modified: openoffice/branches/AOO42X/main/postprocess/packcomponents/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/postprocess/packcomponents/makefile.mk?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/postprocess/packcomponents/makefile.mk
(original)
+++ openoffice/branches/AOO42X/main/postprocess/packcomponents/makefile.mk Thu
Feb 14 14:26:57 2019
@@ -82,6 +82,8 @@ my_components = \
component/framework/util/fwk \
component/framework/util/fwl \
component/framework/util/fwm \
+ component/i18npool/util/i18npool \
+ component/i18npool/source/search/i18nsearch \
component/io/source/acceptor/acceptor \
component/io/source/connector/connector \
component/io/source/stm/streams \
@@ -159,8 +161,6 @@ my_components = \
flash \
flat \
frm \
- i18npool \
- i18nsearch \
localebe1 \
log \
mailmerge \
Modified: openoffice/branches/AOO42X/main/solenv/gbuild/Executable.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/gbuild/Executable.mk?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/gbuild/Executable.mk (original)
+++ openoffice/branches/AOO42X/main/solenv/gbuild/Executable.mk Thu Feb 14
14:26:57 2019
@@ -73,6 +73,7 @@ $(eval $(foreach method,\
add_objcxxobjects \
add_exception_objects \
add_noexception_objects \
+ add_generated_cobjects \
add_generated_exception_objects \
set_yaccflags \
add_cflags \
Modified: openoffice/branches/AOO42X/main/solenv/gbuild/Library.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/gbuild/Library.mk?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/gbuild/Library.mk (original)
+++ openoffice/branches/AOO42X/main/solenv/gbuild/Library.mk Thu Feb 14
14:26:57 2019
@@ -117,6 +117,8 @@ $(eval $(foreach method,\
add_objcxxobjects \
add_exception_objects \
add_noexception_objects \
+ add_generated_cobject \
+ add_generated_cobjects \
add_generated_exception_objects \
set_yaccflags \
add_cflags \
Modified: openoffice/branches/AOO42X/main/solenv/gbuild/LinkTarget.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/gbuild/LinkTarget.mk?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/gbuild/LinkTarget.mk (original)
+++ openoffice/branches/AOO42X/main/solenv/gbuild/LinkTarget.mk Thu Feb 14
14:26:57 2019
@@ -107,6 +107,26 @@ $(call gb_CObject_get_dep_target,%) :
gb_CObject_CObject =
+# GenCObject class
+
+gb_GenCObject_get_source = $(WORKDIR)/$(1).c
+# defined by platform
+# gb_CObject__command
+
+$(call gb_GenCObject_get_target,%) : $(call gb_GenCObject_get_source,%)
+ $(call gb_CObject__command,$@,$*,$<,$(call
gb_GenCObject_get_dep_target,$*))
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_GenCObject_get_dep_target,%) : $(call gb_GenCObject_get_target,%)
+ $(if $(wildcard $@),touch $@,\
+ $(call gb_Object__command_dep,$@,$(call gb_GenCObject_get_target,$*)))
+endif
+
+gb_GenCObject_GenCObject =
+
+
+
+
# CxxObject class
gb_CxxObject_REPOS := $(gb_REPOS)
@@ -237,6 +257,8 @@ $(call gb_LinkTarget_get_clean_target,%)
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_dep_target,$(object))) \
$(foreach object,$(OBJCXXOBJECTS),$(call
gb_ObjCxxObject_get_target,$(object))) \
$(foreach object,$(OBJCXXOBJECTS),$(call
gb_ObjCxxObject_get_dep_target,$(object))) \
+ $(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
+ $(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_dep_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_dep_target,$(object))) \
$(call gb_LinkTarget_get_target,$*) \
@@ -258,7 +280,8 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(3),$(call
gb_CObject_get_dep_target,$(object))) \
$(foreach object,$(4),$(call
gb_CxxObject_get_dep_target,$(object))) \
$(foreach object,$(5),$(call
gb_ObjCxxObject_get_dep_target,$(object)))\
- $(foreach object,$(6),$(call
gb_GenCxxObject_get_dep_target,$(object)))\
+ $(foreach object,$(6),$(call
gb_GenCObject_get_dep_target,$(object)))\
+ $(foreach object,$(7),$(call
gb_GenCxxObject_get_dep_target,$(object)))\
) && \
cat $${RESPONSEFILE} /dev/null | xargs -n 200 cat > $(1)) && \
rm -f $${RESPONSEFILE}
@@ -271,7 +294,7 @@ $(call gb_LinkTarget_get_target,%) : $(c
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_target,%) : $(call gb_LinkTarget_get_dep_target,%)
$(call gb_LinkTarget_get_dep_target,%) : | $(call
gb_LinkTarget_get_headers_target,%)
- $(call
gb_LinkTarget__command_dep,$@,$*,$(COBJECTS),$(CXXOBJECTS),$(OBJCXXOBJECTS),$(GENCXXOBJECTS))
+ $(call
gb_LinkTarget__command_dep,$@,$*,$(COBJECTS),$(CXXOBJECTS),$(OBJCXXOBJECTS),$(GENCOBJECTS),$(GENCXXOBJECTS))
endif
# Ok, this is some dark voodoo: When declaring a linktarget with
@@ -351,6 +374,8 @@ $(call gb_LinkTarget_get_target,$(1)) :
$(call gb_LinkTarget_get_clean_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : OBJCXXOBJECTS :=
$(call gb_LinkTarget_get_clean_target,$(1)) \
+$(call gb_LinkTarget_get_target,$(1)) : GENCOBJECTS :=
+$(call gb_LinkTarget_get_clean_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS :=
$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS)
@@ -386,6 +411,7 @@ ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : COBJECTS :=
$(call gb_LinkTarget_get_dep_target,$(1)) : CXXOBJECTS :=
$(call gb_LinkTarget_get_dep_target,$(1)) : OBJCXXOBJECTS :=
+$(call gb_LinkTarget_get_dep_target,$(1)) : GENCOBJECTS :=
$(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS :=
$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS :=
$$(gb_LinkTarget_CFLAGS)
$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS :=
$$(gb_LinkTarget_CXXFLAGS)
@@ -507,6 +533,10 @@ define gb_LinkTarget_set_cxx_optimizatio
$(foreach object,$(1),$(eval $(call gb_CxxObject_get_target,$(object)) :
CXXFLAGS := $(filter-out $(gb_COMPILEROPTFLAGS),$(CXXFLAGS)) $(2)))
endef
+define gb_LinkTarget_set_genc_optimization
+$(foreach object,$(1),$(eval $(call gb_GenCObject_get_target,$(object)) :
CFLAGS := $(filter-out $(gb_COMPILEROPTFLAGS),$(CFLAGS)) $(2)))
+endef
+
define gb_LinkTarget_set_gencxx_optimization
$(foreach object,$(1),$(eval $(call gb_GenCxxObject_get_target,$(object)) :
CXXFLAGS := $(filter-out $(gb_COMPILEROPTFLAGS),$(CXXFLAGS)) $(2)))
endef
@@ -799,6 +829,21 @@ endif
endef
+define gb_LinkTarget_add_generated_cobject
+$(call gb_LinkTarget_get_target,$(1)) : GENCOBJECTS += $(2)
+$(call gb_LinkTarget_get_clean_target,$(1)) : GENCOBJECTS += $(2)
+
+$(call gb_LinkTarget_get_target,$(1)) : $(call gb_GenCObject_get_target,$(2))
+$(call gb_GenCObject_get_source,$(2)) : | $(call
gb_LinkTarget_get_headers_target,$(1))
+$(call gb_GenCObject_get_target,$(2)) : T_CFLAGS += $(3)
+
+ifeq ($(gb_FULLDEPS),$(true))
+$(call gb_LinkTarget_get_dep_target,$(1)) : GENCOBJECTS += $(2)
+$(call gb_LinkTarget_get_dep_target,$(1)) : $(call
gb_GenCObject_get_dep_target,$(2))
+endif
+
+endef
+
define gb_LinkTarget_add_generated_cxx_object
$(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS += $(2)
$(call gb_LinkTarget_get_clean_target,$(1)) : GENCXXOBJECTS += $(2)
@@ -846,6 +891,10 @@ define gb_LinkTarget_add_exception_objec
$(foreach obj,$(2),$(call gb_LinkTarget_add_exception_object,$(1),$(obj)))
endef
+define gb_LinkTarget_add_generated_cobjects
+$(foreach obj,$(2),$(call
gb_Linktarget_add_generated_cobject,$(1),$(obj),$(3)))
+endef
+
define gb_LinkTarget_add_generated_exception_object
$(call
gb_LinkTarget_add_generated_cxx_object,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS))
endef
Modified: openoffice/branches/AOO42X/main/solenv/gbuild/StaticLibrary.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/gbuild/StaticLibrary.mk?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/gbuild/StaticLibrary.mk (original)
+++ openoffice/branches/AOO42X/main/solenv/gbuild/StaticLibrary.mk Thu Feb 14
14:26:57 2019
@@ -84,6 +84,7 @@ $(eval $(foreach method,\
add_objcxxobjects \
add_exception_objects \
add_noexception_objects \
+ add_generated_cobjects \
add_generated_exception_objects \
add_cflags \
set_cflags \
Modified: openoffice/branches/AOO42X/main/solenv/gbuild/TargetLocations.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/gbuild/TargetLocations.mk?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/gbuild/TargetLocations.mk (original)
+++ openoffice/branches/AOO42X/main/solenv/gbuild/TargetLocations.mk Thu Feb 14
14:26:57 2019
@@ -55,6 +55,7 @@ gb_CustomTarget_get_repo_target = $(WORK
gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done
gb_CustomTarget_get_workdir = $(WORKDIR)/CustomTarget/$(1)
gb_CxxObject_get_target = $(WORKDIR)/CxxObject/$(1).o
+gb_GenCObject_get_target = $(WORKDIR)/GenCObject/$(1).o
gb_GenCxxObject_get_target = $(WORKDIR)/GenCxxObject/$(1).o
gb_Executable_get_external_headers_target =
$(WORKDIR)/ExternalHeaders/Executable/$(1)
gb_Executable_get_headers_target = $(WORKDIR)/Headers/Executable/$(1)
@@ -147,6 +148,7 @@ $(eval $(call gb_Helper_make_dep_targets
CObject \
CxxObject \
ObjCxxObject \
+ GenCObject \
GenCxxObject \
LinkTarget \
SrsPartTarget \
Modified: openoffice/branches/AOO42X/main/solenv/gbuild/platform/freebsd.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/gbuild/platform/freebsd.mk?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/gbuild/platform/freebsd.mk (original)
+++ openoffice/branches/AOO42X/main/solenv/gbuild/platform/freebsd.mk Thu Feb
14 14:26:57 2019
@@ -293,6 +293,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(ASMOBJECTS),$(call
gb_AsmObject_get_target,$(object))) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
+ $(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
-Wl$(COMMA)--start-group $(foreach
lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib)))
-Wl$(COMMA)--end-group \
$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call
gb_Library_get_filename,$(lib)))) \
@@ -313,6 +314,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(gb_AR) -rsu $(1) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
+ $(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
2> /dev/null)
endef
@@ -419,6 +421,9 @@ gb_StaticLibrary_StaticLibrary_platform
gb_Executable_EXT :=
+gb_InBuild_Library_Path := $(OUTDIR)/lib
+gb_Augment_Library_Path := LD_LIBRARY_PATH=$(gb_InBuild_Library_Path)
+
gb_Executable_LAYER := \
$(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
$(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
Modified: openoffice/branches/AOO42X/main/solenv/gbuild/platform/linux.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/gbuild/platform/linux.mk?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/gbuild/platform/linux.mk (original)
+++ openoffice/branches/AOO42X/main/solenv/gbuild/platform/linux.mk Thu Feb 14
14:26:57 2019
@@ -269,6 +269,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(ASMOBJECTS),$(call
gb_AsmObject_get_target,$(object))) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
+ $(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
-Wl$(COMMA)--start-group $(foreach
lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib)))
-Wl$(COMMA)--end-group \
$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call
gb_Library_get_filename,$(lib)))) \
@@ -290,6 +291,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(gb_AR) -rsu $(1) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
+ $(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
2> /dev/null)
endef
@@ -395,6 +397,9 @@ gb_StaticLibrary_StaticLibrary_platform
gb_Executable_EXT :=
+gb_InBuild_Library_Path := $(OUTDIR)/lib
+gb_Augment_Library_Path := LD_LIBRARY_PATH=$(gb_InBuild_Library_Path)
+
gb_Executable_LAYER := \
$(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
$(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
Modified: openoffice/branches/AOO42X/main/solenv/gbuild/platform/macosx.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/gbuild/platform/macosx.mk?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/gbuild/platform/macosx.mk (original)
+++ openoffice/branches/AOO42X/main/solenv/gbuild/platform/macosx.mk Thu Feb 14
14:26:57 2019
@@ -311,6 +311,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
$(foreach object,$(OBJCXXOBJECTS),$(call
gb_ObjCxxObject_get_target,$(object))) \
+ $(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call
gb_StaticLibrary_get_target,$(lib))) \
$(LIBS) \
@@ -330,6 +331,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
$(foreach object,$(OBJCXXOBJECTS),$(call
gb_ObjCxxObject_get_target,$(object))) \
+ $(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
2> /dev/null)
endef
@@ -419,6 +421,9 @@ gb_StaticLibrary_StaticLibrary_platform
gb_Executable_EXT :=
gb_Executable_TARGETTYPEFLAGS := -bind_at_load
+gb_InBuild_Library_Path := $(OUTDIR)/lib
+gb_Augment_Library_Path := DYLD_LIBRARY_PATH=$(gb_InBuild_Library_Path)
+
gb_Executable_LAYER := \
$(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
$(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
Modified: openoffice/branches/AOO42X/main/solenv/gbuild/platform/os2.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/gbuild/platform/os2.mk?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/gbuild/platform/os2.mk (original)
+++ openoffice/branches/AOO42X/main/solenv/gbuild/platform/os2.mk Thu Feb 14
14:26:57 2019
@@ -335,6 +335,7 @@ $(call gb_Helper_abbreviate_dirs_native,
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
+ $(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(ASMOBJECTS),$(call
gb_AsmObject_get_target,$(object))) \
$(PCHOBJS))) && \
$(if $(DLLTARGET), echo EXPORTS >> $(DLLDEF) &&) \
@@ -365,6 +366,7 @@ $(call gb_Helper_abbreviate_dirs_native,
RESPONSEFILE=`$(gb_MKTEMP)` && \
echo "$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
+ $(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) " > $${RESPONSEFILE} && \
$(gb_AR) cru\
$(1) \
@@ -515,6 +517,9 @@ gb_Executable_TARGETTYPEFLAGS :=
#-RELEASE -BASE:0x1b000000 -OPT:NOREF -INCREMENTAL:NO -DEBUG
gb_Executable_get_rpath :=
+gb_InBuild_Library_Path := $(OUTDIR)/bin
+gb_Augment_Library_Path := PATH="$${PATH}:$(gb_InBuild_Library_Path)"
+
define gb_Executable_Executable_platform
#$(call gb_LinkTarget_set_auxtargets,$(2),\
# $(patsubst %.exe,%.pdb,$(call gb_LinkTarget_get_target,$(2))) \
Modified: openoffice/branches/AOO42X/main/solenv/gbuild/platform/solaris.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/gbuild/platform/solaris.mk?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/gbuild/platform/solaris.mk (original)
+++ openoffice/branches/AOO42X/main/solenv/gbuild/platform/solaris.mk Thu Feb
14 14:26:57 2019
@@ -235,6 +235,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach object,$(ASMOBJECTS),$(call
gb_AsmObject_get_target,$(object))) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
+ $(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
$(foreach lib,$(LINKED_STATIC_LIBS),$(call
gb_StaticLibrary_get_target,$(lib))) \
$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call
gb_Library_get_filename,$(lib)))) \
@@ -255,6 +256,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(gb_AR) -rsu $(1) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
+ $(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
2> /dev/null)
endef
@@ -363,6 +365,9 @@ gb_StaticLibrary_StaticLibrary_platform
gb_Executable_EXT :=
+gb_InBuild_Library_Path := $(OUTDIR)/lib
+gb_Augment_Library_Path := LD_LIBRARY_PATH=$(gb_InBuild_Library_Path)
+
gb_Executable_LAYER := \
$(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
$(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
Modified: openoffice/branches/AOO42X/main/solenv/gbuild/platform/windows.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/gbuild/platform/windows.mk?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/gbuild/platform/windows.mk (original)
+++ openoffice/branches/AOO42X/main/solenv/gbuild/platform/windows.mk Thu Feb
14 14:26:57 2019
@@ -457,6 +457,7 @@ $(call gb_Helper_abbreviate_dirs_native,
$(call gb_Helper_convert_native,\
$(foreach object,$(ASMOBJECTS),$(call
gb_AsmObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
+ $(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(PCHOBJS) $(NATIVERES))) && \
@@ -664,6 +665,9 @@ endif
gb_Executable_get_rpath :=
gb_Executable_TARGETGUI :=
+gb_InBuild_Library_Path := $(OUTDIR)/bin
+gb_Augment_Library_Path := PATH="$${PATH}:$(gb_InBuild_Library_Path)"
+
define gb_Executable_Executable_platform
$(call gb_LinkTarget_set_auxtargets,$(2),\
$(patsubst %.exe,%.pdb,$(call gb_LinkTarget_get_target,$(2))) \
Modified: openoffice/branches/AOO42X/main/solenv/gbuild/platform/winmingw.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/solenv/gbuild/platform/winmingw.mk?rev=1853583&r1=1853582&r2=1853583&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/solenv/gbuild/platform/winmingw.mk
(original)
+++ openoffice/branches/AOO42X/main/solenv/gbuild/platform/winmingw.mk Thu Feb
14 14:26:57 2019
@@ -400,6 +400,7 @@ $(call gb_Helper_abbreviate_dirs_native,
mkdir -p $(dir $(1)) && \
RESPONSEFILE=`$(gb_MKTEMP)` && \
echo "$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
+ $(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(NATIVERES) " > $${RESPONSEFILE} && \
@@ -427,6 +428,7 @@ $(call gb_Helper_abbreviate_dirs_native,
echo "\
$(foreach object,$(ASMXXOBJECTS),$(call
gb_AsmObject_get_target,$(object))) \
$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
+ $(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) \
$(NATIVERES) " > $${RESPONSEFILE} && \
@@ -452,6 +454,7 @@ $(call gb_Helper_abbreviate_dirs_native,
RESPONSEFILE=`$(gb_MKTEMP)` && \
echo "$(foreach object,$(CXXOBJECTS),$(call
gb_CxxObject_get_target,$(object))) \
$(foreach object,$(GENCXXOBJECTS),$(call
gb_GenCxxObject_get_target,$(object))) \
+ $(foreach object,$(GENCOBJECTS),$(call
gb_GenCObject_get_target,$(object))) \
$(foreach object,$(COBJECTS),$(call
gb_CObject_get_target,$(object))) " > $${RESPONSEFILE} && \
$(gb_AR) -rsu\
$(1) \
@@ -616,6 +619,9 @@ gb_Executable_get_rpath :=
gb_Executable_Executable_platform =
gb_Executable_TARGETGUI :=
+gb_InBuild_Library_Path := $(OUTDIR)/bin
+gb_Augment_Library_Path := PATH="$${PATH}:$(gb_InBuild_Library_Path)"
+
# GoogleTest class
gb_GoogleTest_GTESTPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
