diff --git a/.gitignore b/.gitignore index 24c7b5ba..9b7c7e3f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,32 +1,6 @@ -*.cm* -*.annot -*.o -*.install .merlin -/.depend /META -/Makefile -/autom4te.cache/ -/config.log -/config.status -/configure -/graph.a -/src/dot_lexer.ml -/src/dot_parser.ml -/src/dot_parser.mli -/src/dot_parser.output -/src/gml.ml /www/index.en.html /www/index.fr.html /www/version.prehtml -/bin/ -/dgraph/dgraph.byte -/dgraph/dgraph.opt -/editor/editor.byte -/editor/editor.opt -/view_graph/viewgraph.byte -/view_graph/viewgraph.opt -/export _build -graph.cmo -doc diff --git a/META.in b/META.in deleted file mode 100644 index b0b5f52f..00000000 --- a/META.in +++ /dev/null @@ -1,23 +0,0 @@ -version = "VERSION" -description = "Generic Graph Library" -requires="" -archive(byte) = "CMA" -archive(byte,plugin) = "CMA" -archive(native) = "CMXA" -archive(native,plugin) = "CMXS" - -package "dgraph" ( - exists_if = "dgraph.cmi" - description = "Library to visualize graph in a Lablgtk canvas" - requires = "ocamlgraph lablgtk2.gnomecanvas" - archive(byte) = "dgraph.cmo" - archive(native) = "dgraph.cmx" -) - -package "viewgraph" ( - exists_if = "viewgraph.cmi" - description = "Library to visualize graph in a Lablgtk canvas (deprecated)" - requires = "ocamlgraph lablgtk2.gnomecanvas" - archive(byte) = "viewgraph.cmo" - archive(native) = "viewgraph.cmx" -) diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..eaced72b --- /dev/null +++ b/Makefile @@ -0,0 +1,12 @@ + +all: + dune build + +test: + dune runtest + +doc: + dune build @doc + +clean: + dune clean diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index f150b2fb..00000000 --- a/Makefile.in +++ /dev/null @@ -1,662 +0,0 @@ -########################################################################## -# # -# Ocamlgraph: a generic graph library for OCaml # -# Copyright (C) 2004-2010 # -# Sylvain Conchon, Jean-Christophe Filliatre and Julien Signoles # -# # -# This software is free software; you can redistribute it and/or # -# modify it under the terms of the GNU Library General Public # -# License version 2.1, with the special exception on linking # -# described in file LICENSE. # -# # -# This software is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # -# # -########################################################################## - -# Where to install the binaries -DESTDIR = -prefix =@prefix@ -exec_prefix=@exec_prefix@ -datarootdir=@datarootdir@ -BINDIR =$(DESTDIR)@bindir@ - -# Where to install the man page -MANDIR=@mandir@ - -# Other variables set by ./configure -OCAMLC = @OCAMLC@ -OCAMLOPT = @OCAMLOPT@ -OCAMLDEP = @OCAMLDEP@ -slash -OCAMLDOC = @OCAMLDOC@ -OCAMLLEX = @OCAMLLEX@ -OCAMLYACC= @OCAMLYACC@ -v -OCAMLLIB = @OCAMLLIB@ -OCAMLBEST= @OCAMLBEST@ -OCAMLVERSION = @OCAMLVERSION@ -OCAMLWEB = @OCAMLWEB@ -OCAMLWIN32 = @OCAMLWIN32@ -OCAMLFIND = @OCAMLFIND@ -EXE = @EXE@ -LIBEXT = @LIBEXT@ -OBJEXT = @OBJEXT@ - -# Others global variables -OCAMLGRAPH_SRCDIR = src -OCAMLGRAPH_LIBDIR = src/lib - -INCLUDES= -I $(OCAMLGRAPH_SRCDIR) -I $(OCAMLGRAPH_LIBDIR) -BFLAGS = $(INCLUDES) -g -dtypes -w +a -w -4 -w -44 -w -50 -w -48 -w -29 -OFLAGS = $(INCLUDES) - -# main target -############# - -NAME=ocamlgraph - -ifeq (@LABLGNOMECANVAS@,yes) -all: byte $(OCAMLBEST) viewer dgraph editor -else -all: byte $(OCAMLBEST) -endif - -# bytecode and native-code compilation -###################################### - -OCAMLGRAPH_LIB= unionfind heap bitv persistentQueue -OCAMLGRAPH_LIB:=$(patsubst %, $(OCAMLGRAPH_LIBDIR)/%.cmo, $(OCAMLGRAPH_LIB)) - -CMO = util blocks persistent imperative \ - delaunay builder classic rand \ - components path nonnegative traverse oper \ - coloring topological kruskal flow \ - prim dominator graphviz gml dot_parser dot_lexer dot pack \ - gmap minsep cliquetree mcs_m md strat fixpoint leaderlist contraction \ - graphml merge mincut clique weakTopological chaoticIteration -CMO := $(OCAMLGRAPH_LIB) $(patsubst %, $(OCAMLGRAPH_SRCDIR)/%.cmo, $(CMO)) - -CMX = $(CMO:.cmo=.cmx) -CMA = graph.cma -CMXA = graph.cmxa -ifeq (@NATIVE_DYNLINK@,yes) -CMXS = graph.cmxs -endif - -CMI = sig sig_pack dot_ast -CMI := $(patsubst %, src/%.cmi, $(CMI)) - -GENERATED = META \ - src/gml.ml src/dot_parser.ml src/dot_parser.mli src/dot_lexer.ml - -$(CMX): OFLAGS += -for-pack Graph - -byte: $(CMA) -opt: $(CMXA) $(CMXS) - -graph.cma: graph.cmo - $(OCAMLC) $(INCLUDES) -a -g -o $@ $^ - -graph.cmxa: graph.cmx - $(OCAMLOPT) $(INCLUDES) -a -o $@ $^ - -graph.cmxs: graph.cmx - $(OCAMLOPT) $(INCLUDES) -shared -o $@ $^ - -graph.cmi: graph.cmo -graph.o: graph.cmx - -graph.cmo: $(CMI) $(CMO) - $(OCAMLC) $(INCLUDES) -pack -g -o $@ $^ - -graph.cmx: $(CMI) $(CMX) - $(OCAMLOPT) $(INCLUDES) -pack -o $@ $^ - -VERSION=1.8.8 - -# gtk2 graph editor -################### - -ED_DIR=editor - -editor: $(ED_DIR)/editor.byte $(ED_DIR)/editor.$(OCAMLBEST) - -ED_CMO = ed_hyper ed_graph ed_draw ed_display ed_main -ED_CMO:= $(patsubst %, $(ED_DIR)/%.cmo, $(ED_CMO)) -ED_CMX = $(ED_CMO:.cmo=.cmx) -ED_CMI = $(ED_CMO:.cmo=.cmi) - -ED_INCLUDES = @INCLUDEGTK2@ -I +threads -I $(ED_DIR) -I . - -$(ED_CMI) $(ED_CMO): BFLAGS+= $(ED_INCLUDES) -$(ED_CMI) $(ED_CMO): $(CMA) -$(ED_CMX): OFLAGS+= $(ED_INCLUDES) -$(ED_CMX): $(CMXA) - -$(ED_DIR)/editor.byte: $(CMA) $(ED_CMO) - $(OCAMLC) -g -o $@ $(ED_INCLUDES) \ - lablgtk.cma lablgnomecanvas.cma unix.cma $^ - -$(ED_DIR)/editor.opt: $(CMXA) $(ED_CMX) - $(OCAMLOPT) -o $@ $(ED_INCLUDES) \ - lablgtk.cmxa lablgnomecanvas.cmxa unix.cmxa $^ - -# gtk2 graph viewer (deprecated) -################### - -VIEWER_DIR=view_graph - -viewer: $(VIEWER_DIR)/viewgraph.byte $(VIEWER_DIR)/viewgraph.$(OCAMLBEST) - -VIEWER_CMO=viewGraph_core viewGraph_select viewGraph_utils viewGraph_test -VIEWER_CMO:=$(patsubst %,$(VIEWER_DIR)/%.cmo, $(VIEWER_CMO)) -VIEWER_CMX=$(VIEWER_CMO:.cmo=.cmx) -VIEWER_CMI=$(VIEWER_CMO:.cmo=.cmi) -VIEWER_MLI=$(VIEWER_CMI:.cmi=.mli) - -VIEWER_INCLUDES= @INCLUDEGTK2@ -I $(VIEWER_DIR) -I . - -$(VIEWER_CMI) $(VIEWER_CMO): BFLAGS+= $(VIEWER_INCLUDES) -$(VIEWER_CMX): OFLAGS+= $(VIEWER_INCLUDES) -for-pack Viewgraph -$(VIEWER_CMI) $(VIEWER_CMO): $(CMA) -$(VIEWER_CMX): $(CMXA) - -VIEWER_CMOLIB = $(VIEWER_DIR)/viewgraph.cmo -VIEWER_CMILIB = $(VIEWER_DIR)/viewgraph.cmi -VIEWER_CMXLIB = $(VIEWER_DIR)/viewgraph.cmx - -$(VIEWER_CMOLIB): $(filter-out $(VIEWER_DIR)/viewGraph_test.cmo, $(VIEWER_CMO)) - $(OCAMLC) -o $@ $(VIEWER_INCLUDES) -pack $^ - -$(VIEWER_CMXLIB): $(filter-out $(VIEWER_DIR)/viewGraph_test.cmx, $(VIEWER_CMX)) - $(OCAMLOPT) -o $@ $(VIEWER_INCLUDES) -pack $^ - -$(VIEWER_DIR)/viewgraph.byte: $(CMA) $(VIEWER_CMOLIB) - $(OCAMLC) -g -o $@ $(VIEWER_INCLUDES) \ - lablgtk.cma gtkInit.cmo lablgnomecanvas.cma unix.cma $^ - -$(VIEWER_DIR)/viewgraph.opt: $(CMXA) $(VIEWER_CMXLIB) - $(OCAMLOPT) -o $@ $(VIEWER_INCLUDES) \ - lablgtk.cmxa gtkInit.cmx lablgnomecanvas.cmxa unix.cmxa $^ - -# new gtk2 graph viewer: dgraph -############################### - -DGRAPH_DIR=dgraph - -dgraph: $(DGRAPH_DIR)/dgraph.byte $(DGRAPH_DIR)/dgraph.$(OCAMLBEST) - -DGRAPH_CMO=xDotDraw xDot \ - dGraphModel \ - dGraphTreeLayout dGraphSubTree dGraphTreeModel \ - dGraphViewItem dGraphView \ - dGraphRandModel dGraphContainer \ - dGraphViewer -DGRAPH_CMO:=$(patsubst %,$(DGRAPH_DIR)/%.cmo, $(DGRAPH_CMO)) -DGRAPH_CMX=$(DGRAPH_CMO:.cmo=.cmx) -DGRAPH_CMI=$(filter-out dgraph/dGraphViewer.cmi, $(DGRAPH_CMO:.cmo=.cmi)) - -DGRAPH_INCLUDES= @INCLUDEGTK2@ -I $(DGRAPH_DIR) -I . - -$(DGRAPH_CMI) $(DGRAPH_CMO): BFLAGS+= $(DGRAPH_INCLUDES) -$(DGRAPH_CMX): OFLAGS+= $(DGRAPH_INCLUDES) -for-pack Dgraph - -$(DGRAPH_CMI) $(DGRAPH_CMO): $(CMA) -$(DGRAPH_CMX): $(CMXA) - -DGRAPH_CMOLIB = $(DGRAPH_DIR)/dgraph.cmo -DGRAPH_CMILIB = $(DGRAPH_DIR)/dgraph.cmi -DGRAPH_CMXLIB = $(DGRAPH_DIR)/dgraph.cmx - -dgraph/dGraphViewer.cmo: $(DGRAPH_CMOLIB) -dgraph/dGraphViewer.cmx: $(DGRAPH_CMXLIB) - -$(DGRAPH_CMOLIB): $(filter-out dgraph/dGraphViewer.cmo, $(DGRAPH_CMO)) - $(OCAMLC) -o $@ $(DGRAPH_INCLUDES) -pack $^ - -$(DGRAPH_CMXLIB): $(filter-out dgraph/dGraphViewer.cmx, $(DGRAPH_CMX)) - $(OCAMLOPT) -o $@ $(DGRAPH_INCLUDES) -pack $^ - -$(DGRAPH_DIR)/dgraph.byte: $(CMA) $(DGRAPH_CMOLIB) \ - $(DGRAPH_DIR)/dGraphViewer.cmo - $(OCAMLC) -g -o $@ $(DGRAPH_INCLUDES) \ - lablgtk.cma gtkInit.cmo lablgnomecanvas.cma $^ - -$(DGRAPH_DIR)/dgraph.opt: $(CMXA) $(DGRAPH_CMXLIB) \ - $(DGRAPH_DIR)/dGraphViewer.cmx - $(OCAMLOPT) -o $@ $(DGRAPH_INCLUDES) \ - lablgtk.cmxa gtkInit.cmx lablgnomecanvas.cmxa $^ - -# Fixing issue with "make -j" -############################# - -# wait than all bytecodes are done before packing the native library: -# without these extra dependencies, building graph.cmx also rebuilds the .cmi -# while graph.cmi may be required at the same time by some .cmo of the -# bytecodes, leading to tentative access to a corrupted graph.cmi. - -ifeq (@LABLGNOMECANVAS@,yes) -graph.cmx: | $(DGRAPH_DIR)/dgraph.byte \ - $(VIEWER_DIR)/viewgraph.byte \ - $(ED_DIR)/editor.byte -endif - -$(CMX): | $(OCAMLGRAPH_SRCDIR)/blocks.cmo - -# No .mli for blocks.ml: so, to avoid clash when generating block.cmi -# from both ocamlc and ocamlopt, force to fully compile the bytecode library -# before the native one -$(OCAMLGRAPH_SRCDIR)/blocks.cmx: | graph.cmo - -# Examples -########## - -EXAMPLESBIN=bin/demo.$(OCAMLBEST) bin/demo_planar.$(OCAMLBEST) \ - bin/bench.$(OCAMLBEST) bin/color.$(OCAMLBEST) bin/sudoku.$(OCAMLBEST) \ - bin/test.$(OCAMLBEST) bin/compare_prim_kruskal.$(OCAMLBEST) - -.PHONY: examples -examples: $(EXAMPLESBIN) - -.PHONY: demo -demo: bin/demo.$(OCAMLBEST) - -bin/demo.byte: $(CMXA) examples/demo.cmo - mkdir -p bin - $(OCAMLOPT) -o $@ graphics.cma unix.cma $^ - -bin/demo.opt: $(CMXA) examples/demo.cmx - mkdir -p bin - $(OCAMLOPT) -o $@ graphics.cmxa unix.cmxa $^ - -bin/fgtest.opt: $(CMXA) myTest/fgtest.cmx - mkdir -p bin - $(OCAMLOPT) -o $@ graphics.cmxa unix.cmxa $^ - -bin/demo_planar.byte: $(CMA) examples/demo_planar.cmo - mkdir -p bin - $(OCAMLC) -o $@ graphics.cma unix.cma $^ - -bin/demo_planar.opt: $(CMXA) examples/demo_planar.cmx - mkdir -p bin - $(OCAMLOPT) -o $@ graphics.cmxa unix.cmxa $^ - -bin/compare_prim_kruskal.opt: $(CMXA) examples/compare_prim_kruskal.ml - mkdir -p bin - $(OCAMLOPT) -o $@ graphics.cmxa unix.cmxa $^ - -bin/demo_prim.opt: $(CMXA) examples/demo_prim.ml - mkdir -p bin - $(OCAMLOPT) -o $@ graphics.cmxa unix.cmxa $^ - -bin/color.byte: $(CMA) examples/color.cmo - mkdir -p bin - $(OCAMLC) -o $@ graphics.cma unix.cma $^ - -bin/color.opt: $(CMXA) examples/color.cmx - mkdir -p bin - $(OCAMLOPT) -o $@ graphics.cmxa unix.cmxa $^ - -bin/sudoku.byte: $(CMA) examples/sudoku.cmo - mkdir -p bin - $(OCAMLC) -o $@ graphics.cma unix.cma $^ - -bin/sudoku.opt: $(CMXA) examples/sudoku.cmx - mkdir -p bin - $(OCAMLOPT) -o $@ graphics.cmxa unix.cmxa $^ - -test: $(CMA) tests/test.ml - ocaml -I . unix.cma graphics.cma $^ - -test-bf: $(CMA) tests/test_bf.ml - ocaml unix.cma graphics.cma $^ - -test-fixpoint: $(CMA) tests/test_fixpoint.ml - ocaml $^ - -test-johnson: $(CMA) tests/test_johnson.ml - ocaml unix.cma graphics.cma $^ - -bin/test-ts: $(CMXA) tests/test_topsort.ml - mkdir -p bin - $(OCAMLOPT) -o $@ unix.cmxa $^ - -test-ts: bin/test-ts - bin/test-ts 10 - -nonneg: $(CMA) tests/nonneg.ml - ocaml unix.cma graphics.cma $^ - -test-graphml: $(CMA) tests/testgraphml.ml - ocaml unix.cma $^ - -bin/test.byte: $(CMA) tests/test.cmo - $(OCAMLC) -g -unsafe -o $@ unix.cma graphics.cma $^ - -bin/test.opt: $(CMXA) tests/test.cmx - $(OCAMLOPT) -unsafe -inline 100 -o $@ unix.cmxa graphics.cmxa $^ - -bin/test_bf.byte: $(CMA) tests/test_bf.ml - $(OCAMLC) -g -o $@ unix.cma graphics.cma $^ - -bin/nonneg.byte: $(CMA) tests/nonneg.ml - $(OCAMLC) -g -o $@ unix.cma graphics.cma $^ - -bench: bin/bench.$(OCAMLBEST) - bin/bench.opt - -bin/bench.opt: $(CMXA) tests/bench.ml - $(OCAMLOPT) -unsafe -inline 100 -o $@ unix.cmxa $^ - -bin/testunix.opt: $(CMXA) myTest/testunix.ml - $(OCAMLOPT) -unsafe -inline 100 -o $@ unix.cmxa $^ - -check: $(CMA) tests/check.ml bin/test-ts - ocaml -I . $(CMA) tests/check.ml - bin/test-ts 10 - -# Additional rules -################## - -EXAMPLES = demo color demo_planar sudoku -EXAMPLESBIN:=$(patsubst %, bin/%.opt, $(EXAMPLES)) -EXAMPLES:= $(patsubst %, examples/%.ml, $(EXAMPLES)) - -examples: $(EXAMPLESBIN) - -TESTS = test check -TESTS := $(patsubst %, tests/%.ml, $(TESTS)) - -DPD_GRAPH_ML= $(TESTS) $(EXAMPLES) - -$(DPD_GRAPH_ML:.ml=.cmo): $(CMA) -$(DPD_GRAPH_ML:.ml=.cmx): $(CMXA) - -# installation -############## - -INSTALL_LIBDIR=$(DESTDIR)$(OCAMLLIB)/ocamlgraph - -install: install-$(OCAMLBEST) install-byte - mkdir -p $(BINDIR) -ifeq (@LABLGNOMECANVAS@,yes) -ifeq ($(OCAMLBEST),byte) - cp -f $(BINDIR)/graph-editor.byte $(BINDIR)/graph-editor$(EXE) - cp -f $(BINDIR)/graph-viewer.byte $(BINDIR)/graph-viewer$(EXE) -else - cp -f $(BINDIR)/graph-editor.opt $(BINDIR)/graph-editor$(EXE) - cp -f $(BINDIR)/graph-viewer.opt $(BINDIR)/graph-viewer$(EXE) -endif -endif - -install-byte: META - mkdir -p $(INSTALL_LIBDIR) - cp -f graph.cmo graph.cmi $(CMA) $(INSTALL_LIBDIR) - cp -f $(OCAMLGRAPH_SRCDIR)/*.mli $(INSTALL_LIBDIR) - cp -f META $(INSTALL_LIBDIR) -ifeq (@LABLGNOMECANVAS@,yes) - mkdir -p $(BINDIR) - cp -f $(ED_DIR)/editor.byte $(BINDIR)/graph-editor.byte - cp -f $(VIEWER_CMILIB) $(VIEWER_CMOLIB) $(INSTALL_LIBDIR) - cp -f $(DGRAPH_CMILIB) $(DGRAPH_CMOLIB) $(INSTALL_LIBDIR) - cp -f $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli $(INSTALL_LIBDIR) - cp -f $(DGRAPH_DIR)/dgraph.byte $(BINDIR)/graph-viewer.byte -endif - -install-opt: install-byte - mkdir -p $(INSTALL_LIBDIR) - cp -f graph$(OBJEXT) graph$(LIBEXT) graph.cmi graph.cmx \ - $(CMXA) $(CMXS) $(INSTALL_LIBDIR) - cp -f $(OCAMLGRAPH_SRCDIR)/*.mli $(INSTALL_LIBDIR) -ifeq (@LABLGNOMECANVAS@,yes) - mkdir -p $(BINDIR) - cp -f $(ED_DIR)/editor.opt $(BINDIR)/graph-editor.opt - cp -f $(VIEWER_CMILIB) $(VIEWER_CMXLIB) $(VIEWER_CMXLIB:.cmx=.o) \ - $(INSTALL_LIBDIR) - cp -f $(DGRAPH_CMILIB) $(DGRAPH_CMXLIB) $(DGRAPH_CMXLIB:.cmx=.o) \ - $(INSTALL_LIBDIR) - cp -f $(DGRAPH_DIR)/dgraph.opt $(BINDIR)/graph-viewer.opt - cp -f $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli $(INSTALL_LIBDIR) -endif - -ifdef DESTDIR -OCAMLFINDDEST := -destdir $(DESTDIR) -endif - -ifeq ($(OCAMLBEST),byte) - OCAMLFIND_OPT_FILES= -else - OCAMLFIND_OPT_FILES=graph$(OBJEXT) graph$(LIBEXT) graph.cmx $(CMXA) $(CMXS) - ifeq (@LABLGNOMECANVAS@,yes) - OCAMLFIND_OPT_FILES+=\ - $(VIEWER_CMXLIB) $(VIEWER_CMXLIB:.cmx=.o) \ - $(DGRAPH_CMXLIB) $(DGRAPH_CMXLIB:.cmx=.o) - endif -endif - -install-findlib: META -ifdef OCAMLFIND -ifeq (@LABLGNOMECANVAS@,yes) - $(OCAMLFIND) install $(OCAMLFINDDEST) ocamlgraph META \ - $(OCAMLGRAPH_SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \ - graph.cmo graph.cmi \ - $(CMA) \ - $(VIEWER_CMOLIB) $(VIEWER_CMILIB) \ - $(DGRAPH_CMOLIB) $(DGRAPH_CMILIB) \ - $(OCAMLFIND_OPT_FILES) -else - $(OCAMLFIND) install $(OCAMLFINDDEST) ocamlgraph META \ - $(OCAMLGRAPH_SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \ - graph$(LIBEXT) graph.cmo graph.cmi $(CMA) \ - $(OCAMLFIND_OPT_FILES) -endif -endif - -META: META.in Makefile - sed -e s/VERSION/$(VERSION)/ -e s/CMA/$(CMA)/ -e s/CMXA/$(CMXA)/ -e s/CMXS/$(CMXS)/ \ - $@.in > $@ - -# documentation -############### - -DOCFILES=$(NAME).ps $(NAME).html - -NODOC = blocks dot_parser dot_lexer -NODOC := $(patsubst %, $(OCAMLGRAPH_SRCDIR)/%.cmo, $(NODOC)) -DOC_CMO = $(filter-out $(NODOC) $(OCAMLGRAPH_LIB), $(CMO)) -DOC_SRC = $(CMI:.cmi=.mli) $(DOC_CMO:.cmo=.mli) $(DOC_CMO:.cmo=.ml) -ifeq (@LABLGNOMECANVAS@,yes) -DOC_SRC := $(DOC_SRC) $(DGRAPH_CMI:.cmi=.mli) -endif -DOC_CHARSET = utf-8 - -.PHONY: doc -doc: $(DOC_CMO) - mkdir -p doc - rm -f doc/* - $(OCAMLDOC) -charset $(DOC_CHARSET) -d doc -html $(DGRAPH_INCLUDES) \ - -I src/lib -I src $(DOC_SRC) - -# literate programming -$(NAME).tex: $(DOC_SRC) - $(OCAMLWEB) -o $@ $^ - -wc: - ocamlwc -p $(OCAMLGRAPH_SRCDIR)/*.mli $(OCAMLGRAPH_SRCDIR)/*.ml - -# file headers -############## - -headers: - headache \ - -c misc/headache_config.txt \ - -h misc/header.txt \ - Makefile.in configure.in README.adoc \ - $(OCAMLGRAPH_LIBDIR)/*.ml $(OCAMLGRAPH_LIBDIR)/*.ml[ily] \ - $(OCAMLGRAPH_SRCDIR)/*.ml $(OCAMLGRAPH_SRCDIR)/*.ml[ily] \ - $(ED_DIR)/*.ml $(ED_DIR)/*.mli - headache \ - -c misc/headache_config.txt \ - -h $(DGRAPH_DIR)/headers/CEA_LGPL \ - $(DGRAPH_DIR)/*.ml $(DGRAPH_DIR)/*.mli -# export -######## - -EXPORTDIR=$(NAME)-$(VERSION) -TAR=$(EXPORTDIR).tar - -FTP = /users/www-perso/projets/ocamlgraph/download -WWW = /users/www-perso/projets/ocamlgraph - -FILES = src/*.ml* lib/*.ml* Makefile.in configure configure.in META.in \ - .depend editor/ed_*.ml* editor/Makefile \ - editor/tests/*.dot editor/tests/*.gml \ - view_graph/*.ml view_graph/*.mli \ - view_graph/README view_graph/Makefile \ - dgraph/*.ml dgraph/*.mli \ - examples/*.ml tests/*.ml \ - README.adoc FAQ CREDITS INSTALL.adoc COPYING LICENSE CHANGES - -export: source export-doc export-web export-delaunay - -source: - mkdir -p export - cd export; rm -rf $(EXPORTDIR) - mkdir -p export/$(EXPORTDIR)/bin - cp --parents $(FILES) export/$(EXPORTDIR) - cd export ; tar cf $(TAR) $(EXPORTDIR) ; gzip -f --best $(TAR) - cp export/$(TAR).gz $(FTP) - cp README.adoc FAQ CREDITS COPYING LICENSE CHANGES $(EXAMPLES) $(FTP) - -# Build and install the .tar.gz requiered by Frama-C -framac: EXPORTDIR=ocamlgraph -framac: FTP=$$HOME/GIT/frama-c.master -framac: - mkdir -p export - cd export; rm -rf $(EXPORTDIR) - mkdir -p export/$(EXPORTDIR)/bin - cp --parents $(FILES) export/$(EXPORTDIR) - cd export ; tar cf $(TAR) $(EXPORTDIR) ; gzip -f --best $(TAR) - cp export/$(TAR).gz $(FTP) - make -C $(FTP) force-ocamlgraph - -www/version.prehtml: Makefile.in - echo "<#def version>$(VERSION)" > www/version.prehtml - -export-web: www/version.prehtml - make -C www install - -export-doc: $(DOC_CMO) - rm -f $(WWW)/doc/* - -$(OCAMLDOC) -d $(WWW)/doc -html $(DGRAPH_INCLUDES) -I src/lib -I src $(DOC_SRC) - -MISCFTP = $(HOME)/WWW/ftp/ocaml/misc -DELAUNAY=delaunay.ml delaunay.mli -export-delaunay: - cd src; cp -f $(DELAUNAY) $(MISCFTP) - cd src; rm -f delaunay.annot; caml2html -noannot -d $(MISCFTP) $(DELAUNAY) - -# generic rules -############### - -.SUFFIXES: .mli .ml .cmi .cmo .cmx .mll .mly .tex .dvi .ps .html - -.mli.cmi: - $(OCAMLC) -c $(BFLAGS) $< - -.ml.cmo: - $(OCAMLC) -c $(BFLAGS) $< - -.ml.o: - $(OCAMLOPT) -c $(OFLAGS) $< - -.ml.cmx: - $(OCAMLOPT) -c $(OFLAGS) $< - -.mll.ml: - $(OCAMLLEX) $< - -.mly.ml: - $(OCAMLYACC) -v $< - -.mly.mli: - $(OCAMLYACC) -v $< - -.tex.dvi: - latex $< && latex $< - -.dvi.ps: - dvips $< -o $@ - -.tex.html: - hevea $< - -# Emacs tags -############ - -otags: - otags -r src editor view_graph - -tags: - find . -name "*.ml*" | sort -r | xargs \ - etags "--regex=/let[ \t]+\([^ \t]+\)/\1/" \ - "--regex=/let[ \t]+rec[ \t]+\([^ \t]+\)/\1/" \ - "--regex=/and[ \t]+\([^ \t]+\)/\1/" \ - "--regex=/type[ \t]+\([^ \t]+\)/\1/" \ - "--regex=/exception[ \t]+\([^ \t]+\)/\1/" \ - "--regex=/val[ \t]+\([^ \t]+\)/\1/" \ - "--regex=/module[ \t]+\([^ \t]+\)/\1/" - -# Makefile is rebuilt whenever Makefile.in or configure.in is modified -###################################################################### - -Makefile: Makefile.in config.status - if test -e $@; then chmod a+w $@; fi - ./config.status - chmod a-w $@ - -config.status: configure - ./config.status --recheck - -configure: configure.in - autoconf - -# clean -####### - -clean: - rm -f *~ - for d in $(OCAMLGRAPH_SRCDIR) $(OCAMLGRAPH_LIBDIR) $(ED_DIR) $(VIEWER_DIR) $(DGRAPH_DIR) \ - tests examples; \ - do \ - rm -f $$d/*.cm[iox] $$d/*$(OBJEXT) $$d/*~ $$d/*.annot; \ - done - rm -f $(GENERATED) $(OCAMLGRAPH_SRCDIR)/dot_parser.output - rm -f graph.*a graph.cm* graph.o graph$(LIBEXT) - rm -f $(ED_DIR)/editor.byte $(ED_DIR)/editor.opt - rm -f $(VIEWER_DIR)/viewgraph.byte $(VIEWER_DIR)/viewgraph.opt - rm -f $(DGRAPH_DIR)/dgraph.byte $(DGRAPH_DIR)/dgraph.opt - rm -f $(DGRAPH_DIR)/dgraph - rm -f *.haux *.aux *.log $(NAME).tex $(NAME).dvi $(DOCFILES) - rm -f $(EXAMPLESBIN) - -dist-clean distclean:: clean - rm -f Makefile config.cache config.log config.status *.byte *.opt - -svnclean svn-clean:: dist-clean - rm -f config.* configure configure.lineno - -# depend -######## - -.PHONY: depend -.depend depend: $(GENERATED) - rm -f .depend - $(OCAMLDEP) $(INCLUDES) -I $(ED_DIR) -I $(VIEWER_DIR) -I $(DGRAPH_DIR)\ - $(OCAMLGRAPH_LIBDIR)/*.ml $(OCAMLGRAPH_LIBDIR)/*.mli \ - $(OCAMLGRAPH_SRCDIR)/*.ml $(OCAMLGRAPH_SRCDIR)/*.mli \ - $(ED_DIR)/*.mli $(ED_DIR)/*.ml \ - $(VIEWER_DIR)/*.mli $(VIEWER_DIR)/*.ml \ - $(DGRAPH_DIR)/*.mli $(DGRAPH_DIR)/*.ml > .depend - -include .depend diff --git a/configure.in b/configure.in deleted file mode 100644 index 8e5d8a75..00000000 --- a/configure.in +++ /dev/null @@ -1,242 +0,0 @@ -########################################################################## -# # -# Ocamlgraph: a generic graph library for OCaml # -# Copyright (C) 2004-2010 # -# Sylvain Conchon, Jean-Christophe Filliatre and Julien Signoles # -# # -# This software is free software; you can redistribute it and/or # -# modify it under the terms of the GNU Library General Public # -# License version 2.1, with the special exception on linking # -# described in file LICENSE. # -# # -# This software is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # -# # -########################################################################## - -# the script generated by autoconf from this input will set the following -# variables: -# OCAMLC "ocamlc" if present in the path, or a failure -# or "ocamlc.opt" if present with same version number as ocamlc -# OCAMLOPT "ocamlopt" (or "ocamlopt.opt" if present), or "no" -# OCAMLBEST either "byte" if no native compiler was found, -# or "opt" otherwise -# OCAMLDEP "ocamldep" -# OCAMLLEX "ocamllex" (or "ocamllex.opt" if present) -# OCAMLYACC "ocamlyac" -# OCAMLLIB the path to the ocaml standard library -# OCAMLVERSION the ocaml version number -# OCAMLWEB "ocamlweb" (not mandatory) -# OCAMLWIN32 "yes"/"no" depending on Sys.os_type = "Win32" -# EXE ".exe" if OCAMLWIN32=yes, "" otherwise - -# check for one particular file of the sources -# ADAPT THE FOLLOWING LINE TO YOUR SOURCES! -AC_INIT(src/sig.mli) - -# Check for Ocaml compilers - -# we first look for ocamlc in the path; if not present, we fail -AC_CHECK_PROG(OCAMLC,ocamlc,ocamlc,no) -if test "$OCAMLC" = no ; then - AC_MSG_ERROR(Cannot find ocamlc.) -fi - -# we extract Ocaml version number and library path -OCAMLVERSION=`$OCAMLC -v | sed -n -e 's|The O.*, version *\(.*\)$|\1|p' ` -echo "ocaml version is $OCAMLVERSION" - -case $OCAMLVERSION in - 0.*|1.*|2.*|3.0*) - AC_MSG_ERROR(ocamlgraph needs ocaml version 3.10.0 or higher);; - 3.10*) - NATIVE_DYNLINK=no;; - *) - NATIVE_DYNLINK=yes - ;; -esac - -# OCAMLLIB=`$OCAMLC -v | tail -n 1 | cut -f 4 -d " "` -# OCAMLLIB=`$OCAMLC -v | tail -n 1 | sed -e 's|[[^:]]*: \(.*\)|\1|' ` -OCAMLLIB=`$OCAMLC -where | tr -d '\\r' | tr '\\\\' '/'` -echo "ocaml library path is $OCAMLLIB" - -# then we look for ocamlopt; if not present, we issue a warning -# if the version is not the same, we also discard it -# we set OCAMLBEST to "opt" or "byte", whether ocamlopt is available or not -AC_CHECK_PROG(OCAMLOPT,ocamlopt,ocamlopt,no) -OCAMLBEST=byte -if test "$OCAMLOPT" = no ; then - AC_MSG_WARN(Cannot find ocamlopt; bytecode compilation only.) -else - AC_MSG_CHECKING(ocamlopt version) - TMPVERSION=`$OCAMLOPT -v | sed -n -e 's|.*version *\(.*\)$|\1|p' ` - if test "$TMPVERSION" != "$OCAMLVERSION" ; then - AC_MSG_RESULT(differs from ocamlc; ocamlopt discarded.) - OCAMLOPT=no - else - AC_MSG_RESULT(ok) - OCAMLBEST=opt - fi -fi - -# checking for ocamlc.opt -AC_CHECK_PROG(OCAMLCDOTOPT,ocamlc.opt,ocamlc.opt,no) -if test "$OCAMLCDOTOPT" != no ; then - AC_MSG_CHECKING(ocamlc.opt version) - TMPVERSION=`$OCAMLCDOTOPT -v | sed -n -e 's|.*version *\(.*\)$|\1|p' ` - if test "$TMPVERSION" != "$OCAMLVERSION" ; then - AC_MSG_RESULT(differs from ocamlc; ocamlc.opt discarded.) - else - AC_MSG_RESULT(ok) - OCAMLC=$OCAMLCDOTOPT - fi -fi - -# checking for ocamlopt.opt -if test "$OCAMLOPT" != no ; then - AC_CHECK_PROG(OCAMLOPTDOTOPT,ocamlopt.opt,ocamlopt.opt,no) - if test "$OCAMLOPTDOTOPT" != no ; then - AC_MSG_CHECKING(ocamlc.opt version) - TMPVER=`$OCAMLOPTDOTOPT -v | sed -n -e 's|.*version *\(.*\)$|\1|p' ` - if test "$TMPVER" != "$OCAMLVERSION" ; then - AC_MSG_RESULT(differs from ocamlc; ocamlopt.opt discarded.) - else - AC_MSG_RESULT(ok) - OCAMLOPT=$OCAMLOPTDOTOPT - fi - fi -fi - -# ocamldep, ocamllex and ocamlyacc should also be present in the path -AC_CHECK_PROG(OCAMLDEP,ocamldep,ocamldep,no) -if test "$OCAMLDEP" = no ; then - AC_MSG_ERROR(Cannot find ocamldep.) -fi - -AC_CHECK_PROG(OCAMLLEX,ocamllex,ocamllex,no) -if test "$OCAMLLEX" = no ; then - AC_MSG_ERROR(Cannot find ocamllex.) -else - AC_CHECK_PROG(OCAMLLEXDOTOPT,ocamllex.opt,ocamllex.opt,no) - if test "$OCAMLLEXDOTOPT" != no ; then - OCAMLLEX=$OCAMLLEXDOTOPT - fi -fi - -AC_CHECK_PROG(OCAMLYACC,ocamlyacc,ocamlyacc,no) -if test "$OCAMLYACC" = no ; then - AC_MSG_ERROR(Cannot find ocamlyacc.) -fi - -AC_CHECK_PROG(OCAMLDOC,ocamldoc,ocamldoc,true) -if test "$OCAMLDOC" = true ; then - AC_MSG_WARN(Cannot find ocamldoc) -else - AC_CHECK_PROG(OCAMLDOCOPT,ocamldoc.opt,ocamldoc.opt,no) - if test "$OCAMLDOCOPT" != no ; then - OCAMLDOC=$OCAMLDOCOPT - fi -fi - -AC_CHECK_PROG(OCAMLWEB,ocamlweb,ocamlweb,true) - -AC_CHECK_PROG(OCAMLFIND,ocamlfind,ocamlfind) -if test "$OCAMLFIND" = "" ; then - echo "No ocamlfind detected" -else - OCAMLLIB_BY_FINDLIB=`ocamlfind printconf stdlib | tr -d '\\r' | tr '\\\\' '/'` - if test "$OCAMLLIB_BY_FINDLIB" = "$OCAMLLIB" ; then - echo "OCamlfind detected and enabled" - else - echo "OCamlfind detected but disabled. Standard libraries differ:" - echo " ocamlc: '$OCAMLLIB'" - echo " ocamlfind: '$OCAMLLIB_BY_FINDLIB'" - OCAMLFIND="" - fi -fi - -if test "$OCAMLBEST" = "opt"; then - SUFFIX=cmxa; -else - SUFFIX=cma; -fi - -# checking for lablgtk2 and lablgnomecanvas -########################################### - -# lablgtk2 now uses ocamlfind while older version uses `ocamlc -where ` -# its installation path is not the same -if test "$OCAMLFIND" = "" ; then - LABLGTK_PATH=+lablgtk2 - LABLGTKPATH_FOR_CONFIGURE=$OCAMLLIB/lablgtk2 -else - LABLGTK_PATH=`ocamlfind query lablgtk2 | tr -d '\\r\\n'` - if test "$LABLGTK_PATH" = "" -o "$LABLGTK_PATH" -ef "$OCAMLLIB/lablgtk2" ; \ - then - LABLGTK_PATH=+lablgtk2 - LABLGTKPATH_FOR_CONFIGURE=$OCAMLLIB/lablgtk2 - else - LABLGTKPATH_FOR_CONFIGURE=$LABLGTK_PATH - fi -fi - -AC_CHECK_FILE($LABLGTKPATH_FOR_CONFIGURE/lablgtk.$SUFFIX, - LABLGTK2=yes, - LABLGTK2=no) - -if test "$LABLGTK2" = yes ; then - INCLUDEGTK2="-I $LABLGTK_PATH" - AC_CHECK_FILE($LABLGTKPATH_FOR_CONFIGURE/lablgnomecanvas.$SUFFIX, - LABLGNOMECANVAS=yes, - LABLGNOMECANVAS=no) -else - LABLGTK2=no - LABLGNOMECANVAS=no -fi - -# platform -AC_MSG_CHECKING(Win32 platform) -echo "print_endline Sys.os_type" > check_arch.ml -if ocaml check_arch.ml | grep -q Win32; then - AC_MSG_RESULT(yes) - OCAMLWIN32=yes - EXE=.exe -else - AC_MSG_RESULT(no) - OCAMLWIN32=no - EXE= -fi -rm -f check_arch.ml - -LIBEXT=`ocamlc -config | grep ext_lib | sed -e 's/.*\(\..*\)/\1/' ` -OBJEXT=`ocamlc -config | grep ext_obj | sed -e 's/.*\(\..*\)/\1/' ` - -if test "$LABLGNOMECANVAS" = no ; then - AC_MSG_WARN([lablgnomecanvas not found: the graph editor and view_graph will not be compiled]) -fi - -# substitutions to perform -AC_SUBST(OCAMLC) -AC_SUBST(OCAMLOPT) -AC_SUBST(OCAMLDEP) -AC_SUBST(OCAMLLEX) -AC_SUBST(OCAMLDOC) -AC_SUBST(OCAMLYACC) -AC_SUBST(OCAMLBEST) -AC_SUBST(OCAMLVERSION) -AC_SUBST(OCAMLLIB) -AC_SUBST(OCAMLWEB) -AC_SUBST(LABLGTK2) -AC_SUBST(LABLGNOMECANVAS) -AC_SUBST(OCAMLWIN32) -AC_SUBST(EXE) -AC_SUBST(LIBEXT) -AC_SUBST(OBJEXT) -AC_SUBST(INCLUDEGTK2) -AC_SUBST(NATIVE_DYNLINK) - -# Finally create the Makefile from Makefile.in -AC_OUTPUT(Makefile) -chmod a-w Makefile diff --git a/editor/Makefile b/editor/Makefile deleted file mode 100644 index b7c1c510..00000000 --- a/editor/Makefile +++ /dev/null @@ -1,28 +0,0 @@ - -test: - make -C .. editor-test - -editor.opt: ed_*.ml - make -C .. editor/editor.opt - -# tortuegpoint: tortue.ml -# ocamlopt outils_math.ml -# ocamlopt -o $@ graphics.cmxa outils_math.cmx $^ - - -# graphEd.opt : outils_math.ml outils_tort.ml graphEd.ml -# ocamlopt -o $@ graphics.cmxa -I .. ../graph.cmxa $^ - - -# graphEdGTK : outils_math.ml outils_tort.ml graphEdGTK.ml -# ocamlopt.opt -o $@ -I +lablgtk2 lablgtk.cmxa lablgnomecanvas.cmxa unix.cmxa -I .. ../graph.cmxa $^ - -# graphEdGTK.byte : outils_math.ml outils_tort.ml graphEdGTK.ml -# ocamlc.opt -g -o $@ -I +lablgtk2 lablgtk.cma lablgnomecanvas.cma unix.cma -I .. ../graph.cma $^ - -# editor.opt: -# make -C .. - -clean: - rm -f *.opt - rm -f *.cm[iox] diff --git a/misc/headache_config.txt b/misc/headache_config.txt deleted file mode 100644 index e0d23d8b..00000000 --- a/misc/headache_config.txt +++ /dev/null @@ -1,9 +0,0 @@ -# Objective Caml source -| ".*\\.ml[il4]?" -> frame open:"(*" line:"*" close:"*)" -| ".*\\.mly" -> frame open:"/*" line:"*" close:"*/" -# C source -| ".*\\.c" -> frame open:"/*" line:"*" close:"*/" -# Misc -| "configure.in" -> frame open:"#" line:"#" close:"#" -| "Makefile.in" -> frame open:"#" line:"#" close:"#" -| "README" -> frame open:"*" line:"*" close:"*" diff --git a/misc/header.txt b/misc/header.txt deleted file mode 100644 index 16f34617..00000000 --- a/misc/header.txt +++ /dev/null @@ -1,14 +0,0 @@ - -OCamlgraph: a generic graph library for OCaml -Copyright (C) 2004-2013 -Sylvain Conchon, Jean-Christophe Filliatre and Julien Signoles - -This software is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public -License version 2.1, with the special exception on linking -described in file LICENSE. - -This software is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - diff --git a/misc/make_intf.ml b/misc/make_intf.ml deleted file mode 100644 index 1dabd447..00000000 --- a/misc/make_intf.ml +++ /dev/null @@ -1,50 +0,0 @@ -(**************************************************************************) -(* *) -(* Ocamlgraph: a generic graph library for OCaml *) -(* Copyright (C) 2004-2007 *) -(* Sylvain Conchon, Jean-Christophe Filliatre and Julien Signoles *) -(* *) -(* This software is free software; you can redistribute it and/or *) -(* modify it under the terms of the GNU Library General Public *) -(* License version 2, with the special exception on linking *) -(* described in file LICENSE. *) -(* *) -(* This software is distributed in the hope that it will be useful, *) -(* but WITHOUT ANY WARRANTY; without even the implied warranty of *) -(* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *) -(* *) -(**************************************************************************) - -(* $Id:$ *) - -(* script to build graph.mli from the set of all .mli files passed on the - command line *) - -open Printf - -let cout = open_out "graph.mli" - -let is_cvs_line s = String.length s > 5 && String.sub s 0 6 = "(* $Id" - -let copy f = - let cin = open_in f in - while not (is_cvs_line (input_line cin)) do () done; - begin - try while true do fprintf cout " %s\n" (input_line cin) done - with End_of_file -> () - end; - close_in cin - -let () = - for i = 1 to Array.length Sys.argv - 1 do - let f = Sys.argv.(i) in - if not (Sys.file_exists f) then failwith (f ^ ": no suh file"); - let m = String.capitalize (Filename.chop_suffix f ".mli") in - fprintf cout "module %s : sig\n" m; - copy f; - fprintf cout "end\n\n" - - done - -let () = close_out cout - diff --git a/view_graph/Makefile b/view_graph/Makefile deleted file mode 100644 index 35098235..00000000 --- a/view_graph/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -OCAMLC=ocamlc.opt -dtypes -OCAMLOPT=ocamlopt.opt -OCAMLDOC=ocamldoc.opt - -GRAPH_DIR=.. -GRAPH_LIB=graph.cmo - -INCLUDES=-I . -I +lablgtk2 -I $(GRAPH_DIR) - -FILES = viewGraph viewGraph_select viewGraph_utils viewGraph_test -SRCS = $(wildcard *.ml *.mli) -CMOS = $(FILES:%=%.cmo) -CMXS = $(FILES:%=%.cmx) - -EXEC=viewgraph - -all : $(EXEC) $(CMXS) doc - -$(EXEC) : $(CMOS) $(GRAPH_DIR)/$(GRAPH_LIB) - $(OCAMLC) $(INCLUDES) -o $@ \ - unix.cma lablgtk.cma lablgnomecanvas.cma $(GRAPH_LIB) \ - $(CMOS) - -depend: .depend - -.depend : $(SRCS) - ocamldep $(SRCS) > $@ - -include .depend - -.PHONY: doc -doc : $(CMOS) doc/intro.txt doc/style.css - $(OCAMLDOC) -d doc \ - -stars -html -intro doc/intro.txt -css-style style.css \ - $(INCLUDES) $(SRCS) - -%.cmo :%.ml - $(OCAMLC) $(INCLUDES) -c $< - -%.cmx :%.ml - $(OCAMLOPT) $(INCLUDES) -c $< - -%.cmi :%.mli - $(OCAMLC) $(INCLUDES) -c $< - -clean : - rm -f $(EXEC) - rm -f .depend - rm -f $(FILES:%=%.cmo) $(FILES:%=%.cmx) $(FILES:%=%.o) $(FILES:%=%.cmi) $(FILES:%=%.annot) - rm -f doc/*.html diff --git a/www/.cvsignore b/www/.cvsignore deleted file mode 100644 index 81e62b9c..00000000 --- a/www/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -*.fr.html -*.en.html -version.prehtml diff --git a/www/Makefile b/www/Makefile deleted file mode 100644 index 8efb2823..00000000 --- a/www/Makefile +++ /dev/null @@ -1,33 +0,0 @@ - -INCLUDES = macros.prehtml version.prehtml - -OCAMLGRAPHHOME = /users/www-perso/projets/ocamlgraph - -ALL = index.fr.html index.en.html - -install: all - scp $(ALL) filliatr@acces:$(OCAMLGRAPHHOME) - -all: $(ALL) - -clean:: - rm -f *~ *.fr.html *.en.html - -YAMLPP=yamlpp macros.prehtml version.prehtml - -version.prehtml: - make -C .. www/version.prehtml - -# RULES - -.SUFFIXES: .html .prehtml .fr.html .en.html - -%.fr.html: %.prehtml $(INCLUDES) - $(YAMLPP) -l fr $< -o $@ - -%.html: %.prehtml $(INCLUDES) - $(YAMLPP) $< -o $@ - -%.en.html: %.prehtml $(INCLUDES) - $(YAMLPP) -l en $< -o $@ - diff --git a/www/index.prehtml b/www/index.prehtml deleted file mode 100644 index a3173793..00000000 --- a/www/index.prehtml +++ /dev/null @@ -1,240 +0,0 @@ -<#def thisfile>index -<#def top>../index - - - - -<#iso> - -ocamlgraph: <#fr>une bibliothèque de graphes pour Objective -Caml</#fr><#en>an ocaml graph library</#en> - - - - - - -

