Merge pull request #7 from RISC-OS-Community/chore/sync-from-template

Chore/sync from template

Author: pzaino

.gitattributes

@@ -30,7 +30,11 @@ doc/**         linguist-documentation
 src/**/c/*     text diff=c linguist-language=c
 src/**/h/*     text diff=c linguist-language=c
 src/**/c++/*   text diff=cpp linguist-language=cpp
-src/**/cpp/*   text diff=cpp linguist-language=cpp 
+src/**/cpp/*   text diff=cpp linguist-language=cpp
+src/**/hpp/*   text diff=cpp linguist-language=cpp
+src/**/hxx/*   text diff=cpp linguist-language=cpp
+src/**/cxx/*   text diff=cpp linguist-language=cpp
+src/**/h++/*   text diff=cpp linguist-language=cpp 
 src/**/bas/*   text diff=bbcbasic  linguist-language=bbcbasic
 src/**/s/*     text diff=armasm linguist-language=assembly
 src/**/Hdr/*   text diff=armasm linguist-language=assembly

.rocog/scripts/ux-src

@@ -102,6 +102,7 @@ function check_path()
         [ "${last_dir}" == "c++" ] || [ "${last_dir}" == "C++" ] || \
         [ "${last_dir}" == "hpp" ] || [ "${last_dir}" == "HPP" ] || \
         [ "${last_dir}" == "hxx" ] || [ "${last_dir}" == "HXX" ] || \
+        [ "${last_dir}" == "h++" ] || [ "${last_dir}" == "H++" ] || \
         [ "${last_dir}" == "s" ] || [ "${last_dir}" == "S" ] || \
         [ "${last_dir}" == "Hdr" ] || [ "${last_dir}" == "hdr" ] || \
         [ "${last_dir}" == "fth" ] || [ "${last_dir}" == "FTH" ] || \
@@ -141,6 +142,7 @@ function find_files_and_link() {
     link_files "${dir_type}" "${src_dir}" "${dst_dir}" "HPP" "hpp"
     link_files "${dir_type}" "${src_dir}" "${dst_dir}" "hxx" "hxx"
     link_files "${dir_type}" "${src_dir}" "${dst_dir}" "HXX" "hxx"
+    link_files "${dir_type}" "${src_dir}" "${dst_dir}" "h++" "hpp"
 
     # Link C header files (if any):
     link_files "${dir_type}" "${src_dir}" "${dst_dir}" "h" "h"

src/.gitkeep

@@ -3,13 +3,13 @@
 # This is a special file that will be used to control automated code
 # analysis tools such as SonarQube, Coverity, etc. on GitHub.
 # This file is not meant to be executed by humans, but by automated
-# tools.
+# tools. 
 # If you want to build the project, please use the MkGCC (note no .sh)
 # script instead or MkDDE on RISC OS.
 
-# MAKE SURE this file is calling your MakefileGCC with the correct
+# MAKE SURE this file is calling your MakefileGCC with the correct 
 # target and make sure your MakefileGCC uses the variable OS to
-# determine the target OS.
+# determine the target OS. 
 
 current_dir="$1"
 if [ "$current_dir" == "" ]; then
@@ -20,9 +20,5 @@ cd ${current_dir}
 # Display MakefielGCC
 cat ${current_dir}/MakeFileGCC
 
-# Clean the artifacts
-rm ./*.o
-
 # Make the artifacts
-make all OS=`uname -s` -f ${current_dir}/MakefileGCC --debug
-
+make static OS=`uname -s` -f ${current_dir}/MakefileGCC