Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
940ce8a2
Commit
940ce8a2
authored
Dec 18, 2009
by
zhanyong.wan
Browse files
Moves gtest.def from src/ to msvc/.
parent
a3dd9d97
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
msvc/gtest.def
msvc/gtest.def
+0
-0
scons/SConscript
scons/SConscript
+1
-1
scripts/generate_gtest_def.py
scripts/generate_gtest_def.py
+3
-3
No files found.
sr
c/gtest.def
→
msv
c/gtest.def
View file @
940ce8a2
File moved
scons/SConscript
View file @
940ce8a2
...
...
@@ -298,7 +298,7 @@ if BUILD_TESTS:
if
env
[
'PLATFORM'
]
==
'win32'
and
env
.
get
(
'GTEST_BUILD_DLL_TEST'
,
None
):
test_env
=
EnvCreator
.
Create
(
env
,
EnvCreator
.
DllBuild
)
dll_env
=
test_env
.
Clone
()
dll_env
.
Append
(
LINKFLAGS
=
[
'-DEF:../
sr
c/gtest.def'
])
dll_env
.
Append
(
LINKFLAGS
=
[
'-DEF:../
msv
c/gtest.def'
])
gtest_dll
=
dll_env
.
SharedLibrary
(
target
=
'gtest_dll'
,
...
...
scripts/generate_gtest_def.py
View file @
940ce8a2
...
...
@@ -63,7 +63,7 @@ import sys
# We assume that this file is in the scripts/ directory in the Google
# Test root directory.
GTEST_DEF_PATH
=
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
'../
sr
c/gtest.def'
)
GTEST_DEF_PATH
=
os
.
path
.
join
(
os
.
path
.
dirname
(
__file__
),
'../
msv
c/gtest.def'
)
# Locates the header of the EXPORTS section.
EXPORTS_SECTION_REGEX
=
re
.
compile
(
r
'^EXPORTS\s*$'
,
re
.
IGNORECASE
)
...
...
@@ -156,13 +156,13 @@ def main():
exports
=
AdjustExports
(
exports
,
unresolved
)
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
'
'again and pass its diagnostic output to this script
\n
'
'unless the build succeeds.
\n
'
)
else
:
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
'
)
if
__name__
==
'__main__'
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment