X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=buildscripts%2Fguile-gnome.sh;h=577956dcd554aadd1a2900796e76944b5e637129;hb=305f1a98bad22056fe6c343dd45fd50f94269503;hp=f4dde4d3d4760499aa748e46e1f0f742900ed4e6;hpb=cf66574a00cbe5387108aff0e7f359fa03af3cce;p=lilypond.git

diff --git a/buildscripts/guile-gnome.sh b/buildscripts/guile-gnome.sh
index f4dde4d3d4..577956dcd5 100644
--- a/buildscripts/guile-gnome.sh
+++ b/buildscripts/guile-gnome.sh
@@ -1,7 +1,5 @@
 #!@BASH@
 
-# WIP - this (the guile-gnome canvas) is broken ATM.
-
 # guile-gnome.sh -- download, compile, install g-wrap, guile-gnome,
 # pango
 
@@ -13,9 +11,24 @@ set -ex
 
 # Where user built stuff will be installed
 OPT=$HOME/usr/pkg
+# When using GUILE CVS, make a slib/require like so
+cat > /dev/null <<EOF
+cd ~/usr/pkg/guile/share/guile/1.7 && ln -s /usr/share/guile/1.6/slib .
+cd && guile -c "(use-modules (ice-9 slib)) (require 'new-catalog)"
+EOF
+# otherwise, this may fix it...
+SLIB_PATH=`locate slib/require.scm | head -1 | sed -s 's/require.scm//g'`
 
 # What extra modules to pull (eg: EXTRA="libgnomecanvas libwnck")
 EXTRA=${EXTRA-libgnomecanvas}
+PANGOVERSION=1.6.0
+GGVERSION=2.7.99
+GWRAPVERSION=1.9.5
+GLVERSION=0.1.2
+
+download=$HOME/usr/src/releases
+[ -d $download ] || mkdir -p $download
+WGET="wget -N -P $download"
 
 export AUTOMAKE=automake-1.8
 export ACLOCAL=aclocal-1.8
@@ -36,7 +49,7 @@ fi
 
 # test: the name of our download and build directory
 rm -rf test
-mkdir test
+mkdir -p test
 cd test
 
 ## 1.  install gnome-devel
@@ -56,9 +69,9 @@ if ! pkg-config --atleast-version=1.5.1 pango; then
 	echo "." > CVS/Repository
 	cvs -z3 checkout -P pango
     else
-        wget ftp://ftp.gtk.org/pub/gtk/v2.5/pango-1.5.2.tar.gz
-	tar -zf pango-1.5.2.tar.gz
-	ln -s pango-1.5.2 pango
+        $WGET ftp://ftp.gtk.org/pub/gtk/v2.6/pango-$PANGOVERSION.tar.gz
+	tar -xzf $download/pango-$PANGOVERSION.tar.gz
+	ln -s pango-$PANGOVERSION pango
     fi
     cd pango
     rm -rf $OPT/pango
@@ -66,11 +79,12 @@ if ! pkg-config --atleast-version=1.5.1 pango; then
 	./autogen.sh --help
     fi
     ./configure --prefix=$OPT/pango --enable-maintainer-mode --enable-gtk-doc
-    make XFT_LIBS="-L/usr/lib -lXft -L/usr/X11R6/lib -lfreetype -lz -lXrender -lX11 -lfontconfig" install
+    make XFT_LIBS="-L/usr/lib -lXft -L/usr/X11R6/lib -lfreetype -lz -lXrender -lX11 -lfontconfig" all install
     cd ../..
 fi
 
-## 3. Currently (2004-9-15) GUILE CVS works again
+## 3. Currently (2004-9-15) GUILE CVS works somewhat
+##    But there's a guile/g-wrap problem with integer parameters
 ## PATH=/usr/bin:$PATH
 
 if [ -d $OPT/libffi/ ]; then
@@ -78,13 +92,8 @@ if [ -d $OPT/libffi/ ]; then
     export CPPFLAGS=-I$OPT/libffi/include
 fi
 
