{"push_id":2447301743,"size":493,"distinct_size":1,"ref":"refs/heads/strip","head":"3eb16576ac3fbbf737a021951bb0f3941cef5f69","before":"aa980a4cd54e968fadf392ce9ddee5c1ca5c38e7","commits":[{"sha":"d6532ae1d997a31884a67c51ec2bc75756242eed","author":{"name":"klarlund","email":"fed672ada9a102df77cd03e70f36f0e05d2764ff@gmail.com"},"message":"Initial submission @6805748, not fully baked yet.","distinct":false,"url":"https://api.github.com/repos/mgorny/distcc/commits/d6532ae1d997a31884a67c51ec2bc75756242eed"},{"sha":"a6339c99587c6b9a6cb967a67a0f38af72a76a7a","author":{"name":"fergus.henderson","email":"4788dfe5d3e6a2f88275157769cfb8143012eef1@users.noreply.github.com"},"message":"Fix a portability issue: compile error on 64-bit platform.","distinct":false,"url":"https://api.github.com/repos/mgorny/distcc/commits/a6339c99587c6b9a6cb967a67a0f38af72a76a7a"},{"sha":"bf506d9a8245dae50b2125ccfd636eff4bd9ea5f","author":{"name":"fergus.henderson","email":"4788dfe5d3e6a2f88275157769cfb8143012eef1@users.noreply.github.com"},"message":"Work around spurious gcc warning that was causing trouble with -Werror.","distinct":false,"url":"https://api.github.com/repos/mgorny/distcc/commits/bf506d9a8245dae50b2125ccfd636eff4bd9ea5f"},{"sha":"ed6e6b5924ef1724cd2ffdb0da18f4b226cf05e0","author":{"name":"fergus.henderson","email":"4788dfe5d3e6a2f88275157769cfb8143012eef1@users.noreply.github.com"},"message":"Fix typo.","distinct":false,"url":"https://api.github.com/repos/mgorny/distcc/commits/ed6e6b5924ef1724cd2ffdb0da18f4b226cf05e0"},{"sha":"4988c26f10e7dacfa4a91b3dda7fcd379a7068f4","author":{"name":"Craig Silverstein","email":"82fa2fa0b4e1a3dcdf3a852574aea04d09cb6dd7@khanacademy.org"},"message":"Integrate the following post-2.18.3 patches from the mainline\ndistcc sources (distcc--devel--2/mbp@sourcefrog.net--2004):\n\n\t% tla cat-log patch-160:\n\tSummary: note on .incbin from asm()\n\t% tla cat-log patch-161:\n\tSummary: args: -d must be local\n\t% tla cat-log patch-162:\n\tSummary: manpage correction from Frerich\n\t% tla cat-log patch-163:\n\tSummary: todo\n\t% tla cat-log patch-164:\n\tSummary: add note that the mDNS patch cannot be legally merged\n\t% tla cat-log patch-165:\n\tSummary: add hosts-from-dnsdomain patch from dan\n\t% tla cat-log patch-166:\n\tSummary: [patch] better checking for errors on connect()\n\nNote only two of these (patch-161 and patch-166) affect the\nsrc/ or test/ directories.\n\nTested via 'make maintainer-check'.","distinct":false,"url":"https://api.github.com/repos/mgorny/distcc/commits/4988c26f10e7dacfa4a91b3dda7fcd379a7068f4"},{"sha":"f11f1a7fbccd3bc875f55172b337b0c8a0fa9c7c","author":{"name":"Craig Silverstein","email":"82fa2fa0b4e1a3dcdf3a852574aea04d09cb6dd7@khanacademy.org"},"message":"Replace the sanity-check in run_all_autoconf.sh with a more accurate\none.\n\nReviewed by klarlund@google.com","distinct":false,"url":"https://api.github.com/repos/mgorny/distcc/commits/f11f1a7fbccd3bc875f55172b337b0c8a0fa9c7c"},{"sha":"7fd58a622398a5974aa0a4ecf653b3f774bc0176","author":{"name":"Craig Silverstein","email":"82fa2fa0b4e1a3dcdf3a852574aea04d09cb6dd7@khanacademy.org"},"message":"Integrate the following post-2.18.3 patches from the mainline\ndistcc sources (distcc--devel--2/mbp@sourcefrog.net--2004):\n\n        % tla cat-log patch-167:\n        Summary: - better autogen message\n        % tla cat-log patch-168:\n        Summary: use python2.4 if available\n        % tla cat-log patch-169:\n        Summary: bump version number\n        % tla cat-log patch-170:\n        Summary: return error on timeout in dcc_select_for_write\n        % tla cat-log patch-171:\n        Summary: doc\n        % tla cat-log patch-172:\n        Summary: doc\n        % tla cat-log patch-173:\n        Summary: [patch] cygwin improvements from Alex Besogonov\n        % tla cat-log patch-174:\n        Summary: update patch to fix up gdb line numbers\n        % tla cat-log patch-175:\n        Summary: [patch] update stale benchmark source URLS (Dongmin\n        Zhang)\n        % tla cat-log patch-176:\n        Summary: update benchmark project urls and md5s\n        % tla cat-log patch-177:\n        Summary: Update more benchmark project definitions\n        % tla cat-log patch-178:\n        Summary: set locale when running make maintainer-check\n\nNote only two of these (patch-170 and patch-173) affect non-comment\ncode in the src/ directory.  patch-173 introduced an \"unused variable\"\nwarning in tempfile.c when run in non-cygwin mode, which I fixed up\nseparate to the above patches.\n\nTested by running 'make maintainer-check'.\n\nReviewed by fergus@google.com","distinct":false,"url":"https://api.github.com/repos/mgorny/distcc/commits/7fd58a622398a5974aa0a4ecf653b3f774bc0176"},{"sha":"c6374143e3d0f520e263ceabfeba206f8f44114b","author":{"name":"Craig Silverstein","email":"82fa2fa0b4e1a3dcdf3a852574aea04d09cb6dd7@khanacademy.org"},"message":"Integrate the following post-2.18.3 patches from the mainline\ndistcc sources (distcc--devel--2/mbp@sourcefrog.net--2004):\n\n\t% tla cat-log patch-179:\n\tSummary: More details on error 110\n\t% tla cat-log patch-180:\n\tSummary: draft patch for substituting compiler command name\n\t% tla cat-log patch-181:\n\tSummary: fix error check in dcc_connect_by_add\n\t% tla cat-log patch-182:\n\tSummary: build fix for --as-needed\n\t% tla cat-log patch-183:\n\tSummary: ignore tags file\n\nNote only one of these (patch-181) affects code in the src/\ndirectory.\n\nTested by running 'make maintainer-check'.\n\nReviewed by fergus@google.com","distinct":false,"url":"https://api.github.com/repos/mgorny/distcc/commits/c6374143e3d0f520e263ceabfeba206f8f44114b"},{"sha":"0623f9de5d870a17e9df1f367165a5b598dbc30d","author":{"name":"Craig Silverstein","email":"82fa2fa0b4e1a3dcdf3a852574aea04d09cb6dd7@khanacademy.org"},"message":"Integrate the following post-bzr (post 2.18.3) patches -- all of them,\nso far -- from the mainline distcc sources\n(http://bazaar.launchpad.net/%7Embp/distcc/trunk/):\n\n        % bzr log -r2\n        message: Add more ignored files\n        % bzr log -r4\n        message: Locks taken through F_SETLK or lockf() must be\n          explicitly released, because closing the file does not do\n          so.  (Sascha Demetrio)\n\nr2 is a noop for us, since it just updates a .bzr config file (which\nwe may want to update in svn-land too, one day, but not for now).\n\nr3, not part of this CL, is the \"avahi\" patch\n(http://0pointer.de/public/distcc-avahi.patch).  It was imperfectly\napplied: the new files that are part of this patch were not added to\nthe bzr repository.  We're following up with the patch-applier to see\nif these files can be taken verbatim from the patch in the 0pointer\nwebsite.  We'll also have to audit this patch to make sure it works\nwith distcc-pump without needing any changes.  For those reasons,\nwe'll apply that patch in a separate change.  \n\nI've also manually updated ChangeLog, which is not automatically\nupdated by bzr the same way it is by arch.\n\nTested by running 'make maintainer-check'.\n\nReviewed by klarlund@google.com","distinct":false,"url":"https://api.github.com/repos/mgorny/distcc/commits/0623f9de5d870a17e9df1f367165a5b598dbc30d"},{"sha":"5f8c9c6936b774774dbc961aae10430f8d6fce3f","author":{"name":"fergus.henderson","email":"4788dfe5d3e6a2f88275157769cfb8143012eef1@users.noreply.github.com"},"message":"Change the version number from \"distcc 2.18.3-17gg1.pump20\" (ugh!)\nto \"distcc 3.0-prerelease1\".","distinct":false,"url":"https://api.github.com/repos/mgorny/distcc/commits/5f8c9c6936b774774dbc961aae10430f8d6fce3f"},{"sha":"e11cf84b89b5050fcee90d134572c6f41486183c","author":{"name":"Craig Silverstein","email":"82fa2fa0b4e1a3dcdf3a852574aea04d09cb6dd7@khanacademy.org"},"message":"Integrate the following post-bzr (post 2.18.3) patch from the mainline\ndistcc sources (http://bazaar.launchpad.net/%7Embp/distcc/trunk/):\n\n   % bzr log -r3\n   message: merge avahi patch from Lennart Poettering\n\n(This patch comes from http://0pointer.de/public/distcc-avahi.patch,\nwhich is the version of the patch I applied, since the one in the bzr\nrepository was missing the new files from the avahi patch.)\n\nI've also manually updated ChangeLog, which is not automatically\nupdated by bzr the same way it is by arch.\n\nI've also added a new m4 directory, including non-standard autoconf\nmacros that we use.  For now, it only includes ACX_PTHREAD (added by\nthe avahi patch) which I got from 0pointer.de.  See the notes at the\ntop of m4/acx_pthread.m4 for more details.\n\nI removed the change to Makefile.in that added in distccmon-gnome.1.\nThis file is not actually added in as part of this patch (it seems to\nbe part of a separate patch, at\nhttp://patches.ubuntu.com/d/distcc/extracted/02_distccmongnome_man.dpatch),\nand may have gotten in here by accident.\n\nTested by running 'make maintainer-check'.  However, I did not test\nwith avahi installed, so I don't know how well that works.\n\nReviewed by fergus@google.com and klarlund@google.com","distinct":false,"url":"https://api.github.com/repos/mgorny/distcc/commits/e11cf84b89b5050fcee90d134572c6f41486183c"},{"sha":"af3ed3cd171768a8002ffc27f7a27dde25b8f4d0","author":{"name":"Craig Silverstein","email":"82fa2fa0b4e1a3dcdf3a852574aea04d09cb6dd7@khanacademy.org"},"message":"Take these human-readable files and normalize their content and\nlocation:\n   README                     Our blurp, tooting our horn\n   INSTALL                    The run_all_autoconf and friends incantations\n   COPYING                    GPL 2.0 license\n   distcc/README              Martin's blurp\n   distcc/INSTALL             Also: more on masquerading, host lists,\n   distcc/COPYING             GPL 2.0 license\n   distcc/NEWS                Recently updated\n   distcc/AUTHORS             Martin Pool\n   distcc/README.packaging    Various advice (version numbering etc)\n   distcc/TODO                A very long list (not updated)\n   distcc/ChangeLog\t      All changes under arch and under bzr\n   distcc/ChangeLog.old\t      All changes from before arch.\n\nNow all live in the top-level directory.  This is the first step\ntowards our eventual goal of getting rid of the second-level distcc\nand include_server directories, and just having everything under one\ntop-level directory.  We're all part of the same project now!\n\nHere's how I merged and updated content:\n\n. README became README.pump.  It was slightly edited for clarity.  (I\n  also redid all the line-wrapping, which makes diff-ing\n  difficult. :-( )  distcc/README became README, with a small amount\n  of text added to describe 'pump' mode, and point to README.pump.\n\n. distcc/NEWS became NEWS.  pump functionality was added (a new\n  \"distcc-3.0\" entry).  I also added all new features and bug-fixes\n  since we moved from arch to bzr.  It looks like NEWS was\n  well-maintained before the move to bzr, so this might be pretty\n  complete.  There may be some more pump-developed bugfixes we need to\n  add, though.\n\n. I got rid of distcc/COPYING.  Now COPYING is the only license in\n  this directory.  This file was not changed.  It remains the GPL 2.0\n  license.\n\n. distcc/AUTHORS became AUTHORS.  I changed Martin to maintainer\n  emeritus.  I added the Google authors as authors of the \"pump\"\n  functionality, and current maintainers.  I set the Google email\n  address to be distcc@googlegroups.com, which is a new group I've set\n  up to be the clearinghouse for distcc discussions.\n\n. distcc/README.packaging became README.packaging.  It was not\n  otherwise changed.\n\n. distcc/TODO became TODO.  It was not otherwise changed, except I\n  added that folks should look for FIXMEs in source files, not just\n  TODOs.\n\n. I merged INSTALL and distcc/INSTALL (in that order).  I rearranged\n  the text a little bit to remove redundancy (both talked about\n  running 'configure'), but did not make any contentful changes.\n\n. I merged distcc/ChangeLog and distcc/ChangeLog.old to have a single\n  changelog again going all the way to 2002.  Comments now separate\n  the various version control systems used.  (svn is #4!)  The single\n  ChangeLog file now lives in the top-level directory.","distinct":false,"url":"https://api.github.com/repos/mgorny/distcc/commits/af3ed3cd171768a8002ffc27f7a27dde25b8f4d0"},{"sha":"63618dfd08fb30d47e8841544752c8009448abe1","author":{"name":"Craig Silverstein","email":"82fa2fa0b4e1a3dcdf3a852574aea04d09cb6dd7@khanacademy.org"},"message":"I meant to delete this as part of my last commit, but apparently\nneglected to...","distinct":false,"url":"https://api.github.com/repos/mgorny/distcc/commits/63618dfd08fb30d47e8841544752c8009448abe1"},{"sha":"bba7dcbaf58e3882627b8e7f8976fd04cbbdb15c","author":{"name":"fergus.henderson","email":"4788dfe5d3e6a2f88275157769cfb8143012eef1@users.noreply.github.com"},"message":"In the rule for 'make pump-check', set DISTCC_HOSTS, so that\n'pump' won't complain that it isn't set.","distinct":false,"url":"https://api.github.com/repos/mgorny/distcc/commits/bba7dcbaf58e3882627b8e7f8976fd04cbbdb15c"},{"sha":"6dcf5b5d62ee5e88f8b11e03d5af05878111b8a2","author":{"name":"fergus.henderson","email":"4788dfe5d3e6a2f88275157769cfb8143012eef1@users.noreply.github.com"},"message":"Update README.pump to better describe performance on small clusters.","distinct":false,"url":"https://api.github.com/repos/mgorny/distcc/commits/6dcf5b5d62ee5e88f8b11e03d5af05878111b8a2"},{"sha":"0a38eace37b20a663b235fb20107829e22fbeb43","author":{"name":"Craig Silverstein","email":"82fa2fa0b4e1a3dcdf3a852574aea04d09cb6dd7@khanacademy.org"},"message":"Merge configure.ac, distcc/configure.ac, and\ninclude_server/configure.ac into a single, top-level configure.ac\nscript.  Likewise with the three Makefile.in scripts.  Now one config\nfile at the top level controls everything.\n\nI had to rewrite quite a bit of code to account for the new level-up.\nIn particular, I had to add \"distcc/\" in front of many things in order\nto refer to the same files I used to refer to when the\nconfigure.ac/Makefile.in text lived in the distcc/ directory rather\nthan the top-level directory.  Likewise (though to a lesser extent)\nfor include_server.\n\nI also had to do a bit of merge work.  Typically I'd leave the\noriginally-distcc-directory content as close to the original as\npossible, and then try to put in the include_server directory stuff.\n\nMost of the top-level configure.ac and Makefile.in could go away,\nsince they were glue before.  I also could get rid of other top-level\nhelper scripts that were used for the glue, such as version.sh.\n\nI also fixed a number of typos and other bugs:\n\nMakefile.in:\n1) Removed obsolete CVS comment (we're 3 source-control systems past\n   that now!)\n\n2) distcc/Makefile.in was using top_builddir without importing it from\n   the configure script.\n\n3) Add zeroconf.h to HEADERS, which is needed for 'make dist'.  I also\n   added all the include_server files to 'make dist'.\n\n4) \"make dist\" was passing 'h' (\"no symlinks\") to tar.  This does not\n   work with the include_server test-suite, which includes symlinks.\n   I verified no other part of the distribution uses symlinks.\n   Removed the h.\n\n5) \"make dist\" was missing a lot of stuff (including almost all the\n   include-server files).  Updated it to get it all now.  Likewise,\n   updated \"make clean\" and its cousins to be more precise.  Also made\n   \"make distcheck\" more careful in checking that kind of thing.\n\n6) Declared more phony targets .PHONY.\n\n7) The include-server build commands do a lot of 'cd'-ing (since\n   setup.py requires it), and then using make variables that might\n   store relative directory paths.  I now go through some hoops to\n   make those directory paths absolute before the cd.\n\n8) \"make pump-check\" was not setting the path, so it was using the\n   installed distcc instead of the local one in the client.  Fixed\n   that, and added a new target, \"make pump-installcheck\", to use the\n   installed distcc instead (parallel to the maintainer-check and\n   maintainer-installcheck targets).\n\nconfigure.ac:\n1) popt test was using $srcdir rather than required ${srcdir}, and\n   thus was always getting the empty string.  (Luckily, srcdir is\n   usually \".\", and the empty string is usually equivalent.)\n   Likewise when setting CPPFLAGS, which again didn't matter because\n   it turns out the relevant code was redundant with what autoconf\n   already does automatically.\n\n2) A merge error: apparently the avahi check was added twice.  Get rid\n   of the second one.\n\n3) Was using obsolete AC_OUTPUT format.  Use AC_CONFIG_FILES instead.\n\n4) Added pkg.m4 to the m4/ directory.  Before it only lived in\n   autoconf.m4.  But my system, at least, doesn't have it.\n\n5) include-server requires python2.4, so remove checks for earlier\n   pythons.\n\nautogen.sh:\n1) Added aclocal call.  I think it was a bug that it was left out\n   before.\n\npump.in:\n1) Fixed it to notice when it can't find the .so file it needs.\n\nI also modified INSTALL to point to the new file locations, and the\nnew instructions to run them (eg no more run_all_autoconf.sh).\n\nDespite all these bugfixes, I made the minimal changes possible to get\nthings to work.  I marked with \"TODO\" further improvements I'd like to\nmake later.\n\nOne particular TODO is that I had to rename the \"distcc\" target -- the\nmain executable -- because it conflicts with the existing distcc\ndirectory.  This is a temporary breakage which will be fixed in the\nnext submit after this one, where I move the subdirs under distcc to\nthe top level, getting rid of the artificial extra directory\nintroduced.\n\nTested by running 'make maintainer-check', 'make distcheck', and 'make\npump-check' on my local machine, which passed.  I've not tested all\nthe various configurations and options (including using avahi, using\nthe library popt library, building without python, etc).  I've also\nnot tried 'make benchmark'.\n\nReviewed by klarlund@google.com and fergus@google.com","distinct":false,"url":"https://api.github.com/repos/mgorny/distcc/commits/0a38eace37b20a663b235fb20107829e22fbeb43"},{"sha":"596cf4e2f019a766965ad0566495c56b7d295fe4","author":{"name":"Craig Silverstein","email":"82fa2fa0b4e1a3dcdf3a852574aea04d09cb6dd7@khanacademy.org"},"message":"The first step of moving everything in the distcc directory to the top\nlevel.  I'm doing this in two stages, because I don't understand svn\nenough to be confident to do it in one.  This first stage just copies\nall the files from distcc/FOO to FOO.  Now there are two copies of\neach file under distcc; the Makefile/etc uses the one in distcc and\nignores the one at the top level.\n\nThe next commit will delete everything under distcc, and rewrite the\nMakefile/etc to use the top-level versions instead.","distinct":false,"url":"https://api.github.com/repos/mgorny/distcc/commits/596cf4e2f019a766965ad0566495c56b7d295fe4"},{"sha":"b54c5dec0997a0ccf84b7c87383c471178e9ff16","author":{"name":"Craig Silverstein","email":"82fa2fa0b4e1a3dcdf3a852574aea04d09cb6dd7@khanacademy.org"},"message":"The second part of my change to hoist everything in the distcc/\ndirectory up to the top level: delete the distcc directory (I already\ncopied it all to the top level in my last commit).\n\nThis requires changing all files that refer to distcc/FOO to refer\ndirectly to FOO instead.  Mostly this is Makefile.in and setup.py, but\nthere are a few other changes in scripts that have to hard-code paths,\nlike configure.ac and pump.in.  Also, several files changed their\ncomments to refer to the new location, which isn't strictly necessary\nbut I did anyway.\n\nThe only other change I made was to get rid of the hack I had put in\nbefore, which renamed distcc to distcc-bin.  I had needed to do that\nbefore, temporarily, because \"distcc\" was already the name of a\ndirectory, and couldn't also be the name of a binary.  Now that the\ndistcc directory is going away, I can rename the target back to\ndistcc.\n\nTested by running './autogen; ./configure; make maintainer-check'.\nI also ran 'make pump-check' and 'make distcheck'.\n\nTo be reviewed (post-facto) by klarlund@google.com and fergus@google.com","distinct":false,"url":"https://api.github.com/repos/mgorny/distcc/commits/b54c5dec0997a0ccf84b7c87383c471178e9ff16"},{"sha":"ab4908e16c9569e203a51140d2dafa7fe6e63050","author":{"name":"klarlund","email":"fed672ada9a102df77cd03e70f36f0e05d2764ff@gmail.com"},"message":"Fix up pump.in:\n\n  - Rename DISTCC_PUMP_LOCATION because there is now no distinct such entity.\n\n  - Comment 'return 0'.\n\n  - Fix logic in Main so that script aborts when include server not started.\n\n  - Add missing line: include_server_started_successfully=0.","distinct":false,"url":"https://api.github.com/repos/mgorny/distcc/commits/ab4908e16c9569e203a51140d2dafa7fe6e63050"},{"sha":"bcd9b9eb39326213e8c66eaded4ff3bd9107601e","author":{"name":"Craig Silverstein","email":"82fa2fa0b4e1a3dcdf3a852574aea04d09cb6dd7@khanacademy.org"},"message":"Added some Google-branch changes to the ChangeLog file, now that we've\nintegrated them back into the main branch in preparation for distcc\n3.0.  These messages were taken from the rpm.spec ChangeLog, where\nthey had been living before.  I can't say that it's a complete list of\ngoogle-branch patches, but it's a good started.\n\nReviewed by fergus@google.com","distinct":false,"url":"https://api.github.com/repos/mgorny/distcc/commits/bcd9b9eb39326213e8c66eaded4ff3bd9107601e"}]}
{"actor":{"display_login":"mgorny"}}