Author: rinrab
Date: Thu Sep 19 13:39:00 2024
New Revision: 1920782
URL: http://svn.apache.org/viewvc?rev=1920782&view=rev
Log:
build: Remove 'msvc-force-static' field from build.conf targets.
In revision r1920771 all usages of this field have been removed and all
executables can be linked against shared libraries. So, now this code
will not be used anymore.
* build.conf
(Target parameters): Remove comment about msvc-force-static field.
* build/generator/gen_base.py
(TargetExe): Do not read msvc-force-static from config.
* build/generator/gen_cmake.py
(get_target_conditions): Remove check for msvc_force_static and don't add
the condition.
* build/generator/gen_win.py
(get_install_targets): Remove the code, that relinks shared to static
libraries, since it is not required.
Modified:
subversion/trunk/build.conf
subversion/trunk/build/generator/gen_base.py
subversion/trunk/build/generator/gen_cmake.py
subversion/trunk/build/generator/gen_win.py
Modified: subversion/trunk/build.conf
URL:
http://svn.apache.org/viewvc/subversion/trunk/build.conf?rev=1920782&r1=1920781&r2=1920782&view=diff
==============================================================================
--- subversion/trunk/build.conf (original)
+++ subversion/trunk/build.conf Thu Sep 19 13:39:00 2024
@@ -135,7 +135,6 @@ swig-checkout-files = common.swg swigrun
# msvc-libs - additional libraries to link with on Windows
# msvc-export - additional list of files to expose in dsp/vc(x)proj
# msvc-static - visual studio target produces only a static lib
-# msvc-force-static- visual studio always uses static libraries for svn libs
# add-deps - expands to additional autoconf-defined dependencies
# add-install-deps - like add-deps, but for the install step
# external-lib - expands to additional autoconf-defined libs
Modified: subversion/trunk/build/generator/gen_base.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_base.py?rev=1920782&r1=1920781&r2=1920782&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_base.py (original)
+++ subversion/trunk/build/generator/gen_base.py Thu Sep 19 13:39:00 2024
@@ -658,8 +658,6 @@ class TargetExe(TargetLinked):
self.manpages = options.get('manpages', '')
self.testing = options.get('testing')
- self.msvc_force_static = options.get('msvc-force-static') == 'yes'
-
def add_dependencies(self):
TargetLinked.add_dependencies(self)
Modified: subversion/trunk/build/generator/gen_cmake.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_cmake.py?rev=1920782&r1=1920781&r2=1920782&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_cmake.py (original)
+++ subversion/trunk/build/generator/gen_cmake.py Thu Sep 19 13:39:00 2024
@@ -83,9 +83,6 @@ def get_target_conditions(target):
else:
enable_condition.append("SVN_ENABLE_PROGRAMS")
- if target.msvc_force_static:
- enable_condition.append("NOT (BUILD_SHARED_LIBS AND WIN32)")
-
if isinstance(target, gen_base.TargetSWIG) or \
isinstance(target, gen_base.TargetSWIGLib):
enable_condition.append("SVN_ENABLE_SWIG_" + target.lang.upper())
Modified: subversion/trunk/build/generator/gen_win.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win.py?rev=1920782&r1=1920781&r2=1920782&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win.py (original)
+++ subversion/trunk/build/generator/gen_win.py Thu Sep 19 13:39:00 2024
@@ -241,21 +241,6 @@ class WinGeneratorBase(gen_win_dependenc
dll_targets.append(self.create_dll_target(target))
install_targets.extend(dll_targets)
- # Fix up targets that can't be linked to libraries
- if not self.disable_shared:
- for target in install_targets:
- if isinstance(target, gen_base.TargetExe) and target.msvc_force_static:
-
- # Make direct dependencies of all the indirect dependencies
- linked_deps = {}
- self.get_linked_win_depends(target, linked_deps)
-
- for lk in linked_deps.keys():
- if not isinstance(lk, gen_base.TargetLib) or not lk.msvc_export:
- self.graph.add(gen_base.DT_LINK, target.name, lk)
- else:
- self.graph.remove(gen_base.DT_LINK, target.name, lk)
-
for target in install_targets:
target.project_guid = self.makeguid(target.name)
