Howto apply a patch/diff file

Benbo · Post by **Benbo** » 20 Jan 2006 17:46

Thankyou. I don't want illegal things on my computer thanks.

An SVN client is what I'm going for.

Sacro · Post by **Sacro** » 20 Jan 2006 19:07

When im under Windows I use cygwin quite happily, it does the job

Benbo · Post by **Benbo** » 20 Jan 2006 19:15

See I don't know much about these sort of apps and so that is why I am asking this question:

Is this it?

Sacro · Post by **Sacro** » 20 Jan 2006 20:28

Yeah, sorry

It's big load of Linux programs and tools compiled to work on windows, not as good as true linux, but better than windows

Benbo · Post by **Benbo** » 20 Jan 2006 21:11

So, I've got this running... What do I need to do?

What do I type in?

Is there a tutorial for this thing?

Sacro · Post by **Sacro** » 20 Jan 2006 21:18

Yeah, http://www.wikibooks.org has tutorials, most standard linux books are fine. Also the OpenTTD Wiki has information on compiling http://wiki.openttd.org/index.php/Cygwin

Benbo · Post by **Benbo** » 21 Jan 2006 09:44

I can't seem to find a tutorial on the stuff I want to do. I don't want to compile, but what I've just found has just pulled me one step closer to getting patches on my OpenTTD.

I was searching a little bit for an SVN client that was free, and I found this page.

I'll probably take a look through a couple until I find the right one for me.

If I don't find one there, then I think I'll have lost the battle...

Edit: Forgot to say that you need to sroll down to 'Clients And Plugins'

Benbo · Post by **Benbo** » 24 Jan 2006 16:23

Sacro wrote:When im under Windows I use cygwin quite happily, it does the job

