Merge pull request #6446 from BOINC/vko_remove_wasm

Remove unfinished wasm compilation support.

Author: AenBleidd

.github/workflows/wasm.yml

@@ -235,17 +235,6 @@ vda/vdad
 build/
 build-*/
 
-# WASM
-*.wasm
-a.out.js
-boinc_client.js
-boinccmd.js
-switcher.js
-boinc.html
-boinc_client.html
-boinccmd.html
-switcher.html
-
 # snap
 parts/
 prime/

.gitignore

@@ -65,10 +65,7 @@ endif
 # Define files for distclean command
 DISTCLEANFILES =                                \
    clientgui/res/Makefile                       \
-   packages/generic/sea/Makefile                \
-   `find . -name "*.wasm"`                      \
-   `find client -name "*.js"`                   \
-   `find client -name "*.html"`
+   packages/generic/sea/Makefile
 
 # Define files for maintainer-clean command
 MAINTAINERCLEANFILES =                          \

3rdParty/vcpkg_ports/configs/client/wasm/vcpkg.json

@@ -57,27 +57,6 @@
 
 #include "hostinfo.h"
 
-#if WASM
-    #include <emscripten.h>
-#endif
-
-#if WASM
-    // unique user device in js.
-    EM_JS(int, get_uuid, (char* buf), {
-        const fpPromise = import('https://openfpcdn.io/fingerprintjs/v3').then(FingerprintJS => FingerprintJS.load());
-
-        // Get the visitor identifier when you need it.
-        fpPromise.then(fp => fp.get()).then(result => {
-                // This is the visitor identifier:
-                const visitorId = result.visitorId;
-                for (let i = 0; i < visitorId.length; i++) {
-                    buf[i] = visitorId[i];
-                }
-        });
-        return 0;
-    });
-#endif
-
 // get domain name and IP address of this host
 // Android: if domain_name is empty, set it to android_xxxxxxxx
 //
