diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2011-12-05 13:04:05 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2011-12-05 20:53:24 +0000 |
| commit | 41b8bad143c06bc5419783b9f3cf5685aa3eea63 (patch) | |
| tree | 440af2f411acfd9bbf43c6d3f33da0a94ae3b4d0 /postprocess | |
| parent | fb7f82382bd317dd12913a6d7a3a5e4be6a6671c (diff) | |
wizards: completely work python wizard packaging and registration
Also improve exception handling and error printing in pythonloader
Allow registration of explicit .py components - the only method that works
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 10f964bb2bdd..c394308be8e4 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -93,13 +93,14 @@ my_components = \ component/scaddins/source/analysis/analysis \ component/scaddins/source/datefunc/date \ component/sccomp/source/solver/solver \ - component/scripting/source/basprov/basprov \ - component/scripting/source/dlgprov/dlgprov \ - component/scripting/source/protocolhandler/protocolhandler \ + component/scripting/source/basprov/basprov \ + component/scripting/source/dlgprov/dlgprov \ + component/scripting/source/protocolhandler/protocolhandler \ component/scripting/source/pyprov/mailmerge \ - component/scripting/source/stringresource/stringresource \ - component/scripting/source/vbaevents/vbaevents \ - component/scripting/util/scriptframe \ + component/wizards/com/sun/star/wizards/fax/fax \ + component/scripting/source/stringresource/stringresource \ + component/scripting/source/vbaevents/vbaevents \ + component/scripting/util/scriptframe \ component/sd/util/sd \ component/sd/util/sdd \ component/sd/util/sdfilt \ @@ -196,7 +197,7 @@ my_components += pythonloader .IF "$(OS)" != "WNT" && "$(OS)" != "MACOSX" && "$(OS)" != "IOS" && "$(OS)" != "ANDROID" my_components += component/desktop/unx/splash/splash .ENDIF - + .IF "$(DISABLE_ATL)" == "" my_components += emboleobj .END @@ -357,8 +358,6 @@ my_components += evoab my_components += component/avmedia/source/gstreamer/avmediagstreamer .END -my_ooo_components = mailmerge component/wizards/com/sun/star/wizards/fax/fax - .INCLUDE: target.mk ALLTAR : $(MISC)/services.rdb |