| 02:01.51 | *** join/#bzflag I_Died_Once (~I_Died_On@unaffiliated/idiedonce/x-1828535) |
| 03:31.02 | *** join/#bzflag Shuist (~Shuist@ppp203-122-213-220.static.internode.on.net) |
| 03:41.52 | *** join/#bzflag TD-Linux (~Thomas@about/essy/indecisive/TD-Linux) |
| 05:20.25 | *** part/#bzflag BulletCatcher (~bc@bzflag/developer/BulletCatcher) |
| 05:47.28 | *** join/#bzflag BulletCatcher (~bc@bzflag/developer/BulletCatcher) |
| 05:47.28 | *** mode/#bzflag [+v BulletCatcher] by ChanServ |
| 11:02.25 | *** join/#bzflag jnoob22 (~jnoob@unaffiliated/jnoob22) |
| 13:50.04 | *** join/#bzflag nadir (uid134094@gateway/web/irccloud.com/x-nqxibfudqzxdyoip) |
| 13:56.26 | macsforme | BulletCatcher: so would you be more open to something like Cmake, where the packages are more up-to-date on linux? and do you have thoughts on packaging bzflag as a container on linux instead? |
| 15:20.14 | blast007 | s/are more up-to-date/exist/ |
| 15:23.56 | blast007 | JeffM's PR #68 that adds visual studio filters also adds a binary airspawn.aps file and a resource.h. And I have changes that add the extra files (aside from the binary file and resource.h) to the various Makefile.am files. What is the best way to handle that? I would not want the airspawn.aps or resource.h to exist in our repo. So would that be a case for a 'squash and merge' after he removes those? |
| 15:24.14 | blast007 | and should I just attach a diff that updates the Makefile.am files? |
| 17:20.14 | JeffM | oh that should not have those |
| 17:20.22 | JeffM | plugins should not need reses |
| 17:20.38 | JeffM | that was probalby the first proejct I updated |
| 17:22.12 | blast007 | http://static.bzexcess.com/filters.diff <-- that's the patch that updates the Makefile.am files |
| 17:22.59 | blast007 | there are also a handful of plugins not part of fullbuild (SAMPLE_PLUGIN, pushstats, and serverSidePlayerSample) that didn't get filters |
| 17:23.11 | JeffM | k |
| 17:24.02 | BulletCatcher | My preferred way to keep those unwanted files out of the bzflag repo is to rebase the PR branch appropriately so we can merge it without squashing. |
| 17:24.32 | JeffM | sure, I'll fix all that in my branch |
| 17:24.47 | JeffM | resource |
| 17:24.52 | JeffM | bahh wrong window |
| 17:28.13 | BulletCatcher | I don't necessarily expect pull requests to be complete (in this case that means including the necessary changes to all of the build systems) when we accept and merge them. |
| 17:28.15 | BulletCatcher | If blast007 has does the work to update the Makefile.am files, he should commit it himself and take credit for the work. |
| 17:28.47 | JeffM | I think it's reasonable to ask if the PR author is willing to do some of the work. |
| 17:29.12 | JeffM | like the projects I missed |
| 17:29.27 | JeffM | then have him add the makefile patch and take credit for that |
| 17:31.14 | BulletCatcher | Not everyone has the expertise and/or resources to make a complete change by themself, and we can use teamwork(!) to get the desired final result. |
| 17:31.52 | BulletCatcher | This applies as much to playing BZFlag as it does to development. :-) |
| 17:33.08 | JeffM | yes |
| 17:33.25 | JeffM | just the other day was saying how someone making a change for one OS would not always make the change for the other OSs :) |
| 17:33.43 | BulletCatcher | yup |
| 17:33.49 | JeffM | for the missing projects, I don't mind doing them, there are actualy additional changes I want/need to make |
| 17:40.49 | JeffM | so I updated my branch, JeffM2501:2.4_MSVC_Filters, do I need to rebase it to bzflag:2.4 ? |
| 17:44.15 | BulletCatcher | That's probably the easiest way to ensure that there are no merge conflicts at this time. |
| 17:44.21 | BulletCatcher | Are the commits that include the unwanted files still somwhere in the middle of the branch? |
| 17:44.30 | JeffM | yeah |
| 17:44.52 | JeffM | maybe |
| 17:45.46 | BulletCatcher | If so, go back to a commit before them, start a new branch, and cherry-pick the commits after. |
| 17:46.23 | JeffM | it was my first commit, so basicly do it all over again |
| 17:47.18 | BulletCatcher | 1. Start a new branch. 2. Redo that first commit without the unwanted files. 3. cherry-pick the rest of the commits. |
| 17:47.39 | JeffM | thats a huge number of files for the first commit |
| 17:48.55 | BulletCatcher | Git can let you create that first commit in an un-checked-in state so you can tweak it. |
| 17:50.50 | BulletCatcher | This kind of capability is the payoff for the SVN->Git migration effort. |
| 18:05.22 | *** join/#bzflag BZnotify (~BZnotify@192.30.252.40) |
| 18:05.22 | BZnotify | [13bzflag] 15JeffM2501 closed pull request #68: Update VC14 projects with reasonable default filters (folders) (062.4...062.4_MSVC_Filters) 02https://git.io/vDYVE |
| 18:05.22 | *** part/#bzflag BZnotify (~BZnotify@192.30.252.40) |
| 18:06.14 | *** join/#bzflag BZnotify (~BZnotify@192.30.252.40) |
| 18:06.14 | BZnotify | [13bzflag] 15JeffM2501 opened pull request #69: Update VC14 projects with reasonable default filters (folders) [this time with feeling] (062.4...062.4_MSVC_Filters_2) 02https://git.io/vDCsY |
| 18:06.14 | *** part/#bzflag BZnotify (~BZnotify@192.30.252.40) |
| 18:06.25 | JeffM | there ya go, 69 dude! |
| 18:06.58 | BulletCatcher | Hey, hey, hey. This is supposed to be a family channel. |
| 18:07.13 | JeffM | just cloned another branch, copied all the files from my current other branch, and then commited it to a new branch :) there was no need to keep all the sub comits in my change |
| 18:07.23 | JeffM | bill and ted is good famialy fun :) |
| 18:09.25 | BulletCatcher | "Be excellent to each other" is an ... um ... excellent philosophy. |
| 18:10.30 | JeffM | it follows wheatons law |
| 18:38.19 | BulletCatcher | macsforme: I have spent a couple of hours experimenting with CMake for a personal project. |
| 18:38.24 | BulletCatcher | Just like autotools and Premake, it has its own horrid language that must be learned in order to use it successfully. |
| 18:38.29 | BulletCatcher | The documentation suggests that CMake is extensible enough to meet our requrements for BZFlag, but I am not far enough into it to know for sure. |
| 18:38.35 | BulletCatcher | If the distros we support already include suitable CMake versions then it may be practical at this time to replace all of our current build systems with it. |
| 18:47.03 | BulletCatcher | Packaging BZFlag as a container for Linux, which I assume means that *all* dependencies (e.g., libc) would be included, would be an adventure. |
| 18:47.08 | BulletCatcher | It may be the easiest way for us to work around Debian's "no upgrades" policy for older distro releases if any of us choose to support them. |
| 18:47.13 | BulletCatcher | Doing that would get us experience with it, after which we could consider whether we would want to drop the per-distro packaging support we currently have. |
| 19:48.04 | *** join/#bzflag Zehra (~Zehra@unaffiliated/zehra) |
| 20:26.31 | *** join/#bzflag spldart (~spldart@bzflag/contributor/spldart) |
| 20:26.31 | *** mode/#bzflag [+v spldart] by ChanServ |
| 20:32.23 | *** join/#bzflag BZnotify (~BZnotify@192.30.252.42) |
| 20:32.23 | BZnotify | [13bzflag] 15blast007 pushed 2 new commits to 062.4: 02https://git.io/vDC8n |
| 20:32.23 | BZnotify | 13bzflag/062.4 1478ed273 15JeffM2501: add filters to all vc project files.... |
| 20:32.23 | BZnotify | 13bzflag/062.4 14834442a 15blast007: Merge pull request #69 from JeffM2501/2.4_MSVC_Filters_2... |
| 20:32.23 | *** part/#bzflag BZnotify (~BZnotify@192.30.252.42) |
| 20:33.59 | JeffM | BulletCatcher: what is the Debian "no upgrades" policy? |
| 20:43.52 | blast007 | the 'stable' part refers to the versions more than the stability of the software |
| 20:44.50 | blast007 | so whenever they release a new major Debian, the versions of the software will remain the same (with few exceptions) untilt the next major release |
| 20:44.52 | JeffM | so "use this old version until you update the OS"? |
| 20:45.06 | blast007 | yup |
| 20:45.15 | JeffM | aka "don't play modern games" |
| 20:45.43 | blast007 | there are backports that can bring newer versions to the stable release - basically, compiling the source from testing against the stable distribution |
| 20:50.07 | spldart | Wow! just updated my bzflag and git was quite 'verbose' Something big happen? |
| 20:50.29 | JeffM | somethign was actualy changed |
| 20:51.29 | spldart | Well.. I'm excited XD |
| 20:52.03 | *** join/#bzflag BZnotify (~BZnotify@192.30.252.42) |
| 20:52.03 | BZnotify | [13bzflag] 15blast007 pushed 1 new commit to 062.4: 02https://git.io/vDC4w |
| 20:52.03 | BZnotify | 13bzflag/062.4 144426f76 15Scott Wichser: Include the new Visual Studio filters in the autotools build system. |
| 20:52.03 | *** part/#bzflag BZnotify (~BZnotify@192.30.252.42) |
| 20:52.05 | blast007 | spldart: 'git log' ;) |
| 20:53.16 | spldart | I will in a sec. I just finished a build and I wanna test the client first ;-] |
| 20:54.12 | JeffM | most of the changes were for windows build files |
| 20:57.39 | spldart | Just noticed that after I ran the git log blast suggested :) |
| 20:58.01 | spldart | Still slightly exciting in my boring life |
| 20:58.03 | spldart | heh |
| 20:58.13 | *** join/#bzflag BZnotify (~BZnotify@192.30.252.42) |
| 20:58.13 | BZnotify | [13bzflag] 15JeffM2501 opened pull request #70: ADD API access to handicap system (062.4...062.4_handiman_api) 02https://git.io/vDCBf |
| 20:58.13 | *** part/#bzflag BZnotify (~BZnotify@192.30.252.42) |
| 22:22.48 | *** join/#bzflag Void7 (uid197664@gateway/web/irccloud.com/x-mnmzfucycomzhfzw) |
| 23:08.15 | macsforme | Lua isn't a "horrid language" :P |
| 23:09.20 | macsforme | but it may require the developer to learn some syntax of a new language, point taken |
| 23:17.31 | BulletCatcher | One horrible CMake example is having to write |
| 23:17.36 | BulletCatcher | string (REPLACE "/" "_" x ${y}) |
| 23:17.38 | BulletCatcher | to replace every occurrence of "/" with "_" in string variable y and store the result in variable x. |
| 23:20.04 | BulletCatcher | Autoconf is just as awful. |
| 23:42.05 | the_map | reminds me of TCL |
| 23:42.10 | the_map | allejo: ^ |