[Cbar-develop] cbar/misc makefile.ver,1.7,1.8 zipup.sh,1.8,1.9 makefile.bcc,1.8,NONE

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

Update of /cvsroot/cbar/cbar/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20003/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/cbar/cbar/misc/makefile.ver,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** makefile.ver	21 Sep 2005 18:29:15 -0000	1.7
--- makefile.ver	29 Oct 2005 18:57:56 -0000	1.8
***************
*** 7,10 ****
  # Shared library versions for Unix
  # todo: this is unused at the moment
! shared_version = 1.0.3
  shared_major_minor = 1.0
--- 7,10 ----
  # Shared library versions for Unix
  # todo: this is unused at the moment
! shared_version = 1.0.4
  shared_major_minor = 1.0

--- makefile.bcc DELETED ---

Index: zipup.sh
===================================================================
RCS file: /cvsroot/cbar/cbar/misc/zipup.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** zipup.sh	21 Sep 2005 18:29:15 -0000	1.8
--- zipup.sh	29 Oct 2005 18:57:56 -0000	1.9
***************
*** 12,23 ****
  
  # note: these are patched by fixver.sh script.
! zipversion=103
! tgzversion=1.0.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=104
! tgzversion=1.0.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,46 ----
  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 cbar/cbar$zipversion.zip
! rm -f cbar/cbar-$tgzversion.tar.gz
  
  echo create tar.gz archives...
  tar -cv $afiles | gzip -9  > cbar/cbar-$tgzversion.tar.gz
  
  echo create zip archives...
! cd cbar
  ./fix.sh djgpp --utod
! cd ../
  zip -9 cbar/cbar$zipversion.zip $afiles
- 
  cd cbar
  ./fix.sh unix --dtou
  
  echo all done!
--- 70,108 ----
  
  #############################################################################
  echo remove old archives...
! rm -f cbar$zipversion.zip
! rm -f cbar-$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  > cbar/cbar-$tgzversion.tar.gz
+ cd cbar
  
  echo create zip archives...
! # Change line endings from unix to DOS/Windows before packing the zip archives
  ./fix.sh djgpp --utod
! cd ..
  zip -9 cbar/cbar$zipversion.zip $afiles
  cd cbar
+ 
+ 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!