Yeh... I was just using this (I hadn't used it before).

What I did was cd to the corect directory where I had downloaded the patch to. Then, I did:

Code: Select all

patch -p0 -i patch.diff

The problem is, that when I entered that in, it cam up with the following:

Cygwin wrote:BASH: patch: command not found

What am I doing wrong? BTW, yes I have Cygwin in the directory where the patch is.

gkirilov · Post by **gkirilov** » 30 Jan 2006 07:14

all the answers are here : http://wiki.openttd.com/index.php/Development:Main_Page

Use Tort.SVN to apply the patches

.

I have a question. Once I apply the patch and then update to newer revision, do I have to apply the patch again?

DaleStan · Post by **DaleStan** » 30 Jan 2006 07:17

No, but you may have to resolve conflicts. (The update window will tell you how many files were conflicted, and which ones.)

Darkvater · Post by **Darkvater** » 30 Jan 2006 10:27

Benbo wrote:I can't seem to find a tutorial on the stuff I want to do. I don't want to compile, but what I've just found has just pulled me one step closer to getting patches on my OpenTTD.

I was searching a little bit for an SVN client that was free, and I found this page.

I'll probably take a look through a couple until I find the right one for me.

If I don't find one there, then I think I'll have lost the battle...

Edit: Forgot to say that you need to sroll down to 'Clients And Plugins'

If you don't want to compile I don't really see what use an SVN client is, but ok; that's perhaps besides the point. Just read what MeusH said on page#1 about TortoiseSVN (yes, the client in your link) and you are all set.
Note however that if you want any patches running in openttd you DO NEED to compile it.

Leviath.NL · Post by **Leviath.NL** » 30 Jan 2006 16:18

hmm i did every thing and tryd to apply the Scenario editor bitmap overlay patch (http://www.tt-forums.net/viewtopic.php?t=20886)

every thing went ok I compiled etc. but when i try yo run openttd.exe in Cygwin or just in explorer it says no data/sample.cat found

I thought ok I'll copy that for you in that folder, but it now gives an error can't finr data/TRG1R.GRF

plz help

Benbo · Post by **Benbo** » 30 Jan 2006 16:25

You'll need to copy all of the OpenTTD files to that directory, and then it hopefully won't bug you. If you copy the files one-by-one, then it'll ask you for each and every file.

bobingabout · Post by **bobingabout** » 30 Jan 2006 16:29

you need the sample.cat and 5 GRF files IIRC
also the GM folder if you want music.

Leviath.NL · Post by **Leviath.NL** » 30 Jan 2006 16:58

i still get an error : (visual C++ runtime library)

program: \trunk\openttd.exe
file: gfxinit.c
line: 88

expression: b

Benbo · Post by **Benbo** » 30 Jan 2006 17:24

Weird. I cannot help you there, but back to my case.

Firstly, people are refering back to TortoiseSVN, so you obviously ignored the rest of the posts I made in this topic saying that I can't use that because I am on 98. I know yeh, sad, but life is that way.

Anyway, I'm using Cygwin, and am thankful to this link. I had already installed it, and I've so far got to step 13, but I don't understand that...

Could someone explain step 13 a bit more to me. I don't understand where you write make clean and all that

.

Thanks.

Ben.

DaleStan · Post by **DaleStan** » 30 Jan 2006 17:34

Benbo wrote:Firstly, people are refering back to TortoiseSVN, so you obviously ignored thethe rest of the posts I made in this topic saying that I can't use that because I am on 98.

http://tortoisesvn.tigris.org/download.html wrote:NOTE: If you need to use TortoiseSVN with Windows 95/98/Me/NT4 then you will need to use a pre-1.2 version. The last release on the 1.1.x line was 1.1.7.

So 1.1.4 doesn't work. Why'd you use that one, and not 1.1.7?

And you did all of step 12 successfully, but now can't figure out where you type make clean?

Leviath.NL · Post by **Leviath.NL** » 30 Jan 2006 17:40

type make clean where you typed cd /usr/src/openttd etc, in Cygwin

do i have to copy the original or the openttd files into the sourcedirectory?

Benbo · Post by **Benbo** » 30 Jan 2006 17:57

DaleStan wrote:
Benbo wrote:Firstly, people are refering back to TortoiseSVN, so you obviously ignored thethe rest of the posts I made in this topic saying that I can't use that because I am on 98.

http://tortoisesvn.tigris.org/download.html wrote:NOTE: If you need to use TortoiseSVN with Windows 95/98/Me/NT4 then you will need to use a pre-1.2 version. The last release on the 1.1.x line was 1.1.7.
So 1.1.4 doesn't work. Why'd you use that one, and not 1.1.7?

Well, I went to the archives, went to 1.1.7 and clicked on the second .msi installer. I downloaed, and started to install, and as soon as I get to the part where it starts to install, then it says:

Tortoise SVN Installer wrote:The installer needs an NT based OS

Hang on, I thought that it said that 1.17 worked on 98??? Oh well, there is another installer available, so let's try that one.
So, I click on the second installer, download, and run. Oooh... it looks like it's installing, and it has the progress bar and is actually installing. But wait. What now?

Now it says:

Tortoise SVN Installer wrote:The cabinet file 'TSVN.cab' required for this installation is corrupt abd cannot be used. This could indicate a network error, and error reading from the CD-ROM, or a problem with this package.

It has a button for continuing, and so I click it, not knowing what to expect. Then it comes up with:

Tortoise SVN Installer wrote:The installer has an unexpected error installing this package

No... really? I would've never have guessed

...

This Installer Carried On And wrote:This may indicate a problem with this package. The error code is 2350.

I suspect that I should try another server and see what happens. I used kent.dl.sourceforge.net.

DaleStan wrote:And you did all of step 12 successfully, but now can't figure out where you type make clean?

Yes.

Leviath.NL wrote: do i have to copy the original or the openttd files into the sourcedirectory?

Yes. I'm pretty sure. There's no harm in doing more anyway. See what the others say too.

Leviath.NL wrote:type make clean where you typed cd /usr/src/openttd etc, in Cygwin

I did this, and I don't see what it does. I see that in the tutorial, it says that it will come up with some error messages. I'm not sure that mine are the right ones though

. It says:

Cygwin wrote:BASH: make: command not found

Leviath.NL · Post by **Leviath.NL** » 30 Jan 2006 18:00

go to Cygwin
if you have the source in
.....\Cygwin\usr\src\ttd\trunk

type
cd \usr\src\ttd\trunk

type
make clean

looks clear to me

Transport Tycoon Forums

Howto apply a patch/diff file

Who is online