mirror of https://gitlab.com/ita1024/waf.git
Let the protoc demo build even if java is missing
This commit is contained in:
parent
70f1522fa1
commit
b1928ee46b
|
@ -1,5 +1,8 @@
|
||||||
#! /usr/bin/env python
|
#! /usr/bin/env python
|
||||||
|
|
||||||
|
import os
|
||||||
|
from waflib import Logs
|
||||||
|
|
||||||
top = '.'
|
top = '.'
|
||||||
out = 'build'
|
out = 'build'
|
||||||
|
|
||||||
|
@ -10,7 +13,10 @@ def configure(conf):
|
||||||
conf.load('compiler_cxx python java protoc')
|
conf.load('compiler_cxx python java protoc')
|
||||||
conf.check_python_version(minver=(2, 5, 0))
|
conf.check_python_version(minver=(2, 5, 0))
|
||||||
# Here you have to point to your protobuf-java JAR
|
# Here you have to point to your protobuf-java JAR
|
||||||
conf.env.CLASSPATH_PROTOBUF = ['/tmp/cp/protobuf-java-2.5.0.jar']
|
if os.path.isfile('/tmp/cp/protobuf-java-2.5.0.jar'):
|
||||||
|
conf.env.CLASSPATH_PROTOBUF = ['/tmp/cp/protobuf-java-2.5.0.jar']
|
||||||
|
else:
|
||||||
|
Logs.warn('Edit the wscript file and set CLASSPATH_PROTOBUF for java')
|
||||||
|
|
||||||
def build(bld):
|
def build(bld):
|
||||||
bld(
|
bld(
|
||||||
|
@ -46,12 +52,13 @@ def build(bld):
|
||||||
source = ['incboth/messageboth_inc.proto', 'incboth/messageboth.proto'],
|
source = ['incboth/messageboth_inc.proto', 'incboth/messageboth.proto'],
|
||||||
protoc_includes = ['incboth']) # either protoc_includes or includes would work in this case
|
protoc_includes = ['incboth']) # either protoc_includes or includes would work in this case
|
||||||
|
|
||||||
bld(
|
if bld.env.CLASSPATH_PROTOBUF:
|
||||||
features = 'javac protoc',
|
bld(
|
||||||
name = 'pbjava',
|
features = 'javac protoc',
|
||||||
srcdir = 'inc/',
|
name = 'pbjava',
|
||||||
source = ['inc/message_inc.proto', 'inc/message.proto'],
|
srcdir = 'inc/',
|
||||||
use = 'PROTOBUF',
|
source = ['inc/message_inc.proto', 'inc/message.proto'],
|
||||||
protoc_includes = ['inc'])
|
use = 'PROTOBUF',
|
||||||
|
protoc_includes = ['inc'])
|
||||||
|
|
||||||
bld.recurse('increcurse')
|
bld.recurse('increcurse')
|
||||||
|
|
Loading…
Reference in New Issue