Re: about macxjoin1153 cws
James McKenzie <[email protected]>
| Newsgroups | gmane.comp.openoffice.devel.porting |
|---|---|
| Message-ID | <[email protected]> |
Pavel JanĂk wrote: > From: "eric.bachard" <[email protected]> > Date: Sat, 02 Jul 2005 22:45:54 +0200 > >Hi, > > > berkeleydb (libdb_java not built) > >this change is: > >.IF "$(OS)"=="MACOSX" >OUT2LIB+=$(BUILD_DIR)$/.libs$/libdb*.jnilib >.ENDIF > >but we use different code in 2.0: > >.IF "$(OS)"=="MACOSX" >OUT2LIB+=$(BUILD_DIR)$/.libs$/libdb_java*jnilib >.ENDIF # "$(OS)"=="MACOSX" > >Can you please use the same code? Or is pluby's change better (are there >any other libdb_* files)? Using the same code in 1.1.x and 2.x will help us >to identify potential problems/unify the source and minimize diffs. > > Don't know, but this was a change of the original code, which specified libdb_*.so (if I remember the code correctly.) > > desktop (mozwrapper and nswrapper) , > >module desktop contains mozwrapper also in 2.0. Should it be adapted there >too? > > > dlcompat (fixed for 10.2 build) > >module dlcompat's build.lst contains this change: > >Index: prj/build.lst >=================================================================== >RCS file: /cvs/external/dlcompat/prj/build.lst,v >retrieving revision 1.1 >retrieving revision 1.1.10.1 >diff -u -r1.1 -r1.1.10.1 >--- prj/build.lst 22 Mar 2004 15:39:02 -0000 1.1 >+++ prj/build.lst 3 Jul 2005 15:01:19 -0000 1.1.10.1 >@@ -1,3 +1,3 @@ >-dc dlcompat : soltools NULL >+dc dlcompat : soltools dlcompat NULL > dc dlcompat usr1 - all dc_mkout NULL > dc dlcompat nmake - all dc_dlcompat NULL > >It makes dlcompat depending on itself which is nonsense. What is the >purpose of this fix? Reopening #i51507#. > > > This build dependency is incorrect, IMHO. I asked why this was this was changed and never received an answer. > > sc (fixes for Hindu and Kannada) > >Hmm, he change here is: > >+ >+# Indic resources are too big for the resource compiler >+RES_HINDI := >+RES_KANNADA := > >in makefile.mk. This is probably trying to fix #i33228#. See this issues >for more details and the reasoning for not fixing this and the workaround >that already is in the source. We do not need to pollute code with another >workaround. > > > What is the other 'fix'? > > shell (the mailer can open documents with exotic filenames) > >The changes here are adding > >... && !defined USE_JAVA > >to #if defined MACOSX. Why? Look at rev. 1.2.24.1.14.2 of cmdmailmsg.cxx >where pluby did this: > >-#if defined MACOSX && ! defined USE_JAVA >+#if 0 // defined MACOSX > >Why you reverted it back to > >-#if 0 // defined MACOSX >+#if defined MACOSX && !defined USE_JAVA > >in revision 1.2.24.1.14.3? > > > Interesting.... > > svtools (?) > >Yes, there is no change in module svtools. > > It is now deprecated and incorporated into m56/m57. James McKenzie