Re: feature/gbuild_java is finished
On 16 February 2012 00:52, Matúš Kukan matus.ku...@gmail.com wrote: I had a look but couldn't build jurt: So, if we don't want to use $(OUTDIR)/class, adding +$(eval $(call gb_Jar_add_jars,jurt,\ +$(WORKDIR)/CustomTarget/ridljar/javamaker/class \ +)) in Jar_jurt.mk seems to help. I wonder how this works on other systems. I guess that should be included from ridljar.jar and I don't know why it isn't on Windows. Of course I really am not java experienced. There are also more missing gb_Helper_abbreviate_dirs_native in unoil's climaker custom target. By the way, I plan to remove gb_Helper_abbreviate_dirs and rename gb_Helper_abbreviate_dirs_native - gb_Helper_abbreviate_dirs I don't think we need both. Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: feature/gbuild_java is finished
On Thu, Feb 16, 2012 at 11:38:07AM +0100, Matúš Kukan wrote: On 16 February 2012 00:52, Matúš Kukan matus.ku...@gmail.com wrote: I had a look but couldn't build jurt: So, if we don't want to use $(OUTDIR)/class, adding +$(eval $(call gb_Jar_add_jars,jurt,\ +$(WORKDIR)/CustomTarget/ridljar/javamaker/class \ +)) in Jar_jurt.mk seems to help. I wonder how this works on other systems. I guess that should be included from ridljar.jar and I don't know why it isn't on Windows. The generated UNO classes must be present in ridl.jar . They are (or should be) added into the jar by $(eval $(call gb_Jar_add_packagedirs,ridl,\ $(WORKDIR)/CustomTarget/ridljar/javamaker/class/com \ )) in ridl/Jar_ridl.mk . Look at the content of the jar, if they are there or not. Also, did you do a clean build in ridl after adding the missing gb_Helper_abbreviate_dirs_native? D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: feature/gbuild_java is finished
On 16 February 2012 13:29, David Tardon dtar...@redhat.com wrote: The generated UNO classes must be present in ridl.jar . They are (or should be) added into the jar by $(eval $(call gb_Jar_add_packagedirs,ridl,\ $(WORKDIR)/CustomTarget/ridljar/javamaker/class/com \ )) Ok, so they were present but in wrong form, there was: ... com/sun/star/uno/UnoRuntime.class c:/git/libo/workdir/wntmsci12.pro/CustomTarget/ridljar/javamaker/class/com/sun/star/beans/Ambiguous.class ... - $(foreach root,$(PACKAGEDIRS), $(gb_Jar_JARCOMMAND) uf $(2) -C $(dir $(root)) $(notdir $(root))) \ + $(foreach root,$(PACKAGEDIRS), cd $(dir $(root)) $(gb_Jar_JARCOMMAND) uf $(2) $(notdir $(root))) \ helps solve the problem. jar command on Windows seems to behave differently when using -C Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: feature/gbuild_java is finished
On 16 February 2012 15:29, Matúš Kukan matus.ku...@gmail.com wrote: - $(foreach root,$(PACKAGEDIRS), $(gb_Jar_JARCOMMAND) uf $(2) -C $(dir $(root)) $(notdir $(root))) \ + $(foreach root,$(PACKAGEDIRS), cd $(dir $(root)) $(gb_Jar_JARCOMMAND) uf $(2) $(notdir $(root))) \ helps solve the problem. jar command on Windows seems to behave differently when using -C Ok, so feature/gbuild_java builds fine up to ~tail_build for me after http://cgit.freedesktop.org/libreoffice/core/commit/?h=feature/gbuild_javaid=144390821535d03735819d229e5ec397972b2436 I stopped there, we will see on Friday whether vorrepe will build all. Matus ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: feature/gbuild_java is finished
On Thu, Feb 16, 2012 at 03:29:59PM +0100, Matúš Kukan wrote: On 16 February 2012 13:29, David Tardon dtar...@redhat.com wrote: The generated UNO classes must be present in ridl.jar . They are (or should be) added into the jar by $(eval $(call gb_Jar_add_packagedirs,ridl,\ $(WORKDIR)/CustomTarget/ridljar/javamaker/class/com \ )) Ok, so they were present but in wrong form, there was: ... com/sun/star/uno/UnoRuntime.class c:/git/libo/workdir/wntmsci12.pro/CustomTarget/ridljar/javamaker/class/com/sun/star/beans/Ambiguous.class ... - $(foreach root,$(PACKAGEDIRS), $(gb_Jar_JARCOMMAND) uf $(2) -C $(dir $(root)) $(notdir $(root))) \ + $(foreach root,$(PACKAGEDIRS), cd $(dir $(root)) $(gb_Jar_JARCOMMAND) uf $(2) $(notdir $(root))) \ helps solve the problem. jar command on Windows seems to behave differently when using -C Ah, presumably that is why the base jar cfm command does not use -C either. Thank you for your help! D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: feature/gbuild_java is finished
On 14 February 2012 06:55, David Tardon dtar...@redhat.com wrote: On Mon, Dec 26, 2011 at 01:33:57PM +0100, David Tardon wrote: I have converted 6 modules to gbuild on branch feature/gbuild_java: javaunohelper, jurt, jvmaccess, jvmfwk, ridljar and unoil. It builds fine here and smoketest finishes with status OK, but some of the modules contain platform specific stuff (e.g., unoil creates some .NET assemblies :) I would appreciate if people tried if it builds correctly on Windows/MacOS X/other-system-than-mine. I am going to be waiting for protests for 2-3 weeks and then merge the branch into master :-) I actually waited a lot longer than promised and there is still no response from any developer using Windows. You have your last chance to test it now :-) I am going to merge it on Friday morning (probably around 6:00 UTC). I don't think it's a crime if you break master by changing build system in 6 modules for some platform. I had a look but couldn't build jurt: c:/git/libo/jurt/com/sun/star/comp/loader/FactoryHelper.java:35: cannot find symbol symbol : class XComponentContext location: package com.sun.star.uno import com.sun.star.uno.XComponentContext; ^ c:/git/libo/jurt/com/sun/star/comp/loader/FactoryHelper.java:36: package com.sun.star.lang does not exist import com.sun.star.lang.XInitialization; ^ ... Please push attached patches, I can't do so here. jvmaccess, jvmfwk, ridljar are ok then and the remaining two could be also. Thanks for your work, Matus 0001-jvmfwk-these-are-also-linked_libs.patch Description: Binary data 0002-add-gb_Helper_abbreviate_dirs_native.patch Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: feature/gbuild_java is finished
On Mon, Dec 26, 2011 at 01:33:57PM +0100, David Tardon wrote: Hi all, I have converted 6 modules to gbuild on branch feature/gbuild_java: javaunohelper, jurt, jvmaccess, jvmfwk, ridljar and unoil. It builds fine here and smoketest finishes with status OK, but some of the modules contain platform specific stuff (e.g., unoil creates some .NET assemblies :) I would appreciate if people tried if it builds correctly on Windows/MacOS X/other-system-than-mine. I am going to be waiting for protests for 2-3 weeks and then merge the branch into master :-) I actually waited a lot longer than promised and there is still no response from any developer using Windows. You have your last chance to test it now :-) I am going to merge it on Friday morning (probably around 6:00 UTC). D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: feature/gbuild_java is finished
I actually waited a lot longer than promised and there is still no response from any developer using Windows. You misunderstand how this works. It's the Windows-based developers who have to make sure they don't break the Linux build, not the other way around. --tml ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
