[Pkg-ocaml-maint-commits] [easy-format] 01/07: Imported Upstream version 1.0.2

[Stéphane Glondu]

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository easy-format.

commit 1ef82f845208ec6b8e32fe07bb062a97719cf648
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Jan 27 10:01:20 2014 +0100

    Imported Upstream version 1.0.2
---
 META.tpl  |  1 +
 Makefile  | 50 ++++++++++++++++++++------------------------------
 README    | 25 -------------------------
 README.md | 34 ++++++++++++++++++++++++++++++++++
 4 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/META.tpl b/META.tpl
index 7f9442b..25d1cbe 100644
--- a/META.tpl
+++ b/META.tpl
@@ -2,3 +2,4 @@ name = "easy-format"
 description = "Indentation made easy(ier)"
 archive(byte)    = "easy_format.cmo"
 archive(native)  = "easy_format.cmx"
+archive(native,plugin)  = "easy_format.cmxs"
diff --git a/Makefile b/Makefile
index 54dc089..f910614 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,29 @@
-VERSION = 1.0.1
+VERSION = 1.0.2
 export VERSION
 
+NATDYNLINK := $(shell if [ -f `ocamlc -where`/dynlink.cmxa ]; then echo YES; else echo NO; fi)
+
+ifeq "${NATDYNLINK}" "YES"
+CMXS=easy_format.cmxs
+endif
+
 .PHONY: default all opt test doc soft-clean clean
 default: all opt
 all:
 	ocamlc -c easy_format.mli
 	ocamlc -c -dtypes easy_format.ml
 	touch bytecode
-opt:
+
+opt: easy_format.cmx $(CMXS)
+	touch nativecode
+
+easy_format.cmx:
 	ocamlc -c easy_format.mli
 	ocamlopt -c -dtypes easy_format.ml
-	touch nativecode
+
+easy_format.cmxs: easy_format.cmx
+	ocamlopt -I . -shared -linkall -o easy_format.cmxs easy_format.cmx
+
 test: all simple_example.out
 	ocamlc -o test_easy_format -dtypes easy_format.cmo test_easy_format.ml
 	./test_easy_format > test_easy_format.out
@@ -24,6 +37,7 @@ simple_example.out: simple_example
 
 doc: ocamldoc/index.html easy_format_example.html
 ocamldoc/index.html: easy_format.mli
+	mkdir -p ocamldoc
 	ocamldoc -d ocamldoc -html $<
 easy_format_example.html: simple_example.out simple_example.ml
 	cat simple_example.ml > easy_format_example.ml
@@ -34,7 +48,7 @@ easy_format_example.html: simple_example.out simple_example.ml
 	caml2html easy_format_example.ml -t -o easy_format_example.html
 
 soft-clean:
-	rm -f *.cm[iox] *.o *.annot \
+	rm -f *.cm[iox] *.cmxs *.o *.annot \
 		test_easy_format lambda_example simple_example \
 		bytecode nativecode
 
@@ -45,8 +59,8 @@ clean: soft-clean
 
 
 COMMON_INSTALL_FILES = META easy_format.cmi easy_format.mli
-BC_INSTALL_FILES = easy_format.cmo 
-NC_INSTALL_FILES = easy_format.cmx easy_format.o
+BC_INSTALL_FILES = easy_format.cmo
+NC_INSTALL_FILES = easy_format.cmx easy_format.o $(CMXS)
 
 install:
 	echo "version = \"$(VERSION)\"" > META; cat META.tpl >> META
@@ -61,27 +75,3 @@ install:
 
 uninstall:
 	ocamlfind remove easy-format
-
-archive:
-	@echo "Making archive for version $(VERSION)"
-	$(MAKE) doc
-	rm -rf /tmp/easy-format /tmp/easy-format-$(VERSION) && \
-	 	cp -r . /tmp/easy-format && \
-		cd /tmp/easy-format && \
-			$(MAKE) clean && \
-			rm -f *~ examples/*~ easy-format*.tar* && \
-		cd /tmp && cp -r easy-format easy-format-$(VERSION) && \
-		tar czf easy-format.tar.gz easy-format && \
-		tar cjf easy-format.tar.bz2 easy-format && \
-		tar czf easy-format-$(VERSION).tar.gz easy-format-$(VERSION) && \
-		tar cjf easy-format-$(VERSION).tar.bz2 easy-format-$(VERSION)
-	mv /tmp/easy-format.tar.gz /tmp/easy-format.tar.bz2 .
-	mv /tmp/easy-format-$(VERSION).tar.gz /tmp/easy-format-$(VERSION).tar.bz2 .
-	cp easy-format.tar.gz easy-format.tar.bz2 $$WWW/
-	cp easy-format-$(VERSION).tar.gz easy-format-$(VERSION).tar.bz2 $$WWW/
-	cp LICENSE $$WWW/easy-format-license.txt
-	cp Changes $$WWW/easy-format-changes.txt
-	cp easy_format_example.ml easy_format_example.html $$WWW/
-	cp ocamldoc/* $$WWW/easy-format-doc/
-	echo 'let easy_format_version = "$(VERSION)"' \
-		> $$WWW/easy-format-version.ml
diff --git a/README b/README
deleted file mode 100644
index 2897b57..0000000
--- a/README
+++ /dev/null
@@ -1,25 +0,0 @@
-+------------------------------------+
-| Easy_format: indentation made easy |
-+------------------------------------+
-
-
-1. Documentation: http://martin.jambon.free.fr/easy-format.html
-
-2. Installation:
-
-Installation requires ocamlfind:
-
-  make
-  make install
-
-Uninstallation:
-
-  make uninstall
-
-
-3. Examples
-
-Some examples can be run with 'make test' before installing.
-
-More examples that require Easy-format to be installed and possibly
-dependencies on other packages can be found in the examples/ subdirectory.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..077bdbe
--- /dev/null
+++ b/README.md
@@ -0,0 +1,34 @@
+Easy-format: indentation made easy
+==================================
+
+
+Documentation
+-------------
+
+The documentation is at http://mjambon.com/easy-format.html
+
+
+Installation
+------------
+
+Installation requires ocamlfind.
+
+```
+$ make
+$ make install
+```
+
+Uninstallation
+--------------
+
+```
+$ make uninstall
+```
+
+Examples
+--------
+
+Some examples can be run with `make test` before installing.
+
+More examples that require Easy-format to be installed and possibly
+dependencies on other packages can be found in the `examples/` subdirectory.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/easy-format.git