Re: [PROPOSAL] Official roadmap, and merge procedure
Heya, I'm in favour of the proposal. I recognise that there are a few things that need to be refined, but I think what we have is good enough to get going and refine as we go along. With QA for example, it is up to the release master to judge whether a release is good to go. If the community QA doesn't provide the required results, the release master just won't do a release and thus, we hope, encourage more QA :) Down the road, we might be able to formalise QA more, so we have better strict criteria when a release can go. Ultimately though, this is the release master's call. In addition, I'd like to spend some time on automating some of the tasks so that e.g. feature branches can be run through CI, so we have more transparency into the state of a particular branch during development, but I don't think that is a prerequisite to get this going :) Cheers Jan -- On Jun 16, 2012, at 21:49 , Marco Monteiro wrote: On 16 June 2012 17:45, Noah Slater nsla...@tumbolia.org wrote: 1. We'd like to proposed formal time-based releases http://wiki.apache.org/couchdb/Roadmap_Process This is a big improvement, but... :) If the QA is good enough, it would be a little better to have feature releases every month or two, support only the latest or two latest feature releases before a breaking change (but not support anything older than a year) and have a new release between feature releases for every bugfix or two. Every feature merge would be done on the first one or two weeks, the remaining time being used to test before the release. If QA is good enough, there will be almost no bugfix release. Anyone wanting to upgrade to fix any issue would always be using the latest feature release (with any bugfix) for it's major version number. This would be much easier to support leaving much more time to make QA good enough. Cheers, Marco
Re: So, how do we get the Mac binary on the home page?
Hans, this is great, can you provide md5/sha1/openpgp hashes for the file? Cheers Jan -- On Jun 14, 2012, at 22:54 , Hans J Schroeder wrote: Hi, The fixed version is now online at: https://github.com/downloads/cloudnode/couchdbx-app/CouchDB%20Server-1.2.0-20120614.zip It should now work for all Mac OS X Versions = 10.6 32bit + 64bit - Hans On Jun 13, 2012, at 2:11 PM, Jan Lehnardt wrote: Hans, any news? :) On Jun 10, 2012, at 19:48 , Jan Lehnardt wrote: On Jun 10, 2012, at 12:38 , Hans J Schroeder wrote: Hi, I have checked how the others (Membase, CouchBase) are doing it and suggest the following disk layout: Data Dir / Application Support Folder = ~/Library/Application Support/CouchDB/etc couchdb-server.ini Bikeshed alert: I'd mirror what the CouchDB source distro does: ~/Library/Application Support/CouchDB/etc/default.d/ ~/Library/Application Support/CouchDB/etc/default.ini ~/Library/Application Support/CouchDB/etc/local.d/ ~/Library/Application Support/CouchDB/etc/local.ini I'd be more than happy to ship whatever is there today and fix this down the road. If it is easy to fix (see below), we may as well do that too. ~/Library/Application Support/CouchDB/var/run/couchdb couch.uri +1 ~/Library/Application Support/CouchDB/var/lib/couchdb views dbs +1 * * * We may want to revisit this based on a close reading of the AppStore submission guidelines, when we get to that, but until then, I believe that is fine. Logs ~/Library/Logs couchdb-server.log I'd drop -server and go with just couchdb.log Is this ok? - Hans P.S. I have also found the incompatibility between OS X versions 10.6.8 - 10.7.2 and the later ones. I guess we can serve all with one binary Great news! :) If you want to/can compile a new one (and if the paths above are easy to adjust), then I'd say let's get that right and then ship. And then improve on all the other things that have been mentioned in this thread. Thanks all for pushing this along! :) Cheers Jan -- On Jun 8, 2012, at 8:54 PM, Dave Cottlehuber wrote: On 8 June 2012 16:40, Jan Lehnardt j...@apache.org wrote: On Jun 8, 2012, at 16:31 , Hans J Schroeder wrote: Hi Jan, Can you specify what systems should use which versions, so we can label them correctly on the website? For Mac OS X 10.6.8 to 10.7.2: https://github.com/downloads/cloudnode/couchdbx-app/CouchDB%20Server-1.2.0.zip For Mac OS X 10.7.3 and later https://github.com/downloads/cloudnode/couchdbx-app/CouchDB%20Server-1.2.0-OS%20X%2010.7.3.zip Thanks Hans! With this, I think we are good to go to put this on the website. Anyone disagreeing? :) Cheers Jan Some things, files are scattered across various places. #1 dbs views are in ~/Library/Application Support/CouchDBServer/ #2 there's no local.ini as such, its in ~/Library/Preferences/couchdb-server.ini #3 couch.log is in $APPROOT/Contents/Resources/couchdbx-core/var/log/couch.log #4 couch.uri is in $APPROOT/Contents/Resources/couchdbx-core/var/run/couch.uri If its not hard to fix #3 and #4 we should do that first. This means CouchDB.app could run read-only in /Applications, which it doesn't atm. #1 and #2 make sense, but might not be immediately obvious. They could wait, its more about documenting somewhere. A+ Dave
Re: Docs, second try
Same repo, some news: - updated NOTICE - added minimal css styling to make it not look ass - made make distcheck pass* (wooo!) - linked the per-chapter build in Futon instead of the full-page.** As far as I can see, this is good to go into master. There's plenty of room for improvement: - better integration into Futon - more approachable ToC (expandable sub-levels, e.g.) - better styling - more docs :) Let us know if you want to help out with this! Cheers Jan -- * Noah, could you have a look at my license.skip commit and tell me I'm not doing anything fishy? https://github.com/janl/couchdb/commit/56b664854209e00d0ff549352970abd269adb24b ** The last commit I had to rebase to keep the history nice, that means the branch had to be pushed with -f. This is only relevant if you have checked out the branch in the past and made edits to it. On Jun 11, 2012, at 22:05 , Jan Lehnardt wrote: Hey all, remember that big commit I made to a new docs branch with all the .jar files in it and whatnot? Well, I've cleaned it up and pushed it to GitHub: https://github.com/janl/couchdb/tree/docs The README states all prerequisites. I have ripped all the .jar files out of the repo and put them in a .tgz up on: http://people.apache.org/~jan/couchdb/couchdb-doc-jars.tgz To build the docs go to share/docs and run $ COUCHDB_DOC_JAR_DIR=/path/to/doc/jars make docs This is the easiest I could think of for pushing this forward. I also went through all the other resources in the share/docs directory and double checked the licensing on all items and couldn't find anything incompatible. I've still to update the NOTICE file to make this land on ASF infrastructure, but I think we are in a good position. Please check out the branch and give us any feedback, I'd like to finally finally get this merged soon :) Cheers Jan --
Re: Docs, second try
On Jun 17, 2012, at 12:12 , Jan Lehnardt wrote: Same repo, some news: - updated NOTICE - added minimal css styling to make it not look ass - made make distcheck pass* (wooo!) - linked the per-chapter build in Futon instead of the full-page.** As far as I can see, this is good to go into master. Well, one more thing™: I need to hook this up to `make install`. I'll try and do this right away. Cheers Jan -- There's plenty of room for improvement: - better integration into Futon - more approachable ToC (expandable sub-levels, e.g.) - better styling - more docs :) Let us know if you want to help out with this! Cheers Jan -- * Noah, could you have a look at my license.skip commit and tell me I'm not doing anything fishy? https://github.com/janl/couchdb/commit/56b664854209e00d0ff549352970abd269adb24b ** The last commit I had to rebase to keep the history nice, that means the branch had to be pushed with -f. This is only relevant if you have checked out the branch in the past and made edits to it. On Jun 11, 2012, at 22:05 , Jan Lehnardt wrote: Hey all, remember that big commit I made to a new docs branch with all the .jar files in it and whatnot? Well, I've cleaned it up and pushed it to GitHub: https://github.com/janl/couchdb/tree/docs The README states all prerequisites. I have ripped all the .jar files out of the repo and put them in a .tgz up on: http://people.apache.org/~jan/couchdb/couchdb-doc-jars.tgz To build the docs go to share/docs and run $ COUCHDB_DOC_JAR_DIR=/path/to/doc/jars make docs This is the easiest I could think of for pushing this forward. I also went through all the other resources in the share/docs directory and double checked the licensing on all items and couldn't find anything incompatible. I've still to update the NOTICE file to make this land on ASF infrastructure, but I think we are in a good position. Please check out the branch and give us any feedback, I'd like to finally finally get this merged soon :) Cheers Jan --
Re: So, how do we get the Mac binary on the home page?
Hi Jan, md5: 2730b996ae2b23a7d2e3099f2e4861cb CouchDB Server-1.2.0-20120614.zip sha: 43e97359f6fda68dac28490a4e5d9d7ad03672fa *CouchDB Server-1.2.0-20120614.zip I am not sure about openpgp. I have no key. Should I generate an own key pair? - Hans On Jun 17, 2012, at 11:57 AM, Jan Lehnardt wrote: Hans, this is great, can you provide md5/sha1/openpgp hashes for the file? Cheers Jan -- On Jun 14, 2012, at 22:54 , Hans J Schroeder wrote: Hi, The fixed version is now online at: https://github.com/downloads/cloudnode/couchdbx-app/CouchDB%20Server-1.2.0-20120614.zip It should now work for all Mac OS X Versions = 10.6 32bit + 64bit - Hans On Jun 13, 2012, at 2:11 PM, Jan Lehnardt wrote: Hans, any news? :) On Jun 10, 2012, at 19:48 , Jan Lehnardt wrote: On Jun 10, 2012, at 12:38 , Hans J Schroeder wrote: Hi, I have checked how the others (Membase, CouchBase) are doing it and suggest the following disk layout: Data Dir / Application Support Folder = ~/Library/Application Support/CouchDB/etc couchdb-server.ini Bikeshed alert: I'd mirror what the CouchDB source distro does: ~/Library/Application Support/CouchDB/etc/default.d/ ~/Library/Application Support/CouchDB/etc/default.ini ~/Library/Application Support/CouchDB/etc/local.d/ ~/Library/Application Support/CouchDB/etc/local.ini I'd be more than happy to ship whatever is there today and fix this down the road. If it is easy to fix (see below), we may as well do that too. ~/Library/Application Support/CouchDB/var/run/couchdb couch.uri +1 ~/Library/Application Support/CouchDB/var/lib/couchdb views dbs +1 * * * We may want to revisit this based on a close reading of the AppStore submission guidelines, when we get to that, but until then, I believe that is fine. Logs ~/Library/Logs couchdb-server.log I'd drop -server and go with just couchdb.log Is this ok? - Hans P.S. I have also found the incompatibility between OS X versions 10.6.8 - 10.7.2 and the later ones. I guess we can serve all with one binary Great news! :) If you want to/can compile a new one (and if the paths above are easy to adjust), then I'd say let's get that right and then ship. And then improve on all the other things that have been mentioned in this thread. Thanks all for pushing this along! :) Cheers Jan -- On Jun 8, 2012, at 8:54 PM, Dave Cottlehuber wrote: On 8 June 2012 16:40, Jan Lehnardt j...@apache.org wrote: On Jun 8, 2012, at 16:31 , Hans J Schroeder wrote: Hi Jan, Can you specify what systems should use which versions, so we can label them correctly on the website? For Mac OS X 10.6.8 to 10.7.2: https://github.com/downloads/cloudnode/couchdbx-app/CouchDB%20Server-1.2.0.zip For Mac OS X 10.7.3 and later https://github.com/downloads/cloudnode/couchdbx-app/CouchDB%20Server-1.2.0-OS%20X%2010.7.3.zip Thanks Hans! With this, I think we are good to go to put this on the website. Anyone disagreeing? :) Cheers Jan Some things, files are scattered across various places. #1 dbs views are in ~/Library/Application Support/CouchDBServer/ #2 there's no local.ini as such, its in ~/Library/Preferences/couchdb-server.ini #3 couch.log is in $APPROOT/Contents/Resources/couchdbx-core/var/log/couch.log #4 couch.uri is in $APPROOT/Contents/Resources/couchdbx-core/var/run/couch.uri If its not hard to fix #3 and #4 we should do that first. This means CouchDB.app could run read-only in /Applications, which it doesn't atm. #1 and #2 make sense, but might not be immediately obvious. They could wait, its more about documenting somewhere. A+ Dave
Re: So, how do we get the Mac binary on the home page?
Ok, I have created a key pair and have signed the zip. The signature is: bash-3.2$ cat CouchDB\ Server-1.2.0-20120614.zip.asc -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (Darwin) iQEcBAABAgAGBQJP3b2bAAoJEJ6rn8XnRbxj0UAH/3IF/Zsa55UPxaRju43XleCt l1Ezw1135D85eC4NCk6zbUrXwd2mJxqcNH1dJ0/X5MLuJWwS3lx/MvSQqrEJRggR wEnXfj50KyL+iKgxfAU9dJ+x2n9BhlybUnYXQWDUe0ovckxiesSWUdqavOLhRoCv bz307dan1xr0Wu0UYxtRK7aRQj0Ffdim4W0OXo6/EMkDRlPwLu9AI1pDbmH4H9kH //DQfjx2vosKYneAu0p2BTakrQfHUCTC0fYzxlP8fz/xjzGK7GwSzRuYv45A8Zw9 DitCFBE90VHI1z46IezZWkorAO681bSyMIjRqDXawNg+toDzqiwteza6hzqdCoM= =uAMZ -END PGP SIGNATURE- - Hans On Jun 17, 2012, at 11:57 AM, Jan Lehnardt wrote: Hans, this is great, can you provide md5/sha1/openpgp hashes for the file? Cheers Jan -- On Jun 14, 2012, at 22:54 , Hans J Schroeder wrote: Hi, The fixed version is now online at: https://github.com/downloads/cloudnode/couchdbx-app/CouchDB%20Server-1.2.0-20120614.zip It should now work for all Mac OS X Versions = 10.6 32bit + 64bit - Hans On Jun 13, 2012, at 2:11 PM, Jan Lehnardt wrote: Hans, any news? :) On Jun 10, 2012, at 19:48 , Jan Lehnardt wrote: On Jun 10, 2012, at 12:38 , Hans J Schroeder wrote: Hi, I have checked how the others (Membase, CouchBase) are doing it and suggest the following disk layout: Data Dir / Application Support Folder = ~/Library/Application Support/CouchDB/etc couchdb-server.ini Bikeshed alert: I'd mirror what the CouchDB source distro does: ~/Library/Application Support/CouchDB/etc/default.d/ ~/Library/Application Support/CouchDB/etc/default.ini ~/Library/Application Support/CouchDB/etc/local.d/ ~/Library/Application Support/CouchDB/etc/local.ini I'd be more than happy to ship whatever is there today and fix this down the road. If it is easy to fix (see below), we may as well do that too. ~/Library/Application Support/CouchDB/var/run/couchdb couch.uri +1 ~/Library/Application Support/CouchDB/var/lib/couchdb views dbs +1 * * * We may want to revisit this based on a close reading of the AppStore submission guidelines, when we get to that, but until then, I believe that is fine. Logs ~/Library/Logs couchdb-server.log I'd drop -server and go with just couchdb.log Is this ok? - Hans P.S. I have also found the incompatibility between OS X versions 10.6.8 - 10.7.2 and the later ones. I guess we can serve all with one binary Great news! :) If you want to/can compile a new one (and if the paths above are easy to adjust), then I'd say let's get that right and then ship. And then improve on all the other things that have been mentioned in this thread. Thanks all for pushing this along! :) Cheers Jan -- On Jun 8, 2012, at 8:54 PM, Dave Cottlehuber wrote: On 8 June 2012 16:40, Jan Lehnardt j...@apache.org wrote: On Jun 8, 2012, at 16:31 , Hans J Schroeder wrote: Hi Jan, Can you specify what systems should use which versions, so we can label them correctly on the website? For Mac OS X 10.6.8 to 10.7.2: https://github.com/downloads/cloudnode/couchdbx-app/CouchDB%20Server-1.2.0.zip For Mac OS X 10.7.3 and later https://github.com/downloads/cloudnode/couchdbx-app/CouchDB%20Server-1.2.0-OS%20X%2010.7.3.zip Thanks Hans! With this, I think we are good to go to put this on the website. Anyone disagreeing? :) Cheers Jan Some things, files are scattered across various places. #1 dbs views are in ~/Library/Application Support/CouchDBServer/ #2 there's no local.ini as such, its in ~/Library/Preferences/couchdb-server.ini #3 couch.log is in $APPROOT/Contents/Resources/couchdbx-core/var/log/couch.log #4 couch.uri is in $APPROOT/Contents/Resources/couchdbx-core/var/run/couch.uri If its not hard to fix #3 and #4 we should do that first. This means CouchDB.app could run read-only in /Applications, which it doesn't atm. #1 and #2 make sense, but might not be immediately obvious. They could wait, its more about documenting somewhere. A+ Dave
Re: So, how do we get the Mac binary on the home page?
Great, I see the package is now linked from the homepage. I have also uploaded the md5/sha1/openpgp hashes. So they can be linked too. - Hans On Jun 17, 2012, at 11:57 AM, Jan Lehnardt wrote: Hans, this is great, can you provide md5/sha1/openpgp hashes for the file? Cheers Jan -- On Jun 14, 2012, at 22:54 , Hans J Schroeder wrote: Hi, The fixed version is now online at: https://github.com/downloads/cloudnode/couchdbx-app/CouchDB%20Server-1.2.0-20120614.zip It should now work for all Mac OS X Versions = 10.6 32bit + 64bit - Hans On Jun 13, 2012, at 2:11 PM, Jan Lehnardt wrote: Hans, any news? :) On Jun 10, 2012, at 19:48 , Jan Lehnardt wrote: On Jun 10, 2012, at 12:38 , Hans J Schroeder wrote: Hi, I have checked how the others (Membase, CouchBase) are doing it and suggest the following disk layout: Data Dir / Application Support Folder = ~/Library/Application Support/CouchDB/etc couchdb-server.ini Bikeshed alert: I'd mirror what the CouchDB source distro does: ~/Library/Application Support/CouchDB/etc/default.d/ ~/Library/Application Support/CouchDB/etc/default.ini ~/Library/Application Support/CouchDB/etc/local.d/ ~/Library/Application Support/CouchDB/etc/local.ini I'd be more than happy to ship whatever is there today and fix this down the road. If it is easy to fix (see below), we may as well do that too. ~/Library/Application Support/CouchDB/var/run/couchdb couch.uri +1 ~/Library/Application Support/CouchDB/var/lib/couchdb views dbs +1 * * * We may want to revisit this based on a close reading of the AppStore submission guidelines, when we get to that, but until then, I believe that is fine. Logs ~/Library/Logs couchdb-server.log I'd drop -server and go with just couchdb.log Is this ok? - Hans P.S. I have also found the incompatibility between OS X versions 10.6.8 - 10.7.2 and the later ones. I guess we can serve all with one binary Great news! :) If you want to/can compile a new one (and if the paths above are easy to adjust), then I'd say let's get that right and then ship. And then improve on all the other things that have been mentioned in this thread. Thanks all for pushing this along! :) Cheers Jan -- On Jun 8, 2012, at 8:54 PM, Dave Cottlehuber wrote: On 8 June 2012 16:40, Jan Lehnardt j...@apache.org wrote: On Jun 8, 2012, at 16:31 , Hans J Schroeder wrote: Hi Jan, Can you specify what systems should use which versions, so we can label them correctly on the website? For Mac OS X 10.6.8 to 10.7.2: https://github.com/downloads/cloudnode/couchdbx-app/CouchDB%20Server-1.2.0.zip For Mac OS X 10.7.3 and later https://github.com/downloads/cloudnode/couchdbx-app/CouchDB%20Server-1.2.0-OS%20X%2010.7.3.zip Thanks Hans! With this, I think we are good to go to put this on the website. Anyone disagreeing? :) Cheers Jan Some things, files are scattered across various places. #1 dbs views are in ~/Library/Application Support/CouchDBServer/ #2 there's no local.ini as such, its in ~/Library/Preferences/couchdb-server.ini #3 couch.log is in $APPROOT/Contents/Resources/couchdbx-core/var/log/couch.log #4 couch.uri is in $APPROOT/Contents/Resources/couchdbx-core/var/run/couch.uri If its not hard to fix #3 and #4 we should do that first. This means CouchDB.app could run read-only in /Applications, which it doesn't atm. #1 and #2 make sense, but might not be immediately obvious. They could wait, its more about documenting somewhere. A+ Dave
Re: So, how do we get the Mac binary on the home page?
woo! Thanks Hans!! On 17 June 2012 13:31, Hans J Schroeder h...@cloudno.de wrote: Great, I see the package is now linked from the homepage. I have also uploaded the md5/sha1/openpgp hashes. So they can be linked too. - Hans On Jun 17, 2012, at 11:57 AM, Jan Lehnardt wrote: Hans, this is great, can you provide md5/sha1/openpgp hashes for the file? Cheers Jan -- On Jun 14, 2012, at 22:54 , Hans J Schroeder wrote: Hi, The fixed version is now online at: https://github.com/downloads/cloudnode/couchdbx-app/CouchDB%20Server-1.2.0-20120614.zip It should now work for all Mac OS X Versions = 10.6 32bit + 64bit - Hans On Jun 13, 2012, at 2:11 PM, Jan Lehnardt wrote: Hans, any news? :) On Jun 10, 2012, at 19:48 , Jan Lehnardt wrote: On Jun 10, 2012, at 12:38 , Hans J Schroeder wrote: Hi, I have checked how the others (Membase, CouchBase) are doing it and suggest the following disk layout: Data Dir / Application Support Folder = ~/Library/Application Support/CouchDB/etc couchdb-server.ini Bikeshed alert: I'd mirror what the CouchDB source distro does: ~/Library/Application Support/CouchDB/etc/default.d/ ~/Library/Application Support/CouchDB/etc/default.ini ~/Library/Application Support/CouchDB/etc/local.d/ ~/Library/Application Support/CouchDB/etc/local.ini I'd be more than happy to ship whatever is there today and fix this down the road. If it is easy to fix (see below), we may as well do that too. ~/Library/Application Support/CouchDB/var/run/couchdb couch.uri +1 ~/Library/Application Support/CouchDB/var/lib/couchdb views dbs +1 * * * We may want to revisit this based on a close reading of the AppStore submission guidelines, when we get to that, but until then, I believe that is fine. Logs ~/Library/Logs couchdb-server.log I'd drop -server and go with just couchdb.log Is this ok? - Hans P.S. I have also found the incompatibility between OS X versions 10.6.8 - 10.7.2 and the later ones. I guess we can serve all with one binary Great news! :) If you want to/can compile a new one (and if the paths above are easy to adjust), then I'd say let's get that right and then ship. And then improve on all the other things that have been mentioned in this thread. Thanks all for pushing this along! :) Cheers Jan -- On Jun 8, 2012, at 8:54 PM, Dave Cottlehuber wrote: On 8 June 2012 16:40, Jan Lehnardt j...@apache.org wrote: On Jun 8, 2012, at 16:31 , Hans J Schroeder wrote: Hi Jan, Can you specify what systems should use which versions, so we can label them correctly on the website? For Mac OS X 10.6.8 to 10.7.2: https://github.com/downloads/cloudnode/couchdbx-app/CouchDB%20Server-1.2.0.zip For Mac OS X 10.7.3 and later https://github.com/downloads/cloudnode/couchdbx-app/CouchDB%20Server-1.2.0-OS%20X%2010.7.3.zip Thanks Hans! With this, I think we are good to go to put this on the website. Anyone disagreeing? :) Cheers Jan Some things, files are scattered across various places. #1 dbs views are in ~/Library/Application Support/CouchDBServer/ #2 there's no local.ini as such, its in ~/Library/Preferences/couchdb-server.ini #3 couch.log is in $APPROOT/Contents/Resources/couchdbx-core/var/log/couch.log #4 couch.uri is in $APPROOT/Contents/Resources/couchdbx-core/var/run/couch.uri If its not hard to fix #3 and #4 we should do that first. This means CouchDB.app could run read-only in /Applications, which it doesn't atm. #1 and #2 make sense, but might not be immediately obvious. They could wait, its more about documenting somewhere. A+ Dave
Re: So, how do we get the Mac binary on the home page?
It’s alive! Thanks everybody and especially Hans! :D Cheers Jan -- On Jun 17, 2012, at 13:41 , Dave Cottlehuber wrote: woo! Thanks Hans!! On 17 June 2012 13:31, Hans J Schroeder h...@cloudno.de wrote: Great, I see the package is now linked from the homepage. I have also uploaded the md5/sha1/openpgp hashes. So they can be linked too. - Hans On Jun 17, 2012, at 11:57 AM, Jan Lehnardt wrote: Hans, this is great, can you provide md5/sha1/openpgp hashes for the file? Cheers Jan -- On Jun 14, 2012, at 22:54 , Hans J Schroeder wrote: Hi, The fixed version is now online at: https://github.com/downloads/cloudnode/couchdbx-app/CouchDB%20Server-1.2.0-20120614.zip It should now work for all Mac OS X Versions = 10.6 32bit + 64bit - Hans On Jun 13, 2012, at 2:11 PM, Jan Lehnardt wrote: Hans, any news? :) On Jun 10, 2012, at 19:48 , Jan Lehnardt wrote: On Jun 10, 2012, at 12:38 , Hans J Schroeder wrote: Hi, I have checked how the others (Membase, CouchBase) are doing it and suggest the following disk layout: Data Dir / Application Support Folder = ~/Library/Application Support/CouchDB/etc couchdb-server.ini Bikeshed alert: I'd mirror what the CouchDB source distro does: ~/Library/Application Support/CouchDB/etc/default.d/ ~/Library/Application Support/CouchDB/etc/default.ini ~/Library/Application Support/CouchDB/etc/local.d/ ~/Library/Application Support/CouchDB/etc/local.ini I'd be more than happy to ship whatever is there today and fix this down the road. If it is easy to fix (see below), we may as well do that too. ~/Library/Application Support/CouchDB/var/run/couchdb couch.uri +1 ~/Library/Application Support/CouchDB/var/lib/couchdb views dbs +1 * * * We may want to revisit this based on a close reading of the AppStore submission guidelines, when we get to that, but until then, I believe that is fine. Logs ~/Library/Logs couchdb-server.log I'd drop -server and go with just couchdb.log Is this ok? - Hans P.S. I have also found the incompatibility between OS X versions 10.6.8 - 10.7.2 and the later ones. I guess we can serve all with one binary Great news! :) If you want to/can compile a new one (and if the paths above are easy to adjust), then I'd say let's get that right and then ship. And then improve on all the other things that have been mentioned in this thread. Thanks all for pushing this along! :) Cheers Jan -- On Jun 8, 2012, at 8:54 PM, Dave Cottlehuber wrote: On 8 June 2012 16:40, Jan Lehnardt j...@apache.org wrote: On Jun 8, 2012, at 16:31 , Hans J Schroeder wrote: Hi Jan, Can you specify what systems should use which versions, so we can label them correctly on the website? For Mac OS X 10.6.8 to 10.7.2: https://github.com/downloads/cloudnode/couchdbx-app/CouchDB%20Server-1.2.0.zip For Mac OS X 10.7.3 and later https://github.com/downloads/cloudnode/couchdbx-app/CouchDB%20Server-1.2.0-OS%20X%2010.7.3.zip Thanks Hans! With this, I think we are good to go to put this on the website. Anyone disagreeing? :) Cheers Jan Some things, files are scattered across various places. #1 dbs views are in ~/Library/Application Support/CouchDBServer/ #2 there's no local.ini as such, its in ~/Library/Preferences/couchdb-server.ini #3 couch.log is in $APPROOT/Contents/Resources/couchdbx-core/var/log/couch.log #4 couch.uri is in $APPROOT/Contents/Resources/couchdbx-core/var/run/couch.uri If its not hard to fix #3 and #4 we should do that first. This means CouchDB.app could run read-only in /Applications, which it doesn't atm. #1 and #2 make sense, but might not be immediately obvious. They could wait, its more about documenting somewhere. A+ Dave
Re: So, how do we get the Mac binary on the home page?
Great! Thank you all for helping. Cheers, Hans On Jun 17, 2012, at 1:44 PM, Jan Lehnardt wrote: It’s alive! Thanks everybody and especially Hans! :D Cheers Jan -- On Jun 17, 2012, at 13:41 , Dave Cottlehuber wrote: woo! Thanks Hans!! On 17 June 2012 13:31, Hans J Schroeder h...@cloudno.de wrote: Great, I see the package is now linked from the homepage. I have also uploaded the md5/sha1/openpgp hashes. So they can be linked too. - Hans On Jun 17, 2012, at 11:57 AM, Jan Lehnardt wrote: Hans, this is great, can you provide md5/sha1/openpgp hashes for the file? Cheers Jan -- On Jun 14, 2012, at 22:54 , Hans J Schroeder wrote: Hi, The fixed version is now online at: https://github.com/downloads/cloudnode/couchdbx-app/CouchDB%20Server-1.2.0-20120614.zip It should now work for all Mac OS X Versions = 10.6 32bit + 64bit - Hans On Jun 13, 2012, at 2:11 PM, Jan Lehnardt wrote: Hans, any news? :) On Jun 10, 2012, at 19:48 , Jan Lehnardt wrote: On Jun 10, 2012, at 12:38 , Hans J Schroeder wrote: Hi, I have checked how the others (Membase, CouchBase) are doing it and suggest the following disk layout: Data Dir / Application Support Folder = ~/Library/Application Support/CouchDB/etc couchdb-server.ini Bikeshed alert: I'd mirror what the CouchDB source distro does: ~/Library/Application Support/CouchDB/etc/default.d/ ~/Library/Application Support/CouchDB/etc/default.ini ~/Library/Application Support/CouchDB/etc/local.d/ ~/Library/Application Support/CouchDB/etc/local.ini I'd be more than happy to ship whatever is there today and fix this down the road. If it is easy to fix (see below), we may as well do that too. ~/Library/Application Support/CouchDB/var/run/couchdb couch.uri +1 ~/Library/Application Support/CouchDB/var/lib/couchdb views dbs +1 * * * We may want to revisit this based on a close reading of the AppStore submission guidelines, when we get to that, but until then, I believe that is fine. Logs ~/Library/Logs couchdb-server.log I'd drop -server and go with just couchdb.log Is this ok? - Hans P.S. I have also found the incompatibility between OS X versions 10.6.8 - 10.7.2 and the later ones. I guess we can serve all with one binary Great news! :) If you want to/can compile a new one (and if the paths above are easy to adjust), then I'd say let's get that right and then ship. And then improve on all the other things that have been mentioned in this thread. Thanks all for pushing this along! :) Cheers Jan -- On Jun 8, 2012, at 8:54 PM, Dave Cottlehuber wrote: On 8 June 2012 16:40, Jan Lehnardt j...@apache.org wrote: On Jun 8, 2012, at 16:31 , Hans J Schroeder wrote: Hi Jan, Can you specify what systems should use which versions, so we can label them correctly on the website? For Mac OS X 10.6.8 to 10.7.2: https://github.com/downloads/cloudnode/couchdbx-app/CouchDB%20Server-1.2.0.zip For Mac OS X 10.7.3 and later https://github.com/downloads/cloudnode/couchdbx-app/CouchDB%20Server-1.2.0-OS%20X%2010.7.3.zip Thanks Hans! With this, I think we are good to go to put this on the website. Anyone disagreeing? :) Cheers Jan Some things, files are scattered across various places. #1 dbs views are in ~/Library/Application Support/CouchDBServer/ #2 there's no local.ini as such, its in ~/Library/Preferences/couchdb-server.ini #3 couch.log is in $APPROOT/Contents/Resources/couchdbx-core/var/log/couch.log #4 couch.uri is in $APPROOT/Contents/Resources/couchdbx-core/var/run/couch.uri If its not hard to fix #3 and #4 we should do that first. This means CouchDB.app could run read-only in /Applications, which it doesn't atm. #1 and #2 make sense, but might not be immediately obvious. They could wait, its more about documenting somewhere. A+ Dave
Re: Docs, second try
On Jun 17, 2012, at 12:47 , Jan Lehnardt wrote: On Jun 17, 2012, at 12:12 , Jan Lehnardt wrote: Same repo, some news: - updated NOTICE - added minimal css styling to make it not look ass - made make distcheck pass* (wooo!) - linked the per-chapter build in Futon instead of the full-page.** As far as I can see, this is good to go into master. Well, one more thing™: I need to hook this up to `make install`. I'll try and do this right away. I got this half done, but I think I will need from you guys. The latest version is still on https://github.com/janl/couchdb/tree/docs If you do $ export COUCHDB_DOC_JAR_DIR=/path/to/doc/jars $ make $ cd share/docs $ make $ cd ../.. $ make install The docs get installed properly and the hook up with Futon works just fine. Obviously, we want `make` in `share/doc` to run as part of the top level make, but I don't know how to hook this up. I tried porting all `Makefiles` in `share/doc` to `Makefile.am` like we do elsewhere, but then the docs build system gets confused with paths, I don't think this is going to work without porting the whole docs build system to the way CouchDB uses make. An easier way for now would be to treat the docs build system as a black box that gets started with `make` in share/docs. `make install` for docs is handled in `share/Makefile.am`. Any help is appreciated! Cheers Jan --
Re: [PROPOSAL] Official roadmap, and merge procedure
On Jun 16, 2012, at 18:45 , Noah Slater wrote: Devs, A few of us met in Dublin recently, and we discussed the project roadmap. Key takeaways from that meeting: 1. We'd like to proposed formal time-based releases 2. Branch and hack all you like, but if you want to ship something, you have to submit a merge request to an active release branch. Before you do this, you should follow a test procedure. And before your request will be accepted, it will be put through QA by the community. Details of these proposals can be found here: http://wiki.apache.org/couchdb/Roadmap_Process http://wiki.apache.org/couchdb/Merge_Procedure Please reply back to this thread with your comments on the proposals. (The last one needs to be fleshed out, a little...) In particular this bit: Feature branches are merged to release branches using 'git merge --no-ff FEATURE BRANCH'. This guarantees a merge commit, which are the only kinds of commit that will appear on release branches. If the merge results in conflicts, the release manager rejects the merge commit with an reply to the dev@ thread. If the merge is successful, the release manager should run 'make distcheck' and push the merge upstream if the tests pass. Merges are currently not allowed on release branches and master. IIRC we came up with git merge --no-ff being safe to enable, but this currently is still disabled. Cheers Jan --
Re: [PROPOSAL] Official roadmap, and merge procedure
Thanks for the comments guys. Bob was in the room when this proposal was drafted (literally) but Paul is our other active release manager, so I want to wait for his review before I comment on anything in the thread. I am also interested to hear what Jason Smith thinks, and indeed, anyone else from Cloudant, or other downstream CouchDB individuals this may effect. If you're interested in helping the CouchDB community test CouchDB, through QA, CI, or any other method, then your should also chime in here. On Sun, Jun 17, 2012 at 4:28 PM, Jan Lehnardt j...@apache.org wrote: On Jun 16, 2012, at 18:45 , Noah Slater wrote: Devs, A few of us met in Dublin recently, and we discussed the project roadmap. Key takeaways from that meeting: 1. We'd like to proposed formal time-based releases 2. Branch and hack all you like, but if you want to ship something, you have to submit a merge request to an active release branch. Before you do this, you should follow a test procedure. And before your request will be accepted, it will be put through QA by the community. Details of these proposals can be found here: http://wiki.apache.org/couchdb/Roadmap_Process http://wiki.apache.org/couchdb/Merge_Procedure Please reply back to this thread with your comments on the proposals. (The last one needs to be fleshed out, a little...) In particular this bit: Feature branches are merged to release branches using 'git merge --no-ff FEATURE BRANCH'. This guarantees a merge commit, which are the only kinds of commit that will appear on release branches. If the merge results in conflicts, the release manager rejects the merge commit with an reply to the dev@ thread. If the merge is successful, the release manager should run 'make distcheck' and push the merge upstream if the tests pass. Merges are currently not allowed on release branches and master. IIRC we came up with git merge --no-ff being safe to enable, but this currently is still disabled. Cheers Jan --
couchdb pull request: limit repeated rewriting, fixes COUCHDB-1441
Github user RonnyPfannschmidt closed the pull request at: https://github.com/apache/couchdb/pull/17
couchdb pull request: keep initial rewrite path instead of overwriting it o...
Github user RonnyPfannschmidt closed the pull request at: https://github.com/apache/couchdb/pull/16
couchdb pull request: Fix type logging status codes
Github user daleharvey closed the pull request at: https://github.com/apache/couchdb/pull/27
Re: [PROPOSAL] Official roadmap, and merge procedure
The only thing I see an issue with is the merge commit policy. You'll find quite quickly that you'll have situations that require merge commits with diff's to work properly. A traditional example is bug fixes that reach back through many release branches. If the RM rejects anything that's not a clean merge then what the committer is required to do is either write three different commits tailored to each release branch (which defeats the purpose of the merge) or merge work back to a release branch and then submit the merge commit as a commit to be merged into the release branch (which makes my brain hurt just thinking about it). If you really want the RM to be a gate keeper/reviewer what I'd suggest is that we take a hard line against working on master at all. When we want to submit work we do the email thing that'll include a list of commits, one per branch. Ie, something like: 1234-master-cool 1234-1.4.x-cool And then we do our review dance and CI checks. (Also, if one commit works on all branches, that's fine, this just allows a degree of freedom for when things don't apply the same everywhere). Along with the rational for tests and docs rational for why things are back ported vs are etc etc should be included in the email to dev@. Also, we'll want to get a template/example/something up on the net so people know what to submit when they do submit. And the actual push to branches happens with one of the RM's reviewing it and then doing a rebase onto those branches (and rejecting as failed). This way we have single commits per feature/fix/whatever on all of our release branches but we allow the committer to produce the commits that will inevitably have to be tailored to each branch in some cases. On Sun, Jun 17, 2012 at 11:48 AM, Noah Slater nsla...@tumbolia.org wrote: Thanks for the comments guys. Bob was in the room when this proposal was drafted (literally) but Paul is our other active release manager, so I want to wait for his review before I comment on anything in the thread. I am also interested to hear what Jason Smith thinks, and indeed, anyone else from Cloudant, or other downstream CouchDB individuals this may effect. If you're interested in helping the CouchDB community test CouchDB, through QA, CI, or any other method, then your should also chime in here. On Sun, Jun 17, 2012 at 4:28 PM, Jan Lehnardt j...@apache.org wrote: On Jun 16, 2012, at 18:45 , Noah Slater wrote: Devs, A few of us met in Dublin recently, and we discussed the project roadmap. Key takeaways from that meeting: 1. We'd like to proposed formal time-based releases 2. Branch and hack all you like, but if you want to ship something, you have to submit a merge request to an active release branch. Before you do this, you should follow a test procedure. And before your request will be accepted, it will be put through QA by the community. Details of these proposals can be found here: http://wiki.apache.org/couchdb/Roadmap_Process http://wiki.apache.org/couchdb/Merge_Procedure Please reply back to this thread with your comments on the proposals. (The last one needs to be fleshed out, a little...) In particular this bit: Feature branches are merged to release branches using 'git merge --no-ff FEATURE BRANCH'. This guarantees a merge commit, which are the only kinds of commit that will appear on release branches. If the merge results in conflicts, the release manager rejects the merge commit with an reply to the dev@ thread. If the merge is successful, the release manager should run 'make distcheck' and push the merge upstream if the tests pass. Merges are currently not allowed on release branches and master. IIRC we came up with git merge --no-ff being safe to enable, but this currently is still disabled. Cheers Jan --
Re: git commit: Automate maintenance of the THANKS file
I'm not sure I like this so much. Playing around with it, its a bit
prone to screw ups. It also breaks if AUTHORS.gz exists before you
pull in new commits. We could solve that by forcing it to build every
time but that's a bit of a hack for not much gain.
Its also got Benoit in there twice since he made commits with slightly
different author/committer names which also seems awkward.
On Sun, Jun 17, 2012 at 1:29 PM, j...@apache.org wrote:
Updated Branches:
refs/heads/master 9514ed3f5 - 7646794ea
Automate maintenance of the THANKS file
THANKS now is automatically maintained for you. It uses git author
data to append people who submitted patches in the past.
For non-commit THANKS, you can still manually edit this file.
This commit removes from the THANKS file the people that appear
as git commit authors since we started committing them after
commit 6c976bd. These removed entries get automatically re-
added by `make`.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/7646794e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7646794e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7646794e
Branch: refs/heads/master
Commit: 7646794ea7a30d41a64c873d8b27ae830397d94a
Parents: 9514ed3
Author: Jan Lehnardt j...@apache.org
Authored: Sun Jun 17 20:06:21 2012 +0200
Committer: Jan Lehnardt j...@apache.org
Committed: Sun Jun 17 20:11:31 2012 +0200
--
Makefile.am | 10 +-
THANKS | 13 +
2 files changed, 14 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/couchdb/blob/7646794e/Makefile.am
--
diff --git a/Makefile.am b/Makefile.am
index 9dd22b8..1cbd865 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,7 +79,15 @@ README.gz: $(top_srcdir)/README
-gzip -9 $ $@
THANKS.gz: $(top_srcdir)/THANKS
- -gzip -9 $ $@
+ sed -e 's/^#.*//' $ $.tmp # strip comments
+ sed -e '/^$$/d' $.tmp $.tmp2 # strip empty lines
+ git shortlog -se 6c976bd..HEAD \
+ | grep -v @apache.org \
+ | sed -E 's/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /' \
+ $.tmp2 # inject git authors
+ echo '\nFor a list of authors see the `AUTHORS` file.\n' $.tmp2
+ -gzip -9 $.tmp2 $@ # zip
+ rm $.tmp $.tmp2 # cleanup
check: dev check-js
$(top_builddir)/test/etap/run $(top_srcdir)/test/etap
http://git-wip-us.apache.org/repos/asf/couchdb/blob/7646794e/THANKS
--
diff --git a/THANKS b/THANKS
index f0dccb8..1e065f8 100644
--- a/THANKS
+++ b/THANKS
@@ -66,7 +66,6 @@ suggesting improvements or submitting changes. Some of
these people are:
* Lim Yue Chuan shasder...@gmail.com
* David Davis xan...@xantus.org
* Klaus Trainer klaus.trai...@web.de
- * Dale Harvey d...@arandomurl.com
* Juuso Väänänen ju...@vaananen.org
* Jeff Zellner jeff.zell...@gmail.com
* Benjamin Young byo...@bigbluehat.com
@@ -92,12 +91,10 @@ suggesting improvements or submitting changes. Some of
these people are:
* Simon Leblanc sim.leblanc+apa...@gmail.com
* Rogutės Sparnuotos rogu...@googlemail.com
* Gavin McDonald gmcdon...@apache.org
- * Ronny Pfannschmidt ronny.pfannschm...@gmx.de
- * Magnus Hoff magh...@gmail.com
- * Alexander Dorofeev aka.s...@gmail.com
- * Anthony S Baker anthony.s.ba...@gmail.com
- * Ewan McDougall i...@mrloop.com
- * Adam Lofts adam.lo...@gmail.com
-For a list of authors see the `AUTHORS` file.
+# Dear committer who merges a commit from a non-committer:
+# You don't have to manually maintain the THANKS file anymore (yay!).
+# Non-committer authors get automatically appended to THANKS and
+# moved into THANKS.gz by `make`. This note will be stripped as well.
+# Authors from commit 6c976bd and onwards are auto-inserted.
Re: [1/2] git commit: fix make distcheck
Noah, is the use of mktemp okay with regards to the rules for building from
source?
Dave, is mktemp portable in our Windows build system?
Cheers
Jan
--
On Jun 17, 2012, at 21:31 , j...@apache.org wrote:
Updated Branches:
refs/heads/master 7646794ea - d93929fdc
fix make distcheck
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d93929fd
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d93929fd
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d93929fd
Branch: refs/heads/master
Commit: d93929fdccb6f0fe7b205a021558c219c7fbc146
Parents: 7f93d33
Author: Jan Lehnardt j...@apache.org
Authored: Sun Jun 17 21:08:35 2012 +0200
Committer: Jan Lehnardt j...@apache.org
Committed: Sun Jun 17 21:08:35 2012 +0200
--
Makefile.am | 14 --
1 files changed, 8 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/couchdb/blob/d93929fd/Makefile.am
--
diff --git a/Makefile.am b/Makefile.am
index 1cbd865..3ffc3df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,15 +79,17 @@ README.gz: $(top_srcdir)/README
-gzip -9 $ $@
THANKS.gz: $(top_srcdir)/THANKS
- sed -e 's/^#.*//' $ $.tmp # strip comments
- sed -e '/^$$/d' $.tmp $.tmp2 # strip empty lines
+ TMP1=`mktemp -t THANKS`
+ TMP2=`mktemp -t THANKS`
+ sed -e 's/^#.*//' $ $TMP1 # strip comments
+ sed -e '/^$$/d' $TMP1 $TMP2 # strip empty lines
git shortlog -se 6c976bd..HEAD \
| grep -v @apache.org \
| sed -E 's/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /' \
- $.tmp2 # inject git authors
- echo '\nFor a list of authors see the `AUTHORS` file.\n' $.tmp2
- -gzip -9 $.tmp2 $@ # zip
- rm $.tmp $.tmp2 # cleanup
+ $TMP2 # inject git authors
+ echo '\nFor a list of authors see the `AUTHORS` file.\n' $TMP2
+ -gzip -9 $TMP2 $@ # zip
+ rm $TMP1 $TMP2 # cleanup
check: dev check-js
$(top_builddir)/test/etap/run $(top_srcdir)/test/etap
Re: [1/2] git commit: fix make distcheck
On Jun 17, 2012, at 21:40 , Paul Davis wrote:
Rather than the fancy footwork you could just store the tmp output in
the final file.
I couldn't get that done reliably, maybe I'm doing it wrong. Any hints
appreciated.
Cheers
Jan
--
On Sun, Jun 17, 2012 at 2:37 PM, Jan Lehnardt j...@apache.org wrote:
Noah, is the use of mktemp okay with regards to the rules for building from
source?
Dave, is mktemp portable in our Windows build system?
Cheers
Jan
--
On Jun 17, 2012, at 21:31 , j...@apache.org wrote:
Updated Branches:
refs/heads/master 7646794ea - d93929fdc
fix make distcheck
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d93929fd
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d93929fd
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d93929fd
Branch: refs/heads/master
Commit: d93929fdccb6f0fe7b205a021558c219c7fbc146
Parents: 7f93d33
Author: Jan Lehnardt j...@apache.org
Authored: Sun Jun 17 21:08:35 2012 +0200
Committer: Jan Lehnardt j...@apache.org
Committed: Sun Jun 17 21:08:35 2012 +0200
--
Makefile.am | 14 --
1 files changed, 8 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/couchdb/blob/d93929fd/Makefile.am
--
diff --git a/Makefile.am b/Makefile.am
index 1cbd865..3ffc3df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,15 +79,17 @@ README.gz: $(top_srcdir)/README
-gzip -9 $ $@
THANKS.gz: $(top_srcdir)/THANKS
- sed -e 's/^#.*//' $ $.tmp # strip comments
- sed -e '/^$$/d' $.tmp $.tmp2 # strip empty lines
+ TMP1=`mktemp -t THANKS`
+ TMP2=`mktemp -t THANKS`
+ sed -e 's/^#.*//' $ $TMP1 # strip comments
+ sed -e '/^$$/d' $TMP1 $TMP2 # strip empty lines
git shortlog -se 6c976bd..HEAD \
| grep -v @apache.org \
| sed -E 's/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /' \
- $.tmp2 # inject git authors
- echo '\nFor a list of authors see the `AUTHORS` file.\n' $.tmp2
- -gzip -9 $.tmp2 $@ # zip
- rm $.tmp $.tmp2 # cleanup
+ $TMP2 # inject git authors
+ echo '\nFor a list of authors see the `AUTHORS` file.\n' $TMP2
+ -gzip -9 $TMP2 $@ # zip
+ rm $TMP1 $TMP2 # cleanup
check: dev check-js
$(top_builddir)/test/etap/run $(top_srcdir)/test/etap
Re: git commit: Automate maintenance of the THANKS file
On Sun, Jun 17, 2012 at 2:44 PM, Jan Lehnardt j...@apache.org wrote: On Jun 17, 2012, at 21:29 , Paul Davis wrote: I'm not sure I like this so much. Playing around with it, its a bit prone to screw ups. I just don't want to maintain this file manually any more. It is error-prone and makes merging user-contributions a pain. I'm happy to have this implemented in any other way, but I think we should try to remove any mechanical steps from maintaining our source if we can. I hope you agree! :) Its an extra step but not one that I find to be particularly onerous. Given that we're already working on codifying merge practices I don't see why we don't just add a check box for includes commit adding yourself to the THANKS file if this is your first contribution that we look for. It also breaks if AUTHORS.gz exists before you pull in new commits. We could solve that by forcing it to build every time but that's a bit of a hack for not much gain. Can you explain how it breaks if AUTHORS.gz exists before the merge? If you mean THANKS.gz, my idea was that this is only relevant on packaging time (make distcheck) where THANKS.gz by definition does not exist. I'm not sure its a good idea to have a file that is only built correctly in special circumstances. Its also got Benoit in there twice since he made commits with slightly different author/committer names which also seems awkward. The subsequent .mailmap commit fixes the dupes. The push emails seem to be delayed atm, I reported this to danielsh on #asfinfra. I'm confused. You've removed one manually curated file only to add a new one that just modifies the build of the first? Seems like a lot of gymnastics. In a perfect world I would be all in with you on this but unfortunately a large number of people don't spend time checking their user settings before pushing commits around. Instead of just adding people to a file the first time they make a commit this means I have to go and check that the THANKS file is generated properly and then maybe update .mailmap if not and recheck that I got it correct.
Re: git commit: Automate maintenance of the THANKS file
On Sun, Jun 17, 2012 at 3:02 PM, Jan Lehnardt j...@apache.org wrote: On Jun 17, 2012, at 21:56 , Paul Davis wrote: On Sun, Jun 17, 2012 at 2:44 PM, Jan Lehnardt j...@apache.org wrote: On Jun 17, 2012, at 21:29 , Paul Davis wrote: I'm not sure I like this so much. Playing around with it, its a bit prone to screw ups. I just don't want to maintain this file manually any more. It is error-prone and makes merging user-contributions a pain. I'm happy to have this implemented in any other way, but I think we should try to remove any mechanical steps from maintaining our source if we can. I hope you agree! :) Its an extra step but not one that I find to be particularly onerous. Given that we're already working on codifying merge practices I don't see why we don't just add a check box for includes commit adding yourself to the THANKS file if this is your first contribution that we look for. That's a fair point, but this has annoyed me forever. It also breaks if AUTHORS.gz exists before you pull in new commits. We could solve that by forcing it to build every time but that's a bit of a hack for not much gain. Can you explain how it breaks if AUTHORS.gz exists before the merge? If you mean THANKS.gz, my idea was that this is only relevant on packaging time (make distcheck) where THANKS.gz by definition does not exist. I'm not sure its a good idea to have a file that is only built correctly in special circumstances. I'm happy to add an rm -f $ to the target. Its also got Benoit in there twice since he made commits with slightly different author/committer names which also seems awkward. The subsequent .mailmap commit fixes the dupes. The push emails seem to be delayed atm, I reported this to danielsh on #asfinfra. I'm confused. You've removed one manually curated file only to add a new one that just modifies the build of the first? Seems like a lot of gymnastics. .mailmap solves more than just this. In a perfect world I would be all in with you on this but unfortunately a large number of people don't spend time checking their user settings before pushing commits around. Instead of just adding people to a file the first time they make a commit this means I have to go and check that the THANKS file is generated properly and then maybe update .mailmap if not and recheck that I got it correct. Fair enough, wanna revert? Cheers Jan -- Playing with it a bit to see if I can make it build correctly and also just build the AUTHORS file. I'll leave it around for a bit but won't promise that the first time I spend more than 30s screwing with mailmap that I revert it.
Re: git commit: Automate maintenance of the THANKS file
On Jun 17, 2012, at 22:05 , Paul Davis wrote: On Sun, Jun 17, 2012 at 3:02 PM, Jan Lehnardt j...@apache.org wrote: On Jun 17, 2012, at 21:56 , Paul Davis wrote: On Sun, Jun 17, 2012 at 2:44 PM, Jan Lehnardt j...@apache.org wrote: On Jun 17, 2012, at 21:29 , Paul Davis wrote: I'm not sure I like this so much. Playing around with it, its a bit prone to screw ups. I just don't want to maintain this file manually any more. It is error-prone and makes merging user-contributions a pain. I'm happy to have this implemented in any other way, but I think we should try to remove any mechanical steps from maintaining our source if we can. I hope you agree! :) Its an extra step but not one that I find to be particularly onerous. Given that we're already working on codifying merge practices I don't see why we don't just add a check box for includes commit adding yourself to the THANKS file if this is your first contribution that we look for. That's a fair point, but this has annoyed me forever. It also breaks if AUTHORS.gz exists before you pull in new commits. We could solve that by forcing it to build every time but that's a bit of a hack for not much gain. Can you explain how it breaks if AUTHORS.gz exists before the merge? If you mean THANKS.gz, my idea was that this is only relevant on packaging time (make distcheck) where THANKS.gz by definition does not exist. I'm not sure its a good idea to have a file that is only built correctly in special circumstances. I'm happy to add an rm -f $ to the target. Its also got Benoit in there twice since he made commits with slightly different author/committer names which also seems awkward. The subsequent .mailmap commit fixes the dupes. The push emails seem to be delayed atm, I reported this to danielsh on #asfinfra. I'm confused. You've removed one manually curated file only to add a new one that just modifies the build of the first? Seems like a lot of gymnastics. .mailmap solves more than just this. In a perfect world I would be all in with you on this but unfortunately a large number of people don't spend time checking their user settings before pushing commits around. Instead of just adding people to a file the first time they make a commit this means I have to go and check that the THANKS file is generated properly and then maybe update .mailmap if not and recheck that I got it correct. Fair enough, wanna revert? Cheers Jan -- Playing with it a bit to see if I can make it build correctly and also just build the AUTHORS file. I'll leave it around for a bit but won't promise that the first time I spend more than 30s screwing with mailmap that I revert it. Heh, that took me a while to get right :) Cheers Jan --
Re: git commit: Fixup automatic THANKS generation
On Jun 17, 2012, at 22:52 , dav...@apache.org wrote:
Updated Branches:
refs/heads/master d93929fdc - e64c05061
Fixup automatic THANKS generation
This avoids the need to use mktemp as well as fixes the removal of the
blank lines in THANKS that we want. This notably does not fix the
dependency issue for AUTHORS.gz on the Git history.
Thanks for cleaning this up! :)
Not to be overly pedantic, but did you mean THANKS.gz (and THANKS.tmp
in the patch). I don't see any connection to AUTHORS[.gz], but I may
be missing something very obvious.
If it is THANKS.gz, can't we rm -f $@ as the first command in the target?
Cheers
Jan
--
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e64c0506
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e64c0506
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e64c0506
Branch: refs/heads/master
Commit: e64c05061c2bbd7bb2d5456e972e61f67486d989
Parents: d93929f
Author: Paul Joseph Davis dav...@apache.org
Authored: Sun Jun 17 15:20:21 2012 -0500
Committer: Paul Joseph Davis dav...@apache.org
Committed: Sun Jun 17 15:36:02 2012 -0500
--
Makefile.am | 20 +---
THANKS |2 --
2 files changed, 9 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e64c0506/Makefile.am
--
diff --git a/Makefile.am b/Makefile.am
index 3ffc3df..6646ac9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,17 +79,15 @@ README.gz: $(top_srcdir)/README
-gzip -9 $ $@
THANKS.gz: $(top_srcdir)/THANKS
- TMP1=`mktemp -t THANKS`
- TMP2=`mktemp -t THANKS`
- sed -e 's/^#.*//' $ $TMP1 # strip comments
- sed -e '/^$$/d' $TMP1 $TMP2 # strip empty lines
- git shortlog -se 6c976bd..HEAD \
- | grep -v @apache.org \
- | sed -E 's/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /' \
- $TMP2 # inject git authors
- echo '\nFor a list of authors see the `AUTHORS` file.\n' $TMP2
- -gzip -9 $TMP2 $@ # zip
- rm $TMP1 $TMP2 # cleanup
+ @sed -e '/^#.*/d' $ $(top_builddir)/AUTHORS.tmp
+ @git shortlog -se 6c976bd..HEAD \
+ | grep -v @apache.org \
+ | sed -E 's/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /' \
+ $(top_builddir)/AUTHORS.tmp
+ @echo '\nFor a list of authors see the `AUTHORS` file.\n' \
+ $(top_builddir)/AUTHORS.tmp
+ -gzip -9 $(top_builddir)/AUTHORS.tmp $@
+ @rm $(top_builddir)/AUTHORS.tmp
check: dev check-js
$(top_builddir)/test/etap/run $(top_srcdir)/test/etap
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e64c0506/THANKS
--
diff --git a/THANKS b/THANKS
index 1e065f8..fc4264d 100644
--- a/THANKS
+++ b/THANKS
@@ -91,10 +91,8 @@ suggesting improvements or submitting changes. Some of
these people are:
* Simon Leblanc sim.leblanc+apa...@gmail.com
* Rogutės Sparnuotos rogu...@googlemail.com
* Gavin McDonald gmcdon...@apache.org
-
# Dear committer who merges a commit from a non-committer:
# You don't have to manually maintain the THANKS file anymore (yay!).
# Non-committer authors get automatically appended to THANKS and
# moved into THANKS.gz by `make`. This note will be stripped as well.
# Authors from commit 6c976bd and onwards are auto-inserted.
-
Re: git commit: Fixup automatic THANKS generation
On Sun, Jun 17, 2012 at 4:35 PM, Jan Lehnardt j...@apache.org wrote:
On Jun 17, 2012, at 22:52 , dav...@apache.org wrote:
Updated Branches:
refs/heads/master d93929fdc - e64c05061
Fixup automatic THANKS generation
This avoids the need to use mktemp as well as fixes the removal of the
blank lines in THANKS that we want. This notably does not fix the
dependency issue for AUTHORS.gz on the Git history.
Thanks for cleaning this up! :)
Not to be overly pedantic, but did you mean THANKS.gz (and THANKS.tmp
in the patch). I don't see any connection to AUTHORS[.gz], but I may
be missing something very obvious.
If it is THANKS.gz, can't we rm -f $@ as the first command in the target?
Cheers
Jan
--
Oh good catch. I kept doing that s/AUTHORS/THANKS/ on the cli too.
Also, no for the rm -f, because that's after Make decides whether or
not to build it at all.
I'm adding a .PHONY rule for that target to force it to build
everytime which is correct enough if a bit of a hack. Pushing after I
see make distcheck run.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e64c0506
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e64c0506
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e64c0506
Branch: refs/heads/master
Commit: e64c05061c2bbd7bb2d5456e972e61f67486d989
Parents: d93929f
Author: Paul Joseph Davis dav...@apache.org
Authored: Sun Jun 17 15:20:21 2012 -0500
Committer: Paul Joseph Davis dav...@apache.org
Committed: Sun Jun 17 15:36:02 2012 -0500
--
Makefile.am | 20 +---
THANKS | 2 --
2 files changed, 9 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e64c0506/Makefile.am
--
diff --git a/Makefile.am b/Makefile.am
index 3ffc3df..6646ac9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,17 +79,15 @@ README.gz: $(top_srcdir)/README
-gzip -9 $ $@
THANKS.gz: $(top_srcdir)/THANKS
- TMP1=`mktemp -t THANKS`
- TMP2=`mktemp -t THANKS`
- sed -e 's/^#.*//' $ $TMP1 # strip comments
- sed -e '/^$$/d' $TMP1 $TMP2 # strip empty lines
- git shortlog -se 6c976bd..HEAD \
- | grep -v @apache.org \
- | sed -E 's/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /' \
- $TMP2 # inject git authors
- echo '\nFor a list of authors see the `AUTHORS` file.\n' $TMP2
- -gzip -9 $TMP2 $@ # zip
- rm $TMP1 $TMP2 # cleanup
+ @sed -e '/^#.*/d' $ $(top_builddir)/AUTHORS.tmp
+ @git shortlog -se 6c976bd..HEAD \
+ | grep -v @apache.org \
+ | sed -E 's/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /' \
+ $(top_builddir)/AUTHORS.tmp
+ @echo '\nFor a list of authors see the `AUTHORS` file.\n' \
+ $(top_builddir)/AUTHORS.tmp
+ -gzip -9 $(top_builddir)/AUTHORS.tmp $@
+ @rm $(top_builddir)/AUTHORS.tmp
check: dev check-js
$(top_builddir)/test/etap/run $(top_srcdir)/test/etap
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e64c0506/THANKS
--
diff --git a/THANKS b/THANKS
index 1e065f8..fc4264d 100644
--- a/THANKS
+++ b/THANKS
@@ -91,10 +91,8 @@ suggesting improvements or submitting changes. Some of
these people are:
* Simon Leblanc sim.leblanc+apa...@gmail.com
* Rogutės Sparnuotos rogu...@googlemail.com
* Gavin McDonald gmcdon...@apache.org
-
# Dear committer who merges a commit from a non-committer:
# You don't have to manually maintain the THANKS file anymore (yay!).
# Non-committer authors get automatically appended to THANKS and
# moved into THANKS.gz by `make`. This note will be stripped as well.
# Authors from commit 6c976bd and onwards are auto-inserted.
-
Re: git commit: Fixup automatic THANKS generation
On Jun 18, 2012, at 00:12 , Paul Davis wrote:
On Sun, Jun 17, 2012 at 4:35 PM, Jan Lehnardt j...@apache.org wrote:
On Jun 17, 2012, at 22:52 , dav...@apache.org wrote:
Updated Branches:
refs/heads/master d93929fdc - e64c05061
Fixup automatic THANKS generation
This avoids the need to use mktemp as well as fixes the removal of the
blank lines in THANKS that we want. This notably does not fix the
dependency issue for AUTHORS.gz on the Git history.
Thanks for cleaning this up! :)
Not to be overly pedantic, but did you mean THANKS.gz (and THANKS.tmp
in the patch). I don't see any connection to AUTHORS[.gz], but I may
be missing something very obvious.
If it is THANKS.gz, can't we rm -f $@ as the first command in the target?
Cheers
Jan
--
Oh good catch. I kept doing that s/AUTHORS/THANKS/ on the cli too.
Also, no for the rm -f, because that's after Make decides whether or
not to build it at all.
I'm adding a .PHONY rule for that target to force it to build
everytime which is correct enough if a bit of a hack. Pushing after I
see make distcheck run.
Sounds good, thanks for tag-teaming this! :)
Cheers
Jan
--
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e64c0506
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e64c0506
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e64c0506
Branch: refs/heads/master
Commit: e64c05061c2bbd7bb2d5456e972e61f67486d989
Parents: d93929f
Author: Paul Joseph Davis dav...@apache.org
Authored: Sun Jun 17 15:20:21 2012 -0500
Committer: Paul Joseph Davis dav...@apache.org
Committed: Sun Jun 17 15:36:02 2012 -0500
--
Makefile.am | 20 +---
THANKS |2 --
2 files changed, 9 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e64c0506/Makefile.am
--
diff --git a/Makefile.am b/Makefile.am
index 3ffc3df..6646ac9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,17 +79,15 @@ README.gz: $(top_srcdir)/README
-gzip -9 $ $@
THANKS.gz: $(top_srcdir)/THANKS
- TMP1=`mktemp -t THANKS`
- TMP2=`mktemp -t THANKS`
- sed -e 's/^#.*//' $ $TMP1 # strip comments
- sed -e '/^$$/d' $TMP1 $TMP2 # strip empty lines
- git shortlog -se 6c976bd..HEAD \
- | grep -v @apache.org \
- | sed -E 's/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /' \
- $TMP2 # inject git authors
- echo '\nFor a list of authors see the `AUTHORS` file.\n' $TMP2
- -gzip -9 $TMP2 $@ # zip
- rm $TMP1 $TMP2 # cleanup
+ @sed -e '/^#.*/d' $ $(top_builddir)/AUTHORS.tmp
+ @git shortlog -se 6c976bd..HEAD \
+ | grep -v @apache.org \
+ | sed -E 's/^[[:blank:]]{5}[[:digit:]]+[[:blank:]]/ * /' \
+ $(top_builddir)/AUTHORS.tmp
+ @echo '\nFor a list of authors see the `AUTHORS` file.\n' \
+ $(top_builddir)/AUTHORS.tmp
+ -gzip -9 $(top_builddir)/AUTHORS.tmp $@
+ @rm $(top_builddir)/AUTHORS.tmp
check: dev check-js
$(top_builddir)/test/etap/run $(top_srcdir)/test/etap
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e64c0506/THANKS
--
diff --git a/THANKS b/THANKS
index 1e065f8..fc4264d 100644
--- a/THANKS
+++ b/THANKS
@@ -91,10 +91,8 @@ suggesting improvements or submitting changes. Some of
these people are:
* Simon Leblanc sim.leblanc+apa...@gmail.com
* Rogutės Sparnuotos rogu...@googlemail.com
* Gavin McDonald gmcdon...@apache.org
-
# Dear committer who merges a commit from a non-committer:
# You don't have to manually maintain the THANKS file anymore (yay!).
# Non-committer authors get automatically appended to THANKS and
# moved into THANKS.gz by `make`. This note will be stripped as well.
# Authors from commit 6c976bd and onwards are auto-inserted.
-
New Install on Windows 2011 SBS
I have downloaded and installed CouchDB 1.20 (R15B) on a SBS2011 server.
Upon first start, it fails, with the following.
---
Erlang R15B (erts-5.9) [source] [smp:8:8] [async-threads:0]
Eshell V5.9 (abort with ^G)
1 {init terminating in
do_boot,{{badmatch,{error,{{app_would_not_start,os_mon},{couch_app,star
t,[normal,[../etc/couchdb/default.ini,../etc/couchdb/local.ini]]
,[{couch,start,0,[{file,d:/relax/couchdb/src/couchdb/couch.erl},{line,
18}]},{init,start_it,1,[{file,init.erl},{line,1041}]},{init,start_em,1
,[{file,init.erl},{line,1022}]}]}}
init terminating in do_boot ()
Abnormal termination
---
I do not have a drive D:, and I am not sure where the setting D:/relax
is coming from. I have checked the default.ini, and local.ini, and these
are stock. I tested on a win7 x64, and it worked without a problem. Is
this an error with SBS2011?
couchdb pull request: Fix for `init.d` script
Github user akaspin closed the pull request at: https://github.com/apache/couchdb/pull/20
