summaryrefslogtreecommitdiff
path: root/cli_ure
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-08-16 15:27:05 +0200
committerMichael Stahl <mstahl@redhat.com>2017-08-16 15:35:09 +0200
commite0487a112984b8151450b07fb1c05deaedc973e5 (patch)
tree79771e75dcba539b3fce8e50e40c6b014717e616 /cli_ure
parent50553df006f5fe8ac59cad3dcde0856735535b40 (diff)
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
Diffstat (limited to 'cli_ure')
-rw-r--r--cli_ure/source/scripts/increment_version.pl63
-rw-r--r--cli_ure/version/incversions.txt4
2 files changed, 36 insertions, 31 deletions
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