[emacs] why.el renamed to why3.el

[GTK sourceview] why.lang renamed to why3.lang

CHANGES

 * marks an incompatible change
 
+  * [emacs] why.el renamed to why3.el
+  * [GTK sourceview] why.lang renamed to why3.lang
 
 version 0.81, March 25, 2013
 ==========================

Makefile.in

@@ -96,9 +96,9 @@ endif
 .PHONY: byte opt clean depend all install install_local install_no_local
 .PHONY: plugins plugins.byte plugins.opt
 
-#############
-# Why library
-#############
+##############
+# Why3 library
+##############
 
 LIBGENERATED = src/util/config.ml src/util/rc.ml src/parser/lexer.ml \
 	       src/parser/parser.mli src/parser/parser.ml \
@@ -215,6 +215,7 @@ install_no_local::
 	mkdir -p $(DATADIR)/why3/images/boomy
 	mkdir -p $(DATADIR)/why3/images/fatcow
 	mkdir -p $(DATADIR)/why3/emacs
+	mkdir -p $(DATADIR)/why3/vim
 	mkdir -p $(DATADIR)/why3/lang
 	mkdir -p $(DATADIR)/why3/theories
 	mkdir -p $(DATADIR)/why3/modules
@@ -229,9 +230,10 @@ install_no_local::
 	cp -f share/images/fatcow/*.png $(DATADIR)/why3/images/fatcow
 	cp -f share/why3session.dtd $(DATADIR)/why3
 	cp -rf share/javascript $(DATADIR)/why3/javascript
-	cp -f share/emacs/why.el $(DATADIR)/why3/emacs/why.el
-	cp -f share/lang/why.lang $(DATADIR)/why3/lang/why.lang
-#	if test -d /etc/bash_completion.d; then cp -f share/bash/why3 /etc/bash_completion.d; fi
+	cp -f share/emacs/why3.el $(DATADIR)/why3/emacs/why3.el
+	cp -f share/vim/why3.vim $(DATADIR)/why3/vim/why3.vim
+	cp -f share/lang/why3.lang $(DATADIR)/why3/lang/why3.lang
+	if test -d /etc/bash_completion.d; then cp -f share/bash/why3 /etc/bash_completion.d; fi
 
 install_no_local_lib::
 	rm -rf $(OCAMLLIB)/why3
@@ -241,8 +243,8 @@ install_no_local_lib::
 
 ifeq (@enable_local@,yes)
 install install-lib:
-	@echo "Why is configured in local installation mode."
-	@echo "To install Why, run ./configure --disable-local ; make ; make install"
+	@echo "Why3 is configured in local installation mode."
+	@echo "To install Why3, run ./configure --disable-local ; make ; make install"
 else
 install: clean_old_install install_no_local
 install-lib: install_no_local_lib
@@ -251,7 +253,7 @@ endif
 install-all: install install-lib
 
 ##################
-# Why plugins
+# Why3 plugins
 ##################
 
 PLUGGENERATED = plugins/tptp/tptp_lexer.ml \
@@ -499,7 +501,7 @@ clean::
 
 local_config: bin/why3config.@OCAMLBEST@
 	WHY3LIB=$(PWD) WHY3DATA=$(PWD)/share bin/why3config.@OCAMLBEST@ \
-		--detect --conf_file why.conf
+		--detect --conf_file why3.conf
 
 install_no_local::
 	cp -f bin/why3config.@OCAMLBEST@ $(BINDIR)/why3config$(EXE)
@@ -1174,14 +1176,14 @@ testl-type: bin/why3.byte
 test-api.byte: examples/use_api/use_api.ml lib/why3/why3.cma
 	$(if $(QUIET),@echo 'Ocaml    $<' &&) \
 	ocaml -I lib/why3 $(INCLUDES) $(EXTCMA) lib/why3/why3.cma $< \
-	|| (rm -f test-api.byte; printf "Test of Why API calls failed. Please fix it"; exit 2)
+	|| (rm -f test-api.byte; printf "Test of Why3 API calls failed. Please fix it"; exit 2)
 	@rm -f test-api.byte;
 
 test-api.opt: examples/use_api/use_api.ml lib/why3/why3.cmxa
 	$(if $(QUIET),@echo 'Ocamlopt $<' &&) \
 	($(OCAMLOPT) -o $@ -I lib/why3 $(INCLUDES) $(EXTCMXA) lib/why3/why3.cmxa $< \
 	&& ./test-api.opt) \
-	|| (rm -f test-api.opt; printf "Test of Why API calls failed. Please fix it"; exit 2)
+	|| (rm -f test-api.opt; printf "Test of Why3 API calls failed. Please fix it"; exit 2)
 	@rm -f test-api.opt
 
 #test-shape: lib/why3/why3.cma
@@ -1191,7 +1193,7 @@ test-session.byte: examples/use_api/create_session.ml lib/why3/why3.cma
 	$(if $(QUIET),@echo 'Ocaml    $<' &&) \
 	ocaml -I lib/why3 $(INCLUDES) $(EXTCMA) lib/why3/why3.cma $< \
 	|| (rm -f why3session.xml;  \
-	printf "Test of Why API calls for Session module failed. Please fix it"; exit 2)
+	printf "Test of Why3 API calls for Session module failed. Please fix it"; exit 2)
 	@rm -f why3session.xml
 
 test-session.opt: examples/use_api/create_session.ml lib/why3/why3.cmxa
@@ -1199,7 +1201,7 @@ test-session.opt: examples/use_api/create_session.ml lib/why3/why3.cmxa
 	($(OCAMLOPT) -o $@ -I lib/why3 $(INCLUDES) $(EXTCMXA) lib/why3/why3.cmxa $< \
 	&& ./test-session.opt) \
 	|| (rm -f test-session.opt why3session.xml; \
-	printf "Test of Why API calls for Session module failed. Please fix it"; exit 2)
+	printf "Test of Why3 API calls for Session module failed. Please fix it"; exit 2)
 	@rm -f test-session.opt why3session.xml
 
 
@@ -1479,7 +1481,7 @@ DISTRIB_FILES = Version Makefile.in configure.in configure \
       share/javascript/themes/default/*.gif \
       share/javascript/themes/default/*.png \
       share/javascript/themes/default/*.css \
-      share/emacs/why.el share/lang/*.lang \
+      share/emacs/why3.el share/lang/*.lang \
       share/images/icons.rc share/images/*.png share/images/*/*.png \
       share/bash/why3 share/zsh/_why3 share/vim/why3.vim
 
