install Pyuno using Package

Change-Id: Iabc029091096c82ff2dc79f0fad8f2bf9ee89514

16 files changed, 71 insertions, 35 deletions

diff --git a/desktop/Pyuno_passive_python.mk b/desktop/Pyuno_passive_python.mk
index d13431d71e0d..348de4aacfb6 100644
--- a/desktop/Pyuno_passive_python.mk
+++ b/desktop/Pyuno_passive_python.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Pyuno_Pyuno,passive_python,$(SRCDIR)/desktop/test/deployment/passive))
 
-$(eval $(call gb_Pyuno_add_files,passive_python, \
+$(eval $(call gb_Pyuno_add_files,passive_python,,\
     passive_python.py \
 ))
 
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 93f89232d41f..38a9eb8a649e 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -483,33 +483,38 @@ End
 #ifndef DISABLE_PYUNO
 
 File gid_File_Wizards_Common
-    Dir = gid_Dir_Wizards;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "wizards.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "Pyuno/wizards.filelist";
 End
 
 File gid_File_Wizards_Fax
-    Dir = gid_Dir_Wizards_Fax;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "fax.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "Pyuno/fax.filelist";
 End
 
 File gid_File_Wizards_Letter
-    Dir = gid_Dir_Wizards_Letter;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "letter.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "Pyuno/letter.filelist";
 End
 
 File gid_File_Wizards_Agenda
-    Dir = gid_Dir_Wizards_Agenda;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "agenda.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "Pyuno/agenda.filelist";
 End
 
 File gid_File_Pymailmerge
-    Dir = gid_Brand_Dir_Program;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "mailmerge.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "Pyuno/mailmerge.filelist";
 End
 #endif
 #endif
diff --git a/scripting/Pyuno_mailmerge.mk b/scripting/Pyuno_mailmerge.mk
index ae814f4fd479..aa4e77ff095d 100644
--- a/scripting/Pyuno_mailmerge.mk
+++ b/scripting/Pyuno_mailmerge.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Pyuno_Pyuno,mailmerge,$(SRCDIR)/scripting/source/pyprov))
 
 $(eval $(call gb_Pyuno_set_componentfile,mailmerge,scripting/source/pyprov/mailmerge))
 
-$(eval $(call gb_Pyuno_add_files,mailmerge,\
+$(eval $(call gb_Pyuno_add_files,mailmerge,,\
 	mailmerge.py \
 	msgbox.py \
 	officehelper.py \
diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
index 3384eed85d16..6ec1d498c446 100644
--- a/solenv/gbuild/Pyuno.mk
+++ b/solenv/gbuild/Pyuno.mk
@@ -25,34 +25,43 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
+$(dir $(call gb_Pyuno_get_target,%)).dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
+$(dir $(call gb_Pyuno_get_target,%))%/.dir :
+	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
+
 $(call gb_Pyuno_get_target,%) :
 	$(call gb_Output_announce,$*,$(true),PYU,3)
-	mkdir -p $(dir $@) && touch $@
+	touch $@
 
 .PHONY : $(call gb_Pyuno_get_clean_target,%)
 $(call gb_Pyuno_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),PYU,3)
-	rm -f $(call gb_Pyuno_get_target,$*) $(call gb_Pyuno_get_outdir_target,$*)
+	rm -f $(call gb_Pyuno_get_target,$*)
+
+gb_Pyuno_get_packagename = Pyuno/$(1)
 
 define gb_Pyuno_Pyuno
-$(call gb_Zip_Zip_internal_nodeliver,Pyuno/$(1),$(2))
+$(call gb_Package_Package_internal,$(call gb_Pyuno_get_packagename,$(1)),$(2))
+$(call gb_Package_set_outdir,$(call gb_Pyuno_get_packagename,$(1)),$(INSTDIR))
+
+$(call gb_Pyuno_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_Pyuno_get_packagename,$(1)))
+$(call gb_Pyuno_get_target,$(1)) :| $(dir $(call gb_Pyuno_get_target,$(1))).dir
+$(call gb_Pyuno_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_Pyuno_get_packagename,$(1)))
+
 $$(eval $$(call gb_Module_register_target,$(call gb_Pyuno_get_target,$(1)),$(call gb_Pyuno_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),Pyuno)
-$(call gb_Deliver_add_deliverable,$(call gb_Pyuno_get_outdir_target,$(1)),$(call gb_Zip_get_target,Pyuno/$(1)),$(1))
-$(call gb_Pyuno_get_target,$(1)) : $(call gb_Pyuno_get_outdir_target,$(1))
-$(call gb_Pyuno_get_outdir_target,$(1)) : $(call gb_Zip_get_target,Pyuno/$(1))
-$(call gb_Pyuno_get_outdir_target,$(1)) :| $(dir $(call gb_Pyuno_get_outdir_target,$(1))).dir
-$(call gb_Pyuno_get_clean_target,$(1)) : $(call gb_Zip_get_clean_target,Pyuno/$(1))
 
 endef
 
 define gb_Pyuno_add_file
-$(call gb_Zip_add_file,Pyuno/$(1),$(2))
+$(call gb_Package_add_file,$(call gb_Pyuno_get_packagename,$(1)),$(gb_Pyuno_PROGRAMDIRNAME)/$(2),$(3))
 
 endef
 
 define gb_Pyuno_add_files
-$(foreach file,$(2),$(call gb_Pyuno_add_file,$(1),$(file)))
+$(foreach file,$(3),$(call gb_Pyuno_add_file,$(1),$(if $(strip $(2)),$(strip $(2))/)$(file),$(file)))
 
 endef
 
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index ffc5a93c0eb0..d87287803e64 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -171,9 +171,7 @@ gb_Postprocess_get_target = $(WORKDIR)/Postprocess/$(1)
 gb_PrecompiledHeader_get_dep_target = $(WORKDIR)/Dep/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.gch.d
 gb_PrecompiledHeader_get_target = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.gch
 gb_PrecompiledHeader_get_timestamp = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/Timestamps/$(1)
-gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1).zip
-gb_Pyuno_get_outdir_target = $(OUTDIR)/bin/$(1).zip
-gb_PyunoFile_get_target = $(WORKDIR)/Pyuno/$(1)/contents/$(2)
+gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1).done
 gb_Rdb_get_target = $(WORKDIR)/Rdb/$(1).rdb
 gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst
 gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index fa070caf2f58..78ba92de663f 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -295,6 +295,10 @@ endef
 
 gb_UIMenubarTarget_UIMenubarTarget_platform :=
 
+# Pyuno class
+
+gb_Pyuno_PROGRAMDIRNAME := program
+
 # Python
 gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib
 
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 469bb5f92471..ce4b1b751747 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -429,6 +429,10 @@ endef
 
 gb_UIMenubarTarget_UIMenubarTarget_platform :=
 
+# Pyuno class
+
+gb_Pyuno_PROGRAMDIRNAME := program
+
 # Python
 gb_PYTHON_PRECOMMAND := PATH="$${PATH}:$(OUTDIR_FOR_BUILD)/bin" PYTHONHOME="$(OUTDIR_FOR_BUILD)/lib/python" PYTHONPATH="$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload"
 
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index e3fc4d77cc69..a14a871a337b 100755
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -608,6 +608,10 @@ endef
 
 gb_UIMenubarTarget_UIMenubarTarget_platform :=
 
+# Pyuno class
+
+gb_Pyuno_PROGRAMDIRNAME := program
+
 # Python
 gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME="$(OUTDIR_FOR_BUILD)/lib/python" PYTHONPATH="$(OUTDIR_FOR_BUILD)/lib/python;$(OUTDIR_FOR_BUILD)/lib/python/lib-dynload"
 
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 88e0953ec8d2..a780c598e9a2 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -377,6 +377,10 @@ endef
 # Python
 gb_PYTHON_PRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
 
+# Pyuno class
+
+gb_Pyuno_PROGRAMDIRNAME := MacOS
+
 include $(GBUILDDIR)/platform/com_GCC_class.mk
 
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index d8bb1c8bf588..d4780aebdf37 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -421,6 +421,10 @@ endef
 
 gb_UIMenubarTarget_UIMenubarTarget_platform :=
 
+# Pyuno class
+
+gb_Pyuno_PROGRAMDIRNAME := program
+
 # Python
 gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload
 
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index ae9081fef33b..01b07901ddc8 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -419,6 +419,10 @@ endef
 
 gb_UIMenubarTarget_UIMenubarTarget_platform :=
 
+# Pyuno class
+
+gb_Pyuno_PROGRAMDIRNAME := program
+
 # Python
 gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload
 
diff --git a/wizards/Pyuno_agenda.mk b/wizards/Pyuno_agenda.mk
index f84430335ec0..2c4655395266 100644
--- a/wizards/Pyuno_agenda.mk
+++ b/wizards/Pyuno_agenda.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Pyuno_Pyuno,agenda,$(SRCDIR)/wizards/com/sun/star/wizards/agenda))
 
-$(eval $(call gb_Pyuno_add_files,agenda,\
+$(eval $(call gb_Pyuno_add_files,agenda,wizards/agenda,\
     AgendaDocument.py \
     AgendaWizardDialogConst.py \
     AgendaWizardDialogImpl.py \
diff --git a/wizards/Pyuno_commonwizards.mk b/wizards/Pyuno_commonwizards.mk
index f213bb193195..c3a96728e17d 100644
--- a/wizards/Pyuno_commonwizards.mk
+++ b/wizards/Pyuno_commonwizards.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Pyuno_Pyuno,wizards,$(SRCDIR)/wizards/com/sun/star/wizards))
 
-$(eval $(call gb_Pyuno_add_files,wizards,\
+$(eval $(call gb_Pyuno_add_files,wizards,wizards,\
     __init__.py \
     common/__init__.py \
     common/ConfigGroup.py \
diff --git a/wizards/Pyuno_fax.mk b/wizards/Pyuno_fax.mk
index a5a1c1d7adca..78e5f8faf331 100644
--- a/wizards/Pyuno_fax.mk
+++ b/wizards/Pyuno_fax.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Pyuno_Pyuno,fax,$(SRCDIR)/wizards/com/sun/star/wizards/fax))
 
-$(eval $(call gb_Pyuno_add_files,fax,\
+$(eval $(call gb_Pyuno_add_files,fax,wizards/fax,\
     __init__.py \
     CallWizard.py \
     CGFax.py \
diff --git a/wizards/Pyuno_letter.mk b/wizards/Pyuno_letter.mk
index 52318496f456..508b705c556c 100644
--- a/wizards/Pyuno_letter.mk
+++ b/wizards/Pyuno_letter.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Pyuno_Pyuno,letter,$(SRCDIR)/wizards/com/sun/star/wizards/letter))
 
-$(eval $(call gb_Pyuno_add_files,letter,\
+$(eval $(call gb_Pyuno_add_files,letter,wizards/letter,\
 	CallWizard.py \
 	CGLetter.py \
 	CGLetterWizard.py \
diff --git a/wizards/Pyuno_web.mk b/wizards/Pyuno_web.mk
index 93b312f9da8b..3bfc4d028f57 100644
--- a/wizards/Pyuno_web.mk
+++ b/wizards/Pyuno_web.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Pyuno_Pyuno,web,$(SRCDIR)/wizards/com/sun/star/wizards/web))
 
-$(eval $(call gb_Pyuno_add_files,web,\
+$(eval $(call gb_Pyuno_add_files,web,wizards/web,\
 	CallWizard.py \
 	BackgroundsDialog.py \
 	ErrorHandler.py \