diff options
| -rw-r--r-- | cli_ure/source/scripts/increment_version.pl | 63 | ||||
| -rw-r--r-- | cli_ure/version/incversions.txt | 4 | ||||
| -rw-r--r-- | unoil/climaker/incversions.txt | 22 |
3 files changed, 58 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 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 + |