Membership #7025

Applying for project: Timetable Improvement Patch

Added by ic111 almost 4 years ago. Updated 6 months ago.

Status:ClosedStart date:2014-08-13
Priority:NormalDue date:
Assignee:ic111% Done:

50%

Category:NewProject
Target version:-

Description

Hello, I would like to request a project on your DevZone, my work is or will be GPL and therefore legitimate to be hosted from you. More infos follows:

Basically, we talk about this project: http://www.tt-forums.net/viewtopic.php?f=33&t=63721&start=60#p1128630

Why I request a project here: I want to be able to publish precompiled releases (i.e. trunk of OpenTTD with my patch applied), and was told that using the infrastructure here is a reasonable way for doing so.

id_rsa.pub - public key (396 Bytes) ic111, 2014-08-14 16:12

History

#1 Updated by planetmaker almost 4 years ago

  • % Done changed from 0 to 50
  • Priority changed from Immediate to Normal
  • Assignee set to ic111
  • Status changed from New to Feedback
  • Category set to NewProject

I created the project at http://dev.openttdcoop.org/projects/openttd-ttip

In order for compilation to work the repository must be a full OpenTTD repository with your patches applied (not just the patch itself)

While the DevZone can compile, its services currently mostly target NewGRFs and similar stuff and we currently outsource programme binary creation to OpenTTD's own compile farm which in turn then publishes the results at our bundles server. That needs talking TrueBrain into setting up a compile job for this project. Knowing him, that best is done when there is already something to actually compile in the repository ;)

If you have a ssh key installed on the DevZone server you can push and pull to ssh:///openttd-ttip and anonymous code access is available via http://hg.openttdcoop.org/openttd-ttip. If you don't yet have a key installed, please attach your public key to this issue so that it can be installed.

#2 Updated by ic111 almost 4 years ago

Attached my public key.

#3 Updated by planetmaker almost 4 years ago

your key has been installed and you should be ready to rock :)

#4 Updated by ic111 almost 4 years ago

Hm, I did the following steps:

hg clone http://hg.openttd.org/openttd/trunk.hg

<copy patch queue>

hg qpush -a

<complete trunk repository is at wol@dbis-lap13:~/openttd/devzone/openttd-ttip/trunk_stip>

wol@dbis-lap13:~/openttd/devzone/openttd-ttip/trunk_stip$ rm -rf .hg
wol@dbis-lap13:~/openttd/devzone/openttd-ttip$ hg add
wol@dbis-lap13:~/openttd/devzone/openttd-ttip$ hg commit -m "Initial commit of stip-patched trunk"
[...]
Änderungssatz 0 erzeugt:bd31a3475d01
wol@dbis-lap13:~/openttd/devzone/openttd-ttip$ hg push
Übertrage nach ssh:///openttd-ttip
Führe ssh 'hg -R openttd-ttip serve --stdio' aus
Suche nach Änderungen
1 Änderungssätze gefunden
Entfernt: Füge Änderungssätze hinzu
Entfernt: Füge Manifeste hinzu
Entfernt: Füge Dateiänderungen hinzu
Entfernt: Fügte 1 Änderungssätze mit 1578 Änderungen an 1578 Dateien hinzu
Entfernt: File "trunk_stip/bin/baseset/openttd.grf" may not be added to the repository.Transaktion abgebrochen!
Entfernt: Zurückrollen abgeschlossen
Entfernt: abort: pretxnchangegroup.check-Hook ist fehlgeschlagen
wol@dbis-lap13:~/openttd/devzone/openttd-ttip$

Did I make some mistake, can I safely remove that file without affecting the ability to build the release?

#5 Updated by ic111 almost 4 years ago

And, the very first step was to hg clone the ssh:///openttd-ttip; and I then copied the cloned trunk repository there.

#6 Updated by planetmaker almost 4 years ago

pulling the trunk repo into the existing repo (hg pull path/to/local/trunk-clone) might have been the wiser choice. Also keeping the history might be (easier for future updates for merges with upstream trunk).

But in essence anything which works for you is ok.

I'll try to talk to TB when he's around.

#7 Updated by planetmaker almost 4 years ago

I'm basically waiting for some commits in the repo to appear which can be built before I'll approach TrueBrain. Are there any issues with pushing? Or is this repo of no interest any longer?

#8 Updated by ic111 almost 4 years ago

Oh, then we misunderstood each other.

My post #4 above reported the problem that I cannot commit to the repository - the system in some way did not like at least some of the files. I don´t know why (file size, file extension, etc.?)

I then understood your post #6 in a way that you will ask TB why I get that error message.

So, I am still interested in that repository, although it is not essential that it works right now (as in the meantime, other people started to publish windows builds of my patch...).

Also, I am not not sure which order of commands you mean in #6 - if I populate that repository using pull, then I have to login via ssh in some way - is that possible?

#9 Updated by planetmaker almost 4 years ago

Oh... :) I totally failed to understand that there was a problem - I should read more carefully.
That's a commit hook which applies to NewGRF projects: deny commit of grf files (as they are the binary). Obviously this commit hook makes no sense for OpenTTD itself as it's a valid part of that repo. Yet it kicked in. I'll disable it so that you will be able to commit. Not sure when I can do so as I'm travelling this week and some ports here are blocked.

#10 Updated by planetmaker almost 4 years ago

The check for no *.grf file being able to be committed is gone now. Please try again :)
Thanks for your patience.

#11 Updated by ic111 almost 4 years ago

Thanks, I now successfully pushed.

What I did not yet get: What workflow do you propose for such a setup (maintain cloned trunk, plus patches applied)?

Above, I first cloned trunk, but then had to remove .hg since hg rejected to add the directory tree to the cloned openttdcoop repository while .hg was there.

That in the end will result in me copying files to that directory tree (since I cannot simply pull from trunk given that I removed .hg).

But how can I do that simpler / better?

#12 Updated by planetmaker almost 4 years ago

I suggest to
- pull from DevZone the empty repo
- pull from OpenTTD the full hg repo (or pull --force if needed)
- push to DevZone the repo (or push --force if needed)
There's never the need to remove any .hg or copy anything manually. You can alway pull from any repo, local or remote.

#13 Updated by ic111 almost 4 years ago

Ah ok, thank you.

Anyway, what´s now in the repository should be a complete, compilable OpenTTD, thus I think you can talk to TB now.

Once building it is set up in a proper way, doing the steps you suggest properly should be no problem either.

#14 Updated by planetmaker almost 4 years ago

I just managed to look at the repository... that's not a normal OpenTTD repository (thus not a normal clone with configure and Makefile in the root dir), but you moved everything in a separate sub-dir. I'm pretty sure the CF will barf on that, failing to find anything to make (no configure, no Makefile).

#15 Updated by ic111 almost 4 years ago

Ah, I thought specifying the path is part of what you called "setting up the compile job" above.

Thus, I moved things to a subdir in case I want to add something else to the repository at some time in the future.

Ok, then I will rearrange things to get rid of that extra directory.

#16 Updated by ic111 almost 4 years ago

Now it is getting funny...

I did the steps you suggested in comment #12, and pushing again ends up in a hook:

wol@dbis-lap13:~/openttd/devzone/openttd-ttip$ hg push
Übertrage nach ssh:///openttd-ttip
Führe ssh 'hg -R openttd-ttip serve --stdio' aus
Suche nach Änderungen
21630 Änderungssätze gefunden
Entfernt: Füge Änderungssätze hinzu
Entfernt: Füge Manifeste hinzu
Entfernt: Füge Dateiänderungen hinzu
Entfernt: Fügte 21630 Änderungssätze mit 96923 Änderungen an 2831 Dateien hinzu
Entfernt: File "media/icon-psd.zip" may not be added to the repository.Transaktion abgebrochen!
Entfernt: Zurückrollen abgeschlossen
Entfernt: abort: pretxnchangegroup.check-Hook ist fehlgeschlagen
wol@dbis-lap13:~/openttd/devzone/openttd-ttip$

This time a zip file. The funny thing is, I don´t find that file in media, nor did the hg commit above report about any zip file being committed.

Is that hook triggered, because long ago in the past, some zip file lived in the media directory? I.e. some change set introduced that file, the hook is triggered, and some time later, the file was removed again?

#17 Updated by planetmaker almost 4 years ago

to my surprise: yes...

~/ottd/trunk$ LC_ALL=C hg log --removed media/icon-psd.zip
changeset: 1100:17203d4add25
user: dominik
date: Sat Jan 22 23:57:03 2005 +0000
summary: (svn r1601) Add: A brand new set of icons.

changeset: 0:29654efe3188
user: truelight
date: Mon Aug 09 17:04:08 2004 +0000
summary: (svn r1) Import of revision 975 of old (crashed) SVN

I removed that from the commit hook, too.

#18 Updated by ic111 almost 4 years ago

Push has completed successfully now.

#19 Updated by frosch 6 months ago

  • Status changed from Feedback to Closed

Also available in: Atom PDF