Diffusion MITK cac415b43136

Merge branch 'bug-14355-embedding-resources-in-modules'
cac415b43136
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-14355-embedding-resources-in-modules'

bug-14355-embedding-resources-in-modules: (21 commits) Fixed conversion warnings and VS 2012 error. Use correct node index for each resource tree when retreiving children. Added documentation for the resources system. Added missing Doxygen grouping command. Added GetCompleteSuffix() to the ModuleResource class. Improved invalid ModuleResource handling and equality operator. Fixed regular expression (dash character position), added docu. Generalize source dir variable in ctest script. Adapt and enhance tests for resources in a full static build. Changed ModuleResource API to be more consistent. Use multiple resource trees from imported static modules. Support for imported resources from statically linked modules. Simplified large if(qt module) switch and added resource processing. Use an exported CMake variable for the resource compiler. Test resources embedded into executables. Use proper include paths for the resource compiler. Removed superfluous namespace prefix. Added a system for embedding external resources in modules. Removed duplicated include statement. Added LICENSE file and explicit link in README.md. ...

Details

Provenance

Authored on Feb 4 2013, 8:31 AM

Parents

rMITKf21a3109acb6: Fixed conversion warnings and VS 2012 error.
rMITK5633b0f5166c: Merge branch 'bug-13861-TranslateFix'

Branches

Unknown

Tags

Unknown

Event Timeline

zelzer committed rMITKcac415b43136: Merge branch 'bug-14355-embedding-resources-in-modules' (authored by zelzer).Feb 4 2013, 8:31 AM

Merged Changes

f21a3109acb6 Fixed conversion warnings and VS 2012 error.
Author
zelzer
Browse Repository
No Builds
No Audits
79675b91b6c5 Use correct node index for each resource tree when retreiving children.
Author
zelzer
Browse Repository
No Builds
No Audits
052ec8bc45ab Added documentation for the resources system.
Author
zelzer
Browse Repository
No Builds
No Audits
0208704ff45d Added missing Doxygen grouping command.
Author
zelzer
Browse Repository
No Builds
No Audits
207701ddf3c0 Added GetCompleteSuffix() to the ModuleResource class.
Author
zelzer
Browse Repository
No Builds
No Audits
958a79196ff1 Improved invalid ModuleResource handling and equality operator.
Author
zelzer
Browse Repository
No Builds
No Audits
8e8b2a8ee173 Fixed regular expression (dash character position), added docu.
Author
zelzer
Browse Repository
No Builds
No Audits
49c1125f6da8 Generalize source dir variable in ctest script.
Author
zelzer
Browse Repository
No Builds
No Audits
72ad5a637587 Adapt and enhance tests for resources in a full static build.
Author
zelzer
Browse Repository
No Builds
No Audits
f4eaf4d26dad Changed ModuleResource API to be more consistent.
Author
zelzer
Browse Repository
No Builds
No Audits
73ddde3a31ff Use multiple resource trees from imported static modules.
Author
zelzer
Browse Repository
No Builds
No Audits
f11ba07f2db7 Support for imported resources from statically linked modules.
Author
zelzer
Browse Repository
No Builds
No Audits
f563d9a68d04 Simplified large if(qt module) switch and added resource processing.
Author
zelzer
Browse Repository
No Builds
No Audits
23380949c8d9 Use an exported CMake variable for the resource compiler.
Author
zelzer
Browse Repository
No Builds
No Audits
4284613d34fd Test resources embedded into executables.
Author
zelzer
Browse Repository
No Builds
No Audits
fb6959a23d80 Use proper include paths for the resource compiler.
Author
zelzer
Browse Repository
No Builds
No Audits
50521473c9cd Removed superfluous namespace prefix.
Author
zelzer
Browse Repository
No Builds
No Audits
4c37f6e3b739 Added a system for embedding external resources in modules.
Author
zelzer
Browse Repository
No Builds
No Audits
7209b9b43e39 Removed duplicated include statement.
Author
zelzer
Browse Repository
No Builds
No Audits
0d5bc32eec4c Added LICENSE file and explicit link in README.md.
Author
zelzer
Browse Repository
No Builds
No Audits
2025dcd2444f Added remarks in macro documentation about executables.
Author
zelzer
Browse Repository
No Builds
No Audits

Changes (72)

Path

Size

Packages

CMake/

mitkFunctionOrganizeSources.cmake

O1: MITK Reviewer Group I

mitkMacroCreateModule.cmake

O1: MITK Reviewer Group I

Core/

Code/

CppMicroServices/

CMake/

usCTestScript_custom.cmake

usCTestScript_travis.cmake

usFunctionCheckCompilerFlags.cmake

usFunctionCreateTestModule.cmake

usFunctionEmbedResources.cmake

usFunctionGenerateModuleInit.cmake

CppMicroServicesConfig.cmake.in

documentation/

doxygen.conf.in

doxygen/

MicroServices.dox

MicroServices_Resources.md

MicroServices_StaticModules.md

snippets/

uServices-resources

uServices-staticmodules/

src/

module/

usModuleActivator.h

usModuleImport.h

usModuleInfo.cpp

usModuleInitialization.h

usModulePrivate.cpp

usModulePrivate.h

usModuleResource.cpp

usModuleResource.h

usModuleResourceBuffer.cpp

usModuleResourceBuffer_p.h

usModuleResourceStream.cpp

usModuleResourceStream.h

usModuleResourceTree.cpp

usModuleResourceTree_p.h

service/

usServiceReference.h

usServiceTracker.tpp

	util/
	module/

	stdint_p.h
	usModuleInfo.cpp

util/

test/

modules/

libBWithStatic/

resources_static

usTestModuleB.cpp

libRWithResources

cppmicroservices.png

special_chars.dummy.txt

usModuleResourceTest.cpp

usServiceListenerTest.cpp

usServiceTrackerTest.cpp

usStaticModuleResourceTest.cpp

usTestManager.cpp

usTestResource.txt

	test/	modules/	libRWithResources/
		src/	module/

	usTestModuleR.cpp
	usModuleInfo.cpp

usResourceCompiler.cpp

rMITKcac415b43136

CMake/mitkFunctionOrganizeSources.cmake

Loading...

CMake/mitkMacroCreateModule.cmake

Loading...

Core/Code/CppMicroServices/CMake/usCTestScript_custom.cmake

Loading...

Core/Code/CppMicroServices/CMake/usCTestScript_travis.cmake

Loading...

Core/Code/CppMicroServices/CMake/usFunctionCheckCompilerFlags.cmake

Loading...

Core/Code/CppMicroServices/CMake/usFunctionCreateTestModule.cmake

Loading...

Core/Code/CppMicroServices/CMake/usFunctionEmbedResources.cmake

Loading...

Core/Code/CppMicroServices/CMake/usFunctionGenerateModuleInit.cmake

Loading...

Core/Code/CppMicroServices/CMakeLists.txt

Loading...

Core/Code/CppMicroServices/CppMicroServicesConfig.cmake.in

Loading...

Core/Code/CppMicroServices/LICENSE

Loading...

Core/Code/CppMicroServices/README.md

Loading...

Core/Code/CppMicroServices/documentation/doxygen.conf.in

Loading...

Core/Code/CppMicroServices/documentation/doxygen/MicroServices.dox

Loading...

Core/Code/CppMicroServices/documentation/doxygen/MicroServices_Resources.md

Loading...

Core/Code/CppMicroServices/documentation/doxygen/MicroServices_StaticModules.md

Loading...

Core/Code/CppMicroServices/documentation/doxygen/doxygen.css

Loading...

Core/Code/CppMicroServices/documentation/snippets/uServices-resources/main.cpp

Loading...

Core/Code/CppMicroServices/documentation/snippets/uServices-staticmodules/main.cpp

Loading...

Core/Code/CppMicroServices/src/CMakeLists.txt

Loading...

Core/Code/CppMicroServices/src/module/usModule.cpp

Loading...

Core/Code/CppMicroServices/src/module/usModule.h

Loading...

Core/Code/CppMicroServices/src/module/usModuleActivator.h

Loading...

Core/Code/CppMicroServices/src/module/usModuleImport.h

Loading...

Core/Code/CppMicroServices/src/module/usModuleInfo.cpp

Loading...

Core/Code/CppMicroServices/src/module/usModuleInfo.h

Loading...

Core/Code/CppMicroServices/src/module/usModuleInitialization.h

Loading...

Core/Code/CppMicroServices/src/module/usModulePrivate.cpp

Loading...

Core/Code/CppMicroServices/src/module/usModulePrivate.h

Loading...

Core/Code/CppMicroServices/src/module/usModuleResource.cpp

Loading...

Core/Code/CppMicroServices/src/module/usModuleResource.h

Loading...

Core/Code/CppMicroServices/src/module/usModuleResourceBuffer.cpp

Loading...

Core/Code/CppMicroServices/src/module/usModuleResourceBuffer_p.h

Loading...

Core/Code/CppMicroServices/src/module/usModuleResourceStream.cpp

Loading...

Core/Code/CppMicroServices/src/module/usModuleResourceStream.h

Loading...

Core/Code/CppMicroServices/src/module/usModuleResourceTree.cpp

Loading...

Core/Code/CppMicroServices/src/module/usModuleResourceTree_p.h

Loading...

Core/Code/CppMicroServices/src/service/usServiceReference.h

Loading...

Core/Code/CppMicroServices/src/service/usServiceTracker.tpp

Loading...

Core/Code/CppMicroServices/src/util/stdint_p.h

Loading...

Core/Code/CppMicroServices/src/util/stdint_vc_p.h

Loading...

Core/Code/CppMicroServices/test/CMakeLists.txt

Loading...

Core/Code/CppMicroServices/test/modules/CMakeLists.txt

Loading...

Core/Code/CppMicroServices/test/modules/libBWithStatic/CMakeLists.txt

Loading...

Core/Code/CppMicroServices/test/modules/libBWithStatic/resources/dynamic.txt

Loading...

Core/Code/CppMicroServices/test/modules/libBWithStatic/resources/res.txt

Loading...

Core/Code/CppMicroServices/test/modules/libBWithStatic/resources_static/res.txt

Loading...

Core/Code/CppMicroServices/test/modules/libBWithStatic/resources_static/static.txt

Loading...

Core/Code/CppMicroServices/test/modules/libBWithStatic/usTestModuleB.cpp

Loading...

Core/Code/CppMicroServices/test/modules/libRWithResources/CMakeLists.txt

Loading...

Core/Code/CppMicroServices/test/modules/libRWithResources/resources/foo.txt

Loading...

Core/Code/CppMicroServices/test/modules/libRWithResources/resources/icons/cppmicroservices.png

Loading...

Core/Code/CppMicroServices/test/modules/libRWithResources/resources/icons/readme.txt

Loading...

Core/Code/CppMicroServices/test/modules/libRWithResources/resources/special_chars.dummy.txt

Loading...

Core/Code/CppMicroServices/test/modules/libRWithResources/resources/test.xml

Loading...

Core/Code/CppMicroServices/test/modules/libRWithResources/usTestModuleR.cpp

Loading...

Core/Code/CppMicroServices/test/usModuleResourceTest.cpp

Loading...

Core/Code/CppMicroServices/test/usServiceListenerTest.cpp

Loading...

Core/Code/CppMicroServices/test/usServiceTrackerTest.cpp

Loading...

Core/Code/CppMicroServices/test/usStaticModuleResourceTest.cpp

Loading...

Core/Code/CppMicroServices/test/usTestManager.cpp

Loading...

Core/Code/CppMicroServices/test/usTestResource.txt

Loading...

Core/Code/CppMicroServices/tools/CMakeLists.txt

Loading...

Core/Code/CppMicroServices/tools/usResourceCompiler.cpp

Loading...

Core/Code/CppMicroServices/usConfig.h.in

Loading...