Skip to content

Commit

Permalink
Merge pull request #13 from cannam/ci
Browse files Browse the repository at this point in the history
CI builds and doc updates
  • Loading branch information
cannam authored Feb 19, 2024
2 parents fff6ed6 + 42bd1bd commit 0ee0a3d
Show file tree
Hide file tree
Showing 39 changed files with 414 additions and 337 deletions.
19 changes: 0 additions & 19 deletions .appveyor.yml

This file was deleted.

31 changes: 31 additions & 0 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Linux CI

on: [push, pull_request]

jobs:
build:

runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4
with:
path: vamp-plugin-sdk
- uses: actions/checkout@v4
with:
repository: vamp-plugins/vamp-test-plugin
path: vamp-test-plugin
- name: deps
run: |
sudo apt-get install -y build-essential cmake libsndfile-dev
- name: make
run: |
cd vamp-plugin-sdk
mkdir build
cd build
cmake .. -DVAMPSDK_BUILD_EXAMPLE_PLUGINS=ON -DVAMPSDK_BUILD_SIMPLE_HOST=ON -DVAMPSDK_BUILD_RDFGEN=ON
make
- name: test-plugin-regression
run: |
cd vamp-plugin-sdk
./test/run-test-plugin-regression.sh
20 changes: 20 additions & 0 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: macOS CI

on: [push, pull_request]

jobs:
build:

runs-on: macos-latest

steps:
- uses: actions/checkout@v4
- name: deps
run: |
brew install cmake libsndfile
- name: make
run: |
mkdir build
cd build
cmake .. -DVAMPSDK_BUILD_EXAMPLE_PLUGINS=ON -DVAMPSDK_BUILD_SIMPLE_HOST=ON -DVAMPSDK_BUILD_RDFGEN=ON
make
23 changes: 23 additions & 0 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Windows CI

on: [push, pull_request]

jobs:
build:

runs-on: windows-2022

steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.x'
- name: deps
run: |
pip install ninja
- name: make
run: |
mkdir build
cd build
cmake .. -G Ninja -DVAMPSDK_BUILD_EXAMPLE_PLUGINS=ON -DVAMPSDK_BUILD_RDFGEN=ON
ninja
2 changes: 1 addition & 1 deletion .hgignore → .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
syntax: glob
doc/
*.o
autom4te*
Expand Down Expand Up @@ -31,3 +30,4 @@ test/obtained
test/failures
*.VC.db
*.VC.opendb
buildfiles
25 changes: 0 additions & 25 deletions .travis.yml

This file was deleted.

12 changes: 12 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ add_library(
src/vamp-sdk/FFT.cpp
src/vamp-sdk/PluginAdapter.cpp
src/vamp-sdk/RealTime.cpp
src/vamp-sdk/acsymbols.c
)
set_target_properties(vamp-sdk PROPERTIES POSITION_INDEPENDENT_CODE ON) # to be linked to shared plugin libraries
target_include_directories(vamp-sdk PUBLIC .)
Expand All @@ -32,6 +33,8 @@ add_library(
src/vamp-hostsdk/PluginSummarisingAdapter.cpp
src/vamp-hostsdk/PluginWrapper.cpp
src/vamp-hostsdk/RealTime.cpp
src/vamp-hostsdk/host-c.cpp
src/vamp-hostsdk/acsymbols.c
)
target_link_libraries(vamp-hostsdk PUBLIC ${CMAKE_DL_LIBS})
target_include_directories(vamp-hostsdk PUBLIC .)
Expand All @@ -54,6 +57,15 @@ if(VAMPSDK_BUILD_EXAMPLE_PLUGINS)
set_target_properties(vamp-example-plugins PROPERTIES PREFIX "") # remove lib* prefix
target_link_libraries(vamp-example-plugins PRIVATE vamp-sdk)
endif()
if(MSVC)
set_target_properties(vamp-example-plugins PROPERTIES LINK_FLAGS /EXPORT:vampGetPluginDescriptor)
else()
if(APPLE)
set_target_properties(vamp-example-plugins PROPERTIES LINK_FLAGS "-exported_symbols_list ${CMAKE_SOURCE_DIR}/vamp-plugin.list")
else()
set_target_properties(vamp-example-plugins PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/vamp-plugin.map")
endif(APPLE)
endif(MSVC)

# simple host
option(VAMPSDK_BUILD_SIMPLE_HOST "Build simple host" OFF)
Expand Down
2 changes: 1 addition & 1 deletion COPYING
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Vamp Plugin SDK
Copyright (c) 2005-2006 Chris Cannam
Copyright (c) 2006-2017 Queen Mary, University of London
Copyright (c) 2006-2024 Queen Mary, University of London

Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
Expand Down
14 changes: 0 additions & 14 deletions INSTALL

This file was deleted.

4 changes: 2 additions & 2 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ HOSTSDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,-soname=$(INSTALL_HOSTSDK_LINK_
# Additional flags for making a plugin. This version script tells the
# GNU linker to make all symbols in the library hidden except for the
# public entry point. It's not essential, but makes a tidier library.
PLUGIN_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,--version-script=build/vamp-plugin.map
PLUGIN_LDFLAGS = $(DYNAMIC_LDFLAGS) -Wl,--version-script=vamp-plugin.map


# Adapt install details when found to be running on OSX (thanks to David O)
Expand All @@ -111,7 +111,7 @@ ifeq ($(uname_S),Darwin)
DYNAMIC_LDFLAGS = -dynamiclib
SDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS)
HOSTSDK_DYNAMIC_LDFLAGS = $(DYNAMIC_LDFLAGS)
PLUGIN_LDFLAGS = $(DYNAMIC_LDFLAGS) -exported_symbols_list build/vamp-plugin.list
PLUGIN_LDFLAGS = $(DYNAMIC_LDFLAGS) -exported_symbols_list vamp-plugin.list

INSTALL_HOSTSDK_LIBNAME = libvamp-hostsdk.3.10.0.dylib
INSTALL_HOSTSDK_LINK_ABI = libvamp-hostsdk.3.dylib
Expand Down
Loading

0 comments on commit 0ee0a3d

Please sign in to comment.