Merge pull request #177 from pmienk/version3

pmienk · web-flow · commit c105a6a82be6 · 2018-08-04T15:40:32.000-07:00
Flag suppression alterations, install.sh refactor for common functionality reuse.
diff --git a/generate.xml b/generate.xml
diff --git a/templates/gsl.install.sh b/templates/gsl.install.sh
diff --git a/templates/shared/common_install_shell_artifacts.gsl b/templates/shared/common_install_shell_artifacts.gsl
diff --git a/templates/shared/common_msvc_artifacts.gsl b/templates/shared/common_msvc_artifacts.gsl
diff --git a/templates/vs2013/gsl.packages.config b/templates/vs2013/gsl.packages.config
@@ -19,7 +19,7 @@ gsl from "library/string.gsl"
 gsl from "library/collections.gsl"
 gsl from "utilities.gsl"
 gsl from "templates/vs2013/common.gsl"
-gsl from "templates/common_msvc_artifacts.gsl"
+gsl from "templates/shared/common_msvc_artifacts.gsl"
 gsl from "templates/gsl.packages.config"
 
 generate_packages_config("output", generate, "vs2013")
diff --git a/templates/vs2013/gsl.vcxproj b/templates/vs2013/gsl.vcxproj
@@ -19,7 +19,7 @@ gsl from "library/string.gsl"
 gsl from "library/collections.gsl"
 gsl from "utilities.gsl"
 gsl from "templates/vs2013/common.gsl"
-gsl from "templates/common_msvc_artifacts.gsl"
+gsl from "templates/shared/common_msvc_artifacts.gsl"
 gsl from "templates/gsl.vcxproj"
 
 generate_vcxproj("output", generate, "vs2013")
diff --git a/templates/vs2013/gsl.vcxproj.filters b/templates/vs2013/gsl.vcxproj.filters
@@ -19,7 +19,7 @@ gsl from "library/string.gsl"
 gsl from "library/collections.gsl"
 gsl from "utilities.gsl"
 gsl from "templates/vs2013/common.gsl"
-gsl from "templates/common_msvc_artifacts.gsl"
+gsl from "templates/shared/common_msvc_artifacts.gsl"
 gsl from "templates/gsl.vcxproj.filters"
 
 generate_filter("output", generate, "vs2013")
diff --git a/templates/vs2015/gsl.packages.config b/templates/vs2015/gsl.packages.config
@@ -19,7 +19,7 @@ gsl from "library/string.gsl"
 gsl from "library/collections.gsl"
 gsl from "utilities.gsl"
 gsl from "templates/vs2015/common.gsl"
-gsl from "templates/common_msvc_artifacts.gsl"
+gsl from "templates/shared/common_msvc_artifacts.gsl"
 gsl from "templates/gsl.packages.config"
 
 generate_packages_config("output", generate, "vs2015")
diff --git a/templates/vs2015/gsl.vcxproj b/templates/vs2015/gsl.vcxproj
@@ -19,7 +19,7 @@ gsl from "library/string.gsl"
 gsl from "library/collections.gsl"
 gsl from "utilities.gsl"
 gsl from "templates/vs2015/common.gsl"
-gsl from "templates/common_msvc_artifacts.gsl"
+gsl from "templates/shared/common_msvc_artifacts.gsl"
 gsl from "templates/gsl.vcxproj"
 
 generate_vcxproj("output", generate, "vs2015")
diff --git a/templates/vs2015/gsl.vcxproj.filters b/templates/vs2015/gsl.vcxproj.filters
@@ -19,7 +19,7 @@ gsl from "library/string.gsl"
 gsl from "library/collections.gsl"
 gsl from "utilities.gsl"
 gsl from "templates/vs2015/common.gsl"
-gsl from "templates/common_msvc_artifacts.gsl"
+gsl from "templates/shared/common_msvc_artifacts.gsl"
 gsl from "templates/gsl.vcxproj.filters"
 
 generate_filter("output", generate, "vs2015")
diff --git a/templates/vs2017/gsl.packages.config b/templates/vs2017/gsl.packages.config
@@ -19,7 +19,7 @@ gsl from "library/string.gsl"
 gsl from "library/collections.gsl"
 gsl from "utilities.gsl"
 gsl from "templates/vs2017/common.gsl"
-gsl from "templates/common_msvc_artifacts.gsl"
+gsl from "templates/shared/common_msvc_artifacts.gsl"
 gsl from "templates/gsl.packages.config"
 
 generate_packages_config("output", generate, "vs2017")
diff --git a/templates/vs2017/gsl.vcxproj b/templates/vs2017/gsl.vcxproj
@@ -19,7 +19,7 @@ gsl from "library/string.gsl"
 gsl from "library/collections.gsl"
 gsl from "utilities.gsl"
 gsl from "templates/vs2017/common.gsl"
-gsl from "templates/common_msvc_artifacts.gsl"
+gsl from "templates/shared/common_msvc_artifacts.gsl"
 gsl from "templates/gsl.vcxproj"
 
 generate_vcxproj("output", generate, "vs2017")
diff --git a/templates/vs2017/gsl.vcxproj.filters b/templates/vs2017/gsl.vcxproj.filters
@@ -19,7 +19,7 @@ gsl from "library/string.gsl"
 gsl from "library/collections.gsl"
 gsl from "utilities.gsl"
 gsl from "templates/vs2017/common.gsl"
-gsl from "templates/common_msvc_artifacts.gsl"
+gsl from "templates/shared/common_msvc_artifacts.gsl"
 gsl from "templates/gsl.vcxproj.filters"
 
 generate_filter("output", generate, "vs2017")
diff --git a/utilities.gsl b/utilities.gsl
@@ -321,6 +321,30 @@ endfunction
 # Build utilities.
 #------------------------------------------------------------------------------
 
+function global.cumulative_install(list, repositories, repository)
+    define my.list = cumulative_install.list
+    define my.repositories = cumulative_install.repositories
+    define my.repository = cumulative_install.repository
+
+    for my.repository->install.build as _build
+        for my.repositories.repository as _repository
+            if (!(_repository.name = my.repository.name) &\
+                 (_repository->package.library = _build.name))
+                cumulative_install(my.list, my.repositories, _repository)
+            endif
+        endfor
+
+        if (count(my.list.build, (count.name = _build.name)) = 0)
+            copy _build to my.list
+        endif
+    endfor
+endfunction
+
+function global.have_build(install, name)
+    define my.install = have_build.install
+    return defined(my.install->build(starts_with(build.name, my.name)))
+endfunction
+
 function global.is_icu_build(build)
     define my.build = is_icu_build.build
     return starts_with(my.build.name, "icu")
