~ubuntu-branches/debian/squeeze/protobuf/squeeze

« back to all changes in this revision

Viewing changes to vsprojects/tests.vcproj

  • Committer: Bazaar Package Importer
  • Author(s): Julien Cristau
  • Date: 2009-06-02 16:19:00 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20090602161900-vm176i3ryt35yk91
Tags: 2.0.3-2.2
* Non-maintainer upload.
* Fix FTBFS from -2.1: don't fail when we can't clean up the java build,
  such as when openjdk isn't installed.
* Disable parallel builds, because libtool is made of fail (if binary-arch
  and build-indep run concurrently, we relink a library while it's being
  used; that doesn't work so well).

Show diffs side-by-side

added added

removed removed

Lines of Context:
262
262
                                RelativePath=".\google\protobuf\unittest_embed_optimize_for.pb.h"
263
263
                                >
264
264
                        </File>
 
265
                        <File
 
266
                                RelativePath=".\google\protobuf\unittest_custom_options.pb.h"
 
267
                                >
 
268
                        </File>
265
269
                </Filter>
266
270
                <Filter
267
271
                        Name="Resource Files"
283
287
                                >
284
288
                        </File>
285
289
                        <File
 
290
                                RelativePath="..\src\google\protobuf\stubs\structurally_valid_unittest.cc"
 
291
                                >
 
292
                        </File>
 
293
                        <File
286
294
                                RelativePath="..\src\google\protobuf\io\coded_stream_unittest.cc"
287
295
                                >
288
296
                        </File>
407
415
                                >
408
416
                        </File>
409
417
                        <File
 
418
                                RelativePath=".\google\protobuf\unittest_custom_options.pb.cc"
 
419
                                >
 
420
                        </File>
 
421
                        <File
410
422
                                RelativePath="..\src\google\protobuf\unknown_field_set_unittest.cc"
411
423
                                >
412
424
                        </File>
563
575
                                />
564
576
                        </FileConfiguration>
565
577
                </File>
 
578
                <File
 
579
                        RelativePath="..\src\google\protobuf\unittest_custom_options.proto"
 
580
                        >
 
581
                        <FileConfiguration
 
582
                                Name="Debug|Win32"
 
583
                                >
 
584
                                <Tool
 
585
                                        Name="VCCustomBuildTool"
 
586
                                        Description="Generating unittest_custom_options.pb.{h,cc}..."
 
587
                                        CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_custom_options.proto&#x0D;&#x0A;"
 
588
                                        Outputs="google\protobuf\unittest_custom_options.pb.h;google\protobuf\unittest_custom_options.pb.cc"
 
589
                                />
 
590
                        </FileConfiguration>
 
591
                        <FileConfiguration
 
592
                                Name="Release|Win32"
 
593
                                >
 
594
                                <Tool
 
595
                                        Name="VCCustomBuildTool"
 
596
                                        Description="Generating unittest_custom_options.pb.{h,cc}..."
 
597
                                        CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_custom_options.proto&#x0D;&#x0A;"
 
598
                                        Outputs="google\protobuf\unittest_custom_options.pb.h;google\protobuf\unittest_custom_options.pb.cc"
 
599
                                />
 
600
                        </FileConfiguration>
 
601
                </File>
566
602
        </Files>
567
603
        <Globals>
568
604
        </Globals>