[[ Emscripten ]] Fix emscripten engine

runrevmark · runrevmark · commit 1c9a151eb9f3 · 2017-04-13T14:24:06.000+01:00
This patch makes sure the emscripten engine works with the new
appcode path changes and fixes an issue from the rework of library
loading which meant it failed to run.

In addition, it tweaks the libfoundation gyp file so the emscripten
engine can be built on Mac; and adjusts the testgen script for a
similar reason.
diff --git a/engine/src/em-main.cpp b/engine/src/em-main.cpp
@@ -55,6 +55,10 @@ platform_main(int argc, char *argv[], char *envp[])
 	{
 		MCEmscriptenBootError("Core initialisation");
 	}
+    if (!MCSInitialize())
+    {
+		MCEmscriptenBootError("Core System initialisation");
+    }
 	if (!MCScriptInitialize())
 	{
 		MCEmscriptenBootError("LCB VM initialisation");
diff --git a/libfoundation/libfoundation.gyp b/libfoundation/libfoundation.gyp
@@ -219,7 +219,7 @@
                 
                 # Set java-related defines and includes
                 [
-					'host_os == "mac" and OS != "ios"',
+					'host_os == "mac" and OS != "ios" and OS != "emscripten"',
 					{
 						'defines':
 						[
diff --git a/libfoundation/src/system-library-emscripten.hpp b/libfoundation/src/system-library-emscripten.hpp
@@ -23,47 +23,64 @@
  * Emscripten Handle Class
  * ================================================================ */
 
-/* The __MCSLibraryHandleEmscripten class is a specialization of the POSIX handle
- * implementation. It only supports manipulating the handle returned by passing
- * NULL to dlopen (which is the main executable) as loadable modules are not
- * currently used.
+/* The __MCSLibraryHandleEmscripten class is a dummy implementation which
+ * notionally represents a handle to the main executable. It currently will
+ * not find any symbols.
  */
 
-#include "system-library-posix.hpp"
-
 #include <link.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
-class __MCSLibraryHandleEmscripten: public __MCSLibraryHandlePosix
+class __MCSLibraryHandleEmscripten
 {
 public:
+    __MCSLibraryHandleEmscripten(void)
+    {
+    }
+    
+    ~__MCSLibraryHandleEmscripten(void)
+    {
+    }
+    
+    bool IsDefined(void) const
+    {
+        return m_defined;
+    }
+    
+    bool IsEqualTo(const __MCSLibraryHandleEmscripten& p_other) const
+    {
+        return false;
+    }
+    
+    bool Hash(void) const
+    {
+        return MCHashPointer(nullptr);
+    }
+    
     bool CreateWithNativePath(MCStringRef p_native_path)
     {
-        return CreateWithAddress(nullptr);
+        return false;
     }
     
     bool CreateWithAddress(void *p_address)
     {
-        void *t_dl_handle = dlopen(NULL,
-                                     RTLD_LAZY);
-
-        if (t_dl_handle == nullptr)
-        {
-            /* TODO: Use dlerror */
-            return __MCSLibraryThrowCreateWithAddressFailed(p_address);
-        }
-        
-        m_handle = t_dl_handle;
-        
+        m_defined = true;
         return true;
     }
     
-    bool
-    CopyNativePath(MCStringRef& r_native_path) const
+    void *LookupSymbol(MCStringRef p_symbol) const
     {
-        return MCSCommandLineGetName(r_native_path);
+        return nullptr;
     }
+    
+    bool CopyNativePath(MCStringRef& r_native_path) const
+    {
+        return MCStringCreateWithCString("<main>", r_native_path);
+    }
+
+private:
+    bool m_defined = false;
 };
 
 typedef class __MCSLibraryHandleEmscripten __MCSLibraryHandle;
diff --git a/tools/emscripten_testgen.sh b/tools/emscripten_testgen.sh
@@ -47,7 +47,7 @@ cp -a ${test_src_dir} ${em_stack_dir}
 cp ${em_test_src_dir}/__boot.livecodescript ${em_test_build_dir}/standalone/boot/standalone/__boot.livecode
 # Copy in startup stack and make substitutions
 cp ${top_src_dir}/engine/rsrc/emscripten-startup-template.livecodescript ${em_test_build_dir}/standalone/boot/__startup.livecode
-sed -i -e"s,@BOOT_HASH@,${boot_hash}," ${em_test_build_dir}/standalone/boot/__startup.livecode
-sed -i -e"s,@ENGINE_VERSION@,${short_ver}," ${em_test_build_dir}/standalone/boot/__startup.livecode
+sed -i"foo" -e"s,@BOOT_HASH@,${boot_hash}," ${em_test_build_dir}/standalone/boot/__startup.livecode
+sed -i"foo" -e"s,@ENGINE_VERSION@,${short_ver}," ${em_test_build_dir}/standalone/boot/__startup.livecode
 # Create the standalone.zip file
 ( cd ${em_test_build_dir}/standalone && zip -0qr ${em_test_build_dir}/standalone.zip * )

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,10 @@ platform_main(int argc, char argv[], char envp[])`
`55`	`55`	`{`
`56`	`56`	`MCEmscriptenBootError("Core initialisation");`
`57`	`57`	`}`
	`58`	`+ if (!MCSInitialize())`
	`59`	`+ {`
	`60`	`+ MCEmscriptenBootError("Core System initialisation");`
	`61`	`+ }`
`58`	`62`	`if (!MCScriptInitialize())`
`59`	`63`	`{`
`60`	`64`	`MCEmscriptenBootError("LCB VM initialisation");`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@`
`219`	`219`
`220`	`220`	`# Set java-related defines and includes`
`221`	`221`	`[`
`222`		`- 'host_os == "mac" and OS != "ios"',`
	`222`	`+ 'host_os == "mac" and OS != "ios" and OS != "emscripten"',`
`223`	`223`	`{`
`224`	`224`	`'defines':`
`225`	`225`	`[`