From 8e50d97e6e9c53ff49d37bd52f7431aa4e73dd82 Mon Sep 17 00:00:00 2001 From: Yuqian Yang Date: Mon, 24 Sep 2018 15:32:40 +0000 Subject: Add .gitlab-ci.yml . --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitlab-ci.yml (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..fc7ac29f --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,2 @@ +test: + script: echo "Hello world!" -- cgit v1.2.3 From 2acd4830d71715054338126d7968762b0bf06cf6 Mon Sep 17 00:00:00 2001 From: crupest Date: Tue, 25 Sep 2018 01:38:56 +0800 Subject: Develop ci. --- .gitignore | 2 ++ .gitlab-ci.yml | 14 ++++++++++++-- CruUI/CMakeLists.txt | 33 +++++++++++++++++++++++++++++++++ script/build.ps1 | 6 ++++++ 4 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 CruUI/CMakeLists.txt create mode 100644 script/build.ps1 (limited to '.gitlab-ci.yml') diff --git a/.gitignore b/.gitignore index 94b41b91..c7fca0cc 100644 --- a/.gitignore +++ b/.gitignore @@ -330,3 +330,5 @@ ASALocalRun/ # Local History for Visual Studio .localhistory/ + +build/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc7ac29f..0407fdc4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,2 +1,12 @@ -test: - script: echo "Hello world!" +before_script: + - vcpkg.exe install folly:x64-windows fmt:x64-windows + +stages: + - build + - test + - deploy + +build: + stage: build + script: + - ./script/build.ps1 diff --git a/CruUI/CMakeLists.txt b/CruUI/CMakeLists.txt new file mode 100644 index 00000000..5384b113 --- /dev/null +++ b/CruUI/CMakeLists.txt @@ -0,0 +1,33 @@ +cmake_minimum_required(VERSION 3.12) +project(CruUI) + +if (MSVC_VERSION GREATER_EQUAL "1900") + include(CheckCXXCompilerFlag) + CHECK_CXX_COMPILER_FLAG("/std:c++latest" _cpp_latest_flag_supported) + if (_cpp_latest_flag_supported) + add_compile_options("/std:c++latest") + endif() +endif() + +include_directories(.) + +add_executable(CruUI + graph/graph.cpp + ui/animations/animation.cpp + ui/controls/button.cpp + ui/controls/linear_layout.cpp + ui/controls/margin_container.cpp + ui/controls/text_block.cpp + ui/controls/text_box.cpp + ui/controls/text_control.cpp + ui/controls/toggle_button.cpp + ui/events/ui_event.cpp + ui/control.cpp + ui/layout_base.cpp + ui/ui_base.cpp + ui/window.cpp + application.cpp + base.cpp + exception.cpp + main.cpp + timer.cpp) diff --git a/script/build.ps1 b/script/build.ps1 new file mode 100644 index 00000000..fb928555 --- /dev/null +++ b/script/build.ps1 @@ -0,0 +1,6 @@ +cd ..\CruUI +Remove-Item build -Recurse -ErrorAction Ignore +New-Item build -ItemType Directory +cd .\build +cmake -G "Visual Studio 15 2017 Win64" .. +cmake --build . -- cgit v1.2.3 From 0ac0b1116449ceb75a3a02e080f893fcaff8d13f Mon Sep 17 00:00:00 2001 From: Yuqian Yang Date: Mon, 24 Sep 2018 17:41:57 +0000 Subject: Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0407fdc4..46876fa6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,12 +1,8 @@ -before_script: - - vcpkg.exe install folly:x64-windows fmt:x64-windows - stages: - build - - test - - deploy build: stage: build script: + - vcpkg.exe install folly:x64-windows fmt:x64-windows - ./script/build.ps1 -- cgit v1.2.3 From 2f015d2b6d221ac47aaaee9b675648370b6bca7c Mon Sep 17 00:00:00 2001 From: crupest Date: Tue, 25 Sep 2018 01:45:17 +0800 Subject: Update ci. --- .gitlab-ci.yml | 1 - script/build.ps1 | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 46876fa6..de979b71 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,5 +4,4 @@ stages: build: stage: build script: - - vcpkg.exe install folly:x64-windows fmt:x64-windows - ./script/build.ps1 diff --git a/script/build.ps1 b/script/build.ps1 index fb928555..125c305c 100644 --- a/script/build.ps1 +++ b/script/build.ps1 @@ -1,3 +1,5 @@ +vcpkg.exe install folly:x64-windows fmt:x64-windows + cd ..\CruUI Remove-Item build -Recurse -ErrorAction Ignore New-Item build -ItemType Directory -- cgit v1.2.3 From 0d5f9d0013456847d326168b6da501c2ae732e03 Mon Sep 17 00:00:00 2001 From: crupest Date: Tue, 25 Sep 2018 01:56:37 +0800 Subject: Update ci.` --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index de979b71..81433e40 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,3 +5,5 @@ build: stage: build script: - ./script/build.ps1 + tags: + - windows -- cgit v1.2.3