@@ -1631,9 +1633,9 @@ depend:
 	rm -f $^
 	$(MAKE) $^
 
-#################################################################
-# Building the Why platform with ocamlbuild (OCaml 3.10 needed) #
-#################################################################
+##################################################################
+# Building the Why3 platform with ocamlbuild (OCaml 3.10 needed) #
+##################################################################
 
 # There used to be targets here but they are no longer useful.
 

share/lang/why.lang → share/lang/why3.lang

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-Copyright (C) 2010-
-  Francois Bobot
-  Jean-Christophe Filliatre
-  Johannes Kanig
-  Andrei Paskevich
+The Why3 Verification Platform   /   The Why3 Development Team
+Copyright 2010-2013   -    INRIA - CNRS - Paris-Sud University
 
-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 under the terms of the GNU Lesser
+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.
 -->
 <!--
  This file was based on ocaml.lang by
  Copyright (C) 2007 Eric Cooper <ecc@cmu.edu>
  Copyright (C) 2007 Eric Norige <thelema314@gmail.com>
 -->
-<language id="why" _name="Why3" version="2.0" _section="Sources">
+<language id="why3" _name="Why3" version="2.0" _section="Sources">
   <metadata>
-    <property name="mimetypes">text/x-why</property>
+    <property name="mimetypes">text/x-why3</property>
     <property name="globs">*.mlw;*.why</property>
     <property name="block-comment-start">(*</property>
     <property name="block-comment-end">*)</property>
@@ -61,7 +54,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
       <match>\%{char-esc}</match>
     </context>
     <!-- here's the main context -->
-    <context id="why">
+    <context id="why3">
       <include>
 	<context id="symbol-star">
 	  <match>\(\*\)</match>
@@ -134,7 +127,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 	  <start>\{</start>
 	  <end>\}</end>
 	  <include>
-	    <context ref="why"/>
+	    <context ref="why3"/>
 	  </include>
 	</context>
 	<context id="badrecord" style-ref="error" extend-parent="false">
@@ -145,7 +138,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 	  <start>\[\|</start>
 	  <end>\|\]</end>
 	  <include>
-	    <context ref="why"/>
+	    <context ref="why3"/>
 	  </include>
 	</context>
 	<context id="badarray" style-ref="error" extend-parent="false">
@@ -155,7 +148,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 	  <start>\[</start>
 	  <end>(?&lt;!\|)\]</end>
 	  <include>
-	    <context ref="why"/>
+	    <context ref="why3"/>
 	  </include>
 	</context>
 	<context id="badlist" style-ref="error" extend-parent="false">

src/ide/gmain.ml

@@ -121,9 +121,9 @@ let (why_lang, any_lang) =
   languages_manager#set_search_path
     (load_path :: languages_manager#search_path);
   let why_lang =
-    match languages_manager#language "why" with
+    match languages_manager#language "why3" with
     | None ->
-        eprintf "language file for 'why' not found in directory %s@."
+        eprintf "language file for 'why3' not found in directory %s@."
           load_path;
         exit 1
     | Some _ as l -> l in