Initial Branch

To establish an initial branch – download or export from the vendors svn, a copy of the current vendor source, renaming the directory to something suitable (ogre, wxwidgets etc.). From the OSRail repository import the newly named directory into the top directory of the repository under vendor. OSRail does not use tags for vendor branches so note the revision in the import comment for example (CMake maintenance branch branch 2.8.0 - last change Nov 11, 2009 svn-1347) it will be required to identify the revision for a merge of a newer revision to the trunk line of CMake.

Update a Branch

To update a vendor branch - download or export from the vendors svn, a copy of the updated vendor source, use the vendor branch name (cmake-2.8.0). Checkout the vendor directory under the vendor directory in the top of the OSRail repository (http://wush.net/svn/sehenley/vendor/cmake). Use the operating system to copy or move the exported vendor source to the checked out vendor source. Check for files and directories that have been removed and use svn to remove them from the working copy. Comment the working copy to the repository.

--- Or

Checkout the new cmake branch/tag to the working directory cmake-2.8.0 (http://www.cmake.org/files)

Run the Perl script svn_load_dirs.pl. In the working directory (not free, no copyright, not available from Debian site, but available from http://subversion.tigris.org)

./svn_load_dirs.pl http://wush.net/svn/sehenley/vendor cmake cmake-2.8.0

Update the Trunk

To update the trunk vendor branch – checkout the trunk vendor branch (http://wush.net/svn/sehenley/trunk/vendor/cmake). From the repository merge the previous vendor branch in the top directory with the current vendor branch into the checked out version of the trunk vendor branch. For example http://wush.net/svn/sehenley/vendor/cmake (svn revision 1324 ) is merged with http://wush.net/svn/sehenley/vendor/cmake (svn revision (head) ) into working directory c:/working/cmake. Resolve any conflicts etc. and commit the result back to the trunk. Use this copy to make any program changes required and commit them to the trunk branch after testing.

Caution: The Windows build of CMake, modifies the cmake source - do not commit these changes.
Self Modified Sources are:

• Tests/.NoDartCoverage
• Utilities/cmexpat/.NoDartCoverage
• Utilities/cmexpat/cm_expat_mangle.h
• Utilities/cmexpat/expat.h
• Utilities/cmzlib/.NoDartCoverage

If the header files are commited - they will prevent a Linux build.
Caution: You should remove the cmake directory when finished or you will get an error running script svn_load_dirs.pl on the next update.

The purpose of the project in the vendors/cmake directory is to build a CMake generator for codeblocks similar to the current Visual C++ generator. The project uses the current release version of CMake (2.8.0) in the vendor directory.

Additionally, the project contains two built-in commands PackageConfigure and PreCompiledHeader. Also added was a codeblocks project file (CodeBlocksGenerator.cbp) to build/debug the modified CMake with its normally generated CMake makefile.

Files Modified in cmake

• cmake/Source/CMakeLists.txt -- modified
• cmake/Modules/CMakeCodeBlocksFind – added
• cmake/Source/cmPackageConfigureCommand.cpp – added
• cmake/Source/cmPackageConfigureCommand.h – added
• cmake/Source/cmPreCompiledHeaderCommand.cpp – added
• cmake/Source/cmPreCompiledHeaderCommand.h – added
• cmake/Source/cmLocalCodeBlocksGenerator.h – added
• cmake/Source/cmLocalCodeBlocksGenerator.cxx – added
• cmake/Source/cmGlobalCodeBlocksGenerator.h – added
• cmake/Source/cmGlobalCodeBlocksGenerator.cxx – added
• cmake/Source/cmDocumentation.cxx – modified
• cmake/Source/cmBootstrapCommands.cxx – modified
• cmake/Source/cmake.cxx - modified
• cmake/bootstrap -- modified
• cmake/cmMakefile.h -- modified

The modified version of CMake is required to build OSRail – Instructions for building this version of CMake can be found under “Building OSRail” (Linux or Windows).