Changeset 27091

Show
Ignore:
Timestamp:
18.03.2013 15:39:40 (7 years ago)
Author:
ak19
Message:

Automating configuring and compiling of wvware with gnome-lib. Tested with GS2. Still to test with GS3.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/build-src/packages/configure

    r26819 r27091  
    144144echo "" 
    145145 
    146 # datadir flag is for default location of wvHtml.xml config file 
    147 if test x$USE_WVWARE = xtrue ;  
    148 then 
     146if test x$USE_WVWARE = xtrue ; then 
     147 
     148  gnomelibmin="${prefix}/ext/gnome-lib-minimal" 
     149  gnomelibsrc="${prefix}/ext/gnome-lib" 
     150  gnomelibcompiled="${prefix}/ext/gnome-lib/$GSDLOS" 
     151# the gnome-lib folder (minimal or src) from which we'll run 
     152# source devel.bash before we can configure (and eventually compile) wvware: 
     153  gnomelibdir="" 
     154 
     155# a gnome-lib-minimal folder is a binary gnome-lib, so doesn't  
     156# need to be compiled up 
     157  if test -d "$gnomelibmin" ; then 
     158    gnomelibdir=$gnomelibmin 
     159 
     160  else  
     161      if test -d "$gnomelibsrc" ; then 
     162      gnomelibdir=$gnomelibsrc 
     163 
     164      if test ! -d "$gnomelibcompiled" ; then 
     165# there is a gnome-lib source folder but it's not yet compiled up,  
     166# so compile it first before we can configure let alone compile wvware 
     167          echo "*** Going to compile gnome-lib source code in $gnomelibsrc" 
     168          cd "$gnomelibsrc" && chmod a+rx devel.bash && ./CASCADE-MAKE.sh 
     169      fi 
     170      fi 
     171  fi 
     172 
    149173  cd "$PACKAGES/wv" 
    150174  gzip -dc wv-1.2.4-gs.tar.gz | tar -xf -   
    151   cd wv-gs && \ 
    152   ./configure $CACHE_FILE --prefix=$PACKAGES/wv --bindir="$bindir" --libdir="$libdir" --datadir="$prefix/etc/packages" $HOSTTARGETFLAGS 
     175 
     176# datadir flag is for default location of wvHtml.xml config file 
     177  if test -z "$gnomelibdir" ; then 
     178      cd "wv-gs" && \ 
     179      ./configure $CACHE_FILE --prefix=$PACKAGES/wv --bindir="$bindir" --libdir="$libdir" --datadir="$prefix/etc/packages" $HOSTTARGETFLAGS 
     180 
     181  else 
     182      echo "**** Compiling wvware with the help of gnome-lib in $gnomelibdir" 
     183 
     184      /bin/bash -c "cd \"$gnomelibdir\" source devel.bash && cd \"$PACKAGES/wv/wv-gs\" ./configure $CACHE_FILE --prefix=$PACKAGES/wv --bindir=\"$bindir\" --libdir=\"$libdir\" --datadir=\"$prefix/etc/packages\" $HOSTTARGETFLAGS" 
     185  fi 
     186 
    153187else 
    154188  echo "wvWare support disabled."