Author: damjan
Date: Fri Dec  9 18:30:45 2016
New Revision: 1773449

URL: http://svn.apache.org/viewvc?rev=1773449&view=rev
Log:
Port main/javaunohelper to gbuild.
Also fix building odk with the new path to the zipped .java files.

Patch by: me

Added:
    openoffice/trunk/main/javaunohelper/Jar_juh.mk
    openoffice/trunk/main/javaunohelper/Library_juh.mk
    openoffice/trunk/main/javaunohelper/Library_juhx.mk
    openoffice/trunk/main/javaunohelper/Makefile   (with props)
    openoffice/trunk/main/javaunohelper/Module_javaunohelper.mk
    openoffice/trunk/main/javaunohelper/Zip_juh_src.mk
    openoffice/trunk/main/javaunohelper/prj/makefile.mk
Removed:
    openoffice/trunk/main/javaunohelper/util/delzip
    openoffice/trunk/main/javaunohelper/util/makefile.mk
    openoffice/trunk/main/javaunohelper/util/settings.pmk
Modified:
    openoffice/trunk/main/Module_ooo.mk
    openoffice/trunk/main/Repository.mk
    openoffice/trunk/main/javaunohelper/prj/build.lst
    openoffice/trunk/main/javaunohelper/prj/d.lst
    openoffice/trunk/main/odk/pack/gendocu/makefile.mk
    openoffice/trunk/main/postprocess/packcomponents/makefile.mk
    openoffice/trunk/main/ure/source/makefile.mk

