Learn how easy it is to sync an existing GitHub or Google Code repo to a SourceForge project!

## brlcad-commits — READ-ONLY high-traffic list for source code change notifications (commit diffs)

You can subscribe to this list here.

2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 Jan Feb Mar Apr (15) May Jun (3) Jul Aug Sep Oct Nov (53) Dec (10) Jan (159) Feb (63) Mar (282) Apr (185) May (228) Jun (404) Jul (376) Aug (260) Sep (891) Oct (302) Nov (338) Dec (430) Jan (502) Feb (116) Mar (76) Apr (135) May (52) Jun (134) Jul (252) Aug (355) Sep (71) Oct (36) Nov (10) Dec (22) Jan (649) Feb (644) Mar (458) Apr (317) May (519) Jun (196) Jul (201) Aug (139) Sep (504) Oct (491) Nov (749) Dec (702) Jan (306) Feb (261) Mar (154) Apr (355) May (296) Jun (420) Jul (509) Aug (389) Sep (211) Oct (304) Nov (159) Dec (180) Jan (193) Feb (290) Mar (206) Apr (253) May (220) Jun (372) Jul (534) Aug (400) Sep (322) Oct (242) Nov (374) Dec (360) Jan (419) Feb (296) Mar (477) Apr (646) May (471) Jun (284) Jul (211) Aug (412) Sep (493) Oct (313) Nov (286) Dec (416) Jan (914) Feb (714) Mar (614) Apr (397) May (177) Jun (640) Jul (382) Aug (778) Sep (484) Oct (370) Nov (340) Dec (464) Jan (982) Feb (417) Mar (278) Apr (517) May (424) Jun (580) Jul (358) Aug (605) Sep (257) Oct (809) Nov (519) Dec (197) Jan (159) Feb (229) Mar (480) Apr (282) May (348) Jun (283) Jul (495) Aug (960) Sep (648) Oct (381) Nov (330) Dec (522) Jan (393) Feb (388) Mar (305) Apr (127) May (593) Jun (444) Jul (508) Aug (476) Sep (595) Oct (196) Nov (310) Dec (277) Jan (242) Feb (207) Mar (220) Apr (263) May (237) Jun Jul Aug Sep Oct Nov Dec

Showing results of 46410

