Times are UTC Toggle Colours
00:16:27 <Brot6> Makefile for NML: Common part - Revision 7:f33aff08f035: Add: License and readme (planetmaker) @ http://dev.openttdcoop.org/projects/make-nml-common/repository/revisions/f33aff08f035 00:16:27 <Brot6> Makefile for NML: Common part - Revision 8:c83c92770419: Add: Enhanced language check script (Albert... (planetmaker) @ http://dev.openttdcoop.org/projects/make-nml-common/repository/revisions/c83c92770419 01:16:16 *** NataS is now known as Nat_AFK 04:08:47 *** Nat_AFK is now known as NataS 04:23:08 *** andythenorth has joined #openttdcoop.devzone 05:08:04 *** andythenorth has quit IRC 05:14:06 *** andythenorth has joined #openttdcoop.devzone 05:44:10 *** NataS has quit IRC 05:50:36 *** Nat_aS has joined #openttdcoop.devzone 06:23:49 *** andythenorth has quit IRC 06:40:01 *** Nat_aS is now known as Nat_AFK 06:44:15 *** ODM has joined #openttdcoop.devzone 07:07:47 *** andythenorth has joined #openttdcoop.devzone 08:27:40 <Brot6> Makefile for NML: Common part - Revision 9:3b790553b228: Fix: Remove unneeded include (planetmaker) @ http://dev.openttdcoop.org/projects/make-nml-common/repository/revisions/3b790553b228 08:28:08 <Brot6> Makefile for NML - Revision 10:2b6b15d4fe17: Fix: Update subrepo (planetmaker) @ http://dev.openttdcoop.org/projects/make-nml/repository/revisions/2b6b15d4fe17 09:12:33 *** andythenorth has quit IRC 10:48:14 <Brot6> Makefile for NML: Common part - Revision 10:ea7fdcb26f25: Change: [lang check] Allow to check more t... (planetmaker) @ http://dev.openttdcoop.org/projects/make-nml-common/repository/revisions/ea7fdcb26f25 10:48:14 <Brot6> Makefile for NML - Revision 11:3e547c9b401e: Doc: Be a bit more verbose about the different Makefile... (planetmaker) @ http://dev.openttdcoop.org/projects/make-nml/repository/revisions/3e547c9b401e 10:50:41 <Brot6> feed grftools had 15 updates, showing the latest 10 10:50:41 <Brot6> Makefile for NewGRFs - Revision 7:d9bbb4c06863: Change: Subrepo location (planetmaker) @ http://dev.openttdcoop.org/projects/make-nml/repository/revisions/d9bbb4c06863 10:50:41 <Brot6> Makefile for NewGRFs - Revision 8:b4d5f97715e8: Fix: Ignore also Makefile.fordist (planetmaker) @ http://dev.openttdcoop.org/projects/make-nml/repository/revisions/b4d5f97715e8 10:50:41 <Brot6> Makefile for NewGRFs: Common part - Revision 6:c29304f0e9be: Add: check_language (old version) and m... (planetmaker) @ http://dev.openttdcoop.org/projects/make-nml-common/repository/revisions/c29304f0e9be 10:50:48 <Brot6> Makefile for NewGRFs - Revision 9:02e8059f3886: Change: Deprecate the scripts dir (planetmaker) @ http://dev.openttdcoop.org/projects/make-nml/repository/revisions/02e8059f3886 10:50:50 <Brot6> Makefile for NewGRFs: Common part - Revision 7:f33aff08f035: Add: License and readme (planetmaker) @ http://dev.openttdcoop.org/projects/make-nml-common/repository/revisions/f33aff08f035 10:50:54 <Brot6> Makefile for NewGRFs: Common part - Revision 8:c83c92770419: Add: Enhanced language check script (Al... (planetmaker) @ http://dev.openttdcoop.org/projects/make-nml-common/repository/revisions/c83c92770419 10:50:58 <Brot6> Makefile for NewGRFs: Common part - Revision 9:3b790553b228: Fix: Remove unneeded include (planetmaker) @ http://dev.openttdcoop.org/projects/make-nml-common/repository/revisions/3b790553b228 10:51:02 <Brot6> Makefile for NewGRFs - Revision 10:2b6b15d4fe17: Fix: Update subrepo (planetmaker) @ http://dev.openttdcoop.org/projects/make-nml/repository/revisions/2b6b15d4fe17 10:51:05 <Brot6> Makefile for NewGRFs: Common part - Revision 10:ea7fdcb26f25: Change: [lang check] Allow to check mo... (planetmaker) @ http://dev.openttdcoop.org/projects/make-nml-common/repository/revisions/ea7fdcb26f25 10:51:09 <Brot6> Makefile for NewGRFs - Revision 11:3e547c9b401e: Doc: Be a bit more verbose about the different Make... (planetmaker) @ http://dev.openttdcoop.org/projects/make-nml/repository/revisions/3e547c9b401e 10:51:32 <planetmaker> he... a slight rename seems to confuse Brot ;-) 11:11:44 <planetmaker> hm... hg advises actually *against* the use of subrepos... http://mercurial.selenic.com/wiki/FeaturesOfLastResort 11:11:45 <Webster> Title: FeaturesOfLastResort - Mercurial (at mercurial.selenic.com) 11:44:23 <Brot6> Dutch Track Set - Bug #3982 (Rejected): Track type introduction (foobar) @ http://dev.openttdcoop.org/issues/3982#change-10871 12:04:35 *** andythenorth has joined #openttdcoop.devzone 12:07:58 <Brot6> Dutch Trains 2 - Bug #3983 (New): build.sh broken (planetmaker) @ http://dev.openttdcoop.org/issues/3983 12:18:16 <Brot6> Dutch Trains 2 - Bug #3984 (New): Update / Rewrite of Makefile (planetmaker) @ http://dev.openttdcoop.org/issues/3984 12:28:06 <Brot6> Dutch Trains 2 - Bug #3984: Update / Rewrite of Makefile (planetmaker) @ http://dev.openttdcoop.org/issues/3984#change-10872 12:40:45 <planetmaker> andythenorth: Terkhen: does that look convincing for a makefile re-write? :-) 12:40:53 <planetmaker> http://dev.openttdcoop.org/issues/3984 <-- andythenorth, Terkhen 12:42:43 <andythenorth> planetmaker: the timings look pretty compelling 12:45:07 <andythenorth> I don't know whether to test it on BANDIT or not 12:45:14 <andythenorth> BANDIT has extra complications 12:45:34 <planetmaker> that *should* be feasible by writing appropriate plug-ins for the special things 12:45:54 <planetmaker> e.g. it has a special target 'gfx' which allows generation of graphics 12:46:06 <planetmaker> something not used in the shown example 12:46:08 <andythenorth> interesting 12:46:14 <andythenorth> we should test it on FIRS 12:46:23 <andythenorth> FIRS is in pretty good shape right now, and is a clean test 12:46:41 <andythenorth> it's also painfully slow to build with NML :P 12:47:04 <andythenorth> if I'm only changing graphics I build it with grfcodec, takes ~10s 12:47:11 <planetmaker> that's something which can in principle also be replaced by a nml/grfcodec combo. It's just replacing another module 12:47:28 <andythenorth> \o/ 12:47:52 <planetmaker> you can also write a plug-in for your lang file generator 12:49:46 <planetmaker> default is: 'gfx' (graphics generation), 'nml' (generating nml from main pnml file), 'grf' (generating grf from nml file), 'lng' generating lang files. And the usually unchanged md5, install, bundle, bundle_src targets 12:50:02 <planetmaker> gfx and lng are by default rather dummy targets 12:50:11 <planetmaker> lng generates the custom_tags.txt, but well 12:50:48 <planetmaker> one could re-write the nml and grf stages to generate an nfo output (instead of nml) and write the grf from the nfo (instead of grf stage) 12:52:00 <planetmaker> I can actually imagine to add these modules to the newgrf framework - and then it's the authors choice which modules to activate 12:52:39 <andythenorth> hmm 12:52:50 <andythenorth> splitting the lang from the main build I hadn't considered 12:52:51 <andythenorth> interesting 12:53:28 <andythenorth> this would allow the use of different templating systems for different stages of the build 12:54:25 <planetmaker> well. the grf really needs nml + lng as input. Thus nml and lng can easily be generated separately (and in parallel, if input allows) 12:55:26 <planetmaker> the other grf I tested it with so far is ogfx+rv, there it works also well, including the generation of the required graphics; those are only generated, when needed 12:55:34 <planetmaker> as graphics generation is lengthy, usually 12:57:54 <planetmaker> If you want to try for now on your own, put everything from the make-nml-common repository in the scripts dir and adjust the Makefile of the project to what it looks like in make-nml or the diff I attached to the dutchtrains. Mind to change the SCRIPT_DIR to scripts (=what it is now) 12:58:07 <planetmaker> I've to go now. I promised to build rockets with the kids :-P 13:07:18 *** andythenorth has quit IRC 13:18:35 *** andythenorth has joined #openttdcoop.devzone 13:41:47 <Brot6> Dutch Trains 2 - Revision 581:4d462e274b08: Fix: Plan K had wrong length set (foobar) @ http://dev.openttdcoop.org/projects/dutchtrains/repository/revisions/4d462e274b08 13:41:47 <Brot6> Dutch Trains 2 - Revision 582:44b9bc181d3a: Fix: build.sh (planetmaker) (closes #3983) (foobar) @ http://dev.openttdcoop.org/projects/dutchtrains/repository/revisions/44b9bc181d3a 13:42:57 <Brot6> Dutch Trains 2 - Bug #3983 (Closed): build.sh broken (planetmaker) @ http://dev.openttdcoop.org/issues/3983 13:42:57 <Brot6> Dutch Trains 2 - Revision 583:20f35254dae0: Change: r581 has actually broken compatibility (foobar) @ http://dev.openttdcoop.org/projects/dutchtrains/repository/revisions/20f35254dae0 13:42:57 <Brot6> Dutch Trains 2 - Bug #3983 (Closed): build.sh broken (foobar) @ http://dev.openttdcoop.org/issues/3983#change-10873 13:45:42 <Brot6> Dutch Trains 2 - Bug #3984 (Feedback): Update / Rewrite of Makefile (planetmaker) @ http://dev.openttdcoop.org/issues/3984 13:45:42 <Brot6> Dutch Trains 2 - Bug #3984 (Feedback): Update / Rewrite of Makefile (foobar) @ http://dev.openttdcoop.org/issues/3984#change-10874 13:46:49 <Brot6> Dutch Trains 2 - Bug #3984 (Feedback): Update / Rewrite of Makefile (foobar) @ http://dev.openttdcoop.org/issues/3984#change-10874 13:53:54 *** andythenorth has left #openttdcoop.devzone 14:44:43 *** Nat_AFK is now known as Nat_aS 15:27:56 *** andythenorth has joined #openttdcoop.devzone 15:47:45 <Terkhen> planetmaker: are you remaking the makefile? :P 15:48:00 <andythenorth> right now I think he's making rockets ;) 15:48:13 <Terkhen> oooh, double nice 15:48:18 <Terkhen> rockets are fun 15:48:26 <Terkhen> makefiles are... less fun, but useful :P 15:49:30 <Terkhen> I'm going to install linux now, I'll check those shiny makefiles later when my computer is better prepared :P 15:49:31 <Terkhen> bbl 16:09:07 *** Nat_aS is now known as Nat_AFK 16:33:34 *** andythenorth has quit IRC 16:48:59 *** andythenorth has joined #openttdcoop.devzone 17:20:35 <Brot6> FIRS Industry Replacement Set - Revision 2852:de992af00644: Change: (translations) use just 'sugar' ... (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/de992af00644 17:20:35 <Brot6> FIRS Industry Replacement Set - Revision 2853:1fbed57bd149: Change: (translations) use just 'sugar' ... (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/1fbed57bd149 17:20:35 <Brot6> FIRS Industry Replacement Set - Revision 2854:bff160f95b7f: merge (andythenorth) @ http://dev.openttdcoop.org/projects/firs/repository/revisions/bff160f95b7f 17:48:21 *** frosch123 has joined #openttdcoop.devzone 18:40:42 *** Zuu has joined #openttdcoop.devzone 18:47:00 *** andythenorth has quit IRC 19:12:32 *** andythenorth has joined #openttdcoop.devzone 19:16:00 *** Nat_AFK is now known as Nat_aS 19:50:50 <Ammler> planetmaker: why do you again allow .zip etc to commit globally? 19:51:04 <Ammler> you know, this can be easy allowed repo specific? 19:51:58 <Ammler> http://dev.openttdcoop.org/projects/home/repository/revisions/15bc722f18eb 19:52:59 <Ammler> I do not see the reason from just reading irc log :-) 19:53:01 <Brot6> Script Communication Protocol - Revision 22:ed5a409b2e5f: - Add support for null type (krinn) @ http://dev.openttdcoop.org/projects/scriptlib-scp/repository/revisions/ed5a409b2e5f 19:53:23 <Ammler> looks more like a accident 19:58:47 <Ammler> looks like we simply should revert/strip that commit 20:00:22 <Ammler> .diff is used for mq, that is why it wasn't added by me 20:01:26 <Ammler> you allow makefile.dep but you also allow a lot others you don't comment :-) 20:03:14 <Ammler> also your framwork could setup a own repo_check.ini 20:03:26 <Ammler> like it does setup other .devzone stuff 20:06:24 <Brot6> DevZone Help Center - Code Review #3985 (New): Review request [commit:15bc722f18eb: Change: [HG] All... (Ammler) @ http://dev.openttdcoop.org/issues/3985 20:16:46 <Brot6> Script Communication Protocol - Revision 23:859df234bd4c: - Remove events to discover companies as G... (krinn) @ http://dev.openttdcoop.org/projects/scriptlib-scp/repository/revisions/859df234bd4c 20:48:14 *** frosch123 has quit IRC 20:56:55 <Brot6> Script Communication Protocol - Revision 24:4af60d0f9532: - Remove events.nut file and reference to ... (krinn) @ http://dev.openttdcoop.org/projects/scriptlib-scp/repository/revisions/4af60d0f9532 21:03:29 *** andythenorth has left #openttdcoop.devzone 21:15:17 *** ODM has quit IRC 21:52:11 *** Nat_aS is now known as Nat_AFK 22:09:40 <planetmaker> Ammler: I only removed *.dep from the checklist. The repo on the devzone is highly modified and many of those things you mentioned are there - but never committed anywhere. Thus they don't show in the commit 22:10:03 <planetmaker> thus indeed things like *.zip should be still on the disallow list 22:10:32 <planetmaker> Terkhen: I basically re-made the makefile already ;-) 22:11:03 <planetmaker> Terkhen: checkout http://dev.openttdcoop.org/projects/make-nml/repository for an example repo with the new one 22:11:50 <planetmaker> Terkhen: but reading more on the mercurial pages, I'll NOT use the subrepo format as found in the repo just given above. Thus I'll just commit all the things in the subrepo in the existing scripts dir 22:23:36 <Brot6> Dutch Trains 2 - Bug #3984: Update / Rewrite of Makefile (planetmaker) @ http://dev.openttdcoop.org/issues/3984#change-10875 22:24:32 <Brot6> Script Communication Protocol - Revision 25:8341511a97f8: Add: Message.GetIntData, Message.GetString... (Zuu) @ http://dev.openttdcoop.org/projects/scriptlib-scp/repository/revisions/8341511a97f8 22:24:32 <Brot6> Script Communication Protocol - Revision 26:7e703ac07e68: Fix: comment of GetBoolData missed one con... (Zuu) @ http://dev.openttdcoop.org/projects/scriptlib-scp/repository/revisions/7e703ac07e68 22:24:32 <Brot6> Script Communication Protocol - Revision 27:1f4733bc96db: Add: make build-docs.py build docs for bot... (Zuu) @ http://dev.openttdcoop.org/projects/scriptlib-scp/repository/revisions/1f4733bc96db 22:38:02 <Brot6> DevZone Help Center - Revision 158:100f6e0f23a0: Fix (r157): Revert partially, the permissible file ... (planetmaker) @ http://dev.openttdcoop.org/projects/home/repository/revisions/100f6e0f23a0 22:39:10 <Brot6> DevZone Help Center - Code Review #3985 (Closed): Review request [commit:15bc722f18eb: Change: [HG] ... (Ammler) @ http://dev.openttdcoop.org/issues/3985 22:39:10 <Brot6> DevZone Help Center - Code Review #3985 (Closed): Review request [commit:15bc722f18eb: Change: [HG] ... (planetmaker) @ http://dev.openttdcoop.org/issues/3985#change-10876 23:02:29 *** Zuu has quit IRC 23:40:23 <Ammler> planetmaker: it's tar* (missing wildcard) ;-) 23:40:40 <planetmaker> meh 23:40:52 <planetmaker> but why wildcard there? 23:40:58 <Ammler> tar.gz etc. 23:41:34 <Ammler> not sure at all, if it works, though :-P 23:43:43 <Ammler> also you missed "[22:00] <Ammler> .diff is used for mq, that is why it wasn't added by me" 23:44:38 <Ammler> and yes, there might be uncommitted changes in that repo 23:44:52 <Ammler> but the .ini file should always be up2date 23:45:20 <Ammler> (and was, else a revert would have been better, imo) 23:45:42 <Ammler> means a test failed and so I didn't commit 23:45:50 <Ammler> whatever 23:46:04 <Ammler> or commit first the existing changes and then add your changes 23:46:33 <Ammler> hmm, best way ^ 23:50:16 <Ammler> I always used at least file with commit there