Skip to content

Commit 6a8e364

Browse files
marcelhecko
authored andcommitted
Remove legacy Makefiles and migrate fully to CMake
- Add cmake/cpack-source.cmake for source tarball generation (rpmtar target) - Add cmake/doxygen.cmake for documentation targets (doc, fulldoc) - Update Dockerfiles to use CMake for tarball generation - Update .copr/Makefile to use CMake - Remove 142 legacy Makefiles (only .copr/Makefile remains) - Remove obsolete .travis.yml (GitHub Actions is used) - Update all documentation to reference CMake options - Clean up .gitignore and pkg/deb install files CMake was already the primary build system; this removes the legacy Makefile-based build that was only used for tarball generation.
1 parent 4bd68ad commit 6a8e364

File tree

178 files changed

+303
-4279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

178 files changed

+303
-4279
lines changed

.copr/Makefile

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
1-
# This is provided and used by Fedora COPR builds
1+
# Minimal Makefile for COPR builds (CMake-based)
22
# COPR provides outdir and spec variables when running make srpm
33

44
srpm:
55
set -x
6-
# see https://docs.pagure.org/copr.copr/user_documentation.html#make-srpm
76
echo "outdir=$(outdir) spec_path=$(spec)"
8-
pwd
9-
ls -al
107
mkdir -p ~/rpmbuild/SOURCES
11-
make rpmtar
8+
mkdir -p build && cd build && cmake3 .. && make rpmtar
129
rpmbuild -bs --define "_sourcedir $$HOME/rpmbuild/SOURCES" \
1310
--define "_specdir $$(pwd)" \
1411
--define "_builddir $$(pwd)" \
1512
--define "_srcrpmdir $(outdir)" \
1613
--define "_rpmdir $$(pwd)" \
1714
$(spec)
1815

19-
.PHONY: srpm
16+
.PHONY: srpm

.gitignore

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@
1111
/CMakeCache.txt
1212
CMakeFiles/
1313
CTestTestfile.cmake
14-
apps/dsm/lib/Makefile
15-
apps/early_dbprompt/Makefile
16-
apps/mobile_push/Makefile
14+
CPackConfig.cmake
15+
CPackSourceConfig.cmake
16+
_CPack_Packages/
1717
apps/py_sems/sip/*.cpp
1818
apps/py_sems/sip/*.h
19-
apps/py_sems/sip/Makefile.gen
2019
apps/rtmp/flash_phone/*.swf
2120
apps/rtmp/librtmp/librtmp.so.0
22-
apps/xmlrpc2di/xmlrpc++/src/Makefile
2321
build/
2422
cmake_install.cmake
2523
core.*

.travis.yml

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

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,4 +431,8 @@ add_subdirectory(apps)
431431
add_subdirectory(core)
432432
add_subdirectory(tools)
433433

434-
# SET_DIRECTORY_PROPERTIES(ADDITIONAL_MAKE_CLEAN_FILES *~)
434+
# Documentation targets (doc, fulldoc)
435+
include(cmake/doxygen.cmake)
436+
437+
# CPack configuration for source tarballs (rpmtar, package_source)
438+
include(cmake/cpack-source.cmake)

Dockerfile-rhel10

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ RUN mkdir -p /root/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
3939
RUN mkdir -p /usr/src/sems
4040
COPY . /usr/src/sems
4141
WORKDIR /usr/src/sems
42-
RUN make rpmtar
42+
RUN mkdir -p build && cd build && cmake .. && make rpmtar
4343
RUN rpmbuild -ba pkg/rpm/sems.spec
4444
RUN rpmbuild -bs pkg/rpm/sems.spec
4545
RUN ls -al /root/rpmbuild/RPMS

Dockerfile-rhel7

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ RUN mkdir -p /root/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
5252
RUN mkdir -p /usr/src/sems
5353
COPY . /usr/src/sems
5454
WORKDIR /usr/src/sems
55-
RUN make rpmtar
55+
RUN mkdir -p build && cd build && cmake3 .. && make rpmtar
5656
RUN rpmbuild -ba pkg/rpm/sems.spec
5757
RUN rpmbuild -bs pkg/rpm/sems.spec
5858
RUN ls -al /root/rpmbuild/RPMS

Dockerfile-rhel8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ RUN mkdir -p /root/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
3333
RUN mkdir -p /usr/src/sems
3434
COPY . /usr/src/sems
3535
WORKDIR /usr/src/sems
36-
RUN make rpmtar
36+
RUN mkdir -p build && cd build && cmake3 .. && make rpmtar
3737
RUN rpmbuild -ba pkg/rpm/sems.spec
3838
RUN rpmbuild -bs pkg/rpm/sems.spec
3939
RUN ls -al /root/rpmbuild/RPMS

Dockerfile-rhel9

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ RUN mkdir -p /root/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
4040
RUN mkdir -p /usr/src/sems
4141
COPY . /usr/src/sems
4242
WORKDIR /usr/src/sems
43-
RUN make rpmtar
43+
RUN mkdir -p build && cd build && cmake3 .. && make rpmtar
4444
RUN rpmbuild -ba pkg/rpm/sems.spec
4545
RUN rpmbuild -bs pkg/rpm/sems.spec
4646
RUN ls -al /root/rpmbuild/RPMS

Makefile

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

0 commit comments

Comments
 (0)