UFO:Alien Invasion

General => Discussion => Topic started by: vedrit on June 06, 2008, 10:31:51 am

Title: Applying patches from the tracker?
Post by: vedrit on June 06, 2008, 10:31:51 am
I was taking a look around the patch tracker and was wondering:
1) What is not currently in 2.2.1
2) how to apply patches to the game

If this in the wrong place, sorry. Its 2:30 AM, and I cant think straight
Title: Re: Applying patches from the tracker?
Post by: stevenjackson on June 06, 2008, 11:58:34 am

It sounds more like you want a more recent copy of ufo than actually needing to apply patches.

There are several options:

1) get the latest source from subversion for the 2.2 branch and compile.

This will give you basically 2.2.1 plus any other bug fixes and such.

2) download one of the prebuilt trunk releases.  This will be buggy but will give you some of the latest features

3) get the latest source from subversion for trunk and compile.

This will give you the cutting edge changes (including all accepted patches) but wont always work and will sometimes be broken.

Steve
Title: Re: Applying patches from the tracker?
Post by: vedrit on June 06, 2008, 12:32:51 pm
k....its 4:30 AM, and I have no idea what your talking about.
What and where?

oh, hey! Look! the SVN! Haha! Lol
still dont really know what to do with it all....
Title: Re: Applying patches from the tracker?
Post by: Mattn on June 06, 2008, 03:56:01 pm
read our wiki - there is an article about compiling the game.
Title: Re: Applying patches from the tracker?
Post by: vedrit on June 07, 2008, 03:56:59 am
thats turning out to be a pain. There are broken links, and a lack of info.
Cant the patches in the patch tracker just be made to be placed in the game directory, for quick and easy testing?
Title: Re: Applying patches from the tracker?
Post by: blondandy on June 07, 2008, 08:27:25 am
I don't think you understand the whole trunk, tags, branches subversion thing. please read the wiki.

the patches are contributions to the game by folk who do not have write access to the repository. or changes that devs just want to store somewhere for a while.

to play the current development version you need a trunk checkout. then compile it. if a specific part of the wiki is confusing or broken, name it, and I will endeavour to fix it.
Title: Re: Applying patches from the tracker?
Post by: vedrit on June 07, 2008, 08:40:50 am
to compile, there are programs needed. The link to getting gettext does nothing (Though this is really something that should be braught up with those guys, as it is in their site), and, yes, the wiki is kind of confusing. It mentions some things, like fink, but does nothing to tell you what it is should you decide that you want to try using it. The SVN download links do nothing, aswell (When you click the green button saying "Download", it says you should first read the release notes, but does nothing)

No, I dont understand the whole trunk, tags, branches subversion thing. All I wanted to do was try some submitted patches.


Oh, and on the beta site, there arent any MAC installers. I understand that it will take some time to port them into MAC, as Windows/Linux is probably the native OS, but having a MAC installer for the beta game will go a ways to getting rid of bugs for the MAC when it goes out of beta
Title: Re: Applying patches from the tracker?
Post by: Mattn on June 07, 2008, 09:37:49 am
Oh, and on the beta site, there arent any MAC installers. I understand that it will take some time to port them into MAC, as Windows/Linux is probably the native OS, but having a MAC installer for the beta game will go a ways to getting rid of bugs for the MAC when it goes out of beta

True - but the installers are created by me - and i don't own a mac
Title: Re: Applying patches from the tracker?
Post by: vedrit on June 07, 2008, 09:47:33 am
ah. Problem. If I knew what the crap I was doing, I would volunteer to help, but as Im more of a "Make this model look fricken kick ass without using allot of poly's!" kinda guy, im kinda useless with porting
Title: Re: Applying patches from the tracker?
Post by: blondandy on June 07, 2008, 09:49:53 am
worry about gettext later (to do with translation).

trunk: current development version
tags: (mostly) frozen releases

patches are updates for source files (eg *.c, *.map). they are text. They will only work against the correct source files. most of the patches were made against trunk. so you will not be able to use the patches unless you have a trunk checkout.

get svn client from here
http://subversion.tigris.org/project_packages.html
the windows binary certainly works for me.

then follow the instructions here
http://ufoai.ninex.info/wiki/index.php/Getting_the_source

the syntax listed under linux for a trunk checkout
svn co https://ufoai.svn.sourceforge.net/svnroot/ufoai/ufoai/trunk
works under windows, so i expect it will work for mac.

as for compiling, i use code::blocks. you will have to get help from a mac user. there are some around now.

if you want to model, then a trunk checkout is still a good place to start.
Title: Re: Applying patches from the tracker?
Post by: Mattn on June 07, 2008, 09:52:00 am
you can also just update the models and upload them somewhere where we can download them and add them to the repository. Also new models are fine if the license is compatible (see our wiki/todo list)
Title: Re: Applying patches from the tracker?
Post by: vedrit on June 07, 2008, 10:15:57 am
before i do some modeling, i have to get used to Blender (Im used to Maya), and I need to gather the resources (Like special exporter plug-ins)

I downloaded what was listed (the client and fink), but i had no idea what to do about the trunk, and the instructions (listed as the same as Linux) were a bit confusin. "Just create a project directory, cd into it and type" ? Huh?
I suppose finding someone that really knows MACs would make this process a whole lot easyer
Title: Re: Applying patches from the tracker?
Post by: blondandy on June 07, 2008, 10:23:28 am
use whatever the console/prompt is called on a mac.

cd means change to the right directory
type the svn... command line (or copy/paste more like)
Title: Re: Applying patches from the tracker?
Post by: vedrit on June 07, 2008, 10:35:40 am
what do you mean "change to the right directory"? I made a folder that I intend on storing things in. Do you mean saving the what-ever-it-is-im-doing-in-the-console in there?
Title: Re: Applying patches from the tracker?
Post by: stevenjackson on June 07, 2008, 11:46:24 pm

My main computer is a mac.  I found it much easier to get compiling working on the mac than in windows.

Other than 2.2 as there is a problem with library conflicts in leopard.

If you get fink its fairly straight forward.

Steve
Title: Re: Applying patches from the tracker?
Post by: vedrit on June 08, 2008, 02:02:01 am
it keeps talking about command lines, but never, not once, does it say where to type in the commands. Very frustating for a n00b like me. Do I use MACs console?
Title: Re: Applying patches from the tracker?
Post by: BTAxis on June 08, 2008, 02:29:41 am
You can't expect us to explain every basic step to you. If you don't know how to enter commands on a command line on a mac, look it up.
Title: Re: Applying patches from the tracker?
Post by: vedrit on June 08, 2008, 03:19:55 am
Which is what Im talking about! For someone in my position, wanting to test out patches that arent in the game, but has no experience with MACs, this is a completely confusing situation, and everything either has to be easy, or explained.
Title: Re: Applying patches from the tracker?
Post by: BTAxis on June 08, 2008, 12:54:29 pm
I do believe there are sufficient instructions for working with svn and blender. But the instructions all assume SOME basic knowledge, like what a command line is. Like I said, you can't expect it to tech you everything from scratch. It isn't teaching you to read, for example.

