Fixes tar and opam file construction

f17d4326 · POGODALLA Sylvain · 9575b716 · f17d4326 · f17d4326 · f17d4326
Commit f17d4326 authored Oct 19, 2018 by POGODALLA Sylvain
6 changed files
--- a/.gitignore
+++ b/.gitignore
 acgtk.install
+acgtk.url
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ tar:
 	if test -d ../$(TAR_RELEASE) ; then rm ../$(TAR_RELEASE) ; fi
 	cd .. && ln -s $(ACGtk_DIR) $(TAR_RELEASE) && cd $(ACGtk_DIR)
 	echo Building $(TAR_RELEASE).tar.gz
-	tar --exclude="*/.git*" --exclude "*/_build" --exclude "$(TAR_RELEASE)/data" --exclude "$(TAR_RELEASE)/src/data" --exclude "$(TAR_RELEASE)/*.tar.*" --exclude "$(TAR_RELEASE)/TODO" --exclude "*~" --exclude "Makefile" --exclude "acgtk.opam" -zcvf $(TAR_RELEASE).tar.gz -C ..  -h $(TAR_RELEASE) 
+	tar --exclude="*/.git*" --exclude "*/_build" --exclude "$(TAR_RELEASE)/data" --exclude "$(TAR_RELEASE)/src/data" --exclude "$(TAR_RELEASE)/*.tar.*" --exclude "$(TAR_RELEASE)/TODO" --exclude "*~" --exclude "Makefile" --exclude "acgtk.url" -zcvf $(TAR_RELEASE).tar.gz -C ..  -h $(TAR_RELEASE) 
 	if test -d ../$(TAR_RELEASE) ; then rm ../$(TAR_RELEASE) ; fi

 www:
@@ -74,8 +74,8 @@ OPAM_GIT_REPO_DIR=~/work/dev/opam-contrib/opam-repository/packages
 OPAM_ACG_REPO_DIR=~/www-acg/opam
 OPAM_CALLIGRAMME_ACG_REPO_DIR=~/www-calligramme-acg/software/opam-acg

-acgtk.opam: tar acg-$(VERSION).tar.gz
-	md5sum acg-$(VERSION).tar.gz | cut -d " " -f 1 | xargs -I{} printf 's!^url .*\$$\!url { src: \\"http://acg.loria.fr/software/acg-$(VERSION).tar.gz\\" checksum: \\"%s\\" }!' {} | xargs -I{} sed -i -e {} $@
+acgtk.url: tar acg-$(VERSION).tar.gz
+	md5sum acg-$(VERSION).tar.gz | cut -d " " -f 1 | xargs -I{} printf 'url {\n     src: "http://acg.loria.fr/software/acg-$(VERSION).tar.gz"\n     checksum: "%s"\n}\n' {} | cat acgtk.opam - >  $@
 	opam lint $@

 test-www-acg: opam-admin
@@ -87,9 +87,9 @@ sync: opam-admin
 opam-admin:
 	cd $(OPAM_ACG_REPO_DIR) && opam admin make

-package-copying: acgtk.opam
+package-copying: acgtk.url
 	mkdir -p $(OPAM_TESTING_DIR)/acgtk/acgtk.$(VERSION_BASENAME)  && cp $< $(OPAM_TESTING_DIR)/acgtk/acgtk.$(VERSION_BASENAME)/opam
 	mkdir -p $(OPAM_GIT_REPO_DIR)/acgtk/acgtk.$(VERSION_BASENAME) && cp $< $(OPAM_GIT_REPO_DIR)/acgtk/acgtk.$(VERSION_BASENAME)/opam
 	mkdir -p $(OPAM_ACG_REPO_DIR)/packages/acgtk/acgtk.$(VERSION_BASENAME) && cp $< $(OPAM_ACG_REPO_DIR)/packages/acgtk/acgtk.$(VERSION_BASENAME)/opam

-opam: version acgtk.opam www package-copying opam-admin sync
+opam: version acgtk.url www package-copying opam-admin sync
--- a/acgtk.opam
+++ b/acgtk.opam
@@ -33,6 +33,6 @@ authors: ["Sylvain Pogodalla"]
 bug-reports: "sylvain.pogodalla@inria.fr"

 synopsis: "Abstract Categorial Grammar development toolkit"
+
 description: "This toolkit provides a compiler and an interpreter for Abstract Categorial Grammars (ACGs). Grammars can be compiled and then used by the interpreter to parse (if the grammar is at most second-order) or to generate terms. See http://acg.loria.fr for more details and bibliographic references."

-url { src: "http://acg.loria.fr/software/acg-1.5.0-20181019.tar.gz" checksum: "36b072ea9a50816d1b9a15aa6599f6ca" }
--- a/src/grammars/data_parser.messages
+++ b/src/grammars/data_parser.messages
--- a/src/scripting/command_parser.messages
+++ b/src/scripting/command_parser.messages
-commands: ADD_HELP WAIT 
+commands: ADD_HELP WAIT
 ##
 ## Ends in an error in state: 86.
 ##
@@ -7,7 +7,7 @@ commands: ADD_HELP WAIT
 ## The known suffix of the stack is as follows:
 ## ADD_HELP 
 ##
-commands: ANALYSE_HELP WAIT 
+commands: ANALYSE_HELP WAIT
 ##
 ## Ends in an error in state: 83.
 ##
@@ -16,7 +16,7 @@ commands: ANALYSE_HELP WAIT
 ## The known suffix of the stack is as follows:
 ## ANALYSE_HELP 
 ##
-commands: CHECK_HELP WAIT 
+commands: CHECK_HELP WAIT
 ##
 ## Ends in an error in state: 80.
 ##
@@ -25,7 +25,7 @@ commands: CHECK_HELP WAIT
 ## The known suffix of the stack is as follows:
 ## CHECK_HELP 
 ##
-commands: CREATE_HELP WAIT 
+commands: CREATE_HELP WAIT
 ##
 ## Ends in an error in state: 70.
 ##
@@ -34,7 +34,7 @@ commands: CREATE_HELP WAIT
 ## The known suffix of the stack is as follows:
 ## CREATE_HELP 
 ##
-commands: COMPOSE IDENTT IDENTT AS IDENTT WAIT 
+commands: COMPOSE IDENTT IDENTT AS IDENTT WAIT
 ##
 ## Ends in an error in state: 76.
 ##
@@ -43,7 +43,7 @@ commands: COMPOSE IDENTT IDENTT AS IDENTT WAIT
 ## The known suffix of the stack is as follows:
 ## COMPOSE IDENTT IDENTT AS IDENTT 
 ##
-commands: CREATE_LEX IDENTT IDENTT IDENTT WAIT 
+commands: CREATE_LEX IDENTT IDENTT IDENTT WAIT
 ##
 ## Ends in an error in state: 68.
 ##
@@ -52,7 +52,7 @@ commands: CREATE_LEX IDENTT IDENTT IDENTT WAIT
 ## The known suffix of the stack is as follows:
 ## CREATE_LEX IDENTT IDENTT IDENTT 
 ##
-commands: CREATE_SIG IDENTT WAIT 
+commands: CREATE_SIG IDENTT WAIT
 ##
 ## Ends in an error in state: 63.
 ##
@@ -61,7 +61,7 @@ commands: CREATE_SIG IDENTT WAIT
 ## The known suffix of the stack is as follows:
 ## CREATE_SIG IDENTT 
 ##
-commands: EXIT WAIT 
+commands: EXIT WAIT
 ##
 ## Ends in an error in state: 51.
 ##
@@ -70,7 +70,7 @@ commands: EXIT WAIT
 ## The known suffix of the stack is as follows:
 ## EXIT 
 ##
-commands: IDENTT PRINT WAIT 
+commands: IDENTT PRINT WAIT
 ##
 ## Ends in an error in state: 90.
 ##
@@ -80,7 +80,7 @@ commands: IDENTT PRINT WAIT
 ## The known suffix of the stack is as follows:
 ## option(IDENTT) PRINT 
 ##
-commands: LOAD_HELP WAIT 
+commands: LOAD_HELP WAIT
 ##
 ## Ends in an error in state: 35.
 ##
