Skip to content

Commit

Permalink
Remove VS15 project files
Browse files Browse the repository at this point in the history
  • Loading branch information
zuckschwerdt committed Apr 24, 2022
1 parent d67ee96 commit 063294f
Show file tree
Hide file tree
Showing 10 changed files with 3 additions and 1,363 deletions.
54 changes: 3 additions & 51 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:

env:
# from https://downloads.myriadrf.org/builds/PothosSDR/
pothos-ver: 2021.05.01-vc16
pothos-exe: PothosSDR-2021.05.01-vc16-x64.exe
pothos-ver: 2021.07.25-vc16
pothos-exe: PothosSDR-2021.07.25-vc16-x64.exe

jobs:
downloads_job:
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
os: [windows-2016, windows-2019]
platform: [x64, Win32]
# from https://downloads.myriadrf.org/builds/PothosSDR/
#pothos-ver: [2021.05.01-vc16]
#pothos-ver: [2021.07.25-vc16]
include:
- os: windows-2016
generator: Visual Studio 15 2017
Expand Down Expand Up @@ -193,54 +193,6 @@ jobs:
asset_name: rtl_433-win-msvc-x64-${{ needs.release_job.outputs.release_version }}.zip
asset_content_type: application/zip

build_vsc_job:
needs: downloads_job
strategy:
fail-fast: false
matrix:
os: [windows-2016]
platform: [x64]
include:
- os: windows-2016
generator: Visual Studio 15 2017
runs-on: ${{ matrix.os }}
name: ${{ matrix.generator }} ${{ matrix.platform }} VS (MSBuild) on ${{ matrix.os }}
steps:
- run: choco install openssl
if: matrix.platform == 'x64'
- uses: actions/checkout@v2
- uses: actions/cache@v2
id: downloads
if: matrix.platform == 'x64'
with:
path: ${{ runner.workspace }}/${{ env.pothos-exe }}
key: download-${{ env.pothos-ver }}
- name: Run Downloads
if: matrix.platform == 'x64' && steps.downloads.outputs.cache-hit != 'true'
shell: bash
working-directory: ${{ runner.workspace }}
run: curl -L -O https://downloads.myriadrf.org/builds/PothosSDR/${{ env.pothos-exe }}
- name: Install Deps
if: matrix.platform == 'x64'
shell: bash
working-directory: ${{ runner.workspace }}
run: |
mkdir -p pothos
7z x -opothos -y ${{ env.pothos-exe }}
mkdir -p libusb/include
cp -a pothos/include libusb
mkdir -p libusb/MS64/dll
cp pothos/lib/libusb-1.0.lib libusb/MS64/dll
cp pothos/bin/libusb-1.0.dll libusb/MS64/dll
mkdir -p rtl-sdr/x64
cp -a pothos/include/* rtl-sdr
cp pothos/lib/rtlsdr.lib rtl-sdr/x64
cp pothos/bin/rtlsdr.dll rtl-sdr/x64
- uses: microsoft/[email protected]
- name: MSBuild
working-directory: vs15
run: msbuild rtl_433.sln /property:Configuration=Release /property:Platform=${{ matrix.platform }}

build_linux_job:
strategy:
fail-fast: false
Expand Down
1 change: 0 additions & 1 deletion docs/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ README.md
CHANGELOG.md
EXAMPLES.md
TESTS.md
VS15.md
1 change: 0 additions & 1 deletion docs/.vuepress/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ module.exports = {
sidebar: [
['/', 'Overview'],
'BUILDING',
'VS15',
'CHANGELOG',
'CONTRIBUTING',
'PRIMER',
Expand Down
10 changes: 0 additions & 10 deletions docs/BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -200,14 +200,4 @@ SET(Threads_FOUND TRUE)
* you need to place it in the same folder as librtlsdr.dll and libusb-1.0.dll (you should have seen both of them by now)
* good luck!

### Visual Studio 2017 supplied project/solution

* Open the `rtl_433.sln` from the `vs15` folder -or-

```
cd rtl_433
cd vs15
MSBuild.exe rtl_433.sln
```

If your system is missing or you find these steps are outdated please PR an update or open an issue.
1 change: 0 additions & 1 deletion docs/build-docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ cd ${0%/*}
sed 's/docs\///' ../README.md >README.md
cp ../CHANGELOG.md .
cp ../rtl_433_tests/README.md TESTS.md
cp ../vs15/README.md VS15.md

# build
yarn install
Expand Down
39 changes: 0 additions & 39 deletions maintainer_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,45 +139,6 @@ def parse_devices(devices_text):
# check that everything between '#define DEVICES' and \n\n with DECL(device_name) matches r_devices
# TODO: implement the check...

# vs15/rtl_433.vcxproj
# <ItemGroup>
# <ClInclude Include="..\include\baseband.h" />
# ...
# </ItemGroup>
repl = (r'" />\n <ClInclude Include="..\\include\\'.join(include_files))
replace_block(r'^ <ItemGroup>\n <ClInclude Include="..\\include\\',
r'" />\n <ClInclude Include="..\\src\\getopt', repl, 'vs15/rtl_433.vcxproj')
# <ItemGroup>
# <ClCompile Include="..\src\baseband.c" />
# ...
# </ItemGroup>
repl = src_files + device_files
repl = [p.replace('/', r'\\') for p in repl]
repl = (r'" />\n <ClCompile Include="..\\src\\'.join(repl))
replace_block(r'^ <ItemGroup>\n <ClCompile Include="..\\src\\',
r'" />\n <ClCompile Include="..\\src\\getopt', repl, 'vs15/rtl_433.vcxproj')

# vs15/rtl_433.vcxproj.filters
# <ItemGroup>
# <ClInclude Include="..\include\baseband.h">
# <Filter>Header Files</Filter>
# </ClInclude>
# ...
# </ItemGroup>
# "Header Files"
repl = (r'">\n <Filter>Header Files</Filter>\n </ClInclude>\n <ClInclude Include="..\\include\\'.join(include_files))
replace_block(r'^ <ItemGroup>\n <ClInclude Include="..\\include\\',
r'">\n <Filter>Header Files</Filter>\n </ClInclude>\n <ClInclude Include="..\\src\\getopt', repl, 'vs15/rtl_433.vcxproj.filters')
# "Source Files"
repl = (r'">\n <Filter>Source Files</Filter>\n </ClCompile>\n <ClCompile Include="..\\src\\'.join(src_files))
replace_block(r'^ <ItemGroup>\n <ClCompile Include="..\\src\\',
r'">\n <Filter>Source Files</Filter>\n </ClCompile>\n <ClCompile Include="..\\src\\getopt', repl, 'vs15/rtl_433.vcxproj.filters')
# "Source Files\devices"
repl = [p.replace('devices/', '') for p in device_files]
repl = (r'">\n <Filter>Source Files\\devices</Filter>\n </ClCompile>\n <ClCompile Include="..\\src\\devices\\'.join(repl))
replace_block(r'^ <ClCompile Include="..\\src\\devices\\',
r'">\n <Filter>Source Files\\devices</Filter>\n </ClCompile>\n </ItemGroup>', repl, 'vs15/rtl_433.vcxproj.filters')

if (not os.path.isfile("./build/src/rtl_433")):
print("\nWARNING: rtl_433 binary not found: skipping README/man generation!\n")
exit(0)
Expand Down
25 changes: 0 additions & 25 deletions vs15/README.md

This file was deleted.

22 changes: 0 additions & 22 deletions vs15/rtl_433.sln

This file was deleted.

Loading

0 comments on commit 063294f

Please sign in to comment.