Apache OpenOffice (AOO) Bugzilla – Issue 14321
.NET build fails (silently) in external/atl
Last modified: 2003-06-03 09:08:49 UTC
MS moved the include files from ${COMPATH}/atl/include/ to ${COMPATH}/atlmfc/include/ And this project doesn't fail because there are some lines like: +if test -f patcherror ; then + echo Error + exit 1 +fi missing in atlcopy.sh (And similar in atlcopy.bat)
Set target
Please change and apply the changes to SO external project to. There are still the old files from MSVC6.
@obo: Please change and apply also for SO external module. The files in SO external/atl are still from old MSVC6.
I think its the best way to get these headers direct from the .NET compiler instead of copying them to solver first. The module external/atl will be obsolete for wntmsci8.
We should remove external/atl completely, also for MSVC 6, This patch would do for source/activex/main/makefile.mk, but ... +++ extensions/source/activex/main/makefile.mk 13 May 2003 12:07:27 @@ -32,7 +32,13 @@ VERSIONOBJ= LIBTARGET=NO USE_DEFFILE=YES -INCPRE+=$(SOLARINCDIR)$/external$/atl \ +.IF "$(COMEX)"=="8" +ATL_INCLUDE=$(COMPATH)$/atlmfc$/include +.ELSE +ATL_INCLUDE=$(COMPATH)$/atl$/include +.ENDIF + +INCPRE+=$(ATL_INCLUDE) \ -I$(MISC) \ ... a grep in extensions shows: $ grep -r "external$/atl" * source/activex/main/makefile.mk~:INCPRE+=$(SOLARINCDIR)$/external$/atl \ source/ole/makefile.mk:INCPRE+= -I$(SOLARINCDIR)$/external$/atl test/ole/cpnt/makefile.mk:INCPRE+= $(OUT)$/inc -I$(SOLARINCDIR)$/external$/atl test/ole/cpnt/makefile.mk:#INCPRE+= -I$(SOLARINCDIR)$/external$/atl test/ole/cpptest/makefile.mk:INCPRE+= $(OUT)$/inc -I$(SOLARINCDIR)$/external$/atl test/ole/cppToUno/makefile.mk:INCPRE+= $(OUT)$/inc -I$(SOLARINCDIR)$/external$/atl test/ole/OleClient/makefile.mk:INCPRE+= $(OUT)$/inc -I$(SOLARINCDIR)$/external$/atl test/ole/OleConverterVar1/makefile.mk:INCPRE+= $(OUT)$/inc -I$(SOLARINCDIR)$/external$/atl Maybe we should define the ATL_INCLUDE in WNT.MK, to keep it in one place, or set it in configure, and your solar environment.
I'll set ATL_INCLUDE in wnt.mk to the appropriate paths.
Done.
RT: Reviewed, looks OK.
Verified together with Mikhail.
Errm, sorry to reopen this issue, but: /v1/cws_srx644_ooo11beta2cyg/external/atl cp: cannot stat `/cygdrive/c/PROGRA~1/MICROS~1.NET/Vc7/atl/include/ATLBASE.H': No such file or directory ... external/atl can be removed from external/prj/* As external is not tagged in cws...obo02 this can not be done before cws..obo02 is merged back to HEAD
As discussed to you.
removed on ooo11beta2.
Hi Martin, can you please also merge the obo02 changes to beta2? At the moment the tree is broken, because some of the files, without the changes from obo02 still use inc/atl. The files to merge are: --- solenv/inc/tg_res.mk solenv/inc/wnt.mk extensions/test/ole/cpptest/makefile.mk extensions/test/ole/cppToUno/makefile.mk extensions/test/ole/cpnt/makefile.mk extensions/test/ole/OleConverterVar1/makefile.mk extensions/test/ole/OleClient/makefile.mk extensions/source/ole/makefile.mk extensions/source/activex/main/makefile.mk extensions/source/activex/main/SODispatchInterceptor.cpp extensions/source/activex/main/SOComWindowPeer.cpp embedserv/source/embed/makefile.mk embedserv/util/makefile.mk dtrans/test/win32/dnd/makefile.mk --- Volker
joined given modules to ooo11beta2
Hi Martin, solenv/inc/tg_res.mk solenv/inc/wnt.mk are still missing. Volker
but now complete, please verify.
A complete build with W32-tcsh and .NET finished succesfully. (No extra patches needed, only midl.exe must already be in the path before calling configure)
c