diff options
| author | Andras Timar <andras.timar@collabora.com> | 2021-05-04 13:05:51 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-05-04 13:05:51 +0200 |
| commit | 73765b1c7a4668197d4114c4ad7bcc9f9d75e009 (patch) | |
| tree | ab0b52f29025e8395162ad7bcae7b172c5547a0e /instsetoo_native | |
| parent | f1b1cf83d513f6b2fa8e1448b29db06e12a332dc (diff) | |
[cp] new versioning scheme: 21.05.x.y
Change-Id: I0596602ad33ea2f4d1291c84caaeb121a4fcb21a
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 6 | ||||
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 4c60da2814c7..a83be274ff4b 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -157,7 +157,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_main_signing.do $(if $(PFXFILE),-f $(PFXFILE)) \ $(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \ $(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \ - -d Collabora\ Office\ $(LIBO_VERSION_MAJOR)-$(LIBO_VERSION_PATCH) \ + -d Collabora\ Office\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO) \ $(WORKDIR)/installation/$(PRODUCTNAME_no_spaces)/msi/install/*/*.msi \ && touch $@ $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL) @@ -171,7 +171,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_helppack_signin $(if $(PFXFILE),-f $(PFXFILE)) \ $(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \ $(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \ - -d Collabora\ Office\ $(LIBO_VERSION_MAJOR)-$(LIBO_VERSION_PATCH)\ Helppack \ + -d Collabora\ Office\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO)\ Helppack \ $(WORKDIR)/installation/$(PRODUCTNAME_no_spaces)_helppack/msi/install/*/*.msi \ && touch $@ $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL) @@ -185,7 +185,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_sdk_signing.don $(if $(PFXFILE),-f $(PFXFILE)) \ $(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \ $(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \ - -d Collabora\ Office\ $(LIBO_VERSION_MAJOR)-$(LIBO_VERSION_PATCH)\ SDK \ + -d Collabora\ Office\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO)\ SDK \ $(WORKDIR)/installation/$(PRODUCTNAME_no_spaces)_SDK/msi/install/*/*.msi \ && touch $@ $(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),PRL) diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 232c4b5a1309..ff4dca17b084 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -5,11 +5,11 @@ Globals variables { LIBO_VERSION_MAJOR @LIBO_VERSION_MAJOR@ - UREPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_PATCH@ + UREPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@@LIBO_VERSION_SUFFIX@ URELAYERVERSION 1 REFERENCEOOOMAJORMINOR 4.1 WINDOWSBASISROOTNAME Collabora Office - UNIXBASISROOTNAME collaboraoffice@LIBO_VERSION_MAJOR@ + UNIXBASISROOTNAME collaboraoffice HIDELICENSEDIALOG 0 PACKAGEPREFIX BASISPACKAGEPREFIX collaboraofficebasis @@ -30,7 +30,7 @@ Globals CREATE_MSP_INSTALLSET 0 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt PACKAGEMAP package_names.txt,package_names_ext.txt - WINDOWSPATCHLEVEL @LIBO_VERSION_PATCH@ + WINDOWSPATCHLEVEL @LIBO_VERSION_MICRO@ OOOVENDOR Collabora Productivity Ltd. 64BITPRODUCT @WINDOWS_X64@ WINDOWSSDKVERSION @WINDOWS_SDK_VERSION@ @@ -46,21 +46,21 @@ CollaboraOffice variables { PRODUCTNAME Collabora Office - PRODUCTVERSION @LIBO_VERSION_MAJOR@ - PRODUCTEXTENSION -@LIBO_VERSION_PATCH@ + PRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ + PRODUCTEXTENSION .@LIBO_VERSION_MICRO@.@LIBO_VERSION_PATCH@ POSTVERSIONEXTENSION BUNDLEIDENTIFIER @MACOSX_BUNDLE_IDENTIFIER@ - BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@ + BRANDPACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ USERDIRPRODUCTVERSION 4 - ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR@-@LIBO_VERSION_PATCH@ + ABOUTBOXPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@ ABOUTBOXPRODUCTVERSIONSUFFIX - BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@ + BASEPRODUCTVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@ PCPFILENAME libreoffice.pcp UPDATEURL https://update.libreoffice.org/check.php ADD_INCLUDE_FILES cli_ure/version/version.txt,unoil/climaker/version.txt ADDSYSTEMINTEGRATION 1 - PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_PATCH@ - PACKAGEREVISION {buildid} + PACKAGEVERSION @LIBO_VERSION_MAJOR@.@LIBO_VERSION_MINOR@.@LIBO_VERSION_MICRO@ + PACKAGEREVISION @LIBO_VERSION_PATCH@ LICENSENAME LGPL ROOTMODULEGID gid_Module_Root GLOBALPATCHFILEGID gid_File_Txt_Patchfiles |