Loading .gitignore +6 −1 Original line number Diff line number Diff line Loading @@ -15,7 +15,6 @@ aclocal.m4 autom4te.cache config.guess config.h config.h.in config.log config.status config.sub Loading @@ -34,3 +33,9 @@ current_tag tags test-driver cfgdealer/cfgdealer_test *.cmake !cmake/Modules/*.cmake CMakeCache.txt CMakeFiles install_manifest.txt version.info CMakeLists.txt 0 → 100644 +66 −0 Original line number Diff line number Diff line cmake_minimum_required(VERSION 3.2) message(STATUS "Generating build using CMake ${CMAKE_VERSION}") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") # store short version to SZARP_VERSION, store long version to version.info (see below) execute_process(COMMAND "${CMAKE_SOURCE_DIR}/script/version-info" -v "${CMAKE_SOURCE_DIR}/debian/changelog" OUTPUT_VARIABLE SZARP_VERSION) add_custom_target( version.info ALL "${CMAKE_SOURCE_DIR}/script/version-info" "${CMAKE_SOURCE_DIR}/debian/changelog" > ${CMAKE_CURRENT_BINARY_DIR}/version.info ) set(PACKAGE_NAME "szarp") # /etc/PACKAGE_NAME/PACKAGE_NAME.cfg project(${PACKAGE_NAME} LANGUAGES C CXX) set(szarp_BINARY_STAGE_DIR ${szarp_BINARY_DIR}/stage CACHE INTERNAL "STAGE_DIR") message(STATUS "Configuration types: ${CMAKE_CONFIGURATION_TYPES}") string(TOUPPER "${CMAKE_BUILD_TYPE}" _build_type) message(STATUS "CMAKE_C_FLAGS_${_build_type}: ${CMAKE_C_FLAGS_${_build_type}}") message(STATUS "CMAKE_CXX_FLAGS_${_build_type}: ${CMAKE_CXX_FLAGS_${_build_type}}") option(WITH_TESTS "Enable tests" ON) if (${WITH_TESTS}) enable_testing() endif() option(BUILD_DOC "Enable documentation build" OFF) include(GNUInstallDirs) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_REQUIRED_LIBRARIES m) set(CMAKE_REQUIRED_INCLUDES math.h) set(Python_ADDITIONAL_VERSIONS 2.7) set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/libs) set(PACKAGE_BUGREPORT "devs@newterm.pl") set(PACKAGE_URL "https://github.com/newterm/szarp") set(PREFIX "/opt/szarp/") set(VERSION ${SZARP_VERSION}) # required by some source files set(CMAKE_POSITION_INDEPENDENT_CODE ON) include(cmake/install_layout.cmake) include(cmake/configure.cmake) include(cmake/compiler.cmake) include(cmake/packaging.cmake) add_subdirectory(libSzarp) add_subdirectory(libSzarp2) add_subdirectory(python) add_subdirectory(sender) add_subdirectory(parcook) add_subdirectory(cfgdealer) add_subdirectory(isl) add_subdirectory(meaner3) add_subdirectory(iks) add_subdirectory(extern) add_subdirectory(wx) add_subdirectory(utils) add_subdirectory(unit_tests) add_subdirectory(resources) add_subdirectory(script) add_subdirectory(qt4) install(FILES version.info DESTINATION "${SZARP_SHAREDIR}" ) install(FILES libs/libpyszbase.so libs/libpysz4.so DESTINATION "${SZARP_LIBDIR}" ) INSTALL +0 −3 Original line number Diff line number Diff line Loading @@ -113,6 +113,3 @@ and one of the following: # apt-get install szarp-server # apt-get install szarp-terminal # apt-get install szarp-viewer Makefile.amdeleted 100644 → 0 +0 −47 Original line number Diff line number Diff line # Makefile.am for SZARP # Pawe Paucha <pawel@praterm.pl> # # $Id: Makefile.am 6583 2009-04-03 15:13:43Z pawel $ SUBDIRS = @SUBDIRS@ ACLOCAL_AMFLAGS = -I m4 MAINTAINERCLEANFILES = Makefile.in configure aclocal.m4 config.h.in \ depcomp install-sh missing mkinstalldirs ylwrap \ config.guess config.sub stamp-h.in py-compile # Traditional SZARP target cleanconfig: maintainer-clean debian/rules clean rm -rf doxy # Create documentation doc documentation: ${MAKE} -C resources/documentation/new doc # Make version info version: @install -d $(DESTDIR)@prefix@/resources @echo "Creating version info..." @ @srcdir@/script/version-info @srcdir@/debian/changelog > $(DESTDIR)@prefix@/resources/version.info install_scripts: ${MAKE} -C script install_scripts logdir: $(INSTALL) -d $(DESTDIR)@prefix@/logs if !DEB_BUILD install-data-hook: version logdir else DEB_BUILD install-data-hook: version logdir endif doxy: cd @srcdir@ && doxygen EXTRA_DIST = \ Doxyfile .PHONY: doxy version autogen.shdeleted 100755 → 0 +0 −14 Original line number Diff line number Diff line #!/bin/sh # $Id$ echo "Running autoheader" autoheader echo "Running aclocal" aclocal -I m4 -I /usr/share/aclocal echo "Running libtoolize" libtoolize echo "Running automake" automake -a -c echo "Running autoconf" autoconf echo "Run ./configure to configure SZARP" Loading
.gitignore +6 −1 Original line number Diff line number Diff line Loading @@ -15,7 +15,6 @@ aclocal.m4 autom4te.cache config.guess config.h config.h.in config.log config.status config.sub Loading @@ -34,3 +33,9 @@ current_tag tags test-driver cfgdealer/cfgdealer_test *.cmake !cmake/Modules/*.cmake CMakeCache.txt CMakeFiles install_manifest.txt version.info
CMakeLists.txt 0 → 100644 +66 −0 Original line number Diff line number Diff line cmake_minimum_required(VERSION 3.2) message(STATUS "Generating build using CMake ${CMAKE_VERSION}") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") # store short version to SZARP_VERSION, store long version to version.info (see below) execute_process(COMMAND "${CMAKE_SOURCE_DIR}/script/version-info" -v "${CMAKE_SOURCE_DIR}/debian/changelog" OUTPUT_VARIABLE SZARP_VERSION) add_custom_target( version.info ALL "${CMAKE_SOURCE_DIR}/script/version-info" "${CMAKE_SOURCE_DIR}/debian/changelog" > ${CMAKE_CURRENT_BINARY_DIR}/version.info ) set(PACKAGE_NAME "szarp") # /etc/PACKAGE_NAME/PACKAGE_NAME.cfg project(${PACKAGE_NAME} LANGUAGES C CXX) set(szarp_BINARY_STAGE_DIR ${szarp_BINARY_DIR}/stage CACHE INTERNAL "STAGE_DIR") message(STATUS "Configuration types: ${CMAKE_CONFIGURATION_TYPES}") string(TOUPPER "${CMAKE_BUILD_TYPE}" _build_type) message(STATUS "CMAKE_C_FLAGS_${_build_type}: ${CMAKE_C_FLAGS_${_build_type}}") message(STATUS "CMAKE_CXX_FLAGS_${_build_type}: ${CMAKE_CXX_FLAGS_${_build_type}}") option(WITH_TESTS "Enable tests" ON) if (${WITH_TESTS}) enable_testing() endif() option(BUILD_DOC "Enable documentation build" OFF) include(GNUInstallDirs) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_REQUIRED_LIBRARIES m) set(CMAKE_REQUIRED_INCLUDES math.h) set(Python_ADDITIONAL_VERSIONS 2.7) set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/libs) set(PACKAGE_BUGREPORT "devs@newterm.pl") set(PACKAGE_URL "https://github.com/newterm/szarp") set(PREFIX "/opt/szarp/") set(VERSION ${SZARP_VERSION}) # required by some source files set(CMAKE_POSITION_INDEPENDENT_CODE ON) include(cmake/install_layout.cmake) include(cmake/configure.cmake) include(cmake/compiler.cmake) include(cmake/packaging.cmake) add_subdirectory(libSzarp) add_subdirectory(libSzarp2) add_subdirectory(python) add_subdirectory(sender) add_subdirectory(parcook) add_subdirectory(cfgdealer) add_subdirectory(isl) add_subdirectory(meaner3) add_subdirectory(iks) add_subdirectory(extern) add_subdirectory(wx) add_subdirectory(utils) add_subdirectory(unit_tests) add_subdirectory(resources) add_subdirectory(script) add_subdirectory(qt4) install(FILES version.info DESTINATION "${SZARP_SHAREDIR}" ) install(FILES libs/libpyszbase.so libs/libpysz4.so DESTINATION "${SZARP_LIBDIR}" )
INSTALL +0 −3 Original line number Diff line number Diff line Loading @@ -113,6 +113,3 @@ and one of the following: # apt-get install szarp-server # apt-get install szarp-terminal # apt-get install szarp-viewer
Makefile.amdeleted 100644 → 0 +0 −47 Original line number Diff line number Diff line # Makefile.am for SZARP # Pawe Paucha <pawel@praterm.pl> # # $Id: Makefile.am 6583 2009-04-03 15:13:43Z pawel $ SUBDIRS = @SUBDIRS@ ACLOCAL_AMFLAGS = -I m4 MAINTAINERCLEANFILES = Makefile.in configure aclocal.m4 config.h.in \ depcomp install-sh missing mkinstalldirs ylwrap \ config.guess config.sub stamp-h.in py-compile # Traditional SZARP target cleanconfig: maintainer-clean debian/rules clean rm -rf doxy # Create documentation doc documentation: ${MAKE} -C resources/documentation/new doc # Make version info version: @install -d $(DESTDIR)@prefix@/resources @echo "Creating version info..." @ @srcdir@/script/version-info @srcdir@/debian/changelog > $(DESTDIR)@prefix@/resources/version.info install_scripts: ${MAKE} -C script install_scripts logdir: $(INSTALL) -d $(DESTDIR)@prefix@/logs if !DEB_BUILD install-data-hook: version logdir else DEB_BUILD install-data-hook: version logdir endif doxy: cd @srcdir@ && doxygen EXTRA_DIST = \ Doxyfile .PHONY: doxy version
autogen.shdeleted 100755 → 0 +0 −14 Original line number Diff line number Diff line #!/bin/sh # $Id$ echo "Running autoheader" autoheader echo "Running aclocal" aclocal -I m4 -I /usr/share/aclocal echo "Running libtoolize" libtoolize echo "Running automake" automake -a -c echo "Running autoconf" autoconf echo "Run ./configure to configure SZARP"