Port main/javaunohelper to gbuild.

Also fix building odk with the new path to the zipped .java files.

Patch by: me

10 files changed, 282 insertions, 45 deletions

diff --git a/javaunohelper/Jar_juh.mk b/javaunohelper/Jar_juh.mk
new file mode 100644
index 000000000000..3895edf1c062
--- /dev/null
+++ b/javaunohelper/Jar_juh.mk
@@ -0,0 +1,72 @@
+###############################################################
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+###############################################################
+
+
+
+$(eval $(call gb_Jar_Jar,juh,SRCDIR))
+
+$(eval $(call gb_Jar_add_jars,juh,\
+	$(OUTDIR)/bin/ridl.jar \
+	$(OUTDIR)/bin/jurt.jar \
+	$(OUTDIR)/bin/unoil.jar \
+))
+
+$(eval $(call gb_Jar_set_packageroot,juh,com))
+
+$(eval $(call gb_Jar_set_manifest,juh,$(SRCDIR)/javaunohelper/util/manifest))
+
+$(eval $(call gb_Jar_set_jarclasspath,juh,\
+	ridl.jar \
+	jurt.jar \
+	../../lib/ \
+	../bin/ \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,juh,\
+	javaunohelper/com/sun/star/lib/uno/helper/UnoUrl \
+	javaunohelper/com/sun/star/lib/uno/helper/Factory \
+	javaunohelper/com/sun/star/lib/uno/helper/ComponentBase \
+	javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter \
+	javaunohelper/com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer \
+	javaunohelper/com/sun/star/lib/uno/helper/WeakBase \
+	javaunohelper/com/sun/star/lib/uno/helper/PropertySetMixin \
+	javaunohelper/com/sun/star/lib/uno/helper/PropertySet \
+	javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer \
+	javaunohelper/com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter \
+	javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter \
+	javaunohelper/com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter \
+	javaunohelper/com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter \
+	javaunohelper/com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter \
+	javaunohelper/com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter \
+	javaunohelper/com/sun/star/comp/JavaUNOHelperServices \
+	javaunohelper/com/sun/star/comp/juhtest/SmoketestCommandEnvironment \
+	javaunohelper/com/sun/star/comp/helper/RegistryServiceFactory \
+	javaunohelper/com/sun/star/comp/helper/UnoInfo \
+	javaunohelper/com/sun/star/comp/helper/ComponentContext \
+	javaunohelper/com/sun/star/comp/helper/BootstrapException \
+	javaunohelper/com/sun/star/comp/helper/SharedLibraryLoader \
+	javaunohelper/com/sun/star/comp/helper/Bootstrap \
+	javaunohelper/com/sun/star/comp/helper/ComponentContextEntry \
+))
+
+$(eval $(call gb_Jar_set_componentfile,juh,javaunohelper/util/juh,URE))
+
+# vim: set noet sw=4 ts=4:
diff --git a/javaunohelper/Library_juh.mk b/javaunohelper/Library_juh.mk
new file mode 100644
index 000000000000..8cdccc0625ad
--- /dev/null
+++ b/javaunohelper/Library_juh.mk
@@ -0,0 +1,43 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,juh))
+
+$(eval $(call gb_Library_add_precompiled_header,juh,$(SRCDIR)/javaunohelper/inc/pch/precompiled_javaunohelper))
+
+$(eval $(call gb_Library_set_include,juh,\
+        $$(INCLUDE) \
+	-I$(SRCDIR)/javaunohelper/inc/pch \
+))
+
+$(eval $(call gb_Library_add_linked_libs,juh,\
+	sal \
+	$(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,juh,\
+	javaunohelper/source/preload \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/javaunohelper/Library_juhx.mk b/javaunohelper/Library_juhx.mk
new file mode 100644
index 000000000000..4956208278b4
--- /dev/null
+++ b/javaunohelper/Library_juhx.mk
@@ -0,0 +1,53 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,juhx))
+
+$(eval $(call gb_Library_add_precompiled_header,juhx,$(SRCDIR)/javaunohelper/inc/pch/precompiled_javaunohelper))
+
+$(eval $(call gb_Library_set_include,juhx,\
+        $$(INCLUDE) \
+	-I$(SRCDIR)/javaunohelper/inc/pch \
+))
+
+$(eval $(call gb_Library_add_api,juhx,\
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,juhx,\
+	cppu \
+	cppuhelper \
+	jvmaccess \
+	sal \
+	salhelper \
+	$(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,juhx,\
+	javaunohelper/source/javaunohelper \
+	javaunohelper/source/bootstrap \
+	javaunohelper/source/vm \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/javaunohelper/Makefile b/javaunohelper/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/javaunohelper/Makefile
@@ -0,0 +1,32 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/javaunohelper/util/settings.pmk b/javaunohelper/Module_javaunohelper.mk
index 693f7b80bfd2..fe1fe0f00ecf 100644
--- a/javaunohelper/util/settings.pmk
+++ b/javaunohelper/Module_javaunohelper.mk
@@ -21,4 +21,13 @@
 
 
 
-JARFILES = ridl.jar jurt.jar
+$(eval $(call gb_Module_Module,javaunohelper))
+
+$(eval $(call gb_Module_add_targets,javaunohelper,\
+	Jar_juh \
+	Library_juh \
+	Library_juhx \
+	Zip_juh_src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/javaunohelper/Zip_juh_src.mk b/javaunohelper/Zip_juh_src.mk
new file mode 100644
index 000000000000..1fb12bad718a
--- /dev/null
+++ b/javaunohelper/Zip_juh_src.mk
@@ -0,0 +1,53 @@
+###############################################################
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+###############################################################
+
+
+
+$(eval $(call gb_Zip_Zip,juh_src,$(SRCDIR)/javaunohelper))
+
+$(eval $(call gb_Zip_add_files,juh_src,\
+	com/sun/star/lib/uno/helper/UnoUrl.java \
+	com/sun/star/lib/uno/helper/Factory.java \
+	com/sun/star/lib/uno/helper/ComponentBase.java \
+	com/sun/star/lib/uno/helper/WeakAdapter.java \
+	com/sun/star/lib/uno/helper/MultiTypeInterfaceContainer.java \
+	com/sun/star/lib/uno/helper/WeakBase.java \
+	com/sun/star/lib/uno/helper/PropertySetMixin.java \
+	com/sun/star/lib/uno/helper/PropertySet.java \
+	com/sun/star/lib/uno/helper/InterfaceContainer.java \
+	com/sun/star/lib/uno/adapter/ByteArrayToXInputStreamAdapter.java \
+	com/sun/star/lib/uno/adapter/XOutputStreamToByteArrayAdapter.java \
+	com/sun/star/lib/uno/adapter/XOutputStreamToOutputStreamAdapter.java \
+	com/sun/star/lib/uno/adapter/InputStreamToXInputStreamAdapter.java \
+	com/sun/star/lib/uno/adapter/XInputStreamToInputStreamAdapter.java \
+	com/sun/star/lib/uno/adapter/OutputStreamToXOutputStreamAdapter.java \
+	com/sun/star/comp/JavaUNOHelperServices.java \
+	com/sun/star/comp/juhtest/SmoketestCommandEnvironment.java \
+	com/sun/star/comp/helper/RegistryServiceFactory.java \
+	com/sun/star/comp/helper/UnoInfo.java \
+	com/sun/star/comp/helper/ComponentContext.java \
+	com/sun/star/comp/helper/BootstrapException.java \
+	com/sun/star/comp/helper/SharedLibraryLoader.java \
+	com/sun/star/comp/helper/Bootstrap.java \
+	com/sun/star/comp/helper/ComponentContextEntry.java \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/javaunohelper/prj/build.lst b/javaunohelper/prj/build.lst
index d97a6450d06a..3fe5369c50de 100644
--- a/javaunohelper/prj/build.lst
+++ b/javaunohelper/prj/build.lst
@@ -1,10 +1,2 @@
 jh  javaunohelper : LIBXSLT:libxslt bridges cppuhelper jurt ridljar unoil NULL
-jh	javaunohelper								usr1	-	all	jh_mkout NULL
-jh	javaunohelper\inc							nmake	-	all	jh_inc NULL
-jh	javaunohelper\com\sun\star\comp\helper		nmake	-	all	jh_helper jh_inc NULL
-jh	javaunohelper\com\sun\star\comp\juhtest		nmake	-	all	jh_juhtest jh_helper jh_libhelp NULL
-jh	javaunohelper\com\sun\star\comp			    nmake	-	all	jh_comp jh_juhtest NULL
-jh	javaunohelper\com\sun\star\lib\uno\adapter	nmake	-	all	jh_adapter jh_libhelp jh_inc NULL
-jh	javaunohelper\com\sun\star\lib\uno\helper	nmake	-	all	jh_libhelp jh_inc NULL
-jh	javaunohelper\source						nmake	-	all	jh_source jh_inc NULL
-jh	javaunohelper\util							nmake	-	all	jh_util jh_helper jh_source jh_adapter jh_libhelp jh_comp NULL
+jh	javaunohelper\prj							nmake	-	all	jh_prj NULL
diff --git a/javaunohelper/prj/d.lst b/javaunohelper/prj/d.lst
index d58290843f48..e69de29bb2d1 100644
--- a/javaunohelper/prj/d.lst
+++ b/javaunohelper/prj/d.lst
@@ -1,7 +0,0 @@
-..\%__SRC%\class\juh.jar %_DEST%\bin%_EXT%\juh.jar
-..\%__SRC%\bin\juh*.dll %_DEST%\bin%_EXT%\juh*.dll
-..\%__SRC%\lib\libjuh*.so %_DEST%\lib%_EXT%\libjuh*.so
-..\%__SRC%\lib\libjuh*.dylib %_DEST%\lib%_EXT%\libjuh*.dylib
-..\%__SRC%\misc\juh.component %_DEST%\xml%_EXT%\juh.component
-
-..\%__SRC%\bin\juh_src.zip %COMMON_DEST%\bin%_EXT%\juh_src.zip
diff --git a/javaunohelper/util/makefile.mk b/javaunohelper/prj/makefile.mk
index c752b4f6c26a..c62c6a657d16 100644
--- a/javaunohelper/util/makefile.mk
+++ b/javaunohelper/prj/makefile.mk
@@ -21,34 +21,24 @@
 
 
 
-PRJ		= ..
-PRJNAME = juhelper
-TARGET  = juh
+PRJ=..
+TARGET=prj
 
 .INCLUDE : settings.mk
-.INCLUDE: settings.pmk
 
-JARCLASSDIRS = com
-JARTARGET		= $(TARGET).jar
-JARCOMPRESS		= TRUE
-JARCLASSPATH = $(JARFILES) ../../lib/ ../bin/
-CUSTOMMANIFESTFILE = manifest
-
-# Special work necessary for building java reference with javadoc.
-# The source of puplic APIs must be delivered and used later in the
-# odk module.
-ZIP1TARGET=$(TARGET)_src
-ZIP1FLAGS=-u -r
-ZIP1DIR=$(PRJ)
-ZIP1LIST=com -x "*makefile.mk"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/juh.component
-
-$(MISC)/juh.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        juh.component
-    $(XSLTPROC) --nonet --stringparam uri '$(COMPONENTPREFIX_URE_JAVA)juh.jar' \
-        -o $@ $(SOLARENV)/bin/createcomponent.xslt juh.component
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/javaunohelper/util/delzip b/javaunohelper/util/delzip
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/javaunohelper/util/delzip
+++ /dev/null