Commit 22ce6e2a authored by gerd's avatar gerd

New release.


git-svn-id: https://godirepo.camlcity.org/svn/lib-xstrp4/trunk@26 56444827-45db-0310-81c6-95464f7ca4c4
parent 6ea89121
version = "1.5"
version = "1.6"
requires = "camlp4"
# This line counts when the compiler is invoked with
......
......@@ -34,7 +34,7 @@ view.sample:
# general rules:
OPTIONS =
OCAMLC = $(OCAMLFIND) ocamlc $(OPTIONS) -package camlp4 -syntax camlp4o -ppopt pa_extend.cmo -ppopt q_MLast.cmo
OCAMLC = $(OCAMLFIND) ocamlc $(OPTIONS) -package camlp4 -syntax camlp4o -ppopt pa_extend.cmo -ppopt q_MLast.cmo -ppopt "-loc" -ppopt "loc"
OCAMLDEP = ocamldep $(OPTIONS)
OCAMLFIND = ocamlfind
......@@ -62,19 +62,6 @@ distclean: clean
RELEASE: META
awk '/version/ { print substr($$3,2,length($$3)-2) }' META >RELEASE
.PHONY: dist
dist: RELEASE
r=`head -1 RELEASE`; find . ! -type d | grep -v .svn | godi_pax -w -f ../$(NAME)-$$r.tar.gz -x tar -z -s ":\.:$(NAME)-$$r:"
.PHONY: tag-release
tag-release: RELEASE
r=`head -1 RELEASE | sed -e s/\\\./-/g`; cd ..; cvs tag -F $(NAME)-$$r $(NAME)
.PHONY: release
release: distclean
$(MAKE) tag-release
$(MAKE) dist
.SUFFIXES: .cmo .cmi .cmx .ml .mli .mll
.ml.cmx:
......
......@@ -25,6 +25,10 @@ See sample.ml for explanations. See the Makefile how to compile sample.ml.
CHANGES:
Changed in version 1.6:
Setting the name of the location variable explicitly
because the default changed in O'Caml 3.09.
Changed in version 1.5:
Fixes for O'Caml 3.08. There is still a known problem:
Locations in error messages may be wrong for <:here< ... >>.
......
#! /bin/sh
set -e
make RELEASE
version="$(cat RELEASE)"
destdir="xstrp4-$version"
trunk="https://gps.dynxs.de/svn/lib-xstrp4/trunk"
tag="https://gps.dynxs.de/svn/lib-xstrp4/tags/$destdir"
mkdir -p packages
rm -rf "packages/$destdir"
makepkg -spec xstrp4.files -intree . -outtree "packages/$destdir"
(cd packages; tar czf "$destdir.tar.gz" "$destdir")
echo "Wrote packages/$destdir.tar.gz"
# Checking for svn:
status=$(svn status | grep -v '^\?' || true )
if [ -n "$status" ]; then
echo "Error: svn status not clean"
exit 1
else
printf "Tag revision (y/n)? "
read answer
case "$answer" in
y|Y|yes|YES)
svn cp "$trunk" "$tag"
echo "New tag: $tag"
;;
*)
echo "Nothing tagged."
;;
esac
fi
# SYNTAX OF xstrp4.files:
#
# d DIRPATH
#
# include this subdirectory
#
# f FILEPATH
#
# include this file (or symlink)
#
# x FILEPATH
#
# exclude this file
#
# p DIRPATH/FILEPATTERN
#
# include all files of the directory that match the regular expression
# FILEPATTERN (Str-type regexp)
#
# w DIRPATH/FILEPATTERN
#
# output a warning if one of the matching files matches
#
# Exclusions must be mentioned before inclusions.
f README
f LICENSE
f RELEASE
f META
f Makefile
f sample.file
f sample.ml
f xstrp4_here_lexer.mll
f xstrp4_here.ml
f xstrp4_here_types.ml
......@@ -6,6 +6,12 @@
open Xstrp4_here_types
open Pcaml
(* Note: Since O'Caml 3.09, the location variable is called "_loc" while
* in earlier versions it was called "loc". Fortunately, 3.09 allows it
* to set the name of the variable with the -loc option.
*)
let interpolated_expr ?(fname="")
?(lnum_offset=0) ?(cnum_offset=0) ?(bol_offset=0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment