Merge pull request #381 from pmienk/master

Changes to facilitate wolfssl.

Author: evoskuil

templates/gsl.include.hpp

@@ -19,15 +19,16 @@ function render_headers(files, folder, base_trim, path_trim, product)
     define my.files = render_headers.files
     define my.product = render_headers.product
     define my.directory = open_directory(my.folder)
+    get_product_files(my.files, my.folder, my.base_trim, my.product)
+    if (!table_empty(my.files))
+        for my.files.row as _row
+            write_include(join(my.product.container, _row.name))
+        endfor
+        table_clear(my.files)
+    endif
+
     for my.directory.directory as _directory by _directory.name
         define my.subfolder = "$(_directory.path)$(_directory.name)"
-        get_product_files(my.files, my.subfolder, my.base_trim, my.product)
-        if (!table_empty(my.files))
-            for my.files.row as _row
-                write_include(join(my.product.container, _row.name))
-            endfor
-            table_clear(my.files)
-        endif
         render_headers(my.files, my.subfolder, my.base_trim, my.path_trim,\
             my.product)
     endfor
@@ -52,7 +53,8 @@ function write_local_includes(files, product, root, repository)
     define my.folder = "$(my.root)$(my.files.path)/"
     define my.root_length = string.length(my.folder)
     define my.path_length = string.length(my.files.path)
-    render_files_headers(my.folder, my.root_length, my.path_length,\
+    define my.primary_folder = "$(my.folder)$(bitcoin_to_include(my.repository.name))/"
+    render_files_headers(my.primary_folder, my.root_length, my.path_length,\
         my.product)
 return
 endfunction

templates/gsl.package.pc.in

@@ -115,6 +115,15 @@ function define_package_variables(variables, package, make, configure, repositor
     # Add explicit package.library declarations.
     format_libs(my.variables, my.package)
 
+    # for unconditional defines
+    for my.configure.define as _define where is_empty(_define.header)
+        if (defined(_define.value))
+            my.variables.cflags += " -D$(_define.name:upper,c)=$(_define.value)"
+        else
+            my.variables.cflags += " -D$(_define.name:upper,c)"
+        endif
+    endfor
+
     # Get the lib product that corresponds to the package.
     define my.product = find_library_product(my.package.library, my.make,\
         my.repository)?

templates/gsl.vcxproj

@@ -102,42 +102,46 @@ endfunction
 ###
 ### generic assistance functions
 ###
-function match_element_name(alpha, beta)
-    define my.alpha = match_element_name.alpha
-    define my.beta = match_element_name.beta
-    return defined(my.alpha) & defined(my.beta) & (object_base_from_element(my.alpha) = object_base_from_element(my.beta))
+function match_name(element, name)
+    define my.element = match_name.element
+    return defined(my.element) & (my.element.name = my.name)
 endfunction
 
-function exists_collision(root, element)
+function exists_unsuffixed_collision(root, name)
+    define my.root = exists_unsuffixed_collision.root
+    define my.unsuffixed = string.substr(my.name, 0, string.locate_last(my.name, "."))
+    return count(my.root.collision, match_name(count, my.unsuffixed)) > 0
+endfunction
+
+function exists_collision(root, name)
     define my.root = exists_collision.root
-    define my.element = exists_collision.element
-    return count(my.root.collision, match_element_name(count, my.element)) > 0
+    return count(my.root.collision, match_name(count, my.name)) > 0
 endfunction
 
-function add_collision(root, element)
+function add_collision(root, name)
     define my.root = add_collision.root
-    define my.element = add_collision.element
-    if (defined(my.root) & !exists_collision(my.root, my.element))
+    define my.unsuffixed = string.substr(my.name, 0, string.locate_last(my.name, "."))
+
+    if (defined(my.root) & !exists_collision(my.root, my.unsuffixed))
         new my.root.collision as _collision
-            _collision.name = my.element.name
+            _collision.name = my.unsuffixed
         endnew
     endif
     return my.root
 endfunction
 
-function collides_file_name(root, element)
+function collides_file_name(root, name)
     define my.root = collides_file_name.root
-    define my.element = collides_file_name.element
-    return count(my.root.file, match_element_name(count, my.element)) > 1
+    return count(my.root.file, match_name(count, my.name)) > 1
 endfunction
 
 function populate_collisions(collisions, file_data)
     define my.collisions = populate_collisions.collisions
     define my.file_data = populate_collisions.file_data
 
     for my.file_data.file as _file
-        if (collides_file_name(my.file_data, _file))
-            add_collision(my.collisions, _file)
+        if (collides_file_name(my.file_data, _file.name))
+            add_collision(my.collisions, _file.name)
         endif
     endfor
 endfunction
@@ -802,7 +806,7 @@ endfunction emit_project
 .   define my.collisions = emit_compile_item.collisions
 .   define my.file_record = emit_compile_item.file_record
 .
-.   if (!exists_collision(my.collisions, my.file_record))
+.   if (!exists_unsuffixed_collision(my.collisions, my.file_record.name))
 .       emit_file_record_item("ClCompile", my.file_record)
 .   else
 .       emit_item_with_object("ClCompile", my.file_record)