-PKG_CONFIG_PATH=$OPT/g-wrap/lib/pkgconfig:$PKG_CONFIG_PATH
-LD_LIBRARY_PATH=$OPT/g-wrap/lib:$LD_LIBRARY_PATH
-GUILE_LOAD_PATH=$OPT/g-wrap/share/guile/site:$GUILE_LOAD_PATH
-
 ## 4.  get g-wrap 2.0
-## note that bleeding edge (2004-9-13) g-wrap breaks guile-gnome.
-if ! pkg-config --exact-version=1.9.1 g-wrap-2.0-guile; then
+if ! pkg-config --atleast-version=$GWRAPVERSION g-wrap-2.0-guile; then
     if [ -n "$BLOEDIGE_RAND" ]; then
 	tla register-archive a.rottmann@gmx.at--2004-main \
 	    http://people.debian.org/~rotty/arch/a.rottmann@gmx.at/2004-main || true
@@ -95,9 +104,9 @@ if ! pkg-config --exact-version=1.9.1 g-wrap-2.0-guile; then
         ## ughr:
 	mkdir -p g-wrap/libffi
     else
-	wget http://savannah.nongnu.org/download/g-wrap/g-wrap-1.9.1.tar.gz
-	tar zxf g-wrap-1.9.1.tar.gz
-	ln -s g-wrap-1.9.1 g-wrap
+	$WGET http://savannah.nongnu.org/download/g-wrap/g-wrap-$GWRAPVERSION.tar.gz
+	tar xzf $download/g-wrap-$GWRAPVERSION.tar.gz
+	ln -s g-wrap-$GWRAPVERSION g-wrap
     fi
     cd g-wrap
     
@@ -110,8 +119,38 @@ if ! pkg-config --exact-version=1.9.1 g-wrap-2.0-guile; then
     ../configure --prefix=$OPT/g-wrap --enable-maintainer-mode
     make install
     cd ../..
-fi    
+    PKG_CONFIG_PATH=$OPT/g-wrap/lib/pkgconfig:$PKG_CONFIG_PATH
+    LD_LIBRARY_PATH=$OPT/g-wrap/lib:$LD_LIBRARY_PATH
+    GUILE_LOAD_PATH=$OPT/g-wrap/share/guile/site:$GUILE_LOAD_PATH:$SLIB_PATH
+fi
 
+## 4a.  get g-lib 0.1.2
+if ! guile -c "(use-modules (srfi srfi-35))"; then
+    if [ -n "$BLOEDIGE_RAND" ]; then
+	:
+    else
+	$WGET http://download.gna.org/guile-lib/guile-lib-$GLVERSION.tar.gz
+	tar xzf $download/guile-lib-$GLVERSION.tar.gz
+	ln -s guile-lib-$GLVERSION guile-lib
+    fi
+    cd guile-lib
+    
+    rm -rf $OPT/guile-lib
+    if [ ! -f src/configure ]; then
+	sh autogen.sh --noconfigure
+    fi    
+    mkdir =build
+    cd =build
+    ../src/configure --prefix=$OPT/guile-lib #--enable-maintainer-mode
+    if true; then
+	make
+	cp ./guile-lib/doc/guile-library.info doc
+	install -d $OPT/guile-lib/share/info
+    fi
+    make install
+    cd ../..
+    GUILE_LOAD_PATH=$OPT/guile-lib/share/guile:$GUILE_LOAD_PATH
+fi    
 
 # not a good idea
 ## cp srfi-34.scm from CVS head ?  --hwn
@@ -119,12 +158,8 @@ fi
 # mv srfi-34.scm srfi-34.scm-g-wrap
 # cp $OPT/guile/share/guile-1.7/srfi/srfi-34.scm .)
 
-PKG_CONFIG_PATH=$OPT/guile-gnome/lib/pkgconfig:$PKG_CONFIG_PATH
-LD_LIBRARY_PATH=$OPT/guile-gnome/lib:$LD_LIBRARY_PATH
-GUILE_LOAD_PATH=$OPT/guile-gnome/share/guile:$GUILE_LOAD_PATH
-
 ## 5.  get guile-gnome
-if ! pkg-config --atleast-version=2.5.990 guile-gnome-glib; then
+if ! pkg-config --atleast-version=$GGVERSION guile-gnome-glib; then
     if [ -n "$BLOEDIGE_RAND" ]; then
 
 	if false; then # rotty
@@ -145,7 +180,7 @@ if ! pkg-config --atleast-version=2.5.990 guile-gnome-glib; then
 	    
 	    tla get wingo@pobox.com--2004-main/guile-gnome-dists--release guile-gnome
 	    cd guile-gnome
-	    tla build-config -r configs/gnu.org/guile-gnome-platform-2.5.990
+	    tla build-config -r configs/gnu.org/guile-gnome-platform-$GGVERSION
 	    cd src
 	    EXTRA="pkg atk defs glib gstreamer gtk gtksourceview libgda libglade libgnome libgnomeui pango libgnomecanvas"
 	    EXTRA=
@@ -156,7 +191,6 @@ if ! pkg-config --atleast-version=2.5.990 guile-gnome-glib; then
 	    done
 
 	    cd libgnomecanvas
-	    #patch -p1 < ~/canvas-pats
 	    cd ..
 	fi
 
@@ -164,10 +198,48 @@ if ! pkg-config --atleast-version=2.5.990 guile-gnome-glib; then
 	    sh autogen.sh --noconfigure
 	fi
 	cd ..
+	srcdir="../src"
     else
-	wget http://ambient.2y.net/wingo/tmp/guile-gnome-platform-2.5.990.tar.gz
-	tar xzf guile-gnome-platform-2.5.990.tar.gz
-	ln -s guile-gnome-platform-2.5.990 guile-gnome
+ 	#$WGET http://download.gna.org/guile-gnome/releases/guile-gnome-platform-$GGVERSION.tar.gz
+ 	$WGET ftp://ftp.gnu.org/gnu/guile-gnome/guile-gnome-platform/guile-gnome-platform-$GGVERSION.tar.gz
+	tar xzf $download/guile-gnome-platform-$GGVERSION.tar.gz
+	ln -s guile-gnome-platform-$GGVERSION guile-gnome
 	cd guile-gnome
-	ln -s . src
-	patch -p0 <<EOF
+	srcdir="../"
+    fi
+    
+    rm -rf $OPT/guile-gnome
+    mkdir =build
+    cd =build
+
+# Using libtool < 1.6.0 together with gcc-3.4 may trigger this problem:
+#
+#    If a tag has not been given, and we're using a compiler which is
+#    not one of the ones with which libtool was built, attempt to
+#    infer the compiler from the first word of the command line passed
+#    to libtool.
+#
+    if [ -z "$GCC34" ]; then
+    # Use libtool-1.5.6, gcc-3.{2,3} without -O2,
+	CFLAGS='-O -g' $srcdir/configure --prefix=$OPT/guile-gnome --enable-maintainer-mode
+    else
+    # or use gcc-3.4 with libtool-1.6.0
+	CC=$GCC34 $srcdir/configure --prefix=$OPT/guile-gnome --enable-maintainer-mode
+    fi
+    make all install G_WRAP_MODULE_DIR=$OPT/g-wrap/share/guile/site
+    PKG_CONFIG_PATH=$OPT/guile-gnome/lib/pkgconfig:$PKG_CONFIG_PATH
+    LD_LIBRARY_PATH=$OPT/guile-gnome/lib:$LD_LIBRARY_PATH
+    GUILE_LOAD_PATH=$OPT/guile-gnome/share/guile:$GUILE_LOAD_PATH
+fi
+
+cat <<EOF
+***********************************************************************
+Before using with Lily, do
+
+    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
+    export GUILE_LOAD_PATH=$GUILE_LOAD_PATH
+    export PKG_CONFIG_PATH=$PKG_CONFIG_PATH
+EOF
+
+# simple test -- fails atm
+# guile -s ../src/libgnomecanvas/examples/canvas.scm