OCamlgraph

- -<#fr>OCamlgraph est une bibliothèque de graphes pour - Objective Caml. -Elle présente trois aspects différents: - - - -<#en> -OCamlgraph is a graph library for Objective Caml. -Its contribution is three-fold: - - - - -

Documentation

- -<#fr>Parcourir l'<#en>Browse the API. -<#fr>Note : Tous les modules sont regroupés à l'intérieur d'un unique module -Graph. -<#en>Note: all modules are packaged into a single module Graph. - -

- -FAQ - -

-<#fr>Articles présentant OCamlgraph : -<#en>Papers describing OCamlgraph: -

- -

- -<#fr>Exemples de code :<#en>Code Examples: -

- -

Distribution

- -<#def LICENSE>LICENSE - -<#fr> -OCamlgraph est distribué librement, sous la licence GNU Library -General Public License version 2, avec une exception concernant -l'édition de lien décrite dans le fichier <#LICENSE>.
-Il est disponible sous forme de sources : - -Vous pouvez accéder à la zone de téléchargement directement. -Voici les derniers changements. - -<#en> -OCamlgraph is freely available, under the terms of the GNU Library -General Public License version 2, with the special exception on linking -described in file <#LICENSE>. -
-It is available as a source tarball: - -

-You can access the download zone directly. -Here are the recent CHANGES. - - -

- -<#fr>Vous pouvez également accéder en lecture à la version de - développement d'OCamlgraph sur github -<#en>Alternatively, you can access the current development version - on github: -

-  https://github.com/backtracking/ocamlgraph
-
- -

<#fr>Crédits<#en>Credits

- -<#fr>Auteurs -<#en>Authors - - -

- -<#fr>Contributeurs extérieurs : -<#en>External contributors: -

- -

-

- -<#drapeaux> - - - diff --git a/www/macros.prehtml b/www/macros.prehtml deleted file mode 100644 index d64b664c..00000000 --- a/www/macros.prehtml +++ /dev/null @@ -1,16 +0,0 @@ - -<#def absolute>http://www.lri.fr/~filliatr - -<#def iso> - - - - -<#def drapfr>Français -<#def drapen>American - -<#def drapeaux> -<#fr><#drapen> -<#en><#drapfr> - -