Skip to content

Commit

Permalink
Merge pull request #9 from pzaino/chore/sync-from-template
Browse files Browse the repository at this point in the history
Chore/sync from template
  • Loading branch information
pzaino authored Mar 4, 2024
2 parents 0e9e488 + 8c149bb commit 002d624
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ 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/**/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
Expand Down
2 changes: 2 additions & 0 deletions .rocog/scripts/ux-src
Original file line number Diff line number Diff line change
Expand Up @@ -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" ] || \
Expand Down Expand Up @@ -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"
Expand Down
12 changes: 4 additions & 8 deletions src/MkGCC.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -20,9 +20,5 @@ cd ${current_dir}
# Display MakefielGCC
cat ${current_dir}/MakeFileGCC

# Clean up the artifacts
rm -rf ./*.o
rm -rf ./*.a

# Make the artifacts
make all OS=`uname -s` -f ${current_dir}/MakefileGCC
make static OS=`uname -s` -f ${current_dir}/MakefileGCC

0 comments on commit 002d624

Please sign in to comment.