install-mini: writes texmf.cnf; TLWinGoo: uninstaller removes release file.

git-svn-id: svn://tug.org/texlive/trunk@8898 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 23 insertions, 10 deletions

diff --git a/Master/tlpkg/doc/install-mini b/Master/tlpkg/doc/install-mini
index 564e4b0c894..89642f1def2 100755
--- a/Master/tlpkg/doc/install-mini
+++ b/Master/tlpkg/doc/install-mini
@@ -7,6 +7,7 @@
 # existing TeXLive installation
 
 # it assumes a standard directory layout, which avoids hard-coded paths.
+# if this is not the case, adjustments may be necessary.
 
 $^W = 1;
 
@@ -19,13 +20,13 @@ use TeXLive::TLWinGoo qw(non_admin add_texbindir_to_path setenv_reg
   create_uninstaller);
 use strict;
 
+# the code below assumes that this script is in $texdir,
+# the directory above texmf, texmf-dist etc.
+
 my $texdir=$0;
 $texdir=~s!\\!/!g;
 $texdir=~s!(.*)/.*$!$1!;
 
-# private macros
-#my $private_root = $ENV{'USERPROFILE'}.'/texmf';
-
 # private runtime-generated files
 $::texlive_release = '2008';
 my $texdirw = $ENV{'USERPROFILE'}.'/.texlive'.$::texlive_release;
@@ -123,12 +124,15 @@ update_assocs();
 # xetex
 
 if (-e $texdir.'/bin/win32/xetex.exe') {
-  my $texmfcnf =  $private_var.'/web2c;'.$texdir.'/texmf/web2c';
+  my $xetexmfcnf =  $private_var.'/web2c';
+  my $texmfcnf = $xetexmfcnf.';'.$texdir.'/texmf/web2c';
   setenv_reg('TEXMFCNF', $texmfcnf);
   broadcast_env();
-  mkdirhier($private_var."/fonts/cache");
+  mkdirhier($private_var."/fonts");
   system("xcopy", "/e", "/i", "/q", "/y", "\"$texbindir_bsl\\conf\"",
       "\"$private_var_bsl\\fonts\\conf\"");
+  system("xcopy", "/e", "/i", "/q", "/y", "\"$texbindir_bsl\\cache\"",
+      "\"$private_var_bsl\\fonts\\cache\"");
   if (open(FONTSCONF, "<$texdir/bin/win32/conf/fonts.conf")) {
     my @lines = <FONTSCONF>;
     close(FONTSCONF);
@@ -148,6 +152,14 @@ if (-e $texdir.'/bin/win32/xetex.exe') {
   } else {
     warn ("Cannot open $texdir/bin/win32/conf/fonts.conf\n");
   }
+  mkdirhier($xetexmfcnf);
+  if (open(TMF, ">$xetexmfcnf/texmf.cnf")) {
+    print TMF "FONTCONFIG_PATH=\$TEXMFVAR/fonts/conf\n";
+    print TMF "FC_CACHEDIR=\$TEXMFVAR/fonts/cache\n";
+    close TMF;
+  } else {
+    warn("Cannot open $xetexmfcnf/texmf.cnf for writing\n");
+  }
   $ENV{'TEXMFCNF'} = $texmfcnf;
   $ENV{'PATH'} = $texbindir_bsl.';'.$ENV{'PATH'};
   system("\"$texbindir_bsl\\fc-cache.exe\"", "-v", "-r");
diff --git a/Master/tlpkg/doc/install-mini.bat b/Master/tlpkg/doc/install-mini.bat
index 7066014b3e3..65b0ab1cb03 100755
--- a/Master/tlpkg/doc/install-mini.bat
+++ b/Master/tlpkg/doc/install-mini.bat
@@ -5,17 +5,18 @@ rem as texmf, texmf-dist etc.
 

 rem TeX Live Root; ends with backslash

 rem This may also work with UNC names

-set tlroot=%~dp0

+

+set texdir=%~dp0

 set tldrive=%~d0

 

 %tldrive%

-cd %tlroot%

+cd %texdir%

 

 rem use provided Perl

 

 set PERL5SAVE=%PERL5LIB%

-set PERL5LIB=%tlroot%tlpkg\tlperl\lib;%tlroot%tlpkg

-"%tlroot%tlpkg\tlperl\bin\perl" "%~dpn0" %*

+set PERL5LIB=%texdir%tlpkg\tlperl\lib;%texdir%tlpkg

+"%texdir%tlpkg\tlperl\bin\perl" "%~dpn0" %*

 rem pause Done

 

 rem cleanup in case of start from command-line

@@ -23,5 +24,5 @@ rem cleanup in case of start from command-line
 set PERL5LIB=%PERL5SAVE%

 set PERL5SAVE=

 set tldrive=

-set tlroot=

+set texdir=

 pause
\ No newline at end of file