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

diff --git a/buildscripts/guile-gnome.sh b/buildscripts/guile-gnome.sh
index d23915959f..577956dcd5 100644
--- a/buildscripts/guile-gnome.sh
+++ b/buildscripts/guile-gnome.sh
@@ -21,8 +21,10 @@ 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}
-GGVERSION=2.7.95
-GWRAPVERSION=1.9.3
+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
@@ -67,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 -xzf 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
@@ -83,21 +85,14 @@ fi
 
 ## 3. Currently (2004-9-15) GUILE CVS works somewhat
 ##    But there's a guile/g-wrap problem with integer parameters
-unset GUILE_LOAD_PATH
-PATH=/usr/bin:$PATH
+## PATH=/usr/bin:$PATH
 
 if [ -d $OPT/libffi/ ]; then
     export LDFLAGS=-L$OPT/libffi/lib
     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:$SLIB_PATH
-
-
 ## 4.  get g-wrap 2.0
-## note that bleeding edge (2004-9-13) g-wrap breaks guile-gnome.
 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 \
@@ -124,8 +119,38 @@ if ! pkg-config --atleast-version=$GWRAPVERSION 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
@@ -133,9 +158,6 @@ 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=$GGVERSION guile-gnome-glib; then
     if [ -n "$BLOEDIGE_RAND" ]; then
@@ -178,7 +200,8 @@ if ! pkg-config --atleast-version=$GGVERSION guile-gnome-glib; then
 	cd ..
 	srcdir="../src"
     else
- 	$WGET http://download.gna.org/guile-gnome/releases/guile-gnome-platform-$GGVERSION.tar.gz
+ 	#$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
@@ -204,8 +227,19 @@ if ! pkg-config --atleast-version=$GGVERSION guile-gnome-glib; then
 	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
-