--- /dev/null
+Release/
+build/
+automotive-dlt.spec
+automotive-dlt.pc
+.cproject
+.project
+config.h
+configure
+
\r
PROJECT( automotive-dlt )\r
\r
-# Set version parameters\r
+############## Set version parameters ####################### \r
SET( ${PROJECT_NAME}_MAJOR_VERSION 2 )\r
SET( ${PROJECT_NAME}_MINOR_VERSION 4 )\r
SET( ${PROJECT_NAME}_PATCH_LEVEL 2 )\r
SET( PRINT_PATCH_LEVEL ${${PROJECT_NAME}_PATCH_LEVEL})\r
SET( PRINT_VERSION ${GENIVI_PROJECT_VERSION})\r
SET( PRINT_VERSION_STATE ${${PROJECT_NAME}_VERSION_STATE})\r
-\r
SET( DLT_REVISION "")\r
-IF(NOT DEFINED DLT_REVISION)\r
- execute_process(COMMAND git describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} \r
- OUTPUT_VARIABLE DLT_REVISION \r
- OUTPUT_STRIP_TRAILING_WHITESPACE)\r
- STRING(REPLACE "-" "_" DLT_REVISION ${DLT_REVISION})\r
-ENDIF(NOT DEFINED DLT_REVISION)\r
+\r
+EXECUTE_PROCESS(COMMAND git describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} \r
+ OUTPUT_VARIABLE DLT_REVISION\r
+ ERROR_VARIABLE GIT_ERROR \r
+ OUTPUT_STRIP_TRAILING_WHITESPACE\r
+ ERROR_STRIP_TRAILING_WHITESPACE)\r
+IF( DLT_REVISION MATCHES "^$")\r
+ SET( PRINT_REVISION "Git revision unavailable")\r
+ELSE( DLT_REVISION MATCHES "")\r
+ STRING(REPLACE "-" "_" DLT_REVISION ${DLT_REVISION})\r
+ SET( PRINT_REVISION ${DLT_REVISION}) \r
+ENDIF( DLT_REVISION MATCHES "^$")\r
\r
##################### RPM SPEC CONFIG ########################\r
SET( GENIVI_RPM_RELEASE "1${DLT_REVISION}")\r
\r
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_SOURCE_DIR}/config.h @ONLY)\r
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/dlt/dlt_version.h.cmake ${CMAKE_SOURCE_DIR}/include/dlt/dlt_version.h @ONLY)\r
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/doxygen.cfg.cmake ${CMAKE_SOURCE_DIR}/doxygen.cfg @ONLY)\r
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/automotive-dlt.pc.cmake ${CMAKE_SOURCE_DIR}/automotive-dlt.pc @ONLY)\r
#CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/systemd/dlt.service.cmake ${CMAKE_SOURCE_DIR}/systemd/dlt.service @ONLY)\r
#CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/systemd/dlt-syslog.service.cmake ${CMAKE_SOURCE_DIR}/systemd/dlt-syslog.service @ONLY)\r
\r
MESSAGE( STATUS )\r
MESSAGE( STATUS "-------------------------------------------------------------------------------" )\r
-MESSAGE( STATUS "Build for Version ${PRINT_VERSION} build ${DLT_REVISION}")\r
+MESSAGE( STATUS "Build for Version ${PRINT_VERSION} build ${PRINT_REVISION}")\r
MESSAGE( STATUS "VERSION_STATE ${PRINT_VERSION_STATE}")\r
MESSAGE( STATUS "BUILD_SHARED_LIBS = ${BUILD_SHARED_LIBS}" )\r
MESSAGE( STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}" )\r
\r
IF (ENABLE_BUILD_DOC)\r
ADD_SUBDIRECTORY( doc )\r
-\r
- ADD_CUSTOM_COMMAND(\r
- OUTPUT ${CMAKE_SOURCE_DIR}/doxygen-execute\r
- DEPENDS ${CMAKE_SOURCE_DIR}/doxygen.cfg\r
- COMMAND doxygen\r
- ARGS ${CMAKE_SOURCE_DIR}/doxygen.cfg\r
- )\r
-\r
- ADD_CUSTOM_TARGET(doxygen-doc ALL DEPENDS ${CMAKE_SOURCE_DIR}/doxygen-execute)\r
-\r
- SET( DOC_COMPONENT doc)\r
ENDIF(ENABLE_BUILD_DOC)\r
\r
INSTALL(FILES automotive-dlt.pc\r
Improvements\r
* [GSW-138] API Extension to resend the log messages in the user buffer fixed\r
* [GSW-135] Fixed compile warnings \r
-\r
+ * Update of doxygen documentation/generation\r
+ \r
2.4.2\r
\r
Improvements\r
+++ /dev/null
-Name: @PROJECT_NAME@
-Summary: %{name} - Diagnostic Log and Trace
-Version: @PRINT_MAJOR_VERSION@.@PRINT_MINOR_VERSION@.@PRINT_PATCH_LEVEL@
-Release: @GENIVI_RPM_RELEASE@
-License: @LICENSE@
-Group: System Environment/Base
-Vendor: BMW Group AG
-Source: %{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: %{name} = %{version}-%{release}, pkgconfig
-
-%description
-This component provides a standardised log and trace interface, based on the
-standardised protocol specified in the AUTOSAR standard 4.0 DLT.
-This component can be used by GENIVI components and other applications as
-logging facility providing
-- the DLT shared library
-- the DLT daemon, including startup scripts
-- the DLT daemon adaptors
-- the DLT client console utilities
-- the DLT test applications
-
-%package doc
-Summary: %{name} - Diagnostic Log and Trace: Documentation
-Group: Documentation
-
-%description doc
-This component provides the documentation for %{name}.
-
-%package devel
-Summary: %{name} - Diagnostic Log and Trace: Development files
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}, pkgconfig
-
-%description devel
-This component provides the development libraries and includes for %{name}.
-
-%prep
-%setup
-echo "building package automotive-dlt"
-
-%build
-%configure
-make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/etc/init.d
-/usr/bin/install -c -m 755 testscripts/Ubuntu/dlt-daemon $RPM_BUILD_ROOT/etc/init.d
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-#/etc/init.d/dlt-daemon
-/etc/dlt-system.conf
-/etc/dlt.conf
-/usr/share/dlt-filetransfer/dlt-test-filetransfer-file
-/usr/share/dlt-filetransfer/dlt-test-filetransfer-image.png
-%{_libdir}/libdlt.so.@PRINT_MAJOR_VERSION@
-%{_libdir}/libdlt.so.@GENIVI_PROJECT_VERSION@
-%{_libdir}/libdlt.so
-%{_bindir}/dlt-system
-%{_bindir}/dlt-convert
-%{_bindir}/dlt-receive
-%{_bindir}/dlt-adaptor-stdin
-%{_bindir}/dlt-adaptor-udp
-%{_bindir}/dlt-test-client
-%{_bindir}/dlt-test-user
-%{_bindir}/dlt-test-stress
-%{_bindir}/dlt-test-internal
-%{_bindir}/dlt-test-filetransfer
-
-%attr(0755,root,root)
-%{_bindir}/dlt-daemon
-%{_bindir}/dlt-example-user
-%{_bindir}/dlt-example-user-func
-%{_bindir}/dlt-example-filetransfer
-
-%files devel
-%{_libdir}/pkgconfig/*.pc
-%{_includedir}/dlt/*.h
-%{_libdir}/pkgconfig/automotive-dlt.pc
-
-%pre
-
-%post
-
-%changelog
-* Wed Nov 24 2010 dlt_maintainer <dlt_maintainer@genivi.org> 2.2.0
-- Creation
%{_bindir}/dlt-test-stress-user
%{_bindir}/dlt-test-internal
%{_bindir}/dlt-test-filetransfer
-%attr(0755,root,root) %{_bindir}/dlt-daemon
+%attr(0755,root,root)
+%{_bindir}/dlt-daemon
%{_bindir}/dlt-example-user
%{_bindir}/dlt-example-user-func
%{_bindir}/dlt-example-filetransfer
#testscripts/Ubuntu/.*(\.h|\.cpp|\.cmake)
#testscripts/Meego/.*(\.h|\.cpp|\.cmake)
#systemd/.*(\.h|\.cpp|\.cmake)
-doc/.*\.(odt|vsd)
configure
distfiles
automotive-dlt.spec.in
# @licence end@
########
-function(convert_odt ODT_FILE)
- set(pdf "${CMAKE_CURRENT_BINARY_DIR}/${ODT_FILE}.pdf")
- set(odt "${CMAKE_CURRENT_SOURCE_DIR}/${ODT_FILE}.odt")
- add_custom_command(
- OUTPUT ${pdf}
- DEPENDS ${odt}
- COMMAND unoconv
- ARGS --format=pdf --stdout ${odt} > ${pdf}
- )
-endfunction(convert_odt)
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/doc/doxygen.cfg.cmake ${CMAKE_SOURCE_DIR}/doc/doxygen.cfg @ONLY)
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/doc/filetransfer_doxygen.cfg.cmake ${CMAKE_SOURCE_DIR}/doc/filetransfer_doxygen.cfg @ONLY)
+
+ADD_CUSTOM_COMMAND(
+ OUTPUT ${CMAKE_SOURCE_DIR}/doxygen-execute
+ DEPENDS ${CMAKE_SOURCE_DIR}/doc/doxygen.cfg
+ COMMAND doxygen
+ ARGS ${CMAKE_SOURCE_DIR}/doc/doxygen.cfg
+)
-convert_odt("GENIVI_UserManual_DLT_Client")
-convert_odt("GENIVI_UserManual_DLT_Daemon")
-convert_odt("GENIVI_Specification_DLT_Daemon")
+ADD_CUSTOM_COMMAND(
+ OUTPUT ${CMAKE_SOURCE_DIR}/doxygen-execute2
+ DEPENDS ${CMAKE_SOURCE_DIR}/doc/filetransfer_doxygen.cfg
+ COMMAND doxygen
+ ARGS ${CMAKE_SOURCE_DIR}/doc/filetransfer_doxygen.cfg
+)
+
+ADD_CUSTOM_TARGET(doc ALL DEPENDS ${CMAKE_SOURCE_DIR}/doxygen-execute)
+ADD_CUSTOM_TARGET(doc-filetransfer ALL DEPENDS ${CMAKE_SOURCE_DIR}/doxygen-execute2)
+
+SET( DOC_COMPONENT doc)
-ADD_CUSTOM_TARGET(Documents ALL echo DEPENDS
-${CMAKE_CURRENT_BINARY_DIR}/GENIVI_UserManual_DLT_Client.pdf
-${CMAKE_CURRENT_BINARY_DIR}/GENIVI_UserManual_DLT_Daemon.pdf
-${CMAKE_CURRENT_BINARY_DIR}/GENIVI_Specification_DLT_Daemon.pdf)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/GENIVI_UserManual_DLT_Client.odt
- ${CMAKE_CURRENT_SOURCE_DIR}/GENIVI_UserManual_DLT_Daemon.odt
- ${CMAKE_CURRENT_SOURCE_DIR}/GENIVI_Specification_DLT_Daemon.odt
- ${CMAKE_CURRENT_BINARY_DIR}/GENIVI_UserManual_DLT_Client.pdf
- ${CMAKE_CURRENT_BINARY_DIR}/GENIVI_UserManual_DLT_Daemon.pdf
- ${CMAKE_CURRENT_BINARY_DIR}/GENIVI_Specification_DLT_Daemon.pdf
- ${CMAKE_CURRENT_SOURCE_DIR}/GENIVI_Specification_DLT_Daemon.vsd
- DESTINATION "doc/${CMAKE_PROJECT_NAME}"
- COMPONENT doc)
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
-PROJECT_NAME = @PACKAGE@
+PROJECT_NAME = @PROJECT_NAME@
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = @VERSION@
+PROJECT_NUMBER = @GENIVI_PROJECT_VERSION@
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
-OUTPUT_DIRECTORY = doc
+OUTPUT_DIRECTORY = ./DOC_DLT
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
# 4096 sub-directories (in 2 levels) under the output directory of each output
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = src/ include/
+INPUT = ./../../src/ \
+ ./../../include
+
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project.
-PROJECT_NAME = DLT Filetransfer
+PROJECT_NAME = @PROJECT_NAME@ - Filetransfer
# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-PROJECT_NUMBER = 2.3.0
+PROJECT_NUMBER = @GENIVI_PROJECT_VERSION@
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
-OUTPUT_DIRECTORY = ./DLT_Filetransfer
+OUTPUT_DIRECTORY = ./DOC_DLT_Filetransfer
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
# 4096 sub-directories (in 2 levels) under the output directory of each output
#define __VERSION_H_
#define PACKAGE_VERSION_STATE ""
-#define PACKAGE_VERSION "2.4.2"
-#define PACKAGE_MAJOR_VERSION "2"
-#define PACKAGE_MINOR_VERSION "4"
-#define PACKAGE_PATCH_LEVEL "2"
+#define PACKAGE_VERSION ""
+#define PACKAGE_MAJOR_VERSION ""
+#define PACKAGE_MINOR_VERSION ""
+#define PACKAGE_PATCH_LEVEL ""
#define PACKAGE_REVISION ""
#endif