@@ -89,7 +89,7 @@ commands: LOAD_HELP WAIT
 ## The known suffix of the stack is as follows:
 ## LOAD_HELP 
 ##
-commands: LOAD_SCRIPT SEMICOLONN 
+commands: LOAD_SCRIPT SEMICOLONN
 ##
 ## Ends in an error in state: 108.
 ##
@@ -98,7 +98,7 @@ commands: LOAD_SCRIPT SEMICOLONN
 ## The known suffix of the stack is as follows:
 ## command 
 ##
-commands: PARSE_HELP WAIT 
+commands: PARSE_HELP WAIT
 ##
 ## Ends in an error in state: 30.
 ##
@@ -107,7 +107,7 @@ commands: PARSE_HELP WAIT
 ## The known suffix of the stack is as follows:
 ## PARSE_HELP 
 ##
-commands: QUERY_HELP WAIT 
+commands: QUERY_HELP WAIT
 ##
 ## Ends in an error in state: 27.
 ##
@@ -116,7 +116,7 @@ commands: QUERY_HELP WAIT
 ## The known suffix of the stack is as follows:
 ## QUERY_HELP 
 ##
-commands: REALIZE_HELP WAIT 
+commands: REALIZE_HELP WAIT
 ##
 ## Ends in an error in state: 24.
 ##
@@ -125,7 +125,7 @@ commands: REALIZE_HELP WAIT
 ## The known suffix of the stack is as follows:
 ## REALIZE_HELP 
 ##
-commands: REALIZE_SHOW_HELP WAIT 
+commands: REALIZE_SHOW_HELP WAIT
 ##
 ## Ends in an error in state: 21.
 ##
@@ -134,7 +134,7 @@ commands: REALIZE_SHOW_HELP WAIT
 ## The known suffix of the stack is as follows:
 ## REALIZE_SHOW_HELP 
 ##
-commands: SAVE_HELP WAIT 
+commands: SAVE_HELP WAIT
 ##
 ## Ends in an error in state: 18.
 ##
@@ -143,7 +143,7 @@ commands: SAVE_HELP WAIT
 ## The known suffix of the stack is as follows:
 ## SAVE_HELP 
 ##
-commands: SELECT IDENTT WAIT 
+commands: SELECT IDENTT WAIT
 ##
 ## Ends in an error in state: 14.
 ##
@@ -152,7 +152,7 @@ commands: SELECT IDENTT WAIT
 ## The known suffix of the stack is as follows:
 ## SELECT IDENTT 
 ##
-commands: WAIT HELP WAIT 
+commands: WAIT HELP WAIT
 ##
 ## Ends in an error in state: 3.
 ##
@@ -161,7 +161,7 @@ commands: WAIT HELP WAIT
 ## The known suffix of the stack is as follows:
 ## WAIT HELP 
 ##
-commands: UNSELECT HELP WAIT 
+commands: UNSELECT HELP WAIT
 ##
 ## Ends in an error in state: 7.
 ##
@@ -170,7 +170,7 @@ commands: UNSELECT HELP WAIT
 ## The known suffix of the stack is as follows:
 ## UNSELECT HELP 
 ##
-commands: TRACE HELP WAIT 
+commands: TRACE HELP WAIT
 ##
 ## Ends in an error in state: 11.
 ##
@@ -179,7 +179,7 @@ commands: TRACE HELP WAIT
 ## The known suffix of the stack is as follows:
 ## TRACE HELP 
 ##
-commands: SELECT HELP WAIT 
+commands: SELECT HELP WAIT
 ##
 ## Ends in an error in state: 16.
 ##
@@ -188,7 +188,7 @@ commands: SELECT HELP WAIT
 ## The known suffix of the stack is as follows:
 ## SELECT HELP 
 ##
-commands: LIST HELP WAIT 
+commands: LIST HELP WAIT
 ##
 ## Ends in an error in state: 40.
 ##
@@ -197,7 +197,7 @@ commands: LIST HELP WAIT
 ## The known suffix of the stack is as follows:
 ## LIST HELP 
 ##
-commands: HELP HELP WAIT 
+commands: HELP HELP WAIT
 ##
 ## Ends in an error in state: 49.
 ##
