royalapps team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3
committer: James Wong <jwong01@xxxxxxxxxxx>
branch nick: trunk
timestamp: Wed 2011-09-07 13:49:15 -0400
message:
  Edited the directory structure.  
  Included the capability to use cmake with DataFileConversion.
removed:
  DataFile/
  DataFile/include/
  DataFile/lib/
  DataFile/src/
  DataFileTest/
  DataFileTest/bin/
  DataFileTest/include/
  DataFileTest/src/
added:
  src/
  src/CMakeLists.txt
  src/DataFile/
  src/DataFile/DataFile.cbp
  src/DataFile/DataFile.layout
  src/DataFile/include/
  src/DataFile/lib/
  src/DataFile/src/
  src/UnitTester/
  src/UnitTester/CMakeLists.txt
  src/UnitTester/UnitTester.cbp
  src/UnitTester/UnitTester.depend
  src/UnitTester/UnitTester.layout
  src/UnitTester/bin/
  src/UnitTester/bin/Debug/
  src/UnitTester/bin/Debug/UnitTester
  src/UnitTester/bin/Release/
  src/UnitTester/bin/Release/UnitTester
  src/UnitTester/include/
  src/UnitTester/mainUnitTester.cpp
  src/UnitTester/src/
  src/UnitTester/src/obj/
  src/UnitTester/src/obj/Debug/
  src/UnitTester/src/obj/Release/
  src/cmake/
  src/cmake/CPackConfigDEB.cmake
  src/cmake/CPackConfigRPM.cmake
  src/cmake/FindCppUnit.cmake


--
lp:datafileconversion
https://code.launchpad.net/~royalapps/datafileconversion/trunk

Your team RoyalApps Development Team is subscribed to branch lp:datafileconversion.
To unsubscribe from this branch go to https://code.launchpad.net/~royalapps/datafileconversion/trunk/+edit-subscription

=== removed directory 'DataFile'
=== removed directory 'DataFile/include'
=== removed directory 'DataFile/lib'
=== removed directory 'DataFile/src'
=== removed directory 'DataFileTest'
=== removed directory 'DataFileTest/bin'
=== removed directory 'DataFileTest/include'
=== removed directory 'DataFileTest/src'
=== added directory 'src'
=== added file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/CMakeLists.txt	2011-09-07 17:49:15 +0000
@@ -0,0 +1,63 @@
+PROJECT(DataFileConversion)
+
+
+cmake_minimum_required(VERSION 2.6)
+
+
+ENABLE_TESTING()
+
+
+# Directory Structure
+set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})
+set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
+set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+find_package(CppUnit REQUIRED)
+
+
+# Libraries
+include_directories("${PROJECT_SOURCE_DIR}/DataFile/include")
+SET(DataFile_SRCFILES DataFile/src/DataFile.cpp)
+ADD_LIBRARY(DataFile SHARED ${DATAFILE_SOURCES})
+
+
+# Main executable
+#ADD_EXECUTABLE(DataFileConversion DataFileConversion/src/main.cpp)
+#target_link_libraries(DataFileConversion DataFile)
+#install(TARGETS DataFileConversion DataFile
+#        RUNTIME DESTINATION bin
+#        LIBRARY DESTINATION lib)
+
+
+# Unit testing driver
+include_directories("${PROJECT_SOURCE_DIR}/UnitTester/include")
+set(UnitTester_SRCFILES UnitTester/mainUnitTester.cpp
+                        UnitTester/src/DataFileTest.cpp)
+add_executable(UnitTester ${UnitTester_SRCFILES})
+TARGET_LINK_LIBRARIES(UnitTester ${CPPUNIT_LIBRARY}
+                                 DataFile
+                                 dl)
+
+# Add coverage options for CI
+if(COVERAGE)
+   set_target_properties(DataFile
+#                         DataFileConversion
+                         UnitTester
+                         PROPERTIES COMPILE_FLAGS "-fprofile-arcs -ftest-coverage"
+                                    LINK_FLAGS "-coverage")
+endif(COVERAGE)
+
+
+# Choose the packaging
+# include("cmake/CPackConfigRPM.cmake")
+include("cmake/CPackConfigDEB.cmake")
+set(CPACK_PACKAGE_VERSION "1.0.0")
+set(CPACK_PACKAGE_VERSION_MAJOR "1")
+set(CPACK_PACKAGE_VERSION_MINOR "0")
+set(CPACK_PACKAGE_VERSION_PATCH "0")
+
+# Use default variables when not specified
+include(CPack)
+
+
+
+

=== added directory 'src/DataFile'
=== added file 'src/DataFile/DataFile.cbp'
--- src/DataFile/DataFile.cbp	1970-01-01 00:00:00 +0000
+++ src/DataFile/DataFile.cbp	2011-09-07 17:49:15 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="DataFile" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug">
+				<Option output="lib/libDataFile" prefix_auto="1" extension_auto="1" />
+				<Option object_output="src/obj/Debug/" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-g" />
+				</Compiler>
+			</Target>
+			<Target title="Release">
+				<Option output="../lib/libDataFile" prefix_auto="1" extension_auto="1" />
+				<Option object_output="src/obj/Release/" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-O2" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+				</Linker>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add option="-Wall" />
+			<Add option="-fexceptions" />
+			<Add directory="include" />
+		</Compiler>
+		<Extensions>
+			<envvars />
+			<code_completion />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>

=== added file 'src/DataFile/DataFile.layout'
--- src/DataFile/DataFile.layout	1970-01-01 00:00:00 +0000
+++ src/DataFile/DataFile.layout	2011-09-07 17:49:15 +0000
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_layout_file>
+	<ActiveTarget name="Debug" />
+</CodeBlocks_layout_file>

=== added directory 'src/DataFile/include'
=== added directory 'src/DataFile/lib'
=== added directory 'src/DataFile/src'
=== added directory 'src/UnitTester'
=== added file 'src/UnitTester/CMakeLists.txt'
--- src/UnitTester/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/UnitTester/CMakeLists.txt	2011-09-07 17:49:15 +0000
@@ -0,0 +1,20 @@
+FILE(GLOB UnitTester_SRCFILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/src "*Test.cpp")
+MESSAGE("Found Test Files: ${UnitTester_SRCFILES}")
+ADD_EXECUTABLE(UnitTester mainUnitTester.cpp
+                          ${UnitTester_SRCFILES})
+TARGET_LINK_LIBRARIES(UnitTester cppunit
+                                 DataFile
+                                 dl)
+
+include_directories("${PROJECT_SOURCE_DIR}/DataFile/include")
+include_directories("${PROJECT_SOURCE_DIR}/UnitTester/include")
+
+FOREACH(test ${UnitTester_SRCFILES})
+   MESSAGE("  ### adding test ${test}")
+   GET_FILENAME_COMPONENT(TestName ${test} NAME_WE)
+   ADD_TEST(${TestName} UnitTester ${TestName})
+ENDFOREACH(test)
+
+
+
+

=== added file 'src/UnitTester/UnitTester.cbp'
--- src/UnitTester/UnitTester.cbp	1970-01-01 00:00:00 +0000
+++ src/UnitTester/UnitTester.cbp	2011-09-07 17:49:15 +0000
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="UnitTester" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug">
+				<Option output="bin/Debug/UnitTester" prefix_auto="1" extension_auto="1" />
+				<Option object_output="src/obj/Debug/" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-g" />
+				</Compiler>
+			</Target>
+			<Target title="Release">
+				<Option output="bin/Release/UnitTester" prefix_auto="1" extension_auto="1" />
+				<Option object_output="src/obj/Release/" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-O2" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+				</Linker>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add option="-Wall" />
+			<Add option="-fexceptions" />
+			<Add directory="include" />
+			<Add directory="../include" />
+		</Compiler>
+		<Linker>
+			<Add directory="../lib" />
+		</Linker>
+		<Unit filename="mainUnitTester.cpp" />
+		<Extensions>
+			<envvars />
+			<code_completion />
+			<debugger />
+			<lib_finder disable_auto="1" />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>

