[Libreoffice-commits] .: 2 commits - scripting/source

[David Tardon]

 scripting/source/pyprov/makefile.mk            |   22 +++++----------
 scripting/source/pyprov/pythonscript.component |   35 -------------------------
 2 files changed, 8 insertions(+), 49 deletions(-)

New commits:
commit 33bbfcbfa2ca58deae1309a01fa943dc3226e2fe
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 31 08:42:03 2011 +0200

    we ship pythonscript as extension

diff --git a/scripting/source/pyprov/pythonscript.component b/scripting/source/pyprov/pythonscript.component
deleted file mode 100755
index 08f8950..0000000
--- a/scripting/source/pyprov/pythonscript.component
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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="org.openoffice.pyuno.LanguageScriptProviderForPython">
-    <service name="com.sun.star.script.provider.LanguageScriptProvider"/>
-    <service name="com.sun.star.script.provider.ScriptProviderForPython"/>
-  </implementation>
-</component>
commit 4899ff666d0d9aab42ef4bf845840600685fd12f
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Mar 31 08:40:21 2011 +0200

    fix mis-merge

diff --git a/scripting/source/pyprov/makefile.mk b/scripting/source/pyprov/makefile.mk
index d7f4776..fa43858 100755
--- a/scripting/source/pyprov/makefile.mk
+++ b/scripting/source/pyprov/makefile.mk
@@ -43,6 +43,14 @@ ALL : ALLTAR \
 $(DLLDEST)$/%.py: %.py
     cp $? $@
 
+ALLTAR : $(MISC)/mailmerge.component
+
+$(MISC)/mailmerge.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        mailmerge.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_PYTHON)mailmerge' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt mailmerge.component
+
 # scripting provider extension
 .IF "$(L10N_framework)"=="" && "$(ENABLE_SCRIPTING_PYTHON)" == "YES"
 
@@ -59,20 +67,6 @@ COMPONENT_FILES=$(EXTENSIONDIR)$/pythonscript.py
 
 .INCLUDE : target.mk
 
-ALLTAR : $(MISC)/mailmerge.component $(MISC)/pythonscript.component
-
-$(MISC)/mailmerge.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        mailmerge.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_PYTHON)mailmerge' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt mailmerge.component
-
-$(MISC)/pythonscript.component .ERRREMOVE : \
-        $(SOLARENV)/bin/createcomponent.xslt pythonscript.component
-    $(XSLTPROC) --nonet --stringparam uri \
-        '$(COMPONENTPREFIX_BASIS_PYTHON)pythonscript' -o $@ \
-        $(SOLARENV)/bin/createcomponent.xslt pythonscript.component
-
 .ENDIF
 
 .ELSE