|
From: Christer S. <ch...@us...> - 2005-10-29 18:57:18
|
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! |