=== added file 'src/UnitTester/UnitTester.depend'
--- src/UnitTester/UnitTester.depend	1970-01-01 00:00:00 +0000
+++ src/UnitTester/UnitTester.depend	2011-09-07 17:49:15 +0000
@@ -0,0 +1,5 @@
+# depslib dependency file v1.0
+1315390584 source:/home/jwong/Projects/DataFileConversion/trunk/UnitTester/mainUnitTester.cpp
+	<cstdlib>
+	<iostream>
+

=== added file 'src/UnitTester/UnitTester.layout'
--- src/UnitTester/UnitTester.layout	1970-01-01 00:00:00 +0000
+++ src/UnitTester/UnitTester.layout	2011-09-07 17:49:15 +0000
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_layout_file>
+	<ActiveTarget name="Debug" />
+	<File name="mainUnitTester.cpp" open="1" top="1" tabpos="0">
+		<Cursor position="139" topLine="0" />
+	</File>
+</CodeBlocks_layout_file>

=== added directory 'src/UnitTester/bin'
=== added directory 'src/UnitTester/bin/Debug'
=== added file 'src/UnitTester/bin/Debug/UnitTester'
Binary files src/UnitTester/bin/Debug/UnitTester	1970-01-01 00:00:00 +0000 and src/UnitTester/bin/Debug/UnitTester	2011-09-07 17:49:15 +0000 differ
=== added directory 'src/UnitTester/bin/Release'
=== added file 'src/UnitTester/bin/Release/UnitTester'
Binary files src/UnitTester/bin/Release/UnitTester	1970-01-01 00:00:00 +0000 and src/UnitTester/bin/Release/UnitTester	2011-09-07 17:49:15 +0000 differ
=== added directory 'src/UnitTester/include'
=== added file 'src/UnitTester/mainUnitTester.cpp'
--- src/UnitTester/mainUnitTester.cpp	1970-01-01 00:00:00 +0000
+++ src/UnitTester/mainUnitTester.cpp	2011-09-07 17:49:15 +0000
@@ -0,0 +1,14 @@
+#include <cstdlib>
+#include <iostream>
+
+int main()
+ {
+
+   std::cout << "Hello world!" << std::endl;
+
+   return EXIT_SUCCESS;
+
+ }
+
+
+

=== added directory 'src/UnitTester/src'
=== added directory 'src/UnitTester/src/obj'
=== added directory 'src/UnitTester/src/obj/Debug'
=== added directory 'src/UnitTester/src/obj/Release'
=== added directory 'src/cmake'
=== added file 'src/cmake/CPackConfigDEB.cmake'
--- src/cmake/CPackConfigDEB.cmake	1970-01-01 00:00:00 +0000
+++ src/cmake/CPackConfigDEB.cmake	2011-09-07 17:49:15 +0000
@@ -0,0 +1,14 @@
+set(CPACK_GENERATOR "DEB")
+set(CPACK_DEBIAN_PACKAGE_NAME "DataFileConversion")
+set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "i386")
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "James Wong")
+set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "A framework to facilitate the conversion between different data formats.")
+set(CPACK_DEBIAN_PACKAGE_SECTION "devel")
+set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
+
+# Scripts for pre or post installation
+#set( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/CMake/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/CMake/debian/prerm;" )
+
+
+
+

=== added file 'src/cmake/CPackConfigRPM.cmake'
--- src/cmake/CPackConfigRPM.cmake	1970-01-01 00:00:00 +0000
+++ src/cmake/CPackConfigRPM.cmake	2011-09-07 17:49:15 +0000
@@ -0,0 +1,12 @@
+set(CPACK_GENERATOR "RPM")
+set(CPACK_RPM_PACKAGE_SUMARY "A framework to facilitate the conversion between different data formats.")
+set(CPACK_RPM_PACKAGE_NAME "DataFileConversion")
+set(CPACK_RPM_PACKAGE_RELEASE)
+set(CPACK_RPM_PACKAGE_LICENSE)
+set(CPACK_RPM_PACKAGE_GROUP)
+set(CPACK_RPM_PACKAGE_VENDOR)
+set(CPACK_RPM_PACKAGE_DESCRIPTION)
+
+
+
+

