Fix regression in feature_buster

due to incompatibility with newer versions of opengeode

c/build_ada_skeletons.c

@@ -426,7 +426,8 @@ void GW_Ada_Backend(FV * fv)
     if (fv->system_ast->context->onlycv)
         return;
 
-    if (ada == fv->language || qgenada == fv->language) {
+    if ((ada == fv->language && sdl != fv->original_language)
+            || qgenada == fv->language) {
 
         /* Create the files and add headers */
         Init_Ada_GW_Backend(fv);

c/c_ast_construction.c

@@ -164,8 +164,16 @@ void Set_Property (char *name, char *val)
 
 void Set_Language_To_SDL()
 {
-    if (NULL != fv)
+    if (NULL != fv) {
+        // During the build the language will be changed to Ada
+        // so we keep a trace of the original language set in the
+        // model, if any backend needs it.
+        // The skeleton generation needs it to avoid overwriting the
+        // .ads file generated by opengeode.
         fv->language = sdl;
+        fv->original_language = sdl;
+    }
+
 }
 
 void Set_Language_To_CPP()
@@ -241,8 +249,10 @@ void Set_Language_To_Scade()
 
 void Set_Language_To_Ada()
 {
-    if (NULL != fv)
+    if (NULL != fv) {
         fv->language = ada;
+        fv->original_language = ada;
+    }
 }
 
 void Set_Language_To_GUI()

include/my_types.h

@@ -244,6 +244,7 @@ typedef struct t_fv {
   struct                 t_system *system_ast;
   Nature                 runtime_nature;
   Language               language;
+  Language               original_language;  // keep track of SDL
   char                   *zipfile;
   Interface_list         *interfaces;
   struct t_process       *process;