Now we will try to build simulators the same way

radio/src/targets/simu/CMakeLists.txt

@@ -8,15 +8,14 @@ add_definitions(-DSIMU)
 remove_definitions(-DCLI)
 
 if(Qt5Widgets_FOUND)
-  string(TOLOWER ${TRANSLATIONS} TRANSLATION_LOWERCASE)
+  set(SIMULATOR_FLAVOUR opentx-${FLAVOUR})
-  set(SIMULATOR_FLAVOUR opentx-${FLAVOUR}-${TRANSLATION_LOWERCASE})
   set(SIMULATOR_TARGET ${SIMULATOR_FLAVOUR}-simulator)
   add_definitions(-DSIMULATOR_FLAVOUR="${SIMULATOR_FLAVOUR}")
   include_directories(${COMPANION_SRC_DIRECTORY} ${COMPANION_SRC_DIRECTORY}/simulation)
   add_library(${SIMULATOR_TARGET} SHARED ${SIMU_SRC} opentxsimulator.cpp)
   add_dependencies(${SIMULATOR_TARGET} ${FIRMWARE_DEPENDENCIES})
   qt5_use_modules(${SIMULATOR_TARGET} Core)
-  add_custom_target(opentx-simulator DEPENDS ${SIMULATOR_TARGET})
+  add_custom_target(libsimulator DEPENDS ${SIMULATOR_TARGET})
 endif()
 
 if(MSVC)

radio/util/build.py

@@ -24,20 +24,18 @@ BOARD_HORUS = 4
 BOARD_FAMILY_AVR = 0
 BOARD_FAMILY_ARM = 1
 
-if len(sys.argv) != 2:
+if len(sys.argv) != 3:
     exit(INVALID_FIRMWARE)
 
-srcdir = os.path.dirname(os.path.realpath(__file__)) + "/../.."
+what = sys.argv[1]
-directory, filename = os.path.split(sys.argv[1])
+directory, filename = os.path.split(sys.argv[2])
 root, ext = os.path.splitext(filename)
 options = root.split("-")
 
 if len(options) < 2 or options[0] != "opentx":
     exit(INVALID_FIRMWARE)
 
-filename = "opentx-"
 optcount = 1
-
 command_options = {}
 
 if options[optcount] == "9x":
@@ -130,7 +128,19 @@ elif options[optcount] == "horus":
 else:
     exit(INVALID_BOARD)
 
-filename += options[optcount]
+if what == "firmware":
+    if board_family == BOARD_FAMILY_ARM:
+        ext = ".bin"
+    else:
+        ext = ".hex"
+    target = "firmware" + ext
+    filename = "opentx"
+elif what == "libsimulator":
+    ext = ".so"
+    target = "libopentx-" + options[optcount] + "-simulator.so"
+    filename = "libopentx"
+
+filename += "-" + options[optcount]
 optcount += 1
 
 # The firmware options
@@ -158,15 +168,9 @@ for key in languages:
 if not language:
     exit(INVALID_LANGUAGE)
 command_options["TRANSLATIONS"] = language.upper()
-filename += "-" + language
-
-if board_family == BOARD_FAMILY_ARM:
-    ext = ".bin"
-else:
-    ext = ".hex"
-filename += ext
-firmware = "firmware" + ext
 
+filename += "-" + language + ext
+srcdir = os.path.dirname(os.path.realpath(__file__)) + "/../.."
 path = os.path.join(directory, filename)
 outpath = path + ".out"
 errpath = path + ".err"
@@ -190,8 +194,8 @@ if not os.path.isfile(path):
         file(errpath, "w").write(output + error)
         exit(COMPILATION_ERROR)
 
-    # Launch make firmware
+    # Launch make
-    cmd = ["make", "firmware"]
+    cmd = ["make", what]
     proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     output, error = proc.communicate()
     if proc.returncode == 0:
@@ -200,17 +204,19 @@ if not os.path.isfile(path):
         file(errpath, "w").write(output + error)
         exit(COMPILATION_ERROR)
 
-    # Check binary size
+    if what == "firmware":
-    if board_family == BOARD_FAMILY_ARM:
+        # Check binary size
-        size = os.stat(firmware).st_size
+        if board_family == BOARD_FAMILY_ARM:
-    else:
+            size = os.stat(firmware).st_size
-        size = subprocess.check_output('avr-size -A %s | grep Total | cut -f2- -d " "' % firmware, shell=True)
+        else:
-        size = int(size.strip())
+            size = subprocess.check_output('avr-size -A %s | grep Total | cut -f2- -d " "' % firmware, shell=True)
-    if size > maxsize:
+            size = int(size.strip())
-        exit(FIRMWARE_SIZE_TOO_BIG)
+        if size > maxsize:
+            exit(FIRMWARE_SIZE_TOO_BIG)
+
 
     # Copy binary to the binaries directory
-    shutil.copyfile(firmware, path)
+    shutil.copyfile(target, path)
 
 print filename
 exit(0)