=== added file 'src/cmake/FindCppUnit.cmake'
--- src/cmake/FindCppUnit.cmake	1970-01-01 00:00:00 +0000
+++ src/cmake/FindCppUnit.cmake	2011-09-07 17:49:15 +0000
@@ -0,0 +1,53 @@
+# - Find cppunit
+# based on a version found at:
+# https://id.eesti.ee/trac/browser/cmake/modules/FindCppUnit.cmake
+#
+# Find the native cppunit includes and library
+#
+#  CPPUNIT_INCLUDE_DIR - where to find cppunit/Test.h, etc.
+#  CPPUNIT_LIBRARIES   - List of libraries when using cppunit.
+#  CPPUNIT_FOUND       - True if cppunit found.
+#  CPPUNIT_DEFINITIONS - You should add_definitons(${LIBSMI_DEFINITIONS}) before
+#                       compiling code that includes cppunit library files.
+
+IF (CPPUNIT_INCLUDE_DIR)
+  # Already in cache, be silent
+  SET(CPPUNIT_FIND_QUIETLY TRUE)
+ENDIF (CPPUNIT_INCLUDE_DIR)
+
+INCLUDE(FindPkgConfig)
+IF (PKG_CONFIG_FOUND)
+  IF (CPPUNIT_FIND_REQUIRED AND CPPUNIT_FIND_VERSION)
+    SET(_PACKAGE_ARGS cppunit>=${CPPUNIT_FIND_VERSION} REQUIRED)
+  ELSE ()
+    SET(_PACKAGE_ARGS cppunit)
+  ENDIF ()
+  IF( NOT CPPUNIT_FIND_QUIETLY)
+    MESSAGE("XXX use pkg-config --modversion ${_PACKAGE_ARGS} ...")
+  ENDIF( NOT CPPUNIT_FIND_QUIETLY)
+  PKG_CHECK_MODULES(CPPUNIT ${_PACKAGE_ARGS})
+ENDIF (PKG_CONFIG_FOUND)
+SET(CPPUNIT_DEFINITIONS ${CPPUNIT_CFLAGS_OTHER})
+
+FIND_PATH(CPPUNIT_INCLUDE_DIR cppunit/Test.h HINTS ${CPPUNIT_INCLUDE_DIRS})
+
+SET(CPPUNIT_NAMES cppunit)
+FIND_LIBRARY(CPPUNIT_LIBRARY NAMES ${CPPUNIT_NAMES} HINTS ${CPPUNIT_LIBRARY_DIRS} )
+
+IF (NOT PKG_CONFIG_FOUND)
+  SET(CPPUNIT_LIBRARIES ${CPPUNIT_NAMES})
+  GET_FILENAME_COMPONENT(CPPUNIT_LIBRARY_DIRS ${CPPUNIT_LIBRARY} PATH)
+ENDIF (NOT PKG_CONFIG_FOUND)
+
+# handle the QUIETLY and REQUIRED arguments and set CPPUNIT_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+#FIND_PACKAGE_HANDLE_STANDARD_ARGS(CppUnit DEFAULT_MSG CPPUNIT_LIBRARY
+#    CPPUNIT_INCLUDE_DIR CPPUNIT_LIBRARIES CPPUNIT_LIBRARY_DIRS)
+#
+#MARK_AS_ADVANCED( CPPUNIT_LIBRARY CPPUNIT_INCLUDE_DIR CPPUNIT_LIBRARIES
+#    CPPUNIT_LIBRARY_DIRS CPPUNIT_DEFINITIONS )
+
+
+
+