Changeset 27946 in webkit


Ignore:
Timestamp:
Nov 21, 2007 7:01:59 PM (16 years ago)
Author:
kevino@webkit.org
Message:

Restore the wx buildbot for Mac by automatically installing dependencies not provided by the OS into WebKitLibraries.

Reviewed by Mark Rowe

Location:
trunk/WebKitTools
Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/ChangeLog

    r27945 r27946  
     12007-11-21  Kevin Ollivier  <kevino@theolliviers.com>
     2
     3        Move install-unix-extras to wx directory as it seems only to be used by that
     4        port now. It now supports universal binaries on Mac and adds libpng and libjpeg.
     5        Also, have build-wxwebkit run it in order to fix the Mac buildbot, and
     6        have install-unix-extras install into WebKitLibraries as per
     7        convention.
     8       
     9        Reviewed by Mark Rowe.
     10
     11        * Scripts/install-unix-extras: Removed.
     12        * wx/build-wxwebkit:
     13        * wx/install-unix-extras: Copied from WebKitTools/Scripts/install-unix-extras.
     14
    1152007-11-21  Eric Seidel  <eric@webkit.org>
    216
  • trunk/WebKitTools/wx/build-wxwebkit

    r27934 r27946  
    186186    if [ $do_prep == 1 ]; then
    187187        # Other preparation steps
     188       
     189        # since the buildbot will wipe the build tree clean sometimes, we need to reinstall
     190        # the dependencies if they aren't installed.
     191        if [ ! "${OSTYPE:0:6}" == "cygwin" ]; then
     192            $WK_ROOT/WebKitTools/wx/install-unix-extras
     193        fi
     194       
    188195        cd $WK_ROOT/JavaScriptCore
    189196        # FIXME: The below is needed because Bakefile doesn't yet properly set dependencies on
  • trunk/WebKitTools/wx/install-unix-extras

    r27930 r27946  
    3333DL_CMD="curl -L"
    3434
     35scriptDir="$(cd $(dirname $0);pwd)"
     36WK_ROOT=$scriptDir/../..
     37WK_ROOTDIR=$WK_ROOT
     38
    3539DL_DIR=/tmp/webkit-deps
    3640# NOTE: If you change this, make sure the dir is on the path.
    37 DEPS_PREFIX=/usr/local
     41DEPS_PREFIX=$WK_ROOT/WebKitLibraries/unix
     42DLLEXT=so
     43
     44if [ "${OSTYPE:0:6}" == "darwin" ]; then
     45    DLLEXT=dylib
     46fi
    3847
    3948mkdir -p $DL_DIR
     
    4352ICU_TARBALL="icu-$ICU_VERSION.tgz"
    4453ICU_URL="ftp://ftp.software.ibm.com/software/globalization/icu/$ICU_VERSION/$ICU_TARBALL"
     54
     55# dependent app, not lib, what should we do for these?
    4556
    4657GPERF_VERSION="3.0.1"
     
    5667ICONV_URL="http://ftp.gnu.org/pub/gnu/libiconv/$ICONV_TARBALL"
    5768
     69LIBJPEG_VERSION="6b"
     70LIBJPEG_TARBALL="jpegsrc.v$LIBJPEG_VERSION.tar.gz"
     71LIBJPEG_URL="http://www.ijg.org/files/$LIBJPEG_TARBALL"
     72
     73LIBPNG_VERSION="1.2.23"
     74LIBPNG_TARBALL="libpng-$LIBPNG_VERSION.tar.gz"
     75LIBPNG_URL="ftp://ftp.simplesystems.org/pub/libpng/png/src/$LIBPNG_TARBALL"
     76
    5877cd $DL_DIR
    5978# build ICU
     
    6584 
    6685  chmod +x configure install-sh
    67   ./configure --prefix=$DEPS_PREFIX
     86
     87  if [ "${OSTYPE:0:6}" == "darwin" ]; then 
     88    ./configure --prefix=$DEPS_PREFIX --disable-dependency-tracking
     89    make CFLAGS="-O -g -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" \
     90    LDFLAGS="-arch i386 -arch ppc"
     91    make install
     92  else
     93    ./configure --prefix=$DEPS_PREFIX
    6894 
    69   make
    70   #make check
    71   make install
    72  
     95    make
     96    #make check
     97    make install
     98  fi
    7399  cd $DL_DIR
    74100  rm -rf icu
    75101fi
    76102
    77 if [ `which gperf >/dev/null 2>&1` ]; then
    78   $DL_CMD -o $DL_DIR/$GPERF_TARBALL $GPERF_URL
    79 
    80   tar xzvf $DL_DIR/$GPERF_TARBALL
    81   cd $DL_DIR/gperf-$GPERF_VERSION
    82  
    83   ./configure --prefix=$DEPS_PREFIX
    84  
    85   make
    86   make install
    87  
    88   cd $DL_DIR
    89   rm -rf $DL_DIR/gperf-$GPERF_VERSION
    90 fi
    91 
    92103# TODO: What would be a good way to test for this?
    93 if [ ! -f $DEPS_PREFIX/lib/libiconv.dylib ]; then
     104if [ ! -f $DEPS_PREFIX/lib/libiconv.$DLLEXT ]; then
    94105  $DL_CMD -o $DL_DIR/$ICONV_TARBALL $ICONV_URL
    95106
    96107  tar xzvf $DL_DIR/$ICONV_TARBALL
    97108  cd $DL_DIR/libiconv-$ICONV_VERSION
     109
     110  if [ "${OSTYPE:0:6}" == "darwin" ]; then 
     111    ./configure --prefix=$DEPS_PREFIX --disable-dependency-tracking
     112    make CFLAGS="-O -g -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" \
     113    LDFLAGS="-arch i386 -arch ppc"
     114    make install
     115  else
     116    ./configure --prefix=$DEPS_PREFIX
    98117 
    99   ./configure --prefix=$DEPS_PREFIX
    100  
    101   make
    102   make install
    103  
     118    make
     119    make install
     120  fi
    104121  cd $DL_DIR
    105122  rm -rf $DL_DIR/libiconv-$ICONV_VERSION
    106123fi
     124
     125if [ ! -f $DEPS_PREFIX/lib/libjpeg.a ]; then
     126  $DL_CMD -o $DL_DIR/$LIBJPEG_TARBALL $LIBJPEG_URL
     127
     128  tar xzvf $DL_DIR/$LIBJPEG_TARBALL
     129  cd $DL_DIR/jpeg-$LIBJPEG_VERSION
     130
     131  # jpeg install command expects this to exist.
     132  mkdir -p $DEPS_PREFIX/man/man1
     133
     134  if [ "${OSTYPE:0:6}" == "darwin" ]; then
     135    ./configure --prefix=$DEPS_PREFIX --disable-dependency-tracking
     136    make CFLAGS="-O -g -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" \
     137    LDFLAGS="-arch i386 -arch ppc"
     138    make install
     139  else
     140    ./configure --prefix=$DEPS_PREFIX
     141 
     142    make
     143  fi
     144 
     145  cp libjpeg.a $DEPS_PREFIX/lib
     146  cp *.h $DEPS_PREFIX/include
     147 
     148  cd $DL_DIR
     149  rm -rf $DL_DIR/jpeg-$LIBJPEG_VERSION
     150fi
     151
     152if [ ! -f $DEPS_PREFIX/lib/libpng.a ]; then
     153  $DL_CMD -o $DL_DIR/$LIBPNG_TARBALL $LIBPNG_URL
     154
     155  tar xzvf $DL_DIR/$LIBPNG_TARBALL
     156  cd $DL_DIR/libpng-$LIBPNG_VERSION
     157
     158  if [ "${OSTYPE:0:6}" == "darwin" ]; then
     159    ./configure --prefix=$DEPS_PREFIX --disable-dependency-tracking
     160    make CFLAGS="-O -g -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc" \
     161    LDFLAGS="-arch i386 -arch ppc"
     162    make install
     163  else
     164    ./configure --prefix=$DEPS_PREFIX
     165 
     166    make
     167    make install
     168  fi
     169 
     170  cd $DL_DIR
     171  rm -rf $DL_DIR/libpng-$LIBPNG_VERSION
     172fi
Note: See TracChangeset for help on using the changeset viewer.