Skip to content

Commit

Permalink
Build: Switch to CMake :^)
Browse files Browse the repository at this point in the history
  • Loading branch information
bugaevc authored and awesomekling committed May 14, 2020
1 parent 49727ff commit 450a2a0
Show file tree
Hide file tree
Showing 236 changed files with 1,774 additions and 2,337 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
*.cxxflags
*.autosave
Meta/Lagom/build
Root
Build
build
CMakeFiles
Toolchain/Tarballs
Toolchain/Build
Toolchain/Local
Expand Down
26 changes: 16 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
os: linux
dist: xenial
dist: bionic

language: cpp

Expand All @@ -23,20 +23,26 @@ notifications:
before_install:
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- sudo apt-get update -qq
- sudo apt-get install -y g++-8 libstdc++-8-dev cmake shellcheck libmpfr-dev libmpc-dev libgmp-dev e2fsprogs qemu-system-i386 qemu-utils
- sudo apt-get install -y g++-8 libstdc++-8-dev shellcheck libmpfr-dev libmpc-dev libgmp-dev e2fsprogs qemu-system-i386 qemu-utils
- sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 90
- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 90
- sudo python2 -m pip install cmake
- export PATH=/usr/local/bin/:$PATH
- cmake --version

script:
- export SERENITY_ROOT=$(pwd)
- Meta/lint-shell-scripts.sh
- Meta/check-license-headers.sh
- cd Toolchain
- TRY_USE_LOCAL_TOOLCHAIN=y ./BuildIt.sh
- cd ../Kernel
- ./makeall.sh
- ../Meta/lint-shell-scripts.sh
- ../Meta/check-license-headers.sh
- ../Meta/Lagom/build-js.sh
- cd ../Libraries/LibJS/Tests
- ./run-tests
- cd ../../../Toolchain/Cache
- cd "$SERENITY_ROOT"
- mkdir -p Build
- cd Build
- cmake .. -DBUILD_LAGOM=1
- make
- make test
- cd "$SERENITY_ROOT"/Libraries/LibJS/Tests
- ./run-tests.sh
- cd "$SERENITY_ROOT"/Toolchain/Cache
- du -ch * || true
5 changes: 0 additions & 5 deletions AK/Makefile

This file was deleted.

12 changes: 12 additions & 0 deletions AK/Tests/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
file(GLOB AK_TEST_SOURCES "*.cpp")

foreach(source ${AK_TEST_SOURCES})
get_filename_component(name ${source} NAME_WE)
add_executable(${name} ${source})
target_link_libraries(${name} LagomCore)
add_test(
NAME ${name}
COMMAND ${name}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
endforeach()
37 changes: 0 additions & 37 deletions AK/Tests/Makefile

This file was deleted.

12 changes: 12 additions & 0 deletions Applications/About/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
set(SOURCES
main.cpp
)

execute_process(COMMAND "git rev-parse --short HEAD" OUTPUT_VARIABLE GIT_COMMIT)
execute_process(COMMAND "git rev-parse --abbrev-ref HEAD" OUTPUT_VARIABLE GIT_BRANCH)
execute_process(COMMAND "git diff-index --quiet HEAD -- && echo tracked || echo untracked" OUTPUT_VARIABLE GIT_CHANGES)

add_definitions(-DGIT_COMMIT="${GIT_COMMIT}" -DGIT_BRANCH="${GIT_BRANCH}" -DGIT_CHANGES="${GIT_CHANGES}")

serenity_bin(About)
target_link_libraries(About LibGUI)
10 changes: 0 additions & 10 deletions Applications/About/Makefile

This file was deleted.

11 changes: 11 additions & 0 deletions Applications/Browser/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
set(SOURCES
BookmarksBarWidget.cpp
DownloadWidget.cpp
InspectorWidget.cpp
main.cpp
Tab.cpp
WindowActions.cpp
)

serenity_bin(Browser)
target_link_libraries(Browser LibWeb LibProtocol LibGUI)
21 changes: 0 additions & 21 deletions Applications/Browser/Makefile

This file was deleted.

19 changes: 19 additions & 0 deletions Applications/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
add_subdirectory(About)
add_subdirectory(Browser)
add_subdirectory(Calculator)
add_subdirectory(Calendar)
add_subdirectory(Debugger)
add_subdirectory(DisplaySettings)
add_subdirectory(FileManager)
add_subdirectory(FontEditor)
add_subdirectory(Help)
add_subdirectory(HexEditor)
add_subdirectory(IRCClient)
add_subdirectory(PaintBrush)
add_subdirectory(Piano)
add_subdirectory(QuickShow)
add_subdirectory(SoundPlayer)
add_subdirectory(SystemMonitor)
add_subdirectory(Terminal)
add_subdirectory(TextEditor)
add_subdirectory(Welcome)
9 changes: 9 additions & 0 deletions Applications/Calculator/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
set(SOURCES
main.cpp
Calculator.cpp
CalculatorWidget.cpp
Keypad.cpp
)

serenity_bin(Calculator)
target_link_libraries(Calculator LibGUI)
11 changes: 0 additions & 11 deletions Applications/Calculator/Makefile

This file was deleted.

9 changes: 9 additions & 0 deletions Applications/Calendar/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
set(SOURCES
AddEventDialog.cpp
Calendar.cpp
CalendarWidget.cpp
main.cpp
)

serenity_bin(Calendar)
target_link_libraries(Calendar LibGUI)
12 changes: 0 additions & 12 deletions Applications/Calendar/Makefile

This file was deleted.

6 changes: 6 additions & 0 deletions Applications/Debugger/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
set(SOURCES
main.cpp
)

serenity_bin(Debugger)
target_link_libraries(Debugger LibCore LibDebug LibX86 LibLine)
8 changes: 0 additions & 8 deletions Applications/Debugger/Makefile

This file was deleted.

8 changes: 8 additions & 0 deletions Applications/DisplaySettings/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
set(SOURCES
DisplaySettings.cpp
main.cpp
MonitorWidget.cpp
)

serenity_bin(DisplaySettings)
target_link_libraries(DisplaySettings LibGUI)
10 changes: 0 additions & 10 deletions Applications/DisplaySettings/Makefile

This file was deleted.

9 changes: 9 additions & 0 deletions Applications/FileManager/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
set(SOURCES
DirectoryView.cpp
FileUtils.cpp
main.cpp
PropertiesDialog.cpp
)

serenity_bin(FileManager)
target_link_libraries(FileManager LibGUI LibDesktop)
11 changes: 0 additions & 11 deletions Applications/FileManager/Makefile

This file was deleted.

11 changes: 11 additions & 0 deletions Applications/FontEditor/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
include_directories(${CMAKE_CURRENT_BINARY_DIR})

set(SOURCES
FontEditor.cpp
GlyphEditorWidget.cpp
GlyphMapWidget.cpp
main.cpp
)

serenity_bin(FontEditor)
target_link_libraries(FontEditor LibGUI LibGfx)
11 changes: 0 additions & 11 deletions Applications/FontEditor/Makefile

This file was deleted.

10 changes: 10 additions & 0 deletions Applications/Help/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
set(SOURCES
History.cpp
main.cpp
ManualModel.cpp
ManualPageNode.cpp
ManualSectionNode.cpp
)

serenity_bin(Help)
target_link_libraries(Help LibWeb LibMarkdown LibGUI)
12 changes: 0 additions & 12 deletions Applications/Help/Makefile

This file was deleted.

8 changes: 8 additions & 0 deletions Applications/HexEditor/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
set(SOURCES
HexEditor.cpp
HexEditorWidget.cpp
main.cpp
)

serenity_bin(HexEditor)
target_link_libraries(HexEditor LibGUI)
10 changes: 0 additions & 10 deletions Applications/HexEditor/Makefile

This file was deleted.

14 changes: 14 additions & 0 deletions Applications/IRCClient/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
set(SOURCES
IRCAppWindow.cpp
IRCChannel.cpp
IRCChannelMemberListModel.cpp
IRCClient.cpp
IRCLogBuffer.cpp
IRCQuery.cpp
IRCWindow.cpp
IRCWindowListModel.cpp
main.cpp
)

serenity_bin(IRCClient)
target_link_libraries(IRCClient LibWeb LibGUI)
16 changes: 0 additions & 16 deletions Applications/IRCClient/Makefile

This file was deleted.

3 changes: 0 additions & 3 deletions Applications/Makefile

This file was deleted.

Loading

0 comments on commit 450a2a0

Please sign in to comment.