From 6315ec5720d70bbd882ab6456f75568d0a16250a Mon Sep 17 00:00:00 2001 From: Dylan Brasseur Date: Thu, 10 Aug 2023 18:02:15 +0200 Subject: [PATCH] Deb creation --- .dockerignore | 5 +- LICENSE | 208 +----------------- .../cpp/ArmoniK.Api.Common/CMakeLists.txt | 1 - packages/cpp/NOTICE.txt | 2 - packages/cpp/tools/packaging/BundledLICENSE | 17 ++ packages/cpp/tools/packaging/deb.Dockerfile | 63 +++--- packages/cpp/tools/packaging/debian/changelog | 5 + packages/cpp/tools/packaging/debian/control | 19 ++ packages/cpp/tools/packaging/debian/copyright | 22 ++ packages/cpp/tools/packaging/debian/rules | 50 +---- packages/cpp/tools/packaging/make-deb.sh | 1 + 11 files changed, 108 insertions(+), 285 deletions(-) delete mode 100644 packages/cpp/NOTICE.txt create mode 100644 packages/cpp/tools/packaging/BundledLICENSE create mode 100644 packages/cpp/tools/packaging/debian/changelog create mode 100644 packages/cpp/tools/packaging/debian/control create mode 100644 packages/cpp/tools/packaging/debian/copyright diff --git a/.dockerignore b/.dockerignore index 6297226e8..ce2e9685a 100644 --- a/.dockerignore +++ b/.dockerignore @@ -16,6 +16,9 @@ **/*.a **/*.so **/*.lib +**/*.deb +**/*.rpm +**/*.apk **/build* **/.build* **/gen @@ -50,7 +53,7 @@ docker-compose **/node_modules **/secrets.dev.yaml **/values.dev.yaml -LICENSE + README.md **/publish terraform diff --git a/LICENSE b/LICENSE index 261eeb9e9..6099cd472 100644 --- a/LICENSE +++ b/LICENSE @@ -1,201 +1,13 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ +Copyright 2021-2023 ANEO Consulting - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at - 1. Definitions. + http://www.apache.org/licenses/LICENSE-2.0 - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. \ No newline at end of file diff --git a/packages/cpp/ArmoniK.Api.Common/CMakeLists.txt b/packages/cpp/ArmoniK.Api.Common/CMakeLists.txt index 7bed9d35c..05fb3ce7c 100644 --- a/packages/cpp/ArmoniK.Api.Common/CMakeLists.txt +++ b/packages/cpp/ArmoniK.Api.Common/CMakeLists.txt @@ -45,7 +45,6 @@ FetchContent_GetProperties(simdjson) if(NOT simdjson_POPULATED) FetchContent_Populate(simdjson) endif() - set(CMAKE_FIND_DEBUG_MODE FALSE) SET(SOURCES_FILES_DIR "${CMAKE_CURRENT_SOURCE_DIR}/source") diff --git a/packages/cpp/NOTICE.txt b/packages/cpp/NOTICE.txt deleted file mode 100644 index ff9ddedbe..000000000 --- a/packages/cpp/NOTICE.txt +++ /dev/null @@ -1,2 +0,0 @@ -This project uses simdjson (https://github.com/simdjson/simdjson) from The simdjson authors under Apache 2.0 license (https://www.apache.org/licenses/LICENSE-2.0) - diff --git a/packages/cpp/tools/packaging/BundledLICENSE b/packages/cpp/tools/packaging/BundledLICENSE new file mode 100644 index 000000000..b5da7a594 --- /dev/null +++ b/packages/cpp/tools/packaging/BundledLICENSE @@ -0,0 +1,17 @@ +Copyright 2021-2023 ANEO Consulting + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +-------------- + +The ArmoniK library integrates the simdjson single-header library licensed under Apache 2.0 (https://github.com/simdjson/simdjson) \ No newline at end of file diff --git a/packages/cpp/tools/packaging/deb.Dockerfile b/packages/cpp/tools/packaging/deb.Dockerfile index edbed6423..aeb33543d 100644 --- a/packages/cpp/tools/packaging/deb.Dockerfile +++ b/packages/cpp/tools/packaging/deb.Dockerfile @@ -1,34 +1,29 @@ -FROM ubuntu:23.04 - -# Install dependencies -RUN apt-get update && DEBIAN_FRONTEND="noninteractive" TZ="Europe/London" apt-get install -y \ - gcc \ - g++ \ - make \ - build-essential \ - cmake \ - libc-ares-dev \ - protobuf-compiler-grpc \ - grpc-proto \ - libgrpc-dev \ - libgrpc++-dev \ - debhelper \ - debmake \ - quilt - -WORKDIR /app/libarmonik -COPY Protos/V1/. ./Protos/ -COPY packages/cpp/ArmoniK.Api.Common/. ./ArmoniK.Api.Common/ -COPY packages/cpp/ArmoniK.Api.Client/. ./ArmoniK.Api.Client/ -COPY packages/cpp/ArmoniK.Api.Worker/. ./ArmoniK.Api.Worker/ -COPY packages/cpp/CMakeLists.txt . -COPY packages/cpp/NOTICE.txt . -COPY --chmod=755 packages/cpp/tools/packaging/debian/. ./debian/ - -ARG PACKAGE_NAME="libarmonik" -ARG VERSION="0.1.0" - -RUN debmake -T -t -f "ANEO Consulting" -e "armonik-support@aneo.fr" -p "$PACKAGE_NAME" -u "$VERSION" -b libarmonik:lib -i debuild - -ENTRYPOINT [ "bash" ] - +FROM debian:12 + +# Install debian package making tools +RUN apt-get update && DEBIAN_FRONTEND="noninteractive" TZ="Europe/London" apt-get install --no-install-recommends -y \ + debhelper \ + debmake \ + devscripts \ + equivs \ + && apt-get clean + +WORKDIR /app/libarmonik +COPY --chmod=755 packages/cpp/tools/packaging/debian/. ./debian/ +# Install build dependencies +RUN yes | mk-build-deps -i -r -B +COPY packages/cpp/tools/packaging/BundledLICENSE ./LICENSE +COPY Protos/V1/. ./Protos/ +COPY packages/cpp/ArmoniK.Api.Common/. ./ArmoniK.Api.Common/ +COPY packages/cpp/ArmoniK.Api.Client/. ./ArmoniK.Api.Client/ +COPY packages/cpp/ArmoniK.Api.Worker/. ./ArmoniK.Api.Worker/ +COPY packages/cpp/CMakeLists.txt . + +ENV DEBEMAIL="armonik-support@aneo.fr" +ENV DEBFULLNAME="ANEO Consulting" +ARG VERSION="3.11.0" +# Prepare package +RUN debmake -t -p "libarmonik" -u "$VERSION" -b libarmonik:lib +WORKDIR /app/"libarmonik-$VERSION" +# Build package +RUN debuild -i -us -uc -b -D diff --git a/packages/cpp/tools/packaging/debian/changelog b/packages/cpp/tools/packaging/debian/changelog new file mode 100644 index 000000000..33aeb43d1 --- /dev/null +++ b/packages/cpp/tools/packaging/debian/changelog @@ -0,0 +1,5 @@ +libarmonik (3.11.0-1) unstable; urgency=low + + * Initial Debian release (closes : #376) + + -- ANEO Consulting Thu, 10 Aug 2023 11:55:25 +0000 diff --git a/packages/cpp/tools/packaging/debian/control b/packages/cpp/tools/packaging/debian/control new file mode 100644 index 000000000..25c8c86f7 --- /dev/null +++ b/packages/cpp/tools/packaging/debian/control @@ -0,0 +1,19 @@ +Source: libarmonik +Section: local +Priority: optional +Maintainer: "ANEO Consulting" +Build-Depends: cmake, debhelper-compat (= 13), libgrpc-dev (>= 1.50), libgrpc++-dev (>= 1.50), protobuf-compiler-grpc (>= 1.50), libprotobuf-dev (>= 3.20), libc-ares-dev, grpc-proto, g++ (>= 10), gcc (>=10) +Standards-Version: 4.5.1 +Homepage: https://www.armonik.fr/ +Rules-Requires-Root: no +Vcs-Git: https://github.com/aneoconsulting/ArmoniK.Api.git +Vcs-Browser: https://github.com/aneoconsulting/ArmoniK.Api + +Package: libarmonik +Section: libs +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: libgrpc-dev (>= 1.50), libgrpc++-dev (>= 1.50), libprotobuf-dev (>= 3.20), libc-ares-dev +Description: ArmoniK Api libraries + This includes the Common, Client and Worker APIs diff --git a/packages/cpp/tools/packaging/debian/copyright b/packages/cpp/tools/packaging/debian/copyright new file mode 100644 index 000000000..a500ddf80 --- /dev/null +++ b/packages/cpp/tools/packaging/debian/copyright @@ -0,0 +1,22 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: libarmonik +Upstream-Contact: armonik-support@aneo.fr +Source: https://github.com/aneoconsulting/ArmoniK.Api + +Files: * +Copyright: 2023 ANEO Consulting +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian systems, the complete text of the Apache License Version 2.0 + can be found in `/usr/share/common-licenses/Apache-2.0'. diff --git a/packages/cpp/tools/packaging/debian/rules b/packages/cpp/tools/packaging/debian/rules index ca6cd1ba9..c79831e5c 100644 --- a/packages/cpp/tools/packaging/debian/rules +++ b/packages/cpp/tools/packaging/debian/rules @@ -1,58 +1,10 @@ #!/usr/bin/make -f -# You must remove unused comment lines for the released package. -# See debhelper(7) (uncomment to enable) -# This is an autogenerated template for debian/rules. -# -# Output every command that modifies files on the build system. -#export DH_VERBOSE = 1 -# -# Copy some variable definitions from pkg-info.mk and vendor.mk -# under /usr/share/dpkg/ to here if they are useful. -# -# See FEATURE AREAS/ENVIRONMENT in dpkg-buildflags(1) -# Apply all hardening options -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all -# Package maintainers to append CFLAGS -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -# Package maintainers to append LDFLAGS -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -# -# With debhelper version 9 or newer, the dh command exports -# all buildflags. So there is no need to include the -# /usr/share/dpkg/buildflags.mk file here if compat is 9 or newer. -# -# These are rarely used code. (START) -# -# The following include for *.mk magically sets miscellaneous -# variables while honoring existing values of pertinent -# environment variables: -# -# Architecture-related variables such as DEB_TARGET_MULTIARCH: -#include /usr/share/dpkg/architecture.mk -# Vendor-related variables such as DEB_VENDOR: -#include /usr/share/dpkg/vendor.mk -# Package-related variables such as DEB_DISTRIBUTION -#include /usr/share/dpkg/pkg-info.mk -# -# You may alternatively set them susing a simple script such as: -# DEB_VENDOR ?= $(shell dpkg-vendor --query Vendor) -# -# These are rarely used code. (END) -# # main packaging script based on post dh7 syntax %: dh $@ # debmake generated override targets + override_dh_auto_configure: dh_auto_configure -- -DBUILD_WORKER=ON -DBUILD_CLIENT=ON -DFETCHCONTENT_FULLY_DISCONNECTED=OFF -DPROTO_FILES_DIR="$(shell pwd)/Protos" -# -# You may need to patch CMakeLists.txt to set the library install path to be: -#-install(TARGETS LIBRARY DESTINATION lib) -#+install(TARGETS LIBRARY DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}) - -# Multiarch package requires library files to be installed to -# /usr/lib// . If the build system does not support -# $(DEB_HOST_MULTIARCH), you may need to override some targets such as -# dh_auto_configure or dh_auto_install to use $(DEB_HOST_MULTIARCH) . diff --git a/packages/cpp/tools/packaging/make-deb.sh b/packages/cpp/tools/packaging/make-deb.sh index 94a097468..8a2b96f65 100644 --- a/packages/cpp/tools/packaging/make-deb.sh +++ b/packages/cpp/tools/packaging/make-deb.sh @@ -3,3 +3,4 @@ set -x script_path="$(readlink -f "${BASH_SOURCE:-$0}")" script_dir="$(dirname "$script_path")" docker build -t "debbuild" -f deb.Dockerfile --progress=plain "${script_dir}/../../../.." +docker run --rm -v ".:/host" --entrypoint bash "debbuild" -c "cp ../*.deb /host/" \ No newline at end of file