Update build script.

diff --git a/ChangeLog b/ChangeLog
index 5dc5d533c119466fa48458fad8aba73ee9247909..c3560a55d72b1bf733bb97c369c1c7114329bd1a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-11  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scm/output-gnome.scm: Update build script.
+
 2004-06-11  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
        * lily/paper-book.cc (LY_DEFINE): ly:output-formats. New function.

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index 5c1b9cfb6a46023fa1969c5c9ea39a591a7aaef9..82ec23cda7ebd77a21a1b7cc7b61f2f8af9e2f25 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -111,20 +111,18 @@ dump_fields ()
   return fields;
 }
 
-LY_DEFINE(ly_output_formats, "ly:output-formats",
-         0, 0, 0, (),
-         "Formats passed to --format as a list of strings, "
-         "used for the output.")
+LY_DEFINE (ly_output_formats, "ly:output-formats",
+          0, 0, 0, (),
+          "Formats passed to --format as a list of strings, "
+          "used for the output.")
 {
   Array<String> output_formats = split_string (output_format_global, ',');
 
-  SCM l = SCM_EOL;
+  SCM lst = SCM_EOL;
   for (int i = 0; i < output_formats.size (); i ++)
-    {
-      l = scm_cons (scm_makfrom0str  (output_formats[i].to_str0 ()), l); 
-    }
-
-  return l; 
+    lst = scm_cons (scm_makfrom0str (output_formats[i].to_str0 ()), lst);
+  
+  return lst; 
 }
          
 

diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index 8f586a442f274058839cc1ff8fc52fa03c69246f..b90616ceb1b842c6a269be2bb1e5b75e1e3c592a 100644 (file)
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -46,24 +46,39 @@
 ;;; move this into workbook?
 
 "
+#!/bin/bash
+
+set -ex
+
+rm -rf test
+mkdir test
+cd test
+
 ## 1.  install gnome-devel (Debian/unstable: apt-get install gnome-devel)
 
 ## 2.  *** NOTE: use guile-1.6 for g-wrap and guile-gnome ***
+##### g-wrap fixes for guile-1.7 have been made -- should test
 PATH=/usr/bin:$PATH
 
 
 ## 3.  get g-wrap 2.0
 tla register-archive a.rottmann@gmx.at--2004-main http://people.debian.org/~rotty/arch/a.rottmann@gmx.at/2004-main || true
 
-rm -rf gw-pristine
-tla get a.rottmann@gmx.at--2004-main/g-wrap--tng gw-pristine
-cd gw-pristine
+rm -rf g-wrap
+## tla get a.rottmann@gmx.at--2004-main/g-wrap--tng g-wrap
+## pull latest g-wrap from janneke -- this step is probably no longer
+## necessary when you read this
+tla register-archive janneke@gnu.org--2004-gnome http://lilypond.org/~janneke/{arch}/2004-gnome || true
+tla get janneke@gnu.org--2004-gnome/g-wrap--janneke g-wrap
+cd g-wrap
 
+rm -rf $HOME/usr/pkg/g-wrap
 AUTOMAKE=automake-1.8 AUTOCONF=autoconf2.50 sh autogen.sh --noconfigure
 mkdir =build
 cd =build
 ../configure --prefix=$HOME/usr/pkg/g-wrap
 make install
+## make install CC='cc -DSIZEOF_LONG=4'
 
 cd ../..
 
@@ -75,6 +90,16 @@ cd guile-gnome
 tla build-config -r configs/gnu.org/dev
 cd src
 
+## 5.  get the gnome canvas module
+tla get guile-gnome-devel@gnu.org--2004/libgnomecanvas--dev libgnomecanvas
+
+## pull latest defs from janneke -- this step is probably no longer
+## necessary when you read this
+tla register-archive janneke@gnu.org--2004-gnome http://lilypond.org/~janneke/{arch}/2004-gnome || true
+rm -rf defs
+tla get janneke@gnu.org--2004-gnome/defs--janneke defs
+
+rm -rf $HOME/usr/pkg/guile-gnome
 AUTOMAKE=automake-1.8 AUTOCONF=autoconf2.50 sh autogen.sh --noconfigure
 mkdir ../=build
 cd ../=build
@@ -85,12 +110,10 @@ export PKG_CONFIG_PATH=$HOME/usr/pkg/g-wrap/lib/pkgconfig:$PKG_CONFIG_PATH
 
 # cp srfi-34.scm from CVS head ?  --hwn
 
-
 ../src/configure --prefix=$HOME/usr/pkg/guile-gnome
 
-G_WRAP_MODULE_DIR=$HOME/usr/pkg/g-wrap/share/guile/site make install
-#FIXME: fixup -- no longer necessary?
-(cd $HOME/usr/pkg/guile-gnome/share/guile/gnome && mv gtk/g[dt]k.scm gw)
+##G_WRAP_MODULE_DIR=$HOME/usr/pkg/g-wrap/share/guile/site make install
+G_WRAP_MODULE_DIR=$HOME/usr/pkg/g-wrap/share/guile/site make install CC='cc -DSIZEOF_LONG=4'
 
 export GUILE_LOAD_PATH=$HOME/usr/pkg/guile-gnome/share/guile:$GUILE_LOAD_PATH
 export LD_LIBRARY_PATH=$HOME/usr/pkg/guile-gnome/lib:$LD_LIBRARY_PATH