summaryrefslogtreecommitdiff
path: root/Master/tlpkg/etc
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-02-09 10:29:59 +0000
committerNorbert Preining <preining@logic.at>2009-02-09 10:29:59 +0000
commite2d716e66a2d0e329eb506bdc77bcb6403136a6c (patch)
tree38b7318cb07ebea39f0548d5cf2a2d6614586bc2 /Master/tlpkg/etc
parente99cbe315b14a327fe89e15f28be027356d540e6 (diff)
fixes for new minimals etc
git-svn-id: svn://tug.org/texlive/trunk@12127 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/etc')
-rw-r--r--Master/tlpkg/etc/tlrepo-from-minimals.pl40
1 files changed, 26 insertions, 14 deletions
diff --git a/Master/tlpkg/etc/tlrepo-from-minimals.pl b/Master/tlpkg/etc/tlrepo-from-minimals.pl
index 411e3940aad..a6eb5eca56d 100644
--- a/Master/tlpkg/etc/tlrepo-from-minimals.pl
+++ b/Master/tlpkg/etc/tlrepo-from-minimals.pl
@@ -7,7 +7,7 @@
BEGIN {
$^W = 1;
chomp ($mydir = `dirname $0`);
- unshift (@INC, "$mydir/tlpkg");
+ unshift (@INC, "$mydir/..");
}
use strict;
@@ -22,21 +22,25 @@ use Getopt::Long;
use Pod::Usage;
my %min_to_tl_arch = qw/freebsd i386-freebsd
+ freebsd-amd64 amd64-freebsd
+ linux i386-linux
linux-64 x86_64-linux
+ linux-ppc powerpc-linux
osx-universal universal-darwin
- linux i386-linux
mswin win32
- sun sparc-solaris/;
+ solaris-intel i386-solaris
+ solaris-sparc sparc-solaris/;
my $help = 0;
my $dist = "current";
my $dest = "web";
my $opt_luatex = 0;
my $opt_modules = 0;
-my $opt_context = 1;
+my $opt_context = 0;
my $opt_all = 0;
my $opt_dontclean = 0;
my $source = ".";
+my $opt_recreate = 0;
TeXLive::TLUtils::process_logging_options();
GetOptions(
@@ -48,6 +52,7 @@ GetOptions(
"context" => \$opt_context,
"all" => \$opt_all,
"dont-clean" => \$opt_dontclean,
+ "recreate" => \$opt_recreate,
"help|?" => \$help) or pod2usage(1);
pod2usage(-exitstatus => 0, -verbose => 2) if $help;
@@ -69,8 +74,8 @@ if ($opt_context) {
system("mkdir -p $tmp/texmf-dist");
system("cp -a $source/$dist/context/current/* $tmp/texmf-dist");
system("mkdir -p $tmp/tlpkg/tlpsrc");
- system("cp ./tlpkg/tlpsrc/context.tlpsrc $tmp/tlpkg/tlpsrc");
- system("cp ./tlpkg/tlpsrc/bin-context.tlpsrc $tmp/tlpkg/tlpsrc");
+ system("cp $source/tlpkg/tlpsrc/context.tlpsrc $tmp/tlpkg/tlpsrc");
+ system("cp $source/tlpkg/tlpsrc/bin-context.tlpsrc $tmp/tlpkg/tlpsrc");
for my $i (keys %min_to_tl_arch) {
system("mkdir -p $tmp/bin/$min_to_tl_arch{$i}");
system("cp -a $source/$dist/bin/context/$i/bin/* $tmp/bin/$min_to_tl_arch{$i}");
@@ -108,7 +113,8 @@ if ($opt_context) {
if ($opt_modules) {
info("Copying files for ConTeXt modules ... ");
system("cp -a $source/$dist/modules/all/* $tmp/texmf-dist");
- system("cp ./tlpkg/tlpsrc/context-*.tlpsrc $tmp/tlpkg/tlpsrc");
+ system("mkdir -p $tmp/tlpkg/tlpsrc");
+ system("cp $source/tlpkg/tlpsrc/context-*.tlpsrc $tmp/tlpkg/tlpsrc");
# we didn't copy the context-letter and context-taspresent because
# they are not present in the context minimals
info("done\n");
@@ -125,7 +131,8 @@ if ($opt_luatex) {
system("ln -s luatex $tmp/bin/$min_to_tl_arch{$i}/pdfluatex");
}
}
- system("cp ./tlpkg/tlpsrc/luatex.tlpsrc $tmp/tlpkg/tlpsrc");
+ system("mkdir -p $tmp/tlpkg/tlpsrc");
+ system("cp $source/tlpkg/tlpsrc/luatex.tlpsrc $tmp/tlpkg/tlpsrc");
get_from_tug("texmf/fmtutil/format.luatex.cnf",
"$tmp/texmf/fmtutil/format.luatex.cnf");
info("done\n");
@@ -133,10 +140,13 @@ if ($opt_luatex) {
# copy the tlpkg stuff
info("Copying files for infrastructure ... ");
-system("cp -a ./tlpkg/TeXLive $tmp/tlpkg");
-system("cp -a ./tlpkg/bin $tmp/tlpkg");
-system("cp ./tlpkg/tlpsrc/00texlive.config.tlpsrc $tmp/tlpkg/tlpsrc");
-system("cp ./tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc $tmp/tlpkg/tlpsrc");
+
+get_from_tug("tlpkg/TeXLive", "$tmp/tlpkg/TeXLive");
+get_from_tug("tlpkg/bin", "$tmp/tlpkg/bin");
+system("cp $source/tlpkg/tlpsrc/00texlive.config.tlpsrc $tmp/tlpkg/tlpsrc");
+# should we get that from TUG, too?
+get_from_tug("tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc",
+ "$tmp/tlpkg/tlpsrc/00texlive.autopatterns.tlpsrc");
info("done\n");
# create new tlpdb
@@ -209,7 +219,9 @@ $mitlpdb->save;
# create the containers
info("Creating containers ... ");
-system("perl $tmp/tlpkg/bin/tl-update-containers -location $dest -no-setup");
+my $cmd = "perl $tmp/tlpkg/bin/tl-update-containers -location $dest -no-setup";
+$cmd .= " -recreate" if $opt_recreate;
+system($cmd);
info("done\ņ");
if (!$opt_dontclean) {
@@ -257,7 +269,7 @@ sub get_from_tug {
system("mkdir -p $dn");
#system("rsync .... Master/$what $dest");
info("WARNING: we are not actually fetching $what from tug, but copying!\n");
- system("cp /src/TeX/texlive-svn/Master/$what $dest");
+ system("cp -a /src/TeX/texlive-svn/Master/$what $dest");
}
### Local Variables: