diff --git a/README.md b/README.md index 919a331..caec0d3 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Contact support@byteworks.us if you need contributor access. A complete distribution of the ORCA languages, including installers and documentation, is available from the Juiced GS store at https://juiced.gs/store/category/software/. It is distributed as part of the Opus ][ package. -## Line Endings +## Line Endings and File Types The text and source files in this repository originally used CR line endings, as usual for Apple II text files, but they have been converted to use LF line endings because that is the format expected by Git. If you wish to move them to a real or emulated Apple II and build them there, you will need to convert them back to CR line endings. @@ -30,11 +30,9 @@ If you wish, you can configure Git to perform line ending conversions as files a smudge = LC_CTYPE=C tr \\\\n \\\\r ``` -2. Add the following lines to the `.git/info/attributes` file, creating it if necessary: +2. Add the following line to the `.git/info/attributes` file, creating it if necessary: ``` * filter=crtext -bin/Libraries/* -filter -bin/Languages/* -filter ``` 3. Run the following commands to convert the existing files in your working copy: @@ -46,3 +44,5 @@ git checkout HEAD -- . Alternatively, you can keep the LF line endings in your working copy of the Git repository, but convert them when you copy the files to an Apple II. There are various tools to do this. One option is `udl`, which is [available][udl] both as a IIGS shell utility and as C code that can be built and used on modern systems. [udl]: http://ftp.gno.org/pub/apple2/gs.specific/gno/file.convert/udl.114.shk + +In addition to converting the line endings, you will also have to set the files to the appropriate file types before building ORCA/C on a IIGS. The included `settypes` script (for use under the ORCA shell) does this for the sources to the ORCA/C compiler itself, although it does not currently cover the test cases and headers. diff --git a/settypes b/settypes new file mode 100644 index 0000000..002df15 --- /dev/null +++ b/settypes @@ -0,0 +1,20 @@ +filetype = src +change =.rez rez +change =.pas pascal +change =.Comments pascal +change =.Debug pascal +change =.Print pascal +change =.asm asm65816 +change =.macros asm65816 +change make= exec +change linkit= linker +change smake exec +change count exec +change backup exec +change settypes exec +filetype =.notes txt +filetype =.md txt +filetype LICENSE txt + +* Install udl and uncomment this to also convert to CR line endings. +* udl -g =