[Dotgnu-pnet-commits] CVS: ml-pnet ChangeLog, 1.15, 1.16 configure.in, 1.13, 1.14 copy-mcs.sh, 1.1, 1.2

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/ml-pnet
In directory subversions:/tmp/cvs-serv18434

Modified Files:
        ChangeLog configure.in copy-mcs.sh 
Log Message:


Look for "build/library.make" in some other places as well.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/ml-pnet/ChangeLog,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** ChangeLog   19 Jul 2003 17:42:07 -0000      1.15
--- ChangeLog   26 Jul 2003 05:01:53 -0000      1.16
***************
*** 1,3 ****
--- 1,8 ----
  
+ 2003-07-26  Rhys Weatherley  <address@hidden>
+ 
+       * configure.in, copy-mcs.sh: look for "build/library.make" in
+       some other places as well.
+ 
  2003-07-19  Gopal.V  <address@hidden>
        

Index: configure.in
===================================================================
RCS file: /cvsroot/dotgnu-pnet/ml-pnet/configure.in,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** configure.in        19 Jul 2003 17:42:07 -0000      1.13
--- configure.in        26 Jul 2003 05:01:53 -0000      1.14
***************
*** 60,75 ****
                MONO_SOURCE_PATH="`pwd`/mcs-sources"
        else
!               if test -f "../mono/mcs/class/library.make" ; then
!                       MONO_SOURCE_PATH="`pwd`/../mono/mcs"
                else
!                       if test -f "../mcs/class/library.make" ; then
!                               MONO_SOURCE_PATH="`pwd`/../mcs"
                        else
!                               AC_MSG_WARN(not found)
!                               echo 
'****************************************************'
!                               echo "Supply the --with-mono-sources option to 
specify the"
!                               echo "location of the Mono library sources."
!                               echo 
'****************************************************'
!                               exit 1
                        fi
                fi
--- 60,87 ----
                MONO_SOURCE_PATH="`pwd`/mcs-sources"
        else
!               if test -f "./mcs-sources/build/library.make" ; then
!                       MONO_SOURCE_PATH="`pwd`/mcs-sources"
                else
!                       if test -f "../mono/mcs/class/library.make" ; then
!                               MONO_SOURCE_PATH="`pwd`/../mono/mcs"
                        else
!                               if test -f "../mono/mcs/build/library.make" ; 
then
!                                       MONO_SOURCE_PATH="`pwd`/../mono/mcs"
!                               else
!                                       if test -f "../mcs/class/library.make" 
; then
!                                               MONO_SOURCE_PATH="`pwd`/../mcs"
!                                       else
!                                               if test -f 
"../mcs/build/library.make" ; then
!                                                       
MONO_SOURCE_PATH="`pwd`/../mcs"
!                                               else
!                                                       AC_MSG_WARN(not found)
!                                                       echo 
'****************************************************'
!                                                       echo "Supply the 
--with-mono-sources option to specify the"
!                                                       echo "location of the 
Mono library sources."
!                                                       echo 
'****************************************************'
!                                                       exit 1
!                                               fi
!                                       fi
!                               fi
                        fi
                fi
***************
*** 78,81 ****
--- 90,96 ----
        # Add an extra "mcs" if the user omitted it.
        if test -f "$MONO_SOURCE_PATH/mcs/class/library.make" ; then
+               MONO_SOURCE_PATH="$MONO_SOURCE_PATH/mcs"
+       fi
+       if test -f "$MONO_SOURCE_PATH/mcs/build/library.make" ; then
                MONO_SOURCE_PATH="$MONO_SOURCE_PATH/mcs"
        fi

Index: copy-mcs.sh
===================================================================
RCS file: /cvsroot/dotgnu-pnet/ml-pnet/copy-mcs.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** copy-mcs.sh 17 Jun 2003 05:24:50 -0000      1.1
--- copy-mcs.sh 26 Jul 2003 05:01:53 -0000      1.2
***************
*** 24,33 ****
  fi
  if test ! -f "$1/class/library.make" ; then
!       echo "Could not fine mcs in the specified directory" 1>&2
!       exit 1
  fi
  MCS_SOURCES="$1"
  
  mkdir mcs-sources
  mkdir mcs-sources/class
  mkdir mcs-sources/class/corlib
--- 24,36 ----
  fi
  if test ! -f "$1/class/library.make" ; then
!       if test ! -f "$1/build/library.make" ; then
!               echo "Could not fine mcs in the specified directory" 1>&2
!               exit 1
!       fi
  fi
  MCS_SOURCES="$1"
  
  mkdir mcs-sources
+ mkdir mcs-sources/build
  mkdir mcs-sources/class
  mkdir mcs-sources/class/corlib
***************
*** 35,39 ****
  mkdir mcs-sources/tools
  
! cp -p "$MCS_SOURCES/class/library.make" mcs-sources/class/library.make
  cp -p "$MCS_SOURCES/class/corlib/System/TODOAttribute.cs" 
mcs-sources/class/corlib/System/TODOAttribute.cs
  cp -pr "$MCS_SOURCES/tools/SqlSharp" mcs-sources/tools
--- 38,46 ----
  mkdir mcs-sources/tools
  
! if test -f "$MCS_SOURCES/class/library.make" ; then
!       cp -p "$MCS_SOURCES/class/library.make" mcs-sources/class/library.make
! else
!       cp -p "$MCS_SOURCES/build/library.make" mcs-sources/build/library.make
! fi
  cp -p "$MCS_SOURCES/class/corlib/System/TODOAttribute.cs" 
mcs-sources/class/corlib/System/TODOAttribute.cs
  cp -pr "$MCS_SOURCES/tools/SqlSharp" mcs-sources/tools