*** tpb has joined #tp | 00:00 | |
*** ChanServ sets mode: +o tpb | 00:00 | |
tpb | tpb has joined on worldforge | 00:00 |
---|---|---|
*** Epyon has quit IRC | 00:04 | |
CIA-56 | llnz tpserver-cpp-risk * rc144c72b0b0f /m4/ (ax_boost_base.m4 ax_boost_signals.m4): New versions of autoconf tests for boost from http://autoconf-archive.cryp.to/ | 00:05 |
CIA-56 | llnz tpserver-cpp-risk * r2cbe6fa33281 /modules/games/minisec/minisec.cpp: Removed old char* handling, use std::string instead in Minisec. | 00:05 |
CIA-56 | jphr tpserver-cpp-risk * rea50d2051bb0 / (3 files in 2 dirs): Merge git+ssh://[email protected]/git/tpserver-cpp | 00:05 |
tpb | Title: Autoconf Macro Archive (at autoconf-archive.cryp.to) | 00:05 |
*** mithro has quit IRC | 00:14 | |
*** JLafont has quit IRC | 00:21 | |
*** JLafont-laptop has quit IRC | 00:21 | |
*** JLafont-laptop has joined #tp | 00:22 | |
*** JLafont has joined #tp | 00:22 | |
*** GlobalWarming has joined #tp | 00:24 | |
llnz | hi GlobalWarming | 00:25 |
llnz | how can we avoid you today? :-p | 00:25 |
CIA-56 | victor.ivri gencon-rfts-ai * rf964ae0cc748 /gencon/Client.java: Final polish towards next (sub(sub))stage in coding the client. | 00:25 |
*** bddebian has quit IRC | 00:58 | |
*** zzorn has quit IRC | 01:33 | |
*** zzorn has joined #tp | 01:50 | |
CIA-56 | llnz tpserver-cpp * rce1b2af643e9 /tpserver/frame.cpp: Don't support TP01 anymore, removed check for later versions. | 01:57 |
*** pluskid has joined #tp | 02:09 | |
*** zzorn_laptop has joined #tp | 02:10 | |
pluskid | ~seen mithro | 02:11 |
tpb | pluskid: mithro was last seen in #tp 2 hours, 18 minutes, and 12 seconds ago: <mithro> see ya! | 02:11 |
*** Demitar has quit IRC | 02:12 | |
llnz | hi pluskid | 02:21 |
pluskid | hi llnz | 02:21 |
CIA-56 | llnz tpserver-cpp * r7aa76d3ce0c9 /tpserver/ (frame.cpp frame.h): | 02:29 |
CIA-56 | TP04 support for fail frames, including references. | 02:29 |
CIA-56 | Woops, guess that means version 0.5.1 will be out as soon as I've sorted | 02:29 |
CIA-56 | the build on OS X. | 02:29 |
*** zzorn has quit IRC | 02:32 | |
*** zzorn has joined #tp | 02:39 | |
pluskid | join #rubinius | 02:40 |
*** GlobalWarming has quit IRC | 02:41 | |
*** pluskid has quit IRC | 03:10 | |
*** andrei has quit IRC | 03:12 | |
*** nash has quit IRC | 03:25 | |
*** xdotx has joined #tp | 03:54 | |
*** JLafont-laptop has quit IRC | 03:59 | |
llnz | hi xdotx | 04:25 |
CIA-56 | pluskid schemepy * rda5f364a27c6 /schemepy/mzscheme/ (Makefile mzhelper.c): Added helper for mzscheme. | 04:48 |
*** JLafont has quit IRC | 05:31 | |
*** JLafont has joined #tp | 05:32 | |
*** JLafont has quit IRC | 05:52 | |
*** JLafont has joined #tp | 05:52 | |
tpb | aloril_ has joined on worldforge | 07:02 |
tpb | aloril has quit worldforge (Ping timeout: 378 seconds) | 07:05 |
*** xdotx has quit IRC | 07:33 | |
*** xdotx has joined #tp | 07:39 | |
CIA-56 | pluskid schemepy * ra5ccd84f1d9d /schemepy/types.py: | 07:46 |
CIA-56 | Modified symbol implementation, use __new__. | 07:46 |
CIA-56 | Instead of __metaclass__ | 07:46 |
*** zzorn_laptop has quit IRC | 08:03 | |
*** zzorn_laptop has joined #tp | 08:04 | |
llnz | do i pass a list of all frame for the sequence number, or each frame individually? | 08:12 |
*** Marcel- has joined #tp | 08:31 | |
Marcel- | hi @all | 08:32 |
llnz | hi Marcel- | 08:32 |
Marcel- | llnz: I had a thought about an account spam creation. How much accounts can one Ip create per hour? | 08:33 |
Marcel- | If endless it is possible to floud the server, isn´t it? | 08:34 |
llnz | tpserver-cpp currently doesn't limit account creation | 08:34 |
llnz | though if it ever became a problem, limiting is an option | 08:35 |
llnz | there are already settings to disable account creation | 08:35 |
Marcel- | yup, another question: Is it possible to rename an account? | 08:35 |
llnz | and the game admin (or other process) could create them from outside | 08:35 |
llnz | currently no | 08:35 |
Marcel- | planned for TP04 ? | 08:36 |
llnz | except for stopping the server, editing the database and restarting it | 08:36 |
llnz | no | 08:36 |
llnz | not currently | 08:36 |
llnz | actual accounts are fairly short lived (one game) | 08:36 |
Marcel- | Do you have an example of a protocol frame, maybe with a list and a enum. I ask because I´m currently at the point to generate the objects to formated strings. And currently I have the following generated: <n>1result<1>[<n>0<<n>>0] | 08:41 |
Marcel- | The header is missing, this is only the data. | 08:41 |
Marcel- | <n>1 is a 32bit int and result is a string and then comes the <1> List with one item (int and long). | 08:42 |
llnz | ok, i'll use tp04 fail frame as an example | 08:43 |
Marcel- | thank you | 08:44 |
llnz | assume header has been dealt with already | 08:44 |
llnz | the data would be something like: | 08:44 |
llnz | oh | 08:44 |
llnz | before i do that, my notation | 08:44 |
llnz | <12> 32bit number (decemal 12), litstring a literal string | 08:45 |
llnz | so, something like: | 08:45 |
llnz | <5><14>Wrong Password<2>[<-10>, <2>;<0>, <1>] | 08:47 |
llnz | that is: the error code, the length of the result string, the result string, the number of items in the list, and two items in the list, each two 32bit ints | 08:48 |
llnz | all numbers are in network byte order | 08:48 |
Marcel- | ah the value of the int should be in the <> | 08:49 |
llnz | yeah, that normally how we notate it | 08:50 |
llnz | see the example at the bottom of the protocol page(s) | 08:51 |
Marcel- | means I need to change some parts in the generator :/ . Okay, thanks for help. | 08:51 |
llnz | BUT | 08:51 |
llnz | the actual data sent would be: | 08:51 |
llnz | actually, it's a little hard to show | 08:52 |
llnz | the numbers are in binary (network byte order) | 08:52 |
llnz | that whole message is 42 bytes | 08:52 |
Marcel- | Means the string will be translated into binary code? | 08:53 |
llnz | meaning that the first 3 bytes are 0 followed by the byte with value 5, followed by 3 bytes 0, one byte 14, byte utf-8 code for W, byte utf-8 code for r, etc | 08:54 |
llnz | the utf-8 codes for those characters are the same as ascii | 08:56 |
llnz | does that help? | 08:56 |
*** bddebian has joined #tp | 09:00 | |
Marcel- | him, not really. First I will do the rest of the string formating and then I will do this string to byte converting thing. Could I use a binaryserializer for this? | 09:01 |
llnz | i'm not sure, i've never programmed in c# | 09:01 |
* llnz wanders off | 09:02 | |
llnz | later all | 09:02 |
bddebian | Heya | 09:02 |
bddebian | Later llnz | 09:02 |
*** llnz has quit IRC | 09:02 | |
*** JLP has joined #tp | 09:33 | |
JLP | ahoy all | 09:34 |
ezod | hey JLP | 09:34 |
bddebian | Hello JLP | 09:35 |
Marcel- | hi JLP | 09:35 |
*** peres has joined #tp | 09:39 | |
*** zzorn_laptop has quit IRC | 10:00 | |
*** geirha has quit IRC | 10:01 | |
*** Marcel- has quit IRC | 10:26 | |
CIA-56 | pluskid schemepy * r3dd54adb6d7d /schemepy/ (guile/guile.py mzscheme/mzhelper.c mzscheme/mzscheme.py): Basic structure added for mzscheme backend. | 10:49 |
CIA-56 | llnz tpserver-cpp-risk * rce1b2af643e9 /tpserver/frame.cpp: Don't support TP01 anymore, removed check for later versions. | 10:57 |
CIA-56 | llnz tpserver-cpp-risk * r7aa76d3ce0c9 /tpserver/ (frame.cpp frame.h): | 10:57 |
CIA-56 | TP04 support for fail frames, including references. | 10:57 |
CIA-56 | Woops, guess that means version 0.5.1 will be out as soon as I've sorted | 10:57 |
CIA-56 | the build on OS X. | 10:57 |
CIA-56 | jphr tpserver-cpp-risk * r30eaaf6af5d6 /tpserver/ (frame.cpp frame.h): Merge git+ssh://[email protected]/git/tpserver-cpp | 10:57 |
*** peres has quit IRC | 11:03 | |
*** Epyon has joined #tp | 11:17 | |
CIA-56 | pluskid schemepy * r3f8ae92317c9 /schemepy/ (5 files in 3 dirs): | 11:30 |
CIA-56 | Added bool conversion support for mzscheme. | 11:30 |
CIA-56 | Seems still not work yet. Like only starting the | 11:30 |
CIA-56 | VM will cause an infinite loop and consumes a lot | 11:30 |
CIA-56 | of memory. | 11:30 |
CIA-56 | pluskid schemepy * r2b52386631c1 /schemepy/ (__init__.py mzscheme/mzhelper.c mzscheme/mzscheme.py): The mzscheme backend passed the bool testcase. | 11:53 |
*** JLafont has quit IRC | 12:07 | |
*** Erroneous has joined #tp | 12:46 | |
*** JLafont has joined #tp | 13:13 | |
*** Erroneous has quit IRC | 13:22 | |
*** Erroneous has joined #tp | 13:23 | |
*** Marcel- has joined #tp | 13:25 | |
tpb | aloril__ has joined on worldforge | 13:50 |
tpb | aloril_ has quit worldforge (Ping timeout: 378 seconds) | 13:53 |
tpb | aloril__ has quit worldforge (Ping timeout: 378 seconds) | 15:30 |
tpb | aloril__ has joined on worldforge | 15:30 |
*** bddebian has quit IRC | 15:38 | |
*** JLafont_ has joined #tp | 15:51 | |
*** JLafont has quit IRC | 15:57 | |
*** Demitar has joined #tp | 16:26 | |
*** jphr has joined #tp | 16:41 | |
jphr | Is there a simple way to ask game if the game is started or not? | 16:42 |
ezod | jphr: in tpserver-cpp? | 16:44 |
jphr | ezod: yes | 16:44 |
ezod | jphr: Game::getGame()->isStarted() | 16:45 |
jphr | ezod: awesome | 16:45 |
jphr | ezod: returns a bool correct? | 16:45 |
ezod | jphr: i believe it returns 'started' from game which is a bool | 16:46 |
jphr | great thank you | 16:46 |
ezod | yeah bool | 16:46 |
ezod | jphr: np | 16:46 |
*** zzorn has quit IRC | 16:57 | |
tpb | aloril_ has joined on worldforge | 17:03 |
tpb | aloril__ has quit worldforge (Ping timeout: 378 seconds) | 17:05 |
CIA-56 | neufelry tpserver-cpp * rf7844c8716e1 /AUTHORS: | 17:26 |
CIA-56 | Name: Ryan Neufeld - jphr | 17:26 |
CIA-56 | Email: [email protected] | 17:26 |
CIA-56 | Changes: Added name+nick+email to AUTHORS in risk branch | 17:26 |
CIA-56 | jaffer tpserver-cpp * ra61470831d51 / (37 files in 5 dirs): git-pulled main repository onto #risk branch | 17:26 |
CIA-56 | jphr tpserver-cpp * r002df20a3d67 /modules/games/Makefile.am: Modified modules/games/Makefile.am to include Risk folder to be commited shortly | 17:27 |
CIA-56 | jphr tpserver-cpp * r6a38d603da7d /modules/games/risk/ (Makefile.am risk.cpp risk.h): Added basic shell of risk ruleset. | 17:27 |
CIA-56 | jphr tpserver-cpp * r196d2b8c1096 /configure.ac: Accidentally left out changes made to configure.ac | 17:27 |
CIA-56 | jphr tpserver-cpp * re480c4ad5081 /configure.ac: Fixed a commented out line in configure.ac | 17:27 |
CIA-56 | jphr tpserver-cpp * r3403bc2029d8 /modules/games/risk/ (risk.cpp risk.h): Fixed syntax errors in risk.cpp, risk.h | 17:27 |
CIA-56 | jphr tpserver-cpp * rbe5dbecb6b06 /modules/games/risk/risk.cpp: More syntax errors. | 17:27 |
CIA-56 | jphr tpserver-cpp * r75bf14f5bddb /modules/games/risk/risk.cpp: included objectmanager.h instead of objectdatamanager.h | 17:27 |
CIA-56 | jphr tpserver-cpp * rda88c72dc0d9 /modules/games/risk/ (risk.cpp risk.h): Some discrepencies existed when comparing risk to minisec. Corrected the required extern "C" section in risk.cpp and moved "public:" up in risk.h | 17:27 |
CIA-56 | jphr tpserver-cpp * r78aad53179a5 /modules/games/risk/ (risk.cpp risk.h): Renamed namespace from Risk to RiskRuleset. Figured this may be causing me problems (its also more clear) | 17:27 |
CIA-56 | jphr tpserver-cpp * r5e1c399b30ef / (configure.ac tpserver/Makefile.am): Merged changes from the main branch to this branch | 17:27 |
CIA-56 | jphr tpserver-cpp * r2f0f06e8de09 /modules/games/ (Makefile.am risk/Makefile.am): Removed trailing whitespace in risk/Makefile.am | 17:27 |
CIA-56 | jphr tpserver-cpp * r91c3b3cbe414 / (6 files in 4 dirs): Merge with git://git.thousandparsec.net/git/tpserver-cpp.git (to fix mac os x compile issue for jphr) | 17:27 |
CIA-56 | jphr tpserver-cpp * rb39b32b35c1c /modules/games/risk/risk.h: small test change to be pushed sideways, not to be pushed to main :p | 17:27 |
CIA-56 | jphr tpserver-cpp * r68cd9f9863ae / (4 files in 3 dirs): Merge git://git.thousandparsec.net/git/tpserver-cpp | 17:27 |
CIA-56 | jphr tpserver-cpp * re49d14f118f0 /AUTHORS: merged main branch changes, tidied up AUTHORS (by removing myself for the time being) | 17:27 |
CIA-56 | jphr tpserver-cpp * rea50d2051bb0 / (3 files in 2 dirs): Merge git+ssh://[email protected]/git/tpserver-cpp | 17:27 |
CIA-56 | jphr tpserver-cpp * r30eaaf6af5d6 /tpserver/ (frame.cpp frame.h): Merge git+ssh://[email protected]/git/tpserver-cpp | 17:28 |
CIA-56 | jphr tpserver-cpp * r8fbc8fffba63 /modules/games/risk/risk.cpp: Added comments to risk.cpp modelling what happens in minisec.cpp | 17:28 |
CIA-56 | jphr tpserver-cpp * r879c98b9f962 /modules/games/risk/ (risk.cpp risk.h): | 17:28 |
CIA-56 | Added a bit of logic to Risk::onAddPlayer. | 17:28 |
CIA-56 | -Player cannot join ANYTIME if NumPlayers >= setting risk_max_players | 17:28 |
CIA-56 | -Player cannot join once game has started if no open spaces exist to be claimed | 17:28 |
CIA-56 | Added private: bool Risk::isBoardClaimed() to run a check to determine if board is fully claimed | 17:28 |
CIA-56 | jphr tpserver-cpp * rd755ce135946 /modules/games/risk/ (riskturn.cpp riskturn.h settings): | 17:28 |
CIA-56 | Create riskturn.cpp&.h as well as a "settings" file | 17:28 |
CIA-56 | -RiskTurn inherits TurnProcess and is only a shell at the moment | 17:28 |
CIA-56 | -settings records settings i've used and settings in consideration | 17:28 |
CIA-56 | jphr tpserver-cpp * rcfe8ffedd74a /modules/games/risk/risk.cpp: Small modification of risk.cpp | 17:28 |
CIA-56 | jphr tpserver-cpp-risk * r8fbc8fffba63 /modules/games/risk/risk.cpp: Added comments to risk.cpp modelling what happens in minisec.cpp | 17:28 |
CIA-56 | jphr tpserver-cpp-risk * r879c98b9f962 /modules/games/risk/ (risk.cpp risk.h): | 17:28 |
CIA-56 | Added a bit of logic to Risk::onAddPlayer. | 17:28 |
CIA-56 | -Player cannot join ANYTIME if NumPlayers >= setting risk_max_players | 17:28 |
CIA-56 | -Player cannot join once game has started if no open spaces exist to be claimed | 17:28 |
CIA-56 | Added private: bool Risk::isBoardClaimed() to run a check to determine if board is fully claimed | 17:28 |
CIA-56 | jphr tpserver-cpp-risk * rd755ce135946 /modules/games/risk/ (riskturn.cpp riskturn.h settings): | 17:29 |
CIA-56 | Create riskturn.cpp&.h as well as a "settings" file | 17:29 |
CIA-56 | -RiskTurn inherits TurnProcess and is only a shell at the moment | 17:29 |
CIA-56 | -settings records settings i've used and settings in consideration | 17:29 |
CIA-56 | jphr tpserver-cpp-risk * rcfe8ffedd74a /modules/games/risk/risk.cpp: Small modification of risk.cpp | 17:29 |
jphr | oh fack | 17:30 |
jphr | well if anyone wants to help, i somehow just pushed all my changes to the main repo | 17:30 |
CIA-56 | victor.ivri gencon-rfts-ai * rad0525e71578 /gencon/ (Client.java test.java): Added more functionality; fixed certain things. | 17:36 |
*** JLafont_ has quit IRC | 18:16 | |
*** JLafont has joined #tp | 18:18 | |
CIA-56 | jaffer tpserver-cpp-risk * r595e2014b92f /modules/games/risk/ (risk.cpp riskturn.h): SORRY: fixed some typos/syntax that caused things to not compile. | 18:48 |
CIA-56 | jaffer tpserver-cpp * r595e2014b92f /modules/games/risk/ (risk.cpp riskturn.h): SORRY: fixed some typos/syntax that caused things to not compile. | 18:51 |
*** jphr has quit IRC | 18:54 | |
*** nash has joined #tp | 19:04 | |
*** Alklomion has joined #tp | 19:27 | |
*** llnz has joined #tp | 20:05 | |
*** xdotx_ has joined #tp | 20:06 | |
*** xdotx has quit IRC | 20:07 | |
llnz | hi all | 20:09 |
llnz | hummm.... :-/ | 20:28 |
Alklomion | hi llnz | 20:29 |
llnz | hi Alklomion | 20:29 |
Alklomion | guess mithro couldn't get online at this time | 20:29 |
Alklomion | So time to go, catch ya | 20:30 |
*** Alklomion has quit IRC | 20:30 | |
llnz | missed him | 20:30 |
llnz | mithro should be arriving in the USA about now | 20:30 |
* llnz wonders how to revert a large number of commits that are no longer sequenal | 20:32 | |
llnz | any git experts in the house? | 20:33 |
nash | llnz: Have you pushed them? | 20:42 |
nash | llnz: if not, just git-revert <patchid> | 20:42 |
nash | for each patch (from most recent to first) | 20:42 |
nash | you can skip them | 20:42 |
llnz | they are in the master branch of tpserver-cpp | 20:49 |
llnz | and in the risk branch | 20:49 |
llnz | but i only want them in the risk branch | 20:50 |
llnz | until i merge it later | 20:50 |
nash | Just revert those patches in the maister branch | 20:53 |
llnz | it's a lot of patches | 20:54 |
nash | then use git log to generate the list, then for i in `cat list` ; git revert $i ; done | 20:54 |
llnz | and wont that wipe out the risk branch when it is merged, and cause problems when the risk branch is merged into master at the right time? | 20:55 |
nash | not sure | 20:56 |
llnz | ie, in risk merge master, then later on master merge risk | 20:56 |
nash | Otherwise you need to do it with a rebase | 20:56 |
llnz | what about commit a patch that removes the unwanted things, merge to risk, in risk revert the patch | 20:57 |
nash | That sounds much worse to me | 20:58 |
llnz | ok | 20:58 |
tpb | aloril__ has joined on worldforge | 21:00 |
* llnz sighs | 21:03 | |
tpb | aloril_ has quit worldforge (Ping timeout: 378 seconds) | 21:04 |
llnz | humm... | 21:07 |
llnz | new, idea | 21:08 |
llnz | create a new branch from the last tag point | 21:08 |
llnz | cherry pick the good commits into it | 21:09 |
nash | yep | 21:11 |
*** bddebian has joined #tp | 21:13 | |
*** Erroneous has quit IRC | 21:16 | |
bddebian | Heya | 21:18 |
*** jphr has joined #tp | 21:19 | |
jphr | llnz: you still here? | 21:20 |
llnz | yes | 21:20 |
llnz | jphr: decided what we are going to do | 21:23 |
jphr | oh good | 21:23 |
llnz | i'm going to create a new branch for me, with the current "mainline" | 21:23 |
jphr | scrap the existing main and then rewrite with mainline? | 21:24 |
llnz | will merge back into master when risk is ready to be merged | 21:24 |
llnz | yeah, basically | 21:24 |
jphr | yeesh, that doesn't really sound ideal | 21:24 |
jphr | a git admin can't just remove those commits? | 21:25 |
*** Marcel- has quit IRC | 21:25 | |
llnz | humm... they seem to end up with different commit ids | 21:27 |
llnz | oh ffs | 21:29 |
jphr | mithro's doing his thing in north america with google isn't he? | 21:30 |
llnz | yeah | 21:30 |
llnz | nash: help please | 21:30 |
jphr | i gotta say again I feel like shit about this | 21:31 |
nash | ? | 21:31 |
nash | llnz: ? | 21:31 |
llnz | jphr: don't worry too much about it | 21:31 |
nash | llnz: Does it break anything? | 21:31 |
llnz | nash: yes, cherry-picking creates new patch ids | 21:31 |
jphr | nash: if you mean my commits, no, I made sure they don't | 21:31 |
nash | So then don't care | 21:31 |
nash | Worry about real problems... | 21:32 |
nash | If you do a release just put "contains experimental risk code, not working" | 21:32 |
jphr | well we can do a delete commit to remove all reference to it can't we? | 21:32 |
jphr | i mean the history is still full of junk | 21:33 |
jphr | but that can be cleaned up later | 21:33 |
llnz | not worried about the history | 21:34 |
llnz | just trying to make/keep the main working and releasable | 21:34 |
jphr | well if the Risk folder is removed all that needs to be fixed is modules/games/Makefile.am by removing "risk" | 21:34 |
jphr | nah it still compiles atm | 21:35 |
nash | If it compiules and non-risk works... it's still working and releasable | 21:35 |
nash | So there is no problem | 21:35 |
llnz | humm... ok | 21:35 |
nash | ANd you are just wasting time doing this | 21:35 |
jphr | after i commited my "SORRY: " fix everything compiles | 21:35 |
llnz | jphr: i know, i have been following locally | 21:36 |
* llnz recompiles | 21:36 | |
jphr | :P | 21:37 |
llnz | yeah, all good | 21:37 |
llnz | jphr: while you are here, want to try to get to the bottom of your osx build problem? | 21:38 |
jphr | sure | 21:38 |
llnz | What files starting with libboost_signals do you have in /opt/local/lib/ ? | 21:38 |
jphr | one second | 21:39 |
jphr | libboost_signals-mt-1_35.dylib | 21:39 |
jphr | libboost_signals-mt.dylib | 21:39 |
llnz | can you try configure --with-boost-signals=boost_signals-mt-1_35 ? | 21:40 |
jphr | with the whole path or just that line? | 21:40 |
llnz | with everything else | 21:40 |
jphr | ok, one second | 21:41 |
* llnz thinks that should work and if that works he knows what the problem is | 21:42 | |
jphr | it got through the part it failed | 21:42 |
jphr | ok, gunna make now | 21:42 |
llnz | cool | 21:42 |
jphr | never got this far before | 21:42 |
jphr | so what did you think the problem was/is | 21:44 |
llnz | it checks for libraries ending with .so, .a and .dll | 21:45 |
jphr | (finished the make, i'll install and test it) | 21:45 |
llnz | needs to check for .dylib | 21:45 |
jphr | YES! | 21:45 |
jphr | installed and works | 21:45 |
llnz | cool | 21:45 |
jphr | thank you so much | 21:46 |
llnz | btw, there are tricks so that you don't need to install it to test it | 21:46 |
llnz | cool | 21:46 |
llnz | i'll add the fix now | 21:46 |
jphr | yeah, it puts it in the tpserver folder doesn't it? | 21:46 |
CIA-56 | llnz tpserver-cpp * r98972c4c5e34 /m4/ax_boost_signals.m4: Hopefully added test to automatically detect libboost_signals on OS X. | 21:47 |
llnz | yeah, and you have give the ruleset command/setting the path to the ruleset library module | 21:48 |
jphr | I can go ahead and cg-rm those files and push that up right? | 21:48 |
llnz | try running autogen.sh and configure without the "with-boost-signals" bit | 21:48 |
llnz | what files? | 21:48 |
jphr | modules/games/risk/* and the folder | 21:49 |
llnz | don't worry about it | 21:49 |
jphr | and change modules/games/Makefile.am by removing " risk" | 21:49 |
jphr | are you sure? I just have to commit | 21:49 |
jphr | err push | 21:49 |
jphr | that way its gone completely | 21:49 |
llnz | i'm sure | 21:49 |
llnz | because if you pull that patch into the risk branch all your code will be gone | 21:50 |
tpb | aloril_ has joined on worldforge | 21:50 |
jphr | well I have a backup, I can pull the change and readd them? I really just want to respect your branch, I can make my branch work more easily | 21:50 |
llnz | if you want, all the history will still be there | 21:51 |
jphr | yeah, a constant reminder :( | 21:51 |
jphr | interestingly, I can't push that commit to the main branch | 21:53 |
llnz | you will probably need to update first | 21:53 |
tpb | aloril__ has quit worldforge (Ping timeout: 378 seconds) | 21:54 |
llnz | tell me if configure passes without passing it "--with-boost-signals" | 21:56 |
* llnz is afk | 21:56 | |
jphr | running now | 22:00 |
jphr | llnz: actually doesn't work without it | 22:00 |
llnz | doesn't it? | 22:05 |
llnz | what does it say (from boost/signal.hpp... yes, onwards) | 22:05 |
CIA-56 | jphr tpserver-cpp * r2d8e90a2b25d /modules/games/ (7 files in 2 dirs): Removed all reference to risk in the main branch. | 22:08 |
jphr | sorry, was doing that, i'll give it a go | 22:10 |
CIA-56 | jphr tpserver-cpp * rbe8dc74a4a2e /configure.ac: Forgot a reference to risk in configure.ac | 22:14 |
*** nash has quit IRC | 22:15 | |
jphr | mmkay, I think by some weird coincidence it actually does work without the signals flag | 22:15 |
llnz | so it does work? | 22:16 |
jphr | from what I see yes, just running make now | 22:17 |
jphr | yes it works, and runs | 22:17 |
llnz | cool | 22:17 |
jphr | I really appreciate all your help, and also want to apologize again for my git screw up | 22:18 |
llnz | don't worry about it | 22:18 |
jphr | thanks | 22:18 |
jphr | maybe we should put a note up in the "starting out with git" about being careful when working with branches, as cg-push and git push do not push to the same branch in some cases | 22:19 |
llnz | ok, that's a good idea | 22:19 |
CIA-56 | llnz tpserver-cpp-risk * r98972c4c5e34 /m4/ax_boost_signals.m4: Hopefully added test to automatically detect libboost_signals on OS X. | 22:19 |
CIA-56 | jphr tpserver-cpp-risk * rf975b1d2f251 /modules/games/ (7 files in 2 dirs): Removed all references to risk to clean up main branch. | 22:19 |
CIA-56 | jphr tpserver-cpp-risk * r2d8e90a2b25d /modules/games/ (7 files in 2 dirs): Removed all reference to risk in the main branch. | 22:19 |
CIA-56 | jphr tpserver-cpp-risk * rbe8dc74a4a2e /configure.ac: Forgot a reference to risk in configure.ac | 22:20 |
CIA-56 | jphr tpserver-cpp-risk * r9a985f3e07b6 / (configure.ac m4/ax_boost_signals.m4): Merge git://git.thousandparsec.net/git/tpserver-cpp | 22:20 |
jphr | thats weird | 22:20 |
jphr | oh IC, that was my branch, phew, thought i screwed up again lol, i'm on edge | 22:22 |
CIA-56 | jphr tpserver-cpp-risk * r58114422bb31 / (8 files in 3 dirs): | 22:27 |
CIA-56 | Readded risk references after merging main branch change to remove them | 22:27 |
CIA-56 | -This was done to fix a mistake I made by merging to main branch | 22:27 |
jphr | and that is that, besides a messy history, problem solved | 22:28 |
llnz | cool | 22:28 |
jphr | and now thanks to you I don't have to monkey around with a vm | 22:28 |
llnz | looks like I'll be doing a release in the next few days | 22:29 |
llnz | 0.5.1 | 22:29 |
llnz | ;_)OS X Support | 22:29 |
jphr | what sort of changes? HAHA | 22:29 |
llnz | :-) | 22:29 |
llnz | and TP04 Fail frame support | 22:29 |
llnz | and some refactoring | 22:29 |
llnz | and a few other things | 22:29 |
jphr | mm, ya, Any chance of making guile detection work better with fink? | 22:30 |
llnz | what's the matter with it? | 22:30 |
jphr | well it just seems like the boost thing, atm I have to add the flag --with-guile=/sw/share/guile/1.8/scripts/binoverride for things to work with guile (installed via fink) | 22:31 |
jphr | and I also have to export a bash variable | 22:31 |
jphr | not that I really care to much, but it is required for me to compile | 22:31 |
llnz | what's the bash variable? | 22:31 |
*** JLafont-laptop has joined #tp | 22:32 | |
jphr | mithro documented them on the wiki here: http://www.thousandparsec.net/wiki/Tpserver-cpp_Setup | 22:32 |
tpb | <http://ln-s.net/rVo> (at www.thousandparsec.net) | 22:32 |
jphr | export CPPFLAGS=-I/sw/include | 22:33 |
llnz | ah | 22:33 |
llnz | humm... | 22:33 |
llnz | so is guile.h in /sw/include ? | 22:33 |
jphr | i belive so, I'll check | 22:33 |
jphr | libguile.h is there | 22:34 |
llnz | ok, what does running guile-config compile | 22:34 |
llnz | ok, what does running "guile-config compile" produce | 22:34 |
llnz | i might be "/sw/share/guile/1.8/scripts/binoverride/guile-config compile" | 22:35 |
llnz | s/i/it/ | 22:35 |
jphr | yes | 22:35 |
jphr | -I/sw/include -D_THREAD_SAFE | 22:35 |
llnz | cool | 22:35 |
llnz | so it's really just looking in /sw/share/guile/*/scripts/binoverride for guile-config in tpserver-cpp | 22:36 |
llnz | libtprl I will look at later | 22:36 |
jphr | mmkay | 22:36 |
* llnz wonders if he should just add that to the path | 22:38 | |
CIA-56 | llnz tpserver-cpp * rb09b0533beb9 /configure.ac: Check for guile-config in the fink/OS X location. | 22:40 |
llnz | jphr: try that without "--with-guile=..." | 22:40 |
llnz | i might fail | 22:41 |
llnz | s/i/it/ | 22:41 |
jphr | what is "s/i/it/" btw? | 22:41 |
llnz | it's a search and replace (perl style), replaces "i" by "it" | 22:42 |
jphr | hecking for guile-config... no | 22:42 |
jphr | configure: WARNING: Cannot find Guile configuration script | 22:42 |
jphr | configure: error: Either MzScheme or Guile must be used. Please install mzscheme or guile. See ./configure --help if one is already installed. | 22:42 |
llnz | note that i'm lazy and it's wrong, because that creates "it mitght faitl" | 22:42 |
llnz | well.. it would if it had the g tag | 22:42 |
llnz | humm... ok | 22:42 |
jphr | lol | 22:43 |
CIA-56 | llnz tpserver-cpp * r5c60e1f0d858 /configure.ac: Don't be so smart, only check for guile 1.8, not * | 22:43 |
llnz | try that | 22:43 |
jphr | ok doing that now (sorry bout the delay) | 22:48 |
llnz | no prob, i'm doing other things too | 22:48 |
jphr | that works without guile :D | 22:49 |
jphr | i'll have to test with a session without those cppflags if you want? | 22:49 |
CIA-56 | llnz tpserver-cpp-risk * rb09b0533beb9 /configure.ac: Check for guile-config in the fink/OS X location. | 22:57 |
CIA-56 | llnz tpserver-cpp-risk * r5c60e1f0d858 /configure.ac: Don't be so smart, only check for guile 1.8, not * | 22:57 |
CIA-56 | jphr tpserver-cpp-risk * r7890b5843bdd /configure.ac: Merge git://git.thousandparsec.net/git/tpserver-cpp | 22:57 |
llnz | that would be a good idea | 23:03 |
jphr | running it without flag (and I don't think it was even on before) | 23:05 |
jphr | A ok | 23:07 |
llnz | cool | 23:18 |
* llnz goes back to asynchroning libtpproto-cpp | 23:18 | |
*** JLafont-laptop has quit IRC | 23:27 | |
*** JLafont-laptop has joined #tp | 23:46 | |
jphr | goodnight, thanks for the help llnz | 23:48 |
*** jphr has quit IRC | 23:49 | |
*** notjotham is now known as megafauna | 23:52 | |
*** megafauna is now known as jotham | 23:57 |
Generated by irclog2html.py 2.17.2 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!