[Cpri-develop] cpri fix.sh,1.1.1.1,1.2

[Christer S. <ch...@us...>]

Update of /cvsroot/cpri/cpri
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19916

Modified Files:
	fix.sh 
Log Message:
Set correct line endings in fix* in the distribution package, and improved the scrips to avoid future problems.

Index: fix.sh
===================================================================
RCS file: /cvsroot/cpri/cpri/fix.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** fix.sh	1 Mar 2003 10:26:24 -0000	1.1.1.1
--- fix.sh	29 Oct 2005 18:57:29 -0000	1.2
***************
*** 1,5 ****
  #!/bin/sh
  #
! # Sets up the Adime package for building with the specified compiler,
  # and if possible converts text files to the desired target format.
  
--- 1,5 ----
  #!/bin/sh
  #
! # Sets up the CPRI package for building with the specified compiler,
  # and if possible converts text files to the desired target format.
  
***************
*** 12,16 ****
     echo "  mingw32     Win32/MinGW32"
     echo "  msvc        Win32/MSVC"
-    echo "  bcc32       Win32/Borland C++"
     echo "  unix        Linux/gcc"
     echo "The other parameters control conversion of text files:"
--- 12,15 ----
***************
*** 39,43 ****
  proc_noexist()
  {
!    echo "Sorry, Cpri has not been ported to $1."
     echo "Want to help?"
     CPRI_NOCONV="1"
--- 38,42 ----
  proc_noexist()
  {
!    echo "Sorry, CPRI has not been ported to $1."
     echo "Want to help?"
     CPRI_NOCONV="1"
***************
*** 48,63 ****
     # common files.
     CPRI_FILELIST=`find . -type f "(" \
!       -name "*.c" -o -name "*.cfg" -o -name "*.cpp" -o -name "*.def" -o \
!       -name "*.h" -o -name "*.hin" -o -name "*.in" -o -name "*.inc" -o \
!       -name "*.m4" -o -name "*.mft" -o -name "*.s" -o -name "*.rc" -o \
!       -name "*.spec" -o -name "*.pl" -o -name "*.txt" -o -name "*._tx" -o \
!       -name "makefile*" -o -name "readme.*" -o \
!       -name "CHANGES" -o -name "AUTHORS" -o -name "THANKS" \
     ")"`
  
-    # touch unix shell scripts?
     if [ "$1" != "omit_sh" ]; then
        CPRI_FILELIST="$CPRI_FILELIST `find . -type f -name '*.sh'`"
     fi
  }
  
--- 47,61 ----
     # common files.
     CPRI_FILELIST=`find . -type f "(" \
!       -name "*.c" -o -name "*.cfg" -o -name "*.def" -o -name "*.h" -o -name "*.t" -o -name "*.ht" -o -name "*.txt" -o -name "*._tx" -o \
!       -name "*.lst" -o -name "makefile*" -o -name "emptymak" -o -name "*.html" \
     ")"`
  
     if [ "$1" != "omit_sh" ]; then
        CPRI_FILELIST="$CPRI_FILELIST `find . -type f -name '*.sh'`"
     fi
+ 
+    if [ "$1" != "omit_bat" ]; then
+       CPRI_FILELIST="$CPRI_FILELIST `find . -type f -name '*.bat'`"
+    fi
  }
  
***************
*** 78,82 ****
  {
     echo "Converting files from DOS/Win32 to Unix..."
!    proc_filelist
     for file in $CPRI_FILELIST; do
        echo "$file"
--- 76,80 ----
  {
     echo "Converting files from DOS/Win32 to Unix..."
!    proc_filelist "omit_bat"
     for file in $CPRI_FILELIST; do
        echo "$file"
***************
*** 118,130 ****
  
  case "$1" in
-    "bcc32"   ) proc_fix     "Windows (BCC32)"   "makefile.bcc";;
-    "beos"    ) proc_noexist "BeOS"              "none";;
     "djgpp"   ) proc_fix     "DOS (djgpp)"       "makefile.dj";;
     "mingw32" ) proc_fix     "Windows (Mingw32)" "makefile.mgw";;
     "msvc"    ) proc_fix     "Windows (MSVC)"    "makefile.vc";;
-    "qnx"     ) proc_fix     "QNX"               "none";;
     "unix"    ) proc_fix     "Unix"              "makefile.uni";;
-    "mac"     ) proc_noexist "Mac"               "none";;
-    "watcom"  ) proc_fix     "DOS (Watcom)"      "none";;
     "help"    ) proc_help;;
     *         ) proc_help;;
--- 116,123 ----