Repository.mk | 2 desktop/Extension_test-active.mk | 23 ++ desktop/Jar_active_java.mk | 28 ++ desktop/Library_active_native.mk | 28 ++ desktop/Module_desktop.mk | 8 desktop/test/deployment/active/Dispatch.java | 95 ---------- desktop/test/deployment/active/META-INF/manifest.xml | 34 +++ desktop/test/deployment/active/Provider.java | 74 ------- desktop/test/deployment/active/Services.java | 65 ------ desktop/test/deployment/active/active_native.cxx | 2 desktop/test/deployment/active/com/sun/star/comp/test/deployment/Dispatch.java | 95 ++++++++++ desktop/test/deployment/active/com/sun/star/comp/test/deployment/Provider.java | 74 +++++++ desktop/test/deployment/active/com/sun/star/comp/test/deployment/Services.java | 65 ++++++ desktop/test/deployment/active/makefile.mk | 78 -------- desktop/test/deployment/active/manifest.xml | 34 --- include/sal/log-areas.dox | 1 solenv/gbuild/Extension.mk | 1 17 files changed, 360 insertions(+), 347 deletions(-)
New commits: commit 1327020b6723ef988fe4e8399a87ce70e21419d7 Author: Stephan Bergmann <sberg...@redhat.com> Date: Mon Dec 16 11:23:54 2013 +0100 Re-enable building test-active.oxt Change-Id: I56bd0630f8d238488d9d6598d87acefe1a08fdf0 diff --git a/Repository.mk b/Repository.mk index d4a103c..3362b71 100644 --- a/Repository.mk +++ b/Repository.mk @@ -630,6 +630,7 @@ $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \ )) $(eval $(call gb_Helper_register_libraries,EXTENSIONLIBS, \ + active_native \ mysqlc \ passive_native \ )) @@ -676,6 +677,7 @@ $(eval $(call gb_Helper_register_jars,OOO, \ $(eval $(call gb_Helper_register_jars,OXT, \ EvolutionarySolver \ + active_java \ mediawiki \ nlpsolver \ passive_java \ diff --git a/desktop/Extension_test-active.mk b/desktop/Extension_test-active.mk new file mode 100644 index 0000000..fbb329f --- /dev/null +++ b/desktop/Extension_test-active.mk @@ -0,0 +1,23 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Extension_Extension,test-active,desktop/test/deployment/active,nodeliver)) + +$(eval $(call gb_Extension_add_files,test-active,, \ + $(SRCDIR)/desktop/test/deployment/active/Addons.xcu \ + $(SRCDIR)/desktop/test/deployment/active/ProtocolHandler.xcu \ + $(SRCDIR)/desktop/test/deployment/active/active_python.py \ + $(call gb_Jar_get_target,active_java) \ +)) + +$(eval $(call gb_Extension_add_libraries,test-active, \ + active_native \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/desktop/Jar_active_java.mk b/desktop/Jar_active_java.mk new file mode 100644 index 0000000..5fa49e84 --- /dev/null +++ b/desktop/Jar_active_java.mk @@ -0,0 +1,28 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Jar_Jar,active_java)) + +$(eval $(call gb_Jar_add_sourcefiles,active_java, \ + desktop/test/deployment/active/com/sun/star/comp/test/deployment/Dispatch \ + desktop/test/deployment/active/com/sun/star/comp/test/deployment/Provider \ + desktop/test/deployment/active/com/sun/star/comp/test/deployment/Services \ +)) + +$(eval $(call gb_Jar_set_manifest,active_java,$(SRCDIR)/desktop/test/deployment/active/MANIFEST.MF)) + +$(eval $(call gb_Jar_set_packageroot,active_java,com)) + +$(eval $(call gb_Jar_use_jars,active_java, \ + juh \ + ridl \ + unoil \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/desktop/Library_active_native.mk b/desktop/Library_active_native.mk new file mode 100644 index 0000000..7c09c10 --- /dev/null +++ b/desktop/Library_active_native.mk @@ -0,0 +1,28 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Library_Library,active_native)) + +$(eval $(call gb_Library_add_exception_objects,active_native, \ + desktop/test/deployment/active/active_native \ +)) + +$(eval $(call gb_Library_use_externals,active_native, \ + boost_headers \ +)) + +$(eval $(call gb_Library_use_libraries,active_native, \ + cppu \ + cppuhelper \ + sal \ +)) + +$(eval $(call gb_Library_use_sdk_api,active_native)) + +# vim: set noet sw=4 ts=4: diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index 20e996b..b54bc96 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -108,6 +108,14 @@ $(eval $(call gb_Module_add_targets,desktop,\ endif +ifneq (,$(filter Extension_test-active,$(MAKECMDGOALS))) +$(eval $(call gb_Module_add_targets,desktop, \ + Extension_test-active \ + Jar_active_java \ + Library_active_native \ +)) +endif + ifneq (,$(filter Extension_test-passive,$(MAKECMDGOALS))) $(eval $(call gb_Module_add_targets,desktop, \ Extension_test-passive \ diff --git a/desktop/test/deployment/active/manifest.xml b/desktop/test/deployment/active/META-INF/manifest.xml similarity index 96% rename from desktop/test/deployment/active/manifest.xml rename to desktop/test/deployment/active/META-INF/manifest.xml index 001ca8d..7cca784 100644 --- a/desktop/test/deployment/active/manifest.xml +++ b/desktop/test/deployment/active/META-INF/manifest.xml @@ -24,7 +24,7 @@ m:full-path="ProtocolHandler.xcu"/> <m:file-entry m:media-type="application/vnd.sun.star.uno-component;type=native;platform=@PLATFORM@" - m:full-path="@PATH@"/> + m:full-path="active_native.uno@SHARED_EXTENSION@"/> <m:file-entry m:media-type="application/vnd.sun.star.uno-component;type=Java" m:full-path="active_java.jar"/> diff --git a/desktop/test/deployment/active/active_native.cxx b/desktop/test/deployment/active/active_native.cxx index 2242c6b..f84336d 100644 --- a/desktop/test/deployment/active/active_native.cxx +++ b/desktop/test/deployment/active/active_native.cxx @@ -252,7 +252,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( pImplName, pServiceManager, pRegistryKey, services); } -extern "C" sal_Bool SAL_CALL component_writeInfo( +extern "C" SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( void * pServiceManager, void * pRegistryKey) { if (!component_writeInfoHelper(pServiceManager, pRegistryKey, services)) { diff --git a/desktop/test/deployment/active/Dispatch.java b/desktop/test/deployment/active/com/sun/star/comp/test/deployment/Dispatch.java similarity index 100% rename from desktop/test/deployment/active/Dispatch.java rename to desktop/test/deployment/active/com/sun/star/comp/test/deployment/Dispatch.java diff --git a/desktop/test/deployment/active/Provider.java b/desktop/test/deployment/active/com/sun/star/comp/test/deployment/Provider.java similarity index 100% rename from desktop/test/deployment/active/Provider.java rename to desktop/test/deployment/active/com/sun/star/comp/test/deployment/Provider.java diff --git a/desktop/test/deployment/active/Services.java b/desktop/test/deployment/active/com/sun/star/comp/test/deployment/Services.java similarity index 100% rename from desktop/test/deployment/active/Services.java rename to desktop/test/deployment/active/com/sun/star/comp/test/deployment/Services.java diff --git a/desktop/test/deployment/active/makefile.mk b/desktop/test/deployment/active/makefile.mk deleted file mode 100644 index baa7938..0000000 --- a/desktop/test/deployment/active/makefile.mk +++ /dev/null @@ -1,78 +0,0 @@ -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# This file incorporates work covered by the following license notice: -# -# 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 . -# - -PRJ = ../../.. -PRJNAME = desktop -TARGET = test_deployment_active - -ENABLE_EXCEPTIONS = TRUE - -PACKAGE = com/sun/star/comp/test/deployment/active_java -JAVAFILES = Dispatch.java Provider.java Services.java -JARFILES = juh.jar ridl.jar unoil.jar - -.INCLUDE: settings.mk - -DLLPRE = - -SLOFILES = $(SHL1OBJS) - -SHL1TARGET = active_native.uno -SHL1OBJS = $(SLO)/active_native.obj -SHL1RPATH = OXT -SHL1STDLIBS = $(CPPUHELPERLIB) $(CPPULIB) $(SALLIB) -SHL1VERSIONMAP = $(SOLARENV)/src/reg-component.map -DEF1NAME = $(SHL1TARGET) - -.INCLUDE: target.mk - -.IF "$(ENABLE_JAVA)" != "" - -ALLTAR : $(MISC)/active.oxt - -$(MISC)/active.oxt : manifest.xml description.xml Addons.xcu \ - ProtocolHandler.xcu $(SHL1TARGETN) $(MISC)/$(TARGET)/active_java.jar \ - active_python.py - $(RM) $@ - $(RM) -r $(MISC)/$(TARGET)/active.oxt-zip - $(MKDIR) $(MISC)/$(TARGET)/active.oxt-zip - $(MKDIRHIER) $(MISC)/$(TARGET)/active.oxt-zip/META-INF - $(SED) -e 's|@PATH@|$(SHL1TARGETN:f)|g' \ - -e 's|@PLATFORM@|$(RTL_OS:l)_$(RTL_ARCH:l)|g' < manifest.xml \ - > $(MISC)/$(TARGET)/active.oxt-zip/META-INF/manifest.xml - $(COPY) description.xml Addons.xcu ProtocolHandler.xcu $(SHL1TARGETN) \ - $(MISC)/$(TARGET)/active_java.jar active_python.py \ - $(MISC)/$(TARGET)/active.oxt-zip/ - cd $(MISC)/$(TARGET)/active.oxt-zip && zip ../../active.oxt \ - META-INF/manifest.xml description.xml Addons.xcu ProtocolHandler.xcu \ - $(SHL1TARGETN:f) active_java.jar active_python.py - -$(MISC)/$(TARGET)/active_java.jar : MANIFEST.MF $(JAVATARGET) - $(MKDIRHIER) $(@:d) - $(RM) $@ - $(RM) -r $(MISC)/$(TARGET)/active_java.jar-zip - $(MKDIR) $(MISC)/$(TARGET)/active_java.jar-zip - $(MKDIRHIER) $(MISC)/$(TARGET)/active_java.jar-zip/META-INF \ - $(MISC)/$(TARGET)/active_java.jar-zip/$(PACKAGE) - $(COPY) MANIFEST.MF $(MISC)/$(TARGET)/active_java.jar-zip/META-INF/ - $(COPY) $(foreach,i,$(JAVAFILES:b) $(CLASSDIR)/$(PACKAGE)/$i.class) \ - $(MISC)/$(TARGET)/active_java.jar-zip/$(PACKAGE)/ - cd $(MISC)/$(TARGET)/active_java.jar-zip && zip ../active_java.jar \ - META-INF/MANIFEST.MF $(foreach,i,$(JAVAFILES:b) $(PACKAGE)/$i.class) - -.ENDIF diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index 3d916e6..ed8e39e 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -99,6 +99,7 @@ certain functionality. @li @c desktop.migration @li @c desktop.offacc @li @c desktop.splash +@li @c desktop.test @section Draw commit c3353da0f0f3b09ae6d0dd0be734a0f889629f0c Author: Stephan Bergmann <sberg...@redhat.com> Date: Mon Dec 16 11:22:29 2013 +0100 Rebuild .oxt when manifest.xml changes Change-Id: Iecd054809109368e2305b3fd4183e53a57a1ec45 diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 419deb6..bf0ce74 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -121,6 +121,7 @@ $(call gb_Extension_get_target,$(1)) : FILES := META-INF description.xml $(call gb_Extension_get_target,$(1)) : LICENSE := $(call gb_Extension_get_target,$(1)) : LOCATION := $(SRCDIR)/$(2) $(call gb_Extension_get_target,$(1)) : PLATFORM := $(PLATFORMID) +$(call gb_Extension_get_target,$(1)) : $(SRCDIR)/$(2)/META-INF/manifest.xml $(call gb_Extension_get_workdir,$(1))/description.xml : \ $(SRCDIR)/$(2)/description.xml $(call gb_Extension_get_workdir,$(1))/description.xml :| \ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits