Tim, I intend to restructure the Fractint/Xfractint directory to look something like: Fractint Common (including header files) DOS (mostly assembly language, but come C) Unix Maps Par Formula IFS Lsystem This should allow me to maintain 3 source trees instead of the current 6. The sixth tree is from having already started this project. The others are Fractint, Xfractint, Fractint-floatonly, Xfractint-floatonly, and Experimental (Allegro). I did a test to see if I can do this under DOS, and I can. It requires editting each file to change the location of the header files, and changing the make files. Which is no different than what is required under Linux. I thought about putting the header files in a separate Headers directory, but that would require more #ifdef's because of the different usage of '/' and '\' in DOS and Linux. If there are no major complaints, I am going to restructure and then start a new CVS repository for each. Any thoughts or advice before I start this? Jonathan
I intend to restructure the Fractint/Xfractint directory to look something like: (details followed)
Looks like a very good idea. But can't you just modify the make files to include appropriate -I directives to find the includes? I don't think you'd want to put paths in the include directives in the source itself. I always though we could just combine the Xfractint and DOS files in one directory since we have avoided file name collisions, then build Xfract/DOS/ and various other options with and without assembler just with make files. However, your solution may be better and it's fine with me. What you really need to do, though, is put the CVS repository at fractint.org. Even if the only way to access it is via ssh login which is very limited at the moment (basically you and me), we could work to set up some form of anonymous access. I've never tried it but it shouldn't be hard. Tim
On Sunday 21 November 2004 3:48 pm, Tim Wegner wrote:
Looks like a very good idea. But can't you just modify the make files to include appropriate -I directives to find the includes? I don't think you'd want to put paths in the include directives in the source itself.
Ahh, thanks. That makes it much easier.
I always thought we could just combine the Xfractint and DOS files in one directory since we have avoided file name collisions, then build Xfract/DOS/ and various other options with and without assembler just with make files. However, your solution may be better and it's fine with me.
The reason I would like them separated is because I have seen changes in some of the Xfractint only files that are only applicable to files that would also be compiled under DOS.
What you really need to do, though, is put the CVS repository at fractint.org. Even if the only way to access it is via ssh login which is very limited at the moment (basically you and me), we could work to set up some form of anonymous access. I've never tried it but it shouldn't be hard.
Do we have the file/directory permissions to set that up, or does Damien have to do it? If you wanted to experiment, there is a compressed file of an old version (20.3p2) in the fractint directory. One problem I still have is getting a diff out of WinCVS. With gCVS, from a terminal, I can use: cvs rdiff -l -r tag module > patch.dif I suppose I need to install a separate CVS to be able to call cvs from a DOS prompt. Generating diffs from within WinCVS scrolls them across the screen, but doesn't give me a way to save them to a file. I could be missing something. Jonathan
Do we have the file/directory permissions to set that up, or does Damien have to do it?
As long as we use our Fractint area (either public or private) we can control permissions.
If you wanted to experiment, there is a compressed file of an old version (20.3p2) in the fractint directory.
WIll do.
One problem I still have is getting a diff out of WinCVS. With gCVS, from a terminal, I can use: cvs rdiff -l -r tag module > patch.dif
You can do 80% of what you want using just the command line with CVS. Tim
On Sunday 21 November 2004 9:34 pm, Tim Wegner wrote:
If you wanted to experiment, there is a compressed file of an old version (20.3p2) in the fractint directory.
WIll do.
I've finished combining the Fractint and Xfractint sources. It is in the fractint directory as fractcvs4.tar.gz for the repository and fractint20.4a.tar.gz as the source tree. I had to make a small change to cmdfiles.c so that Xfractint could read its own section of the sstools.ini file. We need to look into why the helpdefs.h file is generated slightly differently for Fractint and Xfractint (look at the first 10 lines). It looks to me like a problem with the splitpath routine in unix.c. The only other changes were make files and batch files (and the directory structure, of course).
One problem I still have is getting a diff out of WinCVS. With gCVS, from a terminal, I can use: cvs rdiff -l -r tag module > patch.dif
You can do 80% of what you want using just the command line with CVS.
What I don't have yet is a DOS version of CVS so that I can do that. Jonathan
I've finished combining the Fractint and Xfractint sources. It is in the fractint directory as fractcvs4.tar.gz for the repository and fractint20.4a.tar.gz as the source tree.
I'll have a look. Just love these long weekends!!!
What I don't have yet is a DOS version of CVS so that I can do that.
I meant the Linux/Unix CVS command line of course. I can't imagine wanting to use CVS under DOS <g!> Tim
Tim, I tried a small test of CVS on mandy using ssh: :ext:jonathan@mandy.fractalus.com:/home/fractint/testcvs You should use tim@mandy, of course. I imported a module called test that only contains altern.map and ant.c and then made a modification to ant.c. Worked fine. I will need to generate a key so I don't have to keep entering the password. Jonathan
Jonathan, - I will need to generate a key so I don't have to keep - entering the password. Actually I should check mandy's SSH configuration to see if I left keys as an option. For something like that, it's likely I was paranoid enough to lock it down to the authentication methods I actually use. / Damien M. Jones http://www.fractalus.com/gallery/ \\ dmj@fractalus.com (personal gallery of fractal art) /
Jonathan wrote:
:ext:jonathan@mandy.fractalus.com:/home/fractint/testcvs
That's pretty easy. It must be possible to use one of the cvs GUI's in a similar way. I see that a 3rd edition of Fogel's book is out: http://cvsbook.red-bean.com/OSDevWithCVS_3E.pdf Tim
Tim,
:ext:jonathan@mandy.fractalus.com:/home/fractint/testcvs
That's pretty easy. It must be possible to use one of the cvs GUI's in a similar way. I see that a 3rd edition of Fogel's book is out:
I'm using gCVS and WinCVS. I'm having trouble with getting WinCVS to work remotely. Probably missing some critical SSH files. I completed the merge of the float-only versions and uploaded a tar of the complete CVS repository to fractint as fractcvs5.tar.gz. The repository created by WinCVS is different from the one created by gCVS. I've used the one created by gCVS because the WinCVS repository generates error messages when used with gCVS. However, it might be worth looking at a WinCVS repository to see if we would be missing some important functionality. Jonathan
Hiya, I recommend http://www.tortoisecvs.org/, it integrates with the file explorer. Don't know about gCVS but WinCVS definitely creates some weird Sandboxes (checked out repositories) that don't go with other CVS clients (as to my experience). Florian -----Ursprüngliche Nachricht----- Von: fractdev-bounces+flo=fkolbe.de@mailman.xmission.com [mailto:fractdev-bounces+flo=fkolbe.de@mailman.xmission.com]Im Auftrag von Jonathan Osuch Gesendet: Donnerstag, 2. Dezember 2004 00:36 An: Fractint developer's list Betreff: Re: [Fractdev] Fractint/Xfractint directory structure Tim,
:ext:jonathan@mandy.fractalus.com:/home/fractint/testcvs
That's pretty easy. It must be possible to use one of the cvs GUI's in a similar way. I see that a 3rd edition of Fogel's book is out:
I'm using gCVS and WinCVS. I'm having trouble with getting WinCVS to work remotely. Probably missing some critical SSH files. I completed the merge of the float-only versions and uploaded a tar of the complete CVS repository to fractint as fractcvs5.tar.gz. The repository created by WinCVS is different from the one created by gCVS. I've used the one created by gCVS because the WinCVS repository generates error messages when used with gCVS. However, it might be worth looking at a WinCVS repository to see if we would be missing some important functionality. Jonathan _______________________________________________ Fractdev mailing list Fractdev@mailman.xmission.com http://mailman.xmission.com/cgi-bin/mailman/listinfo/fractdev
On Thursday 02 December 2004 6:11 pm, Florian Kolbe wrote:
I recommend http://www.tortoisecvs.org/, it integrates with the file explorer. Don't know about gCVS but WinCVS definitely creates some weird Sandboxes (checked out repositories) that don't go with other CVS clients (as to my experience).
Thanks, I'll have a look. Jonathan
On Thursday 02 December 2004 6:11 pm, Florian Kolbe wrote:
I recommend http://www.tortoisecvs.org/, it integrates with the file explorer. Don't know about gCVS but WinCVS definitely creates some weird Sandboxes (checked out repositories) that don't go with other CVS clients (as to my experience).
Once I overcame the missing cvslock.exe file, I found that tortoisecvs works very nicely. Thanks. Jonathan
participants (4)
-
Damien M. Jones -
Florian Kolbe -
Jonathan Osuch -
Tim Wegner