[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - .gitignore readlicense_oo/CustomTarget_license.mk readlicense_oo/Package_files.mk readlicense_oo/Package_license.mk solenv/bin

[Andras Timar (via logerrit)]

 .gitignore                                  |    1 +
 readlicense_oo/CustomTarget_license.mk      |    4 ++++
 readlicense_oo/Package_files.mk             |    5 +++++
 readlicense_oo/Package_license.mk           |    3 ++-
 solenv/bin/modules/installer/environment.pm |    2 +-
 5 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 4a352772f28cdc8edd36d8c7b7178c9dcd5892a8
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Sun Mar 31 13:00:33 2019 -0700
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Apr 1 07:31:28 2019 +0200

    Restore original $licensepath of the optional EULA of MSI package
    
    Change-Id: If80ac5648f50deda7a16bc6661ced31357958d67
    Reviewed-on: https://gerrit.libreoffice.org/70037
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm
index 7cb2b9aa15a1..38448a8ba9fb 100644
--- a/solenv/bin/modules/installer/environment.pm
+++ b/solenv/bin/modules/installer/environment.pm
@@ -59,7 +59,7 @@ sub create_pathvariables
     my $filelistpath = $environment->{'WORKDIR'};
     $variables{'filelistpath'} = $filelistpath;
 
-    my $licensepath = $environment->{'WORKDIR'} . $installer::globals::separator . "CustomTarget/readlicense_oo/license";
+    my $licensepath = $environment->{'SRCDIR'} . $installer::globals::separator . "readlicense_oo/license";
     $variables{'licensepath'} = $licensepath;
 
     my $packinfopath = $environment->{'SRCDIR'} . $installer::globals::separator . "setup_native/source/packinfo";
commit 62c9b13280e94103db6f83485d4bfe6993b1cd9f
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Sun Mar 31 10:30:02 2019 -0700
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Apr 1 07:31:13 2019 +0200

    [cp] MSP does not allow to move files between components
    
    Change-Id: Ie279b16b4ba5dd87498f4144146d1a9e8ca4ece9
    Reviewed-on: https://gerrit.libreoffice.org/70013
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/.gitignore b/.gitignore
index aad4142986f0..63d17deebbf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -65,6 +65,7 @@
 /AUTHORS
 /MAINTAINERS
 /setup_native/source/packinfo/finals_instsetoo.txt
+/readlicense_oo/license/LICENSE.html
 
 # make id
 /ID
diff --git a/readlicense_oo/CustomTarget_license.mk b/readlicense_oo/CustomTarget_license.mk
index 75923d109970..d5ecffb2300e 100644
--- a/readlicense_oo/CustomTarget_license.mk
+++ b/readlicense_oo/CustomTarget_license.mk
@@ -64,6 +64,10 @@ $(readlicense_oo_DIR)/license.txt : \
 	$(call gb_Helper_abbreviate_dirs, \
 		$(gb_AWK) 'sub("$$","\r")' $< > $@.tmp && mv $@.tmp $@ \
 	)
+
+$(SRCDIR)/readlicense_oo/license/LICENSE.html: \
+		$(readlicense_oo_DIR)/license.html
+	cp $< $@
 endif
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk
index 95614109e3d1..41b6e43c4856 100644
--- a/readlicense_oo/Package_files.mk
+++ b/readlicense_oo/Package_files.mk
@@ -21,4 +21,9 @@ $(eval $(call gb_Package_add_file,readlicense_oo_files,Resources/EULA_en-US.rtf,
 $(eval $(call gb_Package_add_file,readlicense_oo_files,Resources/CREDITS.fodt,CREDITS.fodt))
 endif
 
+ifeq ($(OS),WNT)
+$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE.fodt,LICENSE.html))
+$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE.html,LICENSE.html))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/readlicense_oo/Package_license.mk b/readlicense_oo/Package_license.mk
index d91a18bb8bb5..1aaee1df4a47 100644
--- a/readlicense_oo/Package_license.mk
+++ b/readlicense_oo/Package_license.mk
@@ -11,7 +11,6 @@ $(eval $(call gb_Package_Package,readlicense_oo_license,$(call gb_CustomTarget_g
 
 ifeq ($(OS),WNT)
 $(eval $(call gb_Package_add_file,readlicense_oo_license,license.txt,license.txt))
-$(eval $(call gb_Package_add_file,readlicense_oo_license,LICENSE.fodt,license.html))
 else
 ifneq ($(OS),MACOSX)
 $(eval $(call gb_Package_add_file,readlicense_oo_license,LICENSE,LICENSE))
@@ -20,10 +19,12 @@ $(eval $(call gb_Package_add_file,readlicense_oo_license,Resources/LICENSE,LICEN
 endif
 endif
 
+ifneq ($(OS),WNT)
 ifneq ($(OS),MACOSX)
 $(eval $(call gb_Package_add_file,readlicense_oo_license,LICENSE.html,license.html))
 else
 $(eval $(call gb_Package_add_file,readlicense_oo_license,Resources/LICENSE.html,license.html))
 endif
+endif
 
 # vim: set noet sw=4 ts=4: