Hard Light Productions Forums

Modding, Mission Design, and Coding => FS2 Open Coding - The Source Code Project (SCP) => Topic started by: Inquisitor on October 18, 2002, 07:38:17 am

Title: Using WinCVS
Post by: Inquisitor on October 18, 2002, 07:38:17 am: WinCVS Setup

Ok, go to Admin-->Preferences

In the CVS root, enter the following:

[email protected]:/home/fs2source/cvsroot

Where you replace Inquisitor your username. Anon users type :

[email protected]:/home/fs2source/cvsroot

Authentication is: Password file on CVS server. Then click on the WinCVS tab, and in the home folder, pick a folder on your hard drive.

Click ok to close the dialog.

Make sure the path you selected is reflected in the path dialog in the tool bar, the select the Admin menu again.

Admin-->Login

Type your password, in the case of anonymous users, this password is anonymous.

In the Feedback/Console window at the bottom, it should say something like:

"CVS exited with code 0"

That means you are logged in.

Now, you need to get set up for the first time, vack to the menus:

Create-->Checkout Module

In the "module to check out" field, type "fs2_open"

Verify that the path is correct in the path field. Click the "Checkout options" tab.

This is where you would specify a branch, in our case we have only the one leave this blank if you don;t want the directx build (it will be merged soon anyway), if you are working with the branch, you can type "directx8" here.

The globals tab you can tweak, but the defaults are fine. Click ok and start downloading the code!

It's that easy. when you want to grab a fresh copy, you simply right click on the folder you want to update in the CVS window, and select update, it will merge any code changes with yours, and life will be good :)

I'll cover committs later.

any questions?
Title: Using WinCVS
Post by: RandomTiger on October 18, 2002, 09:58:53 am: Sorry if this is a little off topic, but I think we need a coder tutorial site where things like this can be put and added to.
Title: Using WinCVS
Post by: Inquisitor on October 18, 2002, 10:21:05 am: Not off topic at all :)

HLP/VW: Another gentle reminder about hsting access :)
Title: Using WinCVS
Post by: Bobboau on October 18, 2002, 12:44:29 pm: ah, It works :D
Title: Using WinCVS
Post by: Inquisitor on October 18, 2002, 01:12:29 pm: Sorry it took so long to write it up.

Bobboau, make sure you ask lots of questions if you have them :)
Title: Using WinCVS
Post by: Bobboau on October 18, 2002, 01:16:34 pm: why are all the files read only?
Title: Using WinCVS
Post by: Inquisitor on October 18, 2002, 01:21:38 pm: There is a check box inpreferences youcan select to undo that
Title: Using WinCVS
Post by: Bobboau on October 18, 2002, 01:49:13 pm: ok I'm going to try and get my beam changes ported over tonight, when I've got my changes I'll ask for more information on how to do what
Title: Using WinCVS
Post by: Inquisitor on October 18, 2002, 03:54:26 pm: Excellent :)
Title: Using WinCVS
Post by: Bobboau on October 19, 2002, 02:31:11 am: ok how do I upload my changes?
is it as simple as clicking on the folder and selecting commit?
Title: Using WinCVS
Post by: RandomTiger on October 19, 2002, 05:44:28 am: No, you have update your code to get any changes that other people have made. You will then perhaps get conflicts between your new key stuff and mine. You wll have to resolve these, ask for help if you are anything less than 100% sure. Then give it a test and if its OK then commit.
Title: Using WinCVS
Post by: Inquisitor on October 19, 2002, 10:32:34 am: Always update first, then commit. So if you have been working, and want to committ, gran a CVS update, pay attention to the merges (they are marked with a M in the console window of WinCVS), and resolve any conflicts (the are marked with a C), then right click, commit.

That way, you catch any thing that RT is talking about, and RT should be doing the same thing.

We all get an email when changes are committed, so we can go look at the changelog, see who did what.

