another folder renaming

This commit is contained in:
DJ2LS 2024-04-18 11:04:25 +02:00
parent 55e958c781
commit d5097b8b94
181 changed files with 108 additions and 108 deletions

View file

@ -11,7 +11,7 @@ updates:
# Maintain dependencies for npm # Maintain dependencies for npm
- package-ecosystem: "npm" - package-ecosystem: "npm"
directory: "/freedata-gui" directory: "/freedata_gui"
schedule: schedule:
interval: "monthly" interval: "monthly"
target-branch: "develop" target-branch: "develop"

View file

@ -15,7 +15,7 @@ jobs:
python-version: "3.11" python-version: "3.11"
- name: Electron Builder - name: Electron Builder
working-directory: freedata-gui working-directory: freedata_gui
run: | run: |
npm i npm i
npm run build npm run build
@ -33,7 +33,7 @@ jobs:
pip install -r requirements.txt pip install -r requirements.txt
- name: Build binaries - name: Build binaries
working-directory: freedata-server working-directory: freedata_server
run: | run: |
python3 -m nuitka --remove-output --assume-yes-for-downloads --follow-imports --include-data-dir=lib=lib --include-data-files=lib/codec2/*=lib/codec2/ --include-data-files=config.ini.example=config.ini --standalone server.py --output-filename=freedata-server python3 -m nuitka --remove-output --assume-yes-for-downloads --follow-imports --include-data-dir=lib=lib --include-data-files=lib/codec2/*=lib/codec2/ --include-data-files=config.ini.example=config.ini --standalone server.py --output-filename=freedata-server

View file

@ -15,7 +15,7 @@ jobs:
python-version: "3.11" python-version: "3.11"
- name: Electron Builder - name: Electron Builder
working-directory: freedata-gui working-directory: freedata_gui
run: | run: |
npm i npm i
npm run build npm run build
@ -34,10 +34,10 @@ jobs:
fileName: " hamlib-w64-*.zip" fileName: " hamlib-w64-*.zip"
latest: true latest: true
extract: true extract: true
out-file-path: "freedata-server/lib/hamlib/" out-file-path: "freedata_server/lib/hamlib/"
- name: Build binaries - name: Build binaries
working-directory: freedata-server working-directory: freedata_server
run: | run: |
python3 -m nuitka --remove-output --assume-yes-for-downloads --follow-imports --include-data-dir=lib=lib --include-data-files=lib/codec2/*=lib/codec2/ --include-data-files=config.ini.example=config.ini --standalone server.py --output-filename=freedata-server python3 -m nuitka --remove-output --assume-yes-for-downloads --follow-imports --include-data-dir=lib=lib --include-data-files=lib/codec2/*=lib/codec2/ --include-data-files=config.ini.example=config.ini --standalone server.py --output-filename=freedata-server

View file

@ -13,17 +13,17 @@ jobs:
- os: ubuntu-20.04 - os: ubuntu-20.04
zip_name: freedata-server_ubuntu zip_name: freedata-server_ubuntu
generator: Unix Makefiles generator: Unix Makefiles
modem_binary_name: freedata-server modem_binary_name: freedata_server
- os: macos-latest - os: macos-latest
zip_name: freedata-server_macos zip_name: freedata-server_macos
generator: Unix Makefiles generator: Unix Makefiles
modem_binary_name: freedata-server modem_binary_name: freedata_server
- os: windows-latest - os: windows-latest
zip_name: freedata-server_windows zip_name: freedata-server_windows
generator: Visual Studio 16 2019 generator: Visual Studio 16 2019
modem_binary_name: freedata-server.exe modem_binary_name: freedata_server.exe
steps: steps:
- name: Checkout code for ${{ matrix.platform.name }} - name: Checkout code for ${{ matrix.platform.name }}
@ -62,26 +62,26 @@ jobs:
CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }} CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }}
- name: Build binaries - name: Build binaries
working-directory: freedata-server working-directory: freedata_server
run: | run: |
python3 -m nuitka --remove-output --assume-yes-for-downloads --follow-imports --include-data-dir=lib=lib --include-data-files=lib/codec2/*=lib/codec2/ --include-data-files=config.ini.example=config.ini --standalone server.py --output-filename=freedata-server python3 -m nuitka --remove-output --assume-yes-for-downloads --follow-imports --include-data-dir=lib=lib --include-data-files=lib/codec2/*=lib/codec2/ --include-data-files=config.ini.example=config.ini --standalone server.py --output-filename=freedata-server
#- name: Download Portaudio binaries Linux macOS #- name: Download Portaudio binaries Linux macOS
# if: ${{!startsWith(matrix.os, 'windows')}} # if: ${{!startsWith(matrix.os, 'windows')}}
# working-directory: freedata-server # working-directory: freedata_server
# run: | # run: |
# if ! test -d "server.dist/freedata-server/_sounddevice_data"; then # if ! test -d "server.dist/freedata_server/_sounddevice_data"; then
# git clone https://github.com/spatialaudio/portaudio-binaries dist/freedata-server/_sounddevice_data/portaudio-binaries # git clone https://github.com/spatialaudio/portaudio-binaries dist/freedata_server/_sounddevice_data/portaudio-binaries
# fi # fi
#- name: Download Portaudio binaries Windows #- name: Download Portaudio binaries Windows
# if: ${{startsWith(matrix.os, 'windows')}} # if: ${{startsWith(matrix.os, 'windows')}}
# working-directory: freedata-server # working-directory: freedata_server
# run: | # run: |
# if(Test-Path -Path "server.dist/freedata-server/_sounddevice_data"){ # if(Test-Path -Path "server.dist/freedata_server/_sounddevice_data"){
# echo "sounddevice folder already exists" # echo "sounddevice folder already exists"
# } else { # } else {
# git clone https://github.com/spatialaudio/portaudio-binaries dist/freedata-server/_sounddevice_data/portaudio-binaries # git clone https://github.com/spatialaudio/portaudio-binaries dist/freedata_server/_sounddevice_data/portaudio-binaries
# } # }
- name: LIST ALL FILES - name: LIST ALL FILES
@ -99,7 +99,7 @@ jobs:
with: with:
type: 'zip' type: 'zip'
filename: '${{ matrix.zip_name }}.zip' filename: '${{ matrix.zip_name }}.zip'
directory: ./freedata-server/server.dist directory: ./freedata_server/server.dist
path: . path: .
# exclusions: '*.git* /*node_modules/* .editorconfig' # exclusions: '*.git* /*node_modules/* .editorconfig'
@ -110,14 +110,14 @@ jobs:
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: '${{ matrix.zip_name }}' name: '${{ matrix.zip_name }}'
path: ./freedata-server/server.dist/${{ matrix.zip_name }}.zip path: ./freedata_server/server.dist/${{ matrix.zip_name }}.zip
- name: Release Modem - name: Release Modem
uses: softprops/action-gh-release@v2 uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/v') if: startsWith(github.ref, 'refs/tags/v')
with: with:
draft: true draft: true
files: ./freedata-server/server.dist/${{ matrix.zip_name }}.zip files: ./freedata_server/server.dist/${{ matrix.zip_name }}.zip
- name: LIST ALL FILES - name: LIST ALL FILES
run: ls -R run: ls -R

View file

@ -28,11 +28,11 @@ jobs:
node-version: ${{ matrix.node-version }} node-version: ${{ matrix.node-version }}
- name: Install dependencies - name: Install dependencies
working-directory: freedata-gui working-directory: freedata_gui
run: | run: |
npm i npm i
- name: GUI Test - name: GUI Test
working-directory: freedata-gui working-directory: freedata_gui
run: | run: |
npm run test npm run test

16
.gitignore vendored
View file

@ -1,5 +1,5 @@
# possible installation of codec2 within freedata-server # possible installation of codec2 within freedata_server
freedata-server/codec2 freedata_server/codec2
# temporary test artifacts # temporary test artifacts
**/build **/build
@ -24,12 +24,12 @@ coverage.sh
coverage.xml coverage.xml
#ignore node_modules #ignore node_modules
/freedata-gui/node_modules/ /freedata_gui/node_modules/
#Ignore freedata-gui build items #Ignore freedata_gui build items
/freedata-gui/dist /freedata_gui/dist
/freedata-gui/release /freedata_gui/release
/freedata-gui/dist-electron /freedata_gui/dist-electron
#Ignore GUI config #Ignore GUI config
/freedata-gui/config/config.json /freedata_gui/config/config.json

View file

@ -2,4 +2,4 @@
build build
coverage coverage
assets assets
freedata-gui/src/waterfall freedata_gui/src/waterfall

View file

Before

Width:  |  Height:  |  Size: 590 KiB

After

Width:  |  Height:  |  Size: 590 KiB

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