diff options
| author | Jonathan Bauer | 2019-10-22 14:29:51 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2019-10-22 14:29:51 +0200 |
| commit | 73c0ed09487228a41901f2b827dcd5eb190bc2dd (patch) | |
| tree | 189418bb3044c9345151fab91f6adc869028cbd7 /thrift-compile.sh | |
| parent | Clean up project (diff) | |
| parent | Json: Fix deserialization of bools in Thrift classes (diff) | |
| download | master-sync-shared-73c0ed09487228a41901f2b827dcd5eb190bc2dd.tar.gz master-sync-shared-73c0ed09487228a41901f2b827dcd5eb190bc2dd.tar.xz master-sync-shared-73c0ed09487228a41901f2b827dcd5eb190bc2dd.zip | |
Merge branch 'master' into qemu
Diffstat (limited to 'thrift-compile.sh')
| -rwxr-xr-x | thrift-compile.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/thrift-compile.sh b/thrift-compile.sh index f7a6561..c47cc86 100755 --- a/thrift-compile.sh +++ b/thrift-compile.sh @@ -18,8 +18,8 @@ if thrift --gen java src/main/thrift/bwlp.thrift; then bn=$(basename "$file") if [ -e "src/main/java/org/openslx/bwlp/thrift/iface/$bn" ]; then diff -q \ - <(sed -r 's/_i[0-9]+/_ix/g;s/_iter[0-9]+/_iterx/g;s/_elem[0-9]+/_elemx/g;s/_list[0-9]+/_listx/g;/@Generated/d' "$file") \ - <(sed -r 's/_i[0-9]+/_ix/g;s/_iter[0-9]+/_iterx/g;s/_elem[0-9]+/_elemx/g;s/_list[0-9]+/_listx/g;/@Generated/d' "src/main/java/org/openslx/bwlp/thrift/iface/$bn") + <(sed -r 's/_(i|iter|elem|list|map|key|val)[0-9]+/\1x/g;/@Generated/d' "$file") \ + <(sed -r 's/_(i|iter|elem|list|map|key|val)[0-9]+/\1x/g;/@Generated/d' "src/main/java/org/openslx/bwlp/thrift/iface/$bn") ret=$? [ "$ret" = 0 ] && continue fi |