summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Build/source/texk/tests/TeXLive/TLConfig.pm8
-rw-r--r--Build/source/texk/tests/TeXLive/TLUtils.pm71
-rw-r--r--Build/source/utils/biber/TeXLive/TLConfig.pm8
-rw-r--r--Build/source/utils/biber/TeXLive/TLUtils.pm71
4 files changed, 22 insertions, 136 deletions
diff --git a/Build/source/texk/tests/TeXLive/TLConfig.pm b/Build/source/texk/tests/TeXLive/TLConfig.pm
index 8825b33e800..ab9b5405595 100644
--- a/Build/source/texk/tests/TeXLive/TLConfig.pm
+++ b/Build/source/texk/tests/TeXLive/TLConfig.pm
@@ -1,12 +1,12 @@
-# $Id: TLConfig.pm 23084 2011-06-22 03:07:01Z preining $
+# $Id: TLConfig.pm 26329 2012-05-13 17:31:15Z karl $
# TeXLive::TLConfig.pm - module exporting configuration values
-# Copyright 2007, 2008, 2009, 2010, 2011 Norbert Preining
+# Copyright 2007, 2008, 2009, 2010, 2011, 2012 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
package TeXLive::TLConfig;
-my $svnrev = '$Revision: 23084 $';
+my $svnrev = '$Revision: 26329 $';
my $_modulerevision;
if ($svnrev =~ m/: ([0-9]+) /) {
$_modulerevision = $1;
@@ -54,7 +54,7 @@ BEGIN {
# the year of our release, will be used in the location of the
# network packages, and in menu names, and other places.
-$ReleaseYear = 2011;
+$ReleaseYear = 2012;
# users can upgrade from this year to the current year; maybe a spread
# of more than one year will be useful at some point, but not now.
diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm
index f88a2ab8212..7f3bda59e6f 100644
--- a/Build/source/texk/tests/TeXLive/TLUtils.pm
+++ b/Build/source/texk/tests/TeXLive/TLUtils.pm
@@ -1,3 +1,4 @@
+# $Id: TLUtils.pm 26320 2012-05-13 03:53:19Z preining $
# TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
# Copyright 2007, 2008, 2009, 2010, 2011 Norbert Preining, Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
@@ -5,7 +6,7 @@
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 26100 $';
+my $svnrev = '$Revision: 26320 $';
my $_modulerevision;
if ($svnrev =~ m/: ([0-9]+) /) {
$_modulerevision = $1;
@@ -162,7 +163,6 @@ BEGIN {
&conv_to_w32_path
&native_slashify
&forward_slashify
- &conv_to_w32_path
&untar
&unpack
&merge_into
@@ -2681,67 +2681,10 @@ sub create_fmtutil {
}
sub create_updmap {
- my ($tlpdb,$dest,$localconf) = @_;
- my @tlpdblines = $tlpdb->updmap_cfg_lines(
- get_disabled_local_configs($localconf, '#'));
- # we do not use _create_config_files here because we want to
- # parse the $localconf file for the five options in updmap.cfg
- #_create_config_files($tlpdb, "texmf/web2c/updmap-hdr.cfg", $dest,
- # $localconf, 0, '#', \@tlpdblines);
- my $headfile = "texmf/web2c/updmap-hdr.cfg";
- my $root = $tlpdb->root;
- my @lines;
- my @localconflines;
- my %configs;
- if (-r "$localconf") {
- #
- # this should be done more intelligently, but for now only add those
- # lines without any duplication check ...
- open FOO, "<$localconf"
- or die "strange, -r ok but cannot open $localconf: $!";
- my @bla = <FOO>;
- close(FOO);
- for my $l (@bla) {
- my ($k, $v, @rest) = split(' ', $l);
- if (check_updmap_config_value($k, $v, $localconf)) {
- $configs{$k} = $v;
- } else {
- push @localconflines, $l;
- }
- }
- }
- #
- # read the -hdr file and replace the options if given in the local
- # config file
- open(INFILE,"<$root/$headfile") or die("Cannot open $root/$headfile");
- for my $l (<INFILE>) {
- my ($k, $v, @rest) = split(' ', $l);
- if (check_updmap_config_value($k, $v, "$root/$headfile")) {
- if (defined($configs{$k})) {
- push @lines, "$k $configs{$k}\n";
- } else {
- push @lines, $l;
- }
- } else {
- push @lines, $l;
- }
- }
- close (INFILE);
-
- # add the lines from the tlpdb
- push @lines, @tlpdblines;
-
- # add additional local config lines
- push @lines, @localconflines;
-
- if ($#lines >= 0) {
- open(OUTFILE,">$dest")
- or die("Cannot open $dest for writing: $!");
-
- printf OUTFILE "# Generated by %s on %s\n", "$0", scalar localtime;
- print OUTFILE @lines;
- close(OUTFILE) || warn "close(>$dest) failed: $!";
- }
+ my ($tlpdb,$dest) = @_;
+ my @tlpdblines = $tlpdb->updmap_cfg_lines();
+ _create_config_files($tlpdb, "texmf/web2c/updmap-hdr.cfg", $dest,
+ undef, 0, '#', \@tlpdblines);
}
sub check_updmap_config_value {
@@ -2809,7 +2752,7 @@ sub _create_config_files {
my @lines = <INFILE>;
push @lines, @$tlpdblinesref;
close (INFILE);
- if (-r "$localconf") {
+ if (defined($localconf) && -r $localconf) {
#
# this should be done more intelligently, but for now only add those
# lines without any duplication check ...
diff --git a/Build/source/utils/biber/TeXLive/TLConfig.pm b/Build/source/utils/biber/TeXLive/TLConfig.pm
index 8825b33e800..ab9b5405595 100644
--- a/Build/source/utils/biber/TeXLive/TLConfig.pm
+++ b/Build/source/utils/biber/TeXLive/TLConfig.pm
@@ -1,12 +1,12 @@
-# $Id: TLConfig.pm 23084 2011-06-22 03:07:01Z preining $
+# $Id: TLConfig.pm 26329 2012-05-13 17:31:15Z karl $
# TeXLive::TLConfig.pm - module exporting configuration values
-# Copyright 2007, 2008, 2009, 2010, 2011 Norbert Preining
+# Copyright 2007, 2008, 2009, 2010, 2011, 2012 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
package TeXLive::TLConfig;
-my $svnrev = '$Revision: 23084 $';
+my $svnrev = '$Revision: 26329 $';
my $_modulerevision;
if ($svnrev =~ m/: ([0-9]+) /) {
$_modulerevision = $1;
@@ -54,7 +54,7 @@ BEGIN {
# the year of our release, will be used in the location of the
# network packages, and in menu names, and other places.
-$ReleaseYear = 2011;
+$ReleaseYear = 2012;
# users can upgrade from this year to the current year; maybe a spread
# of more than one year will be useful at some point, but not now.
diff --git a/Build/source/utils/biber/TeXLive/TLUtils.pm b/Build/source/utils/biber/TeXLive/TLUtils.pm
index f88a2ab8212..7f3bda59e6f 100644
--- a/Build/source/utils/biber/TeXLive/TLUtils.pm
+++ b/Build/source/utils/biber/TeXLive/TLUtils.pm
@@ -1,3 +1,4 @@
+# $Id: TLUtils.pm 26320 2012-05-13 03:53:19Z preining $
# TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
# Copyright 2007, 2008, 2009, 2010, 2011 Norbert Preining, Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
@@ -5,7 +6,7 @@
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 26100 $';
+my $svnrev = '$Revision: 26320 $';
my $_modulerevision;
if ($svnrev =~ m/: ([0-9]+) /) {
$_modulerevision = $1;
@@ -162,7 +163,6 @@ BEGIN {
&conv_to_w32_path
&native_slashify
&forward_slashify
- &conv_to_w32_path
&untar
&unpack
&merge_into
@@ -2681,67 +2681,10 @@ sub create_fmtutil {
}
sub create_updmap {
- my ($tlpdb,$dest,$localconf) = @_;
- my @tlpdblines = $tlpdb->updmap_cfg_lines(
- get_disabled_local_configs($localconf, '#'));
- # we do not use _create_config_files here because we want to
- # parse the $localconf file for the five options in updmap.cfg
- #_create_config_files($tlpdb, "texmf/web2c/updmap-hdr.cfg", $dest,
- # $localconf, 0, '#', \@tlpdblines);
- my $headfile = "texmf/web2c/updmap-hdr.cfg";
- my $root = $tlpdb->root;
- my @lines;
- my @localconflines;
- my %configs;
- if (-r "$localconf") {
- #
- # this should be done more intelligently, but for now only add those
- # lines without any duplication check ...
- open FOO, "<$localconf"
- or die "strange, -r ok but cannot open $localconf: $!";
- my @bla = <FOO>;
- close(FOO);
- for my $l (@bla) {
- my ($k, $v, @rest) = split(' ', $l);
- if (check_updmap_config_value($k, $v, $localconf)) {
- $configs{$k} = $v;
- } else {
- push @localconflines, $l;
- }
- }
- }
- #
- # read the -hdr file and replace the options if given in the local
- # config file
- open(INFILE,"<$root/$headfile") or die("Cannot open $root/$headfile");
- for my $l (<INFILE>) {
- my ($k, $v, @rest) = split(' ', $l);
- if (check_updmap_config_value($k, $v, "$root/$headfile")) {
- if (defined($configs{$k})) {
- push @lines, "$k $configs{$k}\n";
- } else {
- push @lines, $l;
- }
- } else {
- push @lines, $l;
- }
- }
- close (INFILE);
-
- # add the lines from the tlpdb
- push @lines, @tlpdblines;
-
- # add additional local config lines
- push @lines, @localconflines;
-
- if ($#lines >= 0) {
- open(OUTFILE,">$dest")
- or die("Cannot open $dest for writing: $!");
-
- printf OUTFILE "# Generated by %s on %s\n", "$0", scalar localtime;
- print OUTFILE @lines;
- close(OUTFILE) || warn "close(>$dest) failed: $!";
- }
+ my ($tlpdb,$dest) = @_;
+ my @tlpdblines = $tlpdb->updmap_cfg_lines();
+ _create_config_files($tlpdb, "texmf/web2c/updmap-hdr.cfg", $dest,
+ undef, 0, '#', \@tlpdblines);
}
sub check_updmap_config_value {
@@ -2809,7 +2752,7 @@ sub _create_config_files {
my @lines = <INFILE>;
push @lines, @$tlpdblinesref;
close (INFILE);
- if (-r "$localconf") {
+ if (defined($localconf) && -r $localconf) {
#
# this should be done more intelligently, but for now only add those
# lines without any duplication check ...
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-12 00:51:49 +0000