Skip to content

Commit 4058164

Browse files
authored
build: cleanup and remove unused .NET build files (#582)
Removes all unused .NET build files, and moves all .NET-related build files into the .NET wrapper directory.
1 parent 713b73a commit 4058164

File tree

8 files changed

+30
-83
lines changed

8 files changed

+30
-83
lines changed

spannerlib/grpc-server/build-dotnet-darwin-aarch64.sh

Lines changed: 0 additions & 4 deletions
This file was deleted.

spannerlib/grpc-server/build-dotnet.sh

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Builds the gRPC server binary for darwin/arm64, linux/x64, and windows/x64
2+
# and copies the binaries to the appropriate folders of the .NET wrapper.
3+
4+
cd ../../grpc-server || exit 1
5+
./build-executables.sh
6+
cd ../wrappers/spannerlib-dotnet || exit 1
7+
8+
mkdir -p spannerlib-dotnet-grpc-server/binaries/any
9+
rm spannerlib-dotnet-grpc-server/binaries/any/grpc_server 2> /dev/null
10+
11+
mkdir -p spannerlib-dotnet-grpc-server/binaries/osx-arm64
12+
cp ../../grpc-server/binaries/osx-arm64/grpc_server spannerlib-dotnet-grpc-server/binaries/osx-arm64/grpc_server
13+
14+
mkdir -p spannerlib-dotnet-grpc-server/binaries/linux-x64
15+
cp ../../grpc-server/binaries/linux-x64/grpc_server spannerlib-dotnet-grpc-server/binaries/linux-x64/grpc_server
16+
17+
mkdir -p spannerlib-dotnet-grpc-server/binaries/win-x64
18+
cp ../../grpc-server/binaries/win-x64/grpc_server.exe spannerlib-dotnet-grpc-server/binaries/win-x64/grpc_server.exe

spannerlib/shared/build-dotnet.sh renamed to spannerlib/wrappers/spannerlib-dotnet/build-shared-lib.sh

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,24 @@
77
# This compiler is used when compiling for linux/x64 on MacOS.
88
# SKIP_WINDOWS: If set, will skip the windows/x64 build.
99

10-
mkdir -p ../wrappers/spannerlib-dotnet/spannerlib-dotnet-native/libraries/any
11-
rm ../wrappers/spannerlib-dotnet/spannerlib-dotnet-native/libraries/any/* 2> /dev/null
10+
mkdir -p spannerlib-dotnet-native/libraries/any
11+
rm spannerlib-dotnet-native/libraries/any/* 2> /dev/null
1212

13+
cd ../../shared || exit 1
1314
./build-binaries.sh
15+
cd ../wrappers/spannerlib-dotnet || exit 1
1416

1517
if [ -z "$SKIP_MACOS" ]; then
16-
mkdir -p ../wrappers/spannerlib-dotnet/spannerlib-dotnet-native/libraries/osx-arm64
17-
cp binaries/osx-arm64/spannerlib.dylib ../wrappers/spannerlib-dotnet/spannerlib-dotnet-native/libraries/osx-arm64/spannerlib.dylib
18+
mkdir -p spannerlib-dotnet-native/libraries/osx-arm64
19+
cp ../../shared/binaries/osx-arm64/spannerlib.dylib spannerlib-dotnet-native/libraries/osx-arm64/spannerlib.dylib
1820
fi
1921

2022
if [ -z "$SKIP_LINUX_CROSS_COMPILE" ] || [ -z "$SKIP_LINUX" ]; then
21-
mkdir -p ../wrappers/spannerlib-dotnet/spannerlib-dotnet-native/libraries/linux-x64
22-
cp binaries/linux-x64/spannerlib.so ../wrappers/spannerlib-dotnet/spannerlib-dotnet-native/libraries/linux-x64/spannerlib.so
23+
mkdir -p spannerlib-dotnet-native/libraries/linux-x64
24+
cp ../../shared/binaries/linux-x64/spannerlib.so spannerlib-dotnet-native/libraries/linux-x64/spannerlib.so
2325
fi
2426

2527
if [ -z "$SKIP_WINDOWS" ]; then
26-
mkdir -p ../wrappers/spannerlib-dotnet/spannerlib-dotnet-native/libraries/win-x64
27-
cp binaries/win-x64/spannerlib.dll ../wrappers/spannerlib-dotnet/spannerlib-dotnet-native/libraries/win-x64/spannerlib.dll
28+
mkdir -p spannerlib-dotnet-native/libraries/win-x64
29+
cp ../../shared/binaries/win-x64/spannerlib.dll spannerlib-dotnet-native/libraries/win-x64/spannerlib.dll
2830
fi

spannerlib/wrappers/spannerlib-dotnet/build.sh

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,13 @@ rm -r ./*/obj 2> /dev/null
4343

4444
# Build gRPC server
4545
echo "Building gRPC server..."
46-
cd ../../grpc-server || exit 1
47-
./build-dotnet.sh
46+
./build-grpc-server.sh
4847

4948
# Build shared library
5049
echo "Building shared library..."
51-
cd ../shared || exit 1
52-
./build-dotnet.sh
50+
./build-shared-lib.sh
5351

5452
# Build nuget packages
55-
cd ../wrappers/spannerlib-dotnet || exit 1
56-
5753
echo "Building .NET packages..."
5854

5955
# Add the build folders as local nuget package sources.

spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-grpc-server/build.sh

Lines changed: 0 additions & 19 deletions
This file was deleted.

spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-grpc-server/publish.sh

Lines changed: 0 additions & 16 deletions
This file was deleted.

spannerlib/wrappers/spannerlib-dotnet/spannerlib-dotnet-native/build.sh

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)