Author: rinrab
Date: Sun Jul 7 17:00:41 2024
New Revision: 1918995
URL: http://svn.apache.org/viewvc?rev=1918995&view=rev
Log:
On the 'cmake' branch: Refactoring in build_type variable; Exclude space from
the start, but add this space to ezt template if needed.
* build/generator/gen_cmake.py
(Generator.write): Initialize build_type variable to None and remove space
from the start.
* build/generator/templates/targets.cmake.ezt
(add_library): Check if build_type not None and include space before
build_type.
Modified:
subversion/branches/cmake/build/generator/gen_cmake.py
subversion/branches/cmake/build/generator/templates/targets.cmake.ezt
Modified: subversion/branches/cmake/build/generator/gen_cmake.py
URL:
http://svn.apache.org/viewvc/subversion/branches/cmake/build/generator/gen_cmake.py?rev=1918995&r1=1918994&r2=1918995&view=diff
==============================================================================
--- subversion/branches/cmake/build/generator/gen_cmake.py (original)
+++ subversion/branches/cmake/build/generator/gen_cmake.py Sun Jul 7 17:00:41
2024
@@ -107,7 +107,7 @@ class Generator(gen_base.GeneratorBase):
target: gen_base.Target
group = None
enable_condition = []
- build_type = ""
+ build_type = None
if isinstance(target, gen_base.TargetScript):
# there is nothing to build
@@ -126,16 +126,16 @@ class Generator(gen_base.GeneratorBase):
elif isinstance(target, gen_base.TargetRaModule):
enable_condition.append("SVN_BUILD_" + get_module_name(target.name));
group = "SVN_RA_MODULES"
- build_type = " ${SVN_RA_BUILD_TYPE}"
+ build_type = "${SVN_RA_BUILD_TYPE}"
elif isinstance(target, gen_base.TargetFsModule):
enable_condition.append("SVN_BUILD_" + get_module_name(target.name));
group = "SVN_FS_MODULES"
- build_type = " ${SVN_FS_BUILD_TYPE}"
+ build_type = "${SVN_FS_BUILD_TYPE}"
elif isinstance(target, gen_base.TargetApacheMod):
pass
elif isinstance(target, gen_base.TargetLib):
if target.msvc_static:
- build_type = " STATIC"
+ build_type = "STATIC"
msvc_export = []
if isinstance(target, gen_base.TargetLib):
Modified: subversion/branches/cmake/build/generator/templates/targets.cmake.ezt
URL:
http://svn.apache.org/viewvc/subversion/branches/cmake/build/generator/templates/targets.cmake.ezt?rev=1918995&r1=1918994&r2=1918995&view=diff
==============================================================================
--- subversion/branches/cmake/build/generator/templates/targets.cmake.ezt
(original)
+++ subversion/branches/cmake/build/generator/templates/targets.cmake.ezt Sun
Jul 7 17:00:41 2024
@@ -22,7 +22,7 @@
[for targets]
# [if-any targets.description][targets.description][else][targets.name][end]
if ([targets.enable_condition])[is targets.type "lib"]
- add_library([targets.name][targets.build_type][for targets.sources]
+ add_library([targets.name][if-any targets.build_type]
[targets.build_type][end][for targets.sources]
[targets.sources][end]
)[if-any targets.msvc_export]
target_exports([targets.name][for targets.msvc_export]
