Removed GnoDruid code, replaced with simple printf.

Also added a comment for those who might be interested in an improved
implementation that uses GtkAssistant. GnoDruid is already considered
depricated and should be replaced anyways. Due to lack of GnoDruid on
OS X we decided to remove the dependency all together until a better
implementation is available.
This commit is contained in:
Piotr Esden-Tempski
2015-03-16 15:38:24 -07:00
committed by Felix Ruess
parent d0ec9d7bbf
commit f21932a529
+10 -33
View File
@@ -180,43 +180,20 @@ let conf_is_set = fun home ->
Sys.file_exists (home // "conf") &&
Sys.file_exists (home // "data")
let druid = fun home ->
let w = GWindow.window ~title:"Configuring Paparazzi" () in
let d = GnoDruid.druid ~packing:w#add () in
ignore (d#connect#cancel (fun () -> exit 1));
begin
let fp = GnoDruid.druid_page_edge ~position:`START ~aa:true ~title:"Configure Paparazzi !!" () in
fp#set_text (sprintf "Configuration files need to be installed in your Paparazzi home (%s). To use another directory, please exit this utility, set the PAPARAZZI_HOME variable to the desired folder and restart." home);
d#append_page fp;
ignore (fp#connect#next
(fun _ ->
basic_command prerr_endline "" "init";
false
))
end;
begin
let ep = GnoDruid.druid_page_edge ~position:`FINISH ~aa:true ~title:"The end" () in
ep#set_text "You are ready. Congratulations!" ;
d#append_page ep ;
ignore (ep#connect#finish
(fun _ ->
w#destroy ();
GMain.quit ()
))
end;
w#show ();
GMain.main ()
(* This was the place where GnoDruid used to create a wizard configuring your
* paparazzi installation. This could be replaced with an implementation using
* GtkAssistant instead. The issue tracking this can be found at:
* https://github.com/paparazzi/paparazzi/issues/923
*)
let _ =
let home = Env.paparazzi_home in
if not (conf_is_set home) then
druid home
printf "ERROR: Configuration files need to be installed in your \
Paparazzi home (%s). Run `make init` in the toplevel paparazzi \
directory to do that in your Paparazzi home (%s) directory. To \
use another directory, set the PAPARAZZI_HOME variable to the \
desired folder.\n" home home
let conf_xml_file = conf_dir // "conf.xml"
let backup_xml_file = conf_xml_file ^ "~"