@@ -206,7 +206,7 @@ commands: HELP HELP WAIT
 ## The known suffix of the stack is as follows:
 ## HELP HELP 
 ##
-commands: DONT WAIT HELP WAIT 
+commands: DONT WAIT HELP WAIT
 ##
 ## Ends in an error in state: 56.
 ##
@@ -215,7 +215,7 @@ commands: DONT WAIT HELP WAIT
 ## The known suffix of the stack is as follows:
 ## DONT WAIT HELP 
 ##
-commands: DONT TRACE HELP WAIT 
+commands: DONT TRACE HELP WAIT
 ##
 ## Ends in an error in state: 60.
 ##
@@ -224,7 +224,7 @@ commands: DONT TRACE HELP WAIT
 ## The known suffix of the stack is as follows:
 ## DONT TRACE HELP 
 ##
-commands: COMPOSE HELP WAIT 
+commands: COMPOSE HELP WAIT
 ##
 ## Ends in an error in state: 78.
 ##
@@ -233,7 +233,7 @@ commands: COMPOSE HELP WAIT
 ## The known suffix of the stack is as follows:
 ## COMPOSE HELP 
 ##
-commands: PRINT HELP WAIT 
+commands: PRINT HELP WAIT
 ##
 ## Ends in an error in state: 92.
 ##
@@ -242,7 +242,7 @@ commands: PRINT HELP WAIT
 ## The known suffix of the stack is as follows:
 ## option(IDENTT) PRINT HELP 
 ##
-commands: IDB HELP WAIT 
+commands: IDB HELP WAIT
 ##
 ## Ends in an error in state: 96.
 ##
@@ -254,7 +254,7 @@ commands: IDB HELP WAIT

 A semicolon ":" is expected

-commands: DONT TRACE WAIT 
+commands: DONT TRACE WAIT
 ##
 ## Ends in an error in state: 58.
 ##
@@ -264,7 +264,7 @@ commands: DONT TRACE WAIT
 ## The known suffix of the stack is as follows:
 ## DONT TRACE 
 ##
-commands: DONT WAIT WAIT 
+commands: DONT WAIT WAIT
 ##
 ## Ends in an error in state: 54.
 ##
@@ -274,7 +274,7 @@ commands: DONT WAIT WAIT
 ## The known suffix of the stack is as follows:
 ## DONT WAIT 
 ##
-commands: HELP WAIT 
+commands: HELP WAIT
 ##
 ## Ends in an error in state: 47.
 ##
@@ -284,7 +284,7 @@ commands: HELP WAIT
 ## The known suffix of the stack is as follows:
 ## HELP 
 ##
-commands: IDENTT IDB WAIT 
+commands: IDENTT IDB WAIT
 ##
 ## Ends in an error in state: 94.
 ##
@@ -294,7 +294,7 @@ commands: IDENTT IDB WAIT
 ## The known suffix of the stack is as follows:
 ## option(IDENTT) IDB 
 ##
-commands: LIST WAIT 
+commands: LIST WAIT
 ##
 ## Ends in an error in state: 38.
 ##
@@ -304,7 +304,7 @@ commands: LIST WAIT
 ## The known suffix of the stack is as follows:
 ## LIST 
 ##
-commands: TRACE WAIT 
+commands: TRACE WAIT
 ##
 ## Ends in an error in state: 9.
 ##
@@ -314,7 +314,7 @@ commands: TRACE WAIT
 ## The known suffix of the stack is as follows:
 ## TRACE 
 ##
-commands: WAIT WAIT 
+commands: WAIT WAIT
 ##
 ## Ends in an error in state: 1.
 ##
@@ -324,7 +324,7 @@ commands: WAIT WAIT
 ## The known suffix of the stack is as follows:
 ## WAIT 
 ##
-commands: UNSELECT WAIT 
+commands: UNSELECT WAIT
 ##
 ## Ends in an error in state: 5.
 ##
@@ -337,7 +337,7 @@ commands: UNSELECT WAIT

 A semicolon ":" or the keyword "help is expected.

