Commit 940ce8a2 by zhanyong.wan

Moves gtest.def from src/ to msvc/.

parent a3dd9d97
...@@ -298,7 +298,7 @@ if BUILD_TESTS: ...@@ -298,7 +298,7 @@ if BUILD_TESTS:
if env['PLATFORM'] == 'win32' and env.get('GTEST_BUILD_DLL_TEST', None): if env['PLATFORM'] == 'win32' and env.get('GTEST_BUILD_DLL_TEST', None):
test_env = EnvCreator.Create(env, EnvCreator.DllBuild) test_env = EnvCreator.Create(env, EnvCreator.DllBuild)
dll_env = test_env.Clone() dll_env = test_env.Clone()
dll_env.Append(LINKFLAGS=['-DEF:../src/gtest.def']) dll_env.Append(LINKFLAGS=['-DEF:../msvc/gtest.def'])
gtest_dll = dll_env.SharedLibrary( gtest_dll = dll_env.SharedLibrary(
target='gtest_dll', target='gtest_dll',
......
...@@ -63,7 +63,7 @@ import sys ...@@ -63,7 +63,7 @@ import sys
# We assume that this file is in the scripts/ directory in the Google # We assume that this file is in the scripts/ directory in the Google
# Test root directory. # Test root directory.
GTEST_DEF_PATH = os.path.join(os.path.dirname(__file__), '../src/gtest.def') GTEST_DEF_PATH = os.path.join(os.path.dirname(__file__), '../msvc/gtest.def')
# Locates the header of the EXPORTS section. # Locates the header of the EXPORTS section.
EXPORTS_SECTION_REGEX = re.compile(r'^EXPORTS\s*$', re.IGNORECASE) EXPORTS_SECTION_REGEX = re.compile(r'^EXPORTS\s*$', re.IGNORECASE)
...@@ -156,13 +156,13 @@ def main(): ...@@ -156,13 +156,13 @@ def main():
exports = AdjustExports(exports, unresolved) exports = AdjustExports(exports, unresolved)
WriteGtestDefFile(open(GTEST_DEF_PATH, 'w'), exports) WriteGtestDefFile(open(GTEST_DEF_PATH, 'w'), exports)
sys.stderr.write('Updated test/gtest.def. Please clean the .dll file\n' sys.stderr.write('Updated gtest.def. Please clean the .dll file\n'
'produced by your Google Test DLL build, run the build\n' 'produced by your Google Test DLL build, run the build\n'
'again and pass its diagnostic output to this script\n' 'again and pass its diagnostic output to this script\n'
'unless the build succeeds.\n') 'unless the build succeeds.\n')
else: else:
sys.stderr.write('The build diagnostic output indicates no unresolved\n' sys.stderr.write('The build diagnostic output indicates no unresolved\n'
'externals. test/gtest.def is likely up to date and\n' 'externals. gtest.def is likely up to date and\n'
'has not been updated.\n') 'has not been updated.\n')
if __name__ == '__main__': if __name__ == '__main__':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment