diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-03-23 16:11:42 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-03-23 16:20:17 +0100 |
commit | 0b9fda25f321ce2697179064e330843237177668 (patch) | |
tree | 9be4cf5c4cc7a6f0a6c5d0bf02ae09bd7cd87a5d /scripting/Jar_HelloWorld.mk | |
parent | fdo#46102: Load Java scripts with class loaders that actually find them (diff) | |
download | core-0b9fda25f321ce2697179064e330843237177668.tar.gz core-0b9fda25f321ce2697179064e330843237177668.zip |
fdo#46102: Fix Java script examples after gbuild'ification
...they contained no class files anymore, due to missing gb_Jar_set_packageroot
calls. However, those calls only work for subdirectories, i.e., the example
.java files need to be put into a package (I chose
org.libreoffice.example.java_scripts) for all of them). This in turn required
adaption of the parcel-descriptor.xml files; not sure what the logicalname
entries there are good for if anything -- the macro names at "Tools - Macros -
Run Macro..." now unfortunately(?) contain the fully qualified paths for the
HelloWorld, HighlightText, and MemoryUpdate examples. There are additional
examples at scripting/examples/java/ that apparently do not get packaged (but I
adapted them anyway).
Diffstat (limited to 'scripting/Jar_HelloWorld.mk')
-rw-r--r-- | scripting/Jar_HelloWorld.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripting/Jar_HelloWorld.mk b/scripting/Jar_HelloWorld.mk index fa0ec4d9c1c8..87902d3e284c 100644 --- a/scripting/Jar_HelloWorld.mk +++ b/scripting/Jar_HelloWorld.mk @@ -39,4 +39,6 @@ $(eval $(call gb_Jar_add_sourcefiles,HelloWorld,\ scripting/examples/java/HelloWorld/HelloWorld \ )) +$(eval $(call gb_Jar_set_packageroot,HelloWorld,org)) + # vim: set noet sw=4 ts=4: |