From a828c6427836be3fa51002eaa32fe32f1468124a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 25 Jan 2025 15:37:45 +0100 Subject: HaX --- src/wx/cucumber/steps.cc | 46 ++++++++++++++++++++++++++++++++++++++++++++ src/wx/cucumber/wscript | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ src/wx/wscript | 11 ++++++++++- wscript | 7 ++++++- 4 files changed, 112 insertions(+), 2 deletions(-) create mode 100644 src/wx/cucumber/steps.cc create mode 100644 src/wx/cucumber/wscript diff --git a/src/wx/cucumber/steps.cc b/src/wx/cucumber/steps.cc new file mode 100644 index 000000000..19ebf9aae --- /dev/null +++ b/src/wx/cucumber/steps.cc @@ -0,0 +1,46 @@ +/* + Copyright (C) 2012-2021 Carl Hetherington + + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + DCP-o-matic is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with DCP-o-matic. If not, see . + +*/ + + +#include +#include + + +using std::string; +using cucumber::ScenarioScope; + + +class Context +{ +public: + void select_menu_item(string id) + { + std::cout << "select_menu_item " << id << "\n"; + } +}; + + + +GIVEN("^I have created a new film$") +{ + ScenarioScope context; + context->select_menu_item("File/New"); +} + diff --git a/src/wx/cucumber/wscript b/src/wx/cucumber/wscript new file mode 100644 index 000000000..0de5c6712 --- /dev/null +++ b/src/wx/cucumber/wscript @@ -0,0 +1,50 @@ +# +# Copyright (C) 2025 Carl Hetherington +# +# This file is part of DCP-o-matic. +# +# DCP-o-matic is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# DCP-o-matic is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with DCP-o-matic. If not, see . +# + +import os +import subprocess +import shlex +import glob +from waflib import Logs +import i18n + +sources = "steps.cc" + +def configure(conf): + conf.env['LIB_CUCUMBER'] = 'cucumber-cpp' + + conf.check_cxx(fragment=""" + #include \n + #include \n + int main() { return 0; }\n + """, + msg='Checking for cucumber-cpp library', + uselib_store='CUCUMBER_CPP') + +def build(bld): + if bld.env.STATIC_DCPOMATIC: + obj = bld(features='cxx cxxstlib') + else: + obj = bld(features='cxx cxxshlib') + + obj.uselib = 'LIB_CUCUMBER' + obj.name = 'libdcpomatic2-wx-cucumber' + obj.source = sources + obj.target = 'dcpomatic2-wx-cucumber' + diff --git a/src/wx/wscript b/src/wx/wscript index 583fe4bb0..220c03154 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -324,8 +324,14 @@ def configure(conf): define_name='DCPOMATIC_HAVE_GLX_SWAP_INTERVAL_EXT', mandatory=False) + if conf.env.ENABLE_CUCUMBER: + conf.recurse('cucumber') + def build(bld): + if bld.env.ENABLE_CUCUMBER: + bld.recurse('cucumber') + if bld.env.STATIC_DCPOMATIC: obj = bld(features='cxx cxxstlib') else: @@ -340,7 +346,9 @@ def build(bld): obj.uselib += 'WINSOCK2 OLE32 DSOUND WINMM KSUSER GL GLU GLEW ' if bld.env.TARGET_OSX: obj.framework = ['CoreAudio', 'OpenGL'] - obj.use = 'libdcpomatic2' + obj.use = ['libdcpomatic2'] + if bld.env.ENABLE_CUCUMBER: + obj.use.append('libdcpomatic2-wx-cucumber') obj.source = sources obj.target = 'dcpomatic2-wx' @@ -351,6 +359,7 @@ def build(bld): bld(rule='msgfmt -c ${SRC} -o ${TGT}', source=bld.path.make_node(os.path.join('..', '..', 'wx-po', 'fa_IR.po')), target=bld.path.get_bld().make_node(mo)) bld.install_files(os.path.join('${PREFIX}', 'share', 'locale', 'fa_IR', 'LC_MESSAGES'), mo) + def pot(bld): i18n.pot(os.path.join('src', 'wx'), sources + " editable_list.h content_widget.h", 'libdcpomatic-wx') diff --git a/wscript b/wscript index 448f390fc..ee6fd9f88 100644 --- a/wscript +++ b/wscript @@ -80,6 +80,7 @@ def options(opt): opt.add_option('--disable-more-warnings', action='store_true', default=False, help='disable some warnings raised by Xcode 15 with the 2.16 branch') opt.add_option('--c++17', action='store_true', default=False, help='build with C++17 and libxml++-4.0') opt.add_option('--variant', help="build with variant") + opt.add_option('--enable-cucumber', action='store_true', default=False, help="build with support for running cucumber tests (also builds with c++14)") def configure(conf): conf.load('compiler_cxx') @@ -93,7 +94,10 @@ def configure(conf): conf.env.PANGOMM_API = '2.48' conf.env.CAIROMM_API = '1.16' else: - cpp_std = '11' + if conf.options.enable_cucumber: + cpp_std = '14' + else: + cpp_std = '11' conf.env.XMLPP_API = '2.6' conf.env.PANGOMM_API = '1.4' conf.env.CAIROMM_API = '1.0' @@ -115,6 +119,7 @@ def configure(conf): else: conf.env.INSTALL_PREFIX = conf.options.destdir conf.env.VARIANT = conf.options.variant if conf.options.variant else "dcpomatic" + conf.env.ENABLE_CUCUMBER = conf.options.enable_cucumber conf.check_cxx(cxxflags=['-msse', '-mfpmath=sse'], msg='Checking for SSE support', mandatory=False, define_name='SSE') -- cgit v1.2.3