salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-31 11:17:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Move common.proto into config.

Browse Source
This commit is contained in:
David Given
2024-10-19 16:58:44 +02:00
parent 944ac97ba4
commit 33d241c33e
38 changed files with 55 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/agat/agat.proto
View File

@@ -1,6 +1,6 @@
syntax = "proto2"; syntax = "proto2";
import "lib/common.proto"; import "lib/config/common.proto";
message AgatDecoderProto {} message AgatDecoderProto {}

2
arch/amiga/amiga.proto
View File

@@ -1,6 +1,6 @@
syntax = "proto2"; syntax = "proto2";
import "lib/common.proto"; import "lib/config/common.proto";
message AmigaDecoderProto {} message AmigaDecoderProto {}

2
arch/apple2/apple2.proto
View File

@@ -1,6 +1,6 @@
syntax = "proto2"; syntax = "proto2";
import "lib/common.proto"; import "lib/config/common.proto";
message Apple2DecoderProto { message Apple2DecoderProto {
optional uint32 side_one_track_offset = 1 optional uint32 side_one_track_offset = 1

4
arch/build.py
View File

@@ -24,10 +24,10 @@ proto(
"./victor9k/victor9k.proto", "./victor9k/victor9k.proto",
"./zilogmcz/zilogmcz.proto", "./zilogmcz/zilogmcz.proto",
], ],
deps=["lib+common_proto"], deps=["lib/config+common_proto"],
) )
protocc(name="proto_lib", srcs=[".+proto"], deps=["lib+common_proto_lib"]) protocc(name="proto_lib", srcs=[".+proto"], deps=["lib/config+common_proto_lib"])
cxxlibrary( cxxlibrary(
name="arch", name="arch",

2
arch/c64/c64.proto
View File

@@ -1,6 +1,6 @@
syntax = "proto2"; syntax = "proto2";
import "lib/common.proto"; import "lib/config/common.proto";
message Commodore64DecoderProto {} message Commodore64DecoderProto {}

2
arch/ibm/ibm.proto
View File

@@ -1,6 +1,6 @@
syntax = "proto2"; syntax = "proto2";
import "lib/common.proto"; import "lib/config/common.proto";
message IbmDecoderProto { message IbmDecoderProto {
// Next: 11 // Next: 11

2
arch/macintosh/macintosh.proto
View File

@@ -1,6 +1,6 @@
syntax = "proto2"; syntax = "proto2";
import "lib/common.proto"; import "lib/config/common.proto";
message MacintoshDecoderProto {} message MacintoshDecoderProto {}

2
arch/micropolis/micropolis.proto
View File

@@ -1,6 +1,6 @@
syntax = "proto2"; syntax = "proto2";
import "lib/common.proto"; import "lib/config/common.proto";
message MicropolisDecoderProto { message MicropolisDecoderProto {
enum ChecksumType { enum ChecksumType {

2
arch/northstar/northstar.proto
View File

@@ -1,6 +1,6 @@
syntax = "proto2"; syntax = "proto2";
import "lib/common.proto"; import "lib/config/common.proto";
message NorthstarDecoderProto {} message NorthstarDecoderProto {}

2
arch/tartu/tartu.proto
View File

@@ -1,6 +1,6 @@
syntax = "proto2"; syntax = "proto2";
import "lib/common.proto"; import "lib/config/common.proto";
message TartuDecoderProto {} message TartuDecoderProto {}

2
arch/tids990/tids990.proto
View File

@@ -1,6 +1,6 @@
syntax = "proto2"; syntax = "proto2";
import "lib/common.proto"; import "lib/config/common.proto";
message Tids990DecoderProto {} message Tids990DecoderProto {}

2
arch/victor9k/victor9k.proto
View File

@@ -1,6 +1,6 @@
syntax = "proto2"; syntax = "proto2";
import "lib/common.proto"; import "lib/config/common.proto";
message Victor9kDecoderProto {} message Victor9kDecoderProto {}

7
lib/build.py
View File

@@ -1,7 +0,0 @@
from build.protobuf import proto, protocc
proto(name="common_proto", srcs=["./common.proto"])
protocc(
name="common_proto_lib", srcs=[".+common_proto"], deps=["+protobuf_lib"]
)

16
lib/config/build.py
View File

@@ -1,17 +1,22 @@
from build.c import cxxlibrary from build.c import cxxlibrary
from build.protobuf import proto, protocc from build.protobuf import proto, protocc
proto(name="common_proto", srcs=["./common.proto"])
protocc(
name="common_proto_lib", srcs=[".+common_proto"], deps=["+protobuf_lib"]
)
proto( proto(
name="drive_proto", name="drive_proto",
srcs=["./drive.proto"], srcs=["./drive.proto"],
deps=["lib+common_proto", "lib/external+fl2_proto", ".+layout_proto"], deps=[".+common_proto", "lib/external+fl2_proto", ".+layout_proto"],
) )
protocc( protocc(
name="drive_proto_lib", name="drive_proto_lib",
srcs=[".+drive_proto"], srcs=[".+drive_proto"],
deps=[ deps=[
".+layout_proto_lib", ".+layout_proto_lib",
"lib+common_proto_lib", ".+common_proto_lib",
"lib/external+fl2_proto_lib", "lib/external+fl2_proto_lib",
], ],
) )
@@ -19,12 +24,12 @@ protocc(
proto( proto(
name="layout_proto", name="layout_proto",
srcs=["./layout.proto"], srcs=["./layout.proto"],
deps=["lib+common_proto", "lib/external+fl2_proto"], deps=[".+common_proto", "lib/external+fl2_proto"],
) )
protocc( protocc(
name="layout_proto_lib", name="layout_proto_lib",
srcs=[".+layout_proto"], srcs=[".+layout_proto"],
deps=["lib+common_proto_lib", "lib/external+fl2_proto_lib"], deps=[".+common_proto_lib", "lib/external+fl2_proto_lib"],
) )
proto( proto(
@@ -33,7 +38,7 @@ proto(
deps=[ deps=[
".+drive_proto", ".+drive_proto",
".+layout_proto", ".+layout_proto",
"lib+common_proto", ".+common_proto",
"lib/decoders+proto", "lib/decoders+proto",
"lib/encoders+proto", "lib/encoders+proto",
"lib/external+fl2_proto", "lib/external+fl2_proto",
@@ -51,6 +56,7 @@ protocc(
srcs=[".+proto", "arch+proto"], srcs=[".+proto", "arch+proto"],
deps=[ deps=[
".+drive_proto_lib", ".+drive_proto_lib",
".+common_proto_lib",
"lib/decoders+proto_lib", "lib/decoders+proto_lib",
"lib/encoders+proto_lib", "lib/encoders+proto_lib",
"lib/external+fl2_proto_lib", "lib/external+fl2_proto_lib",

0
lib/common.proto → lib/config/common.proto
View File

2
lib/config/config.h
View File

@@ -4,7 +4,7 @@
#include <google/protobuf/message.h> #include <google/protobuf/message.h>
#include "lib/config/config.pb.h" #include "lib/config/config.pb.h"
#include "lib/common.pb.h" #include "lib/config/common.pb.h"
class ConfigProto; class ConfigProto;
class OptionProto; class OptionProto;

2
lib/config/config.proto
View File

@@ -9,7 +9,7 @@ import "lib/fluxsink/fluxsink.proto";
import "lib/usb/usb.proto"; import "lib/usb/usb.proto";
import "lib/vfs/vfs.proto"; import "lib/vfs/vfs.proto";
import "lib/config/drive.proto"; import "lib/config/drive.proto";
import "lib/common.proto"; import "lib/config/common.proto";
import "lib/config/layout.proto"; import "lib/config/layout.proto";
enum SupportStatus enum SupportStatus

2
lib/config/drive.proto
View File

@@ -1,6 +1,6 @@
syntax = "proto2"; syntax = "proto2";
import "lib/common.proto"; import "lib/config/common.proto";
import "lib/external/fl2.proto"; import "lib/external/fl2.proto";
// Next: 15 // Next: 15

2
lib/config/layout.proto
View File

@@ -1,6 +1,6 @@
syntax = "proto2"; syntax = "proto2";
import "lib/common.proto"; import "lib/config/common.proto";
import "lib/external/fl2.proto"; import "lib/external/fl2.proto";
message SectorListProto message SectorListProto

2
lib/config/proto.cc
View File

@@ -1,6 +1,6 @@
#include "lib/core/globals.h" #include "lib/core/globals.h"
#include "lib/config/proto.h" #include "lib/config/proto.h"
#include "lib/common.pb.h" #include "lib/config/common.pb.h"
#include <regex> #include <regex>
static ConfigProto config = []() static ConfigProto config = []()

2
lib/config/proto.h
View File

@@ -2,7 +2,7 @@
#define PROTO_H #define PROTO_H
#include <google/protobuf/message.h> #include <google/protobuf/message.h>
#include "lib/common.pb.h" #include "lib/config/common.pb.h"
#include "lib/config/config.pb.h" #include "lib/config/config.pb.h"
class ProtoPathNotFoundException : public ErrorException class ProtoPathNotFoundException : public ErrorException

4
lib/decoders/build.py
View File

@@ -4,13 +4,13 @@ from build.c import cxxlibrary
proto( proto(
name="proto", name="proto",
srcs=["./decoders.proto"], srcs=["./decoders.proto"],
deps=["lib+common_proto", "arch+proto", "lib/fluxsink+proto"], deps=["lib/config+common_proto", "arch+proto", "lib/fluxsink+proto"],
) )
protocc( protocc(
name="proto_lib", name="proto_lib",
srcs=[".+proto"], srcs=[".+proto"],
deps=["lib+common_proto_lib", "arch+proto_lib", "lib/fluxsink+proto_lib"], deps=["lib/config+common_proto_lib", "arch+proto_lib", "lib/fluxsink+proto_lib"],
) )
cxxlibrary( cxxlibrary(

2
lib/decoders/decoders.proto
View File

@@ -20,7 +20,7 @@ import "arch/tids990/tids990.proto";
import "arch/victor9k/victor9k.proto"; import "arch/victor9k/victor9k.proto";
import "arch/zilogmcz/zilogmcz.proto"; import "arch/zilogmcz/zilogmcz.proto";
import "lib/fluxsink/fluxsink.proto"; import "lib/fluxsink/fluxsink.proto";
import "lib/common.proto"; import "lib/config/common.proto";
//NEXT: 33 //NEXT: 33
message DecoderProto { message DecoderProto {

4
lib/encoders/build.py
View File

@@ -4,12 +4,12 @@ from build.c import cxxlibrary
proto( proto(
name="proto", name="proto",
srcs=["./encoders.proto"], srcs=["./encoders.proto"],
deps=["lib+common_proto", "arch+proto"], deps=["lib/config+common_proto", "arch+proto"],
) )
protocc( protocc(
name="proto_lib", name="proto_lib",
srcs=[".+proto"], srcs=[".+proto"],
deps=["lib+common_proto_lib", "arch+proto_lib"], deps=["lib/config+common_proto_lib", "arch+proto_lib"],
) )
cxxlibrary( cxxlibrary(

4
lib/fluxsink/build.py
View File

@@ -1,8 +1,8 @@
from build.protobuf import proto, protocc from build.protobuf import proto, protocc
from build.c import cxxlibrary from build.c import cxxlibrary
proto(name="proto", srcs=["./fluxsink.proto"], deps=["lib+common_proto"]) proto(name="proto", srcs=["./fluxsink.proto"], deps=["lib/config+common_proto"])
protocc(name="proto_lib", srcs=[".+proto"], deps=["lib+common_proto_lib"]) protocc(name="proto_lib", srcs=[".+proto"], deps=["lib/config+common_proto_lib"])
cxxlibrary( cxxlibrary(
name="fluxsink", name="fluxsink",

2
lib/fluxsink/fluxsink.proto
View File

@@ -1,6 +1,6 @@
syntax = "proto2"; syntax = "proto2";
import "lib/common.proto"; import "lib/config/common.proto";
message HardwareFluxSinkProto {} message HardwareFluxSinkProto {}

4
lib/fluxsource/build.py
View File

@@ -1,12 +1,12 @@
from build.protobuf import proto, protocc from build.protobuf import proto, protocc
from build.c import cxxlibrary from build.c import cxxlibrary
proto(name="proto", srcs=["./fluxsource.proto"], deps=["lib+common_proto"]) proto(name="proto", srcs=["./fluxsource.proto"], deps=["lib/config+common_proto"])
protocc( protocc(
name="proto_lib", name="proto_lib",
srcs=[".+proto"], srcs=[".+proto"],
deps=["lib+common_proto", "lib+common_proto_lib"], deps=["lib/config+common_proto", "lib/config+common_proto_lib"],
) )
cxxlibrary( cxxlibrary(

2
lib/fluxsource/fluxsource.proto
View File

@@ -1,6 +1,6 @@
syntax = "proto2"; syntax = "proto2";
import "lib/common.proto"; import "lib/config/common.proto";
message HardwareFluxSourceProto {} message HardwareFluxSourceProto {}

4
lib/imagereader/build.py
View File

@@ -4,12 +4,12 @@ from build.c import cxxlibrary
proto( proto(
name="proto", name="proto",
srcs=["./imagereader.proto"], srcs=["./imagereader.proto"],
deps=["lib+common_proto"], deps=["lib/config+common_proto"],
) )
protocc( protocc(
name="proto_lib", name="proto_lib",
srcs=[".+proto"], srcs=[".+proto"],
deps=["lib+common_proto_lib"], deps=["lib/config+common_proto_lib"],
) )
cxxlibrary( cxxlibrary(

2
lib/imagereader/imagereader.proto
View File

@@ -1,6 +1,6 @@
syntax = "proto2"; syntax = "proto2";
import "lib/common.proto"; import "lib/config/common.proto";
message ImgInputOutputProto {} message ImgInputOutputProto {}

4
lib/imagewriter/build.py
View File

@@ -4,12 +4,12 @@ from build.c import cxxlibrary
proto( proto(
name="proto", name="proto",
srcs=["./imagewriter.proto"], srcs=["./imagewriter.proto"],
deps=["lib+common_proto", "lib/imagereader+proto"], deps=["lib/config+common_proto", "lib/imagereader+proto"],
) )
protocc( protocc(
name="proto_lib", name="proto_lib",
srcs=[".+proto"], srcs=[".+proto"],
deps=["lib+common_proto_lib", "lib/imagereader+proto_lib"], deps=["lib/config+common_proto_lib", "lib/imagereader+proto_lib"],
) )
cxxlibrary( cxxlibrary(

2
lib/imagewriter/imagewriter.proto
View File

@@ -1,7 +1,7 @@
syntax = "proto2"; syntax = "proto2";
import "lib/imagereader/imagereader.proto"; import "lib/imagereader/imagereader.proto";
import "lib/common.proto"; import "lib/config/common.proto";
message D64OutputProto {} message D64OutputProto {}

4
lib/usb/build.py
View File

@@ -1,8 +1,8 @@
from build.protobuf import proto, protocc from build.protobuf import proto, protocc
from build.c import cxxlibrary from build.c import cxxlibrary
proto(name="proto", srcs=["./usb.proto"], deps=["lib+common_proto"]) proto(name="proto", srcs=["./usb.proto"], deps=["lib/config+common_proto"])
protocc(name="proto_lib", srcs=[".+proto"], deps=["lib+common_proto_lib"]) protocc(name="proto_lib", srcs=[".+proto"], deps=["lib/config+common_proto_lib"])
cxxlibrary( cxxlibrary(
name="usb", name="usb",

2
lib/usb/usb.proto
View File

@@ -1,6 +1,6 @@
syntax = "proto2"; syntax = "proto2";
import "lib/common.proto"; import "lib/config/common.proto";
message GreaseweazleProto { message GreaseweazleProto {
enum BusType { /* note that these must match CMD_SET_BUS codes */ enum BusType { /* note that these must match CMD_SET_BUS codes */

4
lib/vfs/build.py
View File

@@ -4,14 +4,14 @@ from build.protobuf import proto, protocc
proto( proto(
name="proto", name="proto",
srcs=["./vfs.proto"], srcs=["./vfs.proto"],
deps=["lib+common_proto", "lib/config+layout_proto", "lib/external+fl2_proto"], deps=["lib/config+common_proto", "lib/config+layout_proto", "lib/external+fl2_proto"],
) )
protocc( protocc(
name="proto_lib", name="proto_lib",
srcs=[".+proto"], srcs=[".+proto"],
deps=[ deps=[
"lib+common_proto_lib", "lib/config+common_proto_lib",
"lib/config+layout_proto_lib", "lib/config+layout_proto_lib",
"lib/external+fl2_proto_lib", "lib/external+fl2_proto_lib",
], ],

2
lib/vfs/vfs.proto
View File

@@ -1,6 +1,6 @@
syntax = "proto2"; syntax = "proto2";
import "lib/common.proto"; import "lib/config/common.proto";
import "lib/config/layout.proto"; import "lib/config/layout.proto";
message AcornDfsProto message AcornDfsProto

2
tests/build.py
View File

@@ -5,7 +5,7 @@ from build.utils import test
from scripts.build import protoencode_single from scripts.build import protoencode_single
proto(name="test_proto", srcs=["./testproto.proto"], deps=["lib+common_proto"]) proto(name="test_proto", srcs=["./testproto.proto"], deps=["lib/config+common_proto"])
protocc( protocc(
name="test_proto_lib", srcs=[".+test_proto"], deps=["lib/config+proto_lib"] name="test_proto_lib", srcs=[".+test_proto"], deps=["lib/config+proto_lib"]

2
tests/testproto.proto
View File

@@ -1,6 +1,6 @@
syntax = "proto2"; syntax = "proto2";
import "lib/common.proto"; import "lib/config/common.proto";
message TestProto { message TestProto {
message SubMessageProto { message SubMessageProto {