Show
Ignore:
Timestamp:
06.03.2012 16:29:51 (8 years ago)
Author:
ak19
Message:

Added new version of mico. The older version 2.3.5 does not work on the 64 bit linux. The latest official binary was 2.3.13 which required a modification to orb/fast_array.cc where it needs to hash include limits.h (include file in diamond brackets). Then the runtime-src's configure.in (and configure) files need to be updated to set the Mico minimum version to 2.3.13. Finally, the make install was not succeeding in Mico. Dr Bainbridge modified runtime-src/packages/configure to both get rid of some config flags that may not be necessary and because a sed replacement operation now needed to be case insensitive.

Location:
main/trunk/greenstone2/runtime-src
Files:
1 added
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/configure

    r25149 r25189  
    44984498sh -c "$CC -c micotest.cpp -o micotest.o $MICO_INC 2>&1" > /dev/null 
    44994499sh -c "$CC -o micotest micotest.o -lstdc++ 2>&1" > /dev/null 
    4500 MICO_VER=`./micotest` || MICO_VER=2.3.5 
     4500MICO_VER=`./micotest` || MICO_VER=2.3.13 
    45014501sh -c "rm micotest" 
    45024502sh -c "rm micotest.o" 
  • main/trunk/greenstone2/runtime-src/configure.in

    r25149 r25189  
    268268sh -c "$CC -c micotest.cpp -o micotest.o $MICO_INC 2>&1" > /dev/null 
    269269sh -c "$CC -o micotest micotest.o -lstdc++ 2>&1" > /dev/null 
    270 MICO_VER=`./micotest` || MICO_VER=2.3.5 
     270MICO_VER=`./micotest` || MICO_VER=2.3.13 
    271271sh -c "rm micotest" 
    272272sh -c "rm micotest.o" 
  • main/trunk/greenstone2/runtime-src/packages/configure

    r25149 r25189  
    1 #! /bin/sh 
     1s#! /bin/sh 
    22 
    33PACKAGES=`pwd` 
     
    140140 
    141141    cd "$PACKAGES/mico" 
    142     gzip -dc mico-2.3.5.tar.gz | tar -xf - 
     142    gzip -dc mico-2.3.13.tar.gz | tar -xf - 
    143143    cd mico && \ 
    144     ./configure $CACHE_FILE    --prefix=$PACKAGES/mico/  --disable-coss --disable-naming --disable-relship --disable-events --disable-streams --disable-property --disable-trader --disable-time --disable-debug --enable-optimize --enable-final --enable-speed-tune 
    145     sed 's/tools//'  $PACKAGES/mico/mico/Makefile | sed 's/ldconfig//' >$PACKAGES/mico/mico/Makefile.out 
     144    ./configure $CACHE_FILE    --prefix=$PACKAGES/mico/  --disable-coss --disable-naming --disable-relship --disable-events --disable-streams --disable-property --disable-trader --disable-time  
     145#--disable-debug  
     146#--enable-optimize --enable-final --enable-speed-tune 
     147#    sed 's/tools//'  $PACKAGES/mico/mico/Makefile | sed 's/ldconfig//' >$PACKAGES/mico/mico/Makefile.out  
     148 
     149# Remove any references to running 'tools' and 'ldconfig' as these require 
     150# admin permissions when running 'make install'. 
     151# Use fgrep here to knock out the entire line containing $(LDCONFIG), because 
     152# there may be a special tab preceding the line which in a Makefile can have 
     153# special meaning. Don't want to leave it in by itself. 
     154    sed 's/tools//'  $PACKAGES/mico/mico/Makefile | fgrep -iv ldconfig >$PACKAGES/mico/mico/Makefile.out 
    146155    mv $PACKAGES/mico/mico/Makefile.out $PACKAGES/mico/mico/Makefile 
    147156  else