Log for #openttdcoop.devzone on 24th May 2009:
Times are UTC Toggle Colours
00:05:22  *** XeryusTC is now known as Xeryus|bnc
01:46:49  <DJNekkid> hi all you not-drunk-guys
01:46:56  <DJNekkid> or ... whatever
04:16:20  <Brot> [DevZone] 2cc train set - Wiki edit: Wiki (#1) (planetmaker) -
04:52:19  <Brot> [DevZone] 2cc train set - Wiki edit: Wiki (#2) (planetmaker) -
08:18:45  <Ammler> planetmaker: didn't you use
08:18:50  <Ammler> @wiki mingw
08:18:52  <Webster> Search results - #openttdcoop Wiki -
08:19:02  <Ammler> and morning, btw. :-)
08:19:07  <planetmaker> moin :)
08:19:23  <Ammler> @man mingw
08:19:23  <Webster>
08:20:05  <planetmaker> indeed I didn't. :)
08:20:10  <planetmaker> But that's not bad either.
08:20:32  <planetmaker> if you google for mingw it gives you the very good wiki page of mingw
08:20:33  <Ammler> I am impressed then :o
08:20:58  <planetmaker> installing it with their page is a piece of cake, too
08:21:11  <planetmaker> and I didn't compile OpenTTD :)
08:21:14  <planetmaker> yet
08:21:48  <planetmaker> hmpf. my makefile and the scripts give different md5 :(
08:22:25  <Ammler> you have already a makefile :-o
08:22:35  <planetmaker> yes
08:22:43  <planetmaker> I'll upload it. One moment
08:23:04  <Ammler> oh, and as the wiki guid isn't 2cc specific
08:23:20  <Ammler> you should move it to the main project
08:23:32  <Ammler> e
08:24:36  <planetmaker> well. yes. But I didn't find where to add a wiki page there. But maybe I was just blind
08:24:44  <planetmaker> Makefile uploaded
08:24:57  <planetmaker> it gives same results on win and lin
08:25:11  <planetmaker> but is not compatible with the bat and the sh file
08:25:13  <planetmaker> for some reason
08:25:18  <Brot> [DevZone] 2cc train set - Makefile (planetmaker) -
08:26:38  <Ammler> planetmaker: as admin
08:26:50  <planetmaker> hm, oh, didn't try that, I guess
08:27:02  <Ammler> you can use "settings" and activate the needed module ;-)
08:27:11  <planetmaker> ah :)
08:27:57  <Ammler>
08:28:19  <Ammler> a main project for such stuff?
08:28:40  <planetmaker> nah. rather in ottdbash, I think
08:28:50  <planetmaker> hm... well. Dunno
08:28:59  <planetmaker> It doesn't fit as a project.
08:29:04  <planetmaker> It's stuff for a wiki
08:29:13  <planetmaker> And we have a good one already :)
08:29:27  <planetmaker> where I could add it to in principle.
08:29:31  <Ammler> and openttd has already a manual for it, too.
08:29:41  <planetmaker> yes. So not much point.
08:29:46  <Ammler> hehe
08:29:57  <planetmaker> I basically wrote it for myself.
08:30:18  <Ammler> well, you could now compare with openttd
08:30:23  <planetmaker> As it were exactly the steps I did. It#s really straight forward without much need.
08:30:34  <planetmaker> *need for manual meddling
08:30:36  <Ammler> maybe you can improve yours or theirs
08:30:47  <planetmaker> yes, maybe.
08:30:50  <planetmaker> :)
08:31:09  <planetmaker> but before I do that, I want to know why the Makefile and the scripts differ...
08:31:24  <planetmaker> well. the makefile I uploaded misses the SED script. One reason. But not the only one.
08:33:39  <Ammler> how stupid would it be?
08:34:12  <Ammler> I do "hg init" at ~/home/redmine
08:34:39  <Ammler> and push the home daily to bitbucket private?
08:36:16  <Ammler> I can add the things I like to backup with hg add ... :-)
08:38:47  <planetmaker> you mean... thus making an external backup of the redmine web interface?
08:40:00  <Ammler> of the remine home
08:40:03  <Ammler> yep
08:40:12  <Ammler> not just db and files
08:41:08  <Ammler> well, the idea is, if you have a hg repo of it, it would be very easy to recover an older state...
08:50:25  <planetmaker> well. why not. question is: do you really want a51 there?
08:50:35  <planetmaker> I'd advise against that
08:51:05  <planetmaker> well... depends upon how accessible that is :)
08:52:27  <Ammler> private is private
08:52:44  <Ammler> like a private project in redmine :-)
09:00:56  <planetmaker> k
09:26:13  *** Xeryus|bnc is now known as XeryusTC
09:56:25  <DJNekkid> hi guys
09:57:38  <planetmaker> hg guy :)
09:57:49  <planetmaker> can you pull and test the bat file?
09:57:53  <DJNekkid> sure
09:58:02  <planetmaker> or, if you want, test the Makefile :)
09:58:15  <planetmaker> I basically thoroughly editied all build scripts
09:58:16  <DJNekkid> do i need additional tools?
09:58:18  <Brot> [DevZone] 2cc train set - Revision 141: Feature: Add Makefile which builds the grf. Use Makefile.local for ... (planetmaker) -
09:58:24  <planetmaker> for the bat file: no
09:58:35  <planetmaker> for the makefile: you'll need mingw and msys
09:59:01  <DJNekkid> it seems to work :)
09:59:30  <planetmaker> I'd prefer to phase out the bat file, though. as the
10:01:22  <planetmaker> good :)
10:01:22  <planetmaker> what's your md5sum?
10:03:21  <DJNekkid> 19da9e151828f54de55ec7c458bd1147
10:04:18  <Brot> [DevZone] 2cc train set - 2cc_trainset.grf (DJNekkid) -
10:13:19  <Brot> [DevZone] 2cc train set - Revision 142: Tagging 1.0 (Ammler) -
10:14:18  <planetmaker> hm... 19da is bad :(
10:14:20  <planetmaker> hm. can you delete all files which are generated by the bat file? manually?
10:14:21  <planetmaker> e.g that there are no unnecessary nfo in sprites/nfo?
10:15:00  <DJNekkid> there are none
10:15:08  <Ammler> planetmaker: why Makefile.local in the repo?
10:15:48  <planetmaker> Ammler: it's an empty one. Or uncommented one. So that is clear what can be done. But... you're right. Probably was no good idea.
10:15:54  <planetmaker> should be Makefile.local.sample
10:15:57  <Ammler> and good morning to DJNekkid:-)
10:15:59  <planetmaker> I'll change that
10:17:23  <Ammler> make: [renumber] Fehler 3 (ignoriert)
10:17:35  <DJNekkid> did foobar get set up yet?
10:17:49  <planetmaker> DJNekkid: I just got his public key via forum mail
10:17:56  <planetmaker> Ammler: that's ok, I think
10:18:09  <planetmaker> dunno, though exactly what it is.
10:18:32  <planetmaker> I think it's renum's output. it returns warnings level 3 --> make returns level 3
10:28:35  <Ammler> it looks very nice so far.
10:30:31  <Ammler> did you find a good manual for Makefiles?
10:30:40  <Ammler> or just man:make ?
10:30:59  <planetmaker> well. a few. but no real good ones. but sufficient. And our dev has already some as has nforenum and grfcodec
10:31:37  <planetmaker> I basically built upon tbrs and nforenum
10:32:00  <Ammler> dutchstations has a good one too.
10:32:19  <planetmaker> I don't have a checkout of that so far :)
10:32:19  <Ammler> whith ID replacment
10:32:24  <planetmaker> ah
10:34:19  <Ammler>
10:35:44  <Ammler> I like the idea to rename the "unnumbered" nfo
10:36:06  <Ammler> so you basically don't have nfo in your source.
10:36:37  <Ammler> like .cpp->.o
10:50:36  <DJNekkid> does anyone of you know of a webtv-site that sends formula1 ?
10:55:37  <planetmaker> not me
10:55:50  <planetmaker> Ammler: yes, I like that idea, too
10:56:08  <planetmaker> that's what basically is done here with the .nfo.pre
10:56:13  <planetmaker> which is good IMO
10:56:26  <planetmaker> it could be extended, though :)
10:58:29  <planetmaker> I'm still thinking of making the source list of nfo files explicit (again)
11:24:34  <Ammler> DJNekkid:
11:24:51  <Ammler> or
11:25:12  <Ammler> but they are here
11:25:21  <Ammler> dunno, how iit works in your country
11:32:47  <DJNekkid> i guess i'll just buy it on ...
11:32:56  <DJNekkid> 50kr (about 5e)
11:43:15  <Ammler> 5€ for one view?
11:43:46  <Ammler> expensive country you are, well, you have the oil :-)
11:46:18  <Brot> [DevZone] OpenGFX - Bug #74: other semaphore type missing (foobar) -
11:46:19  <Brot> [DevZone] OpenGFX - Bug #75: aircraft spites uncropped (foobar) -
11:49:21  <Brot> [DevZone] OpenGFX - Bug #76: sprite misalignment (foobar) -
11:49:22  <Brot> [DevZone] OpenGFX - Bug #77: town building misalignment (foobar) -
11:50:30  <Ammler> oh, foobar is here :-)
11:52:20  <Brot> [DevZone] OpenGFX - Feature #78: pbs graphics (foobar) -
11:55:22  <Brot> [DevZone] OpenGFX - Feature #79: font update (foobar) -
11:57:24  <planetmaker> Ammler: the key of foobar. Does it go to redmin or to ottdc?
11:57:52  <Ammler> ottdc
11:57:57  <planetmaker> k. ty
11:58:18  <Brot> [DevZone] 2cc train set - Revision 143: Change: rename Makefile.local in Makefile.local.sample and fix and ... (planetmaker) -
11:58:20  <Ammler> or
11:58:33  <Ammler> shall I create a new user for hg repos?
11:58:47  <Ammler> hmm
11:58:51  <planetmaker> hm...
11:58:52  <Ammler> might make sense
11:58:59  <planetmaker> yes and no
11:59:03  <Ammler> well
11:59:06  <Ammler> not now
11:59:21  <Ammler> first, I need to think about how to limit the ssh access
12:01:26  <planetmaker> hm...
12:01:30  <planetmaker> ---- BEGIN SSH2 PUBLIC KEY ----
12:01:32  <planetmaker> Comment: "rsa-key-20090524"
12:01:33  <planetmaker> AAAAB3NzaC1yc2EAAAABJQAAAIB9EgdmBhTeATZv2ABU8yX8A20mucl/1yyH8t/m
12:01:35  <planetmaker> ^^is that a good start?
12:02:03  <Ammler> no :-)
12:02:07  <Ammler> looks like putty key
12:02:19  <planetmaker> yes. he needs to use key-gen, right?
12:02:44  <planetmaker> hm... can you write him about it? You know putty :)
12:02:54  <Ammler> if you load the private key to your putty keygen, you have the openssl key right there
12:02:58  <Ammler> it isn't a file
12:04:13  <Ammler> I make some screens
12:04:29  <planetmaker> well... forum-mail him that :)
12:06:54  <Ammler> kde4 is really going to be nice :-)
12:08:16  <planetmaker> :)
12:14:31  <Ammler>
12:14:49  <Ammler> shall I write him?
12:16:35  <planetmaker> well, yes :)
12:16:48  <planetmaker> you should publish that image also in a place in our wiki :)
12:38:00  <DJNekkid> did you set up foobars key=
12:38:00  <DJNekkid> ?
12:42:47  <Ammler> it is on his way, I guess :-)
12:44:08  <DJNekkid> well, i recieved this PM a few minutes ago...
12:44:26  <DJNekkid> Only problem is that HG gives me an error as soon as I want to do a clone over SSH. Clone over http works fine. I suppose that might be due to that my key isn't resolved on the server-side yet. I'll wait for that to be done and then I'll try again.
12:44:27  <DJNekkid> The error it gives me is a "Putty fatal error" with the text "disconnected: no supported authentication methods available" in a popup window and a "no suitable response from remote hg" in the command line. I think I better wait for the key to be set up at the server side before attempting anything to solve this, as it is very likely the cause of this error I bet.
12:49:51  <planetmaker> well. yes. There is no key of his on the server. It's bound to fail :)
12:51:27  <DJNekkid> but didnt he send it to you earlier?
12:51:40  <planetmaker> a wrong key.
12:51:54  <DJNekkid> oh
12:52:07  <DJNekkid> did you send him new instructions on how to make a right one?
12:52:11  <planetmaker> you know... :) not everything works straight away :) I remember there some setup trouble recently, too ;)
12:52:17  <planetmaker> Ammler did
12:52:36  <DJNekkid> there were :)
12:52:47  <Ammler> really? can't remember ;-)
12:52:56  <Ammler> who?
12:52:58  <planetmaker> hm... must be 18 months ago or so.
12:53:07  <planetmaker> when I joined :P
12:53:10  <Ammler> hehe
12:53:10  <DJNekkid> or about 142 revisions atleast
12:53:28  <Ammler> omg 142 revisions already :-o
12:53:55  <Ammler> do you guys now use the Makefile?
12:54:08  <Ammler> I would then add a feature ;-)
12:54:38  <DJNekkid> i use the .bat :)
12:54:53  <Ammler> planetmaker: are you able to use hg in msys?
12:55:04  <planetmaker> didn't try.
12:55:15  <planetmaker> I have no need :)
12:55:32  <Ammler> well, you will have
12:55:34  <planetmaker> seamless integration ;)
12:55:38  <planetmaker> why?
12:55:54  <Ammler> hg parent --template"{rev}"
12:55:55  <planetmaker> hm...
12:56:01  <planetmaker> hm...
12:56:05  <Ammler> hehe
12:56:14  <planetmaker> mäh.
12:56:21  <planetmaker> but I guess so.
12:56:29  <planetmaker> is there a lean command line hg for win, too?
12:56:43  <planetmaker> I don't feel like installing shit just for that :)
12:56:46  <Ammler> of course
12:56:51  <Ammler> tortoise ships with
12:57:04  <Ammler> DJNekkid: uses it, I assume
12:57:22  <Ammler> or do you use the GUI, DJNekkid?
12:57:32  <planetmaker> well. Tortoise is big though
12:57:40  <Ammler> well, the gui uses hg too
12:57:40  <planetmaker> I don't want everything :)
12:58:08  <Ammler> there is for sure a hg win bundle
12:58:27  <DJNekkid> I USE COMMAND LINE
12:58:30  <DJNekkid> sorry caps
12:58:42  <Ammler> OOOOOKKKKEEEY
12:59:14  <planetmaker> NO PROBS! ;)
12:59:31  <Ammler> WHAT?
13:05:02  <planetmaker> psst! this.
13:08:27  <Ammler> WELL THEN.
13:13:13  * planetmaker hides ;)
13:13:43  <planetmaker> hm... tortoisehg is only 10MB - so I guess it's ok :)
13:16:37  <planetmaker> ok, a turtle more in the world :P
13:18:43  <planetmaker> grrr.... "restart computer now?" hmpf
13:19:20  <Ammler> hihi
13:19:35  <planetmaker> well. Only the VM, but...
13:19:37  <planetmaker> windows
13:20:18  <planetmaker> works
13:37:16  <planetmaker> DJNekkid: do you mind to install mingw and msys?
13:38:55  <planetmaker> <-- easy as pie actually
13:39:21  <planetmaker> would have the advantage that we don't have to maintain two build scripts.
13:42:21  <Brot> [DevZone] 2cc train set - 2cc_trainset.nfo (Ammler) -
13:50:33  <Ammler> BuildOTTD is one click for everything :-)
13:51:01  <planetmaker> :) well then :)
13:51:06  <planetmaker> what's that file?
13:52:17  <Brot> [DevZone] 2cc train set - Wiki edit: Wiki (#3) (Ammler) -
13:52:43  <Ammler> @man buildottd
13:52:43  <Webster>
13:53:35  <Ammler> (and just ignore the Warnings ;-)
13:54:26  <Ammler> planetmaker: it installs mingw, msys and other things needed for compiling openttd.
13:54:43  <Ammler> might not be the newest version anymore, but
13:55:46  <planetmaker> nice
13:56:56  <Ammler> and the only issue, it does't work anymore, is the GUI, it fetches the the nightly rev from old compile farm.
13:57:18  <Ammler> but that part doesn't interest us.
13:57:25  <planetmaker> true
14:03:55  <DJNekkid> i guess i wont mind no...  :=)
14:12:34  <DJNekkid> oki, bottd is installed
14:16:39  <Ammler> now you have a folder BOTTD in c:
14:16:47  <DJNekkid> aye
14:16:47  <Ammler> there you have MSYS
14:17:03  <Ammler> just run MSYS and navigate to 2cc
14:17:40  <Ammler> when you are in the same direction as the Makefile, run "make"
14:17:50  <Ammler> directory*
14:18:50  <DJNekkid> hmm
14:18:56  <DJNekkid> doesnt "dir" and such work?
14:19:04  <Ammler> dir = ls
14:19:38  <Ammler> cd /c for cd c:
14:19:56  <DJNekkid> aha
14:20:03  <planetmaker> Ammler: well... I use the normal windows cmd for make
14:20:13  <planetmaker> but yes, ls etc works
14:20:17  <Ammler> means?
14:20:51  <Ammler> planetmaker: make does run in the windows console?
14:20:52  <planetmaker> means if you have msys in your path (as reccomended) you don#t have to do anything special then anymore
14:20:56  <planetmaker> yes
14:21:08  <Ammler> oh
14:21:15  <planetmaker> runs nicely. just have msys and mingw in path
14:21:15  <Ammler> DJNekkid: did you lhear :-)
14:21:24  <planetmaker> e.g. the dos prompt
14:22:12  <DJNekkid> oki?
14:22:13  <DJNekkid> nice
14:22:17  <planetmaker> :)
14:22:24  <planetmaker> DJNekkid: try "make clean" :)
14:22:46  <Ammler> make install troyan
14:23:06  <planetmaker> that doesn't work. Unless your grf folder is called troyan :P
14:23:39  <Ammler> make planet ?
14:24:02  <planetmaker> hm... would be good :D
14:24:12  <Ammler> make: *** No rule to make target `planet'.  Stop.
14:24:29  <planetmaker> haha :)
14:25:05  <Ammler> I expected a easter egg ;-)
14:25:18  <planetmaker> :)
14:26:20  <DJNekkid> oki
14:26:32  <DJNekkid> make clean apparently deleted stuff
14:26:38  <DJNekkid> pure make gave 2 errors
14:27:15  <DJNekkid> i need renum and grfcodec it seems :)
14:27:27  <planetmaker> yes. make clean is supposed to delete everything which is temporary
14:27:44  <planetmaker> DJNekkid: yes. I suppose to make something like c:\ottddev
14:27:53  <planetmaker> put them there and then add that dir to your search path, too
14:27:58  <Ammler> and adding to path, too.
14:28:06  <planetmaker> :)
14:28:10  <DJNekkid> the windows or linux types?
14:28:18  <planetmaker> you need the windows binaries
14:28:32  <Ammler> planetmaker: already tried to compile renum?
14:28:37  <planetmaker> no
14:28:48  <Ammler> boostymaker
14:28:48  <planetmaker> not on windows. Didn't compile there ever anything :)
14:28:53  <planetmaker> :P
14:29:07  <planetmaker> well. why should it work on win, fi I get on mac a template error?
14:29:12  <planetmaker> *if
14:29:51  <DJNekkid> still same errors if i put grfcodec and renum in c:\ottddev
14:29:54  <DJNekkid> and added path
14:30:28  <DJNekkid> \bin\sh: grfcodec: command not found
14:30:46  <planetmaker> you need to start a new shell
14:30:53  <planetmaker> it's not added to an existing cmd window
14:31:05  <planetmaker> aaaah
14:31:17  <planetmaker> never put a laptop onto a chocolate bar!
14:31:27  <DJNekkid> aha, works now :)
14:31:27  <planetmaker> what a mess...!
14:31:45  <planetmaker> nice :)
14:32:11  <DJNekkid> now you can do all kinds of crazy shit :)
14:33:01  <Ammler> so, time to delete the batch and make_*.sh
14:34:11  <planetmaker> hehe :) yes, indeed, we can.
14:38:10  <planetmaker> oh, another thing, DJNekkid
14:38:25  <planetmaker> you want your grf in your data folder afterward, I think
14:38:33  <DJNekkid> i do
14:38:38  <planetmaker> copy Makefile.local.sample to Makefile.local
14:38:44  <DJNekkid> i guess i'll just make a simple batch then
14:38:53  <planetmaker> edit it and un-comment the line with INSTALLDIR
14:39:12  <planetmaker> like INSTALLDIR=C:\whereever
14:39:18  <planetmaker> then make install copies it :)
14:40:07  <DJNekkid> now it should copy as well?
14:40:36  <planetmaker> you'll still need to call make install seperately
14:40:50  <planetmaker> but... I could change it such that it copies automatically
14:41:16  <planetmaker> if you want other grfcodec or renum parameters, then makefile.local is also your friend
14:41:37  <planetmaker> it overrides the default values
14:42:05  <Ammler> (don't edit Makefile for local things)
14:42:10  <planetmaker> :)
14:42:16  <planetmaker> always use makefile.local :)
14:42:29  <Ammler> Makefile is only for things, which everyone of us might need.
14:46:17  <Brot> [DevZone] 2cc train set - Bug #80: Remeber to add Alex' britsh DMUs (DJNekkid) -
14:46:47  <planetmaker> it's a feature :P
14:49:44  <Ammler> But would need 1.0.1
14:49:50  <Ammler> bug*
14:49:56  <Ammler> Feature goes to 1.1
14:50:37  <planetmaker> :) yes
14:50:52  <planetmaker> I uploaded the official tar to our dev repo
14:52:17  <Brot> [DevZone] 2cc train set - 2cc_Trainset.1.0.0.tar (planetmaker) -
14:53:05  <planetmaker> hm... should we branch now, or shouldn't we?
14:53:31  <Ammler> too late :P
14:53:42  <Ammler> why did you remove the nfo?
14:54:06  <planetmaker> not too late. the make made the same md5 as the two scripts
14:54:14  <planetmaker> :)
14:54:15  <Ammler> does the tar have the nfo in it?
14:54:24  <planetmaker> uhm... no?
14:54:29  <planetmaker> oh, that nfo?
14:54:31  <planetmaker> sorry.
14:54:33  <Ammler> planetmaker: that wasn't for test :P
14:54:39  <planetmaker> :P :(
14:54:55  <planetmaker> well. the hg repo has it.
14:55:04  <planetmaker> anyone can check out, can't they?
14:55:12  <Ammler> it was for people not having the ability to make a nfo self.
14:55:17  <Brot> [DevZone] 2cc train set - Revision 144: Change: remove the seperate scripts for win and lin. Use make instead (planetmaker) -
14:55:27  <planetmaker> you still need all pcx. the nfo allone is useless
14:55:31  <planetmaker> *alone
14:55:48  <Ammler> well
14:56:04  <planetmaker> just experienced that as I reported something with... nfrorenum or grfcodec :D
14:56:05  <Ammler> it wasn't meant for makeing the grf, just for curious people.
14:56:17  <planetmaker> any curious person can get it from the site
14:58:07  <Ammler> which site?
14:58:20  <Ammler> well, nvm
14:58:33  <planetmaker> dev... :)
14:59:09  <DJNekkid> however ...
14:59:18  <Ammler> now, we have redundancy, but no nfo :P
14:59:27  <DJNekkid> should i add the 3 DMU's and release a 1.0.1 already, or wait for 1.1 ?
15:00:03  <Ammler> that is 1.1, which is ok, if you have a reason to.
15:00:13  <Ammler> 1.0.1 is only for bugfix
15:00:29  <DJNekkid> okidoki :)
15:00:46  <Ammler> or you make a 1.0.1, dunno
15:00:58  <Ammler> you are the manager :-P
15:01:40  <DJNekkid> hehe...
15:02:40  <Ammler> or you just add it, but don't release it, or is there someone really waiting for?
15:03:32  <DJNekkid> i guess that alex (extOSPOTTER or something) is getting a bit impatient :)
15:03:51  <DJNekkid> i had comepletely forgotten about them
15:06:19  <Ammler> Foobar key is added
15:08:12  <planetmaker> :)
15:19:18  <Brot> [DevZone] 2cc train set - Revision 145: Change: move the makefile's config settings to Makefile.config (planetmaker) -
15:25:53  <Ammler> oh btw.
15:26:09  <Ammler> I had always in mind, opengfx will become part of trunk
15:26:30  <DJNekkid> yea... one can hope :)
15:26:45  <Ammler> that is why I never offered hosting for ti, myself.
15:27:39  <planetmaker> I still hope so.
15:27:44  <planetmaker> but it's not yet done :)
15:28:04  <planetmaker> And I hope to speed up that process.
15:28:17  <Brot> [DevZone] 2cc train set - Revision 146: some old changes, most likely to the docs (DJNekkid) -
15:39:51  <Ammler> hehe, foobar might join us on IRC soon ;-)
15:40:15  <DJNekkid> about time :p
16:22:53  <planetmaker> sure, Ammler ?
16:23:17  <Brot> [DevZone] 2cc train set - Revision 147: Fix: have the Makefile actually obey the version information stored... (planetmaker) -
16:32:17  <Brot> [DevZone] Dutch Train Set - Revision 5: added the green livary to pre 1980 mat64's, as well as finishing it... (DJ Nekkid) -
16:34:20  <planetmaker> hm... wifi died
16:34:22  <planetmaker> [18:24]	<planetmaker>	Ammler: if you find a better solution to r147, it's be nice as that line is IMO anything but readable (and and nfo.sed are actually void)
16:34:23  <planetmaker> [18:24]	<planetmaker>	but everything I tried just didn't work
16:34:25  <planetmaker> [18:25]	<planetmaker>	nasty variables :)
16:34:26  <planetmaker> [18:26]	<planetmaker>	btw, now the grf will make as 1.0.1 (pre-release) :)
16:34:44  <planetmaker> nasty neighbours probably started their coffee maschine or something.
16:35:31  <Ammler> planetmaker: we replace the sed with precompiler :-)
16:35:42  <planetmaker> he :)
16:35:50  <Ammler> just tested it right now
16:35:59  <planetmaker> oh
16:36:08  <Ammler> oh?
16:36:12  <planetmaker> and I spent an hour on rubish then :P
16:36:25  <planetmaker> :)
16:36:36  <Ammler> no
16:37:37  <Ammler> but the precompiler is imo essential in use with make
16:37:57  <Ammler> sed might still be a good thing with translation
16:38:15  <planetmaker> I don't argue against a pre-compiler :)
16:38:42  <planetmaker> how does that work?
16:39:11  <Ammler> I will push it in 10 mins, just eating something right now ;-)
16:39:33  <planetmaker> :)
16:39:53  <DJNekkid> im doing dutch-set stuff atm :)
16:45:32  <planetmaker> seen that :)
16:50:41  <DJNekkid> well guys, we are off for tonight ... eating out, and "angels and demons" on the cinema...
16:50:47  <DJNekkid> tty around ... 2330 or tomorrow :)
16:50:52  <planetmaker> :) enjoy
17:02:26  <Ammler> hehe
17:02:35  <Ammler> of course I have conflicts now :-)
17:04:28  <planetmaker> of course :)
17:04:57  <planetmaker> well. Make sure that you use the variable from Makefile.config. Not nfo.sed style things
17:05:26  <planetmaker> e.g. use $(GRF_NAME) and $(GRF_VERSION) instead of yet another config file IMO
17:06:07  <Ammler> and GRF_REV = $(shell hg parent --template="{rev}\n")
17:06:49  <Ammler> well, theoretically, it is still the same as sed
17:07:23  <Ammler> just that you use #define instead of the sed file and gcc instead of sed
17:21:39  <Ammler> hmm
17:23:02  <planetmaker> oh, we have a new head of our state which is the same as before :)
17:27:37  <planetmaker> Ammler: and {date} :)
17:27:54  <planetmaker> and {name} :P and ... and ... and ... ... ...
17:32:03  <Ammler> hehe this preprocessor things don't work like I wanted
17:32:28  <Ammler> gcc -E - < ./sprites/2cc_trainset.nfo.pre > ./sprites/2cc_trainset.nfo
17:33:37  <planetmaker> hm?
17:35:34  <Ammler> ok, I commit a demo?
17:35:38  <Ammler> push*
17:35:52  <Ammler> or do you like to see just a patch?
17:37:52  <planetmaker> you could upload the patch to the file section
17:37:58  <planetmaker> hm... what about a section "testing"?
17:38:22  <planetmaker> well... no, we have our personal accounts :)
17:38:23  <planetmaker> that's fine
17:40:17  <Ammler> made a ticket
17:41:17  <Brot> [DevZone] 2cc train set - Feature #81: precompiler? (Ammler) -
17:41:18  <Brot> [DevZone] 2cc train set - Feature #81 (Feedback): precompiler? (Ammler) -
17:41:33  <planetmaker> :)
17:43:11  <Ammler>   -E                       Preprocess only; do not compile, assemble or link
17:44:20  <Ammler> then, you would have files like that
17:44:22  <Ammler>
17:45:53  <planetmaker> hm, that looks nice indeed.
17:52:40  <Ammler> the title for the nfo is a bit special
17:53:00  <Ammler> as we do define it in the Makefile
17:53:10  <Ammler> that is why I generate the config.pnfo
17:53:41  <Ammler> but for IDs etc., it could be done directly
17:56:20  <planetmaker> hm... call it GRF_TITLE
17:56:23  <planetmaker> :)
17:56:37  <Ammler> oh, there is more than that needed to commit :-)
17:56:53  <planetmaker> yes. adding to clean, too ;)
17:57:01  <Ammler> and moving to config
17:57:14  <planetmaker> to config? what?
17:57:23  <Ammler> the compiler settings
17:57:24  <planetmaker> oh, cc
17:57:28  <planetmaker> yes
17:57:28  <Ammler> yes
17:57:45  <planetmaker> should I actually commit removal of and nfo.sed?
17:57:55  <planetmaker> it's not really needed right now...
17:57:58  <Ammler> and then, we should make the rename of the nfo
17:58:14  <Ammler> I would do that with that
17:58:27  <planetmaker> yes. we rename *all* nfo to pnfo or something
17:58:37  <planetmaker> so it's clearly distinguished.
17:58:54  <planetmaker> and all of them need at least pre-processing in the way that they get renamed.
17:59:31  <Ammler> hnfo -> precompiler -> pnfo -> renum -> nfo
17:59:39  <Ammler> or is it?
18:00:02  <Ammler> hnfo -> cat -> pnfo -> precompiler -> nfo -> renum
18:00:03  <planetmaker> hm... renum should get a combined nfo
18:00:09  <planetmaker> yes
18:00:33  <planetmaker> well. hnfo -> precompiler -> pnfo -> cat -> nfo -> renum
18:00:35  <planetmaker> IMO
18:00:48  <planetmaker> it allows dedicated pre-processing of different files
18:00:53  <Ammler> hmm
18:00:54  <planetmaker> e.g. the language files
18:01:46  <Ammler> you need the whole file for vehicle IDs
18:02:01  <planetmaker> yes, true
18:02:05  <Ammler> as you have them in the real sprites and later in the lang files
18:02:46  <Ammler> I guess, it is fine as the Makefile of XeryusTC does it.
18:02:51  <planetmaker> so we need two stages of pre-processing: languages seperately (or via sed), then the whole thing pre-processed and then renum
18:03:09  <Ammler> something like that, yes
18:03:28  <planetmaker> hm... that means every string gets (again) it's only compiler directive?
18:03:36  <planetmaker> I guess
18:03:44  <XeryusTC> it isnt mine, it's aegirs
18:03:46  <Ammler> maybe instead of sed, we use also #define for the language files
18:03:46  <XeryusTC> i just use it :P
18:04:03  <planetmaker> Ammler: that's what I meant. Then we need it two-stage.
18:04:16  <Ammler> well, planetmaker made his own ;-)
18:04:20  <planetmaker> first process single language files. Then the whol project
18:05:08  <Ammler> planetmaker: yes, maybe there is something else the language files, but that can be done all the time later
18:05:46  <planetmaker> well, yes. It's kinda independent. And can always be added.
18:06:35  <Ammler> did you check the Makefile of XeryusTC (or aegir)
18:06:49  <Ammler> it uses the file directly as target
18:06:54  <planetmaker> I looked at tbrs
18:07:14  <Ammler> tbrs is very much limited, I guess.
18:07:24  <planetmaker> well...
18:07:50  <planetmaker> still, if we go for it, it's IMO important that we at least allow for easy adding of language support.
18:08:08  <planetmaker> and not make a solution which needs doubling everything for that or re-writing half of it.
18:08:23  <Ammler> yes
18:08:35  <Ammler> so the nfos rename to hnfo
18:08:55  <Ammler> then we use the same name convention as the other makefiles
18:09:03  <planetmaker> uhm...
18:10:16  <planetmaker> well. I don't care about the names.
18:10:19  <planetmaker> why h?
18:10:27  <planetmaker> p makes sense for pre-processed
18:10:37  <planetmaker> just curious :)
18:10:42  <Ammler> yeah, but they aren't :-)
18:10:51  <Ammler> they need first to cat ;-)
18:11:03  <Ammler> [20:00] <Ammler> hnfo -> cat -> pnfo -> precompiler -> nfo -> renum
18:11:12  <planetmaker> as I said: between cat and pre-processing has to be the language stage
18:11:20  <Ammler> pnfo is only temporar files, if any
18:11:22  <planetmaker> e.g. single file pre-processing or modification
18:11:40  <planetmaker> at least I don#t see how it is done otherwise nicely.
18:12:04  <Ammler> if we have files which need precompile, we call them pnfo :-)
18:12:18  <planetmaker> ?
18:12:23  <Ammler> but the most do need just cat
18:12:45  <planetmaker> but the order is wrong
18:12:47  <planetmaker> pnfo -> cat
18:12:53  <planetmaker> not cat -> pnfo
18:13:11  <planetmaker> it's easy to apply global pre-compiler things to multiple files
18:13:20  <planetmaker> but difficult to apply local ones to a global file
18:13:25  <Ammler> <-- listing every single file
18:13:32  <Ammler> (no cat)
18:13:56  <planetmaker> they just include everything. we don't want that for languages.
18:14:08  <planetmaker> #include is cat for pre-compiler
18:14:18  <XeryusTC> mine is suppose to work under windows with a simple make :P not on linux
18:14:21  <Ammler> yep
18:14:25  <planetmaker> XeryusTC: this, too
18:14:48  <Ammler> DJNekkid: used a batch file before
18:15:20  <Ammler> XeryusTC: didn't try, yor should work on linux, too.
18:15:54  <XeryusTC> mine works on linux too
18:15:55  <planetmaker> the longer I think of it, the more I get convinced that we should first try this pre-compiler thing on the languages.
18:15:57  <XeryusTC> or well, it should :P
18:16:01  <planetmaker> if that's set, extend it to the rest.
18:16:07  <planetmaker> a
18:16:08  <XeryusTC> but it is suppose to work on a simple mingw environment :P
18:16:10  <Ammler> that is imo, a main advantage of make, you can use it on mutliple platforms
18:16:13  <planetmaker> seems more natural to me
18:17:03  <planetmaker> XeryusTC: that's what mingw does: export all those nice tools from lin to win...
18:17:18  <Ammler> planetmaker: shall I demo, english?
18:17:20  <XeryusTC> true
18:17:31  <XeryusTC> but im not 100% sure whether it does cat too
18:17:36  <planetmaker> it does
18:17:40  <Ammler> no
18:17:44  <planetmaker> uhm?
18:17:54  <planetmaker> why does it work here, then?
18:18:01  <Ammler> XeryusTC's Makefile used #include instead cat
18:18:18  <Ammler> cat is a shell too, isn't?
18:18:36  <Ammler> l
18:18:43  <planetmaker> ?
18:18:58  <Ammler> of course, mingw has cat
18:19:03  <planetmaker> yes
18:19:07  <planetmaker> that was the point
18:19:11  <Ammler> but the Makefile of XeryusTC doesn't use it.
18:20:36  <planetmaker> yes. but so what?
18:22:05  <Ammler> that was just a info
18:22:18  <Ammler> you once suggested to list the files to include again.
18:22:43  <Ammler> and nod just cat *.nfo > final.nfo
18:22:50  <Ammler> not*
18:22:55  <planetmaker> yes. I'm not happy with cat *.nfo
18:23:04  <planetmaker> it fails, if garbage remains in the dir
18:23:13  <Ammler> then we should make it with #include
18:23:57  <Ammler> so you can have a file called sources.pnfo
18:24:20  <Ammler> or hnfo :-)
18:24:44  <planetmaker> hm... I start to dislike the cryptical file extensions. we have more than 4 letters available :)
18:25:09  <Ammler> hehe
18:25:21  <Ammler> oh and lnfo for language
18:25:35  <planetmaker> well... yes...
18:25:39  <Ammler> :P
18:25:54  <planetmaker> My idea is to put the logic for the language files in the script and only have
18:26:06  <planetmaker> <ID> <string>
18:26:08  <planetmaker> in the files
18:26:13  <Ammler> yep
18:26:18  <planetmaker> rest is done by pre-processor, considering the filename.
18:26:28  <Ammler> then you have a language file like
18:26:29  <planetmaker> or by makefile
18:26:46  <planetmaker> yeah, maybe keep the first 3 lines :)
18:27:10  <Ammler> #define TRAIN "train"
18:27:25  <planetmaker> why define?
18:27:38  <Ammler> what else, sed and replace?
18:28:31  <Ammler> oh, I get you know
18:28:32  <planetmaker> hm... dunno. Does the pre-processor need there in each line a define? That's ... long
18:28:34  <Ammler> -k
18:30:32  <Ammler> maybe we use just sed. :-)
18:31:09  <planetmaker> like emacs an OS on its own :P
18:32:24  <planetmaker> hm...
18:32:28  <planetmaker> hm...
18:32:32  <planetmaker> hm... :)
18:32:39  <Ammler> hm?
18:32:53  <planetmaker> I'm not sure what would be the better solution
18:33:05  <planetmaker> I really would love to see language files like OpenTTD has.
18:33:23  <planetmaker> That's easy for people
18:37:11  <Ammler> yes
18:37:35  <Ammler> you can postadd the #define ;-)
18:38:45  <Ammler> 7f_english.lng -> gcc -> 7f_english.pnfo -> gcc -> 7f_english.nfo
18:41:27  <planetmaker> yes. I'm just adding a rely
18:41:30  <planetmaker> *reply
18:42:22  <planetmaker> but... the #define isn't needed in the language files? is it? Or are the vehicle IDs defined there? I don't think
18:42:30  <planetmaker> that should be done seperately
18:42:44  <planetmaker> they only need replacing
18:47:18  <Brot> [DevZone] 2cc train set - Feature #81: precompiler? (planetmaker) -
18:54:06  <planetmaker> And we need a master file which defines the things, liker master.lang:
18:54:23  <planetmaker> #define ID_WAGON_DOUBLE4		5D
18:55:03  <planetmaker> then the first entry can in all cases for each lang file be extended by the necessary bytes via sed... yeah, sounds ok :)
19:13:27  <Ammler> he
19:17:49  <planetmaker> and then the whole thing can be stuck through a pre-processor
19:27:59  <planetmaker> hm... are defines case sensitive?
19:28:09  <Ammler> possible
19:28:29  <planetmaker> that sucks ;)
19:31:40  *** Ammller has joined #openttdcoop.devzone
19:32:27  <Ammler> what was that?
19:32:39  <planetmaker> I just wanted to ask you :)
19:32:49  <planetmaker> your alter ego?
20:25:01  <Ammler> planetmaker: around?
20:25:27  <Ammler> I setup the proper ssh key allowance
20:26:05  <planetmaker> oh, wow :)
20:27:24  <Ammler> I restrict your account like it, can you test, if you still are able to pull/push?
20:28:11  <Ammler> ok, can you try now
20:28:20  <Ammler> he you made a havy key :-)
20:29:56  <planetmaker> a heavy key?
20:30:22  <Ammler> big one
20:30:26  <planetmaker> successfully pulled from ottdc@mz
20:30:31  <Ammler> cool
20:30:36  <planetmaker> 1024bit, I think
20:30:43  <Ammler> looks like 2k
20:30:48  <planetmaker> hm... maybe
20:30:55  <planetmaker> computers get better :)
20:30:56  <Ammler> mine too :-)
20:31:12  <Ammler> I add this now to dj and foobar
20:31:23  <planetmaker> :)
20:31:42  <Ammler> try to login btw.
20:32:37  <planetmaker> doesn't work. Funny message though: Enter passphrase for key '/Users/ingo/.ssh/id_dsa':
20:32:38  <planetmaker> Illegal command '?'
20:32:40  <planetmaker> Connection to closed.
20:32:50  <planetmaker> e.g. I get kicked off with an illegal command message....
20:34:05  <Ammler> command="~/bin/hg-ssh hg-repos/*",no-port-forwarding,no-X11-forwarding,no-agent-forwarding <-- that needs to be added before a key from now
20:34:42  <Ammler> you could also restrict a key to a single repo as you might see.
20:34:46  <planetmaker> uh?
20:35:01  <planetmaker> oh... cool
20:35:09  <planetmaker> yorki-porky :P
20:35:37  <Ammler> you can now login again and check the file
20:36:12  <Ammler> ~/.ssh/authorized_keys
20:36:57  <Ammler> command="~/bin/hg-ssh hg-repos/<project>"....
20:37:25  <planetmaker> interesting
20:38:01  <Ammler> I might be able to make that per script
20:38:12  <planetmaker> what? adding keys?
20:38:30  <planetmaker> hehe. From a publicly accessible form field. That'd be hilarious ;)
20:38:50  <Ammler> I am learning ruby ;-)
20:39:45  <Ammler> you add your key with redmine, and it will automatically allow you to wirte to the poject you are member of
20:40:17  <Ammler> it should also automatically create the project, if not already existing
20:40:33  <Ammler> the repo*
20:40:39  <Ammler> but not now ;-)
20:41:46  <planetmaker> :)
20:44:41  <Ammler> I removed yoricks key long time ago, btw.
20:45:18  <planetmaker> hehe :)
21:02:51  <planetmaker> But with more repos and more people this advanced right management is certainly very good :)
21:29:18  <Brot> [DevZone] Dutch Train Set - dutchdj.grf (DJNekkid) -
21:48:20  <Ammler> planetmaker: could you again check the .ssh folder
21:48:27  <Ammler> I added a script
21:49:46  <planetmaker> uhm... and?
21:50:31  <Ammler> do you see it?
21:50:48  <Ammler> just if you need to add a key
21:51:00  <Ammler> 3 folders
21:51:09  <planetmaker> ah. .sh
21:51:09  <Ammler> full hg-repos locked
21:52:37  <planetmaker> cool
21:52:44  <planetmaker> just put the key there and be fine?
21:52:49  <Ammler> yep
21:52:57  <planetmaker> great! :)
21:52:59  <Ammler> well, mainly you move them from hg-repos to locked
21:53:01  <planetmaker> what is locked?
21:53:11  <Ammler> locked won't be added anymore
21:53:25  <Ammler> but you can keep them for later use, maybe.
21:53:30  <planetmaker> k
21:53:54  <Ammler> and if you think, there is key in full, which doesn't belong there move it
21:53:57  <Ammler> and run the script
21:53:57  <planetmaker> what's the coop key?
21:54:09  <Ammler> that is ssh from brain to that
21:54:11  <planetmaker> na, the people are fine
21:54:44  <Ammler> I needed that key to mirror the newgrf packs
21:54:55  <planetmaker> ah, ok
21:55:08  <planetmaker> but why forbid access then?
21:55:12  <Ammler> and as now, it is very easy to lock/unlock
21:55:20  <planetmaker> true
21:55:38  <planetmaker> *two thumbs up* :)
21:55:39  <Ammler> don't like unneded keys
21:56:06  <Ammler> I hope, I did not accidentally delete one?
21:56:09  <planetmaker> good time to go to bed now :)
21:56:18  <planetmaker> dunno. We'll hear complains :)
21:56:45  <planetmaker> if you did, it's not mine :P
21:57:14  <planetmaker> hm... smatz?
21:57:48  <planetmaker> or m4rk?
21:58:20  <Ammler> well, no problem for me, if they need access
21:58:38  <Ammler> hmm, I might have lost smatz
21:58:58  <planetmaker> I think so :)
21:59:36  <planetmaker> hm... or not
21:59:41  <Ammler> guet nacht pm
22:00:04  <planetmaker> jo, Dir dann auch :)
22:56:17  <Brot> [DevZone] OpenGFX - Revision 0: Initial repo population. Although restructured, this should produce 0.1.0-a... (foobar) -
23:02:18  <Brot> [DevZone] OpenGFX - (foobar) -
23:03:33  <Ammler> HEYA!
23:11:17  <Brot> [DevZone] OpenGFX - (foobar) -
23:23:19  <Brot> [DevZone] OpenGFX - OpenGFX in repo (foobar) -
23:23:20  <Brot> [DevZone] OpenGFX - Bug #82: close window button (foobar) -
23:29:17  <Brot> [DevZone] #openttdcoop - Wiki edit: SSH (#1) (Ammler) -
23:32:17  <Brot> [DevZone] #openttdcoop - Wiki edit: SSH (#2) (Ammler) -

Powered by YARRSTE version: svn-trunk