If you don't have experience with macs, that's not a crime. But you can easily get up to speed by reading a tutorial somewhere, for example here (http://www.macdevcenter.com/pub/a/mac/2001/12/14/terminal_one.html). Or maybe there are even help forums or IRC channels for that, I don't know.
Title: Re: Applying patches from the tracker?
Post by: vedrit on June 09, 2008, 08:33:14 pm
hm....i thought i edited one of my posts....
I used Fink to install the components (svn, svn-ssl, etc), though there was an error trying to install one of the db43 packages. I think I managed to get it installed, but Im not sure the client works, since when I type in the "svn co https://ufoai.svn.sourceforge.net/svnroot/ufoai/ufoai/trunk" command, I get an error saying svn: ssl is not supported
Title: Re: Applying patches from the tracker?
Post by: vedrit on June 16, 2008, 10:03:53 pm
sorry for the double post, but Im having a problem getting the svn client and ssl to install. Its says that db43-shlibs-4.3.29-1001 could not not be installed, even though when I install that package directly, it installs just fine.
Title: Re: Applying patches from the tracker?
Post by: stevenjackson on June 16, 2008, 11:43:10 pm

What version of osx are you using?

With leopard and tiger they came with subversion built in.

Steve
Title: Re: Applying patches from the tracker?
Post by: vedrit on June 16, 2008, 11:47:25 pm
X 10.4
most of the svn files installed fine
Title: Re: Applying patches from the tracker?
Post by: rynait on December 17, 2009, 02:54:35 am
Hello,

Not mac subject, but window...  I downloaded the patch from SVN  and looked up (using search patch and .diff) found instructions, something about making patch, but am stumped on "how to apply existing patch."

Here is what i thought ... download patch, run the SVN program (using SmartSVN program),  select button-submenu, enter the patch.

Apparently I am wrong!!! cause can not find something about that...  :o

Is there a page explaining how to apply patch to my current SVN?

Rynait
Title: Re: Applying patches from the tracker?
Post by: Kildor on December 17, 2009, 04:28:15 am
It`s depended on type of patch. some patches are applied via svn, some via "patch" or "diff" utility. Can you provide link to patch?
Title: Re: Applying patches from the tracker?
Post by: rynait on December 17, 2009, 09:56:20 am
Hello,

not sure how to provide the file (generated my patch).  Trying this as attachment. If I need to do this different, give me a yell!


using Window XP, with 2.3 dev rev 27496. This .diff file is generated through SmartSvn 6.  The other I have been attempting is the wound-medic patch file that i thought might be a good read.

If this was all wrong.. then i still need to read document somewhere and learn your patching system.

Roy


edit: here is the forum section i referred to (the medikits.diff) http://ufoai.ninex.info/forum/index.php?topic=4282.msg32678#msg32678
Title: Re: Applying patches from the tracker?
Post by: Mattn on December 17, 2009, 12:11:46 pm
please use the patch tracker at: http://sourceforge.net/tracker/?atid=805244&group_id=157793&func=browse - otherwise your patch might get lost in the nirvana of the board ;)
Title: Re: Applying patches from the tracker?
Post by: rynait on December 17, 2009, 11:33:57 pm
otherwise your patch might get lost in the nirvana of the board ;)

Hello Mattn. 

I am asking how to "apply the" patch.  Kildor said depends on what kind of patch and asked to see the patches.

So in response to your concern, I do not care if my patch "gets lost". ;D

Roy
Title: Re: Applying patches from the tracker?
Post by: Duke on December 18, 2009, 12:28:34 am
Look *twice* in the menues of your SmartSVN.
If it really doesn't support to apply a patch, switch to TortoiseSVN.
Title: Re: Applying patches from the tracker?
Post by: rynait on December 18, 2009, 02:09:35 am
Hello

Ah patching function is part of SVN software.  I will look twice as you suggested.  ;)

Thanks.

Roy
Title: Re: Applying patches from the tracker?
Post by: Kildor on December 18, 2009, 04:28:36 am
> rynait
I did not understand you. Because you select wrong topic, I understood as you need to apply patch from some other place, not create patch for yourself.

And yes, patch function is part of SVN software.
Title: Re: Applying patches from the tracker?
Post by: rynait on December 18, 2009, 10:09:37 am
Hello Kildor,

actually I was asking on how to apply patch ... not matter If if it was mine or from somewhere else.   But like I learned, is part of SVN software.  So...  will be working on this "mystery" this weekend.

Roy
Title: Re: Applying patches from the tracker?
Post by: rynait on December 19, 2009, 01:25:00 am
Hello,

Mystery solved.  Smart SVN version 6.0  does not have the function.  however version 6.5 does, and function is deliberately disabled in foundation version (which is the free version). You gotta have to pay and upgrade to professional version.

Because of this, I am uninstalling the Smart SVN and going on with Tortoise SVN.

Alerting future readers know of this issue.

Roy