Main

.github/workflows/release.yml

@@ -1,40 +1,50 @@
-name: 'C++ CI'
+name: Build and Release
 
 on:
   push:
-    branches:
-      - master
-      - feature/github_actions
+    tags:
+      - 'v*'
 
 jobs:
-  build:
+  release:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pages: write
+      id-token: write
     steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-      - run: sudo apt-get update && sudo apt-get install libboost-test-dev -y
-      - run: cmake . -DPATCH_VERSION=${{ github.run_number }} -DWITH_BOOST_TEST=ON
-      - run: cmake --build .
-      - run: cmake --build . --target test
-      - run: cmake --build . --target package
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v4
+
+      - name: Build in Docker
+        run: |
+          # 1. Собираем образ
+          docker build -t builder .
+
+          # 2. Создаем временный контейнер для копирования файлов
+          docker create --name extractor builder
+
+          # 3. Подготавливаем папки на сервере GitHub
+          mkdir -p dist
+
+          # 4. Копируем .deb пакет из папки /output контейнера
+          docker cp extractor:/output/. ./dist/
+
+          # 5. Копируем документацию. 
+          # Путь /build/docs/html так как в Doxyfile OUTPUT_DIRECTORY = docs
+          docker cp extractor:/build/docs/html/. ./dist-docs
+
+          # 6. Удаляем контейнер
+          docker rm extractor
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v1
         with:
-          tag_name: ${{ github.run_number }}
-          release_name: Release ${{ github.run_number }}
-          draft: false
-          prerelease: false
-      - name: Upload Release Asset
-        id: upload-release-asset
-        uses: actions/upload-release-asset@v1
+          files: dist/*.deb
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Deploy to GitHub Pages
+        uses: JamesIves/github-pages-deploy-action@v4
         with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./helloworld-0.0.${{ github.run_number }}-Linux.deb
-          asset_name: helloworld-0.0.${{ github.run_number }}-Linux.deb
-          asset_content_type: application/vnd.debian.binary-package
+          folder: dist-docs
+          branch: gh-pages

.gitignore

@@ -0,0 +1,11 @@
+**/.idea/
+**/.settings/
+**/.vscode/
+**/build/
+**/debug/
+**/release/
+html/
+latex/
+*.deb
+dist/
+output/

CMakeLists.txt

@@ -1,86 +1,9 @@
 cmake_minimum_required(VERSION 3.12)
+project(editor)
 
-set(PATCH_VERSION "1" CACHE INTERNAL "Patch version")
-set(PROJECT_VESRION 0.0.${PATCH_VERSION})
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-project(helloworld VERSION ${PROJECT_VESRION})
+add_executable(editor main.cpp)
 
-option(WITH_BOOST_TEST "Whether to build Boost test" ON)
-
-configure_file(version.h.in version.h)
-
-add_executable(helloworld_cli main.cpp)
-add_library(helloworld lib.cpp)
-
-set_target_properties(helloworld_cli helloworld PROPERTIES
-    CXX_STANDARD 14
-    CXX_STANDARD_REQUIRED ON
-)
-
-target_include_directories(helloworld
-    PRIVATE "${CMAKE_BINARY_DIR}"
-)
-
-target_link_libraries(helloworld_cli PRIVATE
-    helloworld
-)
-
-if(WITH_BOOST_TEST)
-    find_package(Boost COMPONENTS unit_test_framework REQUIRED)
-    add_executable(test_version test_version.cpp)
-
-    set_target_properties(test_version PROPERTIES
-        CXX_STANDARD 14
-        CXX_STANDARD_REQUIRED ON
-    )
-
-    set_target_properties(test_version PROPERTIES
-        COMPILE_DEFINITIONS BOOST_TEST_DYN_LINK
-        INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIR}
-    )
-
-    target_link_libraries(test_version
-        ${Boost_LIBRARIES}
-        helloworld
-    )
-endif()
-
-if (MSVC)
-    target_compile_options(helloworld_cli PRIVATE
-        /W4
-    )
-    target_compile_options(helloworld PRIVATE
-        /W4
-    )
-    if(WITH_BOOST_TEST)
-        target_compile_options(test_version PRIVATE
-            /W4
-        )
-    endif()
-else ()
-    target_compile_options(helloworld_cli PRIVATE
-        -Wall -Wextra -pedantic -Werror
-    )
-    target_compile_options(helloworld PRIVATE
-        -Wall -Wextra -pedantic -Werror
-    )
-    if(WITH_BOOST_TEST)
-        target_compile_options(test_version PRIVATE
-            -Wall -Wextra -pedantic -Werror
-        )
-    endif()
-endif()
-
-install(TARGETS helloworld_cli RUNTIME DESTINATION bin)
-
-set(CPACK_GENERATOR DEB)
-set(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
-set(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}")
-set(CPACK_PACKAGE_VERSION_PATCH "${PROJECT_VERSION_PATCH}")
-set(CPACK_PACKAGE_CONTACT example@example.com)
-include(CPack)
-
-if(WITH_BOOST_TEST)
-    enable_testing()
-    add_test(test_version test_version)
-endif()
+install(TARGETS editor DESTINATION bin)

Dockerfile

@@ -0,0 +1,40 @@
+FROM ubuntu:22.04
+
+# Ставим зависимости: компилятор, cmake, doxygen и инструменты сборки пакетов
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    cmake \
+    doxygen \
+	graphviz \
+    devscripts \
+    debhelper \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /build
+COPY . .
+
+# 1. Генерируем документацию
+RUN doxygen Doxyfile
+
+# 2. Собираем проект и упаковываем в .deb
+# Команда ниже запустит процесс создания пакета из папки debian
+#RUN dpkg-buildpackage -b -us -uc
+#RUN mkdir -p /output
+#RUN dpkg-buildpackage -b -us -uc && cp /editor*.deb /output/
+#RUN dpkg-buildpackage -b -us -uc && cp ../editor*.deb /output/
+# Пакет окажется на уровень выше, в / (корне) или в /build_parent
+
+# Устанавливаем дополнительные утилиты для исправления строк
+RUN apt-get update && apt-get install -y dos2unix
+
+WORKDIR /build
+COPY . .
+
+# Исправляем концы строк, права доступа и создаем папку для вывода
+RUN dos2unix debian/rules && \
+    chmod +x debian/rules && \
+    mkdir -p /output
+
+# Запускаем сборку
+RUN dpkg-buildpackage -b -us -uc && cp ../editor*.deb /output/
+

Document.h

@@ -0,0 +1,24 @@
+#pragma once
+#include <vector>
+#include <string>
+#include "Shape.h"
+
+class Document {
+private:
+    // Храним вектор умных указателей на фигуры
+    std::vector<std::unique_ptr<Shape>> shapes;
+
+public:
+    void addShape(std::unique_ptr<Shape> shape) {
+        shapes.push_back(std::move(shape)); // Передаем владение в вектор
+    }
+
+    void removeLastShape() {
+        if (!shapes.empty()) shapes.pop_back();
+    }
+
+    void save(const std::string& path) { std::cout << "Документ сохранен в: " << path << "\n"; }
+    void load(const std::string& path) { std::cout << "Документ загружен из: " << path << "\n"; }
+
+    const std::vector<std::unique_ptr<Shape>>& getShapes() const { return shapes; }
+};