Mercurial > hg > sonic-visualiser

changeset 2045:555e3add86b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename piper-cpp subrepo to piper-vamp-cpp to match the upstream repo name
author Chris Cannam
date Wed, 17 Oct 2018 15:58:13 +0100
parents ed3c462839b2
children 46c54b4d0b7e
files base.pri base.pro capnp-regen.pri convert.pro deploy/win64/build-32.bat deploy/win64/build-64.bat repoint-lock.json repoint-project.json server.pro
diffstat 9 files changed, 27 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/base.pri	Wed Oct 17 15:50:33 2018 +0100
+++ b/base.pri	Wed Oct 17 15:58:13 2018 +0100
@@ -7,7 +7,7 @@
 	bqresample \
 	bqaudioio \
 	bqaudioio/bqaudioio \
-	piper-cpp \
+	piper-vamp-cpp \
 	checker \
 	checker/checker \
 	dataquay \
--- a/base.pro	Wed Oct 17 15:50:33 2018 +0100
+++ b/base.pro	Wed Oct 17 15:58:13 2018 +0100
@@ -35,7 +35,7 @@
 CHECKER_SOURCES=$$fromfile(checker/checker.pri, SOURCES)
 CHECKER_HEADERS=$$fromfile(checker/checker.pri, HEADERS)
                  
-CLIENT_HEADERS=$$fromfile(piper-cpp/vamp-client/qt/test.pro, HEADERS)
+CLIENT_HEADERS=$$fromfile(piper-vamp-cpp/vamp-client/qt/test.pro, HEADERS)
 
 for (file, BQ_SOURCES)       { SOURCES += $$file }
 for (file, BQ_HEADERS)       { HEADERS += $$file }
@@ -53,8 +53,8 @@
 for (file, SVCORE_HEADERS)   { HEADERS += $$sprintf("svcore/%1", $$file) }
              
 for (file, CLIENT_HEADERS) {
-    HEADERS += $$sprintf("piper-cpp/vamp-client/qt/%1",  $$file)
+    HEADERS += $$sprintf("piper-vamp-cpp/vamp-client/qt/%1",  $$file)
 }
 
-SOURCES += piper-cpp/vamp-capnp/piper-capnp.cpp
+SOURCES += piper-vamp-cpp/vamp-capnp/piper-capnp.cpp
 
--- a/capnp-regen.pri	Wed Oct 17 15:50:33 2018 +0100
+++ b/capnp-regen.pri	Wed Oct 17 15:58:13 2018 +0100
@@ -1,17 +1,17 @@
 
-capnpc.target = piper-cpp/vamp-capnp/piper.capnp.h
+capnpc.target = piper-vamp-cpp/vamp-capnp/piper.capnp.h
 capnpc.depends = $$PWD/piper/capnp/piper.capnp
 
-capnpc.commands = capnp compile --src-prefix=$$PWD/piper/capnp -oc++:$$PWD/piper-cpp/vamp-capnp $$capnpc.depends
+capnpc.commands = capnp compile --src-prefix=$$PWD/piper/capnp -oc++:$$PWD/piper-vamp-cpp/vamp-capnp $$capnpc.depends
 
 macx* {
     exists(sv-dependency-builds) {
-        capnpc.commands=$$PWD/sv-dependency-builds/osx/bin/capnp -I$$PWD/sv-dependency-builds/osx/include compile --src-prefix=$$PWD/piper/capnp -o$$PWD/sv-dependency-builds/osx/bin/capnpc-c++:$$PWD/piper-cpp/vamp-capnp $$capnpc.depends
+        capnpc.commands=$$PWD/sv-dependency-builds/osx/bin/capnp -I$$PWD/sv-dependency-builds/osx/include compile --src-prefix=$$PWD/piper/capnp -o$$PWD/sv-dependency-builds/osx/bin/capnpc-c++:$$PWD/piper-vamp-cpp/vamp-capnp $$capnpc.depends
     }
 }
 
 win32-g++ {
-    capnpc.commands=$$PWD/sv-dependency-builds/win32-mingw/bin/capnp -I$$PWD/sv-dependency-builds/win32-mingw/include compile --src-prefix=$$PWD/piper/capnp -o$$PWD/sv-dependency-builds/win32-mingw/bin/capnpc-c++:$$PWD/piper-cpp/vamp-capnp $$capnpc.depends
+    capnpc.commands=$$PWD/sv-dependency-builds/win32-mingw/bin/capnp -I$$PWD/sv-dependency-builds/win32-mingw/include compile --src-prefix=$$PWD/piper/capnp -o$$PWD/sv-dependency-builds/win32-mingw/bin/capnpc-c++:$$PWD/piper-vamp-cpp/vamp-capnp $$capnpc.depends
 }
 
 win32-msvc* {
@@ -26,8 +26,8 @@
     # I hope using the relative path as target should fix it without
     # breaking the VC2015 build.
 
-    capnpc.target = ../$$basename(PWD)/piper-cpp/vamp-capnp/piper.capnp.h
-    capnpc.commands=$$PWD/sv-dependency-builds/win64-msvc/bin/capnp -I$$PWD/sv-dependency-builds/win64-msvc/include compile --src-prefix=$$PWD/piper/capnp -o$$PWD/sv-dependency-builds/win64-msvc/bin/capnpc-c++:$$PWD/piper-cpp/vamp-capnp $$capnpc.depends
+    capnpc.target = ../$$basename(PWD)/piper-vamp-cpp/vamp-capnp/piper.capnp.h
+    capnpc.commands=$$PWD/sv-dependency-builds/win64-msvc/bin/capnp -I$$PWD/sv-dependency-builds/win64-msvc/include compile --src-prefix=$$PWD/piper/capnp -o$$PWD/sv-dependency-builds/win64-msvc/bin/capnpc-c++:$$PWD/piper-vamp-cpp/vamp-capnp $$capnpc.depends
 }
 
 QMAKE_EXTRA_TARGETS += capnpc
--- a/convert.pro	Wed Oct 17 15:50:33 2018 +0100
+++ b/convert.pro	Wed Oct 17 15:58:13 2018 +0100
@@ -31,7 +31,7 @@
 OBJECTS_DIR = o
 MOC_DIR = o
 
-INCLUDEPATH += piper-cpp piper-cpp/ext vamp-plugin-sdk
+INCLUDEPATH += piper-vamp-cpp piper-vamp-cpp/ext vamp-plugin-sdk
 
 include(vamp-plugin-sdk-files.pri)
 
@@ -39,10 +39,10 @@
 for (file, VAMP_HEADERS) { HEADERS += $$file }
 
 HEADERS += \
-        piper-cpp/vamp-capnp/piper.capnp.h \
-        piper-cpp/vamp-capnp/VampnProto.h
+        piper-vamp-cpp/vamp-capnp/piper.capnp.h \
+        piper-vamp-cpp/vamp-capnp/VampnProto.h
 
 SOURCES += \
-        piper-cpp/vamp-capnp/piper-capnp.cpp \
-        piper-cpp/ext/json11/json11.cpp \
-        piper-cpp/vamp-server/convert.cpp
+        piper-vamp-cpp/vamp-capnp/piper-capnp.cpp \
+        piper-vamp-cpp/ext/json11/json11.cpp \
+        piper-vamp-cpp/vamp-server/convert.cpp
--- a/deploy/win64/build-32.bat	Wed Oct 17 15:50:33 2018 +0100
+++ b/deploy/win64/build-32.bat	Wed Oct 17 15:58:13 2018 +0100
@@ -17,7 +17,7 @@
 call .\repoint install
 if %errorlevel% neq 0 exit /b %errorlevel%
 
-sv-dependency-builds\win32-mingw\bin\capnp -Isv-dependency-builds/win32-mingw/include compile --src-prefix=piper/capnp -osv-dependency-builds/win32-mingw/bin/capnpc-c++:piper-cpp/vamp-capnp piper/capnp/piper.capnp
+sv-dependency-builds\win32-mingw\bin\capnp -Isv-dependency-builds/win32-mingw/include compile --src-prefix=piper/capnp -osv-dependency-builds/win32-mingw/bin/capnpc-c++:piper-vamp-cpp/vamp-capnp piper/capnp/piper.capnp
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 mkdir build_win32
--- a/deploy/win64/build-64.bat	Wed Oct 17 15:50:33 2018 +0100
+++ b/deploy/win64/build-64.bat	Wed Oct 17 15:58:13 2018 +0100
@@ -26,7 +26,7 @@
 call .\repoint install
 if %errorlevel% neq 0 exit /b %errorlevel%
 
-sv-dependency-builds\win64-msvc\bin\capnp -Isv-dependency-builds/win64-msvc/include compile --src-prefix=piper/capnp -osv-dependency-builds/win64-msvc/bin/capnpc-c++:piper-cpp/vamp-capnp piper/capnp/piper.capnp
+sv-dependency-builds\win64-msvc\bin\capnp -Isv-dependency-builds/win64-msvc/include compile --src-prefix=piper/capnp -osv-dependency-builds/win64-msvc/bin/capnpc-c++:piper-vamp-cpp/vamp-capnp piper/capnp/piper.capnp
 if %errorlevel% neq 0 exit /b %errorlevel%
 
 mkdir build_win64
--- a/repoint-lock.json	Wed Oct 17 15:50:33 2018 +0100
+++ b/repoint-lock.json	Wed Oct 17 15:58:13 2018 +0100
@@ -18,7 +18,7 @@
     "piper": {
       "pin": "f5a04ffe4d5a0ae01e77018a86a59b48a425e674"
     },
-    "piper-cpp": {
+    "piper-vamp-cpp": {
       "pin": "a8eeb547656279ad44901f4a71525b3913e91617"
     },
     "dataquay": {
--- a/repoint-project.json	Wed Oct 17 15:50:33 2018 +0100
+++ b/repoint-project.json	Wed Oct 17 15:58:13 2018 +0100
@@ -36,11 +36,10 @@
             "service": "github",
             "owner": "piper-audio"
         },
-        "piper-cpp": {
+        "piper-vamp-cpp": {
             "vcs": "git",
             "service": "github",
-            "owner": "piper-audio",
-            "repository": "piper-vamp-cpp"
+            "owner": "piper-audio"
         },
         "dataquay": {
             "vcs": "hg",
--- a/server.pro	Wed Oct 17 15:50:33 2018 +0100
+++ b/server.pro	Wed Oct 17 15:58:13 2018 +0100
@@ -30,7 +30,7 @@
 OBJECTS_DIR = o
 MOC_DIR = o
 
-INCLUDEPATH += piper-cpp piper-cpp/ext vamp-plugin-sdk
+INCLUDEPATH += piper-vamp-cpp piper-vamp-cpp/ext vamp-plugin-sdk
 
 include(vamp-plugin-sdk-files.pri)
 
@@ -38,10 +38,10 @@
 for (file, VAMP_HEADERS) { HEADERS += $$file }
 
 HEADERS += \
-        piper-cpp/vamp-capnp/piper.capnp.h \
-        piper-cpp/vamp-capnp/VampnProto.h
+        piper-vamp-cpp/vamp-capnp/piper.capnp.h \
+        piper-vamp-cpp/vamp-capnp/VampnProto.h
 
 SOURCES += \
-        piper-cpp/vamp-capnp/piper-capnp.cpp \
-        piper-cpp/ext/json11/json11.cpp \
-        piper-cpp/vamp-server/simple-server.cpp
+        piper-vamp-cpp/vamp-capnp/piper-capnp.cpp \
+        piper-vamp-cpp/ext/json11/json11.cpp \
+        piper-vamp-cpp/vamp-server/simple-server.cpp