Hard Light Productions Forums
Modding, Mission Design, and Coding => FS2 Open Coding - The Source Code Project (SCP) => Topic started by: Bobboau on October 30, 2002, 12:34:45 pm
-
checked out this morning
Compiling...
cfile.cpp
D:\Games\projects\freespace2_public\fs2_open\code\CFile\cfile.cpp(220) : error C2143: syntax error : missing ';' before '<<'
D:\Games\projects\freespace2_public\fs2_open\code\CFile\cfile.cpp(229) : error C2143: syntax error : missing ';' before '>>'
c:\program files\microsoft visual studio\vc98\include\memory.h(28) : error C2143: syntax error : missing ';' before '{'
c:\program files\microsoft visual studio\vc98\include\memory.h(28) : error C2447: missing function header (old-style formal list?)
CfileSystem.cpp
D:\Games\projects\freespace2_public\fs2_open\code\CFile\CfileSystem.cpp(266) : error C2143: syntax error : missing ';' before '<<'
D:\Games\projects\freespace2_public\fs2_open\code\CFile\CfileSystem.cpp(268) : error C2143: syntax error : missing ';' before '{'
D:\Games\projects\freespace2_public\fs2_open\code\CFile\CfileSystem.cpp(271) : error C2143: syntax error : missing ';' before '=='
D:\Games\projects\freespace2_public\fs2_open\code\CFile\CfileSystem.cpp(273) : error C2143: syntax error : missing ';' before '{'
D:\Games\projects\freespace2_public\fs2_open\code\CFile\CfileSystem.cpp(276) : error C2065: 'DIR_SEPARATOR_STR' : undeclared identifier
D:\Games\projects\freespace2_public\fs2_open\code\CFile\CfileSystem.cpp(278) : error C2143: syntax error : missing ';' before '>>'
D:\Games\projects\freespace2_public\fs2_open\code\CFile\CfileSystem.cpp(305) : error C2601: 'cf_packfile_sort_func' : local function definitions are illegal
D:\Games\projects\freespace2_public\fs2_open\code\CFile\CfileSystem.cpp(321) : error C2601: 'cf_build_pack_list' : local function definitions are illegal
D:\Games\projects\freespace2_public\fs2_open\code\CFile\CfileSystem.cpp(1231) : fatal error C1070: mismatched #if/#endif pair in file 'D:\Games\projects\freespace2_public\fs2_open\code\CFile\CfileSystem.cpp'
MissionCampaign.cpp
D:\Games\projects\freespace2_public\fs2_open\code\Mission\MissionCampaign.cpp(417) : error C2146: syntax error : missing ')' before identifier 'DIR_SEPARATOR_STR'
D:\Games\projects\freespace2_public\fs2_open\code\Mission\MissionCampaign.cpp(417) : error C2059: syntax error : ')'
Error executing cl.exe.
fs2_open_debug.exe - 15 error(s), 0 warning(s)
the version of my code that had the new warp out stuff and had fixed the locking thing, and the new glow point code is now also effected by this as I forgot to make a backup before updateing it the other day
-
Bob: look in the source code directory of the affected files, you SHOULD see all the earlier versions of your files.
Also, generally speaking, watch the status window of CVS, look for U's and C's, you might have a conflict that didn;t get resolved automatically, and you may need to edit out the CVS generated comments on that conflict.
-
these lines in cfile.cpp
<<<<<<< cfile.cpp
and
>>>>>>> 2.5
are causeing four of the errors, where did they come from?
-
You have a local conflict, those are the way CVS marks things you have to manually correct. The 2.5 ios the file version number. It tried to merge, but was unable to, so you can go in, look for those comments, and do somethig to them.
-
but this isn't a merge, this is from a checkout, I downloaded the sorce as it was so I could manualy merge my files into it
-
maybe I did it wrong, I'll do it again, this time make sure I rename the directory
-
now I'm getting this
d:\games\projects\freespace2_public\fs2_open\code\cmdline\cmdline.h(37) : fatal error C1070: mismatched #if/#endif pair in file 'd:\games\projects\freespace2_public\fs2_open\code\cmdline\cmdline.h'
last time I fixed this it led to a crash
-
No, it sounds as though you did it right. What happened (at least what looks like happened) is you got caught by DTP's mod code checkin, and it didn;t know how to merege it automatically with whatever chanegs you made to those files.
It's marked all the places, in the cc and .h files, where you need to have a look at what YOU wanted versus what was in CVS, looks like it's about 4 sections of code or so.
Follow?
I have to run to a meeting, let's get in a real time chat after 3 est if you are still have issues.
-
ok I just got a copy of what is up on CVS and compiled it, and it will compile, but it crashes before the debug widow opens up, nothing was merged, this is exactly what is up there now without any changes made (as far as I can tell)
-
I agree with Inquisitor, its rollback time.
-
so how do I get the older version
-
Several posts up, it's an option in the update.
Select the files that are causing the problem, right click, update, then in the "sticky/merge" tab (whatever it is called) put in the date of the file that is good (anything before yesterday I think, day before at the lastest, look at the web CVS entry for the file in question to see when it was last updated).
Need to get home and look at this, sort out what happened, yell at whoever broke it :)
-edit-
Wait a sec....
cmdline.h? I rolled that back already, lemme see if I screwed up the roll back (that's possible).
edit-2
Ooops, I goofed, one sec, gimme a few to see what it is, you should still be able to grab the older version of that .h with the above instructions, seems like I goofed the roll back...
-edit3-
Try now, I had a bad rollback, forgot to reset the sticky tag.
-
still won't run
can we get this fixed I can't do anything untill I get working code again
-
k. Im going to try and make this a constructive comment and people should read it as one.
This is exactly the kind of thing I was scared fs2_open is going to suffer from. Its a total waste when Bob cant get into the code to do what he wants.
I count myself lucky I have my own little code branch and and I am confident no-ones going to screw it up.
Obviously this kind of stuff happens, indeed I made a mistake recently that stopped debug DX compiling for a short time.
But at least I know I compiled it under at least one setting and properly documented my change.
-
One mistake does not wreck the train.
I am going to Oregon for a few days, but will have access.
I will look at it again when I land later today.
Bobbau, I rolled back cmdline.h, what are the new errors. Start a new thread on this so we can sort it out. You STILL sound like you have manual conflicts you have to resolve. It only puts those >>>>> <<<<<<< in when there is such a thing.
I am splitting this thread from the "next build" one.
Check the version number on the cmdlin.h, it SHOULD say 2.10 and are the errors the same?
I am going to be equally constructive and say that most of this conversation SHOULD have taken place over some kind of real time chat.
Also, EVERY CHANGE IS DOCUMENTED. LOOK AT CVS. I don;t mean to be rude, but, we have the tools to make sure we can find these errors, and roll them back. The CVS weblog for each file exists, go look at the files giving you errors and make your own determination. Even the last committ where there were no comments in the logs SHOWS you there was a committ (and I have chastised the appropriate person for missing that, everyone makes mistakes).
So, Bob, help me out here and tell me if the same file is failing in the same place. We roll back till we get it right.
I land at 5:27 PST, probably check in around 6. I'll try compiling it on the plane and hopefully have some news.
RT: Did it compile for you?
DTP: How about you?
Anyone else?
-
Will the rollback affect DX8 branch?
-
No, it won't.
I'd like everyone to take some time and go to the CVS link stickied. Look over the link to the CVS docs I posted and get a little familiar (it's not hard) with the tool.
-
I apologize if I sound snitty, I guess I assumed people looked at the CVS docs first. My apologies.
I will HAPPILY walk people thru how to use this, online, in a real time chat, after the IGC.
Btw, I am connected via my spiffy cell phone modem, on my laptop, in Logan airport. I think that is pretty cool :) No wires :)
I am compiling now, will report back in a few.
-edit-
fs2_open.exe - 0 error(s), 11 warning(s)
Lemme try and run it.
-
it's not a compile error, it crashes before the debug window opens with an assertion failure while trying to build a file list
-
good luck at that conference
-
Originally posted by Inquisitor
One mistake does not wreck the train.
I am going to Oregon for a few days, but will have access.
I will look at it again when I land later today.
Bobbau, I rolled back cmdline.h, what are the new errors. Start a new thread on this so we can sort it out. You STILL sound like you have manual conflicts you have to resolve. It only puts those >>>>> <<<<<<< in when there is such a thing.
I am splitting this thread from the "next build" one.
Check the version number on the cmdlin.h, it SHOULD say 2.10 and are the errors the same?
I am going to be equally constructive and say that most of this conversation SHOULD have taken place over some kind of real time chat.
Also, EVERY CHANGE IS DOCUMENTED. LOOK AT CVS. I don;t mean to be rude, but, we have the tools to make sure we can find these errors, and roll them back. The CVS weblog for each file exists, go look at the files giving you errors and make your own determination. Even the last committ where there were no comments in the logs SHOWS you there was a committ (and I have chastised the appropriate person for missing that, everyone makes mistakes).
So, Bob, help me out here and tell me if the same file is failing in the same place. We roll back till we get it right.
I land at 5:27 PST, probably check in around 6. I'll try compiling it on the plane and hopefully have some news.
RT: Did it compile for you?
DTP: How about you?
Anyone else?
crap just saw this, i think this was my error.
Corrected it, i think, doing a build now.
In my foggy mind i confused cfile.h and cmdline.h did some copy paste thing, and when i urged Inquisitor to do a rollback, he only rolled back Cmdline.h like i told him too. he should have rolled back cfile.h, cfile.cpp, and cfilesystem.cpp and cfilesystem.h, i thought when he rolled back, he rolled back all changes made by this and this user, the last time.
Should be working again.
but building now.
and will report back
-
ok, it should work now, my compiler just passed cfile.h, cpp and cfilesystem.h and cpp.
sorry for the trouble.
:(
-
Tested the release exe to work.
When Inquisitor rolled back cmdline.h
Some external pointers went missing since cfile.cpp and cfile.h used some command arguements to dertermine if it should check for mod support or not.
well be much more carefull in the future.
Im just amazed that bob could even compile it without any fatal errors.
-
Originally posted by Bobboau
it's not a compile error, it crashes before the debug window opens with an assertion failure while trying to build a file list
try again, checkout cvs fs2_open, and try again. :(.
hopes it works now.
Anyway, the reason i respond so late is because of my location, Europe, Denmark GMT+1.
-
anyway, for the future, we should clearly state what files should be rolled back.
i was a bit unclear on that.
maybe like this
ekk- plz roolback
-------------
x.cpp
xx.h
xx.cpp
-------------
I think this was our first rollback, so naturally we ran into troubles.
murdocs law.
if it can go wrong, it will.
-
this should only serv to remind me to ALWAYS make a backup before updateing my code,
oh everythings borked, hope I can get it working again,
tonight
and it's not your fault DTP,
sooner or later, I'm gona realy screw things up, just wait and see
-
ok I've got it working I'm gona comit my stuff now
cvs server: sticky tag `2.2' for file `cfile/cfile.cpp' is not a branch
cvs server: sticky tag `2.2' for file `cfile/cfile.h' is not a branch
cvs server: sticky tag `2.2' for file `cfile/cfilesystem.cpp' is not a branch
:blah: what is it, and how do I kill it
-
Murphy's law actually ;)
Murdoc is an A-Team character ;)
Sorry guys, I just got the convention's internet connection up.
Sounds like things were solved, I knew they would be, you guy are some of the smartest folks I have worked with :)
-
actualy I wasn't able to commit, though it did seem to update properly, I got those errors
-
and this is part of why im not letting non-isu students work on OP :cool:
-
On those files, click update, and in the update window, there should be a check box that says something to the effect of "remove stickiness"
Select only that and click update, it will unflag those.
Then you will be able to committ.
-
Is it fixed yet?
-
I have yet to get it comitted
when I get it working again, and have the mod suport working I'm gona upload my code directory
**
you know I have no idea how this section of code works,
this is my code folder, cfile.h, cfilesystem.cpp, cfile.cpp, cmndline.h, and cmndline.cpp are the files that are screwed up,
get me working versions
http://freespace.volitionwatch.com/blackwater/code.zip
-
Have you found the "remove stickiness" option in WinCVS?
-
Originally posted by Bobboau
http://freespace.volitionwatch.com/blackwater/code.zip
that link gives me a 404
-
try now
-
downloading
-
have you tried deleting all files within code/cmdline
and all files within code/cfile/
and then made a new checkout of cvs.
and then when you checkout, it downloads all the files.
edit1:btw all those files starting with.# are horrible out of date, i dont know what they are but they seem to be copies of the official fs2 release.
they wont compile on a *nix system, because of the separator like "\" would be "/" on a *nix system.
how do you checkout with cvs, what I do is that I
first I login via the admin login, typing in password
then i go to Create->checkout
then i write or pick"fs2_open" or "fred2_open" in the checkout module
then it updates, or downloads missing/new files.
all my checkout options are "not checked"
edit2; the sticky options should be off by default.
but since yours is not here is how mine is set
select the files in question and select update
now the update window appears with four pages with some options
1:Update settings; all options there should be un-checked
2:sticky options; all options there should be un-checked
3:merge options; None
4:Globals; the following should be checked:
;;; Supply controls when addeding files
;;; Dirty files support(Codewarrior pro 2)
;;; Prune remove empty directories
-
I just ran a fresh checkout, meaning I hid all the cvs files and the code files as well as the project files so I get everything in the most up to date build of the code, and it crashes in startup before the debug window
DTP if you have code that doesn't crash will you comitt it, is anyone else able to checkout code and build a working exe, or is it just me?
-
I can checkout, compile and run. Was able to compile (but couldn't run, no FS2 disks) the day you reported this, was able to run the next day (got it installed) while at the conference.
You have a custom pilot? Anything else wierd? standard, updated tbl files?
Beginning to be at a loss here, are you sure your exe is getting updated? somehting isn't set to read only somewhere? You have a desktop sharing program, maybe we can bang heads together on it?
-
well I totaly hid all sorce files and rechecked them out, it crashes before it even loads the table, while it's makeing a file list, or something, it doesn't even get to the debug window,
I'll run it right now and tell you exactly were and how it crashes
I get
First-chance exception in fs2_open_debug.exe: 0xC0000005: Access Violation.
Exception handler: Write to location 01a53000 caused an access violation.
at this line
strcpy( file->name_ext, find.filename );
in this function
void cf_search_root_pack(int root_index)
wich is called from
void cf_build_file_list()
and the root type is
CF_ROOTTYPE_PACK
that is called from
cf_build_secondary_filelist
it is trying to read an obscure wav file in an obscure VP file
-
Want to try my exe? Or DTP posted an "unofficial" exe a few threads down, does it crash with that as well?