Re: [comment] java extensions makefile - generify

2016-08-23 Thread Zenaan Harkness
On Mon, Aug 22, 2016 at 12:08:13PM +, Jenkins (via Code Review) wrote:
> Jenkins has posted comments on this change.
> 
> Change subject: java extensions makefile - generify
> ..
> 
> 
> Patch Set 1:
> 
> Build Failed 
> 
> http://ci.libreoffice.org/job/lo_gerrit/682/ : FAILURE
> 
> http://ci.libreoffice.org/job/lo_gerrit_master/20528/ : FAILURE

Can someone please explain these to me, or point me at an explanatory
URL?

TIA
Zenaan


> -- 
> To view, visit https://gerrit.libreoffice.org/28317
> To unsubscribe, visit https://gerrit.libreoffice.org/settings
> 
> Gerrit-MessageType: comment
> Gerrit-Change-Id: I3819ab94e2c056220993971de44408e46a4559ed
> Gerrit-PatchSet: 1
> Gerrit-Project: core
> Gerrit-Branch: master
> Gerrit-Owner: Zenaan Harkness <z...@freedbms.net>
> Gerrit-Reviewer: Jenkins <c...@libreoffice.org>
> Gerrit-HasComments: No
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice-commits] core.git: odk/settings

2016-08-23 Thread Zenaan Harkness
 odk/settings/std.mk |9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

New commits:
commit 690a1aa9dcf8ce98ec7f96a5980b571566152865
Author: Zenaan Harkness <z...@freedbms.net>
Date:   Mon Aug 22 21:58:36 2016 +1000

java extensions makefile - generify

See http://listarchives.libreoffice.org/global/users/msg49357.html

odk/settings/std.mk currently adds each .class file separately,
therefore having to be updated manually any time one class or
anonymous class is added, removed etc.; all the .class files in
com/sun/star/lib/loader/ are needed in the jar anyway, so use a
generic makefile rule.

Change-Id: I3819ab94e2c056220993971de44408e46a4559ed
Reviewed-on: https://gerrit.libreoffice.org/28317
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Stephan Bergmann <sberg...@redhat.com>
Reviewed-by: jan iversen <j...@documentfoundation.org>

diff --git a/odk/settings/std.mk b/odk/settings/std.mk
index 4cabe70..ac2d4aa 100644
--- a/odk/settings/std.mk
+++ b/odk/settings/std.mk
@@ -82,12 +82,5 @@ JAVAMAKER="$(OO_SDK_HOME)/bin/javamaker"
 REGMERGE="$(OO_SDK_URE_BIN_DIR)/regmerge"
 
 SDK_JAVA_UNO_BOOTSTRAP_FILES=\
--C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader.class$(SQM) \
--C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$1.class$(SQM) \
--C $(CLASSES_DIR) 
$(SQM)com/sun/star/lib/loader/Loader$$CustomURLClassLoader.class$(SQM) \
--C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader$$Drain.class$(SQM) \
--C $(CLASSES_DIR) 
$(SQM)com/sun/star/lib/loader/InstallationFinder.class$(SQM) \
--C $(CLASSES_DIR) 
$(SQM)com/sun/star/lib/loader/InstallationFinder$$StreamGobbler.class$(SQM) \
--C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/WinRegKey.class$(SQM) \
--C $(CLASSES_DIR) 
$(SQM)com/sun/star/lib/loader/WinRegKeyException.class$(SQM) \
+-C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/$(SQM) \
 -C $(CLASSES_DIR) $(SQM)win/unowinreg.dll$(SQM)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


Re: [libreoffice-users] LO 5.2 sdk patch - java extensions makefile bug sdk/classes/settings/std.mk

2016-08-22 Thread Zenaan Harkness
Got there - packaged as a first patch, ready for review:
https://gerrit.libreoffice.org/#/c/28317/


On Thu, Aug 18, 2016 at 04:40:57PM +0200, Stephan Bergmann wrote:
> On 08/18/2016 03:51 PM, Zenaan Harkness wrote:
> >Got stuck needing a simple fix, for the following bug:
> >
> >$ ... set up LO sdk as per ./setsdkenv_unix ...
> >$ cd sdk/examples/DevelopersGuide/FirstSteps
> >$ make FirstStepsExamples
> >...
> >
> >$ make FirstUnoContact.run
> >"/usr/bin/java" 
> >-Dcom.sun.star.lib.loader.unopath="/opt/l/libreoffice/program" -jar 
> >/home/me/lo/llo/out/libreoffice5.2_sdk/LINUXexample.out/class/FirstStepsExamples/FirstUnoContact.jar
> >Exception in thread "main" java.lang.NoClassDefFoundError: 
> >com/sun/star/lib/loader/Loader$1
> >   at com.sun.star.lib.loader.Loader.getCustomLoader(Loader.java:177)
> >   at com.sun.star.lib.loader.Loader.main(Loader.java:127)
> >Caused by: java.lang.ClassNotFoundException: com.sun.star.lib.loader.Loader$1
> >   at java.net.URLClassLoader.findClass(URLClassLoader.java:381)
> >   at java.lang.ClassLoader.loadClass(ClassLoader.java:424)
> >   at sun.misc.Launcher$AppClassLoader.loadClass(Launcher.java:331)
> >   at java.lang.ClassLoader.loadClass(ClassLoader.java:357)
> >   ... 2 more
> >make: *** [FirstUnoContact.run] Error 1
> >Makefile:96: recipe for target 'FirstUnoContact.run' failed
> >
> >
> >So this is a simple problem, the makefile includes most required files
> >into the jar file, but not the missing
> >"com/sun/star/lib/loader/Loader$1.class"
> 
> Happened to get fixed just yesterday for LO 5.2.1, 
> <https://cgit.freedesktop.org/libreoffice/core/commit/?h=libreoffice-5-2-1=fa729e8cf6e3b3e00f0a031d4fc7d7183f4e073d>
> "Add missing Loader$1.class".
> 
> >The current settings/std.mk recipe includes each required file from the
> >same directory, one by one, but omits this one. Just adding all the
> >files from that dir (which are all needed to be in the jar file) is
> >better (will catch any additions/ removals in future versions
> >automatically).
> >
> >Here's the git diff patch which makes things work properly:
> >
> >diff --git a/settings/std.mk b/settings/std.mk
> >index 9fe1e79..ac2d4aa 100644
> >--- a/settings/std.mk
> >+++ b/settings/std.mk
> >@@ -82,12 +82,5 @@ JAVAMAKER="$(OO_SDK_HOME)/bin/javamaker"
> > REGMERGE="$(OO_SDK_URE_BIN_DIR)/regmerge"
> >
> > SDK_JAVA_UNO_BOOTSTRAP_FILES=\
> >--C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/Loader.class$(SQM) \
> >--C $(CLASSES_DIR) 
> >$(SQM)com/sun/star/lib/loader/Loader$$Drain.class$(SQM) \
> >--C $(CLASSES_DIR) 
> >$(SQM)com/sun/star/lib/loader/Loader$$CustomURLClassLoader.class$(SQM) \
> >--C $(CLASSES_DIR) 
> >$(SQM)com/sun/star/lib/loader/Loader$$Drain.class$(SQM) \
> >--C $(CLASSES_DIR) 
> >$(SQM)com/sun/star/lib/loader/InstallationFinder.class$(SQM) \
> >--C $(CLASSES_DIR) 
> >$(SQM)com/sun/star/lib/loader/InstallationFinder$$StreamGobbler.class$(SQM) \
> >--C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/WinRegKey.class$(SQM) \
> >--C $(CLASSES_DIR) 
> >$(SQM)com/sun/star/lib/loader/WinRegKeyException.class$(SQM) \
> >+-C $(CLASSES_DIR) $(SQM)com/sun/star/lib/loader/$(SQM) \
> > -C $(CLASSES_DIR) $(SQM)win/unowinreg.dll$(SQM)
> >
> >
> >If you need a different format, for this or future patches,
> >please let me know.
> >
> >NOTE: Currently I'm just working in a local lo sdk directory created
> >from the distribution tar file. I intend to clone a full sdk repo when I
> >have adequate network access to do so. IN OTHER WORDS, the git hashes
> >above are most likely incorrect/ not related to the actual repo - please
> >tell me how to create a "repo neutral" patch.
> 
> Yeah, your fix looks much better indeed.  Please see
> <https://wiki.documentfoundation.org/Development/gerrit> for how to send a
> patch for review.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice


Zenaan Harkness license statement - MPLv2/LGPLv3+ dual license

2016-08-22 Thread Zenaan Harkness
All of my past & future contributions to LibreOffice are
licensed under the MPLv2/LGPLv3+ dual license.

Zenaan Harkness
Australia
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice