Include translator sources in clean CMake builds

Author: shai-almog

vm/ByteCodeTranslator/src/com/codename1/tools/translator/ByteCodeTranslator.java

@@ -242,12 +242,6 @@ private static void handleCleanOutput(ByteCodeTranslator b, File[] sources, File
         }
         File xmlvm = new File(srcRoot, "xmlvm.h");
         copy(ByteCodeTranslator.class.getResourceAsStream("/xmlvm.h"), new FileOutputStream(xmlvm));
-        File cn1GlobalsC = new File(srcRoot, "cn1_globals.c");
-        copy(ByteCodeTranslator.class.getResourceAsStream("/cn1_globals.m"), new FileOutputStream(cn1GlobalsC));
-        File nativeMethods = new File(srcRoot, "nativeMethods.c");
-        copy(ByteCodeTranslator.class.getResourceAsStream("/nativeMethods.m"), new FileOutputStream(nativeMethods));
-        File javaIoFileC = new File(srcRoot, "java_io_File.c");
-        copy(ByteCodeTranslator.class.getResourceAsStream("/java_io_File.m"), new FileOutputStream(javaIoFileC));
 
         Parser.writeOutput(srcRoot);
 
@@ -563,20 +557,40 @@ public boolean accept(File pathname, String string) {
 
     private static void writeCmakeProject(File projectRoot, File srcRoot, String appName) throws IOException {
         File cmakeLists = new File(projectRoot, "CMakeLists.txt");
+        File translatorSourcesRoot = resolveTranslatorSourcesRoot();
         FileWriter writer = new FileWriter(cmakeLists);
         try {
             writer.append("cmake_minimum_required(VERSION 3.10)\n");
             writer.append("project(").append(appName).append(" LANGUAGES C OBJC)\n");
             writer.append("enable_language(OBJC OPTIONAL)\n");
             writer.append("set(CMAKE_C_STANDARD 99)\n");
-            writer.append("file(GLOB TRANSLATOR_SOURCES \"").append(srcRoot.getName()).append("/*.c\" \"").append(srcRoot.getName()).append("/*.m\")\n");
-            writer.append("file(GLOB TRANSLATOR_HEADERS \"").append(srcRoot.getName()).append("/*.h\")\n");
+            writer.append("set(CN1_TRANSLATOR_SOURCE_ROOT \"")
+                    .append(escapeCmakePath(translatorSourcesRoot.getAbsolutePath()))
+                    .append("\")\n");
+            writer.append("file(GLOB TRANSLATOR_SOURCES \"").append(srcRoot.getName()).append("/*.c\" \"")
+                    .append(srcRoot.getName()).append("/*.m\" \"${CN1_TRANSLATOR_SOURCE_ROOT}/*.c\" \"")
+                    .append("${CN1_TRANSLATOR_SOURCE_ROOT}/*.m\")\n");
+            writer.append("file(GLOB TRANSLATOR_HEADERS \"").append(srcRoot.getName()).append("/*.h\" \"")
+                    .append("${CN1_TRANSLATOR_SOURCE_ROOT}/*.h\")\n");
             writer.append("add_library(${PROJECT_NAME} ${TRANSLATOR_SOURCES} ${TRANSLATOR_HEADERS})\n");
-            writer.append("target_include_directories(${PROJECT_NAME} PUBLIC ").append(srcRoot.getName()).append(")\n");
+            writer.append("target_include_directories(${PROJECT_NAME} PUBLIC ").append(srcRoot.getName())
+                    .append(" ${CN1_TRANSLATOR_SOURCE_ROOT})\n");
         } finally {
             writer.close();
         }
     }
+
+    private static File resolveTranslatorSourcesRoot() {
+        try {
+            return new File(ByteCodeTranslator.class.getResource("/cn1_globals.h").toURI()).getParentFile();
+        } catch (Exception e) {
+            throw new RuntimeException("Failed to resolve ByteCodeTranslator source root", e);
+        }
+    }
+
+    private static String escapeCmakePath(String path) {
+        return path.replace("\\", "\\\\");
+    }
 
     private static String getFileType(String s) {
         if(s.endsWith(".framework")) {

vm/tests/src/test/java/com/codename1/tools/translator/FileClassIntegrationTest.java

@@ -72,8 +72,6 @@ public void testFileClassMethods(CompilerHelper.CompilerConfig config) throws Ex
         Path srcRoot = distDir.resolve("FileTestApp-src");
         CleanTargetIntegrationTest.patchCn1Globals(srcRoot);
 
-        assertTrue(Files.exists(srcRoot.resolve("java_io_File.c")), "java_io_File.c should exist");
-
         replaceLibraryWithExecutableTarget(cmakeLists, srcRoot.getFileName().toString());
 
         Path buildDir = distDir.resolve("build");