Author: ydario
Date: Thu Dec 14 13:50:08 2017
New Revision: 1818128
URL: http://svn.apache.org/viewvc?rev=1818128&view=rev
Log:
#i126518# OS/2 build system updates: use full names for slideshow and
sysdtrans, remove unneeded libraries, use standard toolkit path, fix DLL short
names, disable libs for coin-or.
Modified:
openoffice/trunk/main/RepositoryExternal.mk
openoffice/trunk/main/RepositoryFixes.mk
openoffice/trunk/main/dtrans/Library_sysdtrans_os2.mk
openoffice/trunk/main/embeddedobj/Library_emboleobj.mk
openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
openoffice/trunk/main/set_soenv.in
openoffice/trunk/main/slideshow/Library_slideshow.mk
openoffice/trunk/main/solenv/inc/libs.mk
openoffice/trunk/main/vcl/Library_vcl.mk
openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/makefile.mk
Modified: openoffice/trunk/main/RepositoryExternal.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/RepositoryExternal.mk?rev=1818128&r1=1818127&r2=1818128&view=diff
==============================================================================
--- openoffice/trunk/main/RepositoryExternal.mk (original)
+++ openoffice/trunk/main/RepositoryExternal.mk Thu Dec 14 13:50:08 2017
@@ -535,6 +535,7 @@ $(call gb_LinkTarget_set_include,$(1),\
)
$(call gb_LinkTarget_add_linked_libs,$(1),CoinMP)
ifneq ($(OS),WNT)
+ifneq ($(OS),OS2)
$(call gb_LinkTarget_add_linked_libs,$(1),\
CoinUtils \
Clp \
@@ -545,6 +546,7 @@ $(call gb_LinkTarget_add_linked_libs,$(1
CbcSolver \
)
endif
+endif
endef
endif # SYSTEM_COINMP
Modified: openoffice/trunk/main/RepositoryFixes.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/RepositoryFixes.mk?rev=1818128&r1=1818127&r2=1818128&view=diff
==============================================================================
--- openoffice/trunk/main/RepositoryFixes.mk (original)
+++ openoffice/trunk/main/RepositoryFixes.mk Thu Dec 14 13:50:08 2017
@@ -188,7 +188,7 @@ gb_Library_FILENAMES := $(patsubst cui:i
gb_Library_FILENAMES := $(patsubst
i18nisolang1:i18nisolang1%,i18nisolang1:i18nisolang1gcc3%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
jvmaccess:jvmaccess%,jvmaccess:jvmaccess3gcc3%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
jvmfwk:jvmfwk%,jvmfwk:jvmfwk3%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
rdf:rdf%,rdf:librdf%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst reg:reg%,reg:reg3%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst tl:itl%,tl:tl%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst sal:sal%,sal:sal3%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
salhelper:salhelper%,salhelper:salhelp3%,$(gb_Library_FILENAMES))
@@ -207,15 +207,35 @@ gb_Library_FILENAMES := $(patsubst stl:s
gb_Library_DLLFILENAMES := $(patsubst
sw:sw%,sw:swoo%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
drawinglayer:drawinglayer%,drawinglayer:drawingl%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst
fsstorage:fsstorage.uno%,fsstorage:fsstorag%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst
hatchwindowfactory:hatchwindowfactory.uno%,hatchwindowfactory:hatchwin%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
fsstorage:fsstorage%,fsstorage:fsstorag%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
hatchwindowfactory:hatchwindowfactory%,hatchwindowfactory:hatchwin%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
msforms:msforms.uno%,msforms:msforms%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst
passwordcontainer:passwordcontainer.uno%,passwordcontainer:password%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
passwordcontainer:passwordcontainer%,passwordcontainer:password%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
productregistration:productregistration.uno%,productregistration:productr%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
textconversiondlgs:textconversiondlgs%,textconversiondlgs:txcnvdlg%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
vbahelper:vbahelper%,vbahelper:vbahelp%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
vbaswobj:vbaswobj.uno%,vbaswobj:vbaswobj%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
sfx:test_sfx2_metadatable%,sfx:tstsfx2m%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
xmlreader:xmlreader%,xmlreader:xmlreade%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
ucbhelper:ucbhelper%,ucbhelper:ucbhelp%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
cppcanvas:cppcanvas%,cppcanvas:cppcanva%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
canvasfactory:canvasfactory%,canvasfactory:canvasfa%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
canvastools:canvastools%,canvastools:canvasto%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
cairocanvas:cairocanvas%,cairocanvas:cairocnv%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
simplecanvas:simplecanvas%,simplecanvas:simpleca%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
vclcanvas:vclcanvas%,vclcanvas:vclcanva%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
writerfilter:writerfilter%,writerfilter:wfilt%,$(gb_Library_DLLFILENAMES))
+
+gb_Library_DLLFILENAMES := $(patsubst
connector:connector%,connector:connecto%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
configmgr:configmgr%,configmgr:configmg%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
emboleobj:emboleobj%,emboleobj:emboleob%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
fps_office:fps_office%,fps_office:fps_offi%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
textinstream:textinstream%,textinstream:textouts%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
textoutstream:textoutstream%,textoutstream:textouts%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
sysdtrans:sysdtrans%,sysdtrans:sysdtran%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
slideshow:slideshow%,slideshow:slidesho%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
uuresolver:uuresolver%,uuresolver:uuresolv%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
ucpexpand1:ucpexpand1%,ucpexpand1:ucpexpan%,$(gb_Library_DLLFILENAMES))
gb_Library_NOILIBFILENAMES:=\
ft2lib \
Modified: openoffice/trunk/main/dtrans/Library_sysdtrans_os2.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/Library_sysdtrans_os2.mk?rev=1818128&r1=1818127&r2=1818128&view=diff
==============================================================================
--- openoffice/trunk/main/dtrans/Library_sysdtrans_os2.mk (original)
+++ openoffice/trunk/main/dtrans/Library_sysdtrans_os2.mk Thu Dec 14 13:50:08
2017
@@ -21,23 +21,23 @@
-$(eval $(call gb_Library_Library,sysdtran))
+$(eval $(call gb_Library_Library,sysdtrans))
-$(eval $(call
gb_Library_add_precompiled_header,sysdtran,$(SRCDIR)/dtrans/inc/pch/precompiled_dtrans))
+$(eval $(call
gb_Library_add_precompiled_header,sysdtrans,$(SRCDIR)/dtrans/inc/pch/precompiled_dtrans))
-$(eval $(call gb_Library_set_componentfile,sysdtran,dtrans/util/sysdtrans))
+$(eval $(call gb_Library_set_componentfile,sysdtrans,dtrans/util/sysdtrans))
-$(eval $(call gb_Library_set_include,sysdtran,\
+$(eval $(call gb_Library_set_include,sysdtrans,\
$$(INCLUDE) \
-I$(SRCDIR)/dtrans/inc/pch \
))
-$(eval $(call gb_Library_add_api,sysdtran,\
+$(eval $(call gb_Library_add_api,sysdtrans,\
offapi \
udkapi \
))
-$(eval $(call gb_Library_add_linked_libs,sysdtran,\
+$(eval $(call gb_Library_add_linked_libs,sysdtrans,\
cppuhelper \
cppu \
sal \
@@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
-$(eval $(call gb_Library_add_exception_objects,sysdtran,\
+$(eval $(call gb_Library_add_exception_objects,sysdtrans,\
dtrans/source/os2/clipb/Os2Clipboard \
dtrans/source/os2/clipb/Os2Bitmap \
dtrans/source/os2/clipb/Os2Service \
Modified: openoffice/trunk/main/embeddedobj/Library_emboleobj.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/embeddedobj/Library_emboleobj.mk?rev=1818128&r1=1818127&r2=1818128&view=diff
==============================================================================
--- openoffice/trunk/main/embeddedobj/Library_emboleobj.mk (original)
+++ openoffice/trunk/main/embeddedobj/Library_emboleobj.mk Thu Dec 14 13:50:08
2017
@@ -64,11 +64,6 @@ $(eval $(call gb_Library_add_linked_libs
))
else ifeq ($(OS),OS2)
$(eval $(call gb_Library_add_linked_libs,emboleobj,\
- gdi32 \
- ole32 \
- oleaut32 \
- uuid \
- user32 \
))
endif
Modified: openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1818128&r1=1818127&r2=1818128&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/file_library_ooo.scp Thu Dec 14
13:50:08 2017
@@ -1221,7 +1221,7 @@ File gid_File_Lib_Expwrap_Uno
#ifdef UNX
Name = STRING(CONCAT2(expwrap.uno,UNXSUFFIX));
#elif defined(OS2)
- Name = "expwrap_uno.dll";
+ Name = "expwrap.dll";
#else
Name = "expwrap.uno.dll";
#endif
@@ -1473,7 +1473,7 @@ File gid_File_Lib_Ucbhelper
#ifdef UNX
Name = STRING(CONCAT3(libucbhelper,COMID,UNXSUFFIX));
#elif defined OS2
- Name = "ucbh.dll";
+ Name = "ucbhelp.dll";
#else
Name = STRING(CONCAT3(ucbhelper,COMID,.dll));
#endif
@@ -1843,7 +1843,7 @@ File gid_File_Lib_Raptor
Name = STRING(CONCAT4(libraptor2,UNXSUFFIX,.,RAPTOR_MAJOR));
#endif
#elif defined(OS2)
- Name = "raptor.dll";
+ Name = "raptor20.dll";
#else
#ifdef _gcc3
Name = "libraptor-1.dll";
@@ -1864,7 +1864,7 @@ File gid_File_Lib_Rasqal
Name = STRING(CONCAT4(librasqal,UNXSUFFIX,.,RASQAL_MAJOR));
#endif
#elif defined(OS2)
- Name = "rasqal.dll";
+ Name = "rasqal3.dll";
#else
#ifdef _gcc3
Name = STRING(CONCAT3(librasqal-,RASQAL_MAJOR,.dll));
@@ -1885,7 +1885,7 @@ File gid_File_Lib_Rdf
Name = STRING(CONCAT4(librdf,UNXSUFFIX,.,REDLAND_MAJOR));
#endif
#elif defined(OS2)
- Name = "librdf.dll";
+ Name = "rdf0.dll";
#else
#ifdef _gcc3
Name = "librdf-0.dll";
Modified: openoffice/trunk/main/set_soenv.in
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/set_soenv.in?rev=1818128&r1=1818127&r2=1818128&view=diff
==============================================================================
--- openoffice/trunk/main/set_soenv.in (original)
+++ openoffice/trunk/main/set_soenv.in Thu Dec 14 13:50:08 2017
@@ -358,7 +358,7 @@ elsif ( $platform =~ m/kfreebsd/ )
}
elsif ( $platform =~ m/freebsd/ )
{ $BIG_SVX = "TRUE";
- $COM = "@COM_IS@";
+ $COM = "GCC";
$COMPATH = '@COMPATH@' . '/bin';
$CVER = "C300";
$GUI = "UNX";
Modified: openoffice/trunk/main/slideshow/Library_slideshow.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/slideshow/Library_slideshow.mk?rev=1818128&r1=1818127&r2=1818128&view=diff
==============================================================================
--- openoffice/trunk/main/slideshow/Library_slideshow.mk (original)
+++ openoffice/trunk/main/slideshow/Library_slideshow.mk Thu Dec 14 13:50:08
2017
@@ -19,18 +19,12 @@
#
#**************************************************************
-ifeq ($(OS),OS2)
- SLIDESHOW_NAME := slidesho
-else
- SLIDESHOW_NAME := slideshow
-endif
+$(eval $(call gb_Library_Library,slideshow))
-$(eval $(call gb_Library_Library,$(SLIDESHOW_NAME)))
+$(eval $(call gb_Library_set_componentfile,slideshow,slideshow/util/slideshow))
-$(eval $(call
gb_Library_set_componentfile,$(SLIDESHOW_NAME),slideshow/util/slideshow))
-
-$(eval $(call gb_Library_add_linked_libs,$(SLIDESHOW_NAME),\
+$(eval $(call gb_Library_add_linked_libs,slideshow,\
avmedia \
basegfx \
canvastools \
@@ -47,13 +41,13 @@ $(eval $(call gb_Library_add_linked_libs
$(gb_STDLIBS) \
))
-$(eval $(call gb_Library_add_linked_static_libs,$(SLIDESHOW_NAME),\
+$(eval $(call gb_Library_add_linked_static_libs,slideshow,\
sldshw_s \
))
# List this file again, even though it's in the static lib, so that
# component_getFactory and component_getImplementationEnvironment are exported:
-$(eval $(call gb_Library_add_exception_objects,$(SLIDESHOW_NAME),\
+$(eval $(call gb_Library_add_exception_objects,slideshow,\
slideshow/source/engine/slideshowimpl \
))
Modified: openoffice/trunk/main/solenv/inc/libs.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/solenv/inc/libs.mk?rev=1818128&r1=1818127&r2=1818128&view=diff
==============================================================================
--- openoffice/trunk/main/solenv/inc/libs.mk (original)
+++ openoffice/trunk/main/solenv/inc/libs.mk Thu Dec 14 13:50:08 2017
@@ -83,7 +83,7 @@ CPPUHELPERLIB=-luno_cppuhelper$(COMID)
.ENDIF # "$(GUI)$(COM)"=="WNTGCC"
.INCLUDE .IGNORE : ucbhelper/version.mk
.IF "$(GUI)"=="OS2"
-UCBHELPERLIB=-lucbh$(UCBHELPER_MAJOR)
+UCBHELPERLIB=-lucbhelper
.ELSE
UCBHELPERLIB=-lucbhelper$(COMID)
.ENDIF
Modified: openoffice/trunk/main/vcl/Library_vcl.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_vcl.mk?rev=1818128&r1=1818127&r2=1818128&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Library_vcl.mk (original)
+++ openoffice/trunk/main/vcl/Library_vcl.mk Thu Dec 14 13:50:08 2017
@@ -51,7 +51,7 @@ $(eval $(call gb_Library_set_include,vcl
ifeq ($(GUIBASE),os2)
$(eval $(call gb_Library_set_include,vcl,\
$$(INCLUDE) \
- -idirafter /@unixroot/usr/dev/toolkit452/h \
+ -idirafter /@unixroot/usr/include/os2tk45 \
))
endif
ifeq ($(GUIBASE),unx)
Modified: openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/makefile.mk?rev=1818128&r1=1818127&r2=1818128&view=diff
==============================================================================
--- openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/makefile.mk (original)
+++ openoffice/trunk/main/xmlsecurity/source/xmlsec/nss/makefile.mk Thu Dec 14
13:50:08 2017
@@ -52,7 +52,7 @@ NSS_CFLAGS = -I$(MOZ_INC)$/nss
NSPR_CFLAGS = -I$(MOZ_INC)$/nspr
.ELIF "$(GUI)" == "OS2"
NSS_CFLAGS = -I/@unixroot/usr/include/nss3
-NSPR_CFLAGS = I/@unixroot/usr/include/nspr4
+NSPR_CFLAGS = -I/@unixroot/usr/include/nspr4
.ENDIF
.IF "$(GUI)" == "WNT"