Might help to find an email account that you can use for this, so you can subscribe that account to the notification dealie :)
Title: Using WinCVS
Post by: Bobboau on October 19, 2002, 12:13:45 pm: what are things marked with a P?
Title: Using WinCVS
Post by: Inquisitor on October 19, 2002, 01:26:23 pm: I *THINK* those are files that you haven't changed locally, that are changed on the server, I'll have to look :)
Title: Using WinCVS
Post by: Bobboau on October 19, 2002, 01:39:39 pm: ok, so I update and then commit,
I've updated twice and tested and everything seems to still work
well if I screw everything up you can undo it right?
Title: Using WinCVS
Post by: RandomTiger on October 19, 2002, 02:00:32 pm: Update then recompile the code. Then check for conflicts, for one thing the update will give you my key code which will conflict with yours (unless you've updated already). Give it a quick test to make sure its OK and only then commit.
Title: Using WinCVS
Post by: Bobboau on October 19, 2002, 02:13:13 pm: I alredy took that into consideration (read no conflict with you're code)
so I'm gona cmommit and see if anything wrong hapens
Title: Using WinCVS
Post by: RandomTiger on October 19, 2002, 02:18:11 pm: k
Title: Using WinCVS
Post by: Bobboau on October 19, 2002, 02:21:23 pm: ok there, I did it (I think), update and make sure I didn't break anything
Title: Using WinCVS
Post by: RandomTiger on October 19, 2002, 02:27:04 pm: Sounds like it worked, Im checking out a copy to see how it went.
What did you actually change?

Edit: Nevermind, I just read your checkin.
Looks like Im getting what I want. :yes:
Title: Using WinCVS
Post by: RandomTiger on October 19, 2002, 03:37:16 pm: All seems to have worked except I dont seem to have an e-mail of Bob's commit.
Title: Using WinCVS
Post by: Bobboau on October 19, 2002, 03:48:28 pm: one thing I realy do like is how fast it compiles
Title: Using WinCVS
Post by: Inquisitor on October 19, 2002, 04:00:25 pm: I got an email, wierd...

Anyway, thanks Bobboau!
Title: Using WinCVS
Post by: RandomTiger on October 19, 2002, 04:04:04 pm: Seriously, I think that I just dont get half of them.
It would explain why I never know whats going on.
Title: Using WinCVS
Post by: Bobboau on October 19, 2002, 11:02:07 pm: did someone change the definition of vector, like moveing the xyz into a substructure called xyz
Title: Using WinCVS
Post by: RandomTiger on October 20, 2002, 05:34:44 am: Do you mean changed recently?
Its been like that for a while, dont know if it started like that, I assume it did.
Title: Using WinCVS
Post by: Inquisitor on October 20, 2002, 12:00:14 pm: possibly, we made some header changes a while back to sort out some wierd pathing problems. They are all documented in the CVS changelog, that particular thing doesn;t sound familiar, but that doesn;t mean we didn;t chaneg the structure.

Need to rerun doxygen, now that we have made significant progress here.
Title: Using WinCVS
Post by: DTP on October 20, 2002, 03:47:37 pm: Quote
Originally posted by RandomTiger
Seriously, I think that I just dont get half of them.
It would explain why I never know whats going on.

checked, reasently i have only gotten RT´s & phreaks changes,
not bobboaus. it seems, maybe because we are using wincvs ?.

i got no email of my own changes. i thought/think this was because the email system was smart.
Title: Using WinCVS
Post by: Inquisitor on October 20, 2002, 03:55:54 pm: no, wincvs has nothing to do with it, the notify script might be borked, lemme look into it :)
Title: Using WinCVS
Post by: penguin on October 22, 2002, 12:47:13 am: Quote
Originally posted by Bobboau

what are things marked with a P?

"Patched" files -- ones that have changed since your previous update or checkout that have been successfully updated on your local copy.
Quote
Originally posted by Bobboau

did someone change the definition of vector, like moveing the xyz into a substructure called xyz

Yes, that was done some time ago, to make it ANSI compliant (and to get it compiling under gcc 2.95). The "matrix" struct was changed as well, and there were a few minor changes (to some structure with member names "or" and "and")
Title: Using WinCVS
Post by: Inquisitor on October 28, 2002, 08:24:22 am: http://www.wincvs.org/winhtml/wincvs11.htm
Title: Using WinCVS
Post by: RandomTiger on October 31, 2002, 06:14:35 am: broken link
Title: Using WinCVS
Post by: Inquisitor on October 31, 2002, 07:39:22 am: Works for me. I'll download it when i am not on my cell phone modem in an airport terminal, and upload it to our servers.

Try the main CVS website, it should give overviews of all the functionality.
Title: Using WinCVS
Post by: Bobboau on December 06, 2002, 06:15:17 pm: ok, so I'm about to make an update with my new decal code, but the decal code is all in new files, and all in a new folder, how do I make the new folder/files for the commit in the CVS
Title: Using WinCVS
Post by: Bobboau on December 06, 2002, 07:31:23 pm: well, I'm gona just update and commit and see if it picks them up...
no, it didn't, well you're gona get a compile error...:doubt:
unless you have these (http://freespace.volitionwatch.com/blackwater/decals_sorce.zip) files
Title: Using WinCVS
Post by: Inquisitor on December 07, 2002, 05:40:50 pm: Create the folder.

Put the files in the folder.

Open CVS, right click on the folder, should be an add to CVS, then right click on it again and committ...
Title: Using WinCVS
Post by: Bobboau on December 07, 2002, 07:20:02 pm: ok the only options I get when I right click on the folder is: explore selection, reload view, import module, checkout module, and customise this menu.
I see no add to CVS anywere
Title: Using WinCVS
Post by: Inquisitor on December 08, 2002, 01:11:43 am: IRC

tomorrow

12pm EST
Title: Using WinCVS
Post by: Bobboau on December 11, 2002, 01:04:36 pm: I'm guessing that someone fixed this as there hasn't been a thousand people screaming about it not compileing.

just checked, thank you DTP :)
Title: Using WinCVS
Post by: Inquisitor on December 11, 2002, 01:48:49 pm: yup :)

DTP rules :)
Title: Using WinCVS
Post by: DTP on December 11, 2002, 02:32:48 pm: Quote
Originally posted by Bobboau
I'm guessing that someone fixed this as there hasn't been a thousand people screaming about it not compileing.

just checked, thank you DTP :)

No Problem, regarding how to add directories and files in wincvs just for the record.

There is an icon at the top the resembles a document with a red +sign

mark Directory and click the icon, we need a directory before we can add files in it.

now mark the files and click the icon

now commit the files, since this is not done when you click the icon to add the files.
Title: Using WinCVS
Post by: Inquisitor on December 19, 2002, 09:10:29 am: Gonna get this added to the site.

Bumping for stealth and kasperl :)
Title: Using WinCVS
Post by: EdrickV on December 22, 2002, 04:26:36 pm: Anyone know where to get WinCVS? Wincvs.org seems to be down. Tried Cnet's download.com but didn't find it.
Title: Using WinCVS
Post by: Inquisitor on December 22, 2002, 08:26:38 pm: they seem to go down now and again. seems up for me now...
Title: Using WinCVS
Post by: EdrickV on December 22, 2002, 11:24:51 pm: I realized I still had the copy I'd downloaded quite a while ago when I first tried it (around the time it was first mentioned in this board) and installed that. It still seems to be current. And for anyone trying to use cvsgui.org, use wincvs.org instead. Looks like cvsgui.org was stolen or something. (Got quite a surprise when I followed a likely looking link from Altavista and ended up where it's pointing now.) And yes, the site is back up. :)