Move C++ code into cpp/ dir (#941)

- Moved C++ code to cpp/ from src/raspberrypi
- Related updates to Makefile, easyinstall.sh, and the github build rules
- Removed the native X68k C code in src/x68k from the repo
This commit is contained in:
Daniel Markstedt 2022-10-25 12:59:30 -07:00 committed by GitHub
parent 4b109a70b0
commit 08194af424
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
184 changed files with 11 additions and 4920 deletions

View File

@ -32,11 +32,11 @@ jobs:
- name: make standard - name: make standard
run: make all -j6 CONNECT_TYPE=STANDARD CROSS_COMPILE=arm-linux-gnueabihf- run: make all -j6 CONNECT_TYPE=STANDARD CROSS_COMPILE=arm-linux-gnueabihf-
working-directory: ./src/raspberrypi working-directory: ./cpp
- name: make fullspec - name: make fullspec
run: make all -j6 CONNECT_TYPE=FULLSPEC CROSS_COMPILE=arm-linux-gnueabihf- run: make all -j6 CONNECT_TYPE=FULLSPEC CROSS_COMPILE=arm-linux-gnueabihf-
working-directory: ./src/raspberrypi working-directory: ./cpp
# We need to tar the binary outputs to retain the executable # We need to tar the binary outputs to retain the executable
# file permission. Currently, actions/upload-artifact only # file permission. Currently, actions/upload-artifact only
@ -44,11 +44,11 @@ jobs:
# This is workaround for https://github.com/actions/upload-artifact/issues/38 # This is workaround for https://github.com/actions/upload-artifact/issues/38
- name: tar binary outputs - name: tar binary outputs
run: tar -czvf rascsi.tar.gz ./bin run: tar -czvf rascsi.tar.gz ./bin
working-directory: ./src/raspberrypi working-directory: ./cpp
- name: upload artifacts - name: upload artifacts
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: arm-binaries name: arm-binaries
path: ./src/raspberrypi/rascsi.tar.gz path: ./cpp/rascsi.tar.gz

View File

@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
env: env:
MAKEFLAGS: -j2 # Number of available processors MAKEFLAGS: -j2 # Number of available processors
SOURCES: src/raspberrypi SOURCES: cpp
SONAR_SCANNER_VERSION: 4.7.0.2747 SONAR_SCANNER_VERSION: 4.7.0.2747
SONAR_SERVER_URL: "https://sonarcloud.io" SONAR_SERVER_URL: "https://sonarcloud.io"
BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed

View File

@ -65,7 +65,7 @@ RSYSLOG_LOG = /var/log/rascsi.log
USR_LOCAL_BIN = /usr/local/bin USR_LOCAL_BIN = /usr/local/bin
MAN_PAGE_DIR = /usr/local/man/man1 MAN_PAGE_DIR = /usr/local/man/man1
DOC_DIR = ../../doc DOC_DIR = ../doc
COVERAGE_DIR = ./coverage COVERAGE_DIR = ./coverage
COVERAGE_FILE = rascsi.dat COVERAGE_FILE = rascsi.dat
OS_FILES = ./os_integration OS_FILES = ./os_integration
@ -178,7 +178,7 @@ coverage: test
lcov: CXXFLAGS += --coverage lcov: CXXFLAGS += --coverage
lcov: test lcov: test
lcov -q -c -d . --include '*/raspberrypi/*' -o $(COVERAGE_FILE) --exclude '*/test/*' --exclude '*/interfaces/*' --exclude '*/rascsi_interface.pb*' lcov -q -c -d . --include '*/cpp/*' -o $(COVERAGE_FILE) --exclude '*/test/*' --exclude '*/interfaces/*' --exclude '*/rascsi_interface.pb*'
genhtml -q -o $(COVERAGE_DIR) --legend $(COVERAGE_FILE) genhtml -q -o $(COVERAGE_DIR) --legend $(COVERAGE_FILE)
docs: $(DOC_DIR)/rascsi_man_page.txt $(DOC_DIR)/rasctl_man_page.txt $(DOC_DIR)/scsimon_man_page.txt docs: $(DOC_DIR)/rascsi_man_page.txt $(DOC_DIR)/rasctl_man_page.txt $(DOC_DIR)/scsimon_man_page.txt

Some files were not shown because too many files have changed in this diff Show More