patch::: 1.5.27.jcn1

2001-12-25  Jan Nieuwenhuizen  <janneke@gnu.org>

	* make/lilypond-vars.make:
	* scripts/ly2dvi.py (setup_environment):
	* scripts/lilypond-book.py (setup_environment): Also set tex
	memory options.

diff --git a/ChangeLog b/ChangeLog
index ded1e51b59177d7bab1f3383167d771fa22859fc..bd5350712c382f72293f33e153396ef5c4d0c3e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-25  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * make/lilypond-vars.make: 
+       * scripts/ly2dvi.py (setup_environment): 
+       * scripts/lilypond-book.py (setup_environment): Also set tex
+       memory options.
+
 2001-12-24  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * VERSION: 1.5.27 released.

diff --git a/VERSION b/VERSION
index c939db38f530fde0d45b9743e924db1bd0e6ce70..02970366cd3fb5dea7268883e7d89c0e994409f1 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=27
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 0eff08a3db61dbda7d1d846b285add7d50168e3a..09ce0f151853084630b6fc3d88cddc7e0f896949 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -8,6 +8,10 @@ export MFINPUTS:=$(topdir)/mf/:$(MFINPUTS)::
 export TEXINPUTS:=$(topdir)/mf/out/:$(topdir)/tex/:$(topdir)/ps/:$(TEXINPUTS):$(pwd)::
 export LILYINCLUDE:=$(topdir)/ps:$(topdir)/scm:$(topdir)/ly:$(topdir)/mf/out::$(TEX_TFMDIR):$(LILYINCLUDE)
 export TFMFONTS:=$(topdir)/mf/out:
+export extra_mem_top=1000000
+export extra_mem_bottom=1000000
+export pool_size=250000
+
 
 ifdef DEB_BUILD
 export PKFONTS := $(topdir)/mf/out

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 4e431b030fd3897c2914897e81767e8b5e0726df..fb3e5df785af012665f862afd260d07a0c379441 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -51,13 +51,22 @@ program_version = '@TOPLEVEL_VERSION@'
 if program_version == '@' + 'TOPLEVEL_VERSION' + '@':
        program_version = '1.5.18'
 
-#
+# if set, LILYPONDPREFIX must take prevalence
+# if datadir is not set, we're doing a build and LILYPONDPREFIX 
+datadir = '@datadir@'
+
+if os.environ.has_key ('LILYPONDPREFIX') :
+       datadir = os.environ['LILYPONDPREFIX']
+else:
+       datadir = '@datadir@'
+
+while datadir[-1] == os.sep:
+       datadir= datadir[:-1]
+
 # Try to cater for bad installations of LilyPond, that have
 # broken TeX setup.  Just hope this doesn't hurt good TeX
 # setups.  Maybe we should check if kpsewhich can find
 # feta16.{afm,mf,tex,tfm}, and only set env upon failure.
-#
-datadir = '@datadir@'
 environment = {
        'MFINPUTS' : datadir + '/mf:',
        'TEXINPUTS': datadir + '/tex:' + datadir + '/ps:.:',
@@ -66,6 +75,13 @@ environment = {
        'GS_LIB' : datadir + '/ps',
 }
 
+# tex needs lots of memory, more than it gets by default on Debian
+non_path_environment = {
+       'extra_mem_top' : '1000000',
+       'extra_mem_bottom' : '1000000',
+       'pool_size' : '250000',
+}
+
 def setup_environment ():
        for key in environment.keys ():
                val = environment[key]
@@ -73,7 +89,10 @@ def setup_environment ():
                        val = val + os.pathsep + os.environ[key]
                os.environ[key] = val
 
-
+       for key in non_path_environment.keys ():
+               val = non_path_environment[key]
+               print '%s=%s' % (key,val)
+               os.environ[key] = val
 
 include_path = [os.getcwd()]
 

diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index 62d6bbf561428beb9ec4ba9c5474bea527399846..90fa4d603224e176692bbd6ba457bc767f8b9d25 100644 (file)
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -264,8 +264,6 @@ datadir = '@datadir@'
 
 
 if os.environ.has_key ('LILYPONDPREFIX') :
-# huh ? this always leads to exception.
-# or '@datadir@' == '@' + 'datadir' + '@':   
        datadir = os.environ['LILYPONDPREFIX']
 else:
        datadir = '@datadir@'
@@ -376,6 +374,12 @@ environment = {
        'GS_LIB' : datadir + '/ps',
 }
 
+# tex needs lots of memory, more than it gets by default on Debian
+non_path_environment = {
+       'extra_mem_top' : '1000000',
+       'extra_mem_bottom' : '1000000',
+       'pool_size' : '250000',
+}
 
 def setup_environment ():
        for key in environment.keys ():
@@ -384,6 +388,10 @@ def setup_environment ():
                        val = os.environ[key] + os.pathsep + val 
                os.environ[key] = val
 
+       for key in non_path_environment.keys ():
+               val = non_path_environment[key]
+               os.environ[key] = val
+
 #what a name.
 def set_setting (dict, key, val):
        try: