| *** tpb has joined #tp | 00:00 | |
| *** ChanServ sets mode: +o tpb | 00:00 | |
| *** jmtan has joined #tp | 00:04 | |
| *** llnz has joined #tp | 02:06 | |
| *** peres has left #tp | 02:08 | |
| *** peres has joined #tp | 02:08 | |
| *** llnz2 has joined #tp | 02:17 | |
| *** llnz has quit IRC | 02:20 | |
| *** llnz2 is now known as llnz | 02:20 | |
| *** greenlion has joined #tp | 03:27 | |
| *** greywhind has joined #tp | 04:10 | |
| *** greywhind_ has quit IRC | 04:10 | |
| *** jmtan has quit IRC | 04:36 | |
| *** greywhind_ has joined #tp | 06:20 | |
| *** greywhind has quit IRC | 06:20 | |
| *** mithro has joined #tp | 07:51 | |
| mithro | heyo people | 07:55 |
|---|---|---|
| mithro | what have I missed the last couple of days? | 07:55 |
| *** JLafont has quit IRC | 08:02 | |
| llnz | mithro: not much that I know of | 08:02 |
| llnz | mithro: but epyon was getting permission denied trying to clone the tpserver-cpp repo | 08:03 |
| *** JLafont has joined #tp | 08:10 | |
| * llnz wanders off | 08:16 | |
| llnz | later all | 08:16 |
| *** llnz has quit IRC | 08:16 | |
| *** greywhind has joined #tp | 08:28 | |
| *** greywhind_ has quit IRC | 08:28 | |
| *** peres has left #tp | 09:23 | |
| mithro | greywhind: ping? | 09:54 |
| *** reac has joined #tp | 10:12 | |
| *** JLafont has quit IRC | 10:14 | |
| *** greywhind_ has joined #tp | 10:39 | |
| *** greywhind has quit IRC | 10:39 | |
| *** alanp has joined #tp | 11:59 | |
| *** reac has quit IRC | 12:11 | |
| *** ]Spectre[ has joined #tp | 12:16 | |
| *** ]Spectre[ has left #tp | 12:23 | |
| greywhind_ | mithro: pong | 12:30 |
| mithro | how goes things? | 12:30 |
| greywhind_ | well, my computer overheated a few days ago and the graphics card died | 12:30 |
| greywhind_ | so i had to send it in for repair... should get it back within a week or so from now | 12:31 |
| greywhind_ | but for now i'll work on the old Mac I used to work on | 12:31 |
| greywhind_ | mithro: so i installed the latest version of git yesterday, and looked into trying to merge tp04 and the mainline | 12:33 |
| mithro | well you should do it the opposite (mailine into tp04 | 12:33 |
| greywhind_ | mithro: that's what i meant | 12:33 |
| mithro | and how did it go? | 12:34 |
| greywhind_ | mithro: when i tried to merge, it gave me an error about "incompatible modes" or something, and it seems that that has something to do with submodules being different | 12:34 |
| mithro | you got more info about the error? | 12:35 |
| greywhind_ | which is when i installed the newer git, since the one i was using didn't have the "submodules" commands at all | 12:35 |
| mithro | oh | 12:35 |
| mithro | you probably want to have atleast 1.6.x | 12:35 |
| greywhind_ | mithro: now i do, and the errors seem to be different when i just tried to merge again | 12:36 |
| mithro | well there are bound to be quite a few merge conflicts | 12:36 |
| greywhind_ | looks like only conflicts in... | 12:36 |
| greywhind_ | submodule libtpclient and libtpproto, and then in requirements and version | 12:37 |
| mithro | oh they should be easy to fix | 12:37 |
| greywhind_ | yeah | 12:37 |
| mithro | you'll have to merge libtpclient-py and libtpproto-py too | 12:37 |
| greywhind_ | i don't know how to fix submodule conflicts though | 12:37 |
| mithro | whats the error you get? | 12:37 |
| greywhind_ | Auto-merging libtpclient-py | 12:38 |
| greywhind_ | CONFLICT (submodule): Merge conflict in libtpclient-py | 12:38 |
| greywhind_ | Auto-merging libtpproto-py | 12:38 |
| greywhind_ | CONFLICT (submodule): Merge conflict in libtpproto-py | 12:38 |
| mithro | you will need to merge libtpproto-py | 12:38 |
| greywhind_ | it looks like the folders libtpclient-py and libtpproto-py in the folder are empty | 12:38 |
| greywhind_ | so i'm not sure how to merge that | 12:38 |
| mithro | and then libtpclient-py | 12:38 |
| mithro | and then tpclient-pywx | 12:38 |
| greywhind_ | ah. ok. | 12:38 |
| mithro | you need to checkout the submodules first then do the merge | 12:39 |
| greywhind_ | libtpclient-py-0.3.x is the mainline? | 12:39 |
| mithro | stable branch is mainline | 12:40 |
| greywhind_ | ok. wonder why i don't have a local "stable"... i'll fix that | 12:40 |
| mithro | how did you checkout? | 12:40 |
| greywhind_ | mithro: should the submodules be checked out inside the tpclient-pywx directory or alongside it like we used to have them? | 12:41 |
| mithro | greywhind_: no | 12:41 |
| mithro | greywhind_: they are checkout the first time you run tpclient-pywx | 12:41 |
| greywhind_ | ok | 12:42 |
| greywhind_ | i'll reset and then run it, see if they get checked out | 12:42 |
| greywhind_ | mithro: by the way, do we have a server running tp04? | 12:43 |
| mithro | tpserver-cpp supports it | 12:44 |
| greywhind_ | yeah, i can run my own. just wondered if we had one running | 12:44 |
| mithro | it'll work better with a local server | 12:45 |
| greywhind_ | ok | 12:45 |
| mithro | as there are likely bugs in tp04 which will be hard to debug remotely | 12:45 |
| greywhind_ | hmm... it does seem that the git clone of libtpclient creates a "libtpclient-py-0.3.x" branch locally but no stable. | 12:45 |
| greywhind_ | i'll just set one up though | 12:45 |
| mithro | git branch -l -a | 12:46 |
| mithro | there should be origin/stable | 12:47 |
| *** greywhind_ has quit IRC | 12:47 | |
| *** greywhind has joined #tp | 12:47 | |
| greywhind | sorry, got disconnected | 12:48 |
| mithro | [02:46] <mithro> git branch -l -a | 12:48 |
| mithro | [02:47] <mithro> there should be origin/stable | 12:48 |
| greywhind | yeah, i know. | 12:48 |
| greywhind | seems libtpproto is already merged | 12:48 |
| mithro | oh? | 12:49 |
| greywhind | it's saying tp04 is already up to date with the master | 12:49 |
| mithro | okay good | 12:50 |
| mithro | so you basically want to do a | 12:51 |
| mithro | in tpclient-pywx | 12:52 |
| mithro | a git merge | 12:52 |
| greywhind | first i have to merge libtpclient | 12:52 |
| greywhind | there was only one conflict, in version | 12:52 |
| mithro | yeah | 12:52 |
| mithro | then go into each submodule and checkout the right git version | 12:53 |
| mithro | then just do a | 12:53 |
| greywhind | what would the "right git version" be? | 12:54 |
| mithro | the commits for libtpclient-py/libtpproto-py | 12:54 |
| greywhind | mithro: i assume i want to go with the version string from stable, which is: version = (0, 3, 2) | 12:55 |
| greywhind | when merging | 12:55 |
| mithro | no | 12:55 |
| mithro | you want to go with the tp04 version | 12:55 |
| greywhind | version = (0, 3, 99) | 12:55 |
| mithro | yeah | 12:55 |
| greywhind | ok | 12:55 |
| mithro | when we do release of tp04 version that would be bumped to 0.4.0 | 12:56 |
| greywhind | ok | 12:56 |
| greywhind | now i can just git commit that change, and the merge will be done? | 12:56 |
| mithro | git log will get you the commit id | 12:57 |
| mithro | you'll need to do a | 12:58 |
| mithro | yeah you do a "git add" once you have fixed the conflict | 12:58 |
| mithro | then a git commit | 12:58 |
| greywhind | ok, got it | 12:58 |
| greywhind | commit c091eb5aef67c3b47bf3a46c2879731a3b779812 | 12:59 |
| greywhind | Merge: 7ba5e49 1ee2846 | 12:59 |
| greywhind | Author: Greywhind <[email protected]> | 12:59 |
| greywhind | Date: Sat May 23 09:58:18 2009 -0700 | 12:59 |
| greywhind | Merge branch 'stable' into tp04 | 12:59 |
| greywhind | that's for libtpclient | 12:59 |
| mithro | it should say something like | 12:59 |
| mithro | Conflicts: | 12:59 |
| mithro | tp/client/versions.py | 12:59 |
| greywhind | it did | 13:00 |
| mithro | okay | 13:00 |
| mithro | let me start the tpclient-pywx merge process again | 13:01 |
| mithro | 1) git merge stable | 13:01 |
| mithro | 2) cd libtpproto-py | 13:01 |
| mithro | 3) git checkout <commit id> | 13:01 |
| mithro | 4) cd.. | 13:01 |
| mithro | 5) git add libtpproto-py | 13:02 |
| mithro | 6) same for libtpclient-py | 13:02 |
| greywhind | greywhind (10:02 AM):~/Programming/tp04/tpclient-pywx/libtpproto-py > git checkout 89353e524a64f2c6fa636aff679b71071e86b39b | 13:02 |
| greywhind | Note: moving to '89353e524a64f2c6fa636aff679b71071e86b39b' which isn't a local branch | 13:02 |
| greywhind | If you want to create a new branch from this checkout, you may do so | 13:02 |
| greywhind | (now or later) by using -b with the checkout command again. Example: | 13:02 |
| greywhind | git checkout -b <new_branch_name> | 13:02 |
| greywhind | HEAD is now at 89353e5... Merge commit 'origin/tp04' into tp04 | 13:02 |
| greywhind | does that look ok? | 13:02 |
| mithro | yes | 13:03 |
| mithro | if you probably want to do development you should just checkout tp04 branch | 13:03 |
| mithro | git checkout tp04 | 13:04 |
| greywhind | in each submodule? | 13:04 |
| mithro | yeah | 13:05 |
| mithro | see above | 13:05 |
| greywhind | before or after committing this merge? | 13:06 |
| mithro | well every time you update the libtpproto-py or libtpclient-py you need to do a commit | 13:08 |
| *** reac has joined #tp | 13:08 | |
| mithro | in tpclient-pywx | 13:08 |
| greywhind | ok | 13:09 |
| greywhind | mithro: ok, tpclient-pywx is merged and committed... i should push to tp04 once i've checked to make sure it works, yeah? | 13:10 |
| mithro | yeah | 13:10 |
| mithro | probably a good idea to wait for me to be around so that we can revert is something goes wrong | 13:11 |
| greywhind | mithro: ok. | 13:11 |
| greywhind | mithro: well, it seems to be working here. the single-player button is now there and functioning | 13:12 |
| mithro | you start up a single player game and everything worked? | 13:12 |
| greywhind | i have to install the server first... i'll get back to you on that | 13:12 |
| *** reac has quit IRC | 13:14 | |
| greywhind | mithro: do we have a document on how to install tpserver-cpp on Mac? | 13:15 |
| *** reac has joined #tp | 13:15 | |
| mithro | greywhind: no - but the unix instructions should work | 13:15 |
| greywhind | mithro: ok, i'll look at them | 13:18 |
| mithro | okay | 13:18 |
| greywhind | hmm... "libtoolize not found," even after i installed libtool with macports | 13:20 |
| *** jnengland77 has joined #tp | 13:24 | |
| *** reac has quit IRC | 13:31 | |
| *** reac has joined #tp | 13:31 | |
| greywhind | mithro: it's looking like libtoolize on mac is called glibtoolize, but autogen.sh isn't figuring that out. | 13:43 |
| mithro | greywhind: guess you can modify autogen.sh | 13:44 |
| *** reac has left #tp | 13:44 | |
| greywhind | mithro: about to try that | 13:44 |
| *** reac has joined #tp | 13:44 | |
| greywhind | mithro: yep. that fixed it. | 13:45 |
| mithro | greywhind: submit a patch to lee | 13:46 |
| greywhind | mithro: not sure how to automatically try both though - i don't know autogen scripts very well at all | 13:46 |
| mithro | just put a || at the end | 13:46 |
| cherez | mithro: Is there any particular way you want the tests organized? | 13:46 |
| mithro | cherez: what ever is the best way :) | 13:47 |
| cherez | Way to mount the pressure. :P | 13:48 |
| cherez | Now just a good way won't be good enough. | 13:48 |
| greywhind | mithro: if i just use an or, it still tries libtoolize and prints "./autogen.sh: line 26: libtoolize: command not found" | 13:48 |
| mithro | greywhind: thats fine | 13:48 |
| greywhind | but it keeps working, so i guess if that won't confuse people and make them think something went wrong, it'll work | 13:49 |
| greywhind | mithro: how do i generate the patch again? | 13:49 |
| greywhind | been a while since i've done that | 13:50 |
| *** JLafont has joined #tp | 13:53 | |
| mithro | a number of different ways | 13:53 |
| greywhind | which would you suggest? | 13:54 |
| mithro | git send-email | 13:54 |
| greywhind | so first git-commit, then git-format-patch, then git-send-email? | 13:57 |
| greywhind | mithro: looks like the sendemail.to variable might not be set - what address should i send it to> | 14:03 |
| mithro | greywhind: I would get git-send-email to produce patches and then send with the normal email | 14:04 |
| greywhind | mithro: oh, ok. | 14:04 |
| greywhind | so once i have 0001-Added-conditions-to-autogen.sh-to-check-for-glibtool.patch | 14:05 |
| greywhind | i can send it through normal e-mail | 14:05 |
| mithro | yeah | 14:05 |
| mithro | anyway I should be in bed hours ago | 14:20 |
| greywhind | mithro: ok, just let me know when you want me to push the changes | 14:23 |
| mithro | okay | 14:23 |
| greywhind | thanks for your help even past your bedtime ;-) | 14:24 |
| greywhind | see you later | 14:24 |
| *** alanp has quit IRC | 15:57 | |
| *** greenlion has quit IRC | 16:51 | |
| *** epyon has joined #tp | 17:46 | |
| *** jnengland77 has quit IRC | 18:21 | |
| epyon | mithro: I don't seem to have access to the git repo | 18:48 |
| *** epyon has quit IRC | 19:00 | |
| *** epyon has joined #tp | 19:02 | |
| epyon | mithro: ping? | 19:02 |
| *** llnz has joined #tp | 19:47 | |
| *** mhilmi has joined #tp | 20:19 | |
| *** reac has quit IRC | 20:39 | |
| *** reac has joined #tp | 21:09 | |
| greywhind | llnz: ping? | 23:16 |
| llnz | greywhind: pong | 23:18 |
| greywhind | llnz: i've been trying to compile tpserver-cpp on my mac | 23:19 |
| greywhind | i'm getting | 23:19 |
| greywhind | checking for boostlib >= 1.32.1... yes | 23:19 |
| greywhind | checking whether the Boost::Signals library is available... yes | 23:19 |
| greywhind | configure: error: Could not link against ! | 23:19 |
| greywhind | i've looked around, but i'm not sure how to fix it. i tried adding --with-boost-libdir=/usr/local/include/boost-1_34/libs/, but it didn't seem to help | 23:20 |
| llnz | odd | 23:25 |
| greywhind | any ideas? | 23:26 |
| llnz | building from git? | 23:28 |
| greywhind | llnz: yes | 23:29 |
| llnz | do you have libgnutls installed? | 23:32 |
| greywhind | llnz: let me check | 23:32 |
| greywhind | hm... maybe not. | 23:32 |
| greywhind | i'll try installing it | 23:32 |
| llnz | actually, you shouldn't need it | 23:33 |
| greywhind | llnz: hm. ok | 23:33 |
| llnz | could you email you config.log file (or upload it to a pastebin)? | 23:35 |
| greywhind | http://rafb.net/p/Aa7e3466.html | 23:36 |
| tpb | Title: Nopaste - No description (at rafb.net) | 23:36 |
| llnz | odd | 23:45 |
| greywhind | i know - says it finds it, then fails anyway | 23:54 |
| llnz | looks like it finds the headers, but doesn't fine the library (.so or .dylib) | 23:58 |
| llnz | s/fine/find/ | 23:58 |
Generated by irclog2html.py 2.17.2 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!