fax wizard: build and install the java wizard in paralle to the python one

This commit is contained in:
Michael Meeks 2011-12-05 20:52:12 +00:00
parent 49df5176e5
commit fe05a4b4aa
4 changed files with 41 additions and 7 deletions

View file

@ -97,7 +97,6 @@ my_components = \
component/scripting/source/dlgprov/dlgprov \
component/scripting/source/protocolhandler/protocolhandler \
component/scripting/source/pyprov/mailmerge \
component/wizards/com/sun/star/wizards/fax/fax \
component/scripting/source/stringresource/stringresource \
component/scripting/source/vbaevents/vbaevents \
component/scripting/util/scriptframe \

View file

@ -23,9 +23,9 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
$(eval $(call gb_Pyuno_Pyuno,fax,$(SRCDIR)/wizards/com/sun/star/wizards/fax))
$(eval $(call gb_Pyuno_Pyuno,pyfax,$(SRCDIR)/wizards/com/sun/star/wizards/fax))
$(eval $(call gb_Pyuno_add_files,fax,\
$(eval $(call gb_Pyuno_add_files,pyfax,\
__init__.py \
CallWizard.py \
CGFax.py \
@ -36,6 +36,6 @@ $(eval $(call gb_Pyuno_add_files,fax,\
FaxWizardDialog.py \
FaxWizardDialogResources.py \
))
$(eval $(call gb_Pyuno_set_componentfile_full,fax,wizards/com/sun/star/wizards/fax/fax,vnd.sun.star.expand:\dLO_LIB_DIR/wizards/fax/CallWizard,.py))
$(eval $(call gb_Pyuno_set_componentfile_full,pyfax,wizards/com/sun/star/wizards/fax/pyfax,vnd.sun.star.expand:\dLO_LIB_DIR/wizards/fax/CallWizard,.py))
# vim:set shiftwidth=4 softtabstop=4 expandtab:

View file

@ -26,9 +26,10 @@
*
**********************************************************************-->
<component loader="com.sun.star.loader.Python"
<component loader="com.sun.star.loader.Java2"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.wizards.fax.CallWizard">
<service name="com.sun.star.task.Job"/>
<implementation
name="com.sun.star.wizards.fax.CallWizard$WizardImplementation">
<service name="com.sun.star.wizards.fax.CallWizard"/>
</implementation>
</component>

View file

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--**********************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
**********************************************************************-->
<component loader="com.sun.star.loader.Python"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.wizards.fax.CallWizard">
<service name="com.sun.star.task.Job"/>
</implementation>
</component>