Skip to content

Commit 1b2957f

Browse files
authored
Merge pull request #17 from jul-stas/release-scripts
Release as `scylla-cpp-driver`
2 parents 5183cf0 + 1b22d0c commit 1b2957f

24 files changed

+160
-121
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*.0
66

77
# Compiled Dynamic libraries
8-
libcassandra.so*
8+
libscylla-cpp-driver.so*
99
*.dylib
1010

1111
# Compiled Static libraries

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.1)
2-
project(cassandra C CXX)
2+
project(scylla-cpp C CXX)
33

44
set(CASS_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
55
set(CASS_SRC_DIR "${CASS_ROOT_DIR}/src")
@@ -62,12 +62,12 @@ if(CASS_BUILD_INTEGRATION_TESTS OR CASS_BUILD_UNIT_TESTS)
6262
endif()
6363

6464
# Determine which driver target should be used as a dependency
65-
set(PROJECT_LIB_NAME_TARGET cassandra)
65+
set(PROJECT_LIB_NAME_TARGET scylla-cpp-driver)
6666
if(CASS_USE_STATIC_LIBS OR
6767
(WIN32 AND (CASS_BUILD_INTEGRATION_TESTS OR CASS_BUILD_UNIT_TESTS)))
6868
set(CASS_USE_STATIC_LIBS ON) # Not all driver internals are exported for test executable (e.g. CASS_EXPORT)
6969
set(CASS_BUILD_STATIC ON)
70-
set(PROJECT_LIB_NAME_TARGET cassandra_static)
70+
set(PROJECT_LIB_NAME_TARGET scylla-cpp-driver_static)
7171
endif()
7272

7373
# Ensure the driver is configured to build

packaging/README.md

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
## On a clean CentOS 7
2+
3+
Set up the EPEL, install the toolchain and `libuv`:
4+
```
5+
wget https://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/e/epel-release-7-13.noarch.rpm
6+
sudo rpm -Uvh epel-release*rpm
7+
sudo yum install -y libuv-devel openssl-devel cmake3 make g++ git
8+
```
9+
10+
Now clone the source code, checkout particular revision if needed:
11+
```
12+
git clone https://github.com/scylladb/cpp-driver.git
13+
cd cpp-driver/
14+
```
15+
16+
Packaging:
17+
```
18+
cat licenses/* > LICENSE.txt
19+
cd packaging/
20+
./build_rpm.sh
21+
```
22+
23+
## On a clean Ubuntu 18
24+
25+
```
26+
sudo apt-get update
27+
sudo apt-get install -y libuv1-dev openssl cmake make g++ git devscripts debhelper dh-exec libssl-dev zlib1g-dev
28+
git clone https://github.com/scylladb/cpp-driver.git
29+
cd cpp-driver/packaging
30+
./build_deb.sh
31+
```

packaging/build_deb.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ check_command "lsb_release" "lsb-release"
3737
version=$(header_version "../include/cassandra.h")
3838
release=1
3939
dist=$(lsb_release -s -c)
40-
base="cassandra-cpp-driver-$version"
40+
base="scylla-cpp-driver-$version"
4141
archive="$base.tar.gz"
4242
files="CMakeLists.txt cmake cmake_uninstall.cmake.in driver_config.hpp.in include src"
4343

packaging/build_rpm.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if [[ ! -z $1 ]]; then
4040
fi
4141

4242
version=$(header_version "../include/cassandra.h")
43-
base="cassandra-cpp-driver-$version"
43+
base="scylla-cpp-driver-$version"
4444
archive="$base.tar.gz"
4545
files="CMakeLists.txt cmake cmake_uninstall.cmake.in driver_config.hpp.in include src README.md LICENSE.txt"
4646

@@ -69,15 +69,15 @@ echo "Copying files"
6969
for file in $files; do
7070
cp -r "../$file" "build/SOURCES/$base"
7171
done
72-
cp cassandra.pc.in build/SOURCES
73-
cp cassandra_static.pc.in build/SOURCES
72+
cp scylla-cpp-driver.pc.in build/SOURCES
73+
cp scylla-cpp-driver_static.pc.in build/SOURCES
7474

7575
echo "Archiving $archive"
7676
pushd "build/SOURCES"
7777
tar zcf $archive $base
7878
popd
7979

8080
echo "Building package:"
81-
rpmbuild --target $arch --define "_topdir ${PWD}/build" --define "driver_version $version" --define "libuv_version $libuv_version" -ba cassandra-cpp-driver.spec
81+
rpmbuild --target $arch --define "_topdir ${PWD}/build" --define "driver_version $version" --define "libuv_version $libuv_version" -ba scylla-cpp-driver.spec
8282

8383
exit 0

packaging/cassandra.pc.in

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

packaging/cassandra_static.pc.in

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

packaging/debian/cassandra-cpp-driver-dev.install

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

packaging/debian/cassandra-cpp-driver-dev.links

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

packaging/debian/cassandra.pc

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

0 commit comments

Comments
 (0)