diff --git a/README b/README index 95424bd..e9e76d6 100644 --- a/README +++ b/README @@ -19,29 +19,11 @@ The licence of programs in the tests directory is GPL v3. https://launchpad.net/libmodbus http://copyleft.free.fr/wordpress/index.php/libmodbus/ - Installation ============ -WARNING, don't use the two build systems at the same time. - -With autotools --------------- The shell commands are './configure; make; make install'. -With Waf --------- -The build system is Waf (http://code.google.com/p/waf), the shell commandes are: - $ ./waf configure - $ ./waf build - $ sudo ./waf install - -or 'waf' if you use a global Waf script. - -The sources are built in the 'build' directory at the root of the -project source files. - - Testing ======= diff --git a/src/wscript_build b/src/wscript_build deleted file mode 100644 index 86a43cb..0000000 --- a/src/wscript_build +++ /dev/null @@ -1,8 +0,0 @@ -obj = bld.new_task_gen( - features='cc cshlib', - source='modbus.c', - target='modbus', - vnum=VERSION, - includes='. ..') - -bld.install_files('${PREFIX}/include/modbus', 'modbus.h') diff --git a/tests/wscript_build b/tests/wscript_build deleted file mode 100644 index 4f75d40..0000000 --- a/tests/wscript_build +++ /dev/null @@ -1,15 +0,0 @@ -programs = ('random-test-slave', - 'unit-test-slave', - 'unit-test-master', - 'bandwidth-slave-one', - 'bandwidth-slave-many-up', - 'bandwidth-master') - -for program in programs: - obj = bld.new_task_gen( - features = 'cc cprogram', - source = program + '.c', - target = program, - includes = '. ../src', - uselib_local = 'modbus', - install_path='') diff --git a/waf b/waf deleted file mode 100755 index a8c8129..0000000 --- a/waf +++ /dev/null diff --git a/wscript b/wscript deleted file mode 100755 index 014c975..0000000 --- a/wscript +++ /dev/null @@ -1,66 +0,0 @@ -#! /usr/bin/env python -# encoding: utf-8 - -VERSION = '2.2.0' -APPNAME = 'libmodbus' - -# these variables are mandatory ('/' are converted automatically) -srcdir = '.' -blddir = 'build' - -def set_options(opt): - # options provided by the modules - opt.tool_options('compiler_cc') - -def configure(conf): - conf.check_tool('compiler_cc') - conf.check_tool('misc') - - headers = 'string.h termios.h sys/time.h \ - unistd.h errno.h limits.h fcntl.h \ - sys/types.h sys/socket.h sys/ioctl.h \ - netinet/in.h netinet/ip.h netinet/tcp.h arpa/inet.h' - - # check for headers and append found headers to headers_found for later use - headers_found = [] - for header in headers.split(): - if conf.check_cc(header_name=header): - headers_found.append(header) - - functions_headers = ( - ('setsockopt', 'sys/socket.h'), - ('inet_ntoa', 'arpa/inet.h'), - ('memset', 'string.h'), - ('select', 'sys/select.h'), - ('socket', 'sys/socket.h'), - ) - - for (function, headers) in functions_headers: - conf.check_cc(function_name=function, header_name=headers, mandatory=1) - - conf.define('VERSION', VERSION) - conf.define('PACKAGE', 'libmodbus') - conf.write_config_header('config.h') - -def build(bld): - import misc - - bld.add_subdirs('src tests') - - obj = bld.new_task_gen(features='subst', - source='modbus.pc.in', - target='modbus.pc', - dict = {'VERSION' : VERSION, - 'prefix': bld.env['PREFIX'], - 'exec_prefix': bld.env['PREFIX'], - 'libdir': bld.env['PREFIX'] + 'lib', - 'includedir': bld.env['PREFIX'] + 'include'} - ) - - bld.install_files('${PREFIX}/lib/pkgconfig', 'modbus.pc') - -def shutdown(): - import UnitTest - unittest = UnitTest.unit_test() - unittest.run() - unittest.print_results()