building protoc artifacts on windows
diff --git a/tools/run_tests/artifact_targets.py b/tools/run_tests/artifact_targets.py
index cf056ec..2a9f248 100644
--- a/tools/run_tests/artifact_targets.py
+++ b/tools/run_tests/artifact_targets.py
@@ -266,7 +266,12 @@
['tools/run_tests/build_artifact_protoc.sh'],
environ=environ)
else:
- raise Exception('Not yet supported')
+ generator = 'Visual Studio 12 Win64' if self.arch == 'x64' else 'Visual Studio 12'
+ vcplatform = 'x64' if self.arch == 'x64' else 'Win32'
+ return create_jobspec(self.name,
+ ['tools\\run_tests\\build_artifact_protoc.bat'],
+ environ={'generator': generator,
+ 'Platform': vcplatform})
def __str__(self):
return self.name
@@ -275,7 +280,7 @@
def targets():
"""Gets list of supported targets"""
return ([Cls(platform, arch)
- for Cls in (CSharpExtArtifact, NodeExtArtifact)
+ for Cls in (CSharpExtArtifact, NodeExtArtifact, ProtocArtifact)
for platform in ('linux', 'macos', 'windows')
for arch in ('x86', 'x64')] +
[PythonArtifact('linux', 'x86'),
@@ -283,8 +288,4 @@
PythonArtifact('macos', 'x64'),
RubyArtifact('linux', 'x86'),
RubyArtifact('linux', 'x64'),
- RubyArtifact('macos', 'x64'),
- ProtocArtifact('linux', 'x86'),
- ProtocArtifact('linux', 'x64'),
- ProtocArtifact('macos', 'x86'),
- ProtocArtifact('macos', 'x64')])
+ RubyArtifact('macos', 'x64')])