[Libreoffice-commits] core.git: 2 commits - desktop/Extension_test-passive.mk scp2/source smoketest/Extension_TestExtension.mk solenv/gbuild

[David Tardon]

 desktop/Extension_test-passive.mk          |    2 +-
 scp2/source/extensions/file_extensions.scp |   24 ++++++++++++------------
 smoketest/Extension_TestExtension.mk       |    2 +-
 solenv/gbuild/Extension.mk                 |   20 ++++++++++++++------
 4 files changed, 28 insertions(+), 20 deletions(-)

New commits:
commit b506fcdf2477f68c34344346267543ca6a31da6e
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Oct 11 09:36:33 2013 +0200

    install extensions using filelist
    
    Change-Id: I16dae6402d13d912830a02fbc3a7f8347e890bc7

diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index 3161490..272328e 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -28,9 +28,9 @@
 
 File gid_File_Oxt_Presentation_Minimizer
     TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_Presentation_Minimizer;
-    Name = "presentation-minimizer.oxt";
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "Extension/presentation-minimizer.filelist";
 End
 
 #endif
@@ -41,9 +41,9 @@ End
 
 File gid_File_Oxt_MediaWiki
     TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_MediaWiki;
-    Name = "wiki-publisher.oxt";
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "Extension/wiki-publisher.filelist";
 End
 
 #endif
@@ -171,9 +171,9 @@ End
 
 File gid_File_Oxt_NLPSolver
     TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_NLPSolver;
-    Name = "nlpsolver.oxt";
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "Extension/nlpsolver.filelist";
 End
 
 #endif
@@ -197,9 +197,9 @@ End
 
 File gid_File_Oxt_MySQLConnector
     TXT_FILE_BODY;
-    Styles = (PACKED, ARCHIVE);
-    Dir = gid_Brand_Dir_Share_Extensions_MySQLConnector;
-    Name = "mysql-connector-ooo.oxt";
+    Styles = (PACKED, FILELIST);
+    Dir = FILELIST_DIR;
+    Name = "Extension/mysql-connector-ooo.filelist";
 End
 
 #endif
commit 06293b051c9eb418ce0f5a6ee2f7dabafd78f98c
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Oct 11 09:33:21 2013 +0200

    do not copy testing extensions to instdir
    
    Change-Id: Ibd2f18a8998b3e182d8d5b8af9c9f74a8ac00744

diff --git a/desktop/Extension_test-passive.mk b/desktop/Extension_test-passive.mk
index 354ce26..dbd03cf 100644
--- a/desktop/Extension_test-passive.mk
+++ b/desktop/Extension_test-passive.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Extension_Extension,test-passive,desktop/test/deployment/passive))
+$(eval $(call gb_Extension_Extension,test-passive,desktop/test/deployment/passive,nodeliver))
 
 $(eval $(call gb_Extension_add_file,test-passive,generic.components,$(call gb_Rdb_get_target,passive_generic)))
 
diff --git a/smoketest/Extension_TestExtension.mk b/smoketest/Extension_TestExtension.mk
index 454aede..8644a73 100644
--- a/smoketest/Extension_TestExtension.mk
+++ b/smoketest/Extension_TestExtension.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Extension_Extension,TestExtension,smoketest/com/sun/star/comp/smoketest))
+$(eval $(call gb_Extension_Extension,TestExtension,smoketest/com/sun/star/comp/smoketest,nodeliver))
 
 $(eval $(call gb_Extension_add_file,TestExtension,TestExtension.jar,$(call gb_Jar_get_outdir_target,TestExtension)))
 
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk
index 8477055..42da363 100644
--- a/solenv/gbuild/Extension.mk
+++ b/solenv/gbuild/Extension.mk
@@ -114,7 +114,7 @@ $(call gb_Extension_get_target,%) : \
 # add deliverable
 # add dependency for outdir target to workdir target (pattern rule for delivery is in Package.mk)
 #
-# gb_Extension_Extension extension srcdir
+# gb_Extension_Extension extension srcdir nodeliver
 define gb_Extension_Extension
 $(call gb_Extension_get_target,$(1)) : DESCRIPTION :=
 $(call gb_Extension_get_target,$(1)) : FILES := META-INF description.xml
@@ -127,11 +127,7 @@ $(call gb_Extension_get_workdir,$(1))/description.xml :| \
 	$(call gb_Extension__get_preparation_target,$(1))
 $(call gb_Extension__get_final_target,$(1)) : $(call gb_Extension_get_target,$(1))
 
-$(call gb_GeneratedPackage_GeneratedPackage,Extension/$(1),$(dir $(call gb_Extension_get_rootdir,$(1))))
-$(call gb_GeneratedPackage_add_dir,Extension/$(1),$(INSTROOT)/share/extensions/$(1),$(notdir $(call gb_Extension_get_rootdir,$(1))))
-
-$(call gb_GeneratedPackage_get_target,Extension/$(1)) : $(call gb_Extension_get_target,$(1))
-$(call gb_Extension__get_final_target,$(1)) : $(call gb_GeneratedPackage_get_target,Extension/$(1))
+$(if $(filter nodeliver,$(3)),,$(call gb_Extension__Extension_deliver,$(1),Extension/$(1)))
 
 ifneq ($(strip $(gb_WITH_LANG)),)
 $(call gb_Extension_get_target,$(1)) : \
@@ -149,6 +145,18 @@ $(call gb_Helper_make_userfriendly_targets,$(1),Extension,$(call gb_Extension__g
 
 endef
 
+# Ensure delivery of the extension to instdir.
+#
+# gb_Extension__Extension_deliver extension package-name
+define gb_Extension__Extension_deliver
+$(call gb_GeneratedPackage_GeneratedPackage,$(2),$(dir $(call gb_Extension_get_rootdir,$(1))))
+$(call gb_GeneratedPackage_add_dir,$(2),$(INSTROOT)/share/extensions/$(1),$(notdir $(call gb_Extension_get_rootdir,$(1))))
+
+$(call gb_GeneratedPackage_get_target,$(2)) : $(call gb_Extension_get_target,$(1))
+$(call gb_Extension__get_final_target,$(1)) : $(call gb_GeneratedPackage_get_target,$(2))
+
+endef
+
 # adding a file creates a dependency to it
 # file is copied to $(WORKDIR)
 define gb_Extension_add_file