Update projects

pull/3021/head
Craig Tiller 9 years ago
parent c530d503d6
commit 11a28c7f1a
  1. 6
      Makefile
  2. 3
      build.json
  3. 1
      tools/run_tests/jobset.py
  4. 5
      tools/run_tests/sources_and_headers.json
  5. 4
      vsprojects/Grpc.mak

@ -7135,14 +7135,14 @@ $(BINDIR)/$(CONFIG)/gen_legal_metadata_characters: openssl_dep_error
else else
$(BINDIR)/$(CONFIG)/gen_legal_metadata_characters: $(GEN_LEGAL_METADATA_CHARACTERS_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(BINDIR)/$(CONFIG)/gen_legal_metadata_characters: $(GEN_LEGAL_METADATA_CHARACTERS_OBJS)
$(E) "[LD] Linking $@" $(E) "[LD] Linking $@"
$(Q) mkdir -p `dirname $@` $(Q) mkdir -p `dirname $@`
$(Q) $(LD) $(LDFLAGS) $(GEN_LEGAL_METADATA_CHARACTERS_OBJS) $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gen_legal_metadata_characters $(Q) $(LD) $(LDFLAGS) $(GEN_LEGAL_METADATA_CHARACTERS_OBJS) $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gen_legal_metadata_characters
endif endif
$(OBJDIR)/$(CONFIG)/tools/codegen/core/gen_legal_metadata_characters.o: $(LIBDIR)/$(CONFIG)/libgpr.a $(LIBDIR)/$(CONFIG)/libgrpc.a $(OBJDIR)/$(CONFIG)/tools/codegen/core/gen_legal_metadata_characters.o:
deps_gen_legal_metadata_characters: $(GEN_LEGAL_METADATA_CHARACTERS_OBJS:.o=.dep) deps_gen_legal_metadata_characters: $(GEN_LEGAL_METADATA_CHARACTERS_OBJS:.o=.dep)
ifneq ($(NO_SECURE),true) ifneq ($(NO_SECURE),true)

@ -1150,8 +1150,7 @@
"src": [ "src": [
"tools/codegen/core/gen_legal_metadata_characters.c" "tools/codegen/core/gen_legal_metadata_characters.c"
], ],
"deps": [ "deps": []
]
}, },
{ {
"name": "gpr_cmdline_test", "name": "gpr_cmdline_test",

@ -174,6 +174,7 @@ class Job(object):
for k, v in add_env.iteritems(): for k, v in add_env.iteritems():
env[k] = v env[k] = v
self._start = time.time() self._start = time.time()
print spec.cmdline
self._process = subprocess.Popen(args=spec.cmdline, self._process = subprocess.Popen(args=spec.cmdline,
stderr=subprocess.STDOUT, stderr=subprocess.STDOUT,
stdout=self._tempfile, stdout=self._tempfile,

@ -238,10 +238,7 @@
] ]
}, },
{ {
"deps": [ "deps": [],
"gpr",
"grpc"
],
"headers": [], "headers": [],
"language": "c", "language": "c",
"name": "gen_legal_metadata_characters", "name": "gen_legal_metadata_characters",

@ -183,10 +183,10 @@ gen_hpack_tables: gen_hpack_tables.exe
echo Running gen_hpack_tables echo Running gen_hpack_tables
$(OUT_DIR)\gen_hpack_tables.exe $(OUT_DIR)\gen_hpack_tables.exe
gen_legal_metadata_characters.exe: build_gpr build_grpc $(OUT_DIR) gen_legal_metadata_characters.exe: $(OUT_DIR)
echo Building gen_legal_metadata_characters echo Building gen_legal_metadata_characters
$(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\tools\codegen\core\gen_legal_metadata_characters.c $(CC) $(CFLAGS) /Fo:$(OUT_DIR)\ $(REPO_ROOT)\tools\codegen\core\gen_legal_metadata_characters.c
$(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gen_legal_metadata_characters.exe" Debug\gpr.lib Debug\grpc.lib $(LIBS) $(OUT_DIR)\gen_legal_metadata_characters.obj $(LINK) $(LFLAGS) /OUT:"$(OUT_DIR)\gen_legal_metadata_characters.exe" $(LIBS) $(OUT_DIR)\gen_legal_metadata_characters.obj
gen_legal_metadata_characters: gen_legal_metadata_characters.exe gen_legal_metadata_characters: gen_legal_metadata_characters.exe
echo Running gen_legal_metadata_characters echo Running gen_legal_metadata_characters
$(OUT_DIR)\gen_legal_metadata_characters.exe $(OUT_DIR)\gen_legal_metadata_characters.exe

Loading…
Cancel
Save