See <http://ci.kicad-pcb.org/job/kicad-full/1208/changes>
Changes: [jean-pierre charras] Rework on class EDA_TEXT and related classes and draw functions (Note: this is a work in progress): * remove duplicate code between draw functions and STROKE_FONT used in GAL. Use only STROKE_FONT methods in draw, plot and test DRC function for texts. It remove slightly different shapes between GAL and other calculations. * fix incorrect bounding box for texts with overbar. Especially noticeable for texts with overbar inside a copper zone in Pcbnew. * fix a few minor other bugs related to graphic texts. ------------------------------------------ Started by an SCM change Building on master in workspace <http://ci.kicad-pcb.org/job/kicad-full/ws/> $ bzr revision-info -d <http://ci.kicad-pcb.org/job/kicad-full/ws/> info result: bzr revision-info -d <http://ci.kicad-pcb.org/job/kicad-full/ws/> returned 0. Command output: "6644 [email protected] " stderr: "" [kicad-full] $ bzr pull --overwrite lp:kicad You have not informed bzr of your Launchpad ID, and you must do this to write to Launchpad or access private data. See "bzr help launchpad-login". http://bazaar.launchpad.net/~kicad-product-committers/kicad/product is permanently redirected to http://bazaar.launchpad.net/~kicad-product-committers/kicad/product/changes You have not informed bzr of your Launchpad ID, and you must do this to write to Launchpad or access private data. See "bzr help launchpad-login". M common/CMakeLists.txt M common/drawtxt.cpp M common/eda_text.cpp M common/gal/graphics_abstraction_layer.cpp M common/gal/stroke_font.cpp M eeschema/sch_sheet.cpp M eeschema/sch_text.cpp M include/drawtxt.h M include/gal/graphics_abstraction_layer.h M include/gal/stroke_font.h All changes applied successfully. Now on revision 6645. [kicad-full] $ bzr revert $ bzr revision-info -d <http://ci.kicad-pcb.org/job/kicad-full/ws/> info result: bzr revision-info -d <http://ci.kicad-pcb.org/job/kicad-full/ws/> returned 0. Command output: "6645 [email protected] " stderr: "" [kicad-full] $ bzr log -v -r revid:[email protected]:[email protected] --long --show-ids Getting local revision... $ bzr revision-info -d <http://ci.kicad-pcb.org/job/kicad-full/ws/> info result: bzr revision-info -d <http://ci.kicad-pcb.org/job/kicad-full/ws/> returned 0. Command output: "6645 [email protected] " stderr: "" RevisionState revno:6645 revid:[email protected] [kicad-full] $ /bin/sh -xe /tmp/hudson3133262845001911440.sh + OPTS=' -DCMAKE_BUILD_TYPE=Debug -DBUILD_GITHUB_PLUGIN=ON -DKICAD_SCRIPTING=ON -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON -DKICAD_SKIP_BOOST=YES' + export TERM=vt220 + TERM=vt220 + '[' -d build ']' + cd build + /usr/bin/cmake .. -DCMAKE_BUILD_TYPE=Debug -DBUILD_GITHUB_PLUGIN=ON -DKICAD_SCRIPTING=ON -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON -DKICAD_SKIP_BOOST=YES -- Kicad install dir: </usr/local> -- The compiler /usr/bin/c++ has no C++11 support. Please use a different C++ compiler. -- Found Glew: /usr/lib64/libGLEW.so -- Check for installed GLEW -- found -- Boost version: 1.59.0 -- Found the following Boost libraries: -- context -- system -- thread -- Check for installed Python Interpreter -- found -- Python module install path: lib/python2.6/site-packages -- wxPython version 3.0 found. -- Configuring done -- Generating done -- Build files have been written to: <http://ci.kicad-pcb.org/job/kicad-full/ws/build> + rm -f pcbnew/scripting/pcbnewPYTHON_wrap.cxx.o + rm -f pcbnew/scripting/pcbnewPYTHON_wrap.cxx + env + grep -q '^MAKEJOBS=' + echo 'The MAKEJOBS variable is empty' The MAKEJOBS variable is empty + JOBS=4 + make -j4 [ 0%] [ 0%] [ 0%] Built target lib-dependencies Built target page_layout_lexer_source_files Generating version string header [ 0%] [ 0%] Built target netlist_lexer_source_files Built target fp_lib_table_lexer_source_files -- Using Bazaar to determine build version string. [ 0%] Built target pcb_lexer_source_files [ 0%] Generating headers containing GLSL source code [ 0%] Built target pcb_plot_lexer_source_files Headers are up-to-date [ 0%] Built target shader_headers [ 0%] Built target specctra_lexer_source_files [ 30%] Built target bitmaps [ 30%] -- Bazaar version control system version 2.1.1 found. Built target dialog_bom_cfg_lexer_source_files [ 30%] [ 30%] Built target cmp_library_lexer_source_files Built target field_template_lexer_source_files [ 30%] Built target lib_dxf [ 30%] Built target polygon [ 31%] Built target idf3 [ 32%] [ 32%] Built target potrace Built target pcb_calculator_lexer_source_files [ 32%] Built target idfcyl [ 32%] Built target idfrect [ 33%] Built target dxf2idf -- Writing <http://ci.kicad-pcb.org/job/kicad-full/ws/build/kicad_build_version.h> file with version: (2016-03-23 BZR 6645) [ 33%] Built target version_header [ 33%] Built target idf2vrml Scanning dependencies of target gal [ 33%] [ 33%] Building CXX object common/CMakeFiles/gal.dir/draw_panel_gal.cpp.o Building CXX object common/CMakeFiles/gal.dir/painter.cpp.o Scanning dependencies of target common [ 34%] Building CXX object common/CMakeFiles/common.dir/page_layout/title_block_shapes.cpp.o In file included from <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/graphics_abstraction_layer.h>:38, from <http://ci.kicad-pcb.org/job/kicad-full/ws/common/painter.cpp>:28: <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/stroke_font.h>:53: error: a class-key must be used when declaring a friend <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/stroke_font.h>:53: error: friend declaration does not name a class or function In file included from <http://ci.kicad-pcb.org/job/kicad-full/ws/common/painter.cpp>:28: <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/stroke_font.h>: In member function ‘double KIGFX::GAL::GetOverbarVerticalPosition() const’: <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/stroke_font.h>:162: error: ‘double KIGFX::STROKE_FONT::computeOverbarVerticalPosition() const’ is protected <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/graphics_abstraction_layer.h>:301: error: within this context make[2]: *** [common/CMakeFiles/gal.dir/painter.cpp.o] Error 1 make[2]: *** Waiting for unfinished jobs.... [ 34%] Building CXX object common/CMakeFiles/common.dir/page_layout/class_worksheet_dataitem.cpp.o In file included from <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/graphics_abstraction_layer.h>:38, from <http://ci.kicad-pcb.org/job/kicad-full/ws/common/draw_panel_gal.cpp>:39: <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/stroke_font.h>:53: error: a class-key must be used when declaring a friend <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/stroke_font.h>:53: error: friend declaration does not name a class or function Scanning dependencies of target pcbcommon In file included from <http://ci.kicad-pcb.org/job/kicad-full/ws/common/draw_panel_gal.cpp>:39: <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/stroke_font.h>: In member function ‘double KIGFX::GAL::GetOverbarVerticalPosition() const’: <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/stroke_font.h>:162: error: ‘double KIGFX::STROKE_FONT::computeOverbarVerticalPosition() const’ is protected <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/graphics_abstraction_layer.h>:301: error: within this context [ 34%] Building CXX object common/CMakeFiles/pcbcommon.dir/eda_text.cpp.o make[2]: *** [common/CMakeFiles/gal.dir/draw_panel_gal.cpp.o] Error 1 make[1]: *** [common/CMakeFiles/gal.dir/all] Error 2 make[1]: *** Waiting for unfinished jobs.... [ 34%] Building CXX object common/CMakeFiles/pcbcommon.dir/pcbcommon.cpp.o [ 34%] Building CXX object common/CMakeFiles/common.dir/page_layout/class_worksheet_layout.cpp.o In file included from <http://ci.kicad-pcb.org/job/kicad-full/ws/common/eda_text.cpp>:49: <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/stroke_font.h>:53: error: a class-key must be used when declaring a friend <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/stroke_font.h>:53: error: friend declaration does not name a class or function make[2]: *** [common/CMakeFiles/pcbcommon.dir/eda_text.cpp.o] Error 1 make[2]: *** Waiting for unfinished jobs.... [ 34%] Building CXX object common/CMakeFiles/common.dir/page_layout/page_layout_graphic_items.cpp.o [ 34%] Building CXX object common/CMakeFiles/common.dir/build_version.cpp.o [ 34%] Building CXX object common/CMakeFiles/common.dir/class_bitmap_base.cpp.o [ 34%] Building CXX object common/CMakeFiles/common.dir/class_plotter.cpp.o make[1]: *** [common/CMakeFiles/pcbcommon.dir/all] Error 2 [ 34%] Building CXX object common/CMakeFiles/common.dir/common_plot_functions.cpp.o [ 34%] Building CXX object common/CMakeFiles/common.dir/common_plotHPGL_functions.cpp.o [ 34%] Building CXX object common/CMakeFiles/common.dir/common_plotPS_functions.cpp.o [ 34%] Building CXX object common/CMakeFiles/common.dir/common_plotPDF_functions.cpp.o [ 34%] Building CXX object common/CMakeFiles/common.dir/common_plotGERBER_functions.cpp.o [ 34%] Building CXX object common/CMakeFiles/common.dir/common_plotDXF_functions.cpp.o [ 34%] Building CXX object common/CMakeFiles/common.dir/common_plotSVG_functions.cpp.o [ 34%] Building CXX object common/CMakeFiles/common.dir/draw_frame.cpp.o [ 34%] Building CXX object common/CMakeFiles/common.dir/drawtxt.cpp.o [ 34%] Building CXX object common/CMakeFiles/common.dir/worksheet.cpp.o In file included from <http://ci.kicad-pcb.org/job/kicad-full/ws/common/drawtxt.cpp>:42: <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/stroke_font.h>:53: error: a class-key must be used when declaring a friend <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/stroke_font.h>:53: error: friend declaration does not name a class or function In file included from <http://ci.kicad-pcb.org/job/kicad-full/ws/common/drawtxt.cpp>:44: <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/stroke_font.h>: In member function ‘double KIGFX::GAL::GetOverbarVerticalPosition() const’: <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/stroke_font.h>:162: error: ‘double KIGFX::STROKE_FONT::computeOverbarVerticalPosition() const’ is protected <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/graphics_abstraction_layer.h>:301: error: within this context [ 34%] Building CXX object common/CMakeFiles/common.dir/view/view.cpp.o In file included from <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/graphics_abstraction_layer.h>:38, from <http://ci.kicad-pcb.org/job/kicad-full/ws/common/draw_frame.cpp>:53: <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/stroke_font.h>:53: error: a class-key must be used when declaring a friend <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/stroke_font.h>:53: error: friend declaration does not name a class or function In file included from <http://ci.kicad-pcb.org/job/kicad-full/ws/common/draw_frame.cpp>:53: <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/stroke_font.h>: In member function ‘double KIGFX::GAL::GetOverbarVerticalPosition() const’: <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/stroke_font.h>:162: error: ‘double KIGFX::STROKE_FONT::computeOverbarVerticalPosition() const’ is protected <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/graphics_abstraction_layer.h>:301: error: within this context make[2]: *** [common/CMakeFiles/common.dir/draw_frame.cpp.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: *** [common/CMakeFiles/common.dir/drawtxt.cpp.o] Error 1 In file included from <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/graphics_abstraction_layer.h>:38, from <http://ci.kicad-pcb.org/job/kicad-full/ws/common/view/view.cpp>:34: <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/stroke_font.h>:53: error: a class-key must be used when declaring a friend <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/stroke_font.h>:53: error: friend declaration does not name a class or function In file included from <http://ci.kicad-pcb.org/job/kicad-full/ws/common/view/view.cpp>:34: <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/stroke_font.h>: In member function ‘double KIGFX::GAL::GetOverbarVerticalPosition() const’: <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/stroke_font.h>:162: error: ‘double KIGFX::STROKE_FONT::computeOverbarVerticalPosition() const’ is protected <http://ci.kicad-pcb.org/job/kicad-full/ws/include/gal/graphics_abstraction_layer.h>:301: error: within this context make[2]: *** [common/CMakeFiles/common.dir/view/view.cpp.o] Error 1 make[1]: *** [common/CMakeFiles/common.dir/all] Error 2 make: *** [all] Error 2 Build step 'Execute shell' marked build as failure [WARNINGS] Skipping publisher since build result is FAILURE _______________________________________________ Mailing list: https://launchpad.net/~kicad-developers Post to : [email protected] Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
