ccomx-develop Mailing List for CCOM - a lib for serial port interface

Update of /cvsroot/ccomx/ccom/docs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19848/docs

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

Index: changes._tx
===================================================================
RCS file: /cvsroot/ccomx/ccom/docs/changes._tx,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** changes._tx	21 Sep 2005 18:12:09 -0000	1.5
--- changes._tx	29 Oct 2005 18:57:10 -0000	1.6
***************
*** 38,41 ****
--- 38,47 ----
  @heading
  Changes
+ 
+   0.9.4:
+ <ul>
+    <li>
+       "Set correct line endings in fix* in the distribution package, and improved the scrips to avoid future problems."
+ </ul>
    0.9.3:
  <ul>

Index: ccom._tx
===================================================================
RCS file: /cvsroot/ccomx/ccom/docs/ccom._tx,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ccom._tx	21 Sep 2005 18:12:08 -0000	1.8
--- ccom._tx	29 Oct 2005 18:57:10 -0000	1.9
***************
*** 6,10 ****
  @#
  @multiwordheaders
! @manh="version 0.9.3" "CCOM" "Manual"
  @document_title=CCOM Manual
  @rtfh=CCOM  - an add on lib to CGUI for accessing the serial ports
--- 6,10 ----
  @#
  @multiwordheaders
! @manh="version 0.9.4" "CCOM" "Manual"
  @document_title=CCOM Manual
  @rtfh=CCOM  - an add on lib to CGUI for accessing the serial ports
***************
*** 32,36 ****
  <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center>
  <center><b>
! The Manual of CCOM 0.9.3
  </b></center>
  @!text
--- 32,36 ----
  <center>Homepage: <a href="http://www.idt.mdh.se/~csg/cgui/cguix">http://www.idt.mdh.se/~csg/cgui/cguix</a></center>
  <center><b>
! The Manual of CCOM 0.9.4
  </b></center>
  @!text

Update of /cvsroot/ccomx/ccom/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19848/misc

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

Index: makefile.ver
===================================================================
RCS file: /cvsroot/ccomx/ccom/misc/makefile.ver,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** makefile.ver	21 Sep 2005 18:12:10 -0000	1.8
--- makefile.ver	29 Oct 2005 18:57:10 -0000	1.9
***************
*** 7,10 ****
  # Shared library versions for Unix
  # todo: this is unused at the moment
! shared_version = 0.9.3
  shared_major_minor = 0.9
--- 7,10 ----
  # Shared library versions for Unix
  # todo: this is unused at the moment
! shared_version = 0.9.4
  shared_major_minor = 0.9

--- makefile.bcc DELETED ---

Index: zipup.sh
===================================================================
RCS file: /cvsroot/ccomx/ccom/misc/zipup.sh,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** zipup.sh	21 Sep 2005 18:12:10 -0000	1.9
--- zipup.sh	29 Oct 2005 18:57:10 -0000	1.10
***************
*** 12,23 ****
  
  # note: these are patched by fixver.sh script.
! zipversion=093
! tgzversion=0.9.3
  
  if [ "$1" != "-q" ]; then
  
  echo clean up...
! ./fix.sh djgpp --dtou
! make clean
  
  # Dont generate dependencies if a parameter was given.
--- 12,23 ----
  
  # note: these are patched by fixver.sh script.
! zipversion=094
! tgzversion=0.9.4
  
  if [ "$1" != "-q" ]; then
  
  echo clean up...
! # Make unix line endings
! ./fix.sh unix --dtou
  
  # Dont generate dependencies if a parameter was given.
***************
*** 27,46 ****
  if [ "$1" = "--no-depend" ]; then
     echo skip generating dependencies
-    ./fix.sh djgpp --quick
  else
     echo generate dll stuff...
     ./misc/fixdll.sh
     echo generate dependencies...
     ./fix.sh mingw32 --quick
     make depend
     ./fix.sh msvc --quick
     make depend
     ./fix.sh unix --quick
     make depend
     ./fix.sh djgpp --quick
     make depend
- #    ./fix.sh bcc32 --quick
- #    make depend
-    ./fix.sh djgpp --quick
  fi
  
--- 27,47 ----
  if [ "$1" = "--no-depend" ]; then
     echo skip generating dependencies
  else
     echo generate dll stuff...
     ./misc/fixdll.sh
+ 
     echo generate dependencies...
+    #But don't alter the line endings (--quick ensures that)
     ./fix.sh mingw32 --quick
     make depend
+ 
     ./fix.sh msvc --quick
     make depend
+ 
     ./fix.sh unix --quick
     make depend
+ 
     ./fix.sh djgpp --quick
     make depend
  fi
  
***************
*** 70,90 ****
  
  #############################################################################
- cd ..
  
  echo remove old archives...
! rm -f ccom/ccom$zipversion.zip
! rm -f ccom/ccom-$tgzversion.tar.gz
  
  echo create tar.gz archives...
  tar -cv $afiles | gzip -9  > ccom/ccom-$tgzversion.tar.gz
  
  echo create zip archives...
! cd ccom
  ./fix.sh djgpp --utod
! cd ../
  zip -9 ccom/ccom$zipversion.zip $afiles
- 
  cd ccom
  ./fix.sh unix --dtou
  
  echo all done!
--- 71,110 ----
  
  #############################################################################
  
  echo remove old archives...
! rm -f ccom$zipversion.zip
! rm -f ccom-$tgzversion.tar.gz
! 
! # Line endings are still unix in all files, including bat-files. To make the tar archive useful also for
! # Windows users, we change the line endings to DOS/Windows already before packing the tar. This should be
! # no problem for unix users since the bat file has no meaning in unix.
! cp "fix.bat" _tmpfile
! perl -p -i -e "s/([^\r]|^)\n/\1\r\n/" _tmpfile
! touch -r "fix.bat" _tmpfile
! mv _tmpfile "fix.bat"
  
  echo create tar.gz archives...
+ cd ..
  tar -cv $afiles | gzip -9  > ccom/ccom-$tgzversion.tar.gz
+ cd ccom
  
  echo create zip archives...
! # Change line endings from unix to DOS/Windows before packing the zip archives
  ./fix.sh djgpp --utod
! cd ..
  zip -9 ccom/ccom$zipversion.zip $afiles
  cd ccom
+ 
+ echo "Archives finished!"
+ 
+ # Restore correct unix line endings
  ./fix.sh unix --dtou
  
+ # fix.sh omits to change line endings in the bat-file, so we need to change it separately because we want the local
+ # copy to have the unix style to have the right endings when committing to cvs next time.
+ mv "fix.bat" _tmpfile
+ tr -d '\015' < _tmpfile > "fix.bat"
+ touch -r _tmpfile "fix.bat"
+ rm _tmpfile
+ 
  echo all done!

Update of /cvsroot/ccomx/ccom/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19848/include

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

Index: ccom.h
===================================================================
RCS file: /cvsroot/ccomx/ccom/include/ccom.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ccom.h	21 Sep 2005 18:12:10 -0000	1.9
--- ccom.h	29 Oct 2005 18:57:10 -0000	1.10
***************
*** 4,11 ****
  #define CCOM_VERSION_MAJOR      0
  #define CCOM_VERSION_MINOR      9
! #define CCOM_VERSION_PATCH      3
! #define CCOM_VERSION_STRING     "0.9.3"
! #define CCOM_DATE               20050921    /* yyyymmdd */
! #define CCOM_DATE_STRING "Sep 21, 2005"
  
  #include "ccom/ccomcfg.h"
--- 4,11 ----
  #define CCOM_VERSION_MAJOR      0
  #define CCOM_VERSION_MINOR      9
! #define CCOM_VERSION_PATCH      4
! #define CCOM_VERSION_STRING     "0.9.4"
! #define CCOM_DATE               20051029    /* yyyymmdd */
! #define CCOM_DATE_STRING "Oct 29, 2005"
  
  #include "ccom/ccomcfg.h"

Update of /cvsroot/ccomx/ccom
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19848

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/ccomx/ccom/fix.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** fix.sh	2 Mar 2003 17:06:00 -0000	1.1.1.1
--- fix.sh	29 Oct 2005 18:57:10 -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 CCOM 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 ----
***************
*** 48,63 ****
     # common files.
     CCOM_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
        CCOM_FILELIST="$CCOM_FILELIST `find . -type f -name '*.sh'`"
     fi
  }
  
--- 47,61 ----
     # common files.
     CCOM_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
        CCOM_FILELIST="$CCOM_FILELIST `find . -type f -name '*.sh'`"
     fi
+ 
+    if [ "$1" != "omit_bat" ]; then
+       CCOM_FILELIST="$CCOM_FILELIST `find . -type f -name '*.bat'`"
+    fi
  }
  
***************
*** 78,82 ****
  {
     echo "Converting files from DOS/Win32 to Unix..."
!    proc_filelist
     for file in $CCOM_FILELIST; do
        echo "$file"
--- 76,80 ----
  {
     echo "Converting files from DOS/Win32 to Unix..."
!    proc_filelist "omit_bat"
     for file in $CCOM_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 ----