@@ -166,16 +145,11 @@ void HOST_INFO::generate_host_cpid() {
     char buf[256+MAXPATHLEN];
     char dir[MAXPATHLEN];
 
-#if WASM
-    // unique user device in js.
-    retval = get_uuid(buf);
-#else
     // if a MAC address is available, compute an ID based on it;
     // this has the advantage of stability
     // (a given host will get the same ID each time BOINC is reinstalled)
     //
     retval = get_mac_address(buf);
-#endif
     if (retval) {
         make_random_string("", host_cpid);
         return;

3rdParty/vcpkg_ports/triplets/ci/wasm32-emscripten.cmake

@@ -181,16 +181,6 @@ extern "C" {
 #define LINUX_LIKE_SYSTEM 1
 #endif
 
-#if WASM
-    #include <emscripten.h>
-#endif
-
-#if WASM
-    EM_JS(FILE*, popen, (const char* command, const char* mode), {
-        //TODO: add javascript code
-    });
-#endif
-
 // Returns the offset between LOCAL STANDARD TIME and UTC.
 // LOCAL_STANDARD_TIME = UTC_TIME + get_timezone().
 //
@@ -1409,9 +1399,6 @@ int HOST_INFO::get_cpu_info() {
     strlcpy( p_model, cpuInfo.name.fromID, sizeof(p_model));
 #elif defined(__HAIKU__)
     get_cpu_info_haiku(*this);
-#elif WASM
-    strlcpy( p_vendor, "WASM", sizeof(p_vendor));
-    strlcpy( p_model, "WASM", sizeof(p_model));
 #elif HAVE_SYS_SYSCTL_H
     int mib[2];
     size_t len;

Makefile.am

@@ -158,12 +158,6 @@ AC_ARG_ENABLE(apps-gui,
     [enable_apps_gui=${enableval}],
     [enable_apps_gui=no])
 
-AC_ARG_ENABLE(wasm,
-    AS_HELP_STRING([--enable-wasm],
-                   [enable building the boinc wasm]),
-    [enable_wasm=${enableval}],
-    [enable_wasm=no])
-
 AC_ARG_ENABLE(unit-tests,
     AS_HELP_STRING([--enable-unit-tests],
                    [enable building the boinc unit tests]),
@@ -387,10 +381,6 @@ dnl the manpages only if docbook2x-man is available.
 AC_PATH_PROG(DOCBOOK2X_MAN, docbook2x-man)
 AM_CONDITIONAL(HAVE_DOCBOOK2X_MAN, [test -n "${DOCBOOK2X_MAN}"])
 
-if test "${enable_wasm}" = yes ; then
-  EXEEXT=.html
-fi
-
 AC_SUBST([CLIENT_BIN_FILENAME],[boinc${EXEEXT}])
 AC_SUBST([CLIENT_CMD_BIN_FILENAME],[boinccmd${EXEEXT}])
 AC_SUBST([CLIENT_GUI_BIN_FILENAME],[boincmgr${EXEEXT}])
@@ -736,11 +726,7 @@ AC_TYPE_SIGNAL
 if test "${isWIN32}" = "yes" ; then
   AC_CHECK_HEADERS(winsock2.h winsock.h windows.h ws2tcpip.h winternl.h crtdbg.h)
 fi
-AC_CHECK_HEADERS(sys/types.h sys/un.h arpa/inet.h dirent.h grp.h fcntl.h inttypes.h stdint.h memory.h netdb.h netinet/in.h netinet/tcp.h netinet/ether.h net/if.h net/if_arp.h signal.h strings.h sys/auxv.h sys/file.h sys/fcntl.h sys/ipc.h sys/ioctl.h sys/msg.h sys/param.h sys/resource.h sys/select.h sys/sem.h sys/sockio.h sys/socket.h sys/stat.h sys/statvfs.h sys/statfs.h sys/systeminfo.h sys/time.h sys/types.h sys/utsname.h sys/vmmeter.h sys/wait.h unistd.h utmp.h errno.h procfs.h ieeefp.h setjmp.h float.h sal.h execinfo.h xlocale.h)
-
-if test "${enable_wasm}" != yes ; then
-  AC_CHECK_HEADERS(sys/shm.h)
-fi
+AC_CHECK_HEADERS(sys/types.h sys/un.h arpa/inet.h dirent.h grp.h fcntl.h inttypes.h stdint.h memory.h netdb.h netinet/in.h netinet/tcp.h netinet/ether.h net/if.h net/if_arp.h signal.h strings.h sys/auxv.h sys/file.h sys/fcntl.h sys/ipc.h sys/ioctl.h sys/msg.h sys/param.h sys/resource.h sys/select.h sys/sem.h sys/shm.h sys/sockio.h sys/socket.h sys/stat.h sys/statvfs.h sys/statfs.h sys/systeminfo.h sys/time.h sys/types.h sys/utsname.h sys/vmmeter.h sys/wait.h unistd.h utmp.h errno.h procfs.h ieeefp.h setjmp.h float.h sal.h execinfo.h xlocale.h)
 
 save_cxxflags="${CXXFLAGS}"
 save_cppflags="${CPPFLAGS}"
@@ -1138,10 +1124,6 @@ AM_CONDITIONAL(BUILD_APPS_WITH_VCPKG, [test "${enable_apps_vcpkg}" = yes])
 AM_CONDITIONAL(BUILD_WITH_VBOX, [test "${enable_apps_vbox}" = yes])
 AM_CONDITIONAL(BUILD_WITH_MINGW, [test "${enable_apps_mingw}" = yes])
 AM_CONDITIONAL(BUILD_WITH_GUI, [test "${enable_apps_gui}" = yes])
-if test "${enable_wasm}" = yes ; then
-  AC_DEFINE([WASM], [1], [build boinc wasm])
-fi
-
 
 dnl Whether to build fcgi components
 AM_CONDITIONAL(ENABLE_FCGI,[test "${enable_fcgi}" = yes])

client/hostinfo_network.cpp

@@ -213,23 +213,6 @@
     './win_build/Build/ARM64/Release/installer_setup.exe',
 ]
 
-wasm_client_list = [
-    './client/boinc_client.wasm',
-    './client/boinc_client.js',
-    './client/boinc.html',
-    './samples/wasm/index.html',
-]
-
-wasm_client_debug_folder_list = [
-    'lib/*.cpp',
-    'lib/*.h',
-    'client/*.cpp',
-    'client/*.h',
-    'client/boinc_client.html',
-    'client/boinc_client.js',
-    'client/boinc_client.wasm',
-]
-
 macos_manager_list = [
     'mac_build/build/Deployment/AddRemoveUser',
     'mac_build/build/Deployment/BOINC\ Installer.app',
@@ -289,7 +272,6 @@
 
 logs_list = [
     'config.log',
-    '3rdParty/wasm/vcpkg/buildtrees/*.log',
     '3rdParty/linux/vcpkg/buildtrees/*.log',
     '3rdParty/osx/vcpkg/buildtrees/*.log',
     '3rdParty/android/vcpkg/buildtrees/*.log',
@@ -362,12 +344,6 @@ def prepare_win_manager(target_directory):
 def prepare_win_installer(target_directory):
     prepare_7z_archive('win_installer', target_directory, windows_installer_list)
 
-def prepare_wasm_client(target_directory):
-    prepare_7z_archive('wasm_client', target_directory, wasm_client_list)
-
-def prepare_wasm_client_debug(target_directory):
-    prepare_7z_archive('wasm_client-debug', target_directory, wasm_client_debug_folder_list)
-
 def prepare_macos_apps(target_directory):
     prepare_7z_archive('macos_manager', target_directory, macos_manager_list)
     prepare_7z_archive('macos_apps', target_directory, macos_apps_list)
@@ -398,8 +374,6 @@ def prepare_logs(target_directory):
     'win_client': prepare_win_client,
     'win_manager': prepare_win_manager,
     'win_installer': prepare_win_installer,
-    'wasm_client': prepare_wasm_client,
-    'wasm_client-debug': prepare_wasm_client_debug,
     'macos_manager': prepare_macos_apps,
     'macos_samples-makefile': prepare_macos_makefile_apps,
     'logs': prepare_logs,