From 05b6abcfd1843279c63c9741c69d04b387f08301 Mon Sep 17 00:00:00 2001 From: Russel Waters Date: Mon, 6 May 2019 13:47:24 -0400 Subject: [PATCH] nano_rpc included in packaging (#1961) * include nano_rpc in package targets * protect nano_rpc from packaging if apple * Update CMakeLists.txt whitespace change * Revert "protect nano_rpc from packaging if apple" This reverts commit 69d8a597cd51adcdd4bb715a0e09178fd1db29f7. --- nano/nano_rpc/CMakeLists.txt | 6 ++++++ nanocurrency-beta.spec.in | 1 + nanocurrency.spec.in | 1 + 3 files changed, 8 insertions(+) diff --git a/nano/nano_rpc/CMakeLists.txt b/nano/nano_rpc/CMakeLists.txt index 1cb28ab8..9c22d5cb 100644 --- a/nano/nano_rpc/CMakeLists.txt +++ b/nano/nano_rpc/CMakeLists.txt @@ -19,3 +19,9 @@ target_compile_definitions(nano_rpc -DNANO_VERSION_MAJOR=${CPACK_PACKAGE_VERSION_MAJOR} -DNANO_VERSION_MINOR=${CPACK_PACKAGE_VERSION_MINOR} -DNANO_VERSION_PATCH=${CPACK_PACKAGE_VERSION_PATCH}) + +install(TARGETS nano_rpc + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib +) diff --git a/nanocurrency-beta.spec.in b/nanocurrency-beta.spec.in index ed44481c..520820bd 100644 --- a/nanocurrency-beta.spec.in +++ b/nanocurrency-beta.spec.in @@ -40,6 +40,7 @@ if [ ! %{buildroot} = "/" ]; then %{__rm} -rf %{buildroot}; fi mkdir -p %{buildroot}/usr/bin mkdir -p %{buildroot}/etc/systemd/system/ cp nano_node %{buildroot}/usr/bin/nano_node-beta +cp nano_rpc %{buildroot}/usr/bin/nano_rpc-beta cp etc/systemd/nanocurrency-beta.service %{buildroot}/etc/systemd/system/nanocurrency-beta.service %clean diff --git a/nanocurrency.spec.in b/nanocurrency.spec.in index a00c693a..d68f21b6 100644 --- a/nanocurrency.spec.in +++ b/nanocurrency.spec.in @@ -40,6 +40,7 @@ if [ ! %{buildroot} = "/" ]; then %{__rm} -rf %{buildroot}; fi mkdir -p %{buildroot}/usr/bin mkdir -p %{buildroot}/etc/systemd/system/ cp nano_node %{buildroot}/usr/bin/nano_node +cp nano_rpc %{buildroot}/usr/bin/nano_rpc cp etc/systemd/nanocurrency.service %{buildroot}/etc/systemd/system/nanocurrency.service %clean