Skip to content
Snippets Groups Projects
Commit 9fd61c66 authored by Jan Tattermusch's avatar Jan Tattermusch
Browse files

fix artifact building on win

parent 47b90cbd
No related branches found
No related tags found
No related merge requests found
...@@ -82,3 +82,6 @@ DerivedData ...@@ -82,3 +82,6 @@ DerivedData
# Podfile.lock and the workspace file are tracked, to ease deleting them. That's # Podfile.lock and the workspace file are tracked, to ease deleting them. That's
# needed to trigger "pod install" to rerun the preinstall commands. # needed to trigger "pod install" to rerun the preinstall commands.
Pods/ Pods/
# Artifacts directory
artifacts/
@rem Builds C# artifacts on Windows
@call vsprojects\build_vs2013.bat %* || goto :error
mkdir artifacts
copy /Y vsprojects\Release\grpc_csharp_ext.dll artifacts || goto :error
goto :EOF
:error
echo Failed!
exit /b %errorlevel%
...@@ -45,7 +45,8 @@ import time ...@@ -45,7 +45,8 @@ import time
import uuid import uuid
# Docker doesn't clean up after itself, so we do it on exit. # Docker doesn't clean up after itself, so we do it on exit.
atexit.register(lambda: subprocess.call(['stty', 'echo'])) if jobset.platform_string() == 'linux':
atexit.register(lambda: subprocess.call(['stty', 'echo']))
ROOT = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '../..')) ROOT = os.path.abspath(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
os.chdir(ROOT) os.chdir(ROOT)
...@@ -122,7 +123,7 @@ class CSharpExtArtifact: ...@@ -122,7 +123,7 @@ class CSharpExtArtifact:
if self.platform == 'windows': if self.platform == 'windows':
msbuild_platform = 'Win32' if self.arch == 'x86' else self.arch msbuild_platform = 'Win32' if self.arch == 'x86' else self.arch
return create_jobspec(self.name, return create_jobspec(self.name,
['vsprojects\\build_vs2013.bat', ['tools\\run_tests\\build_artifact_csharp.bat',
'vsprojects\\grpc_csharp_ext.sln', 'vsprojects\\grpc_csharp_ext.sln',
'/p:Configuration=Release', '/p:Configuration=Release',
'/p:PlatformToolset=v120', '/p:PlatformToolset=v120',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment