Apache OpenOffice (AOO) Bugzilla – Issue 118582
Build of OS/2 tree
Last modified: 2016-03-20 20:48:52 UTC
I started building the OS/2 tree from ASF OOo subversion. I will use this issue to track the updates required to compile the os2 tree. Getting it to run will probably require something more :-)
Patches are coming from sun os2port07 cws and from my local tree, plus ASF updates.
Created attachment 76960 [details] sal patches also osl/os2/printf.c is required, it can be copied from vcl/os2/source/app/printf.c
Created attachment 76961 [details] redland patch
Created attachment 76962 [details] raptor multi patch put into raptor subdir
Created attachment 76963 [details] rasqal multi patch into rasqal subdir
Created attachment 76964 [details] redland multi patch into redland subdir
Created attachment 76965 [details] sfx2 fixes
Created attachment 76966 [details] shell patches
Created attachment 76967 [details] bridges patch
Created attachment 76968 [details] configmgr diff
Created attachment 76969 [details] cppu
Created attachment 76970 [details] cppuhelper
Created attachment 76971 [details] dmake
Created attachment 76973 [details] set_soenv patch to restore removed os2 code.
Created attachment 76974 [details] dtrans dep fix
Created attachment 76975 [details] extensions build patch
Created attachment 76976 [details] external build patch
Created attachment 76977 [details] i18npool build
Created attachment 76978 [details] l10ntools build
Created attachment 76979 [details] pyuno build
Created attachment 76980 [details] readlicense build os2 set of files
Created attachment 76981 [details] svtools build and icc compiler cleanup
Created attachment 76982 [details] toolkit build fixes
Created attachment 76983 [details] tools fixes
Created attachment 76984 [details] vcl build fixes After applying the patch, all files in vcl/os2/inc/* must be moved to vcl/inc/os2 as for other platforms (I can't use svn move myself) Also new vcl/os2/source/window/salmenu.cxx is provided.
Created attachment 76985 [details] vcl salmenu.cxx vcl/os2/source/window/salmenu.cxx file-
Created attachment 76986 [details] xmlreader delivery fix
Created attachment 76987 [details] RepositoryFixes.mk patch Added specific os2 file mapping.
Created attachment 76988 [details] build add os2 support.
Created attachment 76989 [details] gbuild os2 specific platform file solenv/gbuild/platform/os2.mk file.
Comment on attachment 76988 [details] build add os2 support. gbuild, add os2 support patch.
This looks like a lot of fun! I will review it, hold tight ;).
(In reply to comment #14) > Created attachment 76971 [details] > dmake svn commit -m "i118582: OS/2 port - support building dmake with klibc. By Yuri Dario." Sending dmake/imacs.c Sending dmake/make.cmd Sending dmake/sysintf.c Transmitting file data ... Committed revision 1199407. Thank You!
(In reply to comment #3) > Created attachment 76960 [details] > sal patches > > also osl/os2/printf.c is required, it can be copied from > vcl/os2/source/app/printf.c I looked at this last file and it doesn't carry the license! I found a copy of the license in the package: http://www.os2site.com/sw/ews/pmprtf.zip Unfortunately it doesn't look OK (IMHO): ______ ... You may NOT: 1. sublicense, rent, lease, or assign the Program; and 2. reverse assemble, reverse compile, or otherwise translate the Program. ... ______ Do you think we can use another implementation (perhaps BSD) of printf instead?
Please replace printf.c with a dummy definition for now; I think I can load it dinamically instead of statically linking the code.
(In reply to comment #36) > Please replace printf.c with a dummy definition for now; I think I can load it > dinamically instead of statically linking the code. I think I will leave that patch for last :). Do be aware we will have to replace the printf in vcl too.
Sure; I plan to export debug_printf() from sal and use that one in vcl too.
(In reply to comment #4) > Created attachment 76961 [details] > redland patch I see some changes in rasqal/rasqal2.map Can you confirm these only apply to OS2?
(In reply to comment #8) > Created attachment 76965 [details] > sfx2 fixes svn commit -m "i118582: OS/2 port - sfx2 fixes. By Yuri Dario" Sending sfx2/Library_sfx.mk Sending sfx2/source/appl/shutdowniconOs2.cxx Sending sfx2/source/doc/objstor.cxx Transmitting file data ... Committed revision 1199928. Thanks!
(In reply to comment #9) > Created attachment 76966 [details] > shell patches svn commit -m "i118582: OS/2 port - shell fixes. By Yuri Dario" Sending shell/inc/internal/utilities.hxx Sending shell/source/unix/exec/shellexec.cxx Transmitting file data .. Committed revision 1199930. Thank you!
(In reply to comment #10) > Created attachment 76967 [details] > bridges patch svn commit -m "i118582: OS/2 port - bridges patch. By Yuri Dario" Sending bridges/source/jni_uno/makefile.mk Transmitting file data . Committed revision 1199933. Thank you!
(In reply to comment #11) > Created attachment 76968 [details] > configmgr diff svn commit -m "i118582: OS/2 port - configmgr patch. By Yuri Dario" Sending configmgr/prj/d.lst Transmitting file data . Committed revision 1199938.
(In reply to comment #12) > Created attachment 76969 [details] > cppu svn commit -m "i118582: OS/2 port - cppu patch. By Yuri Dario" Sending cppu/util/extra.mk Transmitting file data . Committed revision 1199940. thanks!
(In reply to comment #13) > Created attachment 76970 [details] > cppuhelper svn commit -m "i118582: OS/2 port - cppuhelper patch. By Yuri Dario" Sending cppuhelper/source/gcc3os2.map Transmitting file data . Committed revision 1199943. Thank you!
(In reply to comment #4) > Created attachment 76961 [details] > redland patch svn commit -m "i118582: OS/2 port - redland patch by Yuri Dario. While here avoid patching stuff for past legal motivations." Sending redland/raptor/makefile.mk Sending redland/raptor/raptor-1.4.18.patch.dmake Deleting redland/raptor/raptor-1.4.18.patch.legal Adding redland/raptor/raptor-1.4.18.patch.os2 Sending redland/rasqal/makefile.mk Sending redland/rasqal/rasqal-0.9.16.patch.dmake Deleting redland/rasqal/rasqal-0.9.16.patch.legal Adding redland/rasqal/rasqal-0.9.16.patch.os2 Sending redland/rasqal/rasqal2.map Sending redland/redland/makefile.mk Sending redland/redland/redland-1.0.8.patch.dmake Deleting redland/redland/redland-1.0.8.patch.legal Adding redland/redland/redland-1.0.8.patch.os2 Transmitting file data .......... Committed revision 1199946. Thank you! While here I did add some simplifications of my own to the legal stuff.
(In reply to comment #15) > Created attachment 76973 [details] > set_soenv patch to restore removed os2 code. svn commit -m "i118582: OS/2 port - set_soenv patch to restore removed OS2 code by Yuri Dario." Sending set_soenv.in Transmitting file data . Committed revision 1199964. Thanks!
(In reply to comment #16) > Created attachment 76974 [details] > dtrans dep fix svn commit -m "i118582: OS/2 port - dtrans dep fix by Yuri Dario." Sending dtrans/prj/build.lst Transmitting file data . Committed revision 1199970. Thank you!
(In reply to comment #18) > Created attachment 76976 [details] > external build patch svn commit -m "i118582: OS/2 port - external build patch by Yuri Dario." Sending external/gcc3_specific/makefile.mk Transmitting file data . Committed revision 1199974 (Actually the commit message is different but I will miss the missing part in another commit) Thanks!
(In reply to comment #17) > Created attachment 76975 [details] > extensions build patch svn commit -m "i118582: OS/2 port - extensions patch by Yuri Dario." Sending extensions/source/preload/makefile.mk Transmitting file data . Committed revision 1199982.
(In reply to comment #19) > Created attachment 76977 [details] > i18npool build Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: prj/d.lst |=================================================================== |--- prj/d.lst (revision 1186269) |+++ prj/d.lst (working copy) -------------------------- Patching file prj/d.lst using Plan A... Hunk #1 failed at 42. 1 out of 1 hunks failed--saving rejects to prj/d.lst.rej (I edited it by hand - svn diff looks like I got it right.) svn commit -m "i118582: OS/2 port - i18npool build patch by Yuri Dario." Sending i18npool/prj/d.lst Transmitting file data . Committed revision 1199995. Thank you!
(In reply to comment #20) > Created attachment 76978 [details] > l10ntools build svn commit -m "i118582: OS/2 port - l10ntools build patch by Yuri Dario." Sending l10ntools/scripts/makefile.mk Transmitting file data . Committed revision 1200003. Thanks!
(In reply to comment #25) > Created attachment 76983 [details] > tools fixes This all apply only to the OS2 port so I aggregated them in one batch for simplicity: svn commit -m "i118582: OS/2 port - pyuno, readlicense, svtools, toolkit and tools build patches by Yuri Dario." Sending readlicense_oo/docs/readme/eval.xsl Sending readlicense_oo/docs/readme.dtd Sending readlicense_oo/makefile.mk Sending readlicense_oo/prj/d.lst Sending svtools/source/contnr/svtreebx.cxx Sending svtools/source/svhtml/htmlkywd.cxx Sending svtools/source/svrtf/rtfkeywd.cxx Sending toolkit/source/awt/vclxdialog.cxx Sending toolkit/source/awt/vclxsystemdependentwindow.cxx Sending toolkit/source/awt/vclxtoolkit.cxx Sending toolkit/source/awt/vclxtopwindow.cxx Sending toolkit/source/awt/vclxwindow1.cxx Sending tools/Library_tl.mk Sending tools/bootstrp/rscdep.cxx Sending tools/os2/source/dll/toolsdll.cxx Sending tools/source/datetime/tdate.cxx Sending tools/source/datetime/ttime.cxx Sending tools/source/fsys/os2.cxx Sending tools/source/generic/toolsin.cxx Transmitting file data .................... Committed revision 1200011. Thank You!
Created attachment 76995 [details] unixodbc headers patch
Created attachment 76996 [details] dbaccess header fix
Created attachment 76997 [details] sal/osl/os2/debug_printf.c This is a dynamic implementation of pmprintf code, library is loaded on demand so it is not required to start the application. sal/osl/os2/makefile.mk must reference debug_printf.obj instead of printf.obj. Function is automatically exported, so vcl can use it.
(In reply to comment #26) > Created attachment 76984 [details] > vcl build fixes > > After applying the patch, all files in vcl/os2/inc/* must be moved to > vcl/inc/os2 as for other platforms (I can't use svn move myself) > Also new vcl/os2/source/window/salmenu.cxx is provided. svn commit -m "i118582: OS/2 port - vcl build fixes - by ydario" Sending vcl/Library_vcl.mk Sending vcl/Module_vcl.mk Sending vcl/WinResTarget_vcl.mk Adding vcl/inc/os2 Sending vcl/inc/os2/salbmp.h Sending vcl/inc/os2/saldata.hxx Sending vcl/inc/os2/salframe.h Sending vcl/inc/os2/salgdi.h Sending vcl/inc/os2/salinst.h Sending vcl/inc/os2/salmenu.h Sending vcl/inc/os2/salobj.h Sending vcl/inc/os2/salprn.h Sending vcl/inc/os2/salsys.h Sending vcl/inc/os2/saltimer.h Sending vcl/inc/os2/salvd.h Sending vcl/inc/os2/xwphook.h Sending vcl/inc/sft.hxx Sending vcl/inc/vcl/sysdata.hxx Deleting vcl/os2/inc Sending vcl/os2/source/app/salinfo.cxx Sending vcl/os2/source/app/salinst.cxx Sending vcl/os2/source/app/sallang.cxx Sending vcl/os2/source/app/salshl.cxx Sending vcl/os2/source/app/saltimer.cxx Sending vcl/os2/source/gdi/os2layout.cxx Sending vcl/os2/source/gdi/salbmp.cxx Sending vcl/os2/source/gdi/salgdi.cxx Sending vcl/os2/source/gdi/salgdi2.cxx Sending vcl/os2/source/gdi/salgdi3.cxx Sending vcl/os2/source/gdi/salprn.cxx Sending vcl/os2/source/gdi/salvd.cxx Sending vcl/os2/source/src/salsrc.rc Sending vcl/os2/source/window/salframe.cxx Adding vcl/os2/source/window/salmenu.cxx Sending vcl/os2/source/window/salobj.cxx Sending vcl/source/window/menu.cxx Sending vcl/workben/makefile.mk Sending vcl/workben/svdem.cxx Transmitting file data .................................... Committed revision 1200700. Thank you!
(In reply to comment #29) > Created attachment 76987 [details] > RepositoryFixes.mk patch > > Added specific os2 file mapping. svn commit -m "i118582: OS/2 port - Add specific os2 file mapping in RepositoryFixes.mk - by ydario." Sending RepositoryFixes.mk Transmitting file data . Committed revision 1200710. Thanks!
(In reply to comment #32) > Comment on attachment 76988 [details] > build add os2 support. > > gbuild, add os2 support patch. svn commit -m "i118582: OS/2 port - Add platform specific gbuild support - by ydario." Sending gbuild/Tempfile.mk Sending gbuild/gbuild.mk Adding gbuild/platform/os2.mk Transmitting file data ... Committed revision 1200716. Thanks!
(In reply to comment #54) > Created attachment 76995 [details] > unixodbc headers patch BTW, please submit this patch upstream too: http://www.unixodbc.org/
(In reply to comment #55) > Created attachment 76996 [details] > dbaccess header fix svn commit -m "i118582: OS/2 port - patch headers for unixodbc and dbaccess - by ydario." Sending dbaccess/source/ui/dlg/odbcconfig.cxx Sending unixODBC/inc/iodbcunix.h Sending unixODBC/inc/sqltypes.h Transmitting file data ... Committed revision 1200721. Thank you!
(In reply to comment #3) > Created attachment 76960 [details] > sal patches > > also osl/os2/printf.c is required, it can be copied from > vcl/os2/source/app/printf.c svn commit -m "i118582: OS/2 port - sal patches - by ydario." Sending sal/inc/sal/config.h Sending sal/inc/sal/types.h Adding sal/osl/os2/debug_printf.c Sending sal/osl/os2/file.cxx Sending sal/osl/os2/file_url.h Sending sal/osl/os2/makefile.mk Sending sal/osl/os2/module.c Sending sal/osl/os2/process_impl.cxx Sending sal/util/makefile.mk Transmitting file data ......... Committed revision 1200722. But adding the debug_printf. Thanks!
(In reply to comment #56) > Created attachment 76997 [details] > sal/osl/os2/debug_printf.c > > This is a dynamic implementation of pmprintf code, library is loaded on demand > so it is not required to start the application. > > sal/osl/os2/makefile.mk must reference debug_printf.obj instead of printf.obj. > > Function is automatically exported, so vcl can use it. svn commit -m "i118582: OS/2 port - remove pmprintf in vcl for dynamic implementation for debugging - based on work by ydario." Adding vcl/os2/source/app/debug_printf.c Sending vcl/os2/source/app/makefile.mk Deleting vcl/os2/source/app/printf.c Transmitting file data .. Committed revision 1200723. Thank you! Have we finished? :).
Created attachment 77000 [details] br
Created attachment 77001 [details] sax patch
Created attachment 77002 [details] sc patch def file
Created attachment 77003 [details] connectivity def patches
Created attachment 77004 [details] o3tl build patch
Created attachment 77005 [details] javaunohelper fix for java jni exports
Created attachment 77006 [details] desktop build and resource updates
Created attachment 77007 [details] binaryurp use 8.3 names and do not build static libs.
Created attachment 77008 [details] stlport initial build patch
Created attachment 77009 [details] basegfx qa build patch
Created attachment 77010 [details] xmlreader def file patch
Comment on attachment 77008 [details] stlport initial build patch On the stlport initial build patch: Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |--- STLport-4.5.patch (revision 1186269) |+++ STLport-4.5.patch (working copy) -------------------------- Patching file STLport-4.5.patch using Plan A... Hunk #1 succeeded at 300. patch: **** malformed patch at line 19: @@ -367,7 +369,7 @@
(In reply to comment #74) > Created attachment 77010 [details] > xmlreader def file patch I committed everything, except the stlport patch that is "malformed", in one commit: svn commit -m "i118582: OS/2 port - more misc. changes by ydario." Sending basegfx/test/makefile.mk Sending binaryurp/qa/makefile.mk Sending bridges/source/cpp_uno/gcc3_os2_intel/makefile.mk Sending connectivity/source/drivers/hsqldb/makefile.mk Sending desktop/qa/deployment_misc/makefile.mk Sending desktop/util/ooverinfo2.rc Sending javaunohelper/source/makefile.mk Sending o3tl/qa/makefile.mk Sending sax/qa/cppunit/makefile.mk Sending sc/addin/datefunc/makefile.mk Sending xmlreader/source/makefile.mk Transmitting file data ........... Committed revision 1201398. Thanks!
Created attachment 77016 [details] sal patch handle backslash
Created attachment 77017 [details] vcl build fixes
Created attachment 77018 [details] agg build patch
Created attachment 77019 [details] basebmp build patch
Created attachment 77020 [details] binaryurp delivery patch
Created attachment 77021 [details] l10ntools delivery patch
Created attachment 77022 [details] remotebridges delivery patch
Created attachment 77023 [details] vcl revert wrong commit to svdem.cxx
(In reply to comment #84) > Created attachment 77023 [details] > vcl revert wrong commit to svdem.cxx svn commit -m "i118582 - OS/2 Port: vcl revert wrong commit to svdem.cxx. Patch by ydairo." Sending vcl/workben/svdem.cxx Transmitting file data . Committed revision 1202422. Thanks.
(In reply to comment #83) I committed all the last group, including the stlport patch that didn't work. svn commit -m "i118582 - OS/2 Port: misc build fixes. By ydario@." Sending agg/source/makefile.mk Sending basebmp/test/makefile.mk Sending binaryurp/prj/d.lst Sending l10ntools/prj/d.lst Sending remotebridges/prj/d.lst Sending sal/osl/os2/file.cxx Sending sal/osl/os2/module.c Sending stlport/STLport-4.5.patch Sending vcl/Library_vcl.mk Sending vcl/workben/svdem.cxx Transmitting file data .......... Committed revision 1202442.
ok, it seems almost everything is in place now. The tree is only missing the biggest set of patches, changes to solenv/inc/ dmake scripts. Once I'll clean it a bit, I'll submit the required diff file.
(In reply to comment #87) > ok, it seems almost everything is in place now. The tree is only missing the > biggest set of patches, changes to solenv/inc/ dmake scripts. > Once I'll clean it a bit, I'll submit the required diff file. Let's close this issue. Feel free to open new one when you feel it's ready
getting rid of value "enhancement" for field "severity". For enhancement the field "issue type" shall be used.
Work on the OS/2 port continues on issue 118923.
Closing. See https://bz.apache.org/ooo/show_bug.cgi?id=118923. All changes ported in 4.1.2 release.