add scitokens-* binaries to the packages

scitokens · Sep 15, 2021 · f536ea2 · f536ea2
1 parent 2a2b4ef
commit f536ea2
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -90,6 +90,16 @@ install(
   FILES src/scitokens.h
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/scitokens )
 
+install(
+  DIRECTORY build/
+  DESTINATION ${CMAKE_INSTALL_BINDIR}
+  FILES_MATCHING
+  PATTERN "CMakeFiles" EXCLUDE
+  PATTERN "scitokens-*" 
+  PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE
+    OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ 
+  )
+
 set_target_properties(
   SciTokens
   PROPERTIES

diff --git a/debian/libscitokens0.install b/debian/libscitokens0.install
@@ -1 +1,2 @@
 debian/tmp/usr/lib/*/libSciTokens.so.*
+debian/tmp/usr/bin/scitokens-*
diff --git a/debian/rules b/debian/rules
@@ -3,7 +3,7 @@
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
-	dh $@  
+	dh $@ --builddirectory=build
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DLIB_INSTALL_DIR=lib/$(DEB_HOST_MULTIARCH)
+	dh_auto_configure -- -S .. -DLIB_INSTALL_DIR=lib/$(DEB_HOST_MULTIARCH) 
diff --git a/rpm/scitokens-cpp.spec b/rpm/scitokens-cpp.spec
@@ -45,17 +45,24 @@ Requires: %{name}%{?_isa} = %{version}
 %setup -q
 
 %build
+mkdir -p build
+cd build
+%undefine __cmake3_in_source_build
+%define __cmake3_srcdir ..
+%define __cmake3_builddir .
 %cmake3
 %cmake3_build
 
 %install
+cd build
 %cmake3_install
 
 # Run the ldconfig
 %ldconfig_scriptlets
 
 %files
 %{_libdir}/libSciTokens.so.0*
+%{_bindir}/scitokens-*
 %license LICENSE
 %doc README.md
 
@@ -65,6 +72,8 @@ Requires: %{name}%{?_isa} = %{version}
 %dir %{_includedir}/scitokens
 
 %changelog
+#- Add scitokens-* binaries to the package
+
 * Fri Sep 03 2021 Dave Dykstra <dwd@fnal.gov> - 0.6.3-1
 - Add support for building Debian packages on the OpenSUSE Build System
 - Add patch to jwt-cpp to update its picojson dependency in order to