- added '-i', '.' to psview argument list (author's request)

        - added environment clean up from Perl specific variables 
          (when not using external Perl)


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

3 files changed, 25 insertions, 3 deletions

diff --git a/Build/source/texk/texlive/w32_wrapper/readme.txt b/Build/source/texk/texlive/w32_wrapper/readme.txt
index 461fd21f12b..5c20e349e42 100644
--- a/Build/source/texk/texlive/w32_wrapper/readme.txt
+++ b/Build/source/texk/texlive/w32_wrapper/readme.txt
@@ -68,9 +68,7 @@
     
     If you prefer to call the script program simply by its name, copy 
     and rename bin/win32/runscript.exe to <script-name>.exe and put it 
-    somewhere on the search path.]]
-
-local docstr = [[
+    somewhere on the search path.
 
   Wrapper structure
   
@@ -213,4 +211,8 @@ local docstr = [[
     2011/09/10
         - added -dDisableFAPI=true to psview argument list. Needed by
           gs-9.xx
+    2012/03/12
+        - added '-i', '.' to psview argument list (author's request)
+        - added environment clean up from Perl specific variables 
+          (when not using external Perl)
 
diff --git a/Build/source/texk/texlive/w32_wrapper/runscript.tlu b/Build/source/texk/texlive/w32_wrapper/runscript.tlu
index 868632e28f2..3679e8f94d8 100644
--- a/Build/source/texk/texlive/w32_wrapper/runscript.tlu
+++ b/Build/source/texk/texlive/w32_wrapper/runscript.tlu
@@ -224,6 +224,10 @@ local docstr = [[
     2011/09/10

         - added -dDisableFAPI=true to psview argument list. Needed by

           gs-9.xx

+    2012/03/12

+        - added '-i', '.' to psview argument list (author's request)

+        - added environment clean up from Perl specific variables 

+          (when not using external Perl)

 ]]

 

 -- HELPER SUBROUTINES --

@@ -449,6 +453,11 @@ if not PERLEXE then
   PERLEXE = TEXDIR..'/tlpkg/tlperl/bin/perl.exe'

   os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')

   PATH = prepend_path(PATH, TEXDIR..'/tlpkg/tlperl/bin')

+  local PERLENV = 'PERL5OPT;PERLIO;PERLIO_DEBUG;PERLLIB;PERL5DB;PERL5DB_THREADED;' ..

+                  'PERL5SHELL;PERL_ALLOW_NON_IFS_LSP;PERL_DEBUG_MSTATS;' ..

+                  'PERL_DESTRUCT_LEVEL;PERL_DL_NONLAZY;PERL_ENCODING;PERL_HASH_SEED;' ..

+                  'PERL_HASH_SEED_DEBUG;PERL_ROOT;PERL_SIGNALS;PERL_UNICODE'

+  for var in string.gmatch(PERLENV, '[^;]+') do os.setenv(var, nil) end

 end

 -- gs stuff

 os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')

@@ -529,6 +538,7 @@ elseif progname == 'psv' then
   ARGV = {[0]=TEXDIR..'/tlpkg/tlpsv/gswxlua.exe', 'gswxlua', 

           '-dDisableFAPI=true',

           '-l', _q(TEXDIR..'/tlpkg/tlpsv/psv.wx.lua'),

+          '-i', '.',

           '-p', _q(TEXDIR..'/tlpkg/tlpsv/psv_view.ps')}

 elseif progname == 'repstopdf' or progname == 'rpdfcrop' then

   argline = '--restricted ' .. argline

diff --git a/Master/bin/win32/runscript.tlu b/Master/bin/win32/runscript.tlu
index 868632e28f2..3679e8f94d8 100644
--- a/Master/bin/win32/runscript.tlu
+++ b/Master/bin/win32/runscript.tlu
@@ -224,6 +224,10 @@ local docstr = [[
     2011/09/10

         - added -dDisableFAPI=true to psview argument list. Needed by

           gs-9.xx

+    2012/03/12

+        - added '-i', '.' to psview argument list (author's request)

+        - added environment clean up from Perl specific variables 

+          (when not using external Perl)

 ]]

 

 -- HELPER SUBROUTINES --

@@ -449,6 +453,11 @@ if not PERLEXE then
   PERLEXE = TEXDIR..'/tlpkg/tlperl/bin/perl.exe'

   os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')

   PATH = prepend_path(PATH, TEXDIR..'/tlpkg/tlperl/bin')

+  local PERLENV = 'PERL5OPT;PERLIO;PERLIO_DEBUG;PERLLIB;PERL5DB;PERL5DB_THREADED;' ..

+                  'PERL5SHELL;PERL_ALLOW_NON_IFS_LSP;PERL_DEBUG_MSTATS;' ..

+                  'PERL_DESTRUCT_LEVEL;PERL_DL_NONLAZY;PERL_ENCODING;PERL_HASH_SEED;' ..

+                  'PERL_HASH_SEED_DEBUG;PERL_ROOT;PERL_SIGNALS;PERL_UNICODE'

+  for var in string.gmatch(PERLENV, '[^;]+') do os.setenv(var, nil) end

 end

 -- gs stuff

 os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib;'..TEXDIR..'/tlpkg/tlgs/fonts')

@@ -529,6 +538,7 @@ elseif progname == 'psv' then
   ARGV = {[0]=TEXDIR..'/tlpkg/tlpsv/gswxlua.exe', 'gswxlua', 

           '-dDisableFAPI=true',

           '-l', _q(TEXDIR..'/tlpkg/tlpsv/psv.wx.lua'),

+          '-i', '.',

           '-p', _q(TEXDIR..'/tlpkg/tlpsv/psv_view.ps')}

 elseif progname == 'repstopdf' or progname == 'rpdfcrop' then

   argline = '--restricted ' .. argline