changeset 3524:75a789acb1fc

generate .bat.in files inside spec, not from nsis/
author Han-Wen Nienhuys <hanwen@lilypond.org>
date Sun, 27 May 2007 16:26:03 -0300
parents 098990d444e3
children df6b35fcb8c9
files gub/installer.py gub/specs/lilypond.py nsis/lilypond-windows.bat.in
diffstat 3 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gub/installer.py	Sun May 27 16:15:00 2007 -0300
+++ b/gub/installer.py	Sun May 27 16:26:03 2007 -0300
@@ -253,7 +253,6 @@
                    env=locals ())
         
         self.system (r'''cp %(nsisdir)s/*.nsh %(ns_dir)s
-cp %(nsisdir)s/*.bat.in %(ns_dir)s
 cp %(nsisdir)s/*.nsi %(ns_dir)s
 cp %(nsisdir)s/*.sh.in %(ns_dir)s''', locals ())
 
--- a/gub/specs/lilypond.py	Sun May 27 16:15:00 2007 -0300
+++ b/gub/specs/lilypond.py	Sun May 27 16:26:03 2007 -0300
@@ -416,6 +416,11 @@
             s = open (i).read ()
             open (i, 'w').write (re.sub ('\r*\n', '\r\n', s))
 
+        bat = r'''@echo off
+"@INSTDIR@\usr\bin\lilypond-windows.exe" -dgui %1 %2 %3 %4 %5 %6 %7 %8 %9
+'''.replace ('%', '%%').replace ('\n', '\r\n')
+            
+        self.dump (bat, '%(install_root)s/usr/bin/lilypond-windows.bat.in')
 
 ## please document exactly why if this is switched back.
 #        self.file_sub ([(r'gs-font-load\s+#f', 'gs-font-load #t')],
--- a/nsis/lilypond-windows.bat.in	Sun May 27 16:15:00 2007 -0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@echo off
-"@INSTDIR@\usr\bin\lilypond-windows.exe" -dgui %1 %2 %3 %4 %5 %6 %7 %8 %9