[Libreoffice-commits] .: Branch 'feature/pycleanup' - instsetoo_native/util scp2/source solenv/gbuild wizards/Pyuno_commonwizards.mk wizards/Pyuno_fax.mk wizards/Pyuno_wizards.mk
Michael Meeks
michael at kemper.freedesktop.org
Mon Dec 5 05:04:49 PST 2011
instsetoo_native/util/makefile.mk | 36 ----------------------
scp2/source/ooo/directory_ooo.scp | 2 -
scp2/source/ooo/file_ooo.scp | 2 -
solenv/gbuild/Pyuno.mk | 13 +++++++
solenv/gbuild/TargetLocations.mk | 1
wizards/Pyuno_commonwizards.mk | 62 --------------------------------------
wizards/Pyuno_fax.mk | 21 ++++++------
wizards/Pyuno_wizards.mk | 62 ++++++++++++++++++++++++++++++++++++++
8 files changed, 87 insertions(+), 112 deletions(-)
New commits:
commit 757f4933099dde208e14302af35d16676405aa49
Author: Michael Meeks <michael.meeks at suse.com>
Date: Mon Dec 5 13:04:05 2011 +0000
Partial broken attempt at getting gnumake to do my bidding
Wow I hate the horrendous lack of debuggablity, lack of insight into variable
states and complexity of this 'make' stuff.
I also hate committing non-workign stuff - but then Bjoern wants it so ...
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 587b756..bbe3069 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -83,42 +83,6 @@ LOCALPYFILES= \
$(BIN)$/CGFaxWizard.py \
$(BIN)$/FaxWizardDialogImpl.py \
$(BIN)$/FaxWizardDialog.py \
- $(BIN)$/Configuration.py \
- $(BIN)$/ConfigGroup.py \
- $(BIN)$/FileAccess.py \
- $(BIN)$/Properties.py \
- $(BIN)$/Resource.py \
- $(BIN)$/ConfigNode.py \
- $(BIN)$/DebugHelper.py \
- $(BIN)$/Helper.py \
- $(BIN)$/NoValidPathException.py \
- $(BIN)$/PropertyNames.py \
- $(BIN)$/SystemDialog.py \
- $(BIN)$/ConfigSet.py \
- $(BIN)$/Desktop.py \
- $(BIN)$/HelpIds.py \
- $(BIN)$/NumberFormatter.py \
- $(BIN)$/PropertySetHelper.py \
- $(BIN)$/OfficeDocument.py \
- $(BIN)$/TextDocument.py \
- $(BIN)$/TextFieldHandler.py \
- $(BIN)$/TextSectionHandler.py \
- $(BIN)$/ViewHandler.py \
- $(BIN)$/ControlScroller.py \
- $(BIN)$/ImageList.py \
- $(BIN)$/PathSelection.py \
- $(BIN)$/UIConsts.py \
- $(BIN)$/UnoDialog.py \
- $(BIN)$/XPathSelectionListener.py \
- $(BIN)$/DocumentPreview.py \
- $(BIN)$/PeerConfig.py \
- $(BIN)$/UnoDialog2.py \
- $(BIN)$/WizardDialog.py \
- $(BIN)$/CommonListener.py \
- $(BIN)$/DataAware.py \
- $(BIN)$/ListModelBinder.py \
- $(BIN)$/RadioDataAware.py \
- $(BIN)$/UnoDataAware.py \
$(BIN)$/msgbox.py
.ENDIF
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 8d93a44..d453dbe 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -92,7 +92,7 @@ End
Directory gid_Dir_Wizards
Styles = (CREATE);
- ParentID = gid_Dir_Program;
+ ParentID = gid_Brand_Dir_Program;
DosName = "wizards";
End
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index f5f4718..1ea2a09 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -470,7 +470,7 @@ STD_JAR_FILE( gid_File_Jar_Saxon, saxon9 )
STD_PY_FILE( gid_File_PyInitWizards, __init__, gid_Dir_Wizards )
-STD_PY_FILE( gid_File_PyCallFaxWizard, CallWizard, gid_Dir_Program )
+STD_PY_FILE( gid_File_PyCallFaxWizard, CallWizard, gid_Brand_Dir_Program )
STD_PY_FILE( gid_File_PyInitFax, __init__, gid_Dir_Wizards_Fax )
STD_PY_FILE( gid_File_PyFaxDocument, FaxDocument, gid_Dir_Wizards_Fax )
STD_PY_FILE( gid_File_PyCGFax, CGFax, gid_Dir_Wizards_Fax )
diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
index b8eb04e..635735c 100644
--- a/solenv/gbuild/Pyuno.mk
+++ b/solenv/gbuild/Pyuno.mk
@@ -23,26 +23,37 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
+gb_Pyuno_ZIPCOMMAND := zip $(if $(findstring s,$(MAKEFLAGS)),-q)
gb_Pyuno__get_outdir_path = $(patsubst $(OUTDIR)/%,%,$(gb_Helper_OUTDIRLIBDIR))/pyuno/$(1)
$(call gb_Pyuno_get_target,%) :
$(call gb_Output_announce,$*,$(true),PYU,3)
mkdir -p $(dir $@) && touch $@
+$(call gb_Pyuno_get_target_zip,%) : $(call gb_Package_get_target,%_pyuno)
+ cd $(gb_Helper_OUTDIRLIBDIR)/pyuno && \
+ $(gb_Pyuno_ZIPCOMMAND) -rX --filesync \
+ $(call gb_Pyuno_get_target_zip,$*) \
+ $(FILES)
+
.PHONY : $(call gb_Pyuno_get_clean_target,%)
$(call gb_Pyuno_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),PYU,3)
rm -f $@
define gb_Pyuno_Pyuno
+$(call gb_Pyuno_get_target_zip,$(1)) : FILES :=
$(call gb_Package_Package,$(1)_pyuno,$(2))
$$(eval $$(call gb_Module_register_target,$(call gb_Pyuno_get_target,$(1)),$(call gb_Pyuno_get_clean_target,$(1))))
-$(call gb_Pyuno_get_target,$(1)) : $(call gb_Package_get_target,$(1)_pyuno)
+$(call gb_Pyuno_get_target,$(1)) : \
+ $(call gb_Package_get_target,$(1)_pyuno) \
+ $(call gb_Pyuno_get_target_zip,$(1))
$(call gb_Pyuno_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_pyuno)
endef
define gb_Pyuno_add_file
+$(call gb_Pyuno_get_target_zip,$(1)) : FILES += $(2)
$(call gb_Package_add_file,$(1)_pyuno,$(call gb_Pyuno__get_outdir_path,$(2)),$(2))
endef
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 20af9eb..d51b8ed 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -104,6 +104,7 @@ gb_ObjCObject_get_target = $(WORKDIR)/ObjCObject/$(1).o
gb_Package_get_preparation_target = $(WORKDIR)/Package/prepared/$(1)
gb_Package_get_target = $(WORKDIR)/Package/$(1)
gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1)
+gb_Pyuno_get_target_zip = $(OUTDIR)/bin/$(1).zip
gb_RdbTarget_get_target = $(WORKDIR)/RdbTarget/$(1).rdb
gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst
gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res
diff --git a/wizards/Pyuno_commonwizards.mk b/wizards/Pyuno_commonwizards.mk
deleted file mode 100644
index f13c1c2..0000000
--- a/wizards/Pyuno_commonwizards.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon at redhat.com> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Pyuno_Pyuno,common,$(SRCDIR)/wizards/com/sun/star/wizards))
-
-$(eval $(call gb_Pyuno_add_files,common,\
- common/ConfigGroup.py \
- common/Configuration.py \
- common/FileAccess.py \
- common/Properties.py \
- common/Resource.py \
- common/ConfigNode.py \
- common/DebugHelper.py \
- common/Helper.py \
- common/NoValidPathException.py \
- common/PropertyNames.py \
- common/SystemDialog.py \
- common/ConfigSet.py \
- common/Desktop.py \
- common/HelpIds.py \
- common/NumberFormatter.py \
- common/PropertySetHelper.py \
- document/OfficeDocument.py \
- text/TextDocument.py \
- text/TextFieldHandler.py \
- text/TextSectionHandler.py \
- text/ViewHandler.py \
- ui/ControlScroller.py \
- ui/ImageList.py \
- ui/PathSelection.py \
- ui/UIConsts.py \
- ui/UnoDialog.py \
- ui/XPathSelectionListener.py \
- ui/DocumentPreview.py \
- ui/PeerConfig.py \
- ui/UnoDialog2.py \
- ui/WizardDialog.py \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/wizards/Pyuno_fax.mk b/wizards/Pyuno_fax.mk
index 61467a1..33adc6e 100644
--- a/wizards/Pyuno_fax.mk
+++ b/wizards/Pyuno_fax.mk
@@ -23,20 +23,19 @@
# 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,fax,$(SRCDIR)/wizards/com/sun/star/wizards/))
$(eval $(call gb_Pyuno_add_files,fax,\
- CallWizard.py \
- CGFax.py \
- CGFaxWizard.py \
- FaxDocument.py \
- FaxWizardDialogConst.py \
- FaxWizardDialogImpl.py \
- FaxWizardDialog.py \
- FaxWizardDialogResources.py \
- __init__.py \
+ fax/CallWizard.py \
+ fax/CGFax.py \
+ fax/CGFaxWizard.py \
+ fax/FaxDocument.py \
+ fax/FaxWizardDialogConst.py \
+ fax/FaxWizardDialogImpl.py \
+ fax/FaxWizardDialog.py \
+ fax/FaxWizardDialogResources.py \
+ fax/__init__.py \
))
-
$(eval $(call gb_Pyuno_set_componentfile,fax,wizards/com/sun/star/wizards/fax/fax))
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/wizards/Pyuno_wizards.mk b/wizards/Pyuno_wizards.mk
new file mode 100644
index 0000000..f13c1c2
--- /dev/null
+++ b/wizards/Pyuno_wizards.mk
@@ -0,0 +1,62 @@
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon at redhat.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Pyuno_Pyuno,common,$(SRCDIR)/wizards/com/sun/star/wizards))
+
+$(eval $(call gb_Pyuno_add_files,common,\
+ common/ConfigGroup.py \
+ common/Configuration.py \
+ common/FileAccess.py \
+ common/Properties.py \
+ common/Resource.py \
+ common/ConfigNode.py \
+ common/DebugHelper.py \
+ common/Helper.py \
+ common/NoValidPathException.py \
+ common/PropertyNames.py \
+ common/SystemDialog.py \
+ common/ConfigSet.py \
+ common/Desktop.py \
+ common/HelpIds.py \
+ common/NumberFormatter.py \
+ common/PropertySetHelper.py \
+ document/OfficeDocument.py \
+ text/TextDocument.py \
+ text/TextFieldHandler.py \
+ text/TextSectionHandler.py \
+ text/ViewHandler.py \
+ ui/ControlScroller.py \
+ ui/ImageList.py \
+ ui/PathSelection.py \
+ ui/UIConsts.py \
+ ui/UnoDialog.py \
+ ui/XPathSelectionListener.py \
+ ui/DocumentPreview.py \
+ ui/PeerConfig.py \
+ ui/UnoDialog2.py \
+ ui/WizardDialog.py \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
More information about the Libreoffice-commits
mailing list