Apache OpenOffice (AOO) Bugzilla – Issue 59729
extensions needs np_sdk also with --disable-mozilla
Last modified: 2006-08-31 14:05:57 UTC
Hi, extensions/source/plugin/base/* need npsdk header files even if you build with --disable-mozilla, so extensions/prj/d.lst should contain np_sdk and not MOZ:np_sdk. Investige more...
.
This change comes from #i53612#, extensions/prj/build.lst: revision 1.30 date: 2005/12/21 11:13:16; author: obo; state: Exp; lines: +1 -1 INTEGRATION: CWS cmcfixes21 (1.29.104); FILE MERGED 2005/11/10 16:17:51 cmc 1.29.104.1: #i53612# np_sdk optional on MOZ The problem is that four files in extensions include npsdk/something: -*- mode: grep; default-directory: "~/.ooo/ooo_SRC680_m147_src/extensions/" -*- find . -type f -print0 | xargs -0 -e grep -nH -e npsdk ./source/plugin/inc/plugin/unx/plugcon.hxx:84:#include <npsdk/npupp.h> ./source/plugin/inc/plugin/unx/plugcon.hxx:85:#include <npsdk/npapi.h> ./source/plugin/inc/plugin/win/sysplug.hxx:52:#include <npsdk/npapi.h> ./source/plugin/inc/plugin/win/sysplug.hxx:53:#include <npsdk/npupp.h> Grep finished (matches found) at Sun Dec 25 21:05:48 Handing over to Caolan.
Caolan, what about: diff -ur ooo_SRC680_m147_src.orig/extensions/prj/build.lst ooo_SRC680_m147_src/extensions/prj/build.lst --- ooo_SRC680_m147_src.orig/extensions/prj/build.lst 2005-12-24 09:47:34.000000000 +0100 +++ ooo_SRC680_m147_src/extensions/prj/build.lst 2005-12-24 09:47:46.000000000 +0100 @@ -1,4 +1,4 @@ -ex extensions : rdbmaker svx SANE:sane twain offuh MOZ:np_sdk stoc uui NULL +ex extensions : rdbmaker svx SANE:sane twain offuh np_sdk stoc uui NULL ex extensions usr1 - all ex_mkout NULL ex extensions\inc get - all ex_inc NULL ex extensions\inc\ucbhelper get - all ex_incucbh NULL
AFAIK, this dependency is currently replaced by a dependency on the "moz" module.
accepting...
Fair enough, disable-mozilla still means to build the mozilla plugin. Resolving problem in cmcfixes23
reopen to reassign
reassign for qa
done in cmcfixes23
Checked out SRC680_m152 and still getting this: Making: ../../../unxsoli4.pro/slo/context.obj CC -c -temp=/tmp -I. -I/home/openoffice/oocvs/solver/680/unxsoli4.pro/inc/mozilla/plugin -I/home/openoffice/oocvs/solver/680/unxsoli4.pro/inc/mozilla/java -I/home/openoffice/oocvs/solver/680/unxsoli4.pro/inc/mozilla/nspr -I../inc -I../../../inc -I../../../unx/inc -I../../../unxsoli4.pro/inc -I. -I/home/openoffice/oocvs/solver/680/unxsoli4.pro/inc/stl -I/home/openoffice/oocvs/solver/680/unxsoli4.pro/inc/external -I/home/openoffice/oocvs/solver/680/unxsoli4.pro/inc -I/home/openoffice/oocvs/solenv/unxsoli4/inc -I/home/openoffice/oocvs/solenv/inc -I/home/openoffice/oocvs/res -I/home/openoffice/oocvs/solver/680/unxsoli4.pro/inc/stl -I/include -I/home/openoffice/oocvs/solenv/inc/Xp31 -I/usr/jdk/j2sdk1.4.2_08/include -I/usr/jdk/j2sdk1.4.2_08/include/solaris -I/usr/jdk/j2sdk1.4.2_08/include/native_threads/include -I. -I../../../res -I. -xarch=generic -xO3 -xspace -features=no%altspell -library=no%Cstd -KPIC -DSOLARIS -DUNX -DVCL -DC52 -DC52 -DINTEL -DCVER=C52 -D_USE_NAMESPACE -mt -D_PTHREADS -DSYSV -DSUN -DSUN4 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DSTLPORT_VERSION=400 -D__DMAKE -DUNIX -DCPPU_ENV=sunpro5 -DSUPD=680 -DPRODUCT -DNDEBUG -DPRODUCT_FULL -DOSL_DEBUG_LEVEL=0 -DOPTIMIZE -DEXCEPTIONS_ON -DGUI -DSOLAR_JAVA -DSRC680=SRC680 -DOJI -DSHAREDLIB -D_DLL_ -DMULTITHREAD -o ../../../unxsoli4.pro/slo/context.o /home/openoffice/oocvs/extensions/source/plugin/base/context.cxx "../inc/plugin/unx/plugcon.hxx", line 85: Error: Could not open include file<npupp.h>. "../inc/plugin/unx/plugcon.hxx", line 86: Error: Could not open include file<npapi.h>. "../inc/plugin/unx/plugcon.hxx", line 102: Error: Type name expected instead of "NPP". "../inc/plugin/unx/plugcon.hxx", line 103: Error: Type name expected instead of "NPWindow". "../inc/plugin/unx/plugcon.hxx", line 104: Error: Type name expected instead of "NPSetWindowCallbackStruct". "../inc/plugin/unx/plugcon.hxx", line 115: Error: Type name expected instead of "NPSavedData". "../inc/plugin/unx/plugcon.hxx", line 117: Error: NPP is not defined. "../inc/plugin/unx/plugcon.hxx", line 126: Error: NPStream is not defined. "../inc/plugin/unx/plugcon.hxx", line 126: Error: NPStream is not defined. "../inc/plugin/unx/plugcon.hxx", line 126: Error: NPStream is not defined. "../inc/plugin/unx/plugcon.hxx", line 126: Error: Type name expected instead of "NPStream". "../inc/plugin/unx/plugcon.hxx", line 126: Error: Use ";" to terminate declarations. "../inc/plugin/unx/plugcon.hxx", line 126: Error: Use ";" to terminate declarations. "../inc/plugin/unx/plugcon.hxx", line 126: Error: Type name expected instead of "NPStream". "../inc/plugin/unx/plugcon.hxx", line 126: Error: Use ";" to terminate declarations. "../inc/plugin/unx/plugcon.hxx", line 126: Error: Use ";" to terminate declarations. "../inc/plugin/unx/plugcon.hxx", line 126: Error: Type name expected instead of "NPStream". "../inc/plugin/unx/plugcon.hxx", line 126: Error: Use ";" to terminate declarations. "../inc/plugin/unx/plugcon.hxx", line 126: Error: Use ";" to terminate declarations. "../inc/plugin/unx/plugcon.hxx", line 126: Error: Type name expected instead of "NPStream". "../inc/plugin/unx/plugcon.hxx", line 126: Error: Multiple declaration for p. "../inc/plugin/unx/plugcon.hxx", line 126: Error: Use ";" to terminate declarations. "../inc/plugin/unx/plugcon.hxx", line 126: Error: Use ";" to terminate declarations. "../inc/plugin/unx/plugcon.hxx", line 126: Error: Type name expected instead of "NPStream". "../inc/plugin/unx/plugcon.hxx", line 126: Error: Multiple declaration for nIndex. Compilation aborted, too many Error messages. dmake: Error code 1, while making '../../../unxsoli4.pro/slo/context.obj' '---* tg_merge.mk *---' ./configure --with-gnu-patch=/opt/gnu/bin/patch --with-gnu-cp=/opt/gnufile/bin/cp --disable-mozilla --with-jdk-home=/usr/jdk/j2sdk1.4.2_08 --with-ant-home=/opt/ant --disable-cups --with-epm=internal --disable-gnome-vfs --disable-pasf --disable-gtk SunOS mathilde 5.9 Generic_118559-16 i86pc i386 i86pc openoffice@mathilde ~/oocvs/config_office> am I missing something?
reopening, I have the same bug on Solaris/SPARC with SunONE 11.
This is because everyone now *must* build Mozilla and both npupp and npapi are delivered from mozilla build. Right now, there is no module depending on np_sdk: pavel@linux:~/.ooo/ooo_SRC680_m155_src> grep np_sdk */prj/build.lst np_sdk/prj/build.lst:np np_sdk : soltools NULL np_sdk/prj/build.lst:np np_sdk nmake - all np_sdk NULL pavel@linux:~/.ooo/ooo_SRC680_m155_src>
Back to P1. This breaks --disable-mozilla builds. Should we build np_sdk instead if --disable-mozilla is given?
extensions/source/plugin needs to be disabled when --disable-mozilla is given.
Created attachment 33909 [details] Patch
Honouring WITHOUT_MOZILLA in extensions & scp2 again.
Adding myself to cc list.
move to 2.0.3. I'll test the patch.
Patch works for me - I commited it into pj50. Thanks.
verified in my builds.
closing.