From 514ebaf4260f39e7bfd320c2ff3928f73cd22a51 Mon Sep 17 00:00:00 2001 From: qPCR4vir Date: Thu, 5 Dec 2019 13:03:09 +0100 Subject: [PATCH 1/6] FIX #469, #492 ? --- build/cmake/shared_libs.cmake | 4 ++-- source/paint/image.cpp | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/build/cmake/shared_libs.cmake b/build/cmake/shared_libs.cmake index 85e4a706..a158317d 100644 --- a/build/cmake/shared_libs.cmake +++ b/build/cmake/shared_libs.cmake @@ -39,8 +39,8 @@ endif() if(NANA_STATIC_STDLIB) target_link_libraries(nana PUBLIC - $<$:-static-libgcc> - $<$:-static-libstdc++> + $<$:-static-libgcc -static-libstdc++> + $<$:-static-libgcc -static-libstdc++> ) endif() diff --git a/source/paint/image.cpp b/source/paint/image.cpp index 857c31f7..389ed68e 100644 --- a/source/paint/image.cpp +++ b/source/paint/image.cpp @@ -1,4 +1,4 @@ -/* +/** * Paint Image Implementation * Nana C++ Library(http://www.nanapro.org) * Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com) @@ -7,9 +7,8 @@ * (See accompanying file LICENSE_1_0.txt or copy at * http://www.boost.org/LICENSE_1_0.txt) * - * @file: nana/paint/image.cpp - * @contributors: - * nabijaczleweli(pr#106) + * @file nana/paint/image.cpp + * @contributors nabijaczleweli(pr#106) */ #include From 55c9ce790d612366159a03690da2609e2e7b23fc Mon Sep 17 00:00:00 2001 From: qPCR4vir Date: Thu, 5 Dec 2019 13:17:20 +0100 Subject: [PATCH 2/6] update travis --- .travis.yml | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 82e8fd42..d3056da8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,8 +43,12 @@ matrix: - llvm-toolchain-precise before_install: + # donwload nana-demo first + # we are in: 'user'/nana/ - cd .. - - git clone --depth=1 --branch=hotfix https://github.com/qPCR4vir/nana-demo.git nana-demo + # we are in: 'user'/ + - git clone --depth=1 --branch=master https://github.com/qPCR4vir/nana-demo.git nana-demo + # now we have 'user'/nana-demo, 'user'/nana/ and we are in: 'user'/ - export PATH="$HOME/bin:$PATH" - wget --no-check-certificate --no-clobber -O /tmp/tools/cmake https://cmake.org/files/v3.12/cmake-3.12.0-rc3-Linux-x86_64.sh || true - chmod -R +x /tmp/tools @@ -53,22 +57,24 @@ install: - /tmp/tools/cmake --prefix="$HOME" --exclude-subdir before_script : - # we have: qPCR4vir/nana/../nana-demo and now we are in: qPCR4vir/nana/ our executable tests will access: ../nana-demo/Examples/*.bmp etc.(need to be in parallel with nana-demo/Examples) - #- cd ../nana-demo - - mkdir demo-build + - mkdir demo-build - cd demo-build + # now we have 'user'/nana-demo, 'user'/nana/ , 'user'/demo-build/ and we are in: 'user'/demo-build/ services: - - # travis don't have a physical monitor. We need to install an emulator: https://docs.travis-ci.com/user/gui-and-headless-browsers/ + # travis don't have a physical monitor. We need to install an emulator: + # https://docs.travis-ci.com/user/gui-and-headless-browsers/ - xvfb script: - cmake -G"Unix Makefiles" ../nana-demo -DCMAKE_INSTALL_PREFIX=.. -DNANA_CMAKE_ENABLE_JPEG=ON -DNANA_CMAKE_FIND_BOOST_FILESYSTEM=OFF -DNANA_CMAKE_AUTOMATIC_GUI_TESTING=ON -DNANA_CMAKE_INSTALL=OFF - make install + # we have installed in 'user'/ ('user'/demo-build/..), and cmake created 'user'/nana-test/ # todo: separate resources from sources (a directory for images) - ls + # we were still in: 'user'/demo-build/ - cd ../nana-test/bin - - ls + - ls -lh - ./a_group_impl - ./animate-bmp - ./audio_player @@ -107,22 +113,21 @@ script: - ./menu_debug #- ./modal_form # https://travis-ci.org/qPCR4vir/nana/jobs/140250744#L1736 #- ./MontiHall # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1775 - #- ./helloworld_demo # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1786 + - ./helloworld_demo + # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1786 #- ./notepad # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1799 - - ./menu_debug - - ./menu_popuper - #- ./modal_form # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1846 + - ./menu_popuper #- ./widget_show2 # https://travis-ci.org/qPCR4vir/nana/jobs/140245437#L1730 #- ./widget_show # https://travis-ci.org/qPCR4vir/nana/jobs/140245437#L1740 - ./place_login - ./png #- ./screen # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1909 - - ./stretch_image - #- ./threading # https://travis-ci.org/qPCR4vir/nana/jobs/140245437#L1826 ? - #- ./thread-pool # https://travis-ci.org/qPCR4vir/nana/jobs/140247564#L1782 + - ./stretch_image + - ./textbox_line_number + - ./threading # https://travis-ci.org/qPCR4vir/nana/jobs/140245437#L1826 ? + - ./thread-pool # https://travis-ci.org/qPCR4vir/nana/jobs/140247564#L1782 - ./various_events #- ./window-dragger # https://travis-ci.org/qPCR4vir/nana/jobs/140245438#L1820 - ./windows-subclassing - - ./textbox_line_number From 08a1aba80181a97f5ad18099676dc3e8fe3bffdf Mon Sep 17 00:00:00 2001 From: qPCR4vir Date: Thu, 5 Dec 2019 13:53:18 +0100 Subject: [PATCH 3/6] update travis just align --- .travis.yml | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index d3056da8..6b0160be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,7 +79,7 @@ script: - ./animate-bmp - ./audio_player - ./background-effects - #- ./calculator # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1159 + #- ./calculator # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1159 - ./categ - ./clicked - ./decore @@ -87,13 +87,13 @@ script: - ./drag-button - ./draw - ./file_explorer - #- ./example_menu # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1348 + #- ./example_menu # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1348 - ./example_listbox - #- ./example_combox # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1378 + #- ./example_combox # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1378 - ./example.button - #- ./filebox-txt # https://travis-ci.org/qPCR4vir/nana/jobs/140250744#L1393 + #- ./filebox-txt # https://travis-ci.org/qPCR4vir/nana/jobs/140250744#L1393 - ./folder_tree - #- ./folder_tree_nana # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1408 + #- ./folder_tree_nana # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1408 #- ./folder_tree_std # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1421 - ./framework_design_1 - ./framework_design_2 @@ -101,33 +101,32 @@ script: - ./group - ./HelloWord #- ./helloword_quit # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1572 - #- ./inputbox # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1585 + #- ./inputbox # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1585 - ./label_listener - ./lambda_event.Cpp11 - ./listbox_inline_widget - ./listbox_Resolver - ./loader_1 - #- ./loader_2 # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1732 + #- ./loader_2 # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1732 - ./mbox - ./main - ./menu_debug - #- ./modal_form # https://travis-ci.org/qPCR4vir/nana/jobs/140250744#L1736 - #- ./MontiHall # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1775 - - ./helloworld_demo - # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1786 - #- ./notepad # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1799 + #- ./modal_form # https://travis-ci.org/qPCR4vir/nana/jobs/140250744#L1736 + #- ./MontiHall # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1775 + - ./helloworld_demo # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1786 + #- ./notepad # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1799 - ./menu_popuper - #- ./widget_show2 # https://travis-ci.org/qPCR4vir/nana/jobs/140245437#L1730 - #- ./widget_show # https://travis-ci.org/qPCR4vir/nana/jobs/140245437#L1740 + #- ./widget_show2 # https://travis-ci.org/qPCR4vir/nana/jobs/140245437#L1730 + #- ./widget_show # https://travis-ci.org/qPCR4vir/nana/jobs/140245437#L1740 - ./place_login - ./png - #- ./screen # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1909 + #- ./screen # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1909 - ./stretch_image - ./textbox_line_number - - ./threading # https://travis-ci.org/qPCR4vir/nana/jobs/140245437#L1826 ? - - ./thread-pool # https://travis-ci.org/qPCR4vir/nana/jobs/140247564#L1782 + - ./threading # https://travis-ci.org/qPCR4vir/nana/jobs/140245437#L1826 ? + - ./thread-pool # https://travis-ci.org/qPCR4vir/nana/jobs/140247564#L1782 - ./various_events - #- ./window-dragger # https://travis-ci.org/qPCR4vir/nana/jobs/140245438#L1820 + #- ./window-dragger # https://travis-ci.org/qPCR4vir/nana/jobs/140245438#L1820 - ./windows-subclassing From 5d147f6849e2ca7c2ebd51e25a5fe89c7a658a36 Mon Sep 17 00:00:00 2001 From: qPCR4vir Date: Thu, 5 Dec 2019 13:54:23 +0100 Subject: [PATCH 4/6] update travis run all? tests --- .travis.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6b0160be..93e15f9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,7 +79,7 @@ script: - ./animate-bmp - ./audio_player - ./background-effects - #- ./calculator # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1159 + - ./calculator # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1159 - ./categ - ./clicked - ./decore @@ -87,46 +87,46 @@ script: - ./drag-button - ./draw - ./file_explorer - #- ./example_menu # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1348 + - ./example_menu # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1348 - ./example_listbox - #- ./example_combox # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1378 + - ./example_combox # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1378 - ./example.button - #- ./filebox-txt # https://travis-ci.org/qPCR4vir/nana/jobs/140250744#L1393 + - ./filebox-txt # https://travis-ci.org/qPCR4vir/nana/jobs/140250744#L1393 - ./folder_tree - #- ./folder_tree_nana # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1408 - #- ./folder_tree_std # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1421 + - ./folder_tree_nana # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1408 + - ./folder_tree_std # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1421 - ./framework_design_1 - ./framework_design_2 - ./framework_design_3 - ./group - ./HelloWord - #- ./helloword_quit # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1572 - #- ./inputbox # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1585 + - ./helloword_quit # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1572 + - ./inputbox # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1585 - ./label_listener - ./lambda_event.Cpp11 - ./listbox_inline_widget - ./listbox_Resolver - ./loader_1 - #- ./loader_2 # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1732 + - ./loader_2 # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1732 - ./mbox - ./main - ./menu_debug - #- ./modal_form # https://travis-ci.org/qPCR4vir/nana/jobs/140250744#L1736 - #- ./MontiHall # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1775 + - ./modal_form # https://travis-ci.org/qPCR4vir/nana/jobs/140250744#L1736 + - ./MontiHall # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1775 - ./helloworld_demo # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1786 - #- ./notepad # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1799 + - ./notepad # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1799 - ./menu_popuper - #- ./widget_show2 # https://travis-ci.org/qPCR4vir/nana/jobs/140245437#L1730 - #- ./widget_show # https://travis-ci.org/qPCR4vir/nana/jobs/140245437#L1740 + - ./widget_show2 # https://travis-ci.org/qPCR4vir/nana/jobs/140245437#L1730 + - ./widget_show # https://travis-ci.org/qPCR4vir/nana/jobs/140245437#L1740 - ./place_login - ./png - #- ./screen # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1909 + - ./screen # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1909 - ./stretch_image - ./textbox_line_number - ./threading # https://travis-ci.org/qPCR4vir/nana/jobs/140245437#L1826 ? - ./thread-pool # https://travis-ci.org/qPCR4vir/nana/jobs/140247564#L1782 - ./various_events - #- ./window-dragger # https://travis-ci.org/qPCR4vir/nana/jobs/140245438#L1820 + - ./window-dragger # https://travis-ci.org/qPCR4vir/nana/jobs/140245438#L1820 - ./windows-subclassing From 357e8ccd730fb568dd3fcd0f2209cab3d7aed84b Mon Sep 17 00:00:00 2001 From: qPCR4vir Date: Thu, 5 Dec 2019 14:28:40 +0100 Subject: [PATCH 5/6] travis run calculator 2+2=4 !! --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 93e15f9e..94062da2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,7 +79,7 @@ script: - ./animate-bmp - ./audio_player - ./background-effects - - ./calculator # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1159 + - ./calculator # COOL !!! https://travis-ci.org/qPCR4vir/nana/builds/621103509#L924 - ./categ - ./clicked - ./decore @@ -87,11 +87,11 @@ script: - ./drag-button - ./draw - ./file_explorer - - ./example_menu # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1348 + - ./example_menu # OK ! https://travis-ci.org/qPCR4vir/nana/builds/621103509#L1022 - ./example_listbox - - ./example_combox # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1378 + - ./example_combox # OK ! https://travis-ci.org/qPCR4vir/nana/builds/621103509#L1044 - ./example.button - - ./filebox-txt # https://travis-ci.org/qPCR4vir/nana/jobs/140250744#L1393 + # - ./filebox-txt # https://travis-ci.org/qPCR4vir/nana/builds/621103509#L1068 - ./folder_tree - ./folder_tree_nana # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1408 - ./folder_tree_std # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1421 From 3c4848d31a784a5f22ff86389803710441954b42 Mon Sep 17 00:00:00 2001 From: qPCR4vir Date: Thu, 5 Dec 2019 15:10:36 +0100 Subject: [PATCH 6/6] deprecated example --- .travis.yml | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 94062da2..e0b80b04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -92,41 +92,40 @@ script: - ./example_combox # OK ! https://travis-ci.org/qPCR4vir/nana/builds/621103509#L1044 - ./example.button # - ./filebox-txt # https://travis-ci.org/qPCR4vir/nana/builds/621103509#L1068 - - ./folder_tree - - ./folder_tree_nana # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1408 - - ./folder_tree_std # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1421 + - ./folder_tree_nana # todo failed https://travis-ci.org/qPCR4vir/nana/builds/621116812#L1193 + - ./folder_tree_std # todo failed https://travis-ci.org/qPCR4vir/nana/builds/621116812#L1200 - ./framework_design_1 - ./framework_design_2 - ./framework_design_3 - ./group - ./HelloWord - - ./helloword_quit # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1572 - - ./inputbox # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1585 + - ./helloword_quit # ok + - ./inputbox # ok - ./label_listener - ./lambda_event.Cpp11 - ./listbox_inline_widget - ./listbox_Resolver - ./loader_1 - - ./loader_2 # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1732 + - ./loader_2 # ok - ./mbox - ./main - ./menu_debug - - ./modal_form # https://travis-ci.org/qPCR4vir/nana/jobs/140250744#L1736 - - ./MontiHall # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1775 - - ./helloworld_demo # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1786 - - ./notepad # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1799 + - ./modal_form # ok + - ./MontiHall # ok + - ./helloworld_demo # ok + - ./notepad # ok !! - ./menu_popuper - - ./widget_show2 # https://travis-ci.org/qPCR4vir/nana/jobs/140245437#L1730 - - ./widget_show # https://travis-ci.org/qPCR4vir/nana/jobs/140245437#L1740 + - ./widget_show2 # ok !! + - ./widget_show # ok !! - ./place_login - ./png - - ./screen # https://travis-ci.org/qPCR4vir/nana/jobs/140238537#L1909 + - ./screen # ok - ./stretch_image - ./textbox_line_number - - ./threading # https://travis-ci.org/qPCR4vir/nana/jobs/140245437#L1826 ? - - ./thread-pool # https://travis-ci.org/qPCR4vir/nana/jobs/140247564#L1782 + - ./threading # ok + - ./thread-pool # ok - ./various_events - - ./window-dragger # https://travis-ci.org/qPCR4vir/nana/jobs/140245438#L1820 + - ./window-dragger # ok - ./windows-subclassing