From c5d4ad1c98c1434b95a8a9b1c8697dd36cf39623 Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Tue, 20 Apr 2004 09:27:36 +0000 Subject: [PATCH] renamed mathita to matita --- helm/mathita/.cvsignore | 4 -- helm/mathita/.depend | 9 ---- helm/mathita/Makefile | 43 --------------- helm/matita/.cvsignore | 11 ++++ helm/matita/.depend | 9 ++++ helm/matita/Makefile.in | 53 +++++++++++++++++++ helm/matita/buildTimeConf.ml.in | 0 helm/matita/configure.ac | 31 +++++++++++ .../matita.conf.xml.sample} | 4 +- .../mathita.glade => matita/matita.glade} | 6 +-- .../mathita.gladep => matita/matita.gladep} | 4 +- helm/{mathita/mathita.ml => matita/matita.ml} | 16 +++--- .../matitaGeneratedGui.ml} | 20 +++---- .../matitaGeneratedGui.mli} | 0 .../matitaGtkMisc.ml} | 0 .../matitaGtkMisc.mli} | 0 .../mathitaGui.ml => matita/matitaGui.ml} | 4 +- .../mathitaGui.mli => matita/matitaGui.mli} | 18 +++---- 18 files changed, 140 insertions(+), 92 deletions(-) delete mode 100644 helm/mathita/.cvsignore delete mode 100644 helm/mathita/.depend delete mode 100644 helm/mathita/Makefile create mode 100644 helm/matita/.cvsignore create mode 100644 helm/matita/.depend create mode 100644 helm/matita/Makefile.in create mode 100644 helm/matita/buildTimeConf.ml.in create mode 100644 helm/matita/configure.ac rename helm/{mathita/mathita.conf.xml.sample => matita/matita.conf.xml.sample} (64%) rename helm/{mathita/mathita.glade => matita/matita.glade} (99%) rename helm/{mathita/mathita.gladep => matita/matita.gladep} (77%) rename helm/{mathita/mathita.ml => matita/matita.ml} (90%) rename helm/{mathita/mathitaGeneratedGui.ml => matita/matitaGeneratedGui.ml} (96%) rename helm/{mathita/mathitaGeneratedGui.mli => matita/matitaGeneratedGui.mli} (100%) rename helm/{mathita/mathitaGtkMisc.ml => matita/matitaGtkMisc.ml} (100%) rename helm/{mathita/mathitaGtkMisc.mli => matita/matitaGtkMisc.mli} (100%) rename helm/{mathita/mathitaGui.ml => matita/matitaGui.ml} (98%) rename helm/{mathita/mathitaGui.mli => matita/matitaGui.mli} (71%) diff --git a/helm/mathita/.cvsignore b/helm/mathita/.cvsignore deleted file mode 100644 index bba30b067..000000000 --- a/helm/mathita/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -mathita -*.cm[aiox] -*.cmxa -*.[ao] diff --git a/helm/mathita/.depend b/helm/mathita/.depend deleted file mode 100644 index 1fea79aff..000000000 --- a/helm/mathita/.depend +++ /dev/null @@ -1,9 +0,0 @@ -mathitaGeneratedGui.cmo: mathitaGeneratedGui.cmi -mathitaGeneratedGui.cmx: mathitaGeneratedGui.cmi -mathitaGtkMisc.cmo: mathitaGtkMisc.cmi -mathitaGtkMisc.cmx: mathitaGtkMisc.cmi -mathitaGui.cmo: mathitaGeneratedGui.cmi mathitaGtkMisc.cmi mathitaGui.cmi -mathitaGui.cmx: mathitaGeneratedGui.cmx mathitaGtkMisc.cmx mathitaGui.cmi -mathita.cmo: mathitaGeneratedGui.cmi mathitaGui.cmi -mathita.cmx: mathitaGeneratedGui.cmx mathitaGui.cmx -mathitaGui.cmi: mathitaGeneratedGui.cmi mathitaGtkMisc.cmi diff --git a/helm/mathita/Makefile b/helm/mathita/Makefile deleted file mode 100644 index 59cbbea6f..000000000 --- a/helm/mathita/Makefile +++ /dev/null @@ -1,43 +0,0 @@ - -OCAMLFIND = ocamlfind -REQUIRES = lablgtk2.glade helm-registry -OCAML_FLAGS = -package "$(REQUIRES)" -pp camlp4o -OCAML_THREADS_FLAGS = -thread -OCAML_DEBUG_FLAGS = -OCAMLC = $(OCAMLFIND) ocamlc $(OCAML_FLAGS) $(OCAML_THREADS_FLAGS) $(OCAML_DEBUG_FLAGS) -OCAMLOPT = $(OCAMLFIND) opt $(OCAML_FLAGS) $(OCAML_THREADS_FLAGS) $(OCAML_DEBUG_FLAGS) -OCAMLDEP = $(OCAMLFIND) ocamldep $(OCAML_FLAGS) -LABLGLADECC = lablgladecc2 -CMOS = \ - mathitaGeneratedGui.cmo \ - mathitaGtkMisc.cmo \ - mathitaGui.cmo - -all: mathita - -mathita: $(CMOS) mathita.ml - $(OCAMLC) -linkpkg -o $@ $^ - -mathitaGeneratedGui.ml mathitaGeneratedGui.mli: mathita.glade - $(LABLGLADECC) $< > $@ - $(OCAMLC) -i mathitaGeneratedGui.ml > mathitaGeneratedGui.mli - -%.cmi: %.mli - $(OCAMLC) -c $< -%.cmo %.cmi: %.ml - $(OCAMLC) -c $< -%.cmx: %.ml - $(OCAMLOPT) -c $< -%.ml %.mli: %.mly - $(OCAMLYACC) $< - -clean: - rm -rf *.cm[aoix] *.cmxa *.[ao] mathita -distclean: clean - rm -f mathitaGeneratedGui.ml - -depend: mathitaGeneratedGui.ml - $(OCAMLDEP) *.ml *.mli > .depend - -include .depend - diff --git a/helm/matita/.cvsignore b/helm/matita/.cvsignore new file mode 100644 index 000000000..ef69ec2b7 --- /dev/null +++ b/helm/matita/.cvsignore @@ -0,0 +1,11 @@ +Makefile +buildTimeConf.ml +config.status +configure +config.log +autom4te.cache +matita +matita.opt +*.cm[aiox] +*.cmxa +*.[ao] diff --git a/helm/matita/.depend b/helm/matita/.depend new file mode 100644 index 000000000..d6894d903 --- /dev/null +++ b/helm/matita/.depend @@ -0,0 +1,9 @@ +matitaGeneratedGui.cmo: matitaGeneratedGui.cmi +matitaGeneratedGui.cmx: matitaGeneratedGui.cmi +matitaGtkMisc.cmo: matitaGtkMisc.cmi +matitaGtkMisc.cmx: matitaGtkMisc.cmi +matitaGui.cmo: matitaGeneratedGui.cmi matitaGtkMisc.cmi matitaGui.cmi +matitaGui.cmx: matitaGeneratedGui.cmx matitaGtkMisc.cmx matitaGui.cmi +matita.cmo: matitaGeneratedGui.cmi matitaGui.cmi +matita.cmx: matitaGeneratedGui.cmx matitaGui.cmx +matitaGui.cmi: matitaGeneratedGui.cmi matitaGtkMisc.cmi diff --git a/helm/matita/Makefile.in b/helm/matita/Makefile.in new file mode 100644 index 000000000..02686b0fb --- /dev/null +++ b/helm/matita/Makefile.in @@ -0,0 +1,53 @@ + +OCAMLFIND = @OCAMLFIND@ +CAMLP4O = @CAMLP4O@ +LABLGLADECC = @LABLGLADECC@ + +REQUIRES = lablgtk2.glade helm-registry +OCAML_FLAGS = -package "$(REQUIRES)" -pp $(CAMLP4O) +OCAML_THREADS_FLAGS = -thread +OCAML_DEBUG_FLAGS = +OCAMLC = $(OCAMLFIND) ocamlc $(OCAML_FLAGS) $(OCAML_THREADS_FLAGS) $(OCAML_DEBUG_FLAGS) +OCAMLOPT = $(OCAMLFIND) opt $(OCAML_FLAGS) $(OCAML_THREADS_FLAGS) $(OCAML_DEBUG_FLAGS) +OCAMLDEP = $(OCAMLFIND) ocamldep $(OCAML_FLAGS) +CMOS = \ + buildTimeConf.cmo \ + matitaGeneratedGui.cmo \ + matitaGtkMisc.cmo \ + matitaGui.cmo +CMXS = $(patsubst %.cmo,%.cmx,$(CMOS)) + +all: matita +opt: matita.opt + +matita: $(CMOS) matita.ml + $(OCAMLC) -linkpkg -o $@ $^ +matita.opt: $(CMXS) matita.ml + $(OCAMLOPT) -linkpkg -o $@ $^ + +matitaGeneratedGui.ml matitaGeneratedGui.mli: matita.glade + $(LABLGLADECC) $< > $@ + $(OCAMLC) -i matitaGeneratedGui.ml > matitaGeneratedGui.mli + +%.cmi: %.mli + $(OCAMLC) -c $< +%.cmo %.cmi: %.ml + $(OCAMLC) -c $< +%.cmx: %.ml + $(OCAMLOPT) -c $< + +clean: + rm -rf *.cma *.cmo *.cmi *.cmx *.cmxa *.a *.o matita matita.opt +distclean: clean + rm -f matitaGeneratedGui.ml matitaGeneratedGui.mli + rm -f config.log config.status configure Makefile buildTimeConf.ml + rm -f matita.glade.bak matita.gladep.bak + rm -rf autom4te.cache/ + +depend: matitaGeneratedGui.ml matitaGeneratedGui.mli + $(OCAMLDEP) *.ml *.mli > .depend + +include .depend + +.PHONY: all opt clean distclean depend + diff --git a/helm/matita/buildTimeConf.ml.in b/helm/matita/buildTimeConf.ml.in new file mode 100644 index 000000000..e69de29bb diff --git a/helm/matita/configure.ac b/helm/matita/configure.ac new file mode 100644 index 000000000..cc0c50349 --- /dev/null +++ b/helm/matita/configure.ac @@ -0,0 +1,31 @@ +AC_INIT(matita.ml) + +AC_CHECK_PROG(HAVE_OCAMLFIND, ocamlfind, yes, no) +if test $HAVE_OCAMLFIND = "yes"; then + OCAMLFIND="ocamlfind" +else + AC_MSG_ERROR(could not find ocamlfind) +fi + +AC_CHECK_PROG(HAVE_LABLGLADECC, lablgladecc2, yes, no) +if test $HAVE_LABLGLADECC = "yes"; then + LABLGLADECC="lablgladecc2" +else + AC_MSG_ERROR(could not find lablgladecc2) +fi + +AC_CHECK_PROG(HAVE_CAMLP4O, camlp4o, yes, no) +if test $HAVE_CAMLP4O = "yes"; then + CAMLP4O="camlp4o" +else + AC_MSG_ERROR(could not find camlp4o) +fi + +AC_SUBST(OCAMLFIND) +AC_SUBST(CAMLP4O) +AC_SUBST(LABLGLADECC) + +AC_OUTPUT([ + buildTimeConf.ml + Makefile +]) diff --git a/helm/mathita/mathita.conf.xml.sample b/helm/matita/matita.conf.xml.sample similarity index 64% rename from helm/mathita/mathita.conf.xml.sample rename to helm/matita/matita.conf.xml.sample index e9d4576b1..751fed97d 100644 --- a/helm/mathita/mathita.conf.xml.sample +++ b/helm/matita/matita.conf.xml.sample @@ -1,7 +1,7 @@ -
- mathita.glade +
+ matita.glade true
diff --git a/helm/mathita/mathita.glade b/helm/matita/matita.glade similarity index 99% rename from helm/mathita/mathita.glade rename to helm/matita/matita.glade index cc299bad6..6eba147fd 100644 --- a/helm/mathita/mathita.glade +++ b/helm/matita/matita.glade @@ -5,7 +5,7 @@ True - Mathita + Matita GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -338,7 +338,7 @@ - Mathita: current proof + Matita: current proof GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -563,7 +563,7 @@ - Mathita: about + Matita: about GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER True diff --git a/helm/mathita/mathita.gladep b/helm/matita/matita.gladep similarity index 77% rename from helm/mathita/mathita.gladep rename to helm/matita/matita.gladep index 996d23c10..cc3340fc9 100644 --- a/helm/mathita/mathita.gladep +++ b/helm/matita/matita.gladep @@ -2,7 +2,7 @@ - Mathita - mathita + Matita + matita FALSE diff --git a/helm/mathita/mathita.ml b/helm/matita/matita.ml similarity index 90% rename from helm/mathita/mathita.ml rename to helm/matita/matita.ml index f22a035a5..5056a88a2 100644 --- a/helm/mathita/mathita.ml +++ b/helm/matita/matita.ml @@ -30,9 +30,9 @@ let not_implemented feature = raise (Not_implemented feature) exception Failure of string let error s = raise (Failure s) -let _ = Helm_registry.load_from "mathita.conf.xml" +let _ = Helm_registry.load_from "matita.conf.xml" let _ = GMain.Main.init () -let gui = new MathitaGui.gui (Helm_registry.get "mathita.glade_file") +let gui = new MatitaGui.gui (Helm_registry.get "matita.glade_file") let interactive_user_uri_choice ~(selection_mode:[`MULTIPLE|`SINGLE]) ?(nonvars_button=false) ~title ~msg @@ -45,7 +45,7 @@ let interactive_user_uri_choice uris) in if (selection_mode <> `SINGLE) && - (Helm_registry.get_bool "mathita.auto_disambiguation") + (Helm_registry.get_bool "matita.auto_disambiguation") then Lazy.force only_constant_choices else begin @@ -67,7 +67,7 @@ let interactive_user_uri_choice let id2 = win#uriChoiceAutoButton#connect#clicked (fun _ -> use_only_constants := true ; - Helm_registry.set_bool "mathita.auto_disambiguation" true; + Helm_registry.set_bool "matita.auto_disambiguation" true; !bye ()) in let id3 = @@ -107,8 +107,8 @@ module DisambiguateCallbacks = let debugDialog () = let dialog = - new MathitaGeneratedGui.debug - ~file:(Helm_registry.get "mathita.glade_file") () + new MatitaGeneratedGui.debug + ~file:(Helm_registry.get "matita.glade_file") () in let retval = ref None in let return v = @@ -144,8 +144,8 @@ let _ = List.iter prerr_endline uris; print_newline ()) let _ = gui#main#debugMenuItem1#connect#activate (fun _ -> - Helm_registry.set_bool "mathita.auto_disambiguation" - (not (Helm_registry.get_bool "mathita.auto_disambiguation"))) + Helm_registry.set_bool "matita.auto_disambiguation" + (not (Helm_registry.get_bool "matita.auto_disambiguation"))) let _ = (* gui#uriChoices#easy_append "pippo"; *) diff --git a/helm/mathita/mathitaGeneratedGui.ml b/helm/matita/matitaGeneratedGui.ml similarity index 96% rename from helm/mathita/mathitaGeneratedGui.ml rename to helm/matita/matitaGeneratedGui.ml index 2b2e03ded..f912ef0f9 100644 --- a/helm/mathita/mathitaGeneratedGui.ml +++ b/helm/matita/matitaGeneratedGui.ml @@ -1,6 +1,6 @@ -(* Automatically generated from mathita.glade by lablgladecc *) +(* Automatically generated from matita.glade by lablgladecc *) -class mainWin ?(file="mathita.glade") ?domain ?autoconnect(*=true*) () = +class mainWin ?(file="matita.glade") ?domain ?autoconnect(*=true*) () = let xmldata = Glade.create ~file ~root:"MainWin" ?domain () in object (self) inherit Glade.xml ?autoconnect xmldata @@ -157,7 +157,7 @@ class mainWin ?(file="mathita.glade") ?domain ?autoconnect(*=true*) () = toplevel#destroy () method check_widgets () = () end -class proofWin ?(file="mathita.glade") ?domain ?autoconnect(*=true*) () = +class proofWin ?(file="matita.glade") ?domain ?autoconnect(*=true*) () = let xmldata = Glade.create ~file ~root:"ProofWin" ?domain () in object (self) inherit Glade.xml ?autoconnect xmldata @@ -186,7 +186,7 @@ class proofWin ?(file="mathita.glade") ?domain ?autoconnect(*=true*) () = toplevel#destroy () method check_widgets () = () end -class fileSelectionWin ?(file="mathita.glade") ?domain ?autoconnect(*=true*) () = +class fileSelectionWin ?(file="matita.glade") ?domain ?autoconnect(*=true*) () = let xmldata = Glade.create ~file ~root:"FileSelectionWin" ?domain () in object (self) inherit Glade.xml ?autoconnect xmldata @@ -208,7 +208,7 @@ class fileSelectionWin ?(file="mathita.glade") ?domain ?autoconnect(*=true*) () method ok_button1 = ok_button1 method check_widgets () = () end -class toolBarWin ?(file="mathita.glade") ?domain ?autoconnect(*=true*) () = +class toolBarWin ?(file="matita.glade") ?domain ?autoconnect(*=true*) () = let xmldata = Glade.create ~file ~root:"ToolBarWin" ?domain () in object (self) inherit Glade.xml ?autoconnect xmldata @@ -249,7 +249,7 @@ class toolBarWin ?(file="mathita.glade") ?domain ?autoconnect(*=true*) () = toplevel#destroy () method check_widgets () = () end -class genericDialog ?(file="mathita.glade") ?domain ?autoconnect(*=true*) () = +class genericDialog ?(file="matita.glade") ?domain ?autoconnect(*=true*) () = let xmldata = Glade.create ~file ~root:"GenericDialog" ?domain () in object (self) inherit Glade.xml ?autoconnect xmldata @@ -278,7 +278,7 @@ class genericDialog ?(file="mathita.glade") ?domain ?autoconnect(*=true*) () = toplevel#destroy () method check_widgets () = () end -class aboutWin ?(file="mathita.glade") ?domain ?autoconnect(*=true*) () = +class aboutWin ?(file="matita.glade") ?domain ?autoconnect(*=true*) () = let xmldata = Glade.create ~file ~root:"AboutWin" ?domain () in object (self) inherit Glade.xml ?autoconnect xmldata @@ -303,7 +303,7 @@ class aboutWin ?(file="mathita.glade") ?domain ?autoconnect(*=true*) () = toplevel#destroy () method check_widgets () = () end -class uriChoiceDialog ?(file="mathita.glade") ?domain ?autoconnect(*=true*) () = +class uriChoiceDialog ?(file="matita.glade") ?domain ?autoconnect(*=true*) () = let xmldata = Glade.create ~file ~root:"UriChoiceDialog" ?domain () in object (self) inherit Glade.xml ?autoconnect xmldata @@ -400,7 +400,7 @@ class uriChoiceDialog ?(file="mathita.glade") ?domain ?autoconnect(*=true*) () = toplevel#destroy () method check_widgets () = () end -class interpChoiceDialog ?(file="mathita.glade") ?domain ?autoconnect(*=true*) () = +class interpChoiceDialog ?(file="matita.glade") ?domain ?autoconnect(*=true*) () = let xmldata = Glade.create ~file ~root:"InterpChoiceDialog" ?domain () in object (self) inherit Glade.xml ?autoconnect xmldata @@ -441,7 +441,7 @@ class interpChoiceDialog ?(file="mathita.glade") ?domain ?autoconnect(*=true*) ( toplevel#destroy () method check_widgets () = () end -class debug ?(file="mathita.glade") ?domain ?autoconnect(*=true*) () = +class debug ?(file="matita.glade") ?domain ?autoconnect(*=true*) () = let xmldata = Glade.create ~file ~root:"Debug" ?domain () in object (self) inherit Glade.xml ?autoconnect xmldata diff --git a/helm/mathita/mathitaGeneratedGui.mli b/helm/matita/matitaGeneratedGui.mli similarity index 100% rename from helm/mathita/mathitaGeneratedGui.mli rename to helm/matita/matitaGeneratedGui.mli diff --git a/helm/mathita/mathitaGtkMisc.ml b/helm/matita/matitaGtkMisc.ml similarity index 100% rename from helm/mathita/mathitaGtkMisc.ml rename to helm/matita/matitaGtkMisc.ml diff --git a/helm/mathita/mathitaGtkMisc.mli b/helm/matita/matitaGtkMisc.mli similarity index 100% rename from helm/mathita/mathitaGtkMisc.mli rename to helm/matita/matitaGtkMisc.mli diff --git a/helm/mathita/mathitaGui.ml b/helm/matita/matitaGui.ml similarity index 98% rename from helm/mathita/mathitaGui.ml rename to helm/matita/matitaGui.ml index 957c5edcc..16af24434 100644 --- a/helm/mathita/mathitaGui.ml +++ b/helm/matita/matitaGui.ml @@ -41,8 +41,8 @@ class stringListModel' uriChoiceDialog = end *) -open MathitaGeneratedGui -open MathitaGtkMisc +open MatitaGeneratedGui +open MatitaGtkMisc class gui file = (* creation order _is_ relevant for windows placement *) diff --git a/helm/mathita/mathitaGui.mli b/helm/matita/matitaGui.mli similarity index 71% rename from helm/mathita/mathitaGui.mli rename to helm/matita/matitaGui.mli index 4dcc0a5d7..734f1cefe 100644 --- a/helm/mathita/mathitaGui.mli +++ b/helm/matita/matitaGui.mli @@ -38,18 +38,18 @@ class gui : method setQuitCallback : (unit -> unit) -> unit - method uriChoices: MathitaGtkMisc.stringListModel + method uriChoices: MatitaGtkMisc.stringListModel (** {2 Access to low-level GTK widgets} *) - method about : MathitaGeneratedGui.aboutWin - method dialog : MathitaGeneratedGui.genericDialog - method fileSel : MathitaGeneratedGui.fileSelectionWin - method interpChoice : MathitaGeneratedGui.interpChoiceDialog - method main : MathitaGeneratedGui.mainWin - method proof : MathitaGeneratedGui.proofWin - method toolbar : MathitaGeneratedGui.toolBarWin - method uriChoice : MathitaGeneratedGui.uriChoiceDialog + method about : MatitaGeneratedGui.aboutWin + method dialog : MatitaGeneratedGui.genericDialog + method fileSel : MatitaGeneratedGui.fileSelectionWin + method interpChoice : MatitaGeneratedGui.interpChoiceDialog + method main : MatitaGeneratedGui.mainWin + method proof : MatitaGeneratedGui.proofWin + method toolbar : MatitaGeneratedGui.toolBarWin + method uriChoice : MatitaGeneratedGui.uriChoiceDialog end -- 2.39.2