From: Erwin Janssen Date: Fri, 8 Jul 2016 15:44:13 +0000 (+0200) Subject: Sync branch with upstream master to resolve conflicts. X-Git-Tag: untagged-fd4ca25a4ca4e4dc471c~4^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb36dd6f98b9bc455a701fa0947048aa9a6d02e5;p=graphviz Sync branch with upstream master to resolve conflicts. Merge master into windows-build branch to resolvle conflicts in ingore files. --- cb36dd6f98b9bc455a701fa0947048aa9a6d02e5 diff --cc .gitignore index 4d82346e1,8d306e22b..3937c1bf8 --- a/.gitignore +++ b/.gitignore @@@ -195,28 -134,82 +134,89 @@@ tclpkg/gv/swig.cm tclpkg/gv/swig.cmo tclpkg/gv/swig.ml tclpkg/gv/swig.mli - tclpkg/tcldot/tcldot.3tcl.pdf - tclpkg/tkspline/tkspline.3tk.pdf - windows/Properties/AssemblyInfo.cs - windows/build/graphviz.wxs - # Ignore these autogenerated configuration files, - # but keep the versions in windows/include. - ast_common.h - builddate.h - config.h - !windows/include** + ## Files generated by Flex, Bison and Awk + y.* + cmd/lefty/dot2l/dotparse.c + cmd/lefty/dot2l/dotparse.h + cmd/tools/gmlparse.c + cmd/tools/gmlparse.h + cmd/tools/gmlscan.c + lib/cgraph/grammar.c + lib/cgraph/grammar.h + lib/cgraph/scan.c + lib/common/brewer_lib + lib/common/color_lib + lib/common/colortbl.h + lib/common/htmlparse.c + lib/common/htmlparse.h + lib/common/ps_font_equiv.h + lib/common/svgcolor_lib + lib/expr/exop.h + lib/expr/exparse.c + lib/expr/exparse.h + lib/graph/parser.c + lib/graph/parser.h + lib/gvpr/gdefs.h + lib/gvpr/mkdefs + plugin/core/ps.h + plugin/lasi/ps.h + plugin/xlib/vimdot + + ## Binaries + cmd/dot/dot + cmd/dot/dot_static + cmd/dotty/dotty + cmd/edgepaint/edgepaint + cmd/gvmap/cluster + cmd/gvmap/gvmap + cmd/gvpr/gvpr + cmd/gvpr/gvpr_static + cmd/lefty/lefty + cmd/lneato/lneato + cmd/mingle/mingle + cmd/smyrna/smyrna + cmd/tools/acyclic + cmd/tools/bcomps + cmd/tools/ccomps + cmd/tools/dijkstra + cmd/tools/gc + cmd/tools/gml2gv + cmd/tools/graphml2gv + cmd/tools/gv2gml + cmd/tools/gvcolor + cmd/tools/gvgen + cmd/tools/gvpack + cmd/tools/gvpack_static + cmd/tools/gxl2gv + cmd/tools/mm2gv + cmd/tools/nop + cmd/tools/sccmap + cmd/tools/tred + cmd/tools/unflatten + contrib/diffimg/diffimg + contrib/prune/prune + + # Files generated during make check + rtest/ndata + rtest/nhtml - # Ignore folders generated by Visual Studio builds + # Folders generated by Visual Studio builds **/Debug/** **/Release/** +Graphviz/** - # Ignore personal Visual Studio folders and files + # User specific Visual Studio folders and files .vs/** *.VC.db *.VC.opendb *.vcxproj.user + # Do not ignore Windows MSI setup.exe untill a new MSI can be generated. + !windows/graphviz-msi/setup/Release/setup.exe ++ ++# Don't ignore contents of windows/include ++!windows/include** ++ +# Don't ignore any of the submodules - !windows/dependencies/** ++!windows/dependencies/** diff --cc .hgignore index ea229876e,d615b63b6..3937c1bf8 --- a/.hgignore +++ b/.hgignore @@@ -1,54 -1,17 +1,24 @@@ syntax: glob --*~ - *.o --*.a - graphviz*.tar.gz - *.la - *.lai - *.lo - *.Po - *.Plo - *.so - *.so.* - *.soT - *.pc - .libs - .deps - libtool - libltdl - m4 - configure - config.* - Makefile - Makefile.in - autom4te.cache - COPYING - Doxyfile - doxygen - INSTALL - aclocal.m4 - ast_common.h - builddate.h - stamp-h1 - FEATURE - pkgIndex.tcl - SWIGTYPE* - tclpkg/*/gv.3* - y.* + + - cmd/dot/dot - cmd/dot/dot_static - cmd/dot/dot.1.pdf - cmd/dot/dot_builtins - cmd/dot/osage.1.pdf - cmd/dot/patchwork.1.pdf - cmd/dotty/dotty - cmd/dotty/dotty.1.pdf - cmd/gvedit/attrs.txt - cmd/gvedit/gvedit - cmd/gvedit/gvedit.1.pdf - cmd/gvedit/gvedit.pro ++#*~ ++#*.a ++#rtest*.tar.gz* ++#*.lai ++#*.Po ++#*.Plo ++#*.so ++#*.so.* ++#*.soT ++#COPYING ++#doxygen ++ ++# product of: make dist + graphviz*.tar.gz* -rtest*.tar.gz* -*.lai -*.Po -*.Plo -*.so -*.so.* -*.soT -COPYING -doxygen ++ ++lib/rxspencer/re ++lib/rxspencer/*.oo + cmd/gvedit/moc_csettings.cpp cmd/gvedit/moc_imageviewer.cpp cmd/gvedit/moc_mainwindow.cpp @@@ -186,7 -127,82 +134,89 @@@ tclpkg/gv/swig.cm tclpkg/gv/swig.cmo tclpkg/gv/swig.ml tclpkg/gv/swig.mli - tclpkg/tcldot/tcldot.3tcl.pdf - tclpkg/tkspline/tkspline.3tk.pdf - windows/Properties/AssemblyInfo.cs - windows/build/graphviz.wxs + + ## Files generated by Flex, Bison and Awk + y.* + cmd/lefty/dot2l/dotparse.c + cmd/lefty/dot2l/dotparse.h + cmd/tools/gmlparse.c + cmd/tools/gmlparse.h + cmd/tools/gmlscan.c + lib/cgraph/grammar.c + lib/cgraph/grammar.h + lib/cgraph/scan.c + lib/common/brewer_lib + lib/common/color_lib + lib/common/colortbl.h + lib/common/htmlparse.c + lib/common/htmlparse.h + lib/common/ps_font_equiv.h + lib/common/svgcolor_lib + lib/expr/exop.h + lib/expr/exparse.c + lib/expr/exparse.h + lib/graph/parser.c + lib/graph/parser.h + lib/gvpr/gdefs.h + lib/gvpr/mkdefs + plugin/core/ps.h + plugin/lasi/ps.h + plugin/xlib/vimdot + + ## Binaries + cmd/dot/dot + cmd/dot/dot_static + cmd/dotty/dotty + cmd/edgepaint/edgepaint + cmd/gvmap/cluster + cmd/gvmap/gvmap + cmd/gvpr/gvpr + cmd/gvpr/gvpr_static + cmd/lefty/lefty + cmd/lneato/lneato + cmd/mingle/mingle + cmd/smyrna/smyrna + cmd/tools/acyclic + cmd/tools/bcomps + cmd/tools/ccomps + cmd/tools/dijkstra + cmd/tools/gc + cmd/tools/gml2gv + cmd/tools/graphml2gv + cmd/tools/gv2gml + cmd/tools/gvcolor + cmd/tools/gvgen + cmd/tools/gvpack + cmd/tools/gvpack_static + cmd/tools/gxl2gv + cmd/tools/mm2gv + cmd/tools/nop + cmd/tools/sccmap + cmd/tools/tred + cmd/tools/unflatten + contrib/diffimg/diffimg + contrib/prune/prune + + # Files generated during make check + rtest/ndata + rtest/nhtml + + # Folders generated by Visual Studio builds + **/Debug/** + **/Release/** ++Graphviz/** + + # User specific Visual Studio folders and files + .vs/** + *.VC.db + *.VC.opendb + *.vcxproj.user + + # Do not ignore Windows MSI setup.exe untill a new MSI can be generated. + !windows/graphviz-msi/setup/Release/setup.exe ++ ++# Don't ignore contents of windows/include ++!windows/include** ++ ++# Don't ignore any of the submodules ++!windows/dependencies/**