[Libreoffice-commits] core.git: 2 commits - cli_ure/source cli_ure/version unoil/climaker
Michael Stahl
mstahl at redhat.com
Wed Aug 16 13:38:32 UTC 2017
cli_ure/source/scripts/increment_version.pl | 63 ++++++++++++++--------------
cli_ure/version/incversions.txt | 4 +
cli_ure/version/version.txt | 24 +++++-----
unoil/climaker/incversions.txt | 22 +++++++++
unoil/climaker/version.txt | 6 +-
5 files changed, 73 insertions(+), 46 deletions(-)
New commits:
commit 17192ce5588f84192d1dd0d963622bda48566fdc
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Aug 16 15:32:04 2017 +0200
tdf#108709 cli_ure,unoil: bump CLI assembly versions for 5.4
perl cli_ure/source/scripts/increment_version.pl cli_ure/version/version.txt cli_ure/version/incversions.txt temp.txt && mv temp.txt cli_ure/version/version.txt
perl cli_ure/source/scripts/increment_version.pl unoil/climaker/version.txt unoil/climaker/incversions.txt temp.txt && mv temp.txt unoil/climaker/version.txt
Change-Id: Iaea028fc345d090317f7ebf128b683b4643a1093
diff --git a/cli_ure/version/version.txt b/cli_ure/version/version.txt
index e24ddc511fe9..11cd9e737649 100644
--- a/cli_ure/version/version.txt
+++ b/cli_ure/version/version.txt
@@ -16,23 +16,23 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-CLI_URETYPES_NEW_VERSION=1.0.8.0
-CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.7.0
-CLI_URETYPES_POLICY_VERSION=8.0.0.0
+CLI_URETYPES_NEW_VERSION=1.0.9.0
+CLI_URETYPES_OLD_VERSION=1.0.0.0-1.0.8.0
+CLI_URETYPES_POLICY_VERSION=9.0.0.0
CLI_URETYPES_POLICY_ASSEMBLY=policy.1.0.cli_uretypes
-CLI_BASETYPES_NEW_VERSION=1.0.19.0
-CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.18.0
-CLI_BASETYPES_POLICY_VERSION=19.0.0.0
+CLI_BASETYPES_NEW_VERSION=1.0.20.0
+CLI_BASETYPES_OLD_VERSION=1.0.0.0-1.0.19.0
+CLI_BASETYPES_POLICY_VERSION=20.0.0.0
CLI_BASETYPES_POLICY_ASSEMBLY=policy.1.0.cli_basetypes
-CLI_URE_NEW_VERSION=1.0.22.0
-CLI_URE_OLD_VERSION=1.0.0.0-1.0.21.0
-CLI_URE_POLICY_VERSION=22.0.0.0
+CLI_URE_NEW_VERSION=1.0.23.0
+CLI_URE_OLD_VERSION=1.0.0.0-1.0.22.0
+CLI_URE_POLICY_VERSION=23.0.0.0
CLI_URE_POLICY_ASSEMBLY=policy.1.0.cli_ure
-CLI_CPPUHELPER_NEW_VERSION=1.0.22.0
-CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.21.0
-CLI_CPPUHELPER_POLICY_VERSION=22.0.0.0
+CLI_CPPUHELPER_NEW_VERSION=1.0.23.0
+CLI_CPPUHELPER_OLD_VERSION=1.0.0.0-1.0.22.0
+CLI_CPPUHELPER_POLICY_VERSION=23.0.0.0
CLI_CPPUHELPER_POLICY_ASSEMBLY=policy.1.0.cli_cppuhelper
diff --git a/unoil/climaker/version.txt b/unoil/climaker/version.txt
index abc28bc42473..ec48a082e47f 100644
--- a/unoil/climaker/version.txt
+++ b/unoil/climaker/version.txt
@@ -16,8 +16,8 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-CLI_OOOTYPES_NEW_VERSION=1.0.8.0
-CLI_OOOTYPES_OLD_VERSION=1.0.0.0-1.0.7.0
-CLI_OOOTYPES_POLICY_VERSION=8.0.0.0
+CLI_OOOTYPES_NEW_VERSION=1.0.9.0
+CLI_OOOTYPES_OLD_VERSION=1.0.0.0-1.0.8.0
+CLI_OOOTYPES_POLICY_VERSION=9.0.0.0
CLI_OOOTYPES_POLICY_ASSEMBLY=policy.1.0.cli_oootypes
commit e0487a112984b8151450b07fb1c05deaedc973e5
Author: Michael Stahl <mstahl at redhat.com>
Date: Wed Aug 16 15:27:05 2017 +0200
cli_ure,unoil: always increment all CLI assembly version numbers
There is a increment_version.pl, which uses the incversions.txt
to increment the CLI version numbers.
But it first checks that there are new published UNO types,
and exits if there are none. Not sure where the input for that
is supposed to come from.
But the OOo docs claim that all version numbers have to be
incresed for every release to work around some MSI issue,
so change the script to do that and add an incversion.txt
in unoil too.
http://www.openoffice.org/udk/common/man/spec/assemblyversioning.html
https://support.microsoft.com/en-us/help/905238/an-assembly-in-the-global-assembly-cache-or-sxs-is-missing-after-you-p
Change-Id: I6190b53d1a3ff00b9fe014f86f7ec8cddef9904e
diff --git a/cli_ure/source/scripts/increment_version.pl b/cli_ure/source/scripts/increment_version.pl
index ad371e4aaa3c..85be523d9835 100644
--- a/cli_ure/source/scripts/increment_version.pl
+++ b/cli_ure/source/scripts/increment_version.pl
@@ -50,54 +50,55 @@ my $sNameForm =
"For example, valid names are: \n".
"CLI_URETYPES_NEW_VERSION\nCLI_URETYPES_OLD_VERSION\nCLI_URETYPES_POLICY_VERSION\n";
-if (scalar @ARGV < 4) {
+if (scalar @ARGV < 3) {
print $usage;
exit -1;
}
-e "$ARGV[0]" or die "Error: wrong arguments. \n".$usage;
-e "$ARGV[1]" or die "Error: wrong arguments. \n".$usage;
--e "$ARGV[3]" or die "Error: wrong arguments. \n".$usage;
+#-e "$ARGV[3]" or die "Error: wrong arguments. \n".$usage;
+# DISABLED: always increment
#check if new types have been added since last release.
#If not, then there is nothing to be done.
#read in oldVersions line by line and apply the increment operation
-open TYPES, "$ARGV[3]" or die "Cannot open to $ARGV[3] $!";
+#open TYPES, "$ARGV[3]" or die "Cannot open to $ARGV[3] $!";
my $newTypes;
#We look for the line that contains the number of new types
-while(<TYPES>)
-{
- if (/New and published types/i)
- {
- $_ =~ /=\s*(\d+)/;
- if ( ! defined $1)
- {
- print "\n###$ARGV[3] contains an invalid entry for 'New and published types'. \n\n";
- exit -1;
- }
- $newTypes = $1;
- }
-}
+#while(<TYPES>)
+#{
+# if (/New and published types/i)
+# {
+# $_ =~ /=\s*(\d+)/;
+# if ( ! defined $1)
+# {
+# print "\n###$ARGV[3] contains an invalid entry for 'New and published types'. \n\n";
+# exit -1;
+# }
+# $newTypes = $1;
+# }
+#}
#Check if changeTypes contained the line we are looking for
-if (! defined $newTypes)
-{
- print "\n###$ARGV[3] does not contain entry about the new types ".
- "or we are looking for the wrong string! \n\n";
- exit -1;
-}
+#if (! defined $newTypes)
+#{
+# print "\n###$ARGV[3] does not contain entry about the new types ".
+# "or we are looking for the wrong string! \n\n";
+# exit -1;
+#}
-if ( $newTypes == 0)
-{
- print "\nNo new UNO types since las product update.\n";
- exit 0;
-}
-else
-{
- print "\nNew UNO types were added since last release. The version will be increased.\n\n";
-}
+#if ( $newTypes == 0)
+#{
+# print "\nNo new UNO types since las product update.\n";
+# exit 0;
+#}
+#else
+#{
+# print "\nNew UNO types were added since last release. The version will be increased.\n\n";
+#}
#read in incVersions in a list
my @incVersions = readIncVersions($ARGV[1]);
diff --git a/cli_ure/version/incversions.txt b/cli_ure/version/incversions.txt
index bfd3c8198bcf..ad370782932a 100644
--- a/cli_ure/version/incversions.txt
+++ b/cli_ure/version/incversions.txt
@@ -20,6 +20,10 @@ CLI_URETYPES_NEW_VERSION
CLI_URETYPES_OLD_VERSION
CLI_URETYPES_POLICY_VERSION
+CLI_BASETYPES_NEW_VERSION
+CLI_BASETYPES_OLD_VERSION
+CLI_BASETYPES_POLICY_VERSION
+
CLI_URE_NEW_VERSION
CLI_URE_OLD_VERSION
CLI_URE_POLICY_VERSION
diff --git a/unoil/climaker/incversions.txt b/unoil/climaker/incversions.txt
new file mode 100644
index 000000000000..c5eaa3f90078
--- /dev/null
+++ b/unoil/climaker/incversions.txt
@@ -0,0 +1,22 @@
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# This file incorporates work covered by the following license notice:
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed
+# with this work for additional information regarding copyright
+# ownership. The ASF licenses this file to you under the Apache
+# License, Version 2.0 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.apache.org/licenses/LICENSE-2.0 .
+#
+
+CLI_OOOTYPES_NEW_VERSION
+CLI_OOOTYPES_OLD_VERSION
+CLI_OOOTYPES_POLICY_VERSION
+
More information about the Libreoffice-commits
mailing list