[embuilder] Add support for '*' wildcard for matching library names

This is very useful for doing things like `./embuild build libGL*` to
`./embuilder clean libc*`.

Author: sbc100

embuilder.py

@@ -13,6 +13,7 @@
 """
 
 import argparse
+import fnmatch
 import logging
 import sys
 import time
@@ -120,7 +121,7 @@
 
 
 def get_help():
-  all_tasks = get_system_tasks()[1] + PORTS
+  all_tasks = get_all_tasks()
   all_tasks.sort()
   return '''
 Available targets:
@@ -163,6 +164,10 @@ def get_system_tasks():
   return system_libraries, system_tasks
 
 
+def get_all_tasks():
+  return get_system_tasks()[1] + PORTS
+
+
 def main():
   all_build_start_time = time.time()
 
@@ -239,7 +244,10 @@ def main():
   for name, targets in task_targets.items():
     if targets is None:
       # Use target name as task
-      tasks.append(name)
+      if '*' in name:
+        tasks.extend(fnmatch.filter(get_all_tasks(), name))
+      else:
+        tasks.append(name)
     else:
       # There are some ports that we don't want to build as part
       # of ALL since the are not well tested or widely used:

system/lib/gl/gl.c

@@ -15,6 +15,7 @@
 #include <GL/gl.h>
 #include <GL/glext.h>
 
+#include <webgl/webgl1.h>
 #include <webgl/webgl1_ext.h>
 
 // Define emscripten_ versions of gl functions, to avoid name collisions
@@ -23,126 +24,20 @@
  * Miscellaneous
  */
 
-GLAPI void GLAPIENTRY emscripten_glClearIndex( GLfloat c );
-
-GLAPI void GLAPIENTRY emscripten_glClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha );
-
-GLAPI void GLAPIENTRY emscripten_glClear( GLbitfield mask );
-
-GLAPI void GLAPIENTRY emscripten_glIndexMask( GLuint mask );
-
-GLAPI void GLAPIENTRY emscripten_glColorMask( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha );
-
 GLAPI void GLAPIENTRY emscripten_glAlphaFunc( GLenum func, GLclampf ref );
 
-GLAPI void GLAPIENTRY emscripten_glBlendFunc( GLenum sfactor, GLenum dfactor );
-
-GLAPI void GLAPIENTRY emscripten_glLogicOp( GLenum opcode );
-
-GLAPI void GLAPIENTRY emscripten_glCullFace( GLenum mode );
-
-GLAPI void GLAPIENTRY emscripten_glFrontFace( GLenum mode );
-
-GLAPI void GLAPIENTRY emscripten_glPointSize( GLfloat size );
-
-GLAPI void GLAPIENTRY emscripten_glLineWidth( GLfloat width );
-
-GLAPI void GLAPIENTRY emscripten_glLineStipple( GLint factor, GLushort pattern );
-
 GLAPI void GLAPIENTRY emscripten_glPolygonMode( GLenum face, GLenum mode );
 
-GLAPI void GLAPIENTRY emscripten_glPolygonOffset( GLfloat factor, GLfloat units );
-
-GLAPI void GLAPIENTRY emscripten_glPolygonStipple( const GLubyte *mask );
-
-GLAPI void GLAPIENTRY emscripten_glGetPolygonStipple( GLubyte *mask );
-
-GLAPI void GLAPIENTRY emscripten_glEdgeFlag( GLboolean flag );
-
-GLAPI void GLAPIENTRY emscripten_glEdgeFlagv( const GLboolean *flag );
-
-GLAPI void GLAPIENTRY emscripten_glScissor( GLint x, GLint y, GLsizei width, GLsizei height);
-
 GLAPI void GLAPIENTRY emscripten_glClipPlane( GLenum plane, const GLdouble *equation );
 
-GLAPI void GLAPIENTRY emscripten_glGetClipPlane( GLenum plane, GLdouble *equation );
-
 GLAPI void GLAPIENTRY emscripten_glDrawBuffer( GLenum mode );
 
 GLAPI void GLAPIENTRY emscripten_glReadBuffer( GLenum mode );
 
-GLAPI void GLAPIENTRY emscripten_glEnable( GLenum cap );
-
-GLAPI void GLAPIENTRY emscripten_glDisable( GLenum cap );
-
-GLAPI GLboolean GLAPIENTRY emscripten_glIsEnabled( GLenum cap );
-
-
 GLAPI void GLAPIENTRY emscripten_glEnableClientState( GLenum cap );  /* 1.1 */
 
 GLAPI void GLAPIENTRY emscripten_glDisableClientState( GLenum cap );  /* 1.1 */
 
-
-GLAPI void GLAPIENTRY emscripten_glGetBooleanv( GLenum pname, GLboolean *params );
-
-GLAPI void GLAPIENTRY emscripten_glGetDoublev( GLenum pname, GLdouble *params );
-
-GLAPI void GLAPIENTRY emscripten_glGetFloatv( GLenum pname, GLfloat *params );
-
-GLAPI void GLAPIENTRY emscripten_glGetIntegerv( GLenum pname, GLint *params );
-
-
-GLAPI void GLAPIENTRY emscripten_glPushAttrib( GLbitfield mask );
-
-GLAPI void GLAPIENTRY emscripten_glPopAttrib( void );
-
-
-GLAPI void GLAPIENTRY emscripten_glPushClientAttrib( GLbitfield mask );  /* 1.1 */
-
-GLAPI void GLAPIENTRY emscripten_glPopClientAttrib( void );  /* 1.1 */
-
-
-GLAPI GLint GLAPIENTRY emscripten_glRenderMode( GLenum mode );
-
-GLAPI GLenum GLAPIENTRY emscripten_glGetError( void );
-
-GLAPI const GLubyte * GLAPIENTRY emscripten_glGetString( GLenum name );
-
-GLAPI const GLubyte * GLAPIENTRY emscripten_glGetStringi( GLenum name, GLuint index);
-
-GLAPI void GLAPIENTRY emscripten_glFinish( void );
-
-GLAPI void GLAPIENTRY emscripten_glFlush( void );
-
-GLAPI void GLAPIENTRY emscripten_glHint( GLenum target, GLenum mode );
-
-
-/*
- * Depth Buffer
- */
-
-GLAPI void GLAPIENTRY emscripten_glClearDepth( GLclampd depth );
-
-GLAPI void GLAPIENTRY emscripten_glDepthFunc( GLenum func );
-
-GLAPI void GLAPIENTRY emscripten_glDepthMask( GLboolean flag );
-
-GLAPI void GLAPIENTRY emscripten_glDepthRange( GLclampd near_val, GLclampd far_val );
-
-
-/*
- * Accumulation Buffer
- */
-
-GLAPI void GLAPIENTRY emscripten_glClearAccum( GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha );
-
-GLAPI void GLAPIENTRY emscripten_glAccum( GLenum op, GLfloat value );
-
-
-/*
- * Transformation
- */
-
 GLAPI void GLAPIENTRY emscripten_glMatrixMode( GLenum mode );
 
 GLAPI void GLAPIENTRY emscripten_glOrtho( GLdouble left, GLdouble right,

test/test_sanity.py

@@ -3,6 +3,7 @@
 # University of Illinois/NCSA Open Source License.  Both these licenses can be
 # found in the LICENSE file.
 
+import glob
 import os
 import platform
 import shutil
@@ -729,16 +730,24 @@ def test_embuilder_auto_tasks(self):
     # Unless --force is specified
     self.assertContained('Building targets: zlib', self.do([EMBUILDER, 'build', 'zlib', 'MINIMAL', '--force']))
 
-  def test_embuilder_wasm_backend(self):
+  def test_embuilder(self):
     restore_and_set_up()
-    # the --lto flag makes us build wasm-bc
+    # the --lto flag makes us build LTO libraries
     self.clear_cache()
     self.run_process([EMBUILDER, 'build', 'libemmalloc'])
     self.assertExists(os.path.join(config.CACHE, 'sysroot', 'lib', 'wasm32-emscripten'))
     self.clear_cache()
     self.run_process([EMBUILDER, 'build', 'libemmalloc', '--lto'])
     self.assertExists(os.path.join(config.CACHE, 'sysroot', 'lib', 'wasm32-emscripten', 'lto'))
 
+  def test_embuilder_wildcards(self):
+    restore_and_set_up()
+    glob_match = os.path.join(config.CACHE, 'sysroot', 'lib', 'wasm32-emscripten', 'libwebgpu*.a')
+    self.run_process([EMBUILDER, 'clear', 'libwebgpu*'])
+    self.assertFalse(glob.glob(glob_match))
+    self.run_process([EMBUILDER, 'build', 'libwebgpu*'])
+    self.assertGreater(len(glob.glob(glob_match)), 3)
+
   def test_binaryen_version(self):
     restore_and_set_up()
     with open(EM_CONFIG, 'a') as f: