[Pkg-ocaml-maint-commits] [SCM] Debian packaging for coccinelle branch, fixes/system-ocamlsexp, updated. upstream/0.1.8.deb-27-gea09507

[Eugeniy Meshcheryakov]

The following commit has been merged in the fixes/system-ocamlsexp branch:
commit 5694e08ac7f94905236e864bdcc65a43a30ef561
Merge: 4d33edf6fe48e9823b8041dada867a677412a639 2207fc568922b3ddeaff9487ea52caa508a06427
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date:   Sun Aug 9 20:40:20 2009 +0200

    Merge commit 'refs/top-bases/fixes/system-ocamlsexp' into fixes/system-ocamlsexp

diff --combined Makefile
index e1e59cc,bff7065..c932c51
--- a/Makefile
+++ b/Makefile
@@@ -50,7 -50,7 +50,7 @@@ SEXPSYSCMA=bigarray.cma nums.cm
  
  SYSLIBS=str.cma unix.cma $(PYCMA) $(SEXPSYSCMA)
  LIBS=commons/commons.cma \
 -     ocamlsexp/sexplib1.cma commons/commons_sexp.cma \
 +     sexplib.cma commons/commons_sexp.cma \
       globals/globals.cma \
       ctl/ctl.cma \
       parsing_cocci/cocci_parser.cma parsing_c/parsing_c.cma \
@@@ -58,10 -58,10 +58,10 @@@
       extra/extra.cma python/coccipython.cma
  
  #used for clean: and depend: and a little for rec & rec.opt
 -MAKESUBDIRS=commons ocamlsexp \
 +MAKESUBDIRS=commons \
   globals ctl parsing_cocci parsing_c \
   engine extra python
 -INCLUDEDIRS=commons commons/ocamlextra ocamlsexp \
 +INCLUDEDIRS=commons commons/ocamlextra \
   globals $(PYDIR) ctl \
   parsing_cocci parsing_c engine extra python
  
@@@ -93,8 -93,8 +93,8 @@@ OPTFLAGS
  # but is now defined above in this file
  #OPTLIBFLAGS=-cclib dllpycaml_stubs.so
  
 -OCAMLC=ocamlc$(OPTBIN) $(OCAMLCFLAGS)  $(INCLUDES)
 -OCAMLOPT=ocamlopt$(OPTBIN) $(OPTFLAGS) $(INCLUDES)
 +OCAMLC=ocamlc$(OPTBIN) $(OCAMLCFLAGS)  $(INCLUDES) -I $(shell ocamlfind query sexplib)
 +OCAMLOPT=ocamlopt$(OPTBIN) $(OPTFLAGS) $(INCLUDES) -I $(shell ocamlfind query sexplib)
  OCAMLLEX=ocamllex #-ml # -ml for debugging lexer, but slightly slower
  OCAMLYACC=ocamlyacc -v
  OCAMLDEP=ocamldep $(INCLUDES)
@@@ -133,11 -133,13 +133,11 @@@ top: $(EXEC).to
  
  subdirs:
  	$(MAKE) -C commons OCAMLCFLAGS="$(OCAMLCFLAGS)"
 -	$(MAKE) -C ocamlsexp OCAMLCFLAGS="$(OCAMLCFLAGS)"
  	$(MAKE) -C commons sexp OCAMLCFLAGS="$(OCAMLCFLAGS)"
  	+for D in $(MAKESUBDIRS); do $(MAKE) $$D || exit 1 ; done
  
  subdirs.opt:
  	$(MAKE) -C commons all.opt OCAMLCFLAGS="$(OCAMLCFLAGS)"
 -	$(MAKE) -C ocamlsexp all.opt OCAMLCFLAGS="$(OCAMLCFLAGS)"
  	$(MAKE) -C commons sexp.opt OCAMLCFLAGS="$(OCAMLCFLAGS)"
  	+for D in $(MAKESUBDIRS); do $(MAKE) $$D.opt || exit 1 ; done
  
@@@ -364,6 -366,7 +364,7 @@@ OCAMLVERSION=$(shell ocaml -version |pe
  #  modify globals/config.ml.in
  #  cd globals/; cvs commit -m"new version"  (do not commit from the root!)
  #  ./configure --without-python
+ #  can make; ./spatch -testall to check and update the SCORE_expected.sexp
  #  make package
  #  make website
  # Check that run an ocaml in /usr/bin
diff --combined commons/Makefile
index ee407bb,081bb1a..4813a6a
--- a/commons/Makefile
+++ b/commons/Makefile
@@@ -16,7 -16,7 +16,7 @@@ MYSRC=common.ml common_extra.ml 
        ocollection/oseti.ml ocollection/oseth.ml ocollection/osetb.ml ocollection/osetpt.ml \
        ocollection/oassocb.ml ocollection/oassoch.ml ocollection/oassoc_buffer.ml ocollection/oassoc_cache.ml ocollection/oassocid.ml \
        oarray.ml \
-       ocollection/ograph2way.ml ograph_extended.ml \
+       ocollection/ograph2way.ml ograph_simple.ml ograph_extended.ml \
        ofullcommon.ml \
        glimpse.ml parser_combinators.ml
  
@@@ -72,7 -72,7 +72,7 @@@ REGEXPINCLUDES=-I ../ocamlpcre/lib  -I 
  
  #sexplib 
  MYSEXPSRC=sexp_common.ml
 -SEXPINCLUDES=-I ../ocamlsexp -I ../ocamltarzan/lib-sexp -I ../../ocamltarzan/lib-sexp
 +SEXPINCLUDES=-I `ocamlfind query sexplib` -I ../ocamltarzan/lib-sexp -I ../../ocamltarzan/lib-sexp
  #binprot
  MYBINSRC=bin_common.ml
  BININCLUDES=-I ../ocamltarzan/lib-binprot -I ../../ocamltarzan/lib-binprot
diff --combined testing.ml
index ee89772,6ca4be7..9ef923f
--- a/testing.ml
+++ b/testing.ml
@@@ -21,7 -21,6 +21,7 @@@
  
  
  open Common
 +open Sexplib
  
  (*****************************************************************************)
  (* Test framework *)
@@@ -127,6 -126,10 +127,10 @@@ let testall ?(expected_score_file="test
            | Compare_c.Pb s -> 
                let s = Str.global_replace 
                  (Str.regexp "\"/tmp/cocci-output.*\"") "<COCCIOUTPUTFILE>" s
+               in
+               (* on macos the temporary files are stored elsewhere *)
+               let s = Str.global_replace 
+                 (Str.regexp "\"/var/folders/.*/cocci-output.*\"") "<COCCIOUTPUTFILE>" s
                in
                let s = 
                  "INCORRECT:" ^ s ^ "\n" ^ 

-- 
Debian packaging for coccinelle