Modified: openoffice/trunk/main/Module_ooo.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/Module_ooo.mk?rev=1773449&r1=1773448&r2=1773449&view=diff
==============================================================================
--- openoffice/trunk/main/Module_ooo.mk (original)
+++ openoffice/trunk/main/Module_ooo.mk Fri Dec  9 18:30:45 2016
@@ -42,6 +42,7 @@ $(eval $(call gb_Module_add_moduledirs,o
        framework \
        idl \
        io \
+       javaunohelper \
        linguistic \
        o3tl \
        offapi \

Modified: openoffice/trunk/main/Repository.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/Repository.mk?rev=1773449&r1=1773448&r2=1773449&view=diff
==============================================================================
--- openoffice/trunk/main/Repository.mk (original)
+++ openoffice/trunk/main/Repository.mk Fri Dec  9 18:30:45 2016
@@ -72,6 +72,8 @@ $(eval $(call gb_Helper_register_librari
        fwl \
        fwm \
     i18npaper \
+       juh \
+       juhx \
        lng \
        msfilter \
        msword \

Added: openoffice/trunk/main/javaunohelper/Jar_juh.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/javaunohelper/Jar_juh.mk?rev=1773449&view=auto
==============================================================================
--- openoffice/trunk/main/javaunohelper/Jar_juh.mk (added)
+++ openoffice/trunk/main/javaunohelper/Jar_juh.mk Fri Dec  9 18:30:45 2016
@@ -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:

Added: openoffice/trunk/main/javaunohelper/Library_juh.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/javaunohelper/Library_juh.mk?rev=1773449&view=auto
==============================================================================
--- openoffice/trunk/main/javaunohelper/Library_juh.mk (added)
+++ openoffice/trunk/main/javaunohelper/Library_juh.mk Fri Dec  9 18:30:45 2016
@@ -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:

Added: openoffice/trunk/main/javaunohelper/Library_juhx.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/javaunohelper/Library_juhx.mk?rev=1773449&view=auto
==============================================================================
--- openoffice/trunk/main/javaunohelper/Library_juhx.mk (added)
+++ openoffice/trunk/main/javaunohelper/Library_juhx.mk Fri Dec  9 18:30:45 2016
@@ -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:

Added: openoffice/trunk/main/javaunohelper/Makefile
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/javaunohelper/Makefile?rev=1773449&view=auto
==============================================================================
--- openoffice/trunk/main/javaunohelper/Makefile (added)
+++ openoffice/trunk/main/javaunohelper/Makefile Fri Dec  9 18:30:45 2016
@@ -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:

Propchange: openoffice/trunk/main/javaunohelper/Makefile
------------------------------------------------------------------------------
    svn:eol-style = native

Added: openoffice/trunk/main/javaunohelper/Module_javaunohelper.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/javaunohelper/Module_javaunohelper.mk?rev=1773449&view=auto
==============================================================================
--- openoffice/trunk/main/javaunohelper/Module_javaunohelper.mk (added)
+++ openoffice/trunk/main/javaunohelper/Module_javaunohelper.mk Fri Dec  9 
18:30:45 2016
@@ -0,0 +1,33 @@
+#**************************************************************
+#  
+#  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_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:

Added: openoffice/trunk/main/javaunohelper/Zip_juh_src.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/javaunohelper/Zip_juh_src.mk?rev=1773449&view=auto
==============================================================================
--- openoffice/trunk/main/javaunohelper/Zip_juh_src.mk (added)
+++ openoffice/trunk/main/javaunohelper/Zip_juh_src.mk Fri Dec  9 18:30:45 2016
@@ -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:

Modified: openoffice/trunk/main/javaunohelper/prj/build.lst
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/javaunohelper/prj/build.lst?rev=1773449&r1=1773448&r2=1773449&view=diff
==============================================================================
--- openoffice/trunk/main/javaunohelper/prj/build.lst (original)
+++ openoffice/trunk/main/javaunohelper/prj/build.lst Fri Dec  9 18:30:45 2016
@@ -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

Modified: openoffice/trunk/main/javaunohelper/prj/d.lst
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/javaunohelper/prj/d.lst?rev=1773449&r1=1773448&r2=1773449&view=diff
==============================================================================
--- openoffice/trunk/main/javaunohelper/prj/d.lst (original)
+++ openoffice/trunk/main/javaunohelper/prj/d.lst Fri Dec  9 18:30:45 2016
@@ -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

Added: openoffice/trunk/main/javaunohelper/prj/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/javaunohelper/prj/makefile.mk?rev=1773449&view=auto
==============================================================================
--- openoffice/trunk/main/javaunohelper/prj/makefile.mk (added)
+++ openoffice/trunk/main/javaunohelper/prj/makefile.mk Fri Dec  9 18:30:45 2016
@@ -0,0 +1,44 @@
+#**************************************************************
+#  
+#  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.
+#  
+#**************************************************************
+
+
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.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

Modified: openoffice/trunk/main/odk/pack/gendocu/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/odk/pack/gendocu/makefile.mk?rev=1773449&r1=1773448&r2=1773449&view=diff
==============================================================================
--- openoffice/trunk/main/odk/pack/gendocu/makefile.mk (original)
+++ openoffice/trunk/main/odk/pack/gendocu/makefile.mk Fri Dec  9 18:30:45 2016
@@ -97,9 +97,9 @@ $(CPP_DOCU_INDEX_FILE) : $(CPP_DOCU_CLEA
        -rm $(@:d:d)$/cpp.css
        $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/docs$/cpp$/ref$/cpp.css 
$(MY_TEXTCOPY_TARGETPRE) $(@:d:d)$/cpp.css
 
-$(JAVA_SRC_FILES) : $(SOLARCOMMONBINDIR)$/$$(@:f)
+$(JAVA_SRC_FILES) : $(SOLARCOMMONBINDIR)$/jurt_src.zip 
$(SOLARCOMMONBINDIR)$/ridl_src.zip $(SOLARCOMMONBINDIR)$/unoloader_src.zip 
$(SOLARCOMMONPCKDIR)$/juh_src.zip
        -$(MKDIRHIER) $(@:d)        
-       $(MY_COPY) $< $@
+       $(MY_COPY) $^ $(JAVA_SRC_DIR)
        cd $(JAVA_SRC_DIR) && unzip -qu $(@:f)
 
 #$(JAVA_SRC_DIR)$/com$/sun$/star$/beans$/%.java : 
$(PRJ)$/source$/bean$/com$/sun$/star$/beans$/%.java 

Modified: openoffice/trunk/main/postprocess/packcomponents/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/postprocess/packcomponents/makefile.mk?rev=1773449&r1=1773448&r2=1773449&view=diff
==============================================================================
--- openoffice/trunk/main/postprocess/packcomponents/makefile.mk (original)
+++ openoffice/trunk/main/postprocess/packcomponents/makefile.mk Fri Dec  9 
18:30:45 2016
@@ -41,7 +41,6 @@ my_components = \
     invocation \
     javaloader \
     javavm \
-    juh \
     namingservice \
     proxyfac \
     reflection \
@@ -84,6 +83,7 @@ my_components = \
     component/io/source/stm/streams \
     component/io/source/TextInputStream/textinstream \
     component/io/source/TextOutputStream/textoutstream \
+    component/javaunohelper/util/juh \
     component/linguistic/source/lng \
     component/oox/util/oox \
     component/package/source/xstor/xstor \

Modified: openoffice/trunk/main/ure/source/makefile.mk
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/ure/source/makefile.mk?rev=1773449&r1=1773448&r2=1773449&view=diff
==============================================================================
--- openoffice/trunk/main/ure/source/makefile.mk (original)
+++ openoffice/trunk/main/ure/source/makefile.mk Fri Dec  9 18:30:45 2016
@@ -39,7 +39,7 @@ my_components = \
     invocation \
     javaloader \
     javavm \
-    juh \
+    component/javaunohelper/util/juh \
     namingservice \
     proxyfac \
     reflection \


Reply via email to