-commands: COMPOSE IDENTT IDENTT AS WAIT 
+commands: COMPOSE IDENTT IDENTT AS WAIT
 ##
 ## Ends in an error in state: 75.
 ##
@@ -349,7 +349,7 @@ commands: COMPOSE IDENTT IDENTT AS WAIT

 An identifier (the name of a new lexicon) is expected.

-commands: COMPOSE IDENTT IDENTT WAIT 
+commands: COMPOSE IDENTT IDENTT WAIT
 ##
 ## Ends in an error in state: 74.
 ##
@@ -361,7 +361,7 @@ commands: COMPOSE IDENTT IDENTT WAIT

 The keyword "as" is expected.

-commands: COMPOSE IDENTT WAIT 
+commands: COMPOSE IDENTT WAIT
 ##
 ## Ends in an error in state: 73.
 ##
@@ -370,7 +370,7 @@ commands: COMPOSE IDENTT WAIT
 ## The known suffix of the stack is as follows:
 ## COMPOSE IDENTT 
 ##
-commands: COMPOSE WAIT 
+commands: COMPOSE WAIT
 ##
 ## Ends in an error in state: 72.
 ##
@@ -380,7 +380,7 @@ commands: COMPOSE WAIT
 ## The known suffix of the stack is as follows:
 ## COMPOSE 
 ##
-commands: CREATE_LEX IDENTT IDENTT WAIT 
+commands: CREATE_LEX IDENTT IDENTT WAIT
 ##
 ## Ends in an error in state: 67.
 ##
@@ -389,7 +389,7 @@ commands: CREATE_LEX IDENTT IDENTT WAIT
 ## The known suffix of the stack is as follows:
 ## CREATE_LEX IDENTT IDENTT 
 ##
-commands: CREATE_LEX IDENTT WAIT 
+commands: CREATE_LEX IDENTT WAIT
 ##
 ## Ends in an error in state: 66.
 ##
@@ -398,7 +398,7 @@ commands: CREATE_LEX IDENTT WAIT
 ## The known suffix of the stack is as follows:
 ## CREATE_LEX IDENTT 
 ##
-commands: CREATE_LEX WAIT 
+commands: CREATE_LEX WAIT
 ##
 ## Ends in an error in state: 65.
 ##
@@ -410,7 +410,7 @@ commands: CREATE_LEX WAIT

 An identifier (the name of a lexicon) or the command "help" are expected.

-commands: CREATE_SIG WAIT 
+commands: CREATE_SIG WAIT
 ##
 ## Ends in an error in state: 62.
 ##
@@ -422,7 +422,7 @@ commands: CREATE_SIG WAIT

 An identifier (the name of a signature) or the command "help" are expected.

-commands: DONT UNSELECT 
+commands: DONT UNSELECT
 ##
 ## Ends in an error in state: 53.
 ##
@@ -437,7 +437,7 @@ commands: DONT UNSELECT

 The command "trace" or "wait" is expected.

-commands: IDENTT IDENTT WAIT 
+commands: IDENTT IDENTT WAIT
 ##
 ## Ends in an error in state: 45.
 ##
@@ -450,7 +450,7 @@ commands: IDENTT IDENTT WAIT

 The commands "save", "check", "realize" (and the deprecated "analyse" and "realize_show") are expected.

-commands: IDENTT WAIT 
+commands: IDENTT WAIT
 ##
 ## Ends in an error in state: 42.
 ##
@@ -466,7 +466,7 @@ commands: IDENTT WAIT

 A command is expected after an identifier.

-commands: SELECT WAIT 
+commands: SELECT WAIT
 ##
 ## Ends in an error in state: 13.
 ##
@@ -479,7 +479,7 @@ commands: SELECT WAIT

 An identifier (the name of a signature or of a lexicon) or the command "help" are expected.

-commands: SEMICOLONN 
+commands: SEMICOLONN
 ##
 ## Ends in an error in state: 0.
 ##

--- a/src/scripting/messages.ml
+++ b/src/scripting/messages.ml

-(* This file was auto-generated based on "command_parser.messages.new". *)
+(* This file was auto-generated based on "command_parser.messages". *)

 (* Please note that the function [message] can raise [Not_found]. *)