1 2 3 .. 1857 > >> (Page 1 of 1857)
 [brlcad-commits] SF.net SVN: brlcad:[65039] brlcad/trunk/src/conv/gcv/gcv.cpp From: - 2015-05-23 22:56:06 Revision: 65039 http://sourceforge.net/p/brlcad/code/65039 Author: starseeker Date: 2015-05-23 22:56:03 +0000 (Sat, 23 May 2015) Log Message: ----------- Demonstrate proof-of-concept returning of format specific help Modified Paths: -------------- brlcad/trunk/src/conv/gcv/gcv.cpp Modified: brlcad/trunk/src/conv/gcv/gcv.cpp =================================================================== --- brlcad/trunk/src/conv/gcv/gcv.cpp 2015-05-22 21:36:31 UTC (rev 65038) +++ brlcad/trunk/src/conv/gcv/gcv.cpp 2015-05-23 22:56:03 UTC (rev 65039) @@ -121,6 +121,14 @@ if (option.arg[0] == '-') return option::ARG_IGNORE; return option::ARG_OK; } + /* Help may or may not get a format argument */ + static option::ArgStatus Help(const option::Option& option, bool UNUSED(msg)) + { + if (!option.arg) return option::ARG_NONE; + if (option.arg[0] == '-') return option::ARG_IGNORE; + return option::ARG_OK; + } + /* Format specifiers, on the other hand, must be validated - that * means that the options used at the top level for format specification * will not be usable at any lower level */ @@ -144,7 +152,7 @@ const option::Descriptor TopUsage[] = { { UNKNOWN, 0, "", "", TopLevelArg::Unknown, "USAGE: gcv [options] [fmt:]input [fmt:]output\n"}, - { HELP, 0, "h", "help", option::Arg::Optional, "-h [format]\t --help [format]\t Print help and exit. If a format is specified, print help specific to that format" }, + { HELP, 0, "h", "help", TopLevelArg::Help, "-h\t --help [format]\t Print help and exit. If a format is specified to --help, print help specific to that format" }, { IN_FORMAT , 0, "", "in-format", TopLevelArg::Format, "\t --in-format\t File format of input file." }, { OUT_FORMAT , 0, "", "out-format", TopLevelArg::Format, "\t --out-format\t File format of output file." }, { IN_OPT , 0, "", "in-
 [brlcad-commits] SF.net SVN: brlcad:[65038] brlcad/trunk/src/util/gencolor.c From: - 2015-05-22 21:36:33 Revision: 65038 http://sourceforge.net/p/brlcad/code/65038 Author: carlmoore Date: 2015-05-22 21:36:31 +0000 (Fri, 22 May 2015) Log Message: ----------- fix the case of use of any of -p,-b,-L,-H where the number of input values is not integer multiple of number of values needed for the file Modified Paths: -------------- brlcad/trunk/src/util/gencolor.c Modified: brlcad/trunk/src/util/gencolor.c =================================================================== --- brlcad/trunk/src/util/gencolor.c 2015-05-22 20:44:26 UTC (rev 65037) +++ brlcad/trunk/src/util/gencolor.c 2015-05-22 21:36:31 UTC (rev 65038) @@ -108,6 +108,7 @@ main(int argc, char **argv) { int i, len, times, bytes_in_buf, copies_per_buf; + int remainder = 0; int32_t basemultiple = 262144; /* This is 512 squared. */ unsigned char *bp; @@ -136,10 +137,7 @@ } /* If -r was used, ignore -p,-b,-L,-H */ - if (setrcount) { - if (count > 0 && count < len) len = count; - } - else { + if (!setrcount) { if (outputtype == 1) { if (resolution == 1) count = basemultiple*3; @@ -151,9 +149,12 @@ else count = basemultiple*4; } - count = count/len; /* e.g., len is 3 for RGB for a pix file */ + remainder = count % len; + count = count/len; /* e.g., len is 3 for RGB for a pix file */ } +finishup: + /* * Replicate the pattern as many times as it will fit * in the buffer. @@ -188,6 +189,13 @@ count -= times; } + if (remainder > 0) { + count = 1; + len = remainder; + remainder = 0; + goto finishup; + } + return 0; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
 [brlcad-commits] SF.net SVN: brlcad:[65037] brlcad/trunk/src/conv/gcv/gcv.cpp From: - 2015-05-22 20:44:28 Revision: 65037 http://sourceforge.net/p/brlcad/code/65037 Author: starseeker Date: 2015-05-22 20:44:26 +0000 (Fri, 22 May 2015) Log Message: ----------- to the top level, these are unknowns, not format options. Modified Paths: -------------- brlcad/trunk/src/conv/gcv/gcv.cpp Modified: brlcad/trunk/src/conv/gcv/gcv.cpp =================================================================== --- brlcad/trunk/src/conv/gcv/gcv.cpp 2015-05-22 20:38:03 UTC (rev 65036) +++ brlcad/trunk/src/conv/gcv/gcv.cpp 2015-05-22 20:44:26 UTC (rev 65037) @@ -147,9 +147,9 @@ { HELP, 0, "h", "help", option::Arg::Optional, "-h [format]\t --help [format]\t Print help and exit. If a format is specified, print help specific to that format" }, { IN_FORMAT , 0, "", "in-format", TopLevelArg::Format, "\t --in-format\t File format of input file." }, { OUT_FORMAT , 0, "", "out-format", TopLevelArg::Format, "\t --out-format\t File format of output file." }, - { IN_OPT , 0, "", "in-
 [brlcad-commits] SF.net SVN: brlcad:[65036] brlcad/trunk/src/conv/gcv/gcv.cpp From: - 2015-05-22 20:38:06 Revision: 65036 http://sourceforge.net/p/brlcad/code/65036 Author: starseeker Date: 2015-05-22 20:38:03 +0000 (Fri, 22 May 2015) Log Message: ----------- More help output tweaking, and add ability to differentiate between input-only, output-only and input-and-output applicable options. Modified Paths: -------------- brlcad/trunk/src/conv/gcv/gcv.cpp Modified: brlcad/trunk/src/conv/gcv/gcv.cpp =================================================================== --- brlcad/trunk/src/conv/gcv/gcv.cpp 2015-05-22 20:03:09 UTC (rev 65035) +++ brlcad/trunk/src/conv/gcv/gcv.cpp 2015-05-22 20:38:03 UTC (rev 65036) @@ -140,42 +140,58 @@ }; -enum TopOptionIndex { UNKNOWN, HELP, IN_FORMAT, OUT_FORMAT }; +enum TopOptionIndex { UNKNOWN, HELP, IN_FORMAT, OUT_FORMAT, IN_OPT, OUT_OPT, BOTH_OPT }; const option::Descriptor TopUsage[] = { { UNKNOWN, 0, "", "", TopLevelArg::Unknown, "USAGE: gcv [options] [fmt:]input [fmt:]output\n"}, - { HELP, 0, "h", "help", option::Arg::Optional, "-h [category]\t --help [category]\t Print help and exit." }, + { HELP, 0, "h", "help", option::Arg::Optional, "-h [format]\t --help [format]\t Print help and exit. If a format is specified, print help specific to that format" }, { IN_FORMAT , 0, "", "in-format", TopLevelArg::Format, "\t --in-format\t File format of input file." }, - { OUT_FORMAT , 0, "", "out-format", TopLevelArg::Format, "\t --out-format\t File format of input file." }, + { OUT_FORMAT , 0, "", "out-format", TopLevelArg::Format, "\t --out-format\t File format of output file." }, + { IN_OPT , 0, "", "in-
 [brlcad-commits] SF.net SVN: brlcad:[65035] brlcad/trunk/src/libbu/mime.cmake From: - 2015-05-22 20:03:13 Revision: 65035 http://sourceforge.net/p/brlcad/code/65035 Author: starseeker Date: 2015-05-22 20:03:09 +0000 (Fri, 22 May 2015) Log Message: ----------- Try haulting configure and reporting the difference for mime, rather than updating automatically. More jarring, but also more principled in terms of not modifying the src tree. Modified Paths: -------------- brlcad/trunk/src/libbu/mime.cmake Modified: brlcad/trunk/src/libbu/mime.cmake =================================================================== --- brlcad/trunk/src/libbu/mime.cmake 2015-05-22 19:39:16 UTC (rev 65034) +++ brlcad/trunk/src/libbu/mime.cmake 2015-05-22 20:03:09 UTC (rev 65035) @@ -248,7 +248,15 @@ file(WRITE ${mime_h_file_tmp} "${h_contents}") file(WRITE ${mime_c_file_tmp} "${c_contents}") -execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different${mime_h_file_tmp} ${MIME_H_FILE}) +# The header is checked in to the source tree, so to allow for +# a "read-only" source tree we make an out of sync mime.h file +# a configure failure that needs to be corrected. +execute_process(COMMAND${CMAKE_COMMAND} -E compare_files ${mime_h_file_tmp}${MIME_H_FILE} RESULT_VARIABLE header_diff) +if(header_diff) + message(FATAL_ERROR "${MIME_H_FILE} is out of date - please update with${mime_h_file_tmp}") +endif(header_diff) + +# The C file we generate in the build directory execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different${mime_c_file_tmp} ${MIME_C_FILE}) execute_process(COMMAND${CMAKE_COMMAND} -E remove ${mime_h_file_tmp}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [brlcad-commits] SF.net SVN: brlcad:[65034] brlcad/trunk From: - 2015-05-22 19:39:19 Revision: 65034 http://sourceforge.net/p/brlcad/code/65034 Author: starseeker Date: 2015-05-22 19:39:16 +0000 (Fri, 22 May 2015) Log Message: ----------- Check in the bu/mime.h header and update the cmake script to maintain it there instead of in the build directory. Since the header seldom changes, go with the clarity of including it where it is expected instead of enforcing the 'minimize configure/build changes to src dir files' policy. Modified Paths: -------------- brlcad/trunk/include/bu/CMakeLists.txt brlcad/trunk/src/libbu/CMakeLists.txt brlcad/trunk/src/libbu/mime.cmake Added Paths: ----------- brlcad/trunk/include/bu/mime.h Modified: brlcad/trunk/include/bu/CMakeLists.txt =================================================================== --- brlcad/trunk/include/bu/CMakeLists.txt 2015-05-22 18:54:42 UTC (rev 65033) +++ brlcad/trunk/include/bu/CMakeLists.txt 2015-05-22 19:39:16 UTC (rev 65034) @@ -17,6 +17,7 @@ magic.h malloc.h mapped_file.h + mime.h parallel.h parse.h path.h Added: brlcad/trunk/include/bu/mime.h =================================================================== --- brlcad/trunk/include/bu/mime.h (rev 0) +++ brlcad/trunk/include/bu/mime.h 2015-05-22 19:39:16 UTC (rev 65034) @@ -0,0 +1,882 @@ +/** + * Mime type definitions and mapping functions + * + * Do not edit these files directly - apply updates to mime definition files. + * The file misc/mime.types is from: + * http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types + * and should be kept in sync with that copy. + * + * The file misc/mime_cad.types holds local additions to the 'standard' mime types, + * such as the addition of many additional geometry file formats. Any "local" mime + * type definitions not part of the actual standards should be added there. */ + +/* These sources are generated from the public domain data files and are in the public domain.*/ + +#ifndef BU_MIME_H +#define BU_MIME_H + +#include "common.h" +#include "bu/defines.h" + +__BEGIN_DECLS + +typedef enum { + MIME_APPLICATION, + MIME_AUDIO, + MIME_CHEMICAL, + MIME_IMAGE, + MIME_MESSAGE, + MIME_MODEL, + MIME_TEXT, + MIME_VIDEO, + MIME_X_DASH_CONFERENCE, + MIME_UNKNOWN +} mime_context_t; + + +typedef enum { + MIME_APPLICATION_AUTO, + MIME_APPLICATION_ANDREW_DASH_INSET, + MIME_APPLICATION_APPLIXWARE, + MIME_APPLICATION_ATOMCAT_PLUS_XML, + MIME_APPLICATION_ATOMSVC_PLUS_XML, + MIME_APPLICATION_ATOM_PLUS_XML, + MIME_APPLICATION_CCXML_PLUS_XML, + MIME_APPLICATION_CDMI_DASH_CAPABILITY, + MIME_APPLICATION_CDMI_DASH_CONTAINER, + MIME_APPLICATION_CDMI_DASH_DOMAIN, + MIME_APPLICATION_CDMI_DASH_OBJECT, + MIME_APPLICATION_CDMI_DASH_QUEUE, + MIME_APPLICATION_CU_DASH_SEEME, + MIME_APPLICATION_DAVMOUNT_PLUS_XML, + MIME_APPLICATION_DOCBOOK_PLUS_XML, + MIME_APPLICATION_DSSC_PLUS_DER, + MIME_APPLICATION_DSSC_PLUS_XML, + MIME_APPLICATION_ECMASCRIPT, + MIME_APPLICATION_EMMA_PLUS_XML, + MIME_APPLICATION_EPUB_PLUS_ZIP, + MIME_APPLICATION_EXI, + MIME_APPLICATION_FONT_DASH_TDPFR, + MIME_APPLICATION_FONT_DASH_WOFF, + MIME_APPLICATION_GML_PLUS_XML, + MIME_APPLICATION_GPX_PLUS_XML, + MIME_APPLICATION_GXF, + MIME_APPLICATION_HYPERSTUDIO, + MIME_APPLICATION_INKML_PLUS_XML, + MIME_APPLICATION_IPFIX, + MIME_APPLICATION_JAVASCRIPT, + MIME_APPLICATION_JAVA_DASH_ARCHIVE, + MIME_APPLICATION_JAVA_DASH_SERIALIZED_DASH_OBJECT, + MIME_APPLICATION_JAVA_DASH_VM, + MIME_APPLICATION_JSON, + MIME_APPLICATION_JSONML_PLUS_JSON, + MIME_APPLICATION_LOST_PLUS_XML, + MIME_APPLICATION_MAC_DASH_BINHEX40, + MIME_APPLICATION_MAC_DASH_COMPACTPRO, + MIME_APPLICATION_MADS_PLUS_XML, + MIME_APPLICATION_MARC, + MIME_APPLICATION_MARCXML_PLUS_XML, + MIME_APPLICATION_MATHEMATICA, + MIME_APPLICATION_MATHML_PLUS_XML, + MIME_APPLICATION_MBOX, + MIME_APPLICATION_MEDIASERVERCONTROL_PLUS_XML, + MIME_APPLICATION_METALINK4_PLUS_XML, + MIME_APPLICATION_METALINK_PLUS_XML, + MIME_APPLICATION_METS_PLUS_XML, + MIME_APPLICATION_MODS_PLUS_XML, + MIME_APPLICATION_MP21, + MIME_APPLICATION_MP4, + MIME_APPLICATION_MSWORD, + MIME_APPLICATION_MXF, + MIME_APPLICATION_OCTET_DASH_STREAM, + MIME_APPLICATION_ODA, + MIME_APPLICATION_OEBPS_DASH_PACKAGE_PLUS_XML, + MIME_APPLICATION_OGG, + MIME_APPLICATION_OMDOC_PLUS_XML, + MIME_APPLICATION_ONENOTE, + MIME_APPLICATION_OXPS, + MIME_APPLICATION_PATCH_DASH_OPS_DASH_ERROR_PLUS_XML, + MIME_APPLICATION_PDF, + MIME_APPLICATION_PGP_DASH_ENCRYPTED, + MIME_APPLICATION_PGP_DASH_SIGNATURE, + MIME_APPLICATION_PICS_DASH_RULES, + MIME_APPLICATION_PKCS10, + MIME_APPLICATION_PKCS7_DASH_MIME, + MIME_APPLICATION_PKCS7_DASH_SIGNATURE, + MIME_APPLICATION_PKCS8, + MIME_APPLICATION_PKIXCMP, + MIME_APPLICATION_PKIX_DASH_ATTR_DASH_CERT, + MIME_APPLICATION_PKIX_DASH_CERT, + MIME_APPLICATION_PKIX_DASH_CRL, + MIME_APPLICATION_PKIX_DASH_PKIPATH, + MIME_APPLICATION_PLS_PLUS_XML, + MIME_APPLICATION_POSTSCRIPT, + MIME_APPLICATION_PRS_CWW, + MIME_APPLICATION_PSKC_PLUS_XML, + MIME_APPLICATION_RDF_PLUS_XML, + MIME_APPLICATION_REGINFO_PLUS_XML, + MIME_APPLICATION_RELAX_DASH_NG_DASH_COMPACT_DASH_SYNTAX, + MIME_APPLICATION_RESOURCE_DASH_LISTS_DASH_DIFF_PLUS_XML, + MIME_APPLICATION_RESOURCE_DASH_LISTS_PLUS_XML, + MIME_APPLICATION_RLS_DASH_SERVICES_PLUS_XML, + MIME_APPLICATION_RPKI_DASH_GHOSTBUSTERS, + MIME_APPLICATION_RPKI_DASH_MANIFEST, + MIME_APPLICATION_RPKI_DASH_ROA, + MIME_APPLICATION_RSD_PLUS_XML, + MIME_APPLICATION_RSS_PLUS_XML, + MIME_APPLICATION_RTF, + MIME_APPLICATION_SBML_PLUS_XML, + MIME_APPLICATION_SCVP_DASH_CV_DASH_REQUEST, + MIME_APPLICATION_SCVP_DASH_CV_DASH_RESPONSE, + MIME_APPLICATION_SCVP_DASH_VP_DASH_REQUEST, + MIME_APPLICATION_SCVP_DASH_VP_DASH_RESPONSE, + MIME_APPLICATION_SDP, + MIME_APPLICATION_SET_DASH_PAYMENT_DASH_INITIATION, + MIME_APPLICATION_SET_DASH_REGISTRATION_DASH_INITIATION, + MIME_APPLICATION_SHF_PLUS_XML, + MIME_APPLICATION_SMIL_PLUS_XML, + MIME_APPLICATION_SPARQL_DASH_QUERY, + MIME_APPLICATION_SPARQL_DASH_RESULTS_PLUS_XML, + MIME_APPLICATION_SRGS, + MIME_APPLICATION_SRGS_PLUS_XML, + MIME_APPLICATION_SRU_PLUS_XML, + MIME_APPLICATION_SSDL_PLUS_XML, + MIME_APPLICATION_SSML_PLUS_XML, + MIME_APPLICATION_TEI_PLUS_XML, + MIME_APPLICATION_THRAUD_PLUS_XML, + MIME_APPLICATION_TIMESTAMPED_DASH_DATA, + MIME_APPLICATION_VND_3GPP2_TCAP, + MIME_APPLICATION_VND_3GPP_PIC_DASH_BW_DASH_LARGE, + MIME_APPLICATION_VND_3GPP_PIC_DASH_BW_DASH_SMALL, + MIME_APPLICATION_VND_3GPP_PIC_DASH_BW_DASH_VAR, + MIME_APPLICATION_VND_3M_POST_DASH_IT_DASH_NOTES, + MIME_APPLICATION_VND_ACCPAC_SIMPLY_ASO, + MIME_APPLICATION_VND_ACCPAC_SIMPLY_IMP, + MIME_APPLICATION_VND_ACUCOBOL, + MIME_APPLICATION_VND_ACUCORP, + MIME_APPLICATION_VND_ADOBE_AIR_DASH_APPLICATION_DASH_INSTALLER_DASH_PACKAGE_PLUS_ZIP, + MIME_APPLICATION_VND_ADOBE_FORMSCENTRAL_FCDT, + MIME_APPLICATION_VND_ADOBE_FXP, + MIME_APPLICATION_VND_ADOBE_XDP_PLUS_XML, + MIME_APPLICATION_VND_ADOBE_XFDF, + MIME_APPLICATION_VND_AHEAD_SPACE, + MIME_APPLICATION_VND_AIRZIP_FILESECURE_AZF, + MIME_APPLICATION_VND_AIRZIP_FILESECURE_AZS, + MIME_APPLICATION_VND_AMAZON_EBOOK, + MIME_APPLICATION_VND_AMERICANDYNAMICS_ACC, + MIME_APPLICATION_VND_AMIGA_AMI, + MIME_APPLICATION_VND_ANDROID_PACKAGE_DASH_ARCHIVE, + MIME_APPLICATION_VND_ANSER_DASH_WEB_DASH_CERTIFICATE_DASH_ISSUE_DASH_INITIATION, + MIME_APPLICATION_VND_ANSER_DASH_WEB_DASH_FUNDS_DASH_TRANSFER_DASH_INITIATION, + MIME_APPLICATION_VND_ANTIX_GAME_DASH_COMPONENT, + MIME_APPLICATION_VND_APPLE_INSTALLER_PLUS_XML, + MIME_APPLICATION_VND_APPLE_MPEGURL, + MIME_APPLICATION_VND_ARISTANETWORKS_SWI, + MIME_APPLICATION_VND_ASTRAEA_DASH_SOFTWARE_IOTA, + MIME_APPLICATION_VND_AUDIOGRAPH, + MIME_APPLICATION_VND_BLUEICE_MULTIPASS, + MIME_APPLICATION_VND_BMI, + MIME_APPLICATION_VND_BUSINESSOBJECTS, + MIME_APPLICATION_VND_CHEMDRAW_PLUS_XML, + MIME_APPLICATION_VND_CHIPNUTS_KARAOKE_DASH_MMD, + MIME_APPLICATION_VND_CINDERELLA, + MIME_APPLICATION_VND_CLAYMORE, + MIME_APPLICATION_VND_CLOANTO_RP9, + MIME_APPLICATION_VND_CLONK_C4GROUP, + MIME_APPLICATION_VND_CLUETRUST_CARTOMOBILE_DASH_CONFIG, + MIME_APPLICATION_VND_CLUETRUST_CARTOMOBILE_DASH_CONFIG_DASH_PKG, + MIME_APPLICATION_VND_COMMONSPACE, + MIME_APPLICATION_VND_CONTACT_CMSG, + MIME_APPLICATION_VND_COSMOCALLER, + MIME_APPLICATION_VND_CRICK_CLICKER, + MIME_APPLICATION_VND_CRICK_CLICKER_KEYBOARD, + MIME_APPLICATION_VND_CRICK_CLICKER_PALETTE, + MIME_APPLICATION_VND_CRICK_CLICKER_TEMPLATE, + MIME_APPLICATION_VND_CRICK_CLICKER_WORDBANK, + MIME_APPLICATION_VND_CRITICALTOOLS_WBS_PLUS_XML, + MIME_APPLICATION_VND_CTC_DASH_POSML, + MIME_APPLICATION_VND_CUPS_DASH_PPD, + MIME_APPLICATION_VND_CURL_CAR, + MIME_APPLICATION_VND_CURL_PCURL, + MIME_APPLICATION_VND_DART, + MIME_APPLICATION_VND_DATA_DASH_VISION_RDZ, + MIME_APPLICATION_VND_DECE_DATA, + MIME_APPLICATION_VND_DECE_TTML_PLUS_XML, + MIME_APPLICATION_VND_DECE_UNSPECIFIED, + MIME_APPLICATION_VND_DECE_ZIP, + MIME_APPLICATION_VND_DENOVO_FCSELAYOUT_DASH_LINK, + MIME_APPLICATION_VND_DNA, + MIME_APPLICATION_VND_DOLBY_MLP, + MIME_APPLICATION_VND_DPGRAPH, + MIME_APPLICATION_VND_DREAMFACTORY, + MIME_APPLICATION_VND_DS_DASH_KEYPOINT, + MIME_APPLICATION_VND_DVB_AIT, + MIME_APPLICATION_VND_DVB_SERVICE, + MIME_APPLICATION_VND_DYNAGEO, + MIME_APPLICATION_VND_ECOWIN_CHART, + MIME_APPLICATION_VND_ENLIVEN, + MIME_APPLICATION_VND_EPSON_ESF, + MIME_APPLICATION_VND_EPSON_MSF, + MIME_APPLICATION_VND_EPSON_QUICKANIME, + MIME_APPLICATION_VND_EPSON_SALT, + MIME_APPLICATION_VND_EPSON_SSF, + MIME_APPLICATION_VND_ESZIGNO3_PLUS_XML, + MIME_APPLICATION_VND_EZPIX_DASH_ALBUM, + MIME_APPLICATION_VND_EZPIX_DASH_PACKAGE, + MIME_APPLICATION_VND_FDF, + MIME_APPLICATION_VND_FDSN_MSEED, + MIME_APPLICATION_VND_FDSN_SEED, + MIME_APPLICATION_VND_FLOGRAPHIT, + MIME_APPLICATION_VND_FLUXTIME_CLIP, + MIME_APPLICATION_VND_FRAMEMAKER, + MIME_APPLICATION_VND_FROGANS_FNC, + MIME_APPLICATION_VND_FROGANS_LTF, + MIME_APPLICATION_VND_FSC_WEBLAUNCH, + MIME_APPLICATION_VND_FUJITSU_OASYS, + MIME_APPLICATION_VND_FUJITSU_OASYS2, + MIME_APPLICATION_VND_FUJITSU_OASYS3, + MIME_APPLICATION_VND_FUJITSU_OASYSGP, + MIME_APPLICATION_VND_FUJITSU_OASYSPRS, + MIME_APPLICATION_VND_FUJIXEROX_DDD, + MIME_APPLICATION_VND_FUJIXEROX_DOCUWORKS, + MIME_APPLICATION_VND_FUJIXEROX_DOCUWORKS_BINDER, + MIME_APPLICATION_VND_FUZZYSHEET, + MIME_APPLICATION_VND_GENOMATIX_TUXEDO, + MIME_APPLICATION_VND_GEOGEBRA_FILE, + MIME_APPLICATION_VND_GEOGEBRA_TOOL, + MIME_APPLICATION_VND_GEOMETRY_DASH_EXPLORER, + MIME_APPLICATION_VND_GEONEXT, + MIME_APPLICATION_VND_GEOPLAN, + MIME_APPLICATION_VND_GEOSPACE, + MIME_APPLICATION_VND_GMX, + MIME_APPLICATION_VND_GOOGLE_DASH_EARTH_KML_PLUS_XML, + MIME_APPLICATION_VND_GOOGLE_DASH_EARTH_KMZ, + MIME_APPLICATION_VND_GRAFEQ, + MIME_APPLICATION_VND_GROOVE_DASH_ACCOUNT, + MIME_APPLICATION_VND_GROOVE_DASH_HELP, + MIME_APPLICATION_VND_GROOVE_DASH_IDENTITY_DASH_MESSAGE, + MIME_APPLICATION_VND_GROOVE_DASH_INJECTOR, + MIME_APPLICATION_VND_GROOVE_DASH_TOOL_DASH_MESSAGE, + MIME_APPLICATION_VND_GROOVE_DASH_TOOL_DASH_TEMPLATE, + MIME_APPLICATION_VND_GROOVE_DASH_VCARD, + MIME_APPLICATION_VND_HAL_PLUS_XML, + MIME_APPLICATION_VND_HANDHELD_DASH_ENTERTAINMENT_PLUS_XML, + MIME_APPLICATION_VND_HBCI, + MIME_APPLICATION_VND_HHE_LESSON_DASH_PLAYER, + MIME_APPLICATION_VND_HP_DASH_HPGL, + MIME_APPLICATION_VND_HP_DASH_HPID, + MIME_APPLICATION_VND_HP_DASH_HPS, + MIME_APPLICATION_VND_HP_DASH_JLYT, + MIME_APPLICATION_VND_HP_DASH_PCL, + MIME_APPLICATION_VND_HP_DASH_PCLXL, + MIME_APPLICATION_VND_HYDROSTATIX_SOF_DASH_DATA, + MIME_APPLICATION_VND_IBM_MINIPAY, + MIME_APPLICATION_VND_IBM_MODCAP, + MIME_APPLICATION_VND_IBM_RIGHTS_DASH_MANAGEMENT, + MIME_APPLICATION_VND_IBM_SECURE_DASH_CONTAINER, + MIME_APPLICATION_VND_ICCPROFILE, + MIME_APPLICATION_VND_IGLOADER, + MIME_APPLICATION_VND_IMMERVISION_DASH_IVP, + MIME_APPLICATION_VND_IMMERVISION_DASH_IVU, + MIME_APPLICATION_VND_INSORS_IGM, + MIME_APPLICATION_VND_INTERCON_FORMNET, + MIME_APPLICATION_VND_INTERGEO, + MIME_APPLICATION_VND_INTU_QBO, + MIME_APPLICATION_VND_INTU_QFX, + MIME_APPLICATION_VND_IPUNPLUGGED_RCPROFILE, + MIME_APPLICATION_VND_IREPOSITORY_PACKAGE_PLUS_XML, + MIME_APPLICATION_VND_ISAC_FCS, + MIME_APPLICATION_VND_IS_DASH_XPR, + MIME_APPLICATION_VND_JAM, + MIME_APPLICATION_VND_JCP_JAVAME_MIDLET_DASH_RMS, + MIME_APPLICATION_VND_JISP, + MIME_APPLICATION_VND_JOOST_JODA_DASH_ARCHIVE, + MIME_APPLICATION_VND_KAHOOTZ, + MIME_APPLICATION_VND_KDE_KARBON, + MIME_APPLICATION_VND_KDE_KCHART, + MIME_APPLICATION_VND_KDE_KFORMULA, + MIME_APPLICATION_VND_KDE_KIVIO, + MIME_APPLICATION_VND_KDE_KONTOUR, + MIME_APPLICATION_VND_KDE_KPRESENTER, + MIME_APPLICATION_VND_KDE_KSPREAD, + MIME_APPLICATION_VND_KDE_KWORD, + MIME_APPLICATION_VND_KENAMEAAPP, + MIME_APPLICATION_VND_KIDSPIRATION, + MIME_APPLICATION_VND_KINAR, + MIME_APPLICATION_VND_KOAN, + MIME_APPLICATION_VND_KODAK_DASH_DESCRIPTOR, + MIME_APPLICATION_VND_LAS_LAS_PLUS_XML, + MIME_APPLICATION_VND_LLAMAGRAPHICS_LIFE_DASH_BALANCE_DESKTOP, + MIME_APPLICATION_VND_LLAMAGRAPHICS_LIFE_DASH_BALANCE_EXCHANGE_PLUS_XML, + MIME_APPLICATION_VND_LOTUS_DASH_1_DASH_2_DASH_3, + MIME_APPLICATION_VND_LOTUS_DASH_APPROACH, + MIME_APPLICATION_VND_LOTUS_DASH_FREELANCE, + MIME_APPLICATION_VND_LOTUS_DASH_NOTES, + MIME_APPLICATION_VND_LOTUS_DASH_ORGANIZER, + MIME_APPLICATION_VND_LOTUS_DASH_SCREENCAM, + MIME_APPLICATION_VND_LOTUS_DASH_WORDPRO, + MIME_APPLICATION_VND_MACPORTS_PORTPKG, + MIME_APPLICATION_VND_MCD, + MIME_APPLICATION_VND_MEDCALCDATA, + MIME_APPLICATION_VND_MEDIASTATION_CDKEY, + MIME_APPLICATION_VND_MFER, + MIME_APPLICATION_VND_MFMP, + MIME_APPLICATION_VND_MICROGRAFX_FLO, + MIME_APPLICATION_VND_MICROGRAFX_IGX, + MIME_APPLICATION_VND_MIF, + MIME_APPLICATION_VND_MOBIUS_DAF, + MIME_APPLICATION_VND_MOBIUS_DIS, + MIME_APPLICATION_VND_MOBIUS_MBK, + MIME_APPLICATION_VND_MOBIUS_MQY, + MIME_APPLICATION_VND_MOBIUS_MSL, + MIME_APPLICATION_VND_MOBIUS_PLC, + MIME_APPLICATION_VND_MOBIUS_TXF, + MIME_APPLICATION_VND_MOPHUN_APPLICATION, + MIME_APPLICATION_VND_MOPHUN_CERTIFICATE, + MIME_APPLICATION_VND_MOZILLA_XUL_PLUS_XML, + MIME_APPLICATION_VND_MSEQ, + MIME_APPLICATION_VND_MS_DASH_ARTGALRY, + MIME_APPLICATION_VND_MS_DASH_CAB_DASH_COMPRESSED, + MIME_APPLICATION_VND_MS_DASH_EXCEL, + MIME_APPLICATION_VND_MS_DASH_EXCEL_ADDIN_MACROENABLED_12, + MIME_APPLICATION_VND_MS_DASH_EXCEL_SHEET_BINARY_MACROENABLED_12, + MIME_APPLICATION_VND_MS_DASH_EXCEL_SHEET_MACROENABLED_12, + MIME_APPLICATION_VND_MS_DASH_EXCEL_TEMPLATE_MACROENABLED_12, + MIME_APPLICATION_VND_MS_DASH_FONTOBJECT, + MIME_APPLICATION_VND_MS_DASH_HTMLHELP, + MIME_APPLICATION_VND_MS_DASH_IMS, + MIME_APPLICATION_VND_MS_DASH_LRM, + MIME_APPLICATION_VND_MS_DASH_OFFICETHEME, + MIME_APPLICATION_VND_MS_DASH_PKI_SECCAT, + MIME_APPLICATION_VND_MS_DASH_PKI_STL, + MIME_APPLICATION_VND_MS_DASH_POWERPOINT, + MIME_APPLICATION_VND_MS_DASH_POWERPOINT_ADDIN_MACROENABLED_12, + MIME_APPLICATION_VND_MS_DASH_POWERPOINT_PRESENTATION_MACROENABLED_12, + MIME_APPLICATION_VND_MS_DASH_POWERPOINT_SLIDESHOW_MACROENABLED_12, + MIME_APPLICATION_VND_MS_DASH_POWERPOINT_SLIDE_MACROENABLED_12, + MIME_APPLICATION_VND_MS_DASH_POWERPOINT_TEMPLATE_MACROENABLED_12, + MIME_APPLICATION_VND_MS_DASH_PROJECT, + MIME_APPLICATION_VND_MS_DASH_WORD_DOCUMENT_MACROENABLED_12, + MIME_APPLICATION_VND_MS_DASH_WORD_TEMPLATE_MACROENABLED_12, + MIME_APPLICATION_VND_MS_DASH_WORKS, + MIME_APPLICATION_VND_MS_DASH_WPL, + MIME_APPLICATION_VND_MS_DASH_XPSDOCUMENT, + MIME_APPLICATION_VND_MUSICIAN, + MIME_APPLICATION_VND_MUVEE_STYLE, + MIME_APPLICATION_VND_MYNFC, + MIME_APPLICATION_VND_NEUROLANGUAGE_NLU, + MIME_APPLICATION_VND_NITF, + MIME_APPLICATION_VND_NOBLENET_DASH_DIRECTORY, + MIME_APPLICATION_VND_NOBLENET_DASH_SEALER, + MIME_APPLICATION_VND_NOBLENET_DASH_WEB, + MIME_APPLICATION_VND_NOKIA_N_DASH_GAGE_DATA, + MIME_APPLICATION_VND_NOKIA_N_DASH_GAGE_SYMBIAN_INSTALL, + MIME_APPLICATION_VND_NOKIA_RADIO_DASH_PRESET, + MIME_APPLICATION_VND_NOKIA_RADIO_DASH_PRESETS, + MIME_APPLICATION_VND_NOVADIGM_EDM, + MIME_APPLICATION_VND_NOVADIGM_EDX, + MIME_APPLICATION_VND_NOVADIGM_EXT, + MIME_APPLICATION_VND_OASIS_OPENDOCUMENT_CHART, + MIME_APPLICATION_VND_OASIS_OPENDOCUMENT_CHART_DASH_TEMPLATE, + MIME_APPLICATION_VND_OASIS_OPENDOCUMENT_DATABASE, + MIME_APPLICATION_VND_OASIS_OPENDOCUMENT_FORMULA, + MIME_APPLICATION_VND_OASIS_OPENDOCUMENT_FORMULA_DASH_TEMPLATE, + MIME_APPLICATION_VND_OASIS_OPENDOCUMENT_GRAPHICS, + MIME_APPLICATION_VND_OASIS_OPENDOCUMENT_GRAPHICS_DASH_TEMPLATE, + MIME_APPLICATION_VND_OASIS_OPENDOCUMENT_IMAGE, + MIME_APPLICATION_VND_OASIS_OPENDOCUMENT_IMAGE_DASH_TEMPLATE, + MIME_APPLICATION_VND_OASIS_OPENDOCUMENT_PRESENTATION, + MIME_APPLICATION_VND_OASIS_OPENDOCUMENT_PRESENTATION_DASH_TEMPLATE, + MIME_APPLICATION_VND_OASIS_OPENDOCUMENT_SPREADSHEET, + MIME_APPLICATION_VND_OASIS_OPENDOCUMENT_SPREADSHEET_DASH_TEMPLATE, + MIME_APPLICATION_VND_OASIS_OPENDOCUMENT_TEXT, + MIME_APPLICATION_VND_OASIS_OPENDOCUMENT_TEXT_DASH_MASTER, + MIME_APPLICATION_VND_OASIS_OPENDOCUMENT_TEXT_DASH_TEMPLATE, + MIME_APPLICATION_VND_OASIS_OPENDOCUMENT_TEXT_DASH_WEB, + MIME_APPLICATION_VND_OLPC_DASH_SUGAR, + MIME_APPLICATION_VND_OMA_DD2_PLUS_XML, + MIME_APPLICATION_VND_OPENOFFICEORG_EXTENSION, + MIME_APPLICATION_VND_OPENXMLFORMATS_DASH_OFFICEDOCUMENT_PRESENTATIONML_PRESENTATION, + MIME_APPLICATION_VND_OPENXMLFORMATS_DASH_OFFICEDOCUMENT_PRESENTATIONML_SLIDE, + MIME_APPLICATION_VND_OPENXMLFORMATS_DASH_OFFICEDOCUMENT_PRESENTATIONML_SLIDESHOW, + MIME_APPLICATION_VND_OPENXMLFORMATS_DASH_OFFICEDOCUMENT_PRESENTATIONML_TEMPLATE, + MIME_APPLICATION_VND_OPENXMLFORMATS_DASH_OFFICEDOCUMENT_SPREADSHEETML_SHEET, + MIME_APPLICATION_VND_OPENXMLFORMATS_DASH_OFFICEDOCUMENT_SPREADSHEETML_TEMPLATE, + MIME_APPLICATION_VND_OPENXMLFORMATS_DASH_OFFICEDOCUMENT_WORDPROCESSINGML_DOCUMENT, + MIME_APPLICATION_VND_OPENXMLFORMATS_DASH_OFFICEDOCUMENT_WORDPROCESSINGML_TEMPLATE, + MIME_APPLICATION_VND_OSGEO_MAPGUIDE_PACKAGE, + MIME_APPLICATION_VND_OSGI_DP, + MIME_APPLICATION_VND_OSGI_SUBSYSTEM, + MIME_APPLICATION_VND_PALM, + MIME_APPLICATION_VND_PAWAAFILE, + MIME_APPLICATION_VND_PG_FORMAT, + MIME_APPLICATION_VND_PG_OSASLI, + MIME_APPLICATION_VND_PICSEL, + MIME_APPLICATION_VND_PMI_WIDGET, + MIME_APPLICATION_VND_POCKETLEARN, + MIME_APPLICATION_VND_POWERBUILDER6, + MIME_APPLICATION_VND_PREVIEWSYSTEMS_BOX, + MIME_APPLICATION_VND_PROTEUS_MAGAZINE, + MIME_APPLICATION_VND_PUBLISHARE_DASH_DELTA_DASH_TREE, + MIME_APPLICATION_VND_PVI_PTID1, + MIME_APPLICATION_VND_QUARK_QUARKXPRESS, + MIME_APPLICATION_VND_REALVNC_BED, + MIME_APPLICATION_VND_RECORDARE_MUSICXML, + MIME_APPLICATION_VND_RECORDARE_MUSICXML_PLUS_XML, + MIME_APPLICATION_VND_RIG_CRYPTONOTE, + MIME_APPLICATION_VND_RIM_COD, + MIME_APPLICATION_VND_RN_DASH_REALMEDIA, + MIME_APPLICATION_VND_RN_DASH_REALMEDIA_DASH_VBR, + MIME_APPLICATION_VND_ROUTE66_LINK66_PLUS_XML, + MIME_APPLICATION_VND_SAILINGTRACKER_TRACK, + MIME_APPLICATION_VND_SEEMAIL, + MIME_APPLICATION_VND_SEMA, + MIME_APPLICATION_VND_SEMD, + MIME_APPLICATION_VND_SEMF, + MIME_APPLICATION_VND_SHANA_INFORMED_FORMDATA, + MIME_APPLICATION_VND_SHANA_INFORMED_FORMTEMPLATE, + MIME_APPLICATION_VND_SHANA_INFORMED_INTERCHANGE, + MIME_APPLICATION_VND_SHANA_INFORMED_PACKAGE, + MIME_APPLICATION_VND_SIMTECH_DASH_MINDMAPPER, + MIME_APPLICATION_VND_SMAF, + MIME_APPLICATION_VND_SMART_TEACHER, + MIME_APPLICATION_VND_SOLENT_SDKM_PLUS_XML, + MIME_APPLICATION_VND_SPOTFIRE_DXP, + MIME_APPLICATION_VND_SPOTFIRE_SFS, + MIME_APPLICATION_VND_STARDIVISION_CALC, + MIME_APPLICATION_VND_STARDIVISION_DRAW, + MIME_APPLICATION_VND_STARDIVISION_IMPRESS, + MIME_APPLICATION_VND_STARDIVISION_MATH, + MIME_APPLICATION_VND_STARDIVISION_WRITER, + MIME_APPLICATION_VND_STARDIVISION_WRITER_DASH_GLOBAL, + MIME_APPLICATION_VND_STEPMANIA_PACKAGE, + MIME_APPLICATION_VND_STEPMANIA_STEPCHART, + MIME_APPLICATION_VND_SUN_XML_CALC, + MIME_APPLICATION_VND_SUN_XML_CALC_TEMPLATE, + MIME_APPLICATION_VND_SUN_XML_DRAW, + MIME_APPLICATION_VND_SUN_XML_DRAW_TEMPLATE, + MIME_APPLICATION_VND_SUN_XML_IMPRESS, + MIME_APPLICATION_VND_SUN_XML_IMPRESS_TEMPLATE, + MIME_APPLICATION_VND_SUN_XML_MATH, + MIME_APPLICATION_VND_SUN_XML_WRITER, + MIME_APPLICATION_VND_SUN_XML_WRITER_GLOBAL, + MIME_APPLICATION_VND_SUN_XML_WRITER_TEMPLATE, + MIME_APPLICATION_VND_SUS_DASH_CALENDAR, + MIME_APPLICATION_VND_SVD, + MIME_APPLICATION_VND_SYMBIAN_INSTALL, + MIME_APPLICATION_VND_SYNCML_DM_PLUS_WBXML, + MIME_APPLICATION_VND_SYNCML_DM_PLUS_XML, + MIME_APPLICATION_VND_SYNCML_PLUS_XML, + MIME_APPLICATION_VND_TAO_INTENT_DASH_MODULE_DASH_ARCHIVE, + MIME_APPLICATION_VND_TCPDUMP_PCAP, + MIME_APPLICATION_VND_TMOBILE_DASH_LIVETV, + MIME_APPLICATION_VND_TRID_TPT, + MIME_APPLICATION_VND_TRISCAPE_MXS, + MIME_APPLICATION_VND_TRUEAPP, + MIME_APPLICATION_VND_UFDL, + MIME_APPLICATION_VND_UIQ_THEME, + MIME_APPLICATION_VND_UMAJIN, + MIME_APPLICATION_VND_UNITY, + MIME_APPLICATION_VND_UOML_PLUS_XML, + MIME_APPLICATION_VND_VCX, + MIME_APPLICATION_VND_VISIO, + MIME_APPLICATION_VND_VISIONARY, + MIME_APPLICATION_VND_VSF, + MIME_APPLICATION_VND_WAP_WBXML, + MIME_APPLICATION_VND_WAP_WMLC, + MIME_APPLICATION_VND_WAP_WMLSCRIPTC, + MIME_APPLICATION_VND_WEBTURBO, + MIME_APPLICATION_VND_WOLFRAM_PLAYER, + MIME_APPLICATION_VND_WORDPERFECT, + MIME_APPLICATION_VND_WQD, + MIME_APPLICATION_VND_WT_STF, + MIME_APPLICATION_VND_XARA, + MIME_APPLICATION_VND_XFDL, + MIME_APPLICATION_VND_YAMAHA_HV_DASH_DIC, + MIME_APPLICATION_VND_YAMAHA_HV_DASH_SCRIPT, + MIME_APPLICATION_VND_YAMAHA_HV_DASH_VOICE, + MIME_APPLICATION_VND_YAMAHA_OPENSCOREFORMAT, + MIME_APPLICATION_VND_YAMAHA_OPENSCOREFORMAT_OSFPVG_PLUS_XML, + MIME_APPLICATION_VND_YAMAHA_SMAF_DASH_AUDIO, + MIME_APPLICATION_VND_YAMAHA_SMAF_DASH_PHRASE, + MIME_APPLICATION_VND_YELLOWRIVER_DASH_CUSTOM_DASH_MENU, + MIME_APPLICATION_VND_ZUL, + MIME_APPLICATION_VND_ZZAZZ_DECK_PLUS_XML, + MIME_APPLICATION_VOICEXML_PLUS_XML, + MIME_APPLICATION_WIDGET, + MIME_APPLICATION_WINHLP, + MIME_APPLICATION_WSDL_PLUS_XML, + MIME_APPLICATION_WSPOLICY_PLUS_XML, + MIME_APPLICATION_XAML_PLUS_XML, + MIME_APPLICATION_XCAP_DASH_DIFF_PLUS_XML, + MIME_APPLICATION_XENC_PLUS_XML, + MIME_APPLICATION_XHTML_PLUS_XML, + MIME_APPLICATION_XML, + MIME_APPLICATION_XML_DASH_DTD, + MIME_APPLICATION_XOP_PLUS_XML, + MIME_APPLICATION_XPROC_PLUS_XML, + MIME_APPLICATION_XSLT_PLUS_XML, + MIME_APPLICATION_XSPF_PLUS_XML, + MIME_APPLICATION_XV_PLUS_XML, + MIME_APPLICATION_X_DASH_7Z_DASH_COMPRESSED, + MIME_APPLICATION_X_DASH_ABIWORD, + MIME_APPLICATION_X_DASH_ACE_DASH_COMPRESSED, + MIME_APPLICATION_X_DASH_APPLE_DASH_DISKIMAGE, + MIME_APPLICATION_X_DASH_AUTHORWARE_DASH_BIN, + MIME_APPLICATION_X_DASH_AUTHORWARE_DASH_MAP, + MIME_APPLICATION_X_DASH_AUTHORWARE_DASH_SEG, + MIME_APPLICATION_X_DASH_BCPIO, + MIME_APPLICATION_X_DASH_BITTORRENT, + MIME_APPLICATION_X_DASH_BLORB, + MIME_APPLICATION_X_DASH_BZIP, + MIME_APPLICATION_X_DASH_BZIP2, + MIME_APPLICATION_X_DASH_CBR, + MIME_APPLICATION_X_DASH_CDLINK, + MIME_APPLICATION_X_DASH_CFS_DASH_COMPRESSED, + MIME_APPLICATION_X_DASH_CHAT, + MIME_APPLICATION_X_DASH_CHESS_DASH_PGN, + MIME_APPLICATION_X_DASH_CONFERENCE, + MIME_APPLICATION_X_DASH_CPIO, + MIME_APPLICATION_X_DASH_CSH, + MIME_APPLICATION_X_DASH_DEBIAN_DASH_PACKAGE, + MIME_APPLICATION_X_DASH_DGC_DASH_COMPRESSED, + MIME_APPLICATION_X_DASH_DIRECTOR, + MIME_APPLICATION_X_DASH_DOOM, + MIME_APPLICATION_X_DASH_DTBNCX_PLUS_XML, + MIME_APPLICATION_X_DASH_DTBOOK_PLUS_XML, + MIME_APPLICATION_X_DASH_DTBRESOURCE_PLUS_XML, + MIME_APPLICATION_X_DASH_DVI, + MIME_APPLICATION_X_DASH_ENVOY, + MIME_APPLICATION_X_DASH_EVA, + MIME_APPLICATION_X_DASH_FONT_DASH_BDF, + MIME_APPLICATION_X_DASH_FONT_DASH_GHOSTSCRIPT, + MIME_APPLICATION_X_DASH_FONT_DASH_LINUX_DASH_PSF, + MIME_APPLICATION_X_DASH_FONT_DASH_OTF, + MIME_APPLICATION_X_DASH_FONT_DASH_PCF, + MIME_APPLICATION_X_DASH_FONT_DASH_SNF, + MIME_APPLICATION_X_DASH_FONT_DASH_TTF, + MIME_APPLICATION_X_DASH_FONT_DASH_TYPE1, + MIME_APPLICATION_X_DASH_FREEARC, + MIME_APPLICATION_X_DASH_FUTURESPLASH, + MIME_APPLICATION_X_DASH_GCA_DASH_COMPRESSED, + MIME_APPLICATION_X_DASH_GLULX, + MIME_APPLICATION_X_DASH_GNUMERIC, + MIME_APPLICATION_X_DASH_GRAMPS_DASH_XML, + MIME_APPLICATION_X_DASH_GTAR, + MIME_APPLICATION_X_DASH_HDF, + MIME_APPLICATION_X_DASH_INSTALL_DASH_INSTRUCTIONS, + MIME_APPLICATION_X_DASH_ISO9660_DASH_IMAGE, + MIME_APPLICATION_X_DASH_JAVA_DASH_JNLP_DASH_FILE, + MIME_APPLICATION_X_DASH_LATEX, + MIME_APPLICATION_X_DASH_LZH_DASH_COMPRESSED, + MIME_APPLICATION_X_DASH_MIE, + MIME_APPLICATION_X_DASH_MOBIPOCKET_DASH_EBOOK, + MIME_APPLICATION_X_DASH_MSACCESS, + MIME_APPLICATION_X_DASH_MSBINDER, + MIME_APPLICATION_X_DASH_MSCARDFILE, + MIME_APPLICATION_X_DASH_MSCLIP, + MIME_APPLICATION_X_DASH_MSDOWNLOAD, + MIME_APPLICATION_X_DASH_MSMEDIAVIEW, + MIME_APPLICATION_X_DASH_MSMETAFILE, + MIME_APPLICATION_X_DASH_MSMONEY, + MIME_APPLICATION_X_DASH_MSPUBLISHER, + MIME_APPLICATION_X_DASH_MSSCHEDULE, + MIME_APPLICATION_X_DASH_MSTERMINAL, + MIME_APPLICATION_X_DASH_MSWRITE, + MIME_APPLICATION_X_DASH_MS_DASH_APPLICATION, + MIME_APPLICATION_X_DASH_MS_DASH_SHORTCUT, + MIME_APPLICATION_X_DASH_MS_DASH_WMD, + MIME_APPLICATION_X_DASH_MS_DASH_WMZ, + MIME_APPLICATION_X_DASH_MS_DASH_XBAP, + MIME_APPLICATION_X_DASH_NETCDF, + MIME_APPLICATION_X_DASH_NZB, + MIME_APPLICATION_X_DASH_PKCS12, + MIME_APPLICATION_X_DASH_PKCS7_DASH_CERTIFICATES, + MIME_APPLICATION_X_DASH_PKCS7_DASH_CERTREQRESP, + MIME_APPLICATION_X_DASH_RAR_DASH_COMPRESSED, + MIME_APPLICATION_X_DASH_RESEARCH_DASH_INFO_DASH_SYSTEMS, + MIME_APPLICATION_X_DASH_SH, + MIME_APPLICATION_X_DASH_SHAR, + MIME_APPLICATION_X_DASH_SHOCKWAVE_DASH_FLASH, + MIME_APPLICATION_X_DASH_SILVERLIGHT_DASH_APP, + MIME_APPLICATION_X_DASH_SQL, + MIME_APPLICATION_X_DASH_STUFFIT, + MIME_APPLICATION_X_DASH_STUFFITX, + MIME_APPLICATION_X_DASH_SUBRIP, + MIME_APPLICATION_X_DASH_SV4CPIO, + MIME_APPLICATION_X_DASH_SV4CRC, + MIME_APPLICATION_X_DASH_T3VM_DASH_IMAGE, + MIME_APPLICATION_X_DASH_TADS, + MIME_APPLICATION_X_DASH_TAR, + MIME_APPLICATION_X_DASH_TCL, + MIME_APPLICATION_X_DASH_TEX, + MIME_APPLICATION_X_DASH_TEXINFO, + MIME_APPLICATION_X_DASH_TEX_DASH_TFM, + MIME_APPLICATION_X_DASH_TGIF, + MIME_APPLICATION_X_DASH_USTAR, + MIME_APPLICATION_X_DASH_WAIS_DASH_SOURCE, + MIME_APPLICATION_X_DASH_X509_DASH_CA_DASH_CERT, + MIME_APPLICATION_X_DASH_XFIG, + MIME_APPLICATION_X_DASH_XLIFF_PLUS_XML, + MIME_APPLICATION_X_DASH_XPINSTALL, + MIME_APPLICATION_X_DASH_XZ, + MIME_APPLICATION_X_DASH_ZMACHINE, + MIME_APPLICATION_YANG, + MIME_APPLICATION_YIN_PLUS_XML, + MIME_APPLICATION_ZIP, + MIME_APPLICATION_UNKNOWN +} mime_application_t; + + +typedef enum { + MIME_AUDIO_AUTO, + MIME_AUDIO_ADPCM, + MIME_AUDIO_BASIC, + MIME_AUDIO_MIDI, + MIME_AUDIO_MP4, + MIME_AUDIO_MPEG, + MIME_AUDIO_OGG, + MIME_AUDIO_S3M, + MIME_AUDIO_SILK, + MIME_AUDIO_VND_DECE_AUDIO, + MIME_AUDIO_VND_DIGITAL_DASH_WINDS, + MIME_AUDIO_VND_DRA, + MIME_AUDIO_VND_DTS, + MIME_AUDIO_VND_DTS_HD, + MIME_AUDIO_VND_LUCENT_VOICE, + MIME_AUDIO_VND_MS_DASH_PLAYREADY_MEDIA_PYA, + MIME_AUDIO_VND_NUERA_ECELP4800, + MIME_AUDIO_VND_NUERA_ECELP7470, + MIME_AUDIO_VND_NUERA_ECELP9600, + MIME_AUDIO_VND_RIP, + MIME_AUDIO_WEBM, + MIME_AUDIO_XM, + MIME_AUDIO_X_DASH_AAC, + MIME_AUDIO_X_DASH_AIFF, + MIME_AUDIO_X_DASH_CAF, + MIME_AUDIO_X_DASH_FLAC, + MIME_AUDIO_X_DASH_MATROSKA, + MIME_AUDIO_X_DASH_MPEGURL, + MIME_AUDIO_X_DASH_MS_DASH_WAX, + MIME_AUDIO_X_DASH_MS_DASH_WMA, + MIME_AUDIO_X_DASH_PN_DASH_REALAUDIO, + MIME_AUDIO_X_DASH_PN_DASH_REALAUDIO_DASH_PLUGIN, + MIME_AUDIO_X_DASH_WAV, + MIME_AUDIO_UNKNOWN +} mime_audio_t; + + +typedef enum { + MIME_CHEMICAL_AUTO, + MIME_CHEMICAL_X_DASH_CDX, + MIME_CHEMICAL_X_DASH_CIF, + MIME_CHEMICAL_X_DASH_CMDF, + MIME_CHEMICAL_X_DASH_CML, + MIME_CHEMICAL_X_DASH_CSML, + MIME_CHEMICAL_X_DASH_XYZ, + MIME_CHEMICAL_UNKNOWN +} mime_chemical_t; + + +typedef enum { + MIME_IMAGE_AUTO, + MIME_IMAGE_ALIAS, + MIME_IMAGE_BMP, + MIME_IMAGE_BW, + MIME_IMAGE_CGM, + MIME_IMAGE_CI, + MIME_IMAGE_DPIX, + MIME_IMAGE_G3FAX, + MIME_IMAGE_GIF, + MIME_IMAGE_IEF, + MIME_IMAGE_JPEG, + MIME_IMAGE_KTX, + MIME_IMAGE_ORLE, + MIME_IMAGE_PIX, + MIME_IMAGE_PNG, + MIME_IMAGE_PPM, + MIME_IMAGE_PRS_BTIF, + MIME_IMAGE_PS, + MIME_IMAGE_RLE, + MIME_IMAGE_SGI, + MIME_IMAGE_SPM, + MIME_IMAGE_SUN, + MIME_IMAGE_SVG_PLUS_XML, + MIME_IMAGE_TIFF, + MIME_IMAGE_VND_ADOBE_PHOTOSHOP, + MIME_IMAGE_VND_DECE_GRAPHIC, + MIME_IMAGE_VND_DJVU, + MIME_IMAGE_VND_DVB_SUBTITLE, + MIME_IMAGE_VND_DWG, + MIME_IMAGE_VND_DXF, + MIME_IMAGE_VND_FASTBIDSHEET, + MIME_IMAGE_VND_FPX, + MIME_IMAGE_VND_FST, + MIME_IMAGE_VND_FUJIXEROX_EDMICS_DASH_MMR, + MIME_IMAGE_VND_FUJIXEROX_EDMICS_DASH_RLC, + MIME_IMAGE_VND_MS_DASH_MODI, + MIME_IMAGE_VND_MS_DASH_PHOTO, + MIME_IMAGE_VND_NET_DASH_FPX, + MIME_IMAGE_VND_WAP_WBMP, + MIME_IMAGE_VND_XIFF, + MIME_IMAGE_WEBP, + MIME_IMAGE_X_DASH_3DS, + MIME_IMAGE_X_DASH_CMU_DASH_RASTER, + MIME_IMAGE_X_DASH_CMX, + MIME_IMAGE_X_DASH_FREEHAND, + MIME_IMAGE_X_DASH_ICON, + MIME_IMAGE_X_DASH_MRSID_DASH_IMAGE, + MIME_IMAGE_X_DASH_PCX, + MIME_IMAGE_X_DASH_PICT, + MIME_IMAGE_X_DASH_PORTABLE_DASH_ANYMAP, + MIME_IMAGE_X_DASH_PORTABLE_DASH_BITMAP, + MIME_IMAGE_X_DASH_PORTABLE_DASH_GRAYMAP, + MIME_IMAGE_X_DASH_PORTABLE_DASH_PIXMAP, + MIME_IMAGE_X_DASH_RGB, + MIME_IMAGE_X_DASH_TGA, + MIME_IMAGE_X_DASH_XBITMAP, + MIME_IMAGE_X_DASH_XPIXMAP, + MIME_IMAGE_X_DASH_XWINDOWDUMP, + MIME_IMAGE_YUV, + MIME_IMAGE_UNKNOWN +} mime_image_t; + + +typedef enum { + MIME_MESSAGE_AUTO, + MIME_MESSAGE_RFC822, + MIME_MESSAGE_UNKNOWN +} mime_message_t; + + +typedef enum { + MIME_MODEL_AUTO, + MIME_MODEL_DXF, + MIME_MODEL_IGES, + MIME_MODEL_MESH, + MIME_MODEL_OBJ, + MIME_MODEL_PLY, + MIME_MODEL_SHP, + MIME_MODEL_STEP, + MIME_MODEL_STL, + MIME_MODEL_VND_BRLCAD_PLUS_BINARY, + MIME_MODEL_VND_BRLCAD_PLUS_TCL, + MIME_MODEL_VND_COLLADA_PLUS_XML, + MIME_MODEL_VND_DWF, + MIME_MODEL_VND_FASTGEN, + MIME_MODEL_VND_GDL, + MIME_MODEL_VND_GIFT, + MIME_MODEL_VND_GTW, + MIME_MODEL_VND_INTAVAL, + MIME_MODEL_VND_MTS, + MIME_MODEL_VND_RHINO, + MIME_MODEL_VND_VTU, + MIME_MODEL_VRML, + MIME_MODEL_X3D_PLUS_BINARY, + MIME_MODEL_X3D_PLUS_VRML, + MIME_MODEL_X3D_PLUS_XML, + MIME_MODEL_UNKNOWN +} mime_model_t; + + +typedef enum { + MIME_TEXT_AUTO, + MIME_TEXT_CACHE_DASH_MANIFEST, + MIME_TEXT_CALENDAR, + MIME_TEXT_CSS, + MIME_TEXT_CSV, + MIME_TEXT_HTML, + MIME_TEXT_N3, + MIME_TEXT_PLAIN, + MIME_TEXT_PRS_LINES_TAG, + MIME_TEXT_RICHTEXT, + MIME_TEXT_SGML, + MIME_TEXT_TAB_DASH_SEPARATED_DASH_VALUES, + MIME_TEXT_TROFF, + MIME_TEXT_TURTLE, + MIME_TEXT_URI_DASH_LIST, + MIME_TEXT_VCARD, + MIME_TEXT_VND_CURL, + MIME_TEXT_VND_CURL_DCURL, + MIME_TEXT_VND_CURL_MCURL, + MIME_TEXT_VND_CURL_SCURL, + MIME_TEXT_VND_DVB_SUBTITLE, + MIME_TEXT_VND_FLY, + MIME_TEXT_VND_FMI_FLEXSTOR, + MIME_TEXT_VND_GRAPHVIZ, + MIME_TEXT_VND_IN3D_3DML, + MIME_TEXT_VND_IN3D_SPOT, + MIME_TEXT_VND_SUN_J2ME_APP_DASH_DESCRIPTOR, + MIME_TEXT_VND_WAP_WML, + MIME_TEXT_VND_WAP_WMLSCRIPT, + MIME_TEXT_X_DASH_ASM, + MIME_TEXT_X_DASH_C, + MIME_TEXT_X_DASH_FORTRAN, + MIME_TEXT_X_DASH_JAVA_DASH_SOURCE, + MIME_TEXT_X_DASH_NFO, + MIME_TEXT_X_DASH_OPML, + MIME_TEXT_X_DASH_PASCAL, + MIME_TEXT_X_DASH_SETEXT, + MIME_TEXT_X_DASH_SFV, + MIME_TEXT_X_DASH_UUENCODE, + MIME_TEXT_X_DASH_VCALENDAR, + MIME_TEXT_X_DASH_VCARD, + MIME_TEXT_UNKNOWN +} mime_text_t; + + +typedef enum { + MIME_VIDEO_AUTO, + MIME_VIDEO_3GPP, + MIME_VIDEO_3GPP2, + MIME_VIDEO_H261, + MIME_VIDEO_H263, + MIME_VIDEO_H264, + MIME_VIDEO_JPEG, + MIME_VIDEO_JPM, + MIME_VIDEO_MJ2, + MIME_VIDEO_MP4, + MIME_VIDEO_MPEG, + MIME_VIDEO_OGG, + MIME_VIDEO_QUICKTIME, + MIME_VIDEO_VND_DECE_HD, + MIME_VIDEO_VND_DECE_MOBILE, + MIME_VIDEO_VND_DECE_PD, + MIME_VIDEO_VND_DECE_SD, + MIME_VIDEO_VND_DECE_VIDEO, + MIME_VIDEO_VND_DVB_FILE, + MIME_VIDEO_VND_FVT, + MIME_VIDEO_VND_MPEGURL, + MIME_VIDEO_VND_MS_DASH_PLAYREADY_MEDIA_PYV, + MIME_VIDEO_VND_UVVU_MP4, + MIME_VIDEO_VND_VIVO, + MIME_VIDEO_WEBM, + MIME_VIDEO_X_DASH_F4V, + MIME_VIDEO_X_DASH_FLI, + MIME_VIDEO_X_DASH_FLV, + MIME_VIDEO_X_DASH_M4V, + MIME_VIDEO_X_DASH_MATROSKA, + MIME_VIDEO_X_DASH_MNG, + MIME_VIDEO_X_DASH_MSVIDEO, + MIME_VIDEO_X_DASH_MS_DASH_ASF, + MIME_VIDEO_X_DASH_MS_DASH_VOB, + MIME_VIDEO_X_DASH_MS_DASH_WM, + MIME_VIDEO_X_DASH_MS_DASH_WMV, + MIME_VIDEO_X_DASH_MS_DASH_WMX, + MIME_VIDEO_X_DASH_MS_DASH_WVX, + MIME_VIDEO_X_DASH_SGI_DASH_MOVIE, + MIME_VIDEO_X_DASH_SMV, + MIME_VIDEO_UNKNOWN +} mime_video_t; + + +typedef enum { + MIME_X_DASH_CONFERENCE_AUTO, + MIME_X_DASH_CONFERENCE_X_DASH_COOLTALK, + MIME_X_DASH_CONFERENCE_UNKNOWN +} mime_x_DASH_conference_t; + + +__END_DECLS + +#endif /*BU_MIME_H*/ Property changes on: brlcad/trunk/include/bu/mime.h ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: brlcad/trunk/src/libbu/CMakeLists.txt =================================================================== --- brlcad/trunk/src/libbu/CMakeLists.txt 2015-05-22 18:54:42 UTC (rev 65033) +++ brlcad/trunk/src/libbu/CMakeLists.txt 2015-05-22 19:39:16 UTC (rev 65034) @@ -20,7 +20,7 @@ # Set locations for final mime C and header files set(MIME_C_FILE${CMAKE_CURRENT_BINARY_DIR}/mime.c) -set(MIME_H_FILE ${BRLCAD_BINARY_DIR}/${INCLUDE_DIR}/bu/mime.h) +set(MIME_H_FILE ${BRLCAD_SOURCE_DIR}/include/bu/mime.h) # Run the generation process include(${CMAKE_CURRENT_SOURCE_DIR}/mime.cmake) @@ -126,8 +126,6 @@ BRLCAD_ADDDATA(fix.6r vfont) BRLCAD_ADDDATA(nonie.r.12 vfont) -install(FILES ${MIME_H_FILE} DESTINATION${INCLUDE_DIR}/brlcad/bu) - add_subdirectory(tests) add_subdirectory(y2038) Modified: brlcad/trunk/src/libbu/mime.cmake =================================================================== --- brlcad/trunk/src/libbu/mime.cmake 2015-05-22 18:54:42 UTC (rev 65033) +++ brlcad/trunk/src/libbu/mime.cmake 2015-05-22 19:39:16 UTC (rev 65034) @@ -42,14 +42,23 @@ file(READ ${BRLCAD_SOURCE_DIR}/misc/mime.types MIME_TYPES) file(READ${BRLCAD_SOURCE_DIR}/misc/mime_cad.types CAD_TYPES) -set(h_contents "/* Mime type mappings automatically generated from mime.types\n * and mime_cad.types.\n * Do not edit these files directly - apply updates to include/bu source files. */\n\n") +set(h_contents "/**\n * Mime type definitions and mapping functions\n *\n") +set(h_contents "${h_contents} * Do not edit these files directly - apply updates to mime definition files.\n") +set(h_contents "${h_contents} * The file misc/mime.types is from:\n") +set(h_contents "${h_contents} * http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types\n";) +set(h_contents "${h_contents} * and should be kept in sync with that copy.\n *\n") +set(h_contents "${h_contents} * The file misc/mime_cad.types holds local additions to the 'standard' mime types,\n") +set(h_contents "${h_contents} * such as the addition of many additional geometry file formats. Any \"local\" mime\n") +set(h_contents "${h_contents} * type definitions not part of the actual standards should be added there. */\n\n") +set(h_contents "${h_contents}/* These sources are generated from the public domain data files and are in the public domain.*/\n\n") set(h_contents "${h_contents}#ifndef BU_MIME_H\n") set(h_contents "${h_contents}#define BU_MIME_H\n") set(h_contents "${h_contents}\n#include \"common.h\"\n") set(h_contents "${h_contents}#include \"bu/defines.h\"\n") set(h_contents "${h_contents}\n__BEGIN_DECLS\n") -set(c_contents "/* Functions for mapping file extensions to mime type. Automatically\n * generated from mime.types and mime_cad.types.\n * Do not edit these files directly - apply updates to include/bu source files. */\n\n") +set(c_contents "/* Functions for mapping file extensions to mime type. Automatically\n * generated from mime.types and mime_cad.types.\n * Do not edit these files directly - apply updates to mime definition files:\n * misc/mime.types and misc/mime_cad.types. */\n\n") +set(c_contents "${c_contents}/* These sources are generated from public domain data and are in the public domain.*/\n\n") set(c_contents "${c_contents}\n#include \"common.h\"\n") set(c_contents "${c_contents}#include \"bu/mime.h\"\n") set(c_contents "${c_contents}#include \"bu/file.h\"\n") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [brlcad-commits] SF.net SVN: brlcad:[65033] brlcad/trunk/include/bu/file.h From: - 2015-05-22 18:54:45 Revision: 65033 http://sourceforge.net/p/brlcad/code/65033 Author: brlcad Date: 2015-05-22 18:54:42 +0000 (Fri, 22 May 2015) Log Message: ----------- ahh, I get it. this is a problem since now we can't just point at our source header dir. (revert 65032) Modified Paths: -------------- brlcad/trunk/include/bu/file.h Modified: brlcad/trunk/include/bu/file.h =================================================================== --- brlcad/trunk/include/bu/file.h 2015-05-22 18:50:14 UTC (rev 65032) +++ brlcad/trunk/include/bu/file.h 2015-05-22 18:54:42 UTC (rev 65033) @@ -34,6 +34,7 @@ #include "bu/defines.h" #include "bu/magic.h" +#include "bu/mime.h" #include "bu/vls.h" __BEGIN_DECLS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [brlcad-commits] SF.net SVN: brlcad:[65032] brlcad/trunk/include/bu/file.h From: - 2015-05-22 18:50:17 Revision: 65032 http://sourceforge.net/p/brlcad/code/65032 Author: brlcad Date: 2015-05-22 18:50:14 +0000 (Fri, 22 May 2015) Log Message: ----------- no more bu/mime.h Modified Paths: -------------- brlcad/trunk/include/bu/file.h Modified: brlcad/trunk/include/bu/file.h =================================================================== --- brlcad/trunk/include/bu/file.h 2015-05-22 18:33:47 UTC (rev 65031) +++ brlcad/trunk/include/bu/file.h 2015-05-22 18:50:14 UTC (rev 65032) @@ -34,7 +34,6 @@ #include "bu/defines.h" #include "bu/magic.h" -#include "bu/mime.h" #include "bu/vls.h" __BEGIN_DECLS This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [brlcad-commits] SF.net SVN: brlcad:[65031] brlcad/trunk/NEWS From: - 2015-05-22 18:33:49 Revision: 65031 http://sourceforge.net/p/brlcad/code/65031 Author: brlcad Date: 2015-05-22 18:33:47 +0000 (Fri, 22 May 2015) Log Message: ----------- carl added options (-p -b -L -H) to the gencolor command and improved output parsing. Modified Paths: -------------- brlcad/trunk/NEWS Modified: brlcad/trunk/NEWS =================================================================== --- brlcad/trunk/NEWS 2015-05-22 18:31:15 UTC (rev 65030) +++ brlcad/trunk/NEWS 2015-05-22 18:33:47 UTC (rev 65031) @@ -14,7 +14,7 @@ --- 2014-XX-XX Release 7.26.XX --- ---------------------------------------------------------------------- -* added new output options to the gencolor command - Carl Moore +* improved option parsing and output options for gencolor - Carl Moore * fixed composition bugs in pixmatte and pixmerge - Carl Moore * fixed definition of "light year" in unit conversions - Cliff Yapp * added mirroring support for hrt primitive objects - Isaac Kamga This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [brlcad-commits] SF.net SVN: brlcad:[65030] brlcad/trunk/NEWS From: - 2015-05-22 18:31:17 Revision: 65030 http://sourceforge.net/p/brlcad/code/65030 Author: brlcad Date: 2015-05-22 18:31:15 +0000 (Fri, 22 May 2015) Log Message: ----------- carl added options to the gencolor command. Modified Paths: -------------- brlcad/trunk/NEWS Modified: brlcad/trunk/NEWS =================================================================== --- brlcad/trunk/NEWS 2015-05-22 18:18:39 UTC (rev 65029) +++ brlcad/trunk/NEWS 2015-05-22 18:31:15 UTC (rev 65030) @@ -14,6 +14,7 @@ --- 2014-XX-XX Release 7.26.XX --- ---------------------------------------------------------------------- +* added new output options to the gencolor command - Carl Moore * fixed composition bugs in pixmatte and pixmerge - Carl Moore * fixed definition of "light year" in unit conversions - Cliff Yapp * added mirroring support for hrt primitive objects - Isaac Kamga This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [brlcad-commits] SF.net SVN: brlcad:[65029] brlcad/trunk/src/util/gencolor.c From: - 2015-05-22 18:18:42 Revision: 65029 http://sourceforge.net/p/brlcad/code/65029 Author: carlmoore Date: 2015-05-22 18:18:39 +0000 (Fri, 22 May 2015) Log Message: ----------- and move 2 more int variables into main program (not global) Modified Paths: -------------- brlcad/trunk/src/util/gencolor.c Modified: brlcad/trunk/src/util/gencolor.c =================================================================== --- brlcad/trunk/src/util/gencolor.c 2015-05-22 18:15:24 UTC (rev 65028) +++ brlcad/trunk/src/util/gencolor.c 2015-05-22 18:18:39 UTC (rev 65029) @@ -39,7 +39,6 @@ static const char Usage[] = "Usage: gencolor [-r#] [val1 .. valN] > output_file\n"; -int bytes_in_buf, copies_per_buf; int32_t count = -1; int outputtype = 0; /* 1 for pix, 2 for bw; * if this is used and resolution is not yet set, @@ -108,7 +107,7 @@ int main(int argc, char **argv) { - int i, len, times; + int i, len, times, bytes_in_buf, copies_per_buf; int32_t basemultiple = 262144; /* This is 512 squared. */ unsigned char *bp; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [brlcad-commits] SF.net SVN: brlcad:[65028] brlcad/trunk/src/util/gencolor.c From: - 2015-05-22 18:15:26 Revision: 65028 http://sourceforge.net/p/brlcad/code/65028 Author: carlmoore Date: 2015-05-22 18:15:24 +0000 (Fri, 22 May 2015) Log Message: ----------- mv basemultiple declaration to main program; do not need it as global Modified Paths: -------------- brlcad/trunk/src/util/gencolor.c Modified: brlcad/trunk/src/util/gencolor.c =================================================================== --- brlcad/trunk/src/util/gencolor.c 2015-05-22 18:09:25 UTC (rev 65027) +++ brlcad/trunk/src/util/gencolor.c 2015-05-22 18:15:24 UTC (rev 65028) @@ -41,7 +41,6 @@ int bytes_in_buf, copies_per_buf; int32_t count = -1; -int32_t basemultiple = 262144; /* This is 512 squared. */ int outputtype = 0; /* 1 for pix, 2 for bw; * if this is used and resolution is not yet set, * give resolution a default value of 1 @@ -110,6 +109,7 @@ main(int argc, char **argv) { int i, len, times; + int32_t basemultiple = 262144; /* This is 512 squared. */ unsigned char *bp; get_args(argc, argv); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [brlcad-commits] SF.net SVN: brlcad:[65027] brlcad/trunk/src/util/gencolor.c From: - 2015-05-22 18:09:28 Revision: 65027 http://sourceforge.net/p/brlcad/code/65027 Author: carlmoore Date: 2015-05-22 18:09:25 +0000 (Fri, 22 May 2015) Log Message: ----------- allow for (rare?) case of -r giving a smaller positive number than the number of values input; also, 0 (and not just negative) count will take us to infinite condition Modified Paths: -------------- brlcad/trunk/src/util/gencolor.c Modified: brlcad/trunk/src/util/gencolor.c =================================================================== --- brlcad/trunk/src/util/gencolor.c 2015-05-22 15:46:34 UTC (rev 65026) +++ brlcad/trunk/src/util/gencolor.c 2015-05-22 18:09:25 UTC (rev 65027) @@ -137,7 +137,10 @@ } /* If -r was used, ignore -p,-b,-L,-H */ - if (!setrcount) { + if (setrcount) { + if (count > 0 && count < len) len = count; + } + else { if (outputtype == 1) { if (resolution == 1) count = basemultiple*3; @@ -166,7 +169,7 @@ bytes_in_buf += len; } - if (count < 0) { + if (count <= 0) { /* output forever */ while (1) { if (write(1, (char *)buf, bytes_in_buf) != bytes_in_buf) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [brlcad-commits] SF.net SVN: brlcad:[65026] brlcad/trunk/include/bg From: - 2015-05-22 15:46:36 Revision: 65026 http://sourceforge.net/p/brlcad/code/65026 Author: starseeker Date: 2015-05-22 15:46:34 +0000 (Fri, 22 May 2015) Log Message: ----------- GM_ -> BG_ Modified Paths: -------------- brlcad/trunk/include/bg/chull.h brlcad/trunk/include/bg/defines.h brlcad/trunk/include/bg/obr.h brlcad/trunk/include/bg/polygon.h brlcad/trunk/include/bg/tri_ray.h brlcad/trunk/include/bg/tri_tri.h Modified: brlcad/trunk/include/bg/chull.h =================================================================== --- brlcad/trunk/include/bg/chull.h 2015-05-22 15:37:22 UTC (rev 65025) +++ brlcad/trunk/include/bg/chull.h 2015-05-22 15:46:34 UTC (rev 65026) @@ -27,8 +27,8 @@ * @brief Routines for the computation of convex hulls in 2D and 3D */ -#ifndef GM_CHULL_H -#define GM_CHULL_H +#ifndef BG_CHULL_H +#define BG_CHULL_H #include "common.h" #include "vmath.h" @@ -50,7 +50,7 @@ * @param n the number of points in polyline * @return the number of points in the output hull array */ -GM_EXPORT int bg_polyline_2d_chull(point2d_t** hull, const point2d_t* polyline, int n); +BG_EXPORT int bg_polyline_2d_chull(point2d_t** hull, const point2d_t* polyline, int n); /** * @brief @@ -77,7 +77,7 @@ * @param n the number of points in the input set * @return the number of points in the output hull array or zero if error. */ -GM_EXPORT int bg_2d_chull(point2d_t** hull, const point2d_t* points_2d, int n); +BG_EXPORT int bg_2d_chull(point2d_t** hull, const point2d_t* points_2d, int n); /** * @brief @@ -98,7 +98,7 @@ * @param n the number of points in the input set * @return the number of points in the output hull array */ -GM_EXPORT int bg_3d_coplanar_chull(point_t** hull, const point_t* points_3d, int n); +BG_EXPORT int bg_3d_coplanar_chull(point_t** hull, const point_t* points_3d, int n); /** * @brief @@ -120,13 +120,13 @@ * http://www.netlib.org/voronoi/hull.html - see the file chull3d.c * for the full copyright and license statement. */ -GM_EXPORT int bg_3d_chull(int **faces, int *num_faces, point_t **vertices, int *num_vertices, +BG_EXPORT int bg_3d_chull(int **faces, int *num_faces, point_t **vertices, int *num_vertices, const point_t *input_points_3d, int num_input_pnts); __END_DECLS -#endif /* GM_CHULL_H */ +#endif /* BG_CHULL_H */ /** @} */ /* * Local Variables: Modified: brlcad/trunk/include/bg/defines.h =================================================================== --- brlcad/trunk/include/bg/defines.h 2015-05-22 15:37:22 UTC (rev 65025) +++ brlcad/trunk/include/bg/defines.h 2015-05-22 15:46:34 UTC (rev 65026) @@ -26,24 +26,24 @@ /** @{ */ /** @file bg/defines.h */ -#ifndef GM_DEFINES_H -#define GM_DEFINES_H +#ifndef BG_DEFINES_H +#define BG_DEFINES_H #include "common.h" -#ifndef GM_EXPORT -# if defined(GM_DLL_EXPORTS) && defined(GM_DLL_IMPORTS) -# error "Only GM_DLL_EXPORTS or GM_DLL_IMPORTS can be defined, not both." -# elif defined(GM_DLL_EXPORTS) -# define GM_EXPORT __declspec(dllexport) -# elif defined(GM_DLL_IMPORTS) -# define GM_EXPORT __declspec(dllimport) +#ifndef BG_EXPORT +# if defined(BG_DLL_EXPORTS) && defined(BG_DLL_IMPORTS) +# error "Only BG_DLL_EXPORTS or BG_DLL_IMPORTS can be defined, not both." +# elif defined(BG_DLL_EXPORTS) +# define BG_EXPORT __declspec(dllexport) +# elif defined(BG_DLL_IMPORTS) +# define BG_EXPORT __declspec(dllimport) # else -# define GM_EXPORT +# define BG_EXPORT # endif #endif -#endif /* GM_DEFINES_H */ +#endif /* BG_DEFINES_H */ /** @} */ /* * Local Variables: Modified: brlcad/trunk/include/bg/obr.h =================================================================== --- brlcad/trunk/include/bg/obr.h 2015-05-22 15:37:22 UTC (rev 65025) +++ brlcad/trunk/include/bg/obr.h 2015-05-22 15:46:34 UTC (rev 65026) @@ -27,8 +27,8 @@ * @brief Routines for the computation of oriented bounding rectangles 2D and 3D */ -#ifndef GM_OBR_H -#define GM_OBR_H +#ifndef BG_OBR_H +#define BG_OBR_H #include "common.h" #include "vmath.h" @@ -70,7 +70,7 @@ * @param points_2d array of 2D points * @param pnt_cnt number of points in pnts array */ -GM_EXPORT extern int bg_2d_obr(point2d_t *center, +BG_EXPORT extern int bg_2d_obr(point2d_t *center, vect2d_t *u, vect2d_t *v, const point2d_t *points_2d, @@ -90,7 +90,7 @@ * @param points_3d array of coplanar 3D points * @param pnt_cnt number of points in pnts array */ -GM_EXPORT extern int bg_3d_coplanar_obr(point_t *center, +BG_EXPORT extern int bg_3d_coplanar_obr(point_t *center, vect_t *v1, vect_t *v2, const point_t *points_3d, @@ -139,14 +139,14 @@ * @param points_3d array of coplanar 3D points * @param pnt_cnt number of points in pnts array */ -GM_EXPORT extern int bg_3d_obb(point_t **pnts, +BG_EXPORT extern int bg_3d_obb(point_t **pnts, const point_t *points_3d, int pnt_cnt); __END_DECLS -#endif /* GM_OBR_H */ +#endif /* BG_OBR_H */ /** @} */ /* * Local Variables: Modified: brlcad/trunk/include/bg/polygon.h =================================================================== --- brlcad/trunk/include/bg/polygon.h 2015-05-22 15:37:22 UTC (rev 65025) +++ brlcad/trunk/include/bg/polygon.h 2015-05-22 15:46:34 UTC (rev 65026) @@ -27,8 +27,8 @@ * @brief Functions for working with polygons */ -#ifndef GM_POLYGON_H -#define GM_POLYGON_H +#ifndef BG_POLYGON_H +#define BG_POLYGON_H #include "common.h" #include "vmath.h" @@ -58,7 +58,7 @@ * @return 1 if polygon is clockwise * @return 0 if the test failed */ -GM_EXPORT extern int bg_polygon_clockwise(size_t npts, const point2d_t *pts, const int *pt_indices); +BG_EXPORT extern int bg_polygon_clockwise(size_t npts, const point2d_t *pts, const int *pt_indices); /** @@ -77,7 +77,7 @@ * @return 0 if point is outside polygon * @return 1 if point is inside polygon */ -GM_EXPORT extern int bg_pt_in_polygon(size_t npts, const point2d_t *pts, const point2d_t *test_pt); +BG_EXPORT extern int bg_pt_in_polygon(size_t npts, const point2d_t *pts, const point2d_t *test_pt); /** * Triangulation is the process of finding a set of triangles that as a set cover @@ -125,7 +125,7 @@ * @return 0 if triangulation is successful * @return 1 if triangulation is unsuccessful */ -GM_EXPORT extern int bg_nested_polygon_triangulate(int **faces, int *num_faces, point2d_t **out_pts, int *num_outpts, +BG_EXPORT extern int bg_nested_polygon_triangulate(int **faces, int *num_faces, point2d_t **out_pts, int *num_outpts, const int *poly, const size_t poly_npts, const int **holes_array, const size_t *holes_npts, const size_t nholes, const point2d_t *pts, const size_t npts, triangulation_t type); @@ -155,7 +155,7 @@ * @return 0 if triangulation is successful * @return 1 if triangulation is unsuccessful */ -GM_EXPORT extern int bg_polygon_triangulate(int **faces, int *num_faces, point2d_t **out_pts, int *num_outpts, +BG_EXPORT extern int bg_polygon_triangulate(int **faces, int *num_faces, point2d_t **out_pts, int *num_outpts, const point2d_t *pts, const size_t npts, triangulation_t type); @@ -179,7 +179,7 @@ * @return 0 if calculation was successful * @return 1 if calculation failed, e.g. because one parameter is a NULL-pointer */ -GM_EXPORT extern int bg_3d_polygon_area(fastf_t *area, size_t npts, const point_t *pts); +BG_EXPORT extern int bg_3d_polygon_area(fastf_t *area, size_t npts, const point_t *pts); /** @@ -194,7 +194,7 @@ * @return 0 if calculation was successful * @return 1 if calculation failed, e.g. because one in-parameter is a NULL-pointer */ -GM_EXPORT extern int bg_3d_polygon_centroid(point_t *cent, size_t npts, const point_t *pts); +BG_EXPORT extern int bg_3d_polygon_centroid(point_t *cent, size_t npts, const point_t *pts); /** @@ -209,7 +209,7 @@ *@return 0 if calculation was successful *@return 1 if calculation failed, e.g. because pts is a NULL-pointer */ -GM_EXPORT extern int bg_3d_polygon_sort_ccw(size_t npts, point_t *pts, plane_t cmp); +BG_EXPORT extern int bg_3d_polygon_sort_ccw(size_t npts, point_t *pts, plane_t cmp); /** @@ -228,13 +228,13 @@ * @return 0 if calculation was successful * @return 1 if calculation failed, e.g. because one parameter is a NULL-Pointer */ -GM_EXPORT extern int bg_3d_polygon_mk_pts_planes(size_t *npts, point_t **pts, size_t neqs, const plane_t *eqs); +BG_EXPORT extern int bg_3d_polygon_mk_pts_planes(size_t *npts, point_t **pts, size_t neqs, const plane_t *eqs); __END_DECLS -#endif /* GM_POLYGON_H */ +#endif /* BG_POLYGON_H */ /** @} */ /* * Local Variables: Modified: brlcad/trunk/include/bg/tri_ray.h =================================================================== --- brlcad/trunk/include/bg/tri_ray.h 2015-05-22 15:37:22 UTC (rev 65025) +++ brlcad/trunk/include/bg/tri_ray.h 2015-05-22 15:46:34 UTC (rev 65026) @@ -34,8 +34,8 @@ * */ -#ifndef GM_TRI_RAY_H -#define GM_TRI_RAY_H +#ifndef BG_TRI_RAY_H +#define BG_TRI_RAY_H #include "common.h" #include "vmath.h" @@ -43,7 +43,7 @@ __BEGIN_DECLS -GM_EXPORT extern int bg_isect_tri_ray(const point_t orig, +BG_EXPORT extern int bg_isect_tri_ray(const point_t orig, const point_t dir, const point_t vert0, const point_t vert1, @@ -53,7 +53,7 @@ __END_DECLS -#endif /* GM_TRI_RAY_H */ +#endif /* BG_TRI_RAY_H */ /** @} */ /* * Local Variables: Modified: brlcad/trunk/include/bg/tri_tri.h =================================================================== --- brlcad/trunk/include/bg/tri_tri.h 2015-05-22 15:37:22 UTC (rev 65025) +++ brlcad/trunk/include/bg/tri_tri.h 2015-05-22 15:46:34 UTC (rev 65026) @@ -31,8 +31,8 @@ * Journal of Graphics Tools, 2(2), 1997 */ -#ifndef GM_TRI_TRI_H -#define GM_TRI_TRI_H +#ifndef BG_TRI_TRI_H +#define BG_TRI_TRI_H #include "common.h" #include "vmath.h" @@ -40,7 +40,7 @@ __BEGIN_DECLS -GM_EXPORT extern int bg_tri_tri_isect_coplanar(point_t V0, +BG_EXPORT extern int bg_tri_tri_isect_coplanar(point_t V0, point_t V1, point_t V2, point_t U0, @@ -48,14 +48,14 @@ point_t U2, int area_flag); -GM_EXPORT extern int bg_tri_tri_isect(point_t V0, +BG_EXPORT extern int bg_tri_tri_isect(point_t V0, point_t V1, point_t V2, point_t U0, point_t U1, point_t U2); -GM_EXPORT extern int bg_tri_tri_isect_with_line(point_t V0, +BG_EXPORT extern int bg_tri_tri_isect_with_line(point_t V0, point_t V1, point_t V2, point_t U0, @@ -67,7 +67,7 @@ __END_DECLS -#endif /* GM_TRI_TRI_H */ +#endif /* BG_TRI_TRI_H */ /** @} */ /* * Local Variables: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [brlcad-commits] SF.net SVN: brlcad:[65025] brlcad/trunk/src/libbg/CMakeLists.txt From: - 2015-05-22 15:37:25 Revision: 65025 http://sourceforge.net/p/brlcad/code/65025 Author: starseeker Date: 2015-05-22 15:37:22 +0000 (Fri, 22 May 2015) Log Message: ----------- GM -> BG (naming convention is needed for automagic handling of defines with MSVC) Modified Paths: -------------- brlcad/trunk/src/libbg/CMakeLists.txt Modified: brlcad/trunk/src/libbg/CMakeLists.txt =================================================================== --- brlcad/trunk/src/libbg/CMakeLists.txt 2015-05-22 15:14:49 UTC (rev 65024) +++ brlcad/trunk/src/libbg/CMakeLists.txt 2015-05-22 15:37:22 UTC (rev 65025) @@ -1,13 +1,13 @@ # Include directories needed by libbg users -set(GM_INCLUDE_DIRS +set(BG_INCLUDE_DIRS${BRLCAD_BINARY_DIR}/include ${BRLCAD_SOURCE_DIR}/include${BN_INCLUDE_DIRS} ${BU_INCLUDE_DIRS} ) -BRLCAD_LIB_INCLUDE_DIRS(bg GM_INCLUDE_DIRS "") +BRLCAD_LIB_INCLUDE_DIRS(bg BG_INCLUDE_DIRS "") -set(LIBGM_SOURCES +set(LIBBG_SOURCES chull.c chull3d.cpp obr.c @@ -17,7 +17,7 @@ util.c ) -BRLCAD_ADDLIB(libbg "${LIBGM_SOURCES}" libbn libbu) +BRLCAD_ADDLIB(libbg "${LIBBG_SOURCES}" libbn libbu) set_target_properties(libbg PROPERTIES VERSION 20.0.1 SOVERSION 20) add_subdirectory(tests) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [brlcad-commits] SF.net SVN: brlcad:[65024] brlcad/trunk/src/libbn/tests/bntester.c From: - 2015-05-22 15:14:52 Revision: 65024 http://sourceforge.net/p/brlcad/code/65024 Author: starseeker Date: 2015-05-22 15:14:49 +0000 (Fri, 22 May 2015) Log Message: ----------- gcc is issuing a Werror=clobbered warning about found_eof. Modified Paths: -------------- brlcad/trunk/src/libbn/tests/bntester.c Modified: brlcad/trunk/src/libbn/tests/bntester.c =================================================================== --- brlcad/trunk/src/libbn/tests/bntester.c 2015-05-21 19:39:07 UTC (rev 65023) +++ brlcad/trunk/src/libbn/tests/bntester.c 2015-05-22 15:14:49 UTC (rev 65024) @@ -182,7 +182,7 @@ int valid_function_number = 0; int process_test_case = 0; int early_exit = 0; - int found_eof = 0; + static int found_eof = 0; /* static due to longjmp */ /* set initial values in tol structure */ tol.magic = BN_TOL_MAGIC; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [brlcad-commits] SF.net SVN: brlcad:[65023] brlcad/trunk/doc/docbook/system/man1/en/gencolor .xml From: - 2015-05-21 19:39:10 Revision: 65023 http://sourceforge.net/p/brlcad/code/65023 Author: carlmoore Date: 2015-05-21 19:39:07 +0000 (Thu, 21 May 2015) Log Message: ----------- reduce use of underscores Modified Paths: -------------- brlcad/trunk/doc/docbook/system/man1/en/gencolor.xml Modified: brlcad/trunk/doc/docbook/system/man1/en/gencolor.xml =================================================================== --- brlcad/trunk/doc/docbook/system/man1/en/gencolor.xml 2015-05-21 19:28:01 UTC (rev 65022) +++ brlcad/trunk/doc/docbook/system/man1/en/gencolor.xml 2015-05-21 19:39:07 UTC (rev 65023) @@ -17,8 +17,8 @@ gencolor - -r# - -p -b -L -H + -r# + -p -b -L -H val1 valN This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [brlcad-commits] SF.net SVN: brlcad:[65022] brlcad/trunk/doc/docbook/system/man1/en/gencolor .xml From: - 2015-05-21 19:28:06 Revision: 65022 http://sourceforge.net/p/brlcad/code/65022 Author: carlmoore Date: 2015-05-21 19:28:01 +0000 (Thu, 21 May 2015) Log Message: ----------- rewrite of gencolor man page because of new options; also, I added 2015 for copyright (WHAT ABOUT OTHER REVISED PROGRAMS?) Modified Paths: -------------- brlcad/trunk/doc/docbook/system/man1/en/gencolor.xml Modified: brlcad/trunk/doc/docbook/system/man1/en/gencolor.xml =================================================================== --- brlcad/trunk/doc/docbook/system/man1/en/gencolor.xml 2015-05-21 19:06:19 UTC (rev 65021) +++ brlcad/trunk/doc/docbook/system/man1/en/gencolor.xml 2015-05-21 19:28:01 UTC (rev 65022) @@ -17,8 +17,9 @@ gencolor - -r# - val1valN + -r# + -p -b -L -H + val1 valN @@ -27,14 +28,21 @@ gencolor repeats a pattern of up to 8192 8-bit values on its standard output. The values, which range from 0 to 255, are taken either from the command -line, or in binary from its standard input. The +line, or in binary from its standard input (if not supplied, a single value +of 0, for black, is assumed). The flag can be used to specify the number of times to repeat the given -pattern, the default being infinity. -This program is useful for producing a given grey value or -color. Note that +pattern, the default being infinity (unless any of , +, , and are used -- see below). +This program is useful for producing a given grey value or color. Note that gencolor will refuse to write its output to a window; you must redirect the output to a file. + + and are used to specify pix file +and bw file, respectively. and are +used to specify low resolution and high resolution, respectively. By default, a pix file of low resolution +would be assumed; however, use of overrules any use of , +, , and . EXAMPLE @@ -51,7 +59,7 @@ COPYRIGHT -This software is Copyright (c) 1989-2014 by the United States +This software is Copyright (c) 1989-2015 by the United States Government as represented by U.S. Army Research Laboratory. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [brlcad-commits] SF.net SVN: brlcad:[65021] brlcad/trunk/src/util/gencolor.c From: - 2015-05-21 19:06:24 Revision: 65021 http://sourceforge.net/p/brlcad/code/65021 Author: carlmoore Date: 2015-05-21 19:06:19 +0000 (Thu, 21 May 2015) Log Message: ----------- implement -p,-b,-L,-H cases Modified Paths: -------------- brlcad/trunk/src/util/gencolor.c Modified: brlcad/trunk/src/util/gencolor.c =================================================================== --- brlcad/trunk/src/util/gencolor.c 2015-05-21 16:53:02 UTC (rev 65020) +++ brlcad/trunk/src/util/gencolor.c 2015-05-21 19:06:19 UTC (rev 65021) @@ -41,6 +41,16 @@ int bytes_in_buf, copies_per_buf; int32_t count = -1; +int32_t basemultiple = 262144; /* This is 512 squared. */ +int outputtype = 0; /* 1 for pix, 2 for bw; + * if this is used and resolution is not yet set, + * give resolution a default value of 1 + */ +int resolution = 0; /* 1 for low-res, 2 for hi-res; + * if this is used and outputtype is not yet set, + * give outputtype a default value of 1 + */ +int setrcount = 0; /* set to 1 if -r is detected */ unsigned char buf[MAX_BYTES]; @@ -58,13 +68,30 @@ int c; bu_optind = 1; - while ((c = bu_getopt(argc, argv, "r:h?")) != -1) { + while ((c = bu_getopt(argc, argv, "r:pbLHh?")) != -1) { switch (c) { case 'r': count = atoi(bu_optarg); if (count > INT32_MAX) count = INT32_MAX; + setrcount = 1; break; + case 'p': + outputtype = 1; + if (resolution == 0) resolution = 1; + break; + case 'b': + outputtype = 2; + if (resolution == 0) resolution = 1; + break; + case 'L': + resolution = 1; + if (outputtype == 0) outputtype = 1; + break; + case 'H': + resolution = 2; + if (outputtype == 0) outputtype = 1; + break; default: /* 'h' '?' */ printusage(0); } @@ -109,6 +136,22 @@ len = 1; } +/* If -r was used, ignore -p,-b,-L,-H */ + if (!setrcount) { + if (outputtype == 1) { + if (resolution == 1) + count = basemultiple*3; + else + count = basemultiple*12; + } else { + if (resolution == 1) + count = basemultiple; + else + count = basemultiple*4; + } + count = count/len; /* e.g., len is 3 for RGB for a pix file */ + } + /* * Replicate the pattern as many times as it will fit * in the buffer. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [brlcad-commits] SF.net SVN: brlcad:[65020] brlcad/trunk/src/util/gencolor.c From: - 2015-05-21 16:53:06 Revision: 65020 http://sourceforge.net/p/brlcad/code/65020 Author: carlmoore Date: 2015-05-21 16:53:02 +0000 (Thu, 21 May 2015) Log Message: ----------- '-r' no longer requires no following white space; default no-argument run (all black) is allowed Modified Paths: -------------- brlcad/trunk/src/util/gencolor.c Modified: brlcad/trunk/src/util/gencolor.c =================================================================== --- brlcad/trunk/src/util/gencolor.c 2015-05-20 21:27:33 UTC (rev 65019) +++ brlcad/trunk/src/util/gencolor.c 2015-05-21 16:53:02 UTC (rev 65020) @@ -31,15 +31,16 @@ #include #include #include "bio.h" - #include "bu/log.h" #include "bu/str.h" +#include "bu/getopt.h" #define MAX_BYTES (128*1024) static const char Usage[] = "Usage: gencolor [-r#] [val1 .. valN] > output_file\n"; int bytes_in_buf, copies_per_buf; +int32_t count = -1; unsigned char buf[MAX_BYTES]; @@ -47,29 +48,47 @@ printusage(int i) { bu_log("%s\n", Usage); - bu_log(" (No whitespace immediately after -r , and must redirect output)\n"); - bu_exit(i, NULL); + bu_log(" (Must redirect output; cannot send to tty)\n"); + if (i != 3) bu_exit(i, NULL); } +void +get_args(int argc, char **argv) +{ + int c; + bu_optind = 1; + while ((c = bu_getopt(argc, argv, "r:h?")) != -1) { + switch (c) { + case 'r': + count = atoi(bu_optarg); + if (count > INT32_MAX) + count = INT32_MAX; + break; + default: /* 'h' '?' */ + printusage(0); + } + } + + if( isatty(fileno(stdout))) printusage(1); + if (argc == 1 ){ + printusage(3); + fprintf(stderr, " Program continues running:\n"); + } + + return; +} + int main(int argc, char **argv) { int i, len, times; - int32_t count = -1; unsigned char *bp; - if (argc == 1 || isatty(fileno(stdout))) - printusage(1); + get_args(argc, argv); + argc = argc - bu_optind + 1; + argv = argv + bu_optind - 1; - if (argc > 1 && bu_strncmp(argv[1], "-r", 2) == 0) { - count = atoi(&argv[1][2]); - if (count > INT32_MAX) - count = INT32_MAX; - argv++; - argc--; - } - if (argc > 1) { /* get values from the command line */ i = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [brlcad-commits] SF.net SVN: brlcad:[65019] brlcad/trunk/src/util/pix-ps.c From: - 2015-05-20 21:27:36 Revision: 65019 http://sourceforge.net/p/brlcad/code/65019 Author: carlmoore Date: 2015-05-20 21:27:33 +0000 (Wed, 20 May 2015) Log Message: ----------- add 'h' to comment Modified Paths: -------------- brlcad/trunk/src/util/pix-ps.c Modified: brlcad/trunk/src/util/pix-ps.c =================================================================== --- brlcad/trunk/src/util/pix-ps.c 2015-05-20 20:34:56 UTC (rev 65018) +++ brlcad/trunk/src/util/pix-ps.c 2015-05-20 21:27:33 UTC (rev 65019) @@ -175,7 +175,7 @@ outheight = atof(bu_optarg); break; - default: /* '?' */ + default: /* 'h' '?' */ return 0; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [brlcad-commits] SF.net SVN: brlcad:[65018] brlcad/trunk/doc/docbook/system/man1/en/gencolor .xml From: - 2015-05-20 20:34:59 Revision: 65018 http://sourceforge.net/p/brlcad/code/65018 Author: carlmoore Date: 2015-05-20 20:34:56 +0000 (Wed, 20 May 2015) Log Message: ----------- add comment about use of RGB values Modified Paths: -------------- brlcad/trunk/doc/docbook/system/man1/en/gencolor.xml Modified: brlcad/trunk/doc/docbook/system/man1/en/gencolor.xml =================================================================== --- brlcad/trunk/doc/docbook/system/man1/en/gencolor.xml 2015-05-20 15:42:35 UTC (rev 65017) +++ brlcad/trunk/doc/docbook/system/man1/en/gencolor.xml 2015-05-20 20:34:56 UTC (rev 65018) @@ -39,7 +39,7 @@ EXAMPLE gencolor -r512 0 255 0 > foo.pix -will output 512 "green" pixels. +will output 512 "green" pixels (0 255 0 being used as RGB values). SEE ALSO This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.   [brlcad-commits] SF.net SVN: brlcad:[65017] brlcad/trunk From: - 2015-05-20 15:42:40 Revision: 65017 http://sourceforge.net/p/brlcad/code/65017 Author: starseeker Date: 2015-05-20 15:42:35 +0000 (Wed, 20 May 2015) Log Message: ----------- More tweaking of dom2dox build, move back to misc/tools. Add instructions on how to build to README.txt Modified Paths: -------------- brlcad/trunk/misc/tools/CMakeLists.txt brlcad/trunk/src/util/CMakeLists.txt Added Paths: ----------- brlcad/trunk/misc/tools/dom2dox/ brlcad/trunk/misc/tools/dom2dox/CMake/ brlcad/trunk/misc/tools/dom2dox/CMake/FindLEMON.cmake brlcad/trunk/misc/tools/dom2dox/CMake/FindPERPLEX.cmake brlcad/trunk/misc/tools/dom2dox/CMake/FindRE2C.cmake brlcad/trunk/misc/tools/dom2dox/CMake/LEMON_Util.cmake brlcad/trunk/misc/tools/dom2dox/CMake/PERPLEX_Util.cmake brlcad/trunk/misc/tools/dom2dox/CMake/RE2C_Util.cmake brlcad/trunk/misc/tools/dom2dox/CMakeLists.txt brlcad/trunk/misc/tools/dom2dox/Doxyfile brlcad/trunk/misc/tools/dom2dox/README.txt brlcad/trunk/misc/tools/dom2dox/dom2dox.c brlcad/trunk/misc/tools/dom2dox/dom2dox.h brlcad/trunk/misc/tools/dom2dox/dom2dox_parser.lemon brlcad/trunk/misc/tools/dom2dox/dom2dox_scanner.perplex brlcad/trunk/misc/tools/dom2dox.dist Removed Paths: ------------- brlcad/trunk/src/util/dom2dox/ Modified: brlcad/trunk/misc/tools/CMakeLists.txt =================================================================== --- brlcad/trunk/misc/tools/CMakeLists.txt 2015-05-20 14:16:42 UTC (rev 65016) +++ brlcad/trunk/misc/tools/CMakeLists.txt 2015-05-20 15:42:35 UTC (rev 65017) @@ -147,9 +147,8 @@ CMAKEFILES(astyle.dist) # dom2dox - Doc-O-Matic to Doxygen C++ source converter -# until it's made independent of libbu, see src/util/dom2dox -#include(${CMAKE_CURRENT_SOURCE_DIR}/dom2dox.dist) -#CMAKEFILES_IN_DIR(dom2dox_ignore_files dom2dox) +include(${CMAKE_CURRENT_SOURCE_DIR}/dom2dox.dist) +CMAKEFILES_IN_DIR(dom2dox_ignore_files dom2dox) # libxml and libxslt tools for DocBook processing. We build just # enough library support to get these two tools working. Added: brlcad/trunk/misc/tools/dom2dox/CMake/FindLEMON.cmake =================================================================== --- brlcad/trunk/misc/tools/dom2dox/CMake/FindLEMON.cmake (rev 0) +++ brlcad/trunk/misc/tools/dom2dox/CMake/FindLEMON.cmake 2015-05-20 15:42:35 UTC (rev 65017) @@ -0,0 +1,74 @@ +# +# - Find lemon executable and provides macros to generate custom build rules +# The module defines the following variables +# +# LEMON_EXECUTABLE - path to the lemon program +# LEMON_TEMPLATE - location of the lemon template file + +#============================================================================= +# F I N D L E M O N . C M A K E +# +# Originally based off of FindBISON.cmake from Kitware's CMake distribution +# +# Copyright (c) 2010-2014 United States Government as represented by +# the U.S. Army Research Laboratory. +# Copyright 2009 Kitware, Inc. +# Copyright 2006 Tristan Carel +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# * The names of the authors may not be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#============================================================================= + +find_program(LEMON_EXECUTABLE lemon DOC "path to the lemon executable") +mark_as_advanced(LEMON_EXECUTABLE) + +if(LEMON_EXECUTABLE AND NOT LEMON_TEMPLATE) + get_filename_component(lemon_path${LEMON_EXECUTABLE} PATH) + if(lemon_path) + set(LEMON_TEMPLATE "") + if(EXISTS ${lemon_path}/lempar.c) + set(LEMON_TEMPLATE "${lemon_path}/lempar.c") + endif(EXISTS ${lemon_path}/lempar.c) + if(EXISTS /usr/share/lemon/lempar.c) + set(LEMON_TEMPLATE "/usr/share/lemon/lempar.c") + endif(EXISTS /usr/share/lemon/lempar.c) + endif(lemon_path) +endif(LEMON_EXECUTABLE AND NOT LEMON_TEMPLATE) +include(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LEMON DEFAULT_MSG LEMON_EXECUTABLE LEMON_TEMPLATE) +mark_as_advanced(LEMON_TEMPLATE) + +#============================================================ +# FindLEMON.cmake ends here + +# Local Variables: +# tab-width: 8 +# mode: cmake +# indent-tabs-mode: t +# End: +# ex: shiftwidth=2 tabstop=8 Property changes on: brlcad/trunk/misc/tools/dom2dox/CMake/FindLEMON.cmake ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: brlcad/trunk/misc/tools/dom2dox/CMake/FindPERPLEX.cmake =================================================================== --- brlcad/trunk/misc/tools/dom2dox/CMake/FindPERPLEX.cmake (rev 0) +++ brlcad/trunk/misc/tools/dom2dox/CMake/FindPERPLEX.cmake 2015-05-20 15:42:35 UTC (rev 65017) @@ -0,0 +1,79 @@ +# +# - Find perplex executable and provides macros to generate custom build rules +# The module defines the following variables +# +# PERPLEX_EXECUTABLE - path to the perplex program +# PERPLEX_TEMPLATE - location of the perplex template file + +#============================================================================= +# F I N D P E R P L E X . C M A K E +# +# Originally based off of FindBISON.cmake from Kitware's CMake distribution +# +# Copyright (c) 2010-2014 United States Government as represented by +# the U.S. Army Research Laboratory. +# Copyright 2009 Kitware, Inc. +# Copyright 2006 Tristan Carel +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# * The names of the authors may not be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#============================================================================= + +find_program(PERPLEX_EXECUTABLE perplex DOC "path to the perplex executable") +mark_as_advanced(PERPLEX_EXECUTABLE) + +if(PERPLEX_EXECUTABLE AND NOT PERPLEX_TEMPLATE) + get_filename_component(perplex_path${PERPLEX_EXECUTABLE} PATH) + if(perplex_path) + set(PERPLEX_TEMPLATE "") + if(EXISTS ${perplex_path}/../share/perplex/perplex_template.c) + get_filename_component(perplex_template_path "${perplex_path}/../share/perplex/perplex_template.c" ABSOLUTE) + set(PERPLEX_TEMPLATE "${perplex_template_path}") + endif(EXISTS${perplex_path}/../share/perplex/perplex_template.c) + if(EXISTS ${perplex_path}/../share/perplex_template.c AND NOT PERPLEX_TEMPLATE) + get_filename_component(perplex_template_path "${perplex_path}/../share/perplex_template.c" ABSOLUTE) + set(PERPLEX_TEMPLATE "${perplex_template_path}") + endif(EXISTS${perplex_path}/../share/perplex_template.c AND NOT PERPLEX_TEMPLATE) + endif(perplex_path) + if(EXISTS /usr/share/perplex/perplex_template.c AND NOT PERPLEX_TEMPLATE) + set(PERPLEX_TEMPLATE "/usr/share/perplex/perplex_template.c") + endif(EXISTS /usr/share/perplex/perplex_template.c AND NOT PERPLEX_TEMPLATE) +endif(PERPLEX_EXECUTABLE AND NOT PERPLEX_TEMPLATE) +include(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(PERPLEX DEFAULT_MSG PERPLEX_EXECUTABLE PERPLEX_TEMPLATE) +mark_as_advanced(PERPLEX_TEMPLATE) + +#============================================================ +# FindPERPLEX.cmake ends here + +# Local Variables: +# tab-width: 8 +# mode: cmake +# indent-tabs-mode: t +# End: +# ex: shiftwidth=2 tabstop=8 Property changes on: brlcad/trunk/misc/tools/dom2dox/CMake/FindPERPLEX.cmake ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: brlcad/trunk/misc/tools/dom2dox/CMake/FindRE2C.cmake =================================================================== --- brlcad/trunk/misc/tools/dom2dox/CMake/FindRE2C.cmake (rev 0) +++ brlcad/trunk/misc/tools/dom2dox/CMake/FindRE2C.cmake 2015-05-20 15:42:35 UTC (rev 65017) @@ -0,0 +1,10 @@ +# The module defines the following variables: +# RE2C_EXECUTABLE - the path to the re2c executable +# +#============================================================================= + +find_program(RE2C_EXECUTABLE re2c DOC "path to the re2c executable") +mark_as_advanced(RE2C_EXECUTABLE) + +include(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(RE2C DEFAULT_MSG RE2C_EXECUTABLE) Property changes on: brlcad/trunk/misc/tools/dom2dox/CMake/FindRE2C.cmake ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: brlcad/trunk/misc/tools/dom2dox/CMake/LEMON_Util.cmake =================================================================== --- brlcad/trunk/misc/tools/dom2dox/CMake/LEMON_Util.cmake (rev 0) +++ brlcad/trunk/misc/tools/dom2dox/CMake/LEMON_Util.cmake 2015-05-20 15:42:35 UTC (rev 65017) @@ -0,0 +1,149 @@ +# Defines the macro +# LEMON_TARGET( +# []) +# which will create a custom rule to generate a parser. is +# the path to a lemon file. is the desired name for the +# generated source file. is the desired name for the +# generated header which contains the token list. Anything in the optional +# parameter is appended to the lemon command line. +# +# ==================================================================== +# Example: +# +# find_package(LEMON) +# LEMON_TARGET(MyParser parser.y parser.c parser.h) +# add_executable(Foo main.cpp ${LEMON_MyParser_OUTPUTS}) +# ==================================================================== +# +#============================================================================= +# +# Originally based off of FindBISON.cmake from Kitware's CMake distribution +# +# Copyright (c) 2010-2014 United States Government as represented by +# the U.S. Army Research Laboratory. +# Copyright 2009 Kitware, Inc. +# Copyright 2006 Tristan Carel +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# * The names of the authors may not be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#============================================================================= + +#============================================================ +# LEMON_TARGET (public macro) +#============================================================ +# +# TODO - rework this macro to make use of CMakeParseArguments, see +# http://www.cmake.org/pipermail/cmake/2012-July/051309.html +# + +macro(LEMON_TARGET Name LemonInput LemonSource LemonHeader) + if(NOT${ARGC} EQUAL 4 AND NOT ${ARGC} EQUAL 5) + message(SEND_ERROR "Usage") + else() + get_filename_component(LemonInputFull${LemonInput} ABSOLUTE) + get_filename_component(LemonSourceFull ${LemonSource} ABSOLUTE) + get_filename_component(LemonHeaderFull${LemonHeader} ABSOLUTE) + + if(NOT ${LemonInput} STREQUAL${LemonInputFull}) + set(LEMON_${Name}_INPUT "${CMAKE_CURRENT_BINARY_DIR}/${LemonInput}") + else(NOT${LemonInput} STREQUAL ${LemonInputFull}) + set(LEMON_${Name}_INPUT "${LemonInput}") + endif(NOT${LemonInput} STREQUAL ${LemonInputFull}) + + if(NOT${LemonSource} STREQUAL ${LemonSourceFull}) + set(LEMON_${Name}_OUTPUT_SOURCE "${CMAKE_CURRENT_BINARY_DIR}/${LemonSource}") + else(NOT ${LemonSource} STREQUAL${LemonSourceFull}) + set(LEMON_${Name}_OUTPUT_SOURCE "${LemonSource}") + endif(NOT ${LemonSource} STREQUAL${LemonSourceFull}) + + if(NOT ${LemonHeader} STREQUAL${LemonHeaderFull}) + set(LEMON_${Name}_OUTPUT_HEADER "${CMAKE_CURRENT_BINARY_DIR}/${LemonHeader}") + else(NOT${LemonHeader} STREQUAL ${LemonHeaderFull}) + set(LEMON_${Name}_OUTPUT_HEADER "${LemonHeader}") + endif(NOT${LemonHeader} STREQUAL ${LemonHeaderFull}) + + set(LEMON_${Name}_EXTRA_ARGS "${ARGV4}") + + # get input name minus path + get_filename_component(INPUT_NAME "${LemonInput}" NAME) + set(LEMON_BIN_INPUT ${CMAKE_CURRENT_BINARY_DIR}/${INPUT_NAME}) + + # names of lemon output files will be based on the name of the input file + string(REGEX REPLACE "^(.*)(\\.[^.]*)$" "\\1.c" LEMON_GEN_SOURCE "${INPUT_NAME}") + string(REGEX REPLACE "^(.*)(\\.[^.]*)$" "\\1.h" LEMON_GEN_HEADER "${INPUT_NAME}") + string(REGEX REPLACE "^(.*)(\\.[^.]*)$" "\\1.out" LEMON_GEN_OUT "${INPUT_NAME}") + + # copy input to bin directory and run lemon + add_custom_command( + OUTPUT ${LEMON_GEN_OUT}${LEMON_GEN_SOURCE} ${LEMON_GEN_HEADER} + COMMAND${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${LemonInput} ${LEMON_BIN_INPUT} + COMMAND${LEMON_EXECUTABLE} ${INPUT_NAME}${LEMON_${Name}_EXTRA_ARGS} + DEPENDS${LemonInput} ${LEMON_TEMPLATE}${LEMON_EXECUTABLE_TARGET} + COMMENT "[LEMON][${Name}] Building parser with${LEMON_EXECUTABLE}" + ) + + # rename generated outputs + if(NOT "${LemonSource}" STREQUAL "${LEMON_GEN_SOURCE}") + add_custom_command( + OUTPUT ${LemonSource} + COMMAND${CMAKE_COMMAND} -E copy ${LEMON_GEN_SOURCE}${LemonSource} + DEPENDS ${LemonInput}${LEMON_EXECUTABLE_TARGET} ${LEMON_GEN_SOURCE} + ) + set(LEMON_${Name}_OUTPUTS ${LemonSource}${LEMON_${Name}_OUTPUTS}) + endif(NOT "${LemonSource}" STREQUAL "${LEMON_GEN_SOURCE}") + if(NOT "${LemonHeader}" STREQUAL "${LEMON_GEN_HEADER}") + add_custom_command( + OUTPUT${LemonHeader} + COMMAND ${CMAKE_COMMAND} -E copy${LEMON_GEN_HEADER} ${LemonHeader} + DEPENDS${LemonInput} ${LEMON_EXECUTABLE_TARGET}${LEMON_GEN_HEADER} + ) + set(LEMON_${Name}_OUTPUTS${LemonHeader} ${LEMON_${Name}_OUTPUTS}) + endif(NOT "${LemonHeader}" STREQUAL "${LEMON_GEN_HEADER}") + + set(LEMON_${Name}_OUTPUTS${LEMON_GEN_OUT} ${LemonSource}${LemonHeader}) + + # make sure we clean up generated output and copied input + set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${LEMON_${Name}_OUTPUTS}") + if(NOT ${LemonInputFull} STREQUAL${LEMON_BIN_INPUT}) + set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${LEMON_BIN_INPUT}") + endif(NOT${LemonInputFull} STREQUAL ${LEMON_BIN_INPUT}) + + # macro ran successfully + set(LEMON_${Name}_DEFINED TRUE) + endif(NOT ${ARGC} EQUAL 4 AND NOT${ARGC} EQUAL 5) +endmacro(LEMON_TARGET) +# +#============================================================ +# LEMON_Utils.cmake ends here + +# Local Variables: +# tab-width: 8 +# mode: cmake +# indent-tabs-mode: t +# End: +# ex: shiftwidth=2 tabstop=8 Property changes on: brlcad/trunk/misc/tools/dom2dox/CMake/LEMON_Util.cmake ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: brlcad/trunk/misc/tools/dom2dox/CMake/PERPLEX_Util.cmake =================================================================== --- brlcad/trunk/misc/tools/dom2dox/CMake/PERPLEX_Util.cmake (rev 0) +++ brlcad/trunk/misc/tools/dom2dox/CMake/PERPLEX_Util.cmake 2015-05-20 15:42:35 UTC (rev 65017) @@ -0,0 +1,138 @@ +# Defines two macros - PERPLEX_TARGET, which takes perplex inputs and +# runs both perplex and re2c to generate C source code/headers, and +# ADD_PERPLEX_LEMON_DEPENDENCY which is used to set up dependencies between +# scanner and parser targets when necessary. +# +# #==================================================================== +# Example: +# +# find_package(LEMON) +# find_package(RE2C) +# find_package(PERPLEX) +# +# LEMON_TARGET(MyParser parser.y ${CMAKE_CURRENT_BINARY_DIR}/parser.cpp +# PERPLEX_TARGET(MyScanner scanner.re${CMAKE_CURRENT_BINARY_DIR}/scanner.cpp ${CMAKE_CURRENT_BINARY_DIR}/scanner_header.hpp) +# ADD_PERPLEX_LEMON_DEPENDENCY(MyScanner MyParser) +# +# include_directories(${CMAKE_CURRENT_BINARY_DIR}) +# add_executable(Foo +# Foo.cc +# ${LEMON_MyParser_OUTPUTS} +#${PERPLEX_MyScanner_OUTPUTS} +# ) +# ==================================================================== +# +#============================================================================= +# +# Originally based off of FindBISON.cmake from Kitware's CMake distribution +# +# Copyright (c) 2010-2014 United States Government as represented by +# the U.S. Army Research Laboratory. +# Copyright 2009 Kitware, Inc. +# Copyright 2006 Tristan Carel +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# * The names of the authors may not be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#============================================================================= + +#============================================================ +# PERPLEX_TARGET (public macro) +#============================================================ +# +# TODO - rework this macro to make use of CMakeParseArguments, see +# http://www.cmake.org/pipermail/cmake/2012-July/051309.html +# +macro(PERPLEX_TARGET Name Input OutputSrc OutputHeader) + if(${ARGC} GREATER 4) + set(Template${ARGV4}) + else(${ARGC} GREATER 4) + if(PERPLEX_TEMPLATE) + set(Template${PERPLEX_TEMPLATE}) + else(PERPLEX_TEMPLATE) + message(FATAL_ERROR "\nNo Perplex template file specified - please specify the file using the PERPLEX_TEMPLATE variable:\ncmake .. -DPERPLEX_TEMPLATE=/path/to/template_file.c\n") + endif(PERPLEX_TEMPLATE) + endif(${ARGC} GREATER 4) + + get_filename_component(OutputName${OutputSrc} NAME) + set(re2c_src "${CMAKE_CURRENT_BINARY_DIR}/${OutputName}.re") + + add_custom_command( + OUTPUT ${re2c_src}${OutputHeader} + COMMAND ${PERPLEX_EXECUTABLE} -c -o${re2c_src} -i ${OutputHeader} -t${Template} ${Input} + DEPENDS${Input} ${Template}${PERPLEX_EXECUTABLE_TARGET} ${RE2C_EXECUTABLE_TARGET} + WORKING_DIRECTORY${CMAKE_CURRENT_SOURCE_DIR} + COMMENT "[PERPLEX][${Name}] Generating re2c input with${PERPLEX_EXECUTABLE}" + ) + if(NOT DEBUGGING_GENERATED_SOURCES) + add_custom_command( + OUTPUT ${OutputSrc} + COMMAND${RE2C_EXECUTABLE} --no-debug-info --no-generation-date -c -o ${OutputSrc}${re2c_src} + DEPENDS ${Input}${re2c_src} ${OutputHeader}${PERPLEX_EXECUTABLE_TARGET} ${RE2C_EXECUTABLE_TARGET} + WORKING_DIRECTORY${CMAKE_CURRENT_SOURCE_DIR} + COMMENT "[RE2C][${Name}] Building scanner with${RE2C_EXECUTABLE}" + ) + else(NOT DEBUGGING_GENERATED_SOURCES) + add_custom_command( + OUTPUT ${OutputSrc} + COMMAND${RE2C_EXECUTABLE} --no-generation-date -c -o ${OutputSrc}${re2c_src} + DEPENDS ${Input}${re2c_src} ${OutputHeader}${PERPLEX_EXECUTABLE_TARGET} ${RE2C_EXECUTABLE_TARGET} + WORKING_DIRECTORY${CMAKE_CURRENT_SOURCE_DIR} + COMMENT "[RE2C][${Name}] Building scanner with${RE2C_EXECUTABLE}" + ) + endif(NOT DEBUGGING_GENERATED_SOURCES) + set(PERPLEX_${Name}_DEFINED TRUE) + set(PERPLEX_${Name}_OUTPUTS ${OutputSrc}) + set(PERPLEX_${Name}_INPUT ${Input}) +endmacro(PERPLEX_TARGET) + +#============================================================ +# ADD_PERPLEX_LEMON_DEPENDENCY (public macro) +#============================================================ +macro(ADD_PERPLEX_LEMON_DEPENDENCY PERPLEXTarget LemonTarget) + + if(NOT PERPLEX_${PERPLEXTarget}_OUTPUTS) + message(SEND_ERROR "PERPLEX target ${PERPLEXTarget}' does not exists.") + endif() + + if(NOT LEMON_${LemonTarget}_OUTPUT_HEADER) + message(SEND_ERROR "Lemon target ${LemonTarget}' does not exists.") + endif() + + set_source_files_properties(${PERPLEX_${PERPLEXTarget}_OUTPUTS} + PROPERTIES OBJECT_DEPENDS${LEMON_${LemonTarget}_OUTPUT_HEADER}) +endmacro(ADD_PERPLEX_LEMON_DEPENDENCY) + +#============================================================ +# PERPLEX_Utils.cmake ends here + +# Local Variables: +# tab-width: 8 +# mode: cmake +# indent-tabs-mode: t +# End: +# ex: shiftwidth=2 tabstop=8 Property changes on: brlcad/trunk/misc/tools/dom2dox/CMake/PERPLEX_Util.cmake ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: brlcad/trunk/misc/tools/dom2dox/CMake/RE2C_Util.cmake =================================================================== --- brlcad/trunk/misc/tools/dom2dox/CMake/RE2C_Util.cmake (rev 0) +++ brlcad/trunk/misc/tools/dom2dox/CMake/RE2C_Util.cmake 2015-05-20 15:42:35 UTC (rev 65017) @@ -0,0 +1,133 @@ +# R E 2 C _ U T I L . C M A K E +# +# Provides a macro to generate custom build rules: + +# RE2C_TARGET(Name RE2CInput RE2COutput [COMPILE_FLAGS ]) +# which creates a custom command to generate the file from +# the file. If COMPILE_FLAGS option is specified, the next +# parameter is added to the re2c command line. Name is an alias used to +# get details of this custom command. + +# This module also defines a macro: +# ADD_RE2C_LEMON_DEPENDENCY(RE2CTarget LemonTarget) +# which adds the required dependency between a scanner and a parser +# where and are the first parameters of +# respectively RE2C_TARGET and LEMON_TARGET macros. +# +# ==================================================================== +# Example: +# +# find_package(LEMON) +# find_package(RE2C) +# +# LEMON_TARGET(MyParser parser.y${CMAKE_CURRENT_BINARY_DIR}/parser.cpp +# RE2C_TARGET(MyScanner scanner.re ${CMAKE_CURRENT_BINARY_DIR}/scanner.cpp) +# ADD_RE2C_LEMON_DEPENDENCY(MyScanner MyParser) +# +# include_directories(${CMAKE_CURRENT_BINARY_DIR}) +# add_executable(Foo +# Foo.cc +# ${LEMON_MyParser_OUTPUTS} +#${RE2C_MyScanner_OUTPUTS} +# ) +# ==================================================================== +# +#============================================================================= +# Copyright (c) 2010-2014 United States Government as represented by +# the U.S. Army Research Laboratory. +# Copyright 2009 Kitware, Inc. +# Copyright 2006 Tristan Carel +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# * The names of the authors may not be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#============================================================================= + +#============================================================ +# RE2C_TARGET (public macro) +#============================================================ +# +# TODO - rework this macro to make use of CMakeParseArguments, see +# http://www.cmake.org/pipermail/cmake/2012-July/051309.html +# +macro(RE2C_TARGET Name Input Output) + set(RE2C_TARGET_usage "RE2C_TARGET( [COMPILE_FLAGS ]") + if(${ARGC} GREATER 3) + if(${ARGC} EQUAL 5) + if("${ARGV3}" STREQUAL "COMPILE_FLAGS") + set(RE2C_EXECUTABLE_opts "${ARGV4}") + SEPARATE_ARGUMENTS(RE2C_EXECUTABLE_opts) + else() + message(SEND_ERROR ${RE2C_TARGET_usage}) + endif() + else() + message(SEND_ERROR${RE2C_TARGET_usage}) + endif() + endif() + + add_custom_command(OUTPUT ${Output} + COMMAND${RE2C_EXECUTABLE} + ARGS ${RE2C_EXECUTABLE_opts} -o${Output} ${Input} + DEPENDS${Input} ${RE2C_EXECUTABLE_TARGET} + COMMENT "[RE2C][${Name}] Building scanner with ${RE2C_EXECUTABLE}" + WORKING_DIRECTORY${CMAKE_CURRENT_SOURCE_DIR}) + + set(RE2C_${Name}_DEFINED TRUE) + set(RE2C_${Name}_OUTPUTS ${Output}) + set(RE2C_${Name}_INPUT ${Input}) + set(RE2C_${Name}_COMPILE_FLAGS ${RE2C_EXECUTABLE_opts}) + set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${Output}") +endmacro(RE2C_TARGET) +#============================================================ + +#============================================================ +# ADD_RE2C_LEMON_DEPENDENCY (public macro) +#============================================================ +# +macro(ADD_RE2C_LEMON_DEPENDENCY RE2CTarget LemonTarget) + + if(NOT RE2C_${RE2CTarget}_OUTPUTS) + message(SEND_ERROR "RE2C target ${RE2CTarget}' does not exists.") + endif() + + if(NOT LEMON_${LemonTarget}_OUTPUT_HEADER) + message(SEND_ERROR "Lemon target ${LemonTarget}' does not exists.") + endif() + + set_source_files_properties(${RE2C_${RE2CTarget}_OUTPUTS} + PROPERTIES OBJECT_DEPENDS ${LEMON_${LemonTarget}_OUTPUT_HEADER}) +endmacro(ADD_RE2C_LEMON_DEPENDENCY) +#============================================================ + +# RE2C_Util.cmake ends here + +# Local Variables: +# tab-width: 8 +# mode: cmake +# indent-tabs-mode: t +# End: +# ex: shiftwidth=2 tabstop=8 Property changes on: brlcad/trunk/misc/tools/dom2dox/CMake/RE2C_Util.cmake ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: brlcad/trunk/misc/tools/dom2dox/CMakeLists.txt =================================================================== --- brlcad/trunk/misc/tools/dom2dox/CMakeLists.txt (rev 0) +++ brlcad/trunk/misc/tools/dom2dox/CMakeLists.txt 2015-05-20 15:42:35 UTC (rev 65017) @@ -0,0 +1,133 @@ +# Copyright (c) 2015 United States Government as represented by +# the U.S. Army Research Laboratory. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following +# disclaimer in the documentation and/or other materials provided +# with the distribution. +# +# 3. The name of the author may not be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AS IS'' AND ANY EXPRESS +# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE +# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +cmake_minimum_required(VERSION 2.8) + +# Minimum required version of CMake +cmake_minimum_required(VERSION 2.8.4) +if(COMMAND CMAKE_POLICY) + # libraries linked via full path don't introduce linker search paths + CMAKE_POLICY(SET CMP0003 NEW) + + # list command doesn't ignore empty elements + CMAKE_POLICY(SET CMP0007 NEW) + + # prefer files in CMAKE_MODULE_PATH over the cmake module dir + CMAKE_POLICY(SET CMP0017 OLD) + + # allow relative paths in INCLUDE_DIRECTORIES + if ("${CMAKE_VERSION}" VERSION_EQUAL 2.8.12 OR "${CMAKE_VERSION}" VERSION_GREATER 2.8.12) + CMAKE_POLICY(SET CMP0021 OLD) + endif ("${CMAKE_VERSION}" VERSION_EQUAL 2.8.12 OR "${CMAKE_VERSION}" VERSION_GREATER 2.8.12) + + if ("${CMAKE_VERSION}" VERSION_GREATER 2.99) + CMAKE_POLICY(SET CMP0026 OLD) + CMAKE_POLICY(SET CMP0042 OLD) + endif ("${CMAKE_VERSION}" VERSION_GREATER 2.99) + + if ("${CMAKE_VERSION}" VERSION_GREATER 3.0.9) + CMAKE_POLICY(SET CMP0046 NEW) + CMAKE_POLICY(SET CMP0053 OLD) + CMAKE_POLICY(SET CMP0054 NEW) + endif ("${CMAKE_VERSION}" VERSION_GREATER 3.0.9) +endif(COMMAND CMAKE_POLICY) + +project(DOM2DOX) + +set(DOM2DOX_CMAKE_DIR "${DOM2DOX_SOURCE_DIR}/CMake") +if(DOM2DOX_IS_SUBBUILD) + set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${DOM2DOX_CMAKE_DIR}") +else(DOM2DOX_IS_SUBBUILD) + set(CMAKE_MODULE_PATH "${DOM2DOX_CMAKE_DIR};${CMAKE_MODULE_PATH}") +endif(DOM2DOX_IS_SUBBUILD) + +if(NOT DOM2DOX_IS_SUBBUILD) + find_package(LEMON) + find_package(RE2C) + find_package(PERPLEX) + + include(${CMAKE_CURRENT_SOURCE_DIR}/CMake/PERPLEX_Util.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/CMake/LEMON_Util.cmake) + include(${CMAKE_CURRENT_SOURCE_DIR}/CMake/RE2C_Util.cmake) +endif(NOT DOM2DOX_IS_SUBBUILD) + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} +${CMAKE_CURRENT_BINARY_DIR} + ${BRLCAD_SRC_INCLUDE_DIR} +${BRLCAD_BUILD_INCLUDE_DIR} + ${TCL_INCLUDE_DIR} + ) + + +PERPLEX_TARGET(dom2dox_scanner dom2dox_scanner.perplex +${CMAKE_CURRENT_BINARY_DIR}/dom2dox_scanner.c + ${CMAKE_CURRENT_BINARY_DIR}/dom2dox_scanner.h) +LEMON_TARGET(dom2dox_parser dom2dox_parser.lemon +${CMAKE_CURRENT_BINARY_DIR}/dom2dox_parser.c + ${CMAKE_CURRENT_BINARY_DIR}/dom2dox_parser.h) +ADD_PERPLEX_LEMON_DEPENDENCY(dom2dox_scanner dom2dox_parser) + +set(dom2dox_srcs + dom2dox.c +${CMAKE_CURRENT_BINARY_DIR}/dom2dox_scanner.c + ${CMAKE_CURRENT_BINARY_DIR}/dom2dox_parser.c +) +add_executable(dom2dox${dom2dox_srcs}) +target_link_libraries(dom2dox ${BU_LIBRARY}) +include(CheckCCompilerFlag) +CHECK_C_COMPILER_FLAG(-Wno-error NOERROR_FLAG) +if(NOERROR_FLAG) + set_property(TARGET dom2dox APPEND PROPERTY COMPILE_FLAGS "-Wno-error") +endif(NOERROR_FLAG) + +# TODO - The logic below belongs in BRL-CAD's doc directory + +#set(CONVERSION_DIR "${CMAKE_CURRENT_BINARY_DIR}/gen") +#foreach(ON_source ${ON_sources}) +# add_custom_command(OUTPUT "${ON_source}" DEPENDS dom2dox +# COMMAND cmake ARGS -E make_directory "${CONVERSION_DIR}" +# COMMAND dom2dox ARGS "${OPENNURBS_SOURCE_ROOT}/${ON_source}" "${CONVERSION_DIR}/${ON_source}") +#endforeach(ON_source) + +#set(DOC_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}/doc") +#add_custom_target(ON_DOC ALL DEPENDS ${ON_sources} +# COMMAND cmake -E make_directory "${DOC_OUTPUT_DIR}" +# COMMAND cmake -E copy "${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile" "${DOC_OUTPUT_DIR}/Doxyfile" +# COMMAND cmake -E chdir "${DOC_OUTPUT_DIR}" doxygen Doxyfile +# WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") + +# Local Variables: +# tab-width: 8 +# mode: cmake +# indent-tabs-mode: t +# End: +# ex: shiftwidth=2 tabstop=8 Property changes on: brlcad/trunk/misc/tools/dom2dox/CMakeLists.txt ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: brlcad/trunk/misc/tools/dom2dox/Doxyfile =================================================================== --- brlcad/trunk/misc/tools/dom2dox/Doxyfile (rev 0) +++ brlcad/trunk/misc/tools/dom2dox/Doxyfile 2015-05-20 15:42:35 UTC (rev 65017) @@ -0,0 +1,1869 @@ +# Doxyfile 1.8.3.1 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project. +# +# All text after a hash (#) is considered a comment and will be ignored. +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" "). + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or sequence of words) that should +# identify the project. Note that if you do not use Doxywizard you need +# to put quotes around the project name if it contains spaces. + +PROJECT_NAME = "OpenNURBS" + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = + +# Using the PROJECT_BRIEF tag one can provide an optional one line description +# for a project that appears at the top of each page and should give viewer +# a quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = + +# With the PROJECT_LOGO tag one can specify an logo or icon that is +# included in the documentation. The maximum height of the logo should not +# exceed 55 pixels and the maximum width should not exceed 200 pixels. +# Doxygen will copy the logo to the output directory. + +PROJECT_LOGO = + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The$name class" "The $name widget" +# "The$name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = YES + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. Note that you specify absolute paths here, but also +# relative paths, which will be relative from the directory where doxygen is +# started. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful if your file system +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) + +JAVADOC_AUTOBRIEF = NO + +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 4 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# This tag can be used to specify a number of word-keyword mappings (TCL only). +# A mapping has the form "name=value". For example adding +# "class=itcl::class" will allow you to use the command class in the +# itcl::class meaning. + +TCL_SUBST = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given +# extension. Doxygen has a built-in mapping, but you can override or extend it +# using this tag. The format is ext=language, where ext is a file extension, +# and language is one of the parsers supported by doxygen: IDL, Java, +# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, +# C++. For instance to make doxygen treat .inc files as Fortran files (default +# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note +# that for custom extensions you also need to set FILE_PATTERNS otherwise the +# files are not read by doxygen. + +EXTENSION_MAPPING = + +# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all +# comments according to the Markdown format, which allows for more readable +# documentation. See http://daringfireball.net/projects/markdown/ for details. +# The output of markdown processing is further processed by doxygen, so you +# can mix doxygen, HTML, and XML commands with Markdown formatting. +# Disable only in case of backward compatibilities issues. + +MARKDOWN_SUPPORT = YES + +# When enabled doxygen tries to link words that correspond to documented classes, +# or namespaces to their corresponding documentation. Such a link can be +# prevented in individual cases by by putting a % sign in front of the word or +# globally by setting AUTOLINK_SUPPORT to NO. + +AUTOLINK_SUPPORT = YES + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also makes the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate +# getter and setter methods for a property. Setting this option to YES (the +# default) will make doxygen replace the get and set methods by a property in +# the documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and +# unions are shown inside the group in which they are included (e.g. using +# @ingroup) instead of on a separate page (for HTML and Man pages) or +# section (for LaTeX and RTF). + +INLINE_GROUPED_CLASSES = NO + +# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and +# unions with only public data fields will be shown inline in the documentation +# of the scope in which they are defined (i.e. file, namespace, or group +# documentation), provided this scope is documented. If set to NO (the default), +# structs, classes, and unions are shown on a separate page (for HTML and Man +# pages) or section (for LaTeX and RTF). + +INLINE_SIMPLE_STRUCTS = NO + +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penalty. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will roughly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols. + +SYMBOL_CACHE_SIZE = 0 + +# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be +# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given +# their name and scope. Since this can be an expensive process and often the +# same symbol appear multiple times in the code, doxygen keeps a cache of +# pre-resolved symbols. If the cache is too small doxygen will become slower. +# If the cache is too large, memory is wasted. The cache size is given by this +# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols. + +LOOKUP_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = NO + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal +# scope will be included in the documentation. + +EXTRACT_PACKAGE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespaces are hidden. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = NO + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen +# will list include files with double quotes in the documentation +# rather than with sharp brackets. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen +# will sort the (brief and detailed) documentation of class members so that +# constructors and destructors are listed first. If set to NO (the default) +# the constructors will appear in the respective orders defined by +# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. +# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO +# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = NO + +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to +# do proper type resolution of all parameters of a function it will reject a +# match between the prototype and the implementation of a member function even +# if there is only one candidate or it is obvious which candidate to choose +# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen +# will still accept a match between prototype and implementation in such cases. + +STRICT_PROTO_MATCHING = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if section-label ... \endif +# and \cond section-label ... \endcond blocks. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or macro consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and macros in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. +# This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command , where is the value of +# the FILE_VERSION_FILTER tag, and is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. To create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. +# You can optionally specify a file name after the option, if omitted +# DoxygenLayout.xml will be used as the name of the layout file. + +LAYOUT_FILE = + +# The CITE_BIB_FILES tag can be used to specify one or more bib files +# containing the references data. This must be a list of .bib files. The +# .bib extension is automatically appended if omitted. Using this command +# requires the bibtex tool to be installed. See also +# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style +# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this +# feature you need bibtex and perl available in the search path. Do not use +# file names with spaces, bibtex cannot handle them. + +CITE_BIB_FILES = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = NO + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# The WARN_NO_PARAMDOC option can be enabled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file,$line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +#$version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = ../gen + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh +# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py +# *.f90 *.f *.for *.vhd *.vhdl + +FILE_PATTERNS = + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = NO + +# The EXCLUDE tag can be used to specify files and/or directories that should be +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. +# Note that relative paths are relative to the directory from which doxygen is +# run. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command , where +# is the value of the INPUT_FILTER tag, and is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. +# If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. +# Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. +# The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty or if +# non of the patterns match the file name, INPUT_FILTER is applied. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) +# and it is also possible to disable source filtering for a specific pattern +# using *.ext= (so without naming a filter). This option only has effect when +# FILTER_SOURCE_FILES is enabled. + +FILTER_SOURCE_PATTERNS = + +# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that +# is part of the input, its contents will be placed on the main page (index.html). +# This can be useful if you have a project on for instance GitHub and want reuse +# the introduction page also for the doxygen output. + +USE_MDFILE_AS_MAINPAGE = + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C, C++ and Fortran comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. +# Otherwise they will link to the documentation. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = YES + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank html' will be used as the default path. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. Note that when using a custom header you are responsible +# for the proper inclusion of any scripts and style sheets that doxygen +# needs, which is dependent on the configuration options used. +# It is advised to generate a default header using "doxygen -w html +# header.html footer.html stylesheet.css YourConfigFile" and then modify +# that header. Note that the header is subject to change so you typically +# have to redo this when upgrading to a newer version of doxygen or when +# changing the value of configuration settings such as GENERATE_TREEVIEW! + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If left blank doxygen will +# generate a default style sheet. Note that it is recommended to use +# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this +# tag will in the future become obsolete. + +HTML_STYLESHEET = + +# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional +# user-defined cascading style sheet that is included after the standard +# style sheets created by doxygen. Using this option one can overrule +# certain style aspects. This is preferred over using HTML_STYLESHEET +# since it does not replace the standard style sheet and is therefor more +# robust against future updates. Doxygen will copy the style sheet file to +# the output directory. + +HTML_EXTRA_STYLESHEET = + +# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the HTML output directory. Note +# that these files will be copied to the base HTML output directory. Use the +#$relpath\$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these +# files. In the HTML_STYLESHEET file, use the file name only. Also note that +# the files will be copied as-is; there are no commands or markers available. + +HTML_EXTRA_FILES = + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. +# Doxygen will adjust the colors in the style sheet and background images +# according to this color. Hue is specified as an angle on a colorwheel, +# see http://en.wikipedia.org/wiki/Hue for more information. +# For instance the value 0 represents red, 60 is yellow, 120 is green, +# 180 is cyan, 240 is blue, 300 purple, and 360 is red again. +# The allowed range is 0 to 359. + +HTML_COLORSTYLE_HUE = 220 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of +# the colors in the HTML output. For a value of 0 the output will use +# grayscales only. A value of 255 will produce the most vivid colors. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to +# the luminance component of the colors in the HTML output. Values below +# 100 gradually make the output lighter, whereas values above 100 make +# the output darker. The value divided by 100 is the actual gamma applied, +# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2, +# and 100 does not change the gamma. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting +# this to NO can help when comparing the output of multiple runs. + +HTML_TIMESTAMP = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. + +HTML_DYNAMIC_SECTIONS = NO + +# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of +# entries shown in the various tree structured indices initially; the user +# can expand and collapse entries dynamically later on. Doxygen will expand +# the tree to such a level that at most the specified number of entries are +# visible (unless a fully collapsed tree already exceeds this amount). +# So setting the number of entries 1 will produce a full collapsed tree by +# default. 0 is a special value representing an infinite number of entries +# and will result in a full expanded tree by default. + +HTML_INDEX_NUM_ENTRIES = 100 + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# for more information. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely +# identify the documentation publisher. This should be a reverse domain-name +# style string, e.g. com.mycompany.MyDocSet.documentation. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated +# that can be used as input for Qt's qhelpgenerator to generate a +# Qt Compressed Help (.qch) of the generated HTML documentation. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to +# add. For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see +# ; +# Qt Help Project / Custom Filters. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's +# filter section matches. +# ; +# Qt Help Project / Filter Attributes. + +QHP_SECT_FILTER_ATTRS = + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files +# will be generated, which together with the HTML files, form an Eclipse help +# plugin. To install this plugin and make it available under the help contents +# menu in Eclipse, the contents of the directory containing the HTML and XML +# files needs to be copied into the plugins directory of eclipse. The name of +# the directory within the plugins directory should be the same as +# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before +# the help appears. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have +# this name. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) +# at top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. Since the tabs have the same information as the +# navigation tree you can set this option to NO if you already set +# GENERATE_TREEVIEW to YES. + +DISABLE_INDEX = NO + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to YES, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser). +# Windows users are probably better off using the HTML help feature. +# Since the tree basically has the same information as the tab index you +# could consider to set DISABLE_INDEX to NO when enabling this option. + +GENERATE_TREEVIEW = NO + +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values +# (range [0,1..20]) that doxygen will group on one line in the generated HTML +# documentation. Note that a value of 0 will completely suppress the enum +# values from appearing in the overview section. + +ENUM_VALUES_PER_LINE = 4 + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open +# links to external symbols imported via tag files in a separate window. + +EXT_LINKS_IN_WINDOW = NO + +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are +# not supported properly for IE 6.0, but are supported on all modern browsers. +# Note that when changing this option you need to delete any form_*.png files +# in the HTML output before the changes have effect. + +FORMULA_TRANSPARENT = YES + +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax +# (see http://www.mathjax.org) which uses client side Javascript for the +# rendering instead of using prerendered bitmaps. Use this if you do not +# have LaTeX installed or if you want to formulas look prettier in the HTML +# output. When enabled you may also need to install MathJax separately and +# configure the path to it using the MATHJAX_RELPATH option. + +USE_MATHJAX = NO + +# When MathJax is enabled you can set the default output format to be used for +# thA MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and +# SVG. The default value is HTML-CSS, which is slower, but has the best +# compatibility. + +MATHJAX_FORMAT = HTML-CSS + +# When MathJax is enabled you need to specify the location relative to the +# HTML output directory using the MATHJAX_RELPATH option. The destination +# directory should contain the MathJax.js script. For instance, if the mathjax +# directory is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to +# the MathJax Content Delivery Network so you can quickly see the result without +# installing MathJax. +# However, it is strongly recommended to install a local +# copy of MathJax from http://www.mathjax.org before deployment. + +MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest + +# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension +# names that should be enabled during MathJax rendering. + +MATHJAX_EXTENSIONS = + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box +# for the HTML output. The underlying search engine uses javascript +# and DHTML and should work on any modern browser. Note that when using +# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets +# (GENERATE_DOCSET) there is already a search function so this one should +# typically be disabled. For large projects the javascript based search engine +# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution. + +SEARCHENGINE = YES + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be +# implemented using a web server instead of a web client using Javascript. +# There are two flavours of web server based search depending on the +# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for +# searching and an index file used by the script. When EXTERNAL_SEARCH is +# enabled the indexing and searching needs to be provided by external tools. +# See the manual for details. + +SERVER_BASED_SEARCH = NO + +# When EXTERNAL_SEARCH is enabled doxygen will no longer generate the PHP +# script for searching. Instead the search results are written to an XML file +# which needs to be processed by an external indexer. Doxygen will invoke an +# external search engine pointed to by the SEARCHENGINE_URL option to obtain +# the search results. Doxygen ships with an example indexer (doxyindexer) and +# search engine (doxysearch.cgi) which are based on the open source search engine +# library Xapian. See the manual for configuration details. + +EXTERNAL_SEARCH = NO + +# The SEARCHENGINE_URL should point to a search engine hosted by a web server +# which will returned the search results when EXTERNAL_SEARCH is enabled. +# Doxygen ships with an example search engine (doxysearch) which is based on +# the open source search engine library Xapian. See the manual for configuration +# details. + +SEARCHENGINE_URL = + +# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed +# search data is written to a file for indexing by an external tool. With the +# SEARCHDATA_FILE tag the name of this file can be specified. + +SEARCHDATA_FILE = searchdata.xml + +# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the +# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is +# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple +# projects and redirect the results back to the right project. + +EXTERNAL_SEARCH_ID = + +# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen +# projects other than the one defined by this configuration file, but that are +# all added to the same external search index. Each project needs to have a +# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id +# of to a relative location where the documentation can be found. +# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ... + +EXTRA_SEARCH_MAPPINGS = + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = NO + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank latex' will be used as the default command name. +# Note that when enabling USE_PDFLATEX this option is only used for +# generating bitmaps for formulas in the HTML output, but not in the +# Makefile that is written to the output directory. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4 + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for +# the generated latex document. The footer should contain everything after +# the last chapter. If it is left blank doxygen will generate a +# standard footer. Notice: only use this tag if you know what you are doing! + +LATEX_FOOTER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = YES + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = YES + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +# If LATEX_SOURCE_CODE is set to YES then doxygen will include +# source code with syntax highlighting in the LaTeX output. +# Note that which sources are shown also depends on other settings +# such as SOURCE_BROWSER. + +LATEX_SOURCE_CODE = NO + +# The LATEX_BIB_STYLE tag can be used to specify the style to use for the +# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See +# http://en.wikipedia.org/wiki/BibTeX for more info. + +LATEX_BIB_STYLE = plain + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load style sheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will @@ Diff output truncated at 100000 characters. @@ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
 [brlcad-commits] SF.net SVN: brlcad:[65016] brlcad/trunk/src/libged/gdiff.c From: - 2015-05-20 14:16:45 Revision: 65016 http://sourceforge.net/p/brlcad/code/65016 Author: starseeker Date: 2015-05-20 14:16:42 +0000 (Wed, 20 May 2015) Log Message: ----------- Use a local vlist instead of relying on the RTG global. Modified Paths: -------------- brlcad/trunk/src/libged/gdiff.c Modified: brlcad/trunk/src/libged/gdiff.c =================================================================== --- brlcad/trunk/src/libged/gdiff.c 2015-05-20 14:09:20 UTC (rev 65015) +++ brlcad/trunk/src/libged/gdiff.c 2015-05-20 14:16:42 UTC (rev 65016) @@ -90,8 +90,11 @@ { /* Construct a minimal example visual display of a ray diff */ struct bu_list *vhead; - struct bn_vlblock *vbp = bn_vlblock_init(&RTG.rtg_vlfree, 32); + struct bu_list local_vlist; + struct bn_vlblock *vbp; point_t a, b; + BU_LIST_INIT(&local_vlist); + vbp = bn_vlblock_init(&local_vlist, 32); VSET(a, -100, 0, 0); VSET(b, 0, 0, 0); /* Draw left-only lines */ @@ -113,6 +116,7 @@ _ged_cvt_vlblock_to_solids(gedp, vbp, "diff_visual", 0); + bn_vlist_cleanup(&local_vlist); bn_vlblock_free(vbp); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
 [brlcad-commits] SF.net SVN: brlcad:[65015] brlcad/trunk/src/libged/gdiff.c From: - 2015-05-20 14:09:23 Revision: 65015 http://sourceforge.net/p/brlcad/code/65015 Author: starseeker Date: 2015-05-20 14:09:20 +0000 (Wed, 20 May 2015) Log Message: ----------- fix comments Modified Paths: -------------- brlcad/trunk/src/libged/gdiff.c Modified: brlcad/trunk/src/libged/gdiff.c =================================================================== --- brlcad/trunk/src/libged/gdiff.c 2015-05-20 14:04:34 UTC (rev 65014) +++ brlcad/trunk/src/libged/gdiff.c 2015-05-20 14:09:20 UTC (rev 65015) @@ -98,13 +98,13 @@ vhead = bn_vlblock_find(vbp, 255, 0, 0); /* should be red */ BN_ADD_VLIST(vbp->free_vlist_hd, vhead, a, BN_VLIST_LINE_MOVE); BN_ADD_VLIST(vbp->free_vlist_hd, vhead, b, BN_VLIST_LINE_DRAW); - /* Draw right-only lines */ + /* Draw overlap lines */ VSET(a, 0, 0, 0); VSET(b, 100, 0, 0); vhead = bn_vlblock_find(vbp, 255, 255, 255); /* should be white */ BN_ADD_VLIST(vbp->free_vlist_hd, vhead, a, BN_VLIST_LINE_MOVE); BN_ADD_VLIST(vbp->free_vlist_hd, vhead, b, BN_VLIST_LINE_DRAW); - /* Draw overlap lines */ + /* Draw right-only lines */ VSET(a, 100, 0, 0); VSET(b, 200, 0, 0); vhead = bn_vlblock_find(vbp, 0, 0, 255); /* should be blue */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. 
68 messages has been excluded from this view by a project administrator.

Showing results of 46410

1 2 3 .. 1857 > >> (Page 1 of 1857)