From dabed0b3cf854f5857b1547db25ce33718c9d0a1 Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 29 Jul 2015 23:00:03 +0200 Subject: [PATCH 1/2] [LMSAPI] move proto files into lms-api/proto --- {src/lms-api => lms-api}/proto/auth.proto | 0 {src/lms-api => lms-api}/proto/collection.proto | 0 {src/lms-api => lms-api}/proto/common.proto | 0 {src/lms-api => lms-api}/proto/media.proto | 0 {src/lms-api => lms-api}/proto/messages.proto | 0 src/Makefile.am | 4 ++-- test/Makefile.am | 4 ++-- 7 files changed, 4 insertions(+), 4 deletions(-) rename {src/lms-api => lms-api}/proto/auth.proto (100%) rename {src/lms-api => lms-api}/proto/collection.proto (100%) rename {src/lms-api => lms-api}/proto/common.proto (100%) rename {src/lms-api => lms-api}/proto/media.proto (100%) rename {src/lms-api => lms-api}/proto/messages.proto (100%) diff --git a/src/lms-api/proto/auth.proto b/lms-api/proto/auth.proto similarity index 100% rename from src/lms-api/proto/auth.proto rename to lms-api/proto/auth.proto diff --git a/src/lms-api/proto/collection.proto b/lms-api/proto/collection.proto similarity index 100% rename from src/lms-api/proto/collection.proto rename to lms-api/proto/collection.proto diff --git a/src/lms-api/proto/common.proto b/lms-api/proto/common.proto similarity index 100% rename from src/lms-api/proto/common.proto rename to lms-api/proto/common.proto diff --git a/src/lms-api/proto/media.proto b/lms-api/proto/media.proto similarity index 100% rename from src/lms-api/proto/media.proto rename to lms-api/proto/media.proto diff --git a/src/lms-api/proto/messages.proto b/lms-api/proto/messages.proto similarity index 100% rename from src/lms-api/proto/messages.proto rename to lms-api/proto/messages.proto diff --git a/src/Makefile.am b/src/Makefile.am index e537e5c2..2f9310ae 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -112,8 +112,8 @@ MOSTLYCLEANFILES = \ $(builddir)/messages.pb.cc \ $(builddir)/messages.pb.h -%.pb.cc %.pb.h: $(srcdir)/lms-api/proto/%.proto - $(PROTOC) --proto_path=$(srcdir)/lms-api/proto/ --cpp_out=$(builddir)/ $^ +%.pb.cc %.pb.h: $(top_srcdir)/lms-api/proto/%.proto + $(PROTOC) --proto_path=$(top_srcdir)/lms-api/proto/ --cpp_out=$(builddir)/ $^ endif diff --git a/test/Makefile.am b/test/Makefile.am index d551d4f7..e4cedacb 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -26,8 +26,8 @@ BUILT_SOURCES = \ remote_client_CXXFLAGS=-std=c++11 -Wall -Wextra -DBOOST_LOG_DYN_LINK -I$(top_srcdir)/src -%.pb.cc %.pb.h: $(top_srcdir)/src/lms-api/proto/%.proto - $(PROTOC) --proto_path=$(top_srcdir)/src/lms-api/proto/ --cpp_out=$(builddir)/ $^ +%.pb.cc %.pb.h: $(top_srcdir)/lms-api/proto/%.proto + $(PROTOC) --proto_path=$(top_srcdir)/lms-api/proto/ --cpp_out=$(builddir)/ $^ endif From 773eba50f0104ee6bd13e77c8854900f0ab56506 Mon Sep 17 00:00:00 2001 From: emeric Date: Wed, 29 Jul 2015 23:06:47 +0200 Subject: [PATCH 2/2] [LMSAPI] Removed unused proto file --- lms-api/proto/auth.proto | 2 -- lms-api/proto/collection.proto | 2 -- lms-api/proto/common.proto | 27 --------------------------- lms-api/proto/media.proto | 2 -- lms-api/proto/messages.proto | 2 -- src/Makefile.am | 6 ------ test/Makefile.am | 2 -- 7 files changed, 43 deletions(-) delete mode 100644 lms-api/proto/common.proto diff --git a/lms-api/proto/auth.proto b/lms-api/proto/auth.proto index b054ef06..1ad02a48 100644 --- a/lms-api/proto/auth.proto +++ b/lms-api/proto/auth.proto @@ -17,8 +17,6 @@ * along with LMS. If not, see . */ -import "common.proto"; - package LmsAPI; message AuthRequest diff --git a/lms-api/proto/collection.proto b/lms-api/proto/collection.proto index 8037ab02..8666a98b 100644 --- a/lms-api/proto/collection.proto +++ b/lms-api/proto/collection.proto @@ -17,8 +17,6 @@ * along with LMS. If not, see . */ -import "common.proto"; - package LmsAPI; message AudioCollectionRequest diff --git a/lms-api/proto/common.proto b/lms-api/proto/common.proto deleted file mode 100644 index 3042d84d..00000000 --- a/lms-api/proto/common.proto +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2013 Emeric Poupon - * - * This file is part of LMS. - * - * LMS is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * LMS is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with LMS. If not, see . - */ - -package LmsAPI; - -message Error -{ - required bool error = 1; - optional string message = 2; -} - diff --git a/lms-api/proto/media.proto b/lms-api/proto/media.proto index 5dae7257..20af5d02 100644 --- a/lms-api/proto/media.proto +++ b/lms-api/proto/media.proto @@ -17,8 +17,6 @@ * along with LMS. If not, see . */ -import "common.proto"; - package LmsAPI; message MediaRequest diff --git a/lms-api/proto/messages.proto b/lms-api/proto/messages.proto index 7ba930c3..a6eb280b 100644 --- a/lms-api/proto/messages.proto +++ b/lms-api/proto/messages.proto @@ -17,8 +17,6 @@ * along with LMS. If not, see . */ -import "common.proto"; - import "auth.proto"; import "collection.proto"; import "media.proto"; diff --git a/src/Makefile.am b/src/Makefile.am index 2f9310ae..e60d4e1c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -81,8 +81,6 @@ nodist_lms_SOURCES = \ $(builddir)/auth.pb.h \ $(builddir)/collection.pb.cc \ $(builddir)/collection.pb.h \ - $(builddir)/common.pb.cc \ - $(builddir)/common.pb.h \ $(builddir)/media.pb.cc \ $(builddir)/media.pb.h \ $(builddir)/messages.pb.cc \ @@ -93,8 +91,6 @@ BUILT_SOURCES = \ $(builddir)/auth.pb.h \ $(builddir)/collection.pb.cc \ $(builddir)/collection.pb.h \ - $(builddir)/common.pb.cc \ - $(builddir)/common.pb.h \ $(builddir)/media.pb.cc \ $(builddir)/media.pb.h \ $(builddir)/messages.pb.cc \ @@ -105,8 +101,6 @@ MOSTLYCLEANFILES = \ $(builddir)/auth.pb.h \ $(builddir)/collection.pb.cc \ $(builddir)/collection.pb.h \ - $(builddir)/common.pb.cc \ - $(builddir)/common.pb.h \ $(builddir)/media.pb.cc \ $(builddir)/media.pb.h \ $(builddir)/messages.pb.cc \ diff --git a/test/Makefile.am b/test/Makefile.am index e4cedacb..6b3dddd6 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -13,14 +13,12 @@ remote_client_SOURCES = \ nodist_remote_client_SOURCES = \ $(builddir)/auth.pb.cc \ $(builddir)/collection.pb.cc \ - $(builddir)/common.pb.cc \ $(builddir)/media.pb.cc \ $(builddir)/messages.pb.cc BUILT_SOURCES = \ $(builddir)/auth.pb.h \ $(builddir)/collection.pb.h \ - $(builddir)/common.pb.h \ $(builddir)/media.pb.h \ $(builddir)/messages.pb.h