Re: Creating a UNIX module

Russ,

What Torsten has written is correct, however let me make a 'bigger picture' point.

The BEST way to work is to let all text files be text files - that means that on windows a bash script has cr/lf line endings and on unix it has lf line endings.  eg: a cobol file on as/400 will be fixed length records, on windows cr/lf delimited text file and lf delimited text on unix.

So when you want to deploy your unix script you check it out ON UNIX.  ie: you don't need to only use TortoiseCVS (CVSNT) on windows - CVSNT runs on unix and as/400 too - use it on each environment.

eg: in the CVSNT build scripts we edit all the linux cvsnt.spec.in files on windows (with cr/lf line endings) and then the build (on linux) checks them out and uses them with rpmbuild.

For the very very very few instances when people can't run CVSNT from linux to checkout their linux files we do support the -kl substitution mode for unix line endings on windows - but it should be the exception.  The very very rare exception.

Regards,


Arthur Barrett





-----Original Message-----
From:	Torsten Martinsen [mailto:[email protected]]
Sent:	Sat 20/02/2010 8:30 AM
To:	Russ Pachl
Cc:	tortoisecvs-users-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
Subject:	Re: [TortoiseCVS] Creating a UNIX module

Russ Pachl wrote: 

I may be confused then,

 

I have code that we deploy both on Windows and UNIX. When we commit from our sandbox to CVS, it is not persisting the UNIX line endings correctly for the scripts needed to install on UNIX. It is adding the CR/LF to the end. 

 

How do I get it to commit from my sandbox to CVS and retain the correct line ending needed for UNIX?

(Please always Cc: the list).

Change the keyword substitution mode for the existing scripts: 
http://www.cvsnt.org/manual/html/Substitution-modes.html

In the future, when 'CVS Add'ing scripts, be sure to select 'Options -> UNIX line endings'.




 

 

 

From: Torsten Martinsen [mailto:[email protected]] 
Sent: Thursday, February 18, 2010 1:22 PM
To: Russ Pachl
Cc: tortoisecvs-users-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
Subject: Re: [TortoiseCVS] Creating a UNIX module

 

Russ Pachl wrote: 

On the Tortoise FAQ – “To detect whether a module was checked out with UNIX line endings, TortoiseCVS looks at the CVS administrative files in the CVS subdirectory: If the line endings for those files are in UNIX style, a UNIX sandbox is assumed. Unfortunately, there are some CVS clients (e.g. Eclipse) which create those files without a single line ending, so TortoiseCVS cannot detect them as UNIX sandbox. There's a preference setting that instructs TortoiseCVS whether to default to DOS or UNIX in such cases”

 

Which administrative files need to be modified and how to support the UNIX line endings?

You are not supposed to modify the administrative files, CVS does that for you.

-Torsten





------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev