Rebased ref, commits from common ancestor:
commit 2f8910a1a698f0d06f4e0790c903b4bed1f7baf4
Author: Andras Timar <[email protected]>
AuthorDate: Tue Jul 28 21:11:54 2020 +0200
Commit: Andras Timar <[email protected]>
CommitDate: Tue Jul 28 21:11:54 2020 +0200
[cp] fix MSI signing
Change-Id: I5451dd451043207d72a8e917fbfbcd0903106599
diff --git a/instsetoo_native/CustomTarget_install.mk
b/instsetoo_native/CustomTarget_install.mk
index 7de17d582427..a58b84e078e4 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -153,7 +153,7 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_main_signing.do
$(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \
$(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \
-d $(PRODUCTNAME)\
$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)
\
-
$(WORKDIR)/installation/$(PRODUCTNAME)/msi/install/*/*.msi \
+
$(WORKDIR)/installation/$(PRODUCTNAME_WITHOUT_SPACES)/msi/install/*/*.msi \
&& touch $@
$(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_helppack_signing.done:
@@ -165,7 +165,7 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_helppack_signin
$(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \
$(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \
-d $(PRODUCTNAME)\
$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\
Helppack \
-
$(WORKDIR)/installation/$(PRODUCTNAME)_helppack/msi/install/*/*.msi \
+ $(WORKDIR)/installation/$(PRODUCTNAME_WITHOUT
SPACES)_helppack/msi/install/*/*.msi \
&& touch $@
$(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_sdk_signing.done:
@@ -177,7 +177,7 @@ $(call
gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_sdk_signing.don
$(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \
$(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \
-d $(PRODUCTNAME)\
$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\
SDK \
-
$(WORKDIR)/installation/$(PRODUCTNAME)_SDK/msi/install/*/*.msi \
+
$(WORKDIR)/installation/$(PRODUCTNAME_WITHOUT_SPACES)_SDK/msi/install/*/*.msi \
&& touch $@
# vim: set noet sw=4 ts=4:
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
