Whitespace consistency (tabs for Makefiles I guess) git-svn-id: svn://svn.open-ils.org/OpenSRF/branches/rel_2_0@2165 9efc2488-bf62-4759-914b-345cdb29e865
Eliminate the old JSON parser, implemented in osrf_json_parser.c and the associated header osrf_json_utils.h. This parser has been completely replaced by a newer one implemented in osrf_parse_json.c, plus an incremental JSON parser (so far unused) in jsonpush.c.. The even older parser of JSON-with-comments is not affected. D include/opensrf/osrf_json_utils.h M include/opensrf/osrf_json.h D src/libopensrf/osrf_json_parser.c M src/libopensrf/osrf_json_object.c M src/libopensrf/Makefile.json M src/libopensrf/osrf_json_tools.c M src/libopensrf/Makefile.am M src/libopensrf/osrf_parse_json.c M Makefile.am git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@2000 9efc2488-bf62-4759-914b-345cdb29e865
And place headers in /prefix/include/opensrf/ again, fixing regression to /prefix/include/ git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1796 9efc2488-bf62-4759-914b-345cdb29e865
W h i t e s p a c e matters when defining automake targets Headers weren't being installed as the include_HEADER target wasn't being parsed. git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1795 9efc2488-bf62-4759-914b-345cdb29e865
Make building & installing the core components of OpenSRF optional. For now, this will be of most interest to those interested in installing only the JavaScript files from OpenSRF. If you disable the core components in configure, then dependency checking for those core components is skipped and the JavaScript files will be installed to the desired location. For example: ./autogen.sh ./configure --prefix=/openils --sysconfdir=/openils/conf --disable-core sudo make install ... will result in only the OpenSRF JavaScript files being installed in /openils/lib/javascript/ (although at the moment, the other directories will still be created). git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1783 9efc2488-bf62-4759-914b-345cdb29e865
Added distclean-local: target and DISTCLEANFILES to make 'make distclean' work superawesomely Added ACLOCAL_AMFLAGS at the behest of libtoolize git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1737 9efc2488-bf62-4759-914b-345cdb29e865
Clean up the source tree a little more: * Delete setup.py.in (as we're not modifying it) * Make math_client.py be modified with SYSCONFDIR location per other scripts (although slightly longer term we'll need to stop modifying all of these in place, because that doesn't work after the first ./configure run) * Add a few files to automake's tracking so that make dist is a little happier git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1484 9efc2488-bf62-4759-914b-345cdb29e865
merging perl CPANification/normalization branch work git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1418 9efc2488-bf62-4759-914b-345cdb29e865
Commit autotools patch from Kevin Beswick (adjusted slightly for Bill's objson API compatibility layer removal) Enclosed is a patch to update the OpenSRF autotools implementation. It fixes most bugs such as: -correctly replacing hardcoded directory paths in various files -correctly implementing clean, and uninstall make targets -fixes building src/c-apps modules without the lib prefix -builds the src/gateway apache modules with apxs -fixed the naming of the opensrf-c binary Also, it implements more of the autotools features: -rolling a tarball with make dist -enables VPATH (parallel) builds -checking a distribution with make distcheck ------------------------------------------- Developer's Certificate of Origin 1.1 By making a contribution to this project, I certify that: (a) The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or (b) The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as indicated in the file; or (c) The contribution was provided directly to me by some other person who certified (a), (b) or (c) and I have not modified it. (d) I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved. Signed-off-by: [Kevin Beswick (kevinbeswick00@gmail.com)] git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1375 9efc2488-bf62-4759-914b-345cdb29e865
* remove the objson API compat layer. * Set the default JSON gateway protocol to non-legacy json git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1373 9efc2488-bf62-4759-914b-345cdb29e865
Merge the following patches from Kevin Beswick: * fixed location to copy apachetools.h from ... * another typo... * fixed directory error in copying of header file. * move one more copy instruction for a header file. * create the perldir and jsdir * changed the place where headers are copied... fixed an error which caused them to be copied wrong. * fixed a capitalization typo issue in src/Makefile.am * updated opensrf.xml.example to use C math and dbmath implementation rather than Perl * fixed make distcheck problems -- builddir needed to be changed to srcdir * fixed directory replacement in .c file problem stopped the command added in the previous revision from running multiple times, fixed the location of the file to execute the command on. * changed where the directory replacement happens for osrf_json_gateway.c (it was after it was compiled rather than before) * corrected another error with installing header files ( can't install directories recursively through the 'prefix_PRIMARY = files' apparently) * went back to old way of copying perlmods and javascript. it will still be included in dist due to EXTRA_DIST in root makefile * fix install of src/javascript and src/perlmods * nobase_dist_lib_DATA defined twice... oops! * fixed problem with order of execution of targets (install-data-local was being executed before files were copied. resulted in an error) * fixed make dist, and changed ways that files are copied to their installed locations * fixed path substitution for the rest of the files with hardcoded paths to ensure correct default functionality of opensrf git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1367 9efc2488-bf62-4759-914b-345cdb29e865
Linking: * automake automatically figures out many linking directories; remove explicit linking options for . / .libs TMP files: * automake automatically creates a unique directory within TMPDIR; remove intermediate /opensrf/ directory (which causes problems for make clean) git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1355 9efc2488-bf62-4759-914b-345cdb29e865
Patch from Kevin Beswick (kbeswick00@gmail.com) to address various problems with the autotools: * src/libopensrf/Makefile.am: * Fix typo for -I (includes) vs. -L (linking libraries) compile option * src/Makefile.am: * Propagate NDEBUG compile flag to all other makefiles * Create target directories * Set directories in example config files to match configured options * configure.ac: * Set default prefix to /opensrf/ instead of /openils/ * bin/osrf_config.in: * Add --localstatedir option for osrf_config * Correct output value for --apxs * bin/osrf_ctl.sh * Set default PID dir to localstatedir rather than sysconfdir * Makefile.am: * Propagate NDEBUG compile flag to all other makefiles * Remove explicit rpath option, automake will figure that out for us (supposedly) * examples/opensrf_core.xml.example, examples/opensrf.xml.example, examples/srfsh.xml.example: * Set directories in example config files to match configured options git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1349 9efc2488-bf62-4759-914b-345cdb29e865
Patch from Kevin Beswick to use autotools for OpenSRF configuration and build Included is a patch for a working implementation of the GNU Autotools to OpenSRF. Some of the perks of this system are: the user is given the ability to install OpenSRF to non-standard locations, dependency/library checking, gives a user the ability to only install certain components, more portable to other operating systems, etc. To test, simply run: autogen.sh configure make make install Options for configure can be found using: ./configure --help Also, the patch contains a new file, osrf_config, which is generated by running the configure script. Running this file will print all build options a user has chosen when compiling/installing Opensrf. Command line arguments can be added to return each single build option as well. This is useful to developers in that they are able to locate a certain installation directory on a non-standard installation of OpenSRF. To see the available command line options, run: osrf_config --help git-svn-id: svn://svn.open-ils.org/OpenSRF/trunk@1348 9efc2488-bf62-4759-914b-345cdb29e865