[MinGW-cvs] msys/dvlpr/script msysdvlpr,1.2,1.3 msysrls.sh,1.5,1.6

[<ea...@us...>]

Update of /cvsroot/mingw/msys/dvlpr/script
In directory usw-pr-cvs1:/tmp/cvs-serv8893/script

Modified Files:
	msysdvlpr msysrls.sh 
Log Message:

	* bin/lnkcnv: New file.
	* var/script.dat: Add lnkcnv.
	* script/msysrls.sh: Set directory defaults to something more generic.
	* postinstall/pi.sh: Modify the check for ftp.exe and the script ftp.
	* msys.packages: New file.



Index: msysdvlpr
===================================================================
RCS file: /cvsroot/mingw/msys/dvlpr/script/msysdvlpr,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** msysdvlpr	19 Apr 2002 20:42:22 -0000	1.2
--- msysdvlpr	17 May 2002 18:54:54 -0000	1.3
***************
*** 1,5 ****
  #!/bin/sh
  # This file will start another MSYS session as an MSYS system instead of a
! # MINGW32 system.
  # 
  cd /
--- 1,6 ----
  #!/bin/sh
  # This file will start another MSYS session as an MSYS system instead of a
! # MINGW32 system. I.E.: uname -s will return MSYS_NT-4.0 instead of
! # MINGW32_NT-4.0.
  # 
  cd /

Index: msysrls.sh
===================================================================
RCS file: /cvsroot/mingw/msys/dvlpr/script/msysrls.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** msysrls.sh	15 May 2002 20:46:24 -0000	1.5
--- msysrls.sh	17 May 2002 18:54:54 -0000	1.6
***************
*** 17,22 ****
  MINORVER=0
  PATCHVER=8
! STOREROOT=/prjz/msys/nstl
! RLSROOT=/prjz/rls
  ARC=$1
  SNAPDATE=\-`date +%Y.%m.%d`
--- 17,23 ----
  MINORVER=0
  PATCHVER=8
! STOREROOT=/${PACKAGE}/store
! RLSROOT=/${PACKAGE}/rls
! RLSDEPOT=/${PACKAGE}/depot/binary/${PACKAGE}/${SHORTVER}
  ARC=$1
  SNAPDATE=\-`date +%Y.%m.%d`
***************
*** 29,33 ****
  VERSION=${MAJORVER}.${MINORVER}.${PATCHVER}
  SHORTVER=${MAJORVER}.${MINORVER}
! RLSOUTPUTDIR="`p2w ${RLSROOT}/${PACKAGE}/${VERSION}`"
  
  if [ -z "$SNAPDATE" ]
--- 30,34 ----
  VERSION=${MAJORVER}.${MINORVER}.${PATCHVER}
  SHORTVER=${MAJORVER}.${MINORVER}
! RLSOUTPUTDIR="`p2w ${RLSROOT}/${VERSION}`"
  
  if [ -z "$SNAPDATE" ]
***************
*** 46,54 ****
  datastore=${STOREROOT}/var
  
! rlsdepot=${RLSROOT}/${PACKAGE}/depot/${PACKAGE}/${SHORTVER}
! INFOBEFOREFILE="`p2w ${rlsdepot}/doc/msys/MSYS-${VERSION}-changes.rtf`"
! INFOAFTERFILE="`p2w ${rlsdepot}/doc/msys//MSYS_WELCOME.rtf`"
! LICENSEFILE="`p2w ${rlsdepot}/doc/msys/MSYS_LICENSE.rtf`"
! RLSSOURCEDIR="`p2w $rlsdepot`"
  
  exe_LIST="`cat ${datastore}/exe.dat`"
--- 47,54 ----
  datastore=${STOREROOT}/var
  
! INFOBEFOREFILE="`p2w ${RLSDEPOT}/doc/msys/MSYS-${VERSION}-changes.rtf`"
! INFOAFTERFILE="`p2w ${RLSDEPOT}/doc/msys//MSYS_WELCOME.rtf`"
! LICENSEFILE="`p2w ${RLSDEPOT}/doc/msys/MSYS_LICENSE.rtf`"
! RLSSOURCEDIR="`p2w $RLSDEPOT`"
  
  exe_LIST="`cat ${datastore}/exe.dat`"
***************
*** 60,108 ****
  script_LIST="`cat ${datastore}/script.dat`"
  
! if [ ! -d ${rlsdepot} ]
  then
!   mkdir -p ${rlsdepot}
  fi
  
! rm -rf ${rlsdepot}/*
  
! if [ ! -d ${rlsdepot}/bin ]
  then
!   mkdir ${rlsdepot}/bin
  fi
  
  for I in ${exe_LIST}
  do
!   cp ${istore}/bin/${I} ${rlsdepot}/bin/
  done
  
  for I in ${dll_LIST}
  do
!   cp ${istore}/bin/${I} ${rlsdepot}/bin/
  done
  
! if [ ! -d ${rlsdepot}/doc/msys ]
  then
!   mkdir -p ${rlsdepot}/doc/msys
  fi
  
  for I in ${doc_LIST}
  do
!   cat ${noarchstore}/doc/msys/${I} | sed -c -e "s/@VERSION@/$VERSION/g" -e "s/@RELEASE@/$RELEASE/g" > ${rlsdepot}/doc/msys/$I
  done
  
! if [ ! -d ${rlsdepot}/etc ]
  then
!   mkdir ${rlsdepot}/etc
  fi
  
  for I in ${etc_LIST}
  do
!   cp ${noarchstore}/etc/${I} ${rlsdepot}/etc/
  done
  
  for I in ${script_LIST}
  do
!   cp ${noarchstore}/bin/${I} ${rlsdepot}/bin/
  done
  
--- 60,108 ----
  script_LIST="`cat ${datastore}/script.dat`"
  
! if [ ! -d ${RLSDEPOT} ]
  then
!   mkdir -p ${RLSDEPOT}
  fi
  
! rm -rf ${RLSDEPOT}/*
  
! if [ ! -d ${RLSDEPOT}/bin ]
  then
!   mkdir ${RLSDEPOT}/bin
  fi
  
  for I in ${exe_LIST}
  do
!   cp ${istore}/bin/${I} ${RLSDEPOT}/bin/
  done
  
  for I in ${dll_LIST}
  do
!   cp ${istore}/bin/${I} ${RLSDEPOT}/bin/
  done
  
! if [ ! -d ${RLSDEPOT}/doc/msys ]
  then
!   mkdir -p ${RLSDEPOT}/doc/msys
  fi
  
  for I in ${doc_LIST}
  do
!   cat ${noarchstore}/doc/msys/${I} | sed -c -e "s/@VERSION@/$VERSION/g" -e "s/@RELEASE@/$RELEASE/g" > ${RLSDEPOT}/doc/msys/$I
  done
  
! if [ ! -d ${RLSDEPOT}/etc ]
  then
!   mkdir ${RLSDEPOT}/etc
  fi
  
  for I in ${etc_LIST}
  do
!   cp ${noarchstore}/etc/${I} ${RLSDEPOT}/etc/
  done
  
  for I in ${script_LIST}
  do
!   cp ${noarchstore}/bin/${I} ${RLSDEPOT}/bin/
  done
  
***************
*** 111,130 ****
    case $I in
    msys.bat)
!     cp ${noarchstore}/bin/${I} ${rlsdepot}
      ;;
    msys.ico | m.ico)
!     cp ${noarchstore}/${I} ${rlsdepot}
      ;;
    esac
  done
  
! if [ ! -d ${rlsdepot}/postinstall ]
  then
!   mkdir ${rlsdepot}/postinstall
  fi
  
  for I in ${pi_LIST}
  do
!   cp ${noarchstore}/pi/${I} ${rlsdepot}/postinstall/
  done
  
--- 111,130 ----
    case $I in
    msys.bat)
!     cp ${noarchstore}/bin/${I} ${RLSDEPOT}
      ;;
    msys.ico | m.ico)
!     cp ${noarchstore}/${I} ${RLSDEPOT}
      ;;
    esac
  done
  
! if [ ! -d ${RLSDEPOT}/postinstall ]
  then
!   mkdir ${RLSDEPOT}/postinstall
  fi
  
  for I in ${pi_LIST}
  do
!   cp ${noarchstore}/pi/${I} ${RLSDEPOT}/postinstall/
  done
  
***************
*** 134,138 ****
  fi
  
! cat msys.iss.in | \
    sed -c \
        -e "s/@VERSION@/$VERSION/g" \
--- 134,138 ----
  fi
  
! cat ${noarchstore}/msys.iss.in | \
    sed -c \
        -e "s/@VERSION@/$VERSION/g" \
***************
*** 145,150 ****
        -e "s%@RLSSOURCEDIR@%${RLSSOURCEDIR}%g" \
        -e "s%@RLSOUTPUTDIR@%${RLSOUTPUTDIR}%g" \
!   > msys.iss
  
! /c/InnoSetup2/iscc "msys.iss"
! rm msys.iss
--- 145,149 ----
        -e "s%@RLSSOURCEDIR@%${RLSSOURCEDIR}%g" \
        -e "s%@RLSOUTPUTDIR@%${RLSOUTPUTDIR}%g" \
!   > ${RLSDEPOT}/msys.iss
  
! /c/InnoSetup2/iscc "{$RLSDEPOT}/msys.iss"