Merge lp:~statik/ubuntu/lucid/protobuf/merge-bug502654 into lp:ubuntu/lucid/protobuf

Proposed by Elliot Murphy
Status: Merged
Merge reported by: Daniel Holbach
Merged at revision: not available
Proposed branch: lp:~statik/ubuntu/lucid/protobuf/merge-bug502654
Merge into: lp:ubuntu/lucid/protobuf
Diff against target: 248083 lines (+22639/-108557)
345 files modified
CHANGES.txt (+47/-1)
CONTRIBUTORS.txt (+2/-0)
Makefile.am (+18/-1)
Makefile.in (+66/-9)
README.txt (+38/-0)
autogen.sh (+9/-16)
configure (+490/-331)
configure.ac (+25/-25)
debian/changelog (+36/-0)
debian/control (+6/-6)
debian/java-build.xml (+1/-1)
debian/libprotobuf-dev.install (+1/-0)
debian/libprotobuf-java.links (+1/-1)
debian/libprotobuf4.install (+0/-1)
debian/libprotobuf5.install (+1/-0)
debian/libprotobuf5.shlibs (+3/-0)
debian/libprotoc-dev.dirs (+0/-1)
debian/libprotoc-dev.install (+0/-3)
debian/libprotoc4.install (+0/-1)
debian/libprotoc5.install (+1/-0)
debian/libprotoc5.shlibs (+1/-0)
debian/patches/series (+0/-3)
debian/rules (+7/-5)
editors/protobuf-mode.el (+0/-217)
examples/Makefile (+4/-2)
examples/add_person.cc (+3/-0)
examples/list_people.cc (+3/-0)
generate_descriptor_proto.sh (+5/-1)
gtest/CHANGES (+0/-57)
gtest/CONTRIBUTORS (+0/-33)
gtest/COPYING (+0/-28)
gtest/Makefile.am (+0/-390)
gtest/Makefile.in (+0/-1951)
gtest/README (+0/-274)
gtest/aclocal.m4 (+0/-8947)
gtest/build-aux/config.guess (+0/-1516)
gtest/build-aux/config.h.in (+0/-66)
gtest/build-aux/config.sub (+0/-1626)
gtest/build-aux/depcomp (+0/-589)
gtest/build-aux/install-sh (+0/-519)
gtest/build-aux/ltmain.sh (+0/-7874)
gtest/build-aux/missing (+0/-367)
gtest/codegear/gtest.cbproj (+0/-138)
gtest/codegear/gtest.groupproj (+0/-54)
gtest/codegear/gtest_all.cc (+0/-38)
gtest/codegear/gtest_link.cc (+0/-40)
gtest/codegear/gtest_main.cbproj (+0/-82)
gtest/codegear/gtest_unittest.cbproj (+0/-88)
gtest/configure (+0/-18268)
gtest/configure.ac (+0/-51)
gtest/include/gtest/gtest-death-test.h (+0/-262)
gtest/include/gtest/gtest-message.h (+0/-224)
gtest/include/gtest/gtest-param-test.h (+0/-1385)
gtest/include/gtest/gtest-param-test.h.pump (+0/-453)
gtest/include/gtest/gtest-spi.h (+0/-221)
gtest/include/gtest/gtest-test-part.h (+0/-179)
gtest/include/gtest/gtest-typed-test.h (+0/-253)
gtest/include/gtest/gtest.h (+0/-1420)
gtest/include/gtest/gtest_pred_impl.h (+0/-368)
gtest/include/gtest/gtest_prod.h (+0/-58)
gtest/include/gtest/internal/gtest-death-test-internal.h (+0/-227)
gtest/include/gtest/internal/gtest-filepath.h (+0/-201)
gtest/include/gtest/internal/gtest-internal.h (+0/-890)
gtest/include/gtest/internal/gtest-linked_ptr.h (+0/-242)
gtest/include/gtest/internal/gtest-param-util-generated.h (+0/-4572)
gtest/include/gtest/internal/gtest-param-util-generated.h.pump (+0/-269)
gtest/include/gtest/internal/gtest-param-util.h (+0/-629)
gtest/include/gtest/internal/gtest-port.h (+0/-1006)
gtest/include/gtest/internal/gtest-string.h (+0/-335)
gtest/include/gtest/internal/gtest-tuple.h (+966/-0)
gtest/include/gtest/internal/gtest-tuple.h.pump (+335/-0)
gtest/include/gtest/internal/gtest-type-util.h (+0/-3319)
gtest/include/gtest/internal/gtest-type-util.h.pump (+0/-287)
gtest/m4/acx_pthread.m4 (+0/-363)
gtest/m4/gtest.m4 (+0/-74)
gtest/make/Makefile (+0/-78)
gtest/msvc/gtest.sln (+0/-85)
gtest/msvc/gtest.vcproj (+0/-237)
gtest/msvc/gtest_color_test_.vcproj (+0/-144)
gtest/msvc/gtest_env_var_test_.vcproj (+0/-144)
gtest/msvc/gtest_environment_test.vcproj (+0/-144)
gtest/msvc/gtest_main.vcproj (+0/-165)
gtest/msvc/gtest_output_test_.vcproj (+0/-147)
gtest/msvc/gtest_prod_test.vcproj (+0/-164)
gtest/msvc/gtest_uninitialized_test_.vcproj (+0/-144)
gtest/msvc/gtest_unittest.vcproj (+0/-147)
gtest/samples/prime_tables.h (+0/-120)
gtest/samples/sample1.cc (+0/-68)
gtest/samples/sample1.h (+0/-43)
gtest/samples/sample1_unittest.cc (+0/-153)
gtest/samples/sample2.cc (+0/-56)
gtest/samples/sample2.h (+0/-86)
gtest/samples/sample2_unittest.cc (+0/-109)
gtest/samples/sample3-inl.h (+0/-173)
gtest/samples/sample3_unittest.cc (+0/-151)
gtest/samples/sample4.cc (+0/-46)
gtest/samples/sample4.h (+0/-53)
gtest/samples/sample4_unittest.cc (+0/-45)
gtest/samples/sample5_unittest.cc (+0/-199)
gtest/samples/sample6_unittest.cc (+0/-224)
gtest/samples/sample7_unittest.cc (+0/-132)
gtest/samples/sample8_unittest.cc (+0/-173)
gtest/scons/SConscript (+0/-285)
gtest/scripts/fuse_gtest_files.py (+0/-250)
gtest/scripts/gen_gtest_pred_impl.py (+0/-733)
gtest/scripts/gtest-config.in (+0/-274)
gtest/scripts/test/Makefile (+0/-57)
gtest/src/gtest-all.cc (+0/-41)
gtest/src/gtest-death-test.cc (+0/-1177)
gtest/src/gtest-filepath.cc (+0/-341)
gtest/src/gtest-internal-inl.h (+0/-1417)
gtest/src/gtest-port.cc (+0/-672)
gtest/src/gtest-test-part.cc (+0/-124)
gtest/src/gtest-typed-test.cc (+0/-98)
gtest/src/gtest.cc (+0/-4321)
gtest/src/gtest_main.cc (+0/-39)
gtest/test/gtest-death-test_test.cc (+0/-1133)
gtest/test/gtest-filepath_test.cc (+0/-588)
gtest/test/gtest-linked_ptr_test.cc (+0/-154)
gtest/test/gtest-message_test.cc (+0/-157)
gtest/test/gtest-options_test.cc (+0/-267)
gtest/test/gtest-param-test2_test.cc (+0/-65)
gtest/test/gtest-param-test_test.cc (+0/-792)
gtest/test/gtest-param-test_test.h (+0/-55)
gtest/test/gtest-port_test.cc (+0/-688)
gtest/test/gtest-test-part_test.cc (+0/-138)
gtest/test/gtest-tuple_test.cc (+288/-0)
gtest/test/gtest-typed-test2_test.cc (+0/-45)
gtest/test/gtest-typed-test_test.cc (+0/-362)
gtest/test/gtest-typed-test_test.h (+0/-66)
gtest/test/gtest-unittest-api_test.cc (+363/-0)
gtest/test/gtest_all_test.cc (+0/-47)
gtest/test/gtest_break_on_failure_unittest.py (+0/-216)
gtest/test/gtest_break_on_failure_unittest_.cc (+0/-66)
gtest/test/gtest_color_test.py (+0/-126)
gtest/test/gtest_color_test_.cc (+0/-68)
gtest/test/gtest_env_var_test.py (+0/-111)
gtest/test/gtest_env_var_test_.cc (+0/-126)
gtest/test/gtest_environment_test.cc (+0/-186)
gtest/test/gtest_filter_unittest.py (+0/-590)
gtest/test/gtest_filter_unittest_.cc (+0/-146)
gtest/test/gtest_help_test.py (+0/-125)
gtest/test/gtest_help_test_.cc (+0/-42)
gtest/test/gtest_list_tests_unittest.py (+0/-185)
gtest/test/gtest_list_tests_unittest_.cc (+0/-85)
gtest/test/gtest_main_unittest.cc (+0/-45)
gtest/test/gtest_nc.cc (+0/-234)
gtest/test/gtest_nc_test.py (+0/-101)
gtest/test/gtest_no_test_unittest.cc (+0/-54)
gtest/test/gtest_output_test.py (+0/-282)
gtest/test/gtest_output_test_.cc (+0/-1005)
gtest/test/gtest_output_test_golden_lin.txt (+0/-632)
gtest/test/gtest_output_test_golden_win.txt (+0/-575)
gtest/test/gtest_pred_impl_unittest.cc (+0/-2432)
gtest/test/gtest_prod_test.cc (+0/-57)
gtest/test/gtest_repeat_test.cc (+0/-255)
gtest/test/gtest_sole_header_test.cc (+0/-57)
gtest/test/gtest_stress_test.cc (+0/-152)
gtest/test/gtest_test_utils.py (+0/-226)
gtest/test/gtest_throw_on_failure_ex_test.cc (+0/-92)
gtest/test/gtest_throw_on_failure_test.py (+0/-172)
gtest/test/gtest_throw_on_failure_test_.cc (+0/-56)
gtest/test/gtest_uninitialized_test.py (+0/-72)
gtest/test/gtest_uninitialized_test_.cc (+0/-43)
gtest/test/gtest_unittest.cc (+0/-5665)
gtest/test/gtest_xml_outfile1_test_.cc (+0/-49)
gtest/test/gtest_xml_outfile2_test_.cc (+0/-49)
gtest/test/gtest_xml_outfiles_test.py (+0/-133)
gtest/test/gtest_xml_output_unittest.py (+0/-176)
gtest/test/gtest_xml_output_unittest_.cc (+0/-120)
gtest/test/gtest_xml_test_utils.py (+0/-159)
gtest/test/production.cc (+0/-36)
gtest/test/production.h (+0/-55)
gtest/xcode/Config/DebugProject.xcconfig (+0/-30)
gtest/xcode/Config/FrameworkTarget.xcconfig (+0/-17)
gtest/xcode/Config/General.xcconfig (+0/-41)
gtest/xcode/Config/InternalPythonTestTarget.xcconfig (+0/-8)
gtest/xcode/Config/InternalTestTarget.xcconfig (+0/-8)
gtest/xcode/Config/ReleaseProject.xcconfig (+0/-32)
gtest/xcode/Config/TestTarget.xcconfig (+0/-8)
gtest/xcode/Resources/Info.plist (+0/-30)
gtest/xcode/Samples/FrameworkSample/Info.plist (+0/-28)
gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj (+0/-335)
gtest/xcode/Samples/FrameworkSample/widget.cc (+0/-63)
gtest/xcode/Samples/FrameworkSample/widget.h (+0/-59)
gtest/xcode/Samples/FrameworkSample/widget_test.cc (+0/-68)
gtest/xcode/Scripts/runtests.sh (+0/-69)
gtest/xcode/Scripts/versiongenerate.py (+0/-71)
gtest/xcode/gtest.xcodeproj/project.pbxproj (+0/-4741)
java/README.txt (+23/-1)
java/pom.xml (+53/-18)
java/src/main/java/com/google/protobuf/AbstractMessage.java (+486/-253)
java/src/main/java/com/google/protobuf/AbstractMessageLite.java (+321/-0)
java/src/main/java/com/google/protobuf/BlockingRpcChannel.java (+0/-51)
java/src/main/java/com/google/protobuf/BlockingService.java (+0/-64)
java/src/main/java/com/google/protobuf/ByteString.java (+39/-37)
java/src/main/java/com/google/protobuf/CodedInputStream.java (+95/-129)
java/src/main/java/com/google/protobuf/CodedOutputStream.java (+179/-246)
java/src/main/java/com/google/protobuf/Descriptors.java (+331/-252)
java/src/main/java/com/google/protobuf/DynamicMessage.java (+52/-29)
java/src/main/java/com/google/protobuf/ExtensionRegistry.java (+45/-35)
java/src/main/java/com/google/protobuf/ExtensionRegistryLite.java (+169/-0)
java/src/main/java/com/google/protobuf/FieldSet.java (+512/-524)
java/src/main/java/com/google/protobuf/GeneratedMessage.java (+284/-248)
java/src/main/java/com/google/protobuf/GeneratedMessageLite.java (+539/-0)
java/src/main/java/com/google/protobuf/Internal.java (+121/-0)
java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java (+3/-1)
java/src/main/java/com/google/protobuf/Message.java (+32/-217)
java/src/main/java/com/google/protobuf/MessageLite.java (+331/-0)
java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java (+0/-58)
java/src/main/java/com/google/protobuf/RpcUtil.java (+8/-5)
java/src/main/java/com/google/protobuf/ServiceException.java (+0/-42)
java/src/main/java/com/google/protobuf/TextFormat.java (+165/-133)
java/src/main/java/com/google/protobuf/UninitializedMessageException.java (+12/-73)
java/src/main/java/com/google/protobuf/UnknownFieldSet.java (+257/-115)
java/src/main/java/com/google/protobuf/WireFormat.java (+64/-34)
java/src/test/java/com/google/protobuf/DescriptorsTest.java (+38/-0)
java/src/test/java/com/google/protobuf/DynamicMessageTest.java (+12/-0)
java/src/test/java/com/google/protobuf/GeneratedMessageTest.java (+89/-0)
java/src/test/java/com/google/protobuf/LiteTest.java (+114/-0)
java/src/test/java/com/google/protobuf/TestUtil.java (+945/-86)
java/src/test/java/com/google/protobuf/TextFormatTest.java (+22/-3)
java/src/test/java/com/google/protobuf/WireFormatTest.java (+65/-0)
m4/acx_check_suncc.m4 (+0/-33)
protobuf-lite.pc.in (+13/-0)
protobuf.pc.in (+13/-0)
python/google/protobuf/internal/containers.py (+6/-2)
python/google/protobuf/internal/decoder.py (+2/-2)
python/google/protobuf/internal/decoder_test.py (+11/-7)
python/google/protobuf/internal/encoder.py (+4/-2)
python/google/protobuf/internal/encoder_test.py (+8/-4)
python/google/protobuf/internal/message_test.py (+53/-0)
python/google/protobuf/internal/reflection_test.py (+84/-4)
python/google/protobuf/internal/test_util.py (+197/-1)
python/google/protobuf/internal/text_format_test.py (+278/-3)
python/google/protobuf/internal/type_checkers.py (+4/-2)
python/google/protobuf/internal/wire_format.py (+2/-0)
python/google/protobuf/message.py (+1/-2)
python/google/protobuf/reflection.py (+56/-10)
python/google/protobuf/service.py (+3/-2)
python/google/protobuf/text_format.py (+526/-1)
python/setup.py (+1/-1)
src/Makefile.am (+52/-17)
src/Makefile.in (+407/-139)
src/google/protobuf/compiler/code_generator.cc (+22/-0)
src/google/protobuf/compiler/code_generator.h (+11/-0)
src/google/protobuf/compiler/cpp/cpp_enum.cc (+51/-28)
src/google/protobuf/compiler/cpp/cpp_enum.h (+4/-0)
src/google/protobuf/compiler/cpp/cpp_enum_field.cc (+52/-55)
src/google/protobuf/compiler/cpp/cpp_extension.cc (+1/-0)
src/google/protobuf/compiler/cpp/cpp_field.cc (+19/-0)
src/google/protobuf/compiler/cpp/cpp_field.h (+10/-0)
src/google/protobuf/compiler/cpp/cpp_file.cc (+196/-145)
src/google/protobuf/compiler/cpp/cpp_generator.cc (+1/-28)
src/google/protobuf/compiler/cpp/cpp_helpers.cc (+21/-2)
src/google/protobuf/compiler/cpp/cpp_helpers.h (+29/-0)
src/google/protobuf/compiler/cpp/cpp_message.cc (+361/-209)
src/google/protobuf/compiler/cpp/cpp_message.h (+4/-5)
src/google/protobuf/compiler/cpp/cpp_message_field.cc (+29/-38)
src/google/protobuf/compiler/cpp/cpp_primitive_field.cc (+49/-60)
src/google/protobuf/compiler/cpp/cpp_service.cc (+1/-1)
src/google/protobuf/compiler/cpp/cpp_string_field.cc (+84/-45)
src/google/protobuf/compiler/cpp/cpp_unittest.cc (+54/-6)
src/google/protobuf/compiler/java/java_enum.cc (+88/-68)
src/google/protobuf/compiler/java/java_enum_field.cc (+26/-17)
src/google/protobuf/compiler/java/java_extension.cc (+85/-14)
src/google/protobuf/compiler/java/java_file.cc (+50/-9)
src/google/protobuf/compiler/java/java_file.h (+2/-0)
src/google/protobuf/compiler/java/java_generator.cc (+1/-27)
src/google/protobuf/compiler/java/java_helpers.cc (+67/-0)
src/google/protobuf/compiler/java/java_helpers.h (+30/-0)
src/google/protobuf/compiler/java/java_message.cc (+290/-191)
src/google/protobuf/compiler/java/java_primitive_field.cc (+21/-80)
src/google/protobuf/compiler/parser.cc (+1/-1)
src/google/protobuf/descriptor.cc (+65/-13)
src/google/protobuf/descriptor.pb.cc (+1224/-843)
src/google/protobuf/descriptor.pb.h (+127/-74)
src/google/protobuf/descriptor.proto (+9/-2)
src/google/protobuf/descriptor_unittest.cc (+145/-0)
src/google/protobuf/dynamic_message.cc (+43/-41)
src/google/protobuf/extension_set.cc (+509/-281)
src/google/protobuf/extension_set.h (+110/-47)
src/google/protobuf/extension_set_heavy.cc (+221/-0)
src/google/protobuf/generated_message_reflection.cc (+317/-47)
src/google/protobuf/generated_message_reflection.h (+17/-14)
src/google/protobuf/generated_message_reflection_unittest.cc (+116/-0)
src/google/protobuf/generated_message_util.cc (+44/-0)
src/google/protobuf/generated_message_util.h (+65/-0)
src/google/protobuf/io/coded_stream.cc (+46/-50)
src/google/protobuf/io/coded_stream.h (+46/-0)
src/google/protobuf/io/gzip_stream.cc (+0/-296)
src/google/protobuf/io/gzip_stream.h (+0/-178)
src/google/protobuf/io/gzip_stream_unittest.sh (+0/-44)
src/google/protobuf/io/tokenizer.cc (+1/-1)
src/google/protobuf/io/tokenizer_unittest.cc (+1/-0)
src/google/protobuf/io/zero_copy_stream_impl.cc (+0/-345)
src/google/protobuf/io/zero_copy_stream_impl.h (+4/-284)
src/google/protobuf/io/zero_copy_stream_impl_lite.cc (+393/-0)
src/google/protobuf/io/zero_copy_stream_impl_lite.h (+340/-0)
src/google/protobuf/io/zero_copy_stream_unittest.cc (+66/-0)
src/google/protobuf/lite_unittest.cc (+112/-0)
src/google/protobuf/message.cc (+27/-177)
src/google/protobuf/message.h (+87/-157)
src/google/protobuf/message_lite.cc (+293/-0)
src/google/protobuf/message_lite.h (+239/-0)
src/google/protobuf/message_unittest.cc (+0/-30)
src/google/protobuf/repeated_field.cc (+38/-17)
src/google/protobuf/repeated_field.h (+432/-353)
src/google/protobuf/stubs/common.cc (+38/-15)
src/google/protobuf/stubs/common.h (+26/-18)
src/google/protobuf/stubs/map-util.cc (+0/-42)
src/google/protobuf/stubs/once.cc (+0/-82)
src/google/protobuf/stubs/once.h (+0/-122)
src/google/protobuf/stubs/once_unittest.cc (+0/-253)
src/google/protobuf/stubs/stl_util-inl.cc (+0/-41)
src/google/protobuf/test_util.cc (+321/-6)
src/google/protobuf/test_util.h (+15/-0)
src/google/protobuf/test_util_lite.cc (+1502/-0)
src/google/protobuf/test_util_lite.h (+101/-0)
src/google/protobuf/testing/zcgunzip.cc (+0/-73)
src/google/protobuf/testing/zcgzip.cc (+0/-79)
src/google/protobuf/text_format.cc (+48/-16)
src/google/protobuf/text_format.h (+12/-0)
src/google/protobuf/text_format_unittest.cc (+117/-3)
src/google/protobuf/unittest.proto (+10/-0)
src/google/protobuf/unittest_custom_options.proto (+2/-0)
src/google/protobuf/unittest_empty.proto (+0/-37)
src/google/protobuf/unittest_enormous_descriptor.proto (+1045/-0)
src/google/protobuf/unittest_import_lite.proto (+49/-0)
src/google/protobuf/unittest_lite.proto (+312/-0)
src/google/protobuf/unittest_lite_imports_nonlite.proto (+43/-0)
src/google/protobuf/wire_format.cc (+161/-145)
src/google/protobuf/wire_format.h (+96/-366)
src/google/protobuf/wire_format_inl.h (+0/-687)
src/google/protobuf/wire_format_lite.cc (+192/-0)
src/google/protobuf/wire_format_lite.h (+558/-0)
src/google/protobuf/wire_format_lite_inl.h (+657/-0)
src/google/protobuf/wire_format_unittest.cc (+51/-12)
vsprojects/extract_includes.bat (+5/-1)
vsprojects/libprotobuf-lite.vcproj (+270/-0)
vsprojects/libprotobuf.vcproj (+37/-9)
vsprojects/lite-test.vcproj (+273/-0)
vsprojects/protobuf.sln (+16/-0)
vsprojects/readme.txt (+6/-3)
vsprojects/tests.vcproj (+32/-0)
To merge this branch: bzr merge lp:~statik/ubuntu/lucid/protobuf/merge-bug502654
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Review via email: mp+17571@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Elliot Murphy (statik) wrote :

Merged from Debian, reviewed Ubuntu delta and it still looks sane and appropriate.

Revision history for this message
Daniel Holbach (dholbach) wrote :

As far as I can tell this has been merged into Lucid already.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CHANGES.txt'
--- CHANGES.txt 2009-06-24 00:19:03 +0000
+++ CHANGES.txt 2010-01-18 04:34:17 +0000
@@ -1,4 +1,50 @@
1????-??-?? version 2.1.0:12009-11-18 version 2.2.0a:
2
3 There is probably no reason to install this release if you have arleady
4 installed 2.2.0.
5
6 C++
7 * Bumped binary interface version number, so that installing libprotobuf.so
8 v2.2.0 doesn't break already-compiled binaries that are linked against
9 v2.1.0. This should have happened as part of the original 2.2.0 release,
10 but somehow was missed.
11
122009-08-11 version 2.2.0:
13
14 C++
15 * Lite mode: The "optimize_for = LITE_RUNTIME" option causes the compiler
16 to generate code which only depends libprotobuf-lite, which is much smaller
17 than libprotobuf but lacks descriptors, reflection, and some other features.
18 * Fixed bug where Message.Swap(Message) was only implemented for
19 optimize_for_speed. Swap now properly implemented in both modes
20 (Issue 91).
21 * Added RemoveLast and SwapElements(index1, index2) to Reflection
22 interface for repeated elements.
23 * Added Swap(Message) to Reflection interface.
24 * Floating-point literals in generated code that are intended to be
25 single-precision now explicitly have 'f' suffix to avoid pedantic warnings
26 produced by some compilers.
27 * The [deprecated=true] option now causes the C++ code generator to generate
28 a GCC-style deprecation annotation (no-op on other compilers).
29 * google::protobuf::GetEnumDescriptor<SomeGeneratedEnumType>() returns the
30 EnumDescriptor for that type -- useful for templates which cannot call
31 SomeGeneratedEnumType_descriptor().
32 * Various optimizations and obscure bug fixes.
33
34 Java
35 * Lite mode: The "optimize_for = LITE_RUNTIME" option causes the compiler
36 to generate code which only depends libprotobuf-lite, which is much smaller
37 than libprotobuf but lacks descriptors, reflection, and some other features.
38 * Lots of style cleanups.
39
40 Python
41 * Fixed endianness bug with floats and doubles.
42 * Text format parsing support.
43 * Fix bug with parsing packed repeated fields in embedded messages.
44 * Ability to initialize fields by passing keyword args to constructor.
45 * Support iterators in extend and __setslice__ for containers.
46
472009-05-13 version 2.1.0:
248
3 General49 General
4 * Repeated fields of primitive types (types other that string, group, and50 * Repeated fields of primitive types (types other that string, group, and
551
=== modified file 'CONTRIBUTORS.txt'
--- CONTRIBUTORS.txt 2009-06-24 00:19:03 +0000
+++ CONTRIBUTORS.txt 2010-01-18 04:34:16 +0000
@@ -70,3 +70,5 @@
70 * Small patch improving performance of in Python serialization.70 * Small patch improving performance of in Python serialization.
71 Alexandre Vassalotti <alexandre@peadrop.com>71 Alexandre Vassalotti <alexandre@peadrop.com>
72 * Emacs mode for Protocol Buffers (editors/protobuf-mode.el).72 * Emacs mode for Protocol Buffers (editors/protobuf-mode.el).
73 Scott Stafford <scott.stafford@gmail.com>
74 * Added Swap(), SwapElements(), and RemoveLast() to Reflection interface.
7375
=== modified file 'Makefile.am'
--- Makefile.am 2009-06-24 00:19:03 +0000
+++ Makefile.am 2010-01-18 04:34:16 +0000
@@ -32,6 +32,9 @@
32 cd gtest && $(MAKE) $(AM_MAKEFLAGS) clean; \32 cd gtest && $(MAKE) $(AM_MAKEFLAGS) clean; \
33 fi33 fi
3434
35pkgconfigdir = $(libdir)/pkgconfig
36pkgconfig_DATA = protobuf.pc protobuf-lite.pc
37
35EXTRA_DIST = \38EXTRA_DIST = \
36 autogen.sh \39 autogen.sh \
37 generate_descriptor_proto.sh \40 generate_descriptor_proto.sh \
@@ -46,11 +49,13 @@
46 vsprojects/config.h \49 vsprojects/config.h \
47 vsprojects/extract_includes.bat \50 vsprojects/extract_includes.bat \
48 vsprojects/libprotobuf.vcproj \51 vsprojects/libprotobuf.vcproj \
52 vsprojects/libprotobuf-lite.vcproj \
49 vsprojects/libprotoc.vcproj \53 vsprojects/libprotoc.vcproj \
50 vsprojects/protobuf.sln \54 vsprojects/protobuf.sln \
51 vsprojects/protoc.vcproj \55 vsprojects/protoc.vcproj \
52 vsprojects/readme.txt \56 vsprojects/readme.txt \
53 vsprojects/tests.vcproj \57 vsprojects/tests.vcproj \
58 vsprojects/lite-test.vcproj \
54 vsprojects/convert2008to2005.sh \59 vsprojects/convert2008to2005.sh \
55 examples/README.txt \60 examples/README.txt \
56 examples/Makefile \61 examples/Makefile \
@@ -62,6 +67,7 @@
62 examples/add_person.py \67 examples/add_person.py \
63 examples/list_people.py \68 examples/list_people.py \
64 java/src/main/java/com/google/protobuf/AbstractMessage.java \69 java/src/main/java/com/google/protobuf/AbstractMessage.java \
70 java/src/main/java/com/google/protobuf/AbstractMessageLite.java \
65 java/src/main/java/com/google/protobuf/BlockingRpcChannel.java \71 java/src/main/java/com/google/protobuf/BlockingRpcChannel.java \
66 java/src/main/java/com/google/protobuf/BlockingService.java \72 java/src/main/java/com/google/protobuf/BlockingService.java \
67 java/src/main/java/com/google/protobuf/ByteString.java \73 java/src/main/java/com/google/protobuf/ByteString.java \
@@ -70,10 +76,14 @@
70 java/src/main/java/com/google/protobuf/Descriptors.java \76 java/src/main/java/com/google/protobuf/Descriptors.java \
71 java/src/main/java/com/google/protobuf/DynamicMessage.java \77 java/src/main/java/com/google/protobuf/DynamicMessage.java \
72 java/src/main/java/com/google/protobuf/ExtensionRegistry.java \78 java/src/main/java/com/google/protobuf/ExtensionRegistry.java \
79 java/src/main/java/com/google/protobuf/ExtensionRegistryLite.java \
73 java/src/main/java/com/google/protobuf/FieldSet.java \80 java/src/main/java/com/google/protobuf/FieldSet.java \
74 java/src/main/java/com/google/protobuf/GeneratedMessage.java \81 java/src/main/java/com/google/protobuf/GeneratedMessage.java \
82 java/src/main/java/com/google/protobuf/GeneratedMessageLite.java \
83 java/src/main/java/com/google/protobuf/Internal.java \
75 java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java \84 java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java \
76 java/src/main/java/com/google/protobuf/Message.java \85 java/src/main/java/com/google/protobuf/Message.java \
86 java/src/main/java/com/google/protobuf/MessageLite.java \
77 java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java \87 java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java \
78 java/src/main/java/com/google/protobuf/RpcCallback.java \88 java/src/main/java/com/google/protobuf/RpcCallback.java \
79 java/src/main/java/com/google/protobuf/RpcChannel.java \89 java/src/main/java/com/google/protobuf/RpcChannel.java \
@@ -91,6 +101,7 @@
91 java/src/test/java/com/google/protobuf/DescriptorsTest.java \101 java/src/test/java/com/google/protobuf/DescriptorsTest.java \
92 java/src/test/java/com/google/protobuf/DynamicMessageTest.java \102 java/src/test/java/com/google/protobuf/DynamicMessageTest.java \
93 java/src/test/java/com/google/protobuf/GeneratedMessageTest.java \103 java/src/test/java/com/google/protobuf/GeneratedMessageTest.java \
104 java/src/test/java/com/google/protobuf/LiteTest.java \
94 java/src/test/java/com/google/protobuf/MessageTest.java \105 java/src/test/java/com/google/protobuf/MessageTest.java \
95 java/src/test/java/com/google/protobuf/ServiceTest.java \106 java/src/test/java/com/google/protobuf/ServiceTest.java \
96 java/src/test/java/com/google/protobuf/TestUtil.java \107 java/src/test/java/com/google/protobuf/TestUtil.java \
@@ -110,6 +121,7 @@
110 python/google/protobuf/internal/input_stream.py \121 python/google/protobuf/internal/input_stream.py \
111 python/google/protobuf/internal/input_stream_test.py \122 python/google/protobuf/internal/input_stream_test.py \
112 python/google/protobuf/internal/message_listener.py \123 python/google/protobuf/internal/message_listener.py \
124 python/google/protobuf/internal/message_test.py \
113 python/google/protobuf/internal/more_extensions.proto \125 python/google/protobuf/internal/more_extensions.proto \
114 python/google/protobuf/internal/more_messages.proto \126 python/google/protobuf/internal/more_messages.proto \
115 python/google/protobuf/internal/output_stream.py \127 python/google/protobuf/internal/output_stream.py \
@@ -149,4 +161,9 @@
149 missing \161 missing \
150 mkinstalldirs \162 mkinstalldirs \
151 config.h.in \163 config.h.in \
152 stamp.h.in164 stamp.h.in \
165 m4/ltsugar.m4 \
166 m4/libtool.m4 \
167 m4/ltversion.m4 \
168 m4/lt~obsolete.m4 \
169 m4/ltoptions.m4
153170
=== modified file 'Makefile.in'
--- Makefile.in 2009-06-24 00:19:03 +0000
+++ Makefile.in 2010-01-18 04:34:16 +0000
@@ -13,6 +13,7 @@
13# PARTICULAR PURPOSE.13# PARTICULAR PURPOSE.
1414
15@SET_MAKE@15@SET_MAKE@
16
16VPATH = @srcdir@17VPATH = @srcdir@
17pkgdatadir = $(datadir)/@PACKAGE@18pkgdatadir = $(datadir)/@PACKAGE@
18pkglibdir = $(libdir)/@PACKAGE@19pkglibdir = $(libdir)/@PACKAGE@
@@ -31,9 +32,11 @@
31POST_UNINSTALL = :32POST_UNINSTALL = :
32build_triplet = @build@33build_triplet = @build@
33host_triplet = @host@34host_triplet = @host@
35target_triplet = @target@
34subdir = .36subdir = .
35DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \37DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
36 $(srcdir)/Makefile.in $(srcdir)/config.h.in \38 $(srcdir)/Makefile.in $(srcdir)/config.h.in \
39 $(srcdir)/protobuf-lite.pc.in $(srcdir)/protobuf.pc.in \
37 $(top_srcdir)/configure config.guess config.sub depcomp \40 $(top_srcdir)/configure config.guess config.sub depcomp \
38 install-sh ltmain.sh missing41 install-sh ltmain.sh missing
39ACLOCAL_M4 = $(top_srcdir)/aclocal.m442ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -49,7 +52,7 @@
49 configure.lineno config.status.lineno52 configure.lineno config.status.lineno
50mkinstalldirs = $(install_sh) -d53mkinstalldirs = $(install_sh) -d
51CONFIG_HEADER = config.h54CONFIG_HEADER = config.h
52CONFIG_CLEAN_FILES =55CONFIG_CLEAN_FILES = protobuf.pc protobuf-lite.pc
53SOURCES =56SOURCES =
54DIST_SOURCES =57DIST_SOURCES =
55RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \58RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -59,6 +62,15 @@
59 install-pdf-recursive install-ps-recursive install-recursive \62 install-pdf-recursive install-ps-recursive install-recursive \
60 installcheck-recursive installdirs-recursive pdf-recursive \63 installcheck-recursive installdirs-recursive pdf-recursive \
61 ps-recursive uninstall-recursive64 ps-recursive uninstall-recursive
65am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
66am__vpath_adj = case $$p in \
67 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
68 *) f=$$p;; \
69 esac;
70am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
71am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
72pkgconfigDATA_INSTALL = $(INSTALL_DATA)
73DATA = $(pkgconfig_DATA)
62RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \74RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
63 distclean-recursive maintainer-clean-recursive75 distclean-recursive maintainer-clean-recursive
64ETAGS = etags76ETAGS = etags
@@ -106,6 +118,7 @@
106INSTALL_PROGRAM = @INSTALL_PROGRAM@118INSTALL_PROGRAM = @INSTALL_PROGRAM@
107INSTALL_SCRIPT = @INSTALL_SCRIPT@119INSTALL_SCRIPT = @INSTALL_SCRIPT@
108INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@120INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
121ISAINFO = @ISAINFO@
109LD = @LD@122LD = @LD@
110LDFLAGS = @LDFLAGS@123LDFLAGS = @LDFLAGS@
111LIBOBJS = @LIBOBJS@124LIBOBJS = @LIBOBJS@
@@ -191,7 +204,11 @@
191srcdir = @srcdir@204srcdir = @srcdir@
192subdirs = @subdirs@205subdirs = @subdirs@
193sysconfdir = @sysconfdir@206sysconfdir = @sysconfdir@
207target = @target@
194target_alias = @target_alias@208target_alias = @target_alias@
209target_cpu = @target_cpu@
210target_os = @target_os@
211target_vendor = @target_vendor@
195top_builddir = @top_builddir@212top_builddir = @top_builddir@
196top_srcdir = @top_srcdir@213top_srcdir = @top_srcdir@
197ACLOCAL_AMFLAGS = -I m4214ACLOCAL_AMFLAGS = -I m4
@@ -203,6 +220,8 @@
203220
204# Always include gtest in distributions.221# Always include gtest in distributions.
205DIST_SUBDIRS = $(subdirs) src222DIST_SUBDIRS = $(subdirs) src
223pkgconfigdir = $(libdir)/pkgconfig
224pkgconfig_DATA = protobuf.pc protobuf-lite.pc
206EXTRA_DIST = \225EXTRA_DIST = \
207 autogen.sh \226 autogen.sh \
208 generate_descriptor_proto.sh \227 generate_descriptor_proto.sh \
@@ -217,11 +236,13 @@
217 vsprojects/config.h \236 vsprojects/config.h \
218 vsprojects/extract_includes.bat \237 vsprojects/extract_includes.bat \
219 vsprojects/libprotobuf.vcproj \238 vsprojects/libprotobuf.vcproj \
239 vsprojects/libprotobuf-lite.vcproj \
220 vsprojects/libprotoc.vcproj \240 vsprojects/libprotoc.vcproj \
221 vsprojects/protobuf.sln \241 vsprojects/protobuf.sln \
222 vsprojects/protoc.vcproj \242 vsprojects/protoc.vcproj \
223 vsprojects/readme.txt \243 vsprojects/readme.txt \
224 vsprojects/tests.vcproj \244 vsprojects/tests.vcproj \
245 vsprojects/lite-test.vcproj \
225 vsprojects/convert2008to2005.sh \246 vsprojects/convert2008to2005.sh \
226 examples/README.txt \247 examples/README.txt \
227 examples/Makefile \248 examples/Makefile \
@@ -233,6 +254,7 @@
233 examples/add_person.py \254 examples/add_person.py \
234 examples/list_people.py \255 examples/list_people.py \
235 java/src/main/java/com/google/protobuf/AbstractMessage.java \256 java/src/main/java/com/google/protobuf/AbstractMessage.java \
257 java/src/main/java/com/google/protobuf/AbstractMessageLite.java \
236 java/src/main/java/com/google/protobuf/BlockingRpcChannel.java \258 java/src/main/java/com/google/protobuf/BlockingRpcChannel.java \
237 java/src/main/java/com/google/protobuf/BlockingService.java \259 java/src/main/java/com/google/protobuf/BlockingService.java \
238 java/src/main/java/com/google/protobuf/ByteString.java \260 java/src/main/java/com/google/protobuf/ByteString.java \
@@ -241,10 +263,14 @@
241 java/src/main/java/com/google/protobuf/Descriptors.java \263 java/src/main/java/com/google/protobuf/Descriptors.java \
242 java/src/main/java/com/google/protobuf/DynamicMessage.java \264 java/src/main/java/com/google/protobuf/DynamicMessage.java \
243 java/src/main/java/com/google/protobuf/ExtensionRegistry.java \265 java/src/main/java/com/google/protobuf/ExtensionRegistry.java \
266 java/src/main/java/com/google/protobuf/ExtensionRegistryLite.java \
244 java/src/main/java/com/google/protobuf/FieldSet.java \267 java/src/main/java/com/google/protobuf/FieldSet.java \
245 java/src/main/java/com/google/protobuf/GeneratedMessage.java \268 java/src/main/java/com/google/protobuf/GeneratedMessage.java \
269 java/src/main/java/com/google/protobuf/GeneratedMessageLite.java \
270 java/src/main/java/com/google/protobuf/Internal.java \
246 java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java \271 java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java \
247 java/src/main/java/com/google/protobuf/Message.java \272 java/src/main/java/com/google/protobuf/Message.java \
273 java/src/main/java/com/google/protobuf/MessageLite.java \
248 java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java \274 java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java \
249 java/src/main/java/com/google/protobuf/RpcCallback.java \275 java/src/main/java/com/google/protobuf/RpcCallback.java \
250 java/src/main/java/com/google/protobuf/RpcChannel.java \276 java/src/main/java/com/google/protobuf/RpcChannel.java \
@@ -262,6 +288,7 @@
262 java/src/test/java/com/google/protobuf/DescriptorsTest.java \288 java/src/test/java/com/google/protobuf/DescriptorsTest.java \
263 java/src/test/java/com/google/protobuf/DynamicMessageTest.java \289 java/src/test/java/com/google/protobuf/DynamicMessageTest.java \
264 java/src/test/java/com/google/protobuf/GeneratedMessageTest.java \290 java/src/test/java/com/google/protobuf/GeneratedMessageTest.java \
291 java/src/test/java/com/google/protobuf/LiteTest.java \
265 java/src/test/java/com/google/protobuf/MessageTest.java \292 java/src/test/java/com/google/protobuf/MessageTest.java \
266 java/src/test/java/com/google/protobuf/ServiceTest.java \293 java/src/test/java/com/google/protobuf/ServiceTest.java \
267 java/src/test/java/com/google/protobuf/TestUtil.java \294 java/src/test/java/com/google/protobuf/TestUtil.java \
@@ -281,6 +308,7 @@
281 python/google/protobuf/internal/input_stream.py \308 python/google/protobuf/internal/input_stream.py \
282 python/google/protobuf/internal/input_stream_test.py \309 python/google/protobuf/internal/input_stream_test.py \
283 python/google/protobuf/internal/message_listener.py \310 python/google/protobuf/internal/message_listener.py \
311 python/google/protobuf/internal/message_test.py \
284 python/google/protobuf/internal/more_extensions.proto \312 python/google/protobuf/internal/more_extensions.proto \
285 python/google/protobuf/internal/more_messages.proto \313 python/google/protobuf/internal/more_messages.proto \
286 python/google/protobuf/internal/output_stream.py \314 python/google/protobuf/internal/output_stream.py \
@@ -321,7 +349,12 @@
321 missing \349 missing \
322 mkinstalldirs \350 mkinstalldirs \
323 config.h.in \351 config.h.in \
324 stamp.h.in352 stamp.h.in \
353 m4/ltsugar.m4 \
354 m4/libtool.m4 \
355 m4/ltversion.m4 \
356 m4/lt~obsolete.m4 \
357 m4/ltoptions.m4
325358
326all: config.h359all: config.h
327 $(MAKE) $(AM_MAKEFLAGS) all-recursive360 $(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -377,6 +410,10 @@
377410
378distclean-hdr:411distclean-hdr:
379 -rm -f config.h stamp-h1412 -rm -f config.h stamp-h1
413protobuf.pc: $(top_builddir)/config.status $(srcdir)/protobuf.pc.in
414 cd $(top_builddir) && $(SHELL) ./config.status $@
415protobuf-lite.pc: $(top_builddir)/config.status $(srcdir)/protobuf-lite.pc.in
416 cd $(top_builddir) && $(SHELL) ./config.status $@
380417
381mostlyclean-libtool:418mostlyclean-libtool:
382 -rm -f *.lo419 -rm -f *.lo
@@ -386,6 +423,23 @@
386423
387distclean-libtool:424distclean-libtool:
388 -rm -f libtool425 -rm -f libtool
426install-pkgconfigDATA: $(pkgconfig_DATA)
427 @$(NORMAL_INSTALL)
428 test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
429 @list='$(pkgconfig_DATA)'; for p in $$list; do \
430 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
431 f=$(am__strip_dir) \
432 echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
433 $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
434 done
435
436uninstall-pkgconfigDATA:
437 @$(NORMAL_UNINSTALL)
438 @list='$(pkgconfig_DATA)'; for p in $$list; do \
439 f=$(am__strip_dir) \
440 echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
441 rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
442 done
389443
390# This directory's subdirectories are mostly independent; you can cd444# This directory's subdirectories are mostly independent; you can cd
391# into them and run `make' without going through this Makefile.445# into them and run `make' without going through this Makefile.
@@ -668,9 +722,12 @@
668check-am: all-am722check-am: all-am
669 $(MAKE) $(AM_MAKEFLAGS) check-local723 $(MAKE) $(AM_MAKEFLAGS) check-local
670check: check-recursive724check: check-recursive
671all-am: Makefile config.h725all-am: Makefile $(DATA) config.h
672installdirs: installdirs-recursive726installdirs: installdirs-recursive
673installdirs-am:727installdirs-am:
728 for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
729 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
730 done
674install: install-recursive731install: install-recursive
675install-exec: install-exec-recursive732install-exec: install-exec-recursive
676install-data: install-data-recursive733install-data: install-data-recursive
@@ -716,7 +773,7 @@
716773
717info-am:774info-am:
718775
719install-data-am:776install-data-am: install-pkgconfigDATA
720777
721install-dvi: install-dvi-recursive778install-dvi: install-dvi-recursive
722779
@@ -752,7 +809,7 @@
752809
753ps-am:810ps-am:
754811
755uninstall-am:812uninstall-am: uninstall-pkgconfigDATA
756813
757.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \814.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
758 install-strip815 install-strip
@@ -767,12 +824,12 @@
767 info-am install install-am install-data install-data-am \824 info-am install install-am install-data install-data-am \
768 install-dvi install-dvi-am install-exec install-exec-am \825 install-dvi install-dvi-am install-exec install-exec-am \
769 install-html install-html-am install-info install-info-am \826 install-html install-html-am install-info install-info-am \
770 install-man install-pdf install-pdf-am install-ps \827 install-man install-pdf install-pdf-am install-pkgconfigDATA \
771 install-ps-am install-strip installcheck installcheck-am \828 install-ps install-ps-am install-strip installcheck \
772 installdirs installdirs-am maintainer-clean \829 installcheck-am installdirs installdirs-am maintainer-clean \
773 maintainer-clean-generic mostlyclean mostlyclean-generic \830 maintainer-clean-generic mostlyclean mostlyclean-generic \
774 mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \831 mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
775 uninstall uninstall-am832 uninstall uninstall-am uninstall-pkgconfigDATA
776833
777834
778# Build gtest before we build protobuf tests. We don't add gtest to SUBDIRS835# Build gtest before we build protobuf tests. We don't add gtest to SUBDIRS
779836
=== modified file 'README.txt'
--- README.txt 2009-06-24 00:19:03 +0000
+++ README.txt 2010-01-18 04:34:17 +0000
@@ -33,6 +33,44 @@
33 If you already built the package with a different prefix, make sure33 If you already built the package with a different prefix, make sure
34 to run "make clean" before building again.34 to run "make clean" before building again.
3535
36** Compiling dependent packages **
37
38 To compile a package that uses Protocol Buffers, you need to pass
39 various flags to your compiler and linker. As of version 2.2.0,
40 Protocol Buffers integrates with pkg-config to manage this. If you
41 have pkg-config installed, then you can invoke it to get a list of
42 flags like so:
43
44 pkg-config --cflags protobuf # print compiler flags
45 pkg-config --libs protobuf # print linker flags
46 pkg-config --cflags --libs protobuf # print both
47
48 For example:
49
50 c++ my_program.cc my_proto.pb.cc `pkg-config --cflags --libs protobuf`
51
52 Note that packages written prior to the 2.2.0 release of Protocol
53 Buffers may not yet integrate with pkg-config to get flags, and may
54 not pass the correct set of flags to correctly link against
55 libprotobuf. If the package in question uses autoconf, you can
56 often fix the problem by invoking its configure script like:
57
58 configure CXXFLAGS="$(pkg-config --cflags protobuf)" \
59 LIBS="$(pkg-config --libs protobuf)"
60
61 This will force it to use the correct flags.
62
63 If you are writing an autoconf-based package that uses Protocol
64 Buffers, you should probably use the PKG_CHECK_MODULES macro in your
65 configure script like:
66
67 PKG_CHECK_MODULES([protobuf], [protobuf])
68
69 See the pkg-config man page for more info.
70
71 If you only want protobuf-lite, substitute "protobuf-lite" in place
72 of "protobuf" in these examples.
73
36** Note for cross-compiling **74** Note for cross-compiling **
3775
38 The makefiles normally invoke the protoc executable that they just76 The makefiles normally invoke the protoc executable that they just
3977
=== modified file 'autogen.sh'
--- autogen.sh 2009-06-24 00:19:03 +0000
+++ autogen.sh 2010-01-18 04:34:16 +0000
@@ -13,23 +13,16 @@
13 exit 113 exit 1
14fi14fi
1515
16if test ! -d gtest; then16set -ex
17 echo "gtest bundle not present. Downloading gtest-1.3.0 automatically." >&2
18 set -ex
19 curl http://googletest.googlecode.com/files/gtest-1.3.0.tar.bz2 | tar jx
20 mv gtest-1.3.0 gtest
2117
22 # Temporary hack: Must change C runtime library to "multi-threaded DLL",18# Temporary hack: Must change C runtime library to "multi-threaded DLL",
23 # otherwise it will be set to "multi-threaded static" when MSVC upgrades19# otherwise it will be set to "multi-threaded static" when MSVC upgrades
24 # the project file to MSVC 2005/2008. vladl of Google Test says gtest will20# the project file to MSVC 2005/2008. vladl of Google Test says gtest will
25 # probably change their default to match, then this will be unnecessary.21# probably change their default to match, then this will be unnecessary.
26 # One of these mappings converts the debug configuration and the other22# One of these mappings converts the debug configuration and the other
27 # converts the release configuration. I don't know which is which.23# converts the release configuration. I don't know which is which.
28 sed -i -e 's/RuntimeLibrary="5"/RuntimeLibrary="3"/g;24sed -i -e 's/RuntimeLibrary="5"/RuntimeLibrary="3"/g;
29 s/RuntimeLibrary="4"/RuntimeLibrary="2"/g;' gtest/msvc/*.vcproj25 s/RuntimeLibrary="4"/RuntimeLibrary="2"/g;' gtest/msvc/*.vcproj
30else
31 set -ex
32fi
3326
34# TODO(kenton): Remove the ",no-obsolete" part and fix the resulting warnings.27# TODO(kenton): Remove the ",no-obsolete" part and fix the resulting warnings.
35autoreconf -f -i -Wall,no-obsolete28autoreconf -f -i -Wall,no-obsolete
3629
=== modified file 'configure'
--- configure 2009-06-24 00:19:03 +0000
+++ configure 2010-01-18 04:34:17 +0000
@@ -1,6 +1,6 @@
1#! /bin/sh1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles.2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.61 for Protocol Buffers 2.1.0.3# Generated by GNU Autoconf 2.61 for Protocol Buffers 2.2.0a.
4#4#
5# Report bugs to <protobuf@googlegroups.com>.5# Report bugs to <protobuf@googlegroups.com>.
6#6#
@@ -723,8 +723,8 @@
723# Identity of this package.723# Identity of this package.
724PACKAGE_NAME='Protocol Buffers'724PACKAGE_NAME='Protocol Buffers'
725PACKAGE_TARNAME='protobuf'725PACKAGE_TARNAME='protobuf'
726PACKAGE_VERSION='2.1.0'726PACKAGE_VERSION='2.2.0a'
727PACKAGE_STRING='Protocol Buffers 2.1.0'727PACKAGE_STRING='Protocol Buffers 2.2.0a'
728PACKAGE_BUGREPORT='protobuf@googlegroups.com'728PACKAGE_BUGREPORT='protobuf@googlegroups.com'
729729
730ac_unique_file="src/google/protobuf/message.cc"730ac_unique_file="src/google/protobuf/message.cc"
@@ -801,6 +801,18 @@
801build_alias801build_alias
802host_alias802host_alias
803target_alias803target_alias
804build
805build_cpu
806build_vendor
807build_os
808host
809host_cpu
810host_vendor
811host_os
812target
813target_cpu
814target_vendor
815target_os
804INSTALL_PROGRAM816INSTALL_PROGRAM
805INSTALL_SCRIPT817INSTALL_SCRIPT
806INSTALL_DATA818INSTALL_DATA
@@ -848,15 +860,11 @@
848CXXCPP860CXXCPP
849GREP861GREP
850EGREP862EGREP
863GCC_TRUE
864GCC_FALSE
865PROTOBUF_OPT_FLAG
866ISAINFO
851LIBTOOL867LIBTOOL
852build
853build_cpu
854build_vendor
855build_os
856host
857host_cpu
858host_vendor
859host_os
860SED868SED
861FGREP869FGREP
862LD870LD
@@ -872,9 +880,6 @@
872LIPO880LIPO
873OTOOL881OTOOL
874OTOOL64882OTOOL64
875GCC_TRUE
876GCC_FALSE
877PROTOBUF_OPT_FLAG
878LIBOBJS883LIBOBJS
879POW_LIB884POW_LIB
880HAVE_ZLIB_TRUE885HAVE_ZLIB_TRUE
@@ -1403,7 +1408,7 @@
1403 # Omit some internal or obsolete options to make the list less imposing.1408 # Omit some internal or obsolete options to make the list less imposing.
1404 # This message is too long to be a string in the A/UX 3.1 sh.1409 # This message is too long to be a string in the A/UX 3.1 sh.
1405 cat <<_ACEOF1410 cat <<_ACEOF
1406\`configure' configures Protocol Buffers 2.1.0 to adapt to many kinds of systems.1411\`configure' configures Protocol Buffers 2.2.0a to adapt to many kinds of systems.
14071412
1408Usage: $0 [OPTION]... [VAR=VALUE]...1413Usage: $0 [OPTION]... [VAR=VALUE]...
14091414
@@ -1468,12 +1473,13 @@
1468System types:1473System types:
1469 --build=BUILD configure for building on BUILD [guessed]1474 --build=BUILD configure for building on BUILD [guessed]
1470 --host=HOST cross-compile to build programs to run on HOST [BUILD]1475 --host=HOST cross-compile to build programs to run on HOST [BUILD]
1476 --target=TARGET configure for building compilers for TARGET [HOST]
1471_ACEOF1477_ACEOF
1472fi1478fi
14731479
1474if test -n "$ac_init_help"; then1480if test -n "$ac_init_help"; then
1475 case $ac_init_help in1481 case $ac_init_help in
1476 short | recursive ) echo "Configuration of Protocol Buffers 2.1.0:";;1482 short | recursive ) echo "Configuration of Protocol Buffers 2.2.0a:";;
1477 esac1483 esac
1478 cat <<\_ACEOF1484 cat <<\_ACEOF
14791485
@@ -1482,6 +1488,7 @@
1482 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]1488 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
1483 --disable-dependency-tracking speeds up one-time build1489 --disable-dependency-tracking speeds up one-time build
1484 --enable-dependency-tracking do not reject slow dependency extractors1490 --enable-dependency-tracking do not reject slow dependency extractors
1491 --disable-64bit-solaris Build 64 bit binary on Solaris [default=on]
1485 --enable-shared[=PKGS] build shared libraries [default=yes]1492 --enable-shared[=PKGS] build shared libraries [default=yes]
1486 --enable-static[=PKGS] build static libraries [default=yes]1493 --enable-static[=PKGS] build static libraries [default=yes]
1487 --enable-fast-install[=PKGS]1494 --enable-fast-install[=PKGS]
@@ -1576,7 +1583,7 @@
1576test -n "$ac_init_help" && exit $ac_status1583test -n "$ac_init_help" && exit $ac_status
1577if $ac_init_version; then1584if $ac_init_version; then
1578 cat <<\_ACEOF1585 cat <<\_ACEOF
1579Protocol Buffers configure 2.1.01586Protocol Buffers configure 2.2.0a
1580generated by GNU Autoconf 2.611587generated by GNU Autoconf 2.61
15811588
1582Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,1589Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1590,7 +1597,7 @@
1590This file contains any messages produced by compilers while1597This file contains any messages produced by compilers while
1591running configure, to aid debugging if configure makes a mistake.1598running configure, to aid debugging if configure makes a mistake.
15921599
1593It was created by Protocol Buffers $as_me 2.1.0, which was1600It was created by Protocol Buffers $as_me 2.2.0a, which was
1594generated by GNU Autoconf 2.61. Invocation command line was1601generated by GNU Autoconf 2.61. Invocation command line was
15951602
1596 $ $0 $@1603 $ $0 $@
@@ -1944,20 +1951,22 @@
19441951
19451952
19461953
1947# Detect whether the user specified their own compilation flags. If so then
1948# we want to respect their decision, otherwise we will twiddle them later.
1949if test "$CXXFLAGS" = ""; then
1950
1951 protobuf_default_cxxflags=yes
1952
1953fi
1954
19551954
19561955
1957ac_config_headers="$ac_config_headers config.h"1956ac_config_headers="$ac_config_headers config.h"
19581957
19591958
1960am__api_version='1.10'1959
1960# autoconf's default CXXFLAGS are usually "-g -O2". These aren't necessarily
1961# the best choice for libprotobuf.
1962if test "x${ac_cv_env_CFLAGS_set}" = "x"; then
1963 CFLAGS=""
1964fi
1965
1966if test "x${ac_cv_env_CXXFLAGS_set}" = "x"; then
1967 CXXFLAGS=""
1968fi
1969
19611970
1962ac_aux_dir=1971ac_aux_dir=
1963for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do1972for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -1990,6 +1999,135 @@
1990ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.1999ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
19912000
19922001
2002# Make sure we can run config.sub.
2003$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
2004 { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
2005echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
2006 { (exit 1); exit 1; }; }
2007
2008{ echo "$as_me:$LINENO: checking build system type" >&5
2009echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
2010if test "${ac_cv_build+set}" = set; then
2011 echo $ECHO_N "(cached) $ECHO_C" >&6
2012else
2013 ac_build_alias=$build_alias
2014test "x$ac_build_alias" = x &&
2015 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
2016test "x$ac_build_alias" = x &&
2017 { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
2018echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
2019 { (exit 1); exit 1; }; }
2020ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
2021 { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
2022echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
2023 { (exit 1); exit 1; }; }
2024
2025fi
2026{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
2027echo "${ECHO_T}$ac_cv_build" >&6; }
2028case $ac_cv_build in
2029*-*-*) ;;
2030*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
2031echo "$as_me: error: invalid value of canonical build" >&2;}
2032 { (exit 1); exit 1; }; };;
2033esac
2034build=$ac_cv_build
2035ac_save_IFS=$IFS; IFS='-'
2036set x $ac_cv_build
2037shift
2038build_cpu=$1
2039build_vendor=$2
2040shift; shift
2041# Remember, the first character of IFS is used to create $*,
2042# except with old shells:
2043build_os=$*
2044IFS=$ac_save_IFS
2045case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
2046
2047
2048{ echo "$as_me:$LINENO: checking host system type" >&5
2049echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
2050if test "${ac_cv_host+set}" = set; then
2051 echo $ECHO_N "(cached) $ECHO_C" >&6
2052else
2053 if test "x$host_alias" = x; then
2054 ac_cv_host=$ac_cv_build
2055else
2056 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
2057 { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
2058echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
2059 { (exit 1); exit 1; }; }
2060fi
2061
2062fi
2063{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
2064echo "${ECHO_T}$ac_cv_host" >&6; }
2065case $ac_cv_host in
2066*-*-*) ;;
2067*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
2068echo "$as_me: error: invalid value of canonical host" >&2;}
2069 { (exit 1); exit 1; }; };;
2070esac
2071host=$ac_cv_host
2072ac_save_IFS=$IFS; IFS='-'
2073set x $ac_cv_host
2074shift
2075host_cpu=$1
2076host_vendor=$2
2077shift; shift
2078# Remember, the first character of IFS is used to create $*,
2079# except with old shells:
2080host_os=$*
2081IFS=$ac_save_IFS
2082case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
2083
2084
2085{ echo "$as_me:$LINENO: checking target system type" >&5
2086echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
2087if test "${ac_cv_target+set}" = set; then
2088 echo $ECHO_N "(cached) $ECHO_C" >&6
2089else
2090 if test "x$target_alias" = x; then
2091 ac_cv_target=$ac_cv_host
2092else
2093 ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
2094 { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5
2095echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;}
2096 { (exit 1); exit 1; }; }
2097fi
2098
2099fi
2100{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5
2101echo "${ECHO_T}$ac_cv_target" >&6; }
2102case $ac_cv_target in
2103*-*-*) ;;
2104*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5
2105echo "$as_me: error: invalid value of canonical target" >&2;}
2106 { (exit 1); exit 1; }; };;
2107esac
2108target=$ac_cv_target
2109ac_save_IFS=$IFS; IFS='-'
2110set x $ac_cv_target
2111shift
2112target_cpu=$1
2113target_vendor=$2
2114shift; shift
2115# Remember, the first character of IFS is used to create $*,
2116# except with old shells:
2117target_os=$*
2118IFS=$ac_save_IFS
2119case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
2120
2121
2122# The aliases save the names the user supplied, while $host etc.
2123# will get canonicalized.
2124test -n "$target_alias" &&
2125 test "$program_prefix$program_suffix$program_transform_name" = \
2126 NONENONEs,x,x, &&
2127 program_prefix=${target_alias}-
2128
2129am__api_version='1.10'
2130
1993# Find a good install program. We prefer a C program (faster),2131# Find a good install program. We prefer a C program (faster),
1994# so one script is as good as another. But avoid the broken or2132# so one script is as good as another. But avoid the broken or
1995# incompatible versions:2133# incompatible versions:
@@ -2294,7 +2432,7 @@
22942432
2295# Define the identity of the package.2433# Define the identity of the package.
2296 PACKAGE='protobuf'2434 PACKAGE='protobuf'
2297 VERSION='2.1.0'2435 VERSION='2.2.0a'
22982436
22992437
2300cat >>confdefs.h <<_ACEOF2438cat >>confdefs.h <<_ACEOF
@@ -4929,6 +5067,237 @@
49295067
49305068
49315069
5070 if test "$GCC" = yes; then
5071 GCC_TRUE=
5072 GCC_FALSE='#'
5073else
5074 GCC_TRUE='#'
5075 GCC_FALSE=
5076fi
5077 # let the Makefile know if we're gcc
5078
5079# test_util.cc takes forever to compile with GCC and optimization turned on.
5080{ echo "$as_me:$LINENO: checking C++ compiler flags..." >&5
5081echo $ECHO_N "checking C++ compiler flags...... $ECHO_C" >&6; }
5082if test "x${ac_cv_env_CXXFLAGS_set}" = "x"; then
5083
5084 if test "$GCC" = "yes"; then
5085
5086 PROTOBUF_OPT_FLAG="-O2"
5087 CXXFLAGS="${CXXFLAGS} -g"
5088
5089fi
5090
5091
5092 # Protocol Buffers contains several checks that are intended to be used only
5093 # for debugging and which might hurt performance. Most users are probably
5094 # end users who don't want these checks, so add -DNDEBUG by default.
5095 CXXFLAGS="$CXXFLAGS -DNDEBUG"
5096
5097 { echo "$as_me:$LINENO: result: use default: $PROTOBUF_OPT_FLAG $CXXFLAGS" >&5
5098echo "${ECHO_T}use default: $PROTOBUF_OPT_FLAG $CXXFLAGS" >&6; }
5099
5100else
5101
5102 { echo "$as_me:$LINENO: result: use user-supplied: $CXXFLAGS" >&5
5103echo "${ECHO_T}use user-supplied: $CXXFLAGS" >&6; }
5104
5105fi
5106
5107
5108
5109
5110
5111
5112 ac_ext=cpp
5113ac_cpp='$CXXCPP $CPPFLAGS'
5114ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
5115ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5116ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
5117
5118 { echo "$as_me:$LINENO: checking whether __SUNPRO_CC is declared" >&5
5119echo $ECHO_N "checking whether __SUNPRO_CC is declared... $ECHO_C" >&6; }
5120if test "${ac_cv_have_decl___SUNPRO_CC+set}" = set; then
5121 echo $ECHO_N "(cached) $ECHO_C" >&6
5122else
5123 cat >conftest.$ac_ext <<_ACEOF
5124/* confdefs.h. */
5125_ACEOF
5126cat confdefs.h >>conftest.$ac_ext
5127cat >>conftest.$ac_ext <<_ACEOF
5128/* end confdefs.h. */
5129$ac_includes_default
5130int
5131main ()
5132{
5133#ifndef __SUNPRO_CC
5134 (void) __SUNPRO_CC;
5135#endif
5136
5137 ;
5138 return 0;
5139}
5140_ACEOF
5141rm -f conftest.$ac_objext
5142if { (ac_try="$ac_compile"
5143case "(($ac_try" in
5144 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
5145 *) ac_try_echo=$ac_try;;
5146esac
5147eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
5148 (eval "$ac_compile") 2>conftest.er1
5149 ac_status=$?
5150 grep -v '^ *+' conftest.er1 >conftest.err
5151 rm -f conftest.er1
5152 cat conftest.err >&5
5153 echo "$as_me:$LINENO: \$? = $ac_status" >&5
5154 (exit $ac_status); } && {
5155 test -z "$ac_cxx_werror_flag" ||
5156 test ! -s conftest.err
5157 } && test -s conftest.$ac_objext; then
5158 ac_cv_have_decl___SUNPRO_CC=yes
5159else
5160 echo "$as_me: failed program was:" >&5
5161sed 's/^/| /' conftest.$ac_ext >&5
5162
5163 ac_cv_have_decl___SUNPRO_CC=no
5164fi
5165
5166rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
5167fi
5168{ echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_CC" >&5
5169echo "${ECHO_T}$ac_cv_have_decl___SUNPRO_CC" >&6; }
5170if test $ac_cv_have_decl___SUNPRO_CC = yes; then
5171 SUNCC="yes"
5172else
5173 SUNCC="no"
5174fi
5175
5176 ac_ext=cpp
5177ac_cpp='$CXXCPP $CPPFLAGS'
5178ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
5179ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5180ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
5181
5182
5183
5184 # Check whether --enable-64bit-solaris was given.
5185if test "${enable_64bit_solaris+set}" = set; then
5186 enableval=$enable_64bit_solaris; ac_enable_64bit="$enableval"
5187else
5188 ac_enable_64bit="yes"
5189fi
5190
5191
5192 if test "$SUNCC" = "yes" -a "x${ac_cv_env_CXXFLAGS_set}" = "x"; then
5193
5194 CXXFLAGS="-g0 -xO3 -xlibmil -xdepend -xbuiltin -mt -compat=5 -library=stlport4 -template=no%extdef ${CXXFLAGS}"
5195
5196fi
5197
5198
5199 case $host_os in
5200 *solaris*)
5201 for ac_prog in isainfo
5202do
5203 # Extract the first word of "$ac_prog", so it can be a program name with args.
5204set dummy $ac_prog; ac_word=$2
5205{ echo "$as_me:$LINENO: checking for $ac_word" >&5
5206echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
5207if test "${ac_cv_prog_ISAINFO+set}" = set; then
5208 echo $ECHO_N "(cached) $ECHO_C" >&6
5209else
5210 if test -n "$ISAINFO"; then
5211 ac_cv_prog_ISAINFO="$ISAINFO" # Let the user override the test.
5212else
5213as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5214for as_dir in $PATH
5215do
5216 IFS=$as_save_IFS
5217 test -z "$as_dir" && as_dir=.
5218 for ac_exec_ext in '' $ac_executable_extensions; do
5219 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5220 ac_cv_prog_ISAINFO="$ac_prog"
5221 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5222 break 2
5223 fi
5224done
5225done
5226IFS=$as_save_IFS
5227
5228fi
5229fi
5230ISAINFO=$ac_cv_prog_ISAINFO
5231if test -n "$ISAINFO"; then
5232 { echo "$as_me:$LINENO: result: $ISAINFO" >&5
5233echo "${ECHO_T}$ISAINFO" >&6; }
5234else
5235 { echo "$as_me:$LINENO: result: no" >&5
5236echo "${ECHO_T}no" >&6; }
5237fi
5238
5239
5240 test -n "$ISAINFO" && break
5241done
5242test -n "$ISAINFO" || ISAINFO="no"
5243
5244 if test "x$ISAINFO" != "xno"; then
5245 isainfo_b=`${ISAINFO} -b`
5246else
5247 isainfo_b="x"
5248fi
5249
5250
5251 if test "$isainfo_b" != "x"; then
5252
5253
5254 isainfo_k=`${ISAINFO} -k`
5255
5256 if test "x$ac_enable_64bit" = "xyes"; then
5257
5258
5259 if test "x${ac_cv_env_LDFLAGS_set}" = "x"; then
5260
5261 LDFLAGS="-L/usr/local/lib/${isainfo_k} ${LDFLAGS}"
5262
5263fi
5264
5265
5266 if test "x$libdir" = "x\${exec_prefix}/lib"; then
5267
5268 libdir="${libdir}/${isainfo_k}"
5269
5270fi
5271
5272
5273 if test "x${ac_cv_env_CXXFLAGS_set}" = "x"; then
5274
5275 CXXFLAGS="${CXXFLAGS} -m64"
5276 ac_cv_env_CXXFLAGS_set=set
5277 ac_cv_env_CXXFLAGS_value='-m64'
5278
5279fi
5280
5281
5282 if test "$target_cpu" = "sparc" -a "x$SUNCC" = "xyes" ; then
5283
5284 CXXFLAGS="-xmemalign=8s ${CXXFLAGS}"
5285
5286fi
5287
5288
5289fi
5290
5291
5292fi
5293
5294 ;;
5295 esac
5296
5297
5298
5299# Have to do libtool after SUNCC, other wise it "helpfully" adds Crun Cstd
5300# to the link
4932case `pwd` in5301case `pwd` in
4933 *\ * | *\ *)5302 *\ * | *\ *)
4934 { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&55303 { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
@@ -4954,89 +5323,6 @@
49545323
4955ltmain="$ac_aux_dir/ltmain.sh"5324ltmain="$ac_aux_dir/ltmain.sh"
49565325
4957# Make sure we can run config.sub.
4958$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
4959 { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
4960echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
4961 { (exit 1); exit 1; }; }
4962
4963{ echo "$as_me:$LINENO: checking build system type" >&5
4964echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
4965if test "${ac_cv_build+set}" = set; then
4966 echo $ECHO_N "(cached) $ECHO_C" >&6
4967else
4968 ac_build_alias=$build_alias
4969test "x$ac_build_alias" = x &&
4970 ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
4971test "x$ac_build_alias" = x &&
4972 { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
4973echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
4974 { (exit 1); exit 1; }; }
4975ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
4976 { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
4977echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
4978 { (exit 1); exit 1; }; }
4979
4980fi
4981{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
4982echo "${ECHO_T}$ac_cv_build" >&6; }
4983case $ac_cv_build in
4984*-*-*) ;;
4985*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
4986echo "$as_me: error: invalid value of canonical build" >&2;}
4987 { (exit 1); exit 1; }; };;
4988esac
4989build=$ac_cv_build
4990ac_save_IFS=$IFS; IFS='-'
4991set x $ac_cv_build
4992shift
4993build_cpu=$1
4994build_vendor=$2
4995shift; shift
4996# Remember, the first character of IFS is used to create $*,
4997# except with old shells:
4998build_os=$*
4999IFS=$ac_save_IFS
5000case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
5001
5002
5003{ echo "$as_me:$LINENO: checking host system type" >&5
5004echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
5005if test "${ac_cv_host+set}" = set; then
5006 echo $ECHO_N "(cached) $ECHO_C" >&6
5007else
5008 if test "x$host_alias" = x; then
5009 ac_cv_host=$ac_cv_build
5010else
5011 ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
5012 { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
5013echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
5014 { (exit 1); exit 1; }; }
5015fi
5016
5017fi
5018{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
5019echo "${ECHO_T}$ac_cv_host" >&6; }
5020case $ac_cv_host in
5021*-*-*) ;;
5022*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
5023echo "$as_me: error: invalid value of canonical host" >&2;}
5024 { (exit 1); exit 1; }; };;
5025esac
5026host=$ac_cv_host
5027ac_save_IFS=$IFS; IFS='-'
5028set x $ac_cv_host
5029shift
5030host_cpu=$1
5031host_vendor=$2
5032shift; shift
5033# Remember, the first character of IFS is used to create $*,
5034# except with old shells:
5035host_os=$*
5036IFS=$ac_save_IFS
5037case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
5038
5039
5040{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&55326{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
5041echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }5327echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
5042if test "${ac_cv_path_SED+set}" = set; then5328if test "${ac_cv_path_SED+set}" = set; then
@@ -5528,13 +5814,13 @@
5528else5814else
5529 lt_cv_nm_interface="BSD nm"5815 lt_cv_nm_interface="BSD nm"
5530 echo "int some_variable = 0;" > conftest.$ac_ext5816 echo "int some_variable = 0;" > conftest.$ac_ext
5531 (eval echo "\"\$as_me:5531: $ac_compile\"" >&5)5817 (eval echo "\"\$as_me:5817: $ac_compile\"" >&5)
5532 (eval "$ac_compile" 2>conftest.err)5818 (eval "$ac_compile" 2>conftest.err)
5533 cat conftest.err >&55819 cat conftest.err >&5
5534 (eval echo "\"\$as_me:5534: $NM \\\"conftest.$ac_objext\\\"\"" >&5)5820 (eval echo "\"\$as_me:5820: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
5535 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)5821 (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
5536 cat conftest.err >&55822 cat conftest.err >&5
5537 (eval echo "\"\$as_me:5537: output\"" >&5)5823 (eval echo "\"\$as_me:5823: output\"" >&5)
5538 cat conftest.out >&55824 cat conftest.out >&5
5539 if $GREP 'External.*some_variable' conftest.out > /dev/null; then5825 if $GREP 'External.*some_variable' conftest.out > /dev/null; then
5540 lt_cv_nm_interface="MS dumpbin"5826 lt_cv_nm_interface="MS dumpbin"
@@ -6645,7 +6931,7 @@
6645 ;;6931 ;;
6646*-*-irix6*)6932*-*-irix6*)
6647 # Find out which ABI we are using.6933 # Find out which ABI we are using.
6648 echo '#line 6648 "configure"' > conftest.$ac_ext6934 echo '#line 6934 "configure"' > conftest.$ac_ext
6649 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&56935 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
6650 (eval $ac_compile) 2>&56936 (eval $ac_compile) 2>&5
6651 ac_status=$?6937 ac_status=$?
@@ -8726,11 +9012,11 @@
8726 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \9012 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
8727 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \9013 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
8728 -e 's:$: $lt_compiler_flag:'`9014 -e 's:$: $lt_compiler_flag:'`
8729 (eval echo "\"\$as_me:8729: $lt_compile\"" >&5)9015 (eval echo "\"\$as_me:9015: $lt_compile\"" >&5)
8730 (eval "$lt_compile" 2>conftest.err)9016 (eval "$lt_compile" 2>conftest.err)
8731 ac_status=$?9017 ac_status=$?
8732 cat conftest.err >&59018 cat conftest.err >&5
8733 echo "$as_me:8733: \$? = $ac_status" >&59019 echo "$as_me:9019: \$? = $ac_status" >&5
8734 if (exit $ac_status) && test -s "$ac_outfile"; then9020 if (exit $ac_status) && test -s "$ac_outfile"; then
8735 # The compiler can only warn and ignore the option if not recognized9021 # The compiler can only warn and ignore the option if not recognized
8736 # So say no if there are warnings other than the usual output.9022 # So say no if there are warnings other than the usual output.
@@ -9050,11 +9336,11 @@
9050 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \9336 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
9051 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \9337 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
9052 -e 's:$: $lt_compiler_flag:'`9338 -e 's:$: $lt_compiler_flag:'`
9053 (eval echo "\"\$as_me:9053: $lt_compile\"" >&5)9339 (eval echo "\"\$as_me:9339: $lt_compile\"" >&5)
9054 (eval "$lt_compile" 2>conftest.err)9340 (eval "$lt_compile" 2>conftest.err)
9055 ac_status=$?9341 ac_status=$?
9056 cat conftest.err >&59342 cat conftest.err >&5
9057 echo "$as_me:9057: \$? = $ac_status" >&59343 echo "$as_me:9343: \$? = $ac_status" >&5
9058 if (exit $ac_status) && test -s "$ac_outfile"; then9344 if (exit $ac_status) && test -s "$ac_outfile"; then
9059 # The compiler can only warn and ignore the option if not recognized9345 # The compiler can only warn and ignore the option if not recognized
9060 # So say no if there are warnings other than the usual output.9346 # So say no if there are warnings other than the usual output.
@@ -9155,11 +9441,11 @@
9155 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \9441 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
9156 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \9442 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
9157 -e 's:$: $lt_compiler_flag:'`9443 -e 's:$: $lt_compiler_flag:'`
9158 (eval echo "\"\$as_me:9158: $lt_compile\"" >&5)9444 (eval echo "\"\$as_me:9444: $lt_compile\"" >&5)
9159 (eval "$lt_compile" 2>out/conftest.err)9445 (eval "$lt_compile" 2>out/conftest.err)
9160 ac_status=$?9446 ac_status=$?
9161 cat out/conftest.err >&59447 cat out/conftest.err >&5
9162 echo "$as_me:9162: \$? = $ac_status" >&59448 echo "$as_me:9448: \$? = $ac_status" >&5
9163 if (exit $ac_status) && test -s out/conftest2.$ac_objext9449 if (exit $ac_status) && test -s out/conftest2.$ac_objext
9164 then9450 then
9165 # The compiler can only warn and ignore the option if not recognized9451 # The compiler can only warn and ignore the option if not recognized
@@ -9210,11 +9496,11 @@
9210 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \9496 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
9211 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \9497 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
9212 -e 's:$: $lt_compiler_flag:'`9498 -e 's:$: $lt_compiler_flag:'`
9213 (eval echo "\"\$as_me:9213: $lt_compile\"" >&5)9499 (eval echo "\"\$as_me:9499: $lt_compile\"" >&5)
9214 (eval "$lt_compile" 2>out/conftest.err)9500 (eval "$lt_compile" 2>out/conftest.err)
9215 ac_status=$?9501 ac_status=$?
9216 cat out/conftest.err >&59502 cat out/conftest.err >&5
9217 echo "$as_me:9217: \$? = $ac_status" >&59503 echo "$as_me:9503: \$? = $ac_status" >&5
9218 if (exit $ac_status) && test -s out/conftest2.$ac_objext9504 if (exit $ac_status) && test -s out/conftest2.$ac_objext
9219 then9505 then
9220 # The compiler can only warn and ignore the option if not recognized9506 # The compiler can only warn and ignore the option if not recognized
@@ -11958,7 +12244,7 @@
11958 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=212244 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
11959 lt_status=$lt_dlunknown12245 lt_status=$lt_dlunknown
11960 cat > conftest.$ac_ext <<_LT_EOF12246 cat > conftest.$ac_ext <<_LT_EOF
11961#line 11961 "configure"12247#line 12247 "configure"
11962#include "confdefs.h"12248#include "confdefs.h"
1196312249
11964#if HAVE_DLFCN_H12250#if HAVE_DLFCN_H
@@ -12058,7 +12344,7 @@
12058 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=212344 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
12059 lt_status=$lt_dlunknown12345 lt_status=$lt_dlunknown
12060 cat > conftest.$ac_ext <<_LT_EOF12346 cat > conftest.$ac_ext <<_LT_EOF
12061#line 12061 "configure"12347#line 12347 "configure"
12062#include "confdefs.h"12348#include "confdefs.h"
1206312349
12064#if HAVE_DLFCN_H12350#if HAVE_DLFCN_H
@@ -14061,11 +14347,11 @@
14061 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \14347 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
14062 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \14348 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
14063 -e 's:$: $lt_compiler_flag:'`14349 -e 's:$: $lt_compiler_flag:'`
14064 (eval echo "\"\$as_me:14064: $lt_compile\"" >&5)14350 (eval echo "\"\$as_me:14350: $lt_compile\"" >&5)
14065 (eval "$lt_compile" 2>conftest.err)14351 (eval "$lt_compile" 2>conftest.err)
14066 ac_status=$?14352 ac_status=$?
14067 cat conftest.err >&514353 cat conftest.err >&5
14068 echo "$as_me:14068: \$? = $ac_status" >&514354 echo "$as_me:14354: \$? = $ac_status" >&5
14069 if (exit $ac_status) && test -s "$ac_outfile"; then14355 if (exit $ac_status) && test -s "$ac_outfile"; then
14070 # The compiler can only warn and ignore the option if not recognized14356 # The compiler can only warn and ignore the option if not recognized
14071 # So say no if there are warnings other than the usual output.14357 # So say no if there are warnings other than the usual output.
@@ -14160,11 +14446,11 @@
14160 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \14446 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
14161 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \14447 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
14162 -e 's:$: $lt_compiler_flag:'`14448 -e 's:$: $lt_compiler_flag:'`
14163 (eval echo "\"\$as_me:14163: $lt_compile\"" >&5)14449 (eval echo "\"\$as_me:14449: $lt_compile\"" >&5)
14164 (eval "$lt_compile" 2>out/conftest.err)14450 (eval "$lt_compile" 2>out/conftest.err)
14165 ac_status=$?14451 ac_status=$?
14166 cat out/conftest.err >&514452 cat out/conftest.err >&5
14167 echo "$as_me:14167: \$? = $ac_status" >&514453 echo "$as_me:14453: \$? = $ac_status" >&5
14168 if (exit $ac_status) && test -s out/conftest2.$ac_objext14454 if (exit $ac_status) && test -s out/conftest2.$ac_objext
14169 then14455 then
14170 # The compiler can only warn and ignore the option if not recognized14456 # The compiler can only warn and ignore the option if not recognized
@@ -14212,11 +14498,11 @@
14212 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \14498 -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
14213 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \14499 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
14214 -e 's:$: $lt_compiler_flag:'`14500 -e 's:$: $lt_compiler_flag:'`
14215 (eval echo "\"\$as_me:14215: $lt_compile\"" >&5)14501 (eval echo "\"\$as_me:14501: $lt_compile\"" >&5)
14216 (eval "$lt_compile" 2>out/conftest.err)14502 (eval "$lt_compile" 2>out/conftest.err)
14217 ac_status=$?14503 ac_status=$?
14218 cat out/conftest.err >&514504 cat out/conftest.err >&5
14219 echo "$as_me:14219: \$? = $ac_status" >&514505 echo "$as_me:14505: \$? = $ac_status" >&5
14220 if (exit $ac_status) && test -s out/conftest2.$ac_objext14506 if (exit $ac_status) && test -s out/conftest2.$ac_objext
14221 then14507 then
14222 # The compiler can only warn and ignore the option if not recognized14508 # The compiler can only warn and ignore the option if not recognized
@@ -15192,143 +15478,6 @@
15192# Only expand once:15478# Only expand once:
1519315479
1519415480
15195 if test "$GCC" = yes; then
15196 GCC_TRUE=
15197 GCC_FALSE='#'
15198else
15199 GCC_TRUE='#'
15200 GCC_FALSE=
15201fi
15202 # let the Makefile know if we're gcc
15203
15204# autoconf's default CXXFLAGS are usually "-g -O2". These aren't necessarily
15205# the best choice for libprotobuf.
15206{ echo "$as_me:$LINENO: checking C++ compiler flags..." >&5
15207echo $ECHO_N "checking C++ compiler flags...... $ECHO_C" >&6; }
15208if test "$protobuf_default_cxxflags" = "yes"; then
15209
15210
15211 # test_util.cc takes forever to compile with GCC and optimization turned on.
15212 # But we cannot override anything that is part of CXXFLAGS since it is the
15213 # last thing added to the command line. The automake docs insist that you
15214 # should never want to override CXXFLAGS because they represent the intent of
15215 # the user, and the user knows best. But if the user actually did not set
15216 # any CXXFLAGS, then AC_PROG_CXX sets them to a rather arbitrary default.
15217 # That's not user intent at all, but automake still treats it like it is.
15218 # Grr. Anyway, getting back to the point, this hack here strips out the -O
15219 # flag from autoconf's defaults and puts it into another variable so that
15220 # we can override it. BTW, m4 escaping sucks.
15221 PROTOBUF_OPT_FLAG=`echo "$CXXFLAGS" | grep -o '\-O[0-9]\?'`
15222 CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/ \?-O[0-9]\?//g'`
15223
15224 # Protocol Buffers contains several checks that are intended to be used only
15225 # for debugging and which might hurt performance. Most users are probably
15226 # end users who don't want these checks, so add -DNDEBUG by default.
15227 CXXFLAGS="$CXXFLAGS -DNDEBUG"
15228
15229 { echo "$as_me:$LINENO: result: use default: $PROTOBUF_OPT_FLAG $CXXFLAGS" >&5
15230echo "${ECHO_T}use default: $PROTOBUF_OPT_FLAG $CXXFLAGS" >&6; }
15231
15232else
15233
15234 PROTOBUF_OPT_FLAG=
15235 { echo "$as_me:$LINENO: result: use user-supplied: $CXXFLAGS" >&5
15236echo "${ECHO_T}use user-supplied: $CXXFLAGS" >&6; }
15237
15238fi
15239
15240
15241
15242
15243
15244
15245 { echo "$as_me:$LINENO: checking whether __SUNPRO_C is declared" >&5
15246echo $ECHO_N "checking whether __SUNPRO_C is declared... $ECHO_C" >&6; }
15247if test "${ac_cv_have_decl___SUNPRO_C+set}" = set; then
15248 echo $ECHO_N "(cached) $ECHO_C" >&6
15249else
15250 cat >conftest.$ac_ext <<_ACEOF
15251/* confdefs.h. */
15252_ACEOF
15253cat confdefs.h >>conftest.$ac_ext
15254cat >>conftest.$ac_ext <<_ACEOF
15255/* end confdefs.h. */
15256$ac_includes_default
15257int
15258main ()
15259{
15260#ifndef __SUNPRO_C
15261 (void) __SUNPRO_C;
15262#endif
15263
15264 ;
15265 return 0;
15266}
15267_ACEOF
15268rm -f conftest.$ac_objext
15269if { (ac_try="$ac_compile"
15270case "(($ac_try" in
15271 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15272 *) ac_try_echo=$ac_try;;
15273esac
15274eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15275 (eval "$ac_compile") 2>conftest.er1
15276 ac_status=$?
15277 grep -v '^ *+' conftest.er1 >conftest.err
15278 rm -f conftest.er1
15279 cat conftest.err >&5
15280 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15281 (exit $ac_status); } && {
15282 test -z "$ac_cxx_werror_flag" ||
15283 test ! -s conftest.err
15284 } && test -s conftest.$ac_objext; then
15285 ac_cv_have_decl___SUNPRO_C=yes
15286else
15287 echo "$as_me: failed program was:" >&5
15288sed 's/^/| /' conftest.$ac_ext >&5
15289
15290 ac_cv_have_decl___SUNPRO_C=no
15291fi
15292
15293rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
15294fi
15295{ echo "$as_me:$LINENO: result: $ac_cv_have_decl___SUNPRO_C" >&5
15296echo "${ECHO_T}$ac_cv_have_decl___SUNPRO_C" >&6; }
15297if test $ac_cv_have_decl___SUNPRO_C = yes; then
15298 SUNCC="yes"
15299else
15300 SUNCC="no"
15301fi
15302
15303
15304 if test "$SUNCC" = "yes"; then
15305
15306 isainfo_k=`isainfo -k`
15307 if test "$target_cpu" = "sparc"; then
15308
15309 MEMALIGN_FLAGS="-xmemalign=8s"
15310 IS_64="-m64"
15311 LDFLAGS="${LDFLAGS} -L/usr/lib/${isainfo_k} -L/usr/local/lib/${isainfo_k}"
15312
15313else
15314
15315 if test "$isainfo_k" = "amd64"; then
15316
15317 IS_64="-m64"
15318 LDFLAGS="${LDFLAGS} -L/usr/lib/${isainfo_k} -L/usr/local/lib/${isainfo_k}"
15319
15320fi
15321
15322
15323fi
15324
15325
15326 CFLAGS="-g -xO4 -xlibmil -xdepend -Xa -mt -xstrconst ${IS_64} ${MEMALIGN_FLAGS} $CFLAGS"
15327 CXXFLAGS="-g -xO4 -xlibmil -mt ${IS_64} ${MEMALIGN_FLAGS} -xlang=c99 -compat=5 -library=stlport4 -template=no%extdef $CXXFLAGS"
15328
15329fi
15330
15331
1533215481
15333# Checks for header files.15482# Checks for header files.
15334{ echo "$as_me:$LINENO: checking for ANSI C header files" >&515483{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
@@ -17039,10 +17188,13 @@
17039 fi17188 fi
1704017189
1704117190
17191# HACK: Make gtest's configure script pick up our copy of CXXFLAGS, since the
17192# flags added by ACX_CHECK_SUNCC must be used when compiling gtest too.
17193export CXXFLAGS
17042subdirs="$subdirs gtest"17194subdirs="$subdirs gtest"
1704317195
1704417196
17045ac_config_files="$ac_config_files Makefile src/Makefile"17197ac_config_files="$ac_config_files Makefile src/Makefile protobuf.pc protobuf-lite.pc"
1704617198
17047cat >confcache <<\_ACEOF17199cat >confcache <<\_ACEOF
17048# This file is a shell script that caches the results of configure17200# This file is a shell script that caches the results of configure
@@ -17161,13 +17313,6 @@
17161Usually this means the macro was only invoked conditionally." >&2;}17313Usually this means the macro was only invoked conditionally." >&2;}
17162 { (exit 1); exit 1; }; }17314 { (exit 1); exit 1; }; }
17163fi17315fi
17164if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
17165 { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
17166Usually this means the macro was only invoked conditionally." >&5
17167echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
17168Usually this means the macro was only invoked conditionally." >&2;}
17169 { (exit 1); exit 1; }; }
17170fi
17171if test -z "${GCC_TRUE}" && test -z "${GCC_FALSE}"; then17316if test -z "${GCC_TRUE}" && test -z "${GCC_FALSE}"; then
17172 { { echo "$as_me:$LINENO: error: conditional \"GCC\" was never defined.17317 { { echo "$as_me:$LINENO: error: conditional \"GCC\" was never defined.
17173Usually this means the macro was only invoked conditionally." >&517318Usually this means the macro was only invoked conditionally." >&5
@@ -17175,6 +17320,13 @@
17175Usually this means the macro was only invoked conditionally." >&2;}17320Usually this means the macro was only invoked conditionally." >&2;}
17176 { (exit 1); exit 1; }; }17321 { (exit 1); exit 1; }; }
17177fi17322fi
17323if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
17324 { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
17325Usually this means the macro was only invoked conditionally." >&5
17326echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
17327Usually this means the macro was only invoked conditionally." >&2;}
17328 { (exit 1); exit 1; }; }
17329fi
17178if test -z "${HAVE_ZLIB_TRUE}" && test -z "${HAVE_ZLIB_FALSE}"; then17330if test -z "${HAVE_ZLIB_TRUE}" && test -z "${HAVE_ZLIB_FALSE}"; then
17179 { { echo "$as_me:$LINENO: error: conditional \"HAVE_ZLIB\" was never defined.17331 { { echo "$as_me:$LINENO: error: conditional \"HAVE_ZLIB\" was never defined.
17180Usually this means the macro was only invoked conditionally." >&517332Usually this means the macro was only invoked conditionally." >&5
@@ -17489,7 +17641,7 @@
17489# report actual input values of CONFIG_FILES etc. instead of their17641# report actual input values of CONFIG_FILES etc. instead of their
17490# values after options handling.17642# values after options handling.
17491ac_log="17643ac_log="
17492This file was extended by Protocol Buffers $as_me 2.1.0, which was17644This file was extended by Protocol Buffers $as_me 2.2.0a, which was
17493generated by GNU Autoconf 2.61. Invocation command line was17645generated by GNU Autoconf 2.61. Invocation command line was
1749417646
17495 CONFIG_FILES = $CONFIG_FILES17647 CONFIG_FILES = $CONFIG_FILES
@@ -17542,7 +17694,7 @@
17542_ACEOF17694_ACEOF
17543cat >>$CONFIG_STATUS <<_ACEOF17695cat >>$CONFIG_STATUS <<_ACEOF
17544ac_cs_version="\\17696ac_cs_version="\\
17545Protocol Buffers config.status 2.1.017697Protocol Buffers config.status 2.2.0a
17546configured by $0, generated by GNU Autoconf 2.61,17698configured by $0, generated by GNU Autoconf 2.61,
17547 with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"17699 with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
1754817700
@@ -18010,6 +18162,8 @@
18010 "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;18162 "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
18011 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;18163 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
18012 "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;18164 "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
18165 "protobuf.pc") CONFIG_FILES="$CONFIG_FILES protobuf.pc" ;;
18166 "protobuf-lite.pc") CONFIG_FILES="$CONFIG_FILES protobuf-lite.pc" ;;
1801318167
18014 *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&518168 *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
18015echo "$as_me: error: invalid argument: $ac_config_target" >&2;}18169echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -18109,6 +18263,18 @@
18109build_alias!$build_alias$ac_delim18263build_alias!$build_alias$ac_delim
18110host_alias!$host_alias$ac_delim18264host_alias!$host_alias$ac_delim
18111target_alias!$target_alias$ac_delim18265target_alias!$target_alias$ac_delim
18266build!$build$ac_delim
18267build_cpu!$build_cpu$ac_delim
18268build_vendor!$build_vendor$ac_delim
18269build_os!$build_os$ac_delim
18270host!$host$ac_delim
18271host_cpu!$host_cpu$ac_delim
18272host_vendor!$host_vendor$ac_delim
18273host_os!$host_os$ac_delim
18274target!$target$ac_delim
18275target_cpu!$target_cpu$ac_delim
18276target_vendor!$target_vendor$ac_delim
18277target_os!$target_os$ac_delim
18112INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim18278INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
18113INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim18279INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
18114INSTALL_DATA!$INSTALL_DATA$ac_delim18280INSTALL_DATA!$INSTALL_DATA$ac_delim
@@ -18156,60 +18322,56 @@
18156CXXCPP!$CXXCPP$ac_delim18322CXXCPP!$CXXCPP$ac_delim
18157GREP!$GREP$ac_delim18323GREP!$GREP$ac_delim
18158EGREP!$EGREP$ac_delim18324EGREP!$EGREP$ac_delim
18325GCC_TRUE!$GCC_TRUE$ac_delim
18326_ACEOF
18327
18328 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
18329 break
18330 elif $ac_last_try; then
18331 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
18332echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
18333 { (exit 1); exit 1; }; }
18334 else
18335 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
18336 fi
18337done
18338
18339ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
18340if test -n "$ac_eof"; then
18341 ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
18342 ac_eof=`expr $ac_eof + 1`
18343fi
18344
18345cat >>$CONFIG_STATUS <<_ACEOF
18346cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
18347/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
18348_ACEOF
18349sed '
18350s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
18351s/^/s,@/; s/!/@,|#_!!_#|/
18352:n
18353t n
18354s/'"$ac_delim"'$/,g/; t
18355s/$/\\/; p
18356N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
18357' >>$CONFIG_STATUS <conf$$subs.sed
18358rm -f conf$$subs.sed
18359cat >>$CONFIG_STATUS <<_ACEOF
18360CEOF$ac_eof
18361_ACEOF
18362
18363
18364ac_delim='%!_!# '
18365for ac_last_try in false false false false false :; do
18366 cat >conf$$subs.sed <<_ACEOF
18367GCC_FALSE!$GCC_FALSE$ac_delim
18368PROTOBUF_OPT_FLAG!$PROTOBUF_OPT_FLAG$ac_delim
18369ISAINFO!$ISAINFO$ac_delim
18159LIBTOOL!$LIBTOOL$ac_delim18370LIBTOOL!$LIBTOOL$ac_delim
18160build!$build$ac_delim
18161build_cpu!$build_cpu$ac_delim
18162build_vendor!$build_vendor$ac_delim
18163build_os!$build_os$ac_delim
18164host!$host$ac_delim
18165host_cpu!$host_cpu$ac_delim
18166host_vendor!$host_vendor$ac_delim
18167host_os!$host_os$ac_delim
18168SED!$SED$ac_delim18371SED!$SED$ac_delim
18169FGREP!$FGREP$ac_delim18372FGREP!$FGREP$ac_delim
18170LD!$LD$ac_delim18373LD!$LD$ac_delim
18171DUMPBIN!$DUMPBIN$ac_delim18374DUMPBIN!$DUMPBIN$ac_delim
18172_ACEOF
18173
18174 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
18175 break
18176 elif $ac_last_try; then
18177 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
18178echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
18179 { (exit 1); exit 1; }; }
18180 else
18181 ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
18182 fi
18183done
18184
18185ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
18186if test -n "$ac_eof"; then
18187 ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
18188 ac_eof=`expr $ac_eof + 1`
18189fi
18190
18191cat >>$CONFIG_STATUS <<_ACEOF
18192cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
18193/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
18194_ACEOF
18195sed '
18196s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
18197s/^/s,@/; s/!/@,|#_!!_#|/
18198:n
18199t n
18200s/'"$ac_delim"'$/,g/; t
18201s/$/\\/; p
18202N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
18203' >>$CONFIG_STATUS <conf$$subs.sed
18204rm -f conf$$subs.sed
18205cat >>$CONFIG_STATUS <<_ACEOF
18206CEOF$ac_eof
18207_ACEOF
18208
18209
18210ac_delim='%!_!# '
18211for ac_last_try in false false false false false :; do
18212 cat >conf$$subs.sed <<_ACEOF
18213ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim18375ac_ct_DUMPBIN!$ac_ct_DUMPBIN$ac_delim
18214NM!$NM$ac_delim18376NM!$NM$ac_delim
18215LN_S!$LN_S$ac_delim18377LN_S!$LN_S$ac_delim
@@ -18221,9 +18383,6 @@
18221LIPO!$LIPO$ac_delim18383LIPO!$LIPO$ac_delim
18222OTOOL!$OTOOL$ac_delim18384OTOOL!$OTOOL$ac_delim
18223OTOOL64!$OTOOL64$ac_delim18385OTOOL64!$OTOOL64$ac_delim
18224GCC_TRUE!$GCC_TRUE$ac_delim
18225GCC_FALSE!$GCC_FALSE$ac_delim
18226PROTOBUF_OPT_FLAG!$PROTOBUF_OPT_FLAG$ac_delim
18227LIBOBJS!$LIBOBJS$ac_delim18386LIBOBJS!$LIBOBJS$ac_delim
18228POW_LIB!$POW_LIB$ac_delim18387POW_LIB!$POW_LIB$ac_delim
18229HAVE_ZLIB_TRUE!$HAVE_ZLIB_TRUE$ac_delim18388HAVE_ZLIB_TRUE!$HAVE_ZLIB_TRUE$ac_delim
@@ -18239,7 +18398,7 @@
18239LTLIBOBJS!$LTLIBOBJS$ac_delim18398LTLIBOBJS!$LTLIBOBJS$ac_delim
18240_ACEOF18399_ACEOF
1824118400
18242 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 27; then18401 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 32; then
18243 break18402 break
18244 elif $ac_last_try; then18403 elif $ac_last_try; then
18245 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&518404 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
1824618405
=== modified file 'configure.ac'
--- configure.ac 2009-06-24 00:19:03 +0000
+++ configure.ac 2010-01-18 04:34:17 +0000
@@ -12,17 +12,22 @@
12# In the SVN trunk, the version should always be the next anticipated release12# In the SVN trunk, the version should always be the next anticipated release
13# version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed13# version with the "-pre" suffix. (We used to use "-SNAPSHOT" but this pushed
14# the size of one file name in the dist tarfile over the 99-char limit.)14# the size of one file name in the dist tarfile over the 99-char limit.)
15AC_INIT([Protocol Buffers],[2.1.0],[protobuf@googlegroups.com],[protobuf])15AC_INIT([Protocol Buffers],[2.2.0a],[protobuf@googlegroups.com],[protobuf])
1616
17# Detect whether the user specified their own compilation flags. If so then
18# we want to respect their decision, otherwise we will twiddle them later.
19AS_IF([test "$CXXFLAGS" = ""],[
20 protobuf_default_cxxflags=yes
21])
2217
23AC_CONFIG_SRCDIR(src/google/protobuf/message.cc)18AC_CONFIG_SRCDIR(src/google/protobuf/message.cc)
24AC_CONFIG_HEADERS([config.h])19AC_CONFIG_HEADERS([config.h])
25AC_CONFIG_MACRO_DIR([m4])20AC_CONFIG_MACRO_DIR([m4])
21
22# autoconf's default CXXFLAGS are usually "-g -O2". These aren't necessarily
23# the best choice for libprotobuf.
24AS_IF([test "x${ac_cv_env_CFLAGS_set}" = "x"],
25 [CFLAGS=""])
26AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"],
27 [CXXFLAGS=""])
28
29AC_CANONICAL_TARGET
30
26AM_INIT_AUTOMAKE31AM_INIT_AUTOMAKE
2732
28AC_ARG_WITH([zlib],33AC_ARG_WITH([zlib],
@@ -40,26 +45,15 @@
40AC_PROG_CXX45AC_PROG_CXX
41AC_LANG([C++])46AC_LANG([C++])
42ACX_USE_SYSTEM_EXTENSIONS47ACX_USE_SYSTEM_EXTENSIONS
43AC_PROG_LIBTOOL
44AM_CONDITIONAL(GCC, test "$GCC" = yes) # let the Makefile know if we're gcc48AM_CONDITIONAL(GCC, test "$GCC" = yes) # let the Makefile know if we're gcc
4549
46# autoconf's default CXXFLAGS are usually "-g -O2". These aren't necessarily50# test_util.cc takes forever to compile with GCC and optimization turned on.
47# the best choice for libprotobuf.
48AC_MSG_CHECKING([C++ compiler flags...])51AC_MSG_CHECKING([C++ compiler flags...])
49AS_IF([test "$protobuf_default_cxxflags" = "yes"],[52AS_IF([test "x${ac_cv_env_CXXFLAGS_set}" = "x"],[
5053 AS_IF([test "$GCC" = "yes"],[
51 # test_util.cc takes forever to compile with GCC and optimization turned on.54 PROTOBUF_OPT_FLAG="-O2"
52 # But we cannot override anything that is part of CXXFLAGS since it is the55 CXXFLAGS="${CXXFLAGS} -g"
53 # last thing added to the command line. The automake docs insist that you56 ])
54 # should never want to override CXXFLAGS because they represent the intent of
55 # the user, and the user knows best. But if the user actually did not set
56 # any CXXFLAGS, then AC_PROG_CXX sets them to a rather arbitrary default.
57 # That's not user intent at all, but automake still treats it like it is.
58 # Grr. Anyway, getting back to the point, this hack here strips out the -O
59 # flag from autoconf's defaults and puts it into another variable so that
60 # we can override it. BTW, m4 escaping sucks.
61 PROTOBUF_OPT_FLAG=`echo "$CXXFLAGS" | grep -o '\-O@<:@0-9@:>@\?'`
62 CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/ \?-O@<:@0-9@:>@\?//g'`
6357
64 # Protocol Buffers contains several checks that are intended to be used only58 # Protocol Buffers contains several checks that are intended to be used only
65 # for debugging and which might hurt performance. Most users are probably59 # for debugging and which might hurt performance. Most users are probably
@@ -68,7 +62,6 @@
6862
69 AC_MSG_RESULT([use default: $PROTOBUF_OPT_FLAG $CXXFLAGS])63 AC_MSG_RESULT([use default: $PROTOBUF_OPT_FLAG $CXXFLAGS])
70],[64],[
71 PROTOBUF_OPT_FLAG=
72 AC_MSG_RESULT([use user-supplied: $CXXFLAGS])65 AC_MSG_RESULT([use user-supplied: $CXXFLAGS])
73])66])
7467
@@ -76,6 +69,10 @@
7669
77ACX_CHECK_SUNCC70ACX_CHECK_SUNCC
7871
72# Have to do libtool after SUNCC, other wise it "helpfully" adds Crun Cstd
73# to the link
74AC_PROG_LIBTOOL
75
79# Checks for header files.76# Checks for header files.
80AC_HEADER_STDC77AC_HEADER_STDC
81AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h stdlib.h unistd.h])78AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h stdlib.h unistd.h])
@@ -117,7 +114,10 @@
117ACX_PTHREAD114ACX_PTHREAD
118AC_CXX_STL_HASH115AC_CXX_STL_HASH
119116
117# HACK: Make gtest's configure script pick up our copy of CXXFLAGS, since the
118# flags added by ACX_CHECK_SUNCC must be used when compiling gtest too.
119export CXXFLAGS
120AC_CONFIG_SUBDIRS([gtest])120AC_CONFIG_SUBDIRS([gtest])
121121
122AC_CONFIG_FILES([Makefile src/Makefile ])122AC_CONFIG_FILES([Makefile src/Makefile protobuf.pc protobuf-lite.pc])
123AC_OUTPUT123AC_OUTPUT
124124
=== modified file 'debian/changelog'
--- debian/changelog 2009-11-16 10:41:33 +0000
+++ debian/changelog 2010-01-18 04:34:17 +0000
@@ -1,3 +1,39 @@
1protobuf (2.2.0a-0.1ubuntu1) lucid; urgency=low
2
3 * Merge from Debian (LP: #502654)
4 * Remaining Ubuntu changes:
5 - Disable the death tests on IA64, now as a quilt patch.
6 - Don't hardcode python2.4, also as a quilt patch.
7
8 -- Elliot Murphy <elliot@ubuntu.com> Sun, 17 Jan 2010 23:21:58 -0500
9
10protobuf (2.2.0a-0.1) unstable; urgency=low
11
12 * Non-maintainer upload
13 * New upstream release made this evening correction major SONAME
14 * debian/control: Updated major version to 5 (Closes: #556563)
15 * debian/rules: Updated two links to use libproto*5
16 * debian/libprotobuf5.shlibs: Added
17 * debian/libprotoc5.shlibs: Added
18
19 -- Dirk Eddelbuettel <edd@debian.org> Wed, 18 Nov 2009 21:47:41 -0600
20
21protobuf (2.2.0-0.1) unstable; urgency=low
22
23 * Non-maintainer upload coordinated with maintainer
24 * New upstream release (Closes: #551931)
25
26 * debian/libprotobuf-install: Added 'usr/lib/pkgconfig/*' to have
27 pkg-config support files installed
28
29 * debian/control: Added (= ${binary:Version}) to Depends for -dev
30 packages for tighter link to underlying libraries [lintian warning]
31 * debian/control: Updated StandardVersion: to 3.8.3
32
33 * debian/control: Major version not incremented as upstream kept it at 4
34
35 -- Dirk Eddelbuettel <edd@debian.org> Sat, 14 Nov 2009 06:44:22 -0600
36
1protobuf (2.1.0-1ubuntu1) lucid; urgency=low37protobuf (2.1.0-1ubuntu1) lucid; urgency=low
238
3 * Merge from Debian testing.39 * Merge from Debian testing.
440
=== modified file 'debian/control'
--- debian/control 2009-11-16 10:41:33 +0000
+++ debian/control 2010-01-18 04:34:17 +0000
@@ -5,12 +5,12 @@
5XSBC-Original-Maintainer: Iustin Pop <iusty@k1024.org>5XSBC-Original-Maintainer: Iustin Pop <iusty@k1024.org>
6Build-Depends: debhelper (>= 7), python (>= 2.3.5-11), python-setuptools (>= 0.6c8), xmlto, ant, quilt, zlib1g-dev6Build-Depends: debhelper (>= 7), python (>= 2.3.5-11), python-setuptools (>= 0.6c8), xmlto, ant, quilt, zlib1g-dev
7Build-Depends-Indep: python-support (>= 0.6), openjdk-6-jdk7Build-Depends-Indep: python-support (>= 0.6), openjdk-6-jdk
8Standards-Version: 3.8.28Standards-Version: 3.8.3
9Homepage: http://code.google.com/p/protobuf/9Homepage: http://code.google.com/p/protobuf/
10Vcs-Browser: http://git.debian.org/?p=collab-maint/protobuf.git10Vcs-Browser: http://git.debian.org/?p=collab-maint/protobuf.git
11Vcs-Git: git://git.debian.org/git/collab-maint/protobuf.git11Vcs-Git: git://git.debian.org/git/collab-maint/protobuf.git
1212
13Package: libprotobuf413Package: libprotobuf5
14Architecture: any14Architecture: any
15Depends: ${shlibs:Depends}, ${misc:Depends}15Depends: ${shlibs:Depends}, ${misc:Depends}
16Description: protocol buffers C++ library16Description: protocol buffers C++ library
@@ -30,7 +30,7 @@
30Package: libprotobuf-dev30Package: libprotobuf-dev
31Architecture: any31Architecture: any
32Section: libdevel32Section: libdevel
33Depends: ${shlibs:Depends}, ${misc:Depends}, libprotobuf433Depends: ${shlibs:Depends}, ${misc:Depends}, libprotobuf5 (= ${binary:Version})
34Description: protocol buffers C++ library (development headers)34Description: protocol buffers C++ library (development headers)
35 Protocol buffers are a flexible, efficient, automated mechanism for35 Protocol buffers are a flexible, efficient, automated mechanism for
36 serializing structured data - similar to XML, but smaller, faster, and36 serializing structured data - similar to XML, but smaller, faster, and
@@ -46,7 +46,7 @@
46 This package contains the development libraries needed for writing C++46 This package contains the development libraries needed for writing C++
47 applications.47 applications.
4848
49Package: libprotoc449Package: libprotoc5
50Architecture: any50Architecture: any
51Depends: ${shlibs:Depends}, ${misc:Depends}51Depends: ${shlibs:Depends}, ${misc:Depends}
52Description: protocol buffers compiler library52Description: protocol buffers compiler library
@@ -67,7 +67,7 @@
67Package: libprotoc-dev67Package: libprotoc-dev
68Architecture: any68Architecture: any
69Section: libdevel69Section: libdevel
70Depends: ${shlibs:Depends}, ${misc:Depends}, libprotoc4, libprotobuf-dev70Depends: ${shlibs:Depends}, ${misc:Depends}, libprotoc5 (= ${binary:Version}), libprotobuf-dev (= ${binary:Version})
71Replaces: libprotobuf-dev (<< 2.1.0)71Replaces: libprotobuf-dev (<< 2.1.0)
72Conflicts: libprotobuf-dev (<< 2.1.0)72Conflicts: libprotobuf-dev (<< 2.1.0)
73Description: protocol buffers compiler library (development headers)73Description: protocol buffers compiler library (development headers)
@@ -87,7 +87,7 @@
8787
88Package: protobuf-compiler88Package: protobuf-compiler
89Architecture: any89Architecture: any
90Depends: ${shlibs:Depends}, ${misc:Depends}, libprotoc4 (= ${binary:Version})90Depends: ${shlibs:Depends}, ${misc:Depends}, libprotoc5 (= ${binary:Version})
91Description: compiler for protocol buffer definition files91Description: compiler for protocol buffer definition files
92 Protocol buffers are a flexible, efficient, automated mechanism for92 Protocol buffers are a flexible, efficient, automated mechanism for
93 serializing structured data - similar to XML, but smaller, faster, and93 serializing structured data - similar to XML, but smaller, faster, and
9494
=== modified file 'debian/java-build.xml'
--- debian/java-build.xml 2009-11-16 10:41:33 +0000
+++ debian/java-build.xml 2010-01-18 04:34:16 +0000
@@ -28,6 +28,6 @@
28 </target>28 </target>
2929
30 <target name="jar" depends="compile">30 <target name="jar" depends="compile">
31 <jar destfile="${targetdir}/protobuf-2.1.0.jar" basedir="${classesdir}" />31 <jar destfile="${targetdir}/protobuf-2.2.0.jar" basedir="${classesdir}" />
32 </target>32 </target>
33</project>33</project>
3434
=== modified file 'debian/libprotobuf-dev.install'
--- debian/libprotobuf-dev.install 2009-06-24 00:19:03 +0000
+++ debian/libprotobuf-dev.install 2010-01-18 04:34:17 +0000
@@ -1,3 +1,4 @@
1usr/lib/libprotobuf.so1usr/lib/libprotobuf.so
2usr/lib/libprotobuf.la2usr/lib/libprotobuf.la
3usr/lib/pkgconfig/*
3usr/include4usr/include
45
=== modified file 'debian/libprotobuf-java.links'
--- debian/libprotobuf-java.links 2009-11-16 10:41:33 +0000
+++ debian/libprotobuf-java.links 2010-01-18 04:34:17 +0000
@@ -1,1 +1,1 @@
1usr/share/java/protobuf-2.1.0.jar usr/share/java/protobuf.jar1usr/share/java/protobuf-2.2.0.jar usr/share/java/protobuf.jar
22
=== removed file 'debian/libprotobuf4.install'
--- debian/libprotobuf4.install 2009-06-24 00:19:03 +0000
+++ debian/libprotobuf4.install 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1usr/lib/libprotobuf*.so.*
20
=== added file 'debian/libprotobuf5.install'
--- debian/libprotobuf5.install 1970-01-01 00:00:00 +0000
+++ debian/libprotobuf5.install 2010-01-18 04:34:16 +0000
@@ -0,0 +1,1 @@
1usr/lib/libprotobuf*.so.*
02
=== added file 'debian/libprotobuf5.shlibs'
--- debian/libprotobuf5.shlibs 1970-01-01 00:00:00 +0000
+++ debian/libprotobuf5.shlibs 2010-01-18 04:34:17 +0000
@@ -0,0 +1,3 @@
1libprotobuf 5 libprotobuf5
2libprotobuf-lite 5 libprotobuf5
3
04
=== added file 'debian/libprotoc-dev.dirs'
--- debian/libprotoc-dev.dirs 1970-01-01 00:00:00 +0000
+++ debian/libprotoc-dev.dirs 2010-01-18 04:34:17 +0000
@@ -0,0 +1,1 @@
1usr/share/doc
02
=== removed file 'debian/libprotoc-dev.dirs'
--- debian/libprotoc-dev.dirs 2009-06-24 00:19:03 +0000
+++ debian/libprotoc-dev.dirs 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1usr/share/doc
20
=== added file 'debian/libprotoc-dev.install'
--- debian/libprotoc-dev.install 1970-01-01 00:00:00 +0000
+++ debian/libprotoc-dev.install 2010-01-18 04:34:16 +0000
@@ -0,0 +1,3 @@
1usr/lib/libprotoc.so
2usr/lib/libprotoc.la
3usr/include/google/protobuf/compiler
04
=== removed file 'debian/libprotoc-dev.install'
--- debian/libprotoc-dev.install 2009-06-24 00:19:03 +0000
+++ debian/libprotoc-dev.install 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1usr/lib/libprotoc.so
2usr/lib/libprotoc.la
3usr/include/google/protobuf/compiler
40
=== removed file 'debian/libprotoc4.install'
--- debian/libprotoc4.install 2009-06-24 00:19:03 +0000
+++ debian/libprotoc4.install 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
1usr/lib/libprotoc*.so.*
20
=== added file 'debian/libprotoc5.install'
--- debian/libprotoc5.install 1970-01-01 00:00:00 +0000
+++ debian/libprotoc5.install 2010-01-18 04:34:17 +0000
@@ -0,0 +1,1 @@
1usr/lib/libprotoc*.so.*
02
=== added file 'debian/libprotoc5.shlibs'
--- debian/libprotoc5.shlibs 1970-01-01 00:00:00 +0000
+++ debian/libprotoc5.shlibs 2010-01-18 04:34:17 +0000
@@ -0,0 +1,1 @@
1libprotoc 5 libprotoc5
02
=== added directory 'debian/patches'
=== removed directory 'debian/patches'
=== renamed file 'debian/patches/default_python_version' => 'debian/patches/default_python_version'
=== renamed file 'debian/patches/no_death_tests_on_ia64' => 'debian/patches/no_death_tests_on_ia64'
=== added file 'debian/patches/series'
--- debian/patches/series 1970-01-01 00:00:00 +0000
+++ debian/patches/series 2010-01-18 04:34:16 +0000
@@ -0,0 +1,3 @@
1# comment to keep empty file in the diff.gz
2no_death_tests_on_ia64
3default_python_version
04
=== removed file 'debian/patches/series'
--- debian/patches/series 2009-11-16 10:41:33 +0000
+++ debian/patches/series 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1# comment to keep empty file in the diff.gz
2no_death_tests_on_ia64
3default_python_version
40
=== modified file 'debian/rules'
--- debian/rules 2009-11-16 10:41:33 +0000
+++ debian/rules 2010-01-18 04:34:17 +0000
@@ -90,9 +90,11 @@
90 # remove the built manpage90 # remove the built manpage
91 rm -f protoc.191 rm -f protoc.1
9292
93 cd python && \93 if [ -f python/protobuf.egg-info ]; then \
94 python setup.py clean --all ;\94 ( cd python && \
95 rm -rf protobuf.egg-info95 python setup.py clean --all && \
96 rm -rf protobuf.egg-info ) \
97 fi
9698
97 # remove java builds99 # remove java builds
98 $(SHELL) ./debian/ant-wrapper -f debian/java-build.xml clean || true100 $(SHELL) ./debian/ant-wrapper -f debian/java-build.xml clean || true
@@ -130,9 +132,9 @@
130132
131 # convert doc dir to symlink for the dev packages133 # convert doc dir to symlink for the dev packages
132 rm -rf $(CURDIR)/debian/libprotobuf-dev/usr/share/doc/libprotobuf-dev134 rm -rf $(CURDIR)/debian/libprotobuf-dev/usr/share/doc/libprotobuf-dev
133 ln -s libprotobuf4 $(CURDIR)/debian/libprotobuf-dev/usr/share/doc/libprotobuf-dev135 ln -s libprotobuf5 $(CURDIR)/debian/libprotobuf-dev/usr/share/doc/libprotobuf-dev
134 rm -rf $(CURDIR)/debian/libprotoc-dev/usr/share/doc/libprotoc-dev136 rm -rf $(CURDIR)/debian/libprotoc-dev/usr/share/doc/libprotoc-dev
135 ln -s libprotoc4 $(CURDIR)/debian/libprotoc-dev/usr/share/doc/libprotoc-dev137 ln -s libprotoc5 $(CURDIR)/debian/libprotoc-dev/usr/share/doc/libprotoc-dev
136138
137 # remove compiler headers from libprotobuf-dev139 # remove compiler headers from libprotobuf-dev
138 rm -rf $(CURDIR)/debian/libprotobuf-dev/usr/include/google/protobuf/compiler140 rm -rf $(CURDIR)/debian/libprotobuf-dev/usr/include/google/protobuf/compiler
139141
=== added file 'editors/protobuf-mode.el'
--- editors/protobuf-mode.el 1970-01-01 00:00:00 +0000
+++ editors/protobuf-mode.el 2010-01-18 04:34:16 +0000
@@ -0,0 +1,218 @@
1;;; protobuf-mode.el --- major mode for editing protocol buffers.
2
3;; Author: Alexandre Vassalotti <alexandre@peadrop.com>
4;; Created: 23-Apr-2009
5;; Version: 0.3
6;; Keywords: google protobuf languages
7
8;; Redistribution and use in source and binary forms, with or without
9;; modification, are permitted provided that the following conditions are
10;; met:
11;;
12;; * Redistributions of source code must retain the above copyright
13;; notice, this list of conditions and the following disclaimer.
14;; * Redistributions in binary form must reproduce the above
15;; copyright notice, this list of conditions and the following disclaimer
16;; in the documentation and/or other materials provided with the
17;; distribution.
18;; * Neither the name of Google Inc. nor the names of its
19;; contributors may be used to endorse or promote products derived from
20;; this software without specific prior written permission.
21;;
22;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
23;; "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
24;; LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
25;; A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
26;; OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
27;; SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
28;; LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
29;; DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
30;; THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
32;; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33
34;;; Commentary:
35
36;; Installation:
37;; - Put `protobuf-mode.el' in your Emacs load-path.
38;; - Add this line to your .emacs file:
39;; (require 'protobuf-mode)
40;;
41;; You can customize this mode just like any mode derived from CC Mode. If
42;; you want to add customizations specific to protobuf-mode, you can use the
43;; `protobuf-mode-hook'. For example, the following would make protocol-mode
44;; use 2-space indentation:
45;;
46;; (defconst my-protobuf-style
47;; '((c-basic-offset . 2)
48;; (indent-tabs-mode . nil)))
49;;
50;; (add-hook 'protobuf-mode-hook
51;; (lambda () (c-add-style "my-style" my-protobuf-style t)))
52;;
53;; Refer to the documentation of CC Mode for more information about
54;; customization details and how to use this mode.
55;;
56;; TODO:
57;; - Make highlighting for enum values work properly.
58;; - Fix the parser to recognize extensions as identifiers and not
59;; as casts.
60;; - Improve the parsing of option assignment lists. For example:
61;; optional int32 foo = 1 [(my_field_option) = 4.5];
62;; - Add support for fully-qualified identifiers (e.g., with a leading ".").
63
64;;; Code:
65
66(require 'cc-mode)
67
68(eval-when-compile
69 (require 'cc-langs)
70 (require 'cc-fonts))
71
72;; This mode does not inherit properties from other modes. So, we do not use
73;; the usual `c-add-language' function.
74(put 'protobuf-mode 'c-mode-prefix "protobuf-")
75
76;; The following code uses of the `c-lang-defconst' macro define syntactic
77;; features of protocol buffer language. Refer to the documentation in the
78;; cc-langs.el file for information about the meaning of the -kwds variables.
79
80(c-lang-defconst c-primitive-type-kwds
81 protobuf '("double" "float" "int32" "int64" "uint32" "uint64" "sint32"
82 "sint64" "fixed32" "fixed64" "sfixed32" "sfixed64" "bool"
83 "string" "bytes" "group"))
84
85(c-lang-defconst c-modifier-kwds
86 protobuf '("required" "optional" "repeated"))
87
88(c-lang-defconst c-class-decl-kwds
89 protobuf '("message" "enum" "service"))
90
91(c-lang-defconst c-constant-kwds
92 protobuf '("true" "false"))
93
94(c-lang-defconst c-other-decl-kwds
95 protobuf '("package" "import"))
96
97(c-lang-defconst c-other-kwds
98 protobuf '("default" "max"))
99
100(c-lang-defconst c-identifier-ops
101 ;; Handle extended identifiers like google.protobuf.MessageOptions
102 protobuf '((left-assoc ".")))
103
104;; The following keywords do not fit well in keyword classes defined by
105;; cc-mode. So, we approximate as best we can.
106
107(c-lang-defconst c-type-list-kwds
108 protobuf '("extensions" "to"))
109
110(c-lang-defconst c-typeless-decl-kwds
111 protobuf '("extend" "rpc" "option" "returns"))
112
113
114;; Here we remove default syntax for loops, if-statements and other C
115;; syntactic features that are not supported by the protocol buffer language.
116
117(c-lang-defconst c-brace-list-decl-kwds
118 ;; Remove syntax for C-style enumerations.
119 protobuf nil)
120
121(c-lang-defconst c-block-stmt-1-kwds
122 ;; Remove syntax for "do" and "else" keywords.
123 protobuf nil)
124
125(c-lang-defconst c-block-stmt-2-kwds
126 ;; Remove syntax for "for", "if", "switch" and "while" keywords.
127 protobuf nil)
128
129(c-lang-defconst c-simple-stmt-kwds
130 ;; Remove syntax for "break", "continue", "goto" and "return" keywords.
131 protobuf nil)
132
133(c-lang-defconst c-paren-stmt-kwds
134 ;; Remove special case for the "(;;)" in for-loops.
135 protobuf nil)
136
137(c-lang-defconst c-label-kwds
138 ;; Remove case label syntax for the "case" and "default" keywords.
139 protobuf nil)
140
141(c-lang-defconst c-before-label-kwds
142 ;; Remove special case for the label in a goto statement.
143 protobuf nil)
144
145(c-lang-defconst c-cpp-matchers
146 ;; Disable all the C preprocessor syntax.
147 protobuf nil)
148
149(c-lang-defconst c-decl-prefix-re
150 ;; Same as for C, except it does not match "(". This is needed for disabling
151 ;; the syntax for casts.
152 protobuf "\\([\{\};,]+\\)")
153
154
155;; Add support for variable levels of syntax highlighting.
156
157(defconst protobuf-font-lock-keywords-1 (c-lang-const c-matchers-1 protobuf)
158 "Minimal highlighting for protobuf-mode.")
159
160(defconst protobuf-font-lock-keywords-2 (c-lang-const c-matchers-2 protobuf)
161 "Fast normal highlighting for protobuf-mode.")
162
163(defconst protobuf-font-lock-keywords-3 (c-lang-const c-matchers-3 protobuf)
164 "Accurate normal highlighting for protobuf-mode.")
165
166(defvar protobuf-font-lock-keywords protobuf-font-lock-keywords-3
167 "Default expressions to highlight in protobuf-mode.")
168
169;; Our syntax table is auto-generated from the keyword classes we defined
170;; previously with the `c-lang-const' macro.
171(defvar protobuf-mode-syntax-table nil
172 "Syntax table used in protobuf-mode buffers.")
173(or protobuf-mode-syntax-table
174 (setq protobuf-mode-syntax-table
175 (funcall (c-lang-const c-make-mode-syntax-table protobuf))))
176
177(defvar protobuf-mode-abbrev-table nil
178 "Abbreviation table used in protobuf-mode buffers.")
179
180(defvar protobuf-mode-map nil
181 "Keymap used in protobuf-mode buffers.")
182(or protobuf-mode-map
183 (setq protobuf-mode-map (c-make-inherited-keymap)))
184
185(easy-menu-define protobuf-menu protobuf-mode-map
186 "Protocol Buffers Mode Commands"
187 (cons "Protocol Buffers" (c-lang-const c-mode-menu protobuf)))
188
189;;;###autoload (add-to-list 'auto-mode-alist '("\\.proto\\'" . protobuf-mode))
190
191;;;###autoload
192(defun protobuf-mode ()
193 "Major mode for editing Protocol Buffers description language.
194
195The hook `c-mode-common-hook' is run with no argument at mode
196initialization, then `protobuf-mode-hook'.
197
198Key bindings:
199\\{protobuf-mode-map}"
200 (interactive)
201 (kill-all-local-variables)
202 (set-syntax-table protobuf-mode-syntax-table)
203 (setq major-mode 'protobuf-mode
204 mode-name "Protocol-Buffers"
205 local-abbrev-table protobuf-mode-abbrev-table
206 abbrev-mode t)
207 (use-local-map protobuf-mode-map)
208 (c-initialize-cc-mode t)
209 (c-make-emacs-variables-local)
210 (c-init-language-vars protobuf-mode)
211 (c-common-init 'protobuf-mode)
212 (easy-menu-add protobuf-menu)
213 (c-run-mode-hooks 'c-mode-common-hook 'protobuf-mode-hook)
214 (c-update-modeline))
215
216(provide 'protobuf-mode)
217
218;;; protobuf-mode.el ends here
0219
=== removed file 'editors/protobuf-mode.el'
--- editors/protobuf-mode.el 2009-06-24 00:19:03 +0000
+++ editors/protobuf-mode.el 1970-01-01 00:00:00 +0000
@@ -1,217 +0,0 @@
1;;; protobuf-mode.el --- major mode for editing protocol buffers.
2
3;; Author: Alexandre Vassalotti <alexandre@peadrop.com>
4;; Created: 23-Apr-2009
5;; Version: 0.3
6;; Keywords: google protobuf languages
7
8;; Redistribution and use in source and binary forms, with or without
9;; modification, are permitted provided that the following conditions are
10;; met:
11;;
12;; * Redistributions of source code must retain the above copyright
13;; notice, this list of conditions and the following disclaimer.
14;; * Redistributions in binary form must reproduce the above
15;; copyright notice, this list of conditions and the following disclaimer
16;; in the documentation and/or other materials provided with the
17;; distribution.
18;; * Neither the name of Google Inc. nor the names of its
19;; contributors may be used to endorse or promote products derived from
20;; this software without specific prior written permission.
21;;
22;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
23;; "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
24;; LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
25;; A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
26;; OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
27;; SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
28;; LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
29;; DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
30;; THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31;; (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
32;; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33
34;;; Commentary:
35
36;; Installation:
37;; - Put `protobuf-mode.el' in your Emacs load-path.
38;; - Add this line to your .emacs file:
39;; (require 'protobuf-mode)
40;;
41;; You can customize this mode just like any mode derived from CC Mode. If
42;; you want to add customizations specific to protobuf-mode, you can use the
43;; `protobuf-mode-hook'. For example, the following would make protocol-mode
44;; use 2-space indentation:
45;;
46;; (defconst my-protobuf-style
47;; '((c-basic-offset . 2)
48;; (indent-tabs-mode . nil)))
49;;
50;; (add-hook 'protobuf-mode-hook
51;; (lambda () (c-add-style "my-style" my-protobuf-style t)))
52;;
53;; Refer to the documentation of CC Mode for more information about
54;; customization details and how to use this mode.
55;;
56;; TODO:
57;; - Make highlighting for enum values work properly.
58;; - Fix the parser to recognize extensions as identifiers and not
59;; as casts.
60;; - Improve the parsing of option assignment lists. For example:
61;; optional int32 foo = 1 [(my_field_option) = 4.5];
62;; - Add support for fully-qualified identifiers (e.g., with a leading ".").
63
64;;; Code:
65
66(require 'cc-mode)
67
68(eval-when-compile
69 (require 'cc-langs)
70 (require 'cc-fonts))
71
72;; This mode does not inherit properties from other modes. So, we do not use
73;; the usual `c-add-language' function.
74(put 'protobuf-mode 'c-mode-prefix "protobuf-")
75
76;; The following code uses of the `c-lang-defconst' macro define syntactic
77;; features of protocol buffer language. Refer to the documentation in the
78;; cc-langs.el file for information about the meaning of the -kwds variables.
79
80(c-lang-defconst c-primitive-type-kwds
81 protobuf '("double" "float" "int32" "int64" "uint32" "uint64" "sint32"
82 "sint64" "fixed32" "fixed64" "sfixed32" "sfixed64" "bool"
83 "string" "bytes" "group"))
84
85(c-lang-defconst c-modifier-kwds
86 protobuf '("required" "optional" "repeated"))
87
88(c-lang-defconst c-class-decl-kwds
89 protobuf '("message" "enum" "service"))
90
91(c-lang-defconst c-constant-kwds
92 protobuf '("true" "false"))
93
94(c-lang-defconst c-other-decl-kwds
95 protobuf '("package" "import"))
96
97(c-lang-defconst c-other-kwds
98 protobuf '("default" "max"))
99
100(c-lang-defconst c-identifier-ops
101 ;; Handle extended identifiers like google.protobuf.MessageOptions
102 protobuf '((left-assoc ".")))
103
104;; The following keywords do not fit well in keyword classes defined by
105;; cc-mode. So, we approximate as best we can.
106
107(c-lang-defconst c-type-list-kwds
108 protobuf '("extensions" "to"))
109
110(c-lang-defconst c-typeless-decl-kwds
111 protobuf '("extend" "rpc" "option" "returns"))
112
113
114;; Here we remove default syntax for loops, if-statements and other C
115;; syntactic features that are not supported by the protocol buffer language.
116
117(c-lang-defconst c-brace-list-decl-kwds
118 ;; Remove syntax for C-style enumerations.
119 protobuf nil)
120
121(c-lang-defconst c-block-stmt-1-kwds
122 ;; Remove syntax for "do" and "else" keywords.
123 protobuf nil)
124
125(c-lang-defconst c-block-stmt-2-kwds
126 ;; Remove syntax for "for", "if", "switch" and "while" keywords.
127 protobuf nil)
128
129(c-lang-defconst c-simple-stmt-kwds
130 ;; Remove syntax for "break", "continue", "goto" and "return" keywords.
131 protobuf nil)
132
133(c-lang-defconst c-paren-stmt-kwds
134 ;; Remove special case for the "(;;)" in for-loops.
135 protobuf nil)
136
137(c-lang-defconst c-label-kwds
138 ;; Remove case label syntax for the "case" and "default" keywords.
139 protobuf nil)
140
141(c-lang-defconst c-before-label-kwds
142 ;; Remove special case for the label in a goto statement.
143 protobuf nil)
144
145(c-lang-defconst c-cpp-matchers
146 ;; Disable all the C preprocessor syntax.
147 protobuf nil)
148
149(c-lang-defconst c-decl-prefix-re
150 ;; Same as for C, except it does not match "(". This is needed for disabling
151 ;; the syntax for casts.
152 protobuf "\\([\{\};,]+\\)")
153
154
155;; Add support for variable levels of syntax highlighting.
156
157(defconst protobuf-font-lock-keywords-1 (c-lang-const c-matchers-1 protobuf)
158 "Minimal highlighting for protobuf-mode.")
159
160(defconst protobuf-font-lock-keywords-2 (c-lang-const c-matchers-2 protobuf)
161 "Fast normal highlighting for protobuf-mode.")
162
163(defconst protobuf-font-lock-keywords-3 (c-lang-const c-matchers-3 protobuf)
164 "Accurate normal highlighting for protobuf-mode.")
165
166(defvar protobuf-font-lock-keywords protobuf-font-lock-keywords-3
167 "Default expressions to highlight in protobuf-mode.")
168
169;; Our syntax table is auto-generated from the keyword classes we defined
170;; previously with the `c-lang-const' macro.
171(defvar protobuf-mode-syntax-table nil
172 "Syntax table used in protobuf-mode buffers.")
173(or protobuf-mode-syntax-table
174 (setq protobuf-mode-syntax-table
175 (funcall (c-lang-const c-make-mode-syntax-table protobuf))))
176
177(defvar protobuf-mode-abbrev-table nil
178 "Abbreviation table used in protobuf-mode buffers.")
179
180(defvar protobuf-mode-map nil
181 "Keymap used in protobuf-mode buffers.")
182(or protobuf-mode-map
183 (setq protobuf-mode-map (c-make-inherited-keymap)))
184
185(easy-menu-define protobuf-menu protobuf-mode-map
186 "Protocol Buffers Mode Commands"
187 (cons "Protocol Buffers" (c-lang-const c-mode-menu protobuf)))
188
189;;;###autoload (add-to-list 'auto-mode-alist '("\\.proto\\'" . protobuf-mode))
190
191;;;###autoload
192(defun protobuf-mode ()
193 "Major mode for editing Protocol Buffers description language.
194
195The hook `c-mode-common-hook' is run with no argument at mode
196initialization, then `protobuf-mode-hook'.
197
198Key bindings:
199\\{protobuf-mode-map}"
200 (interactive)
201 (kill-all-local-variables)
202 (set-syntax-table protobuf-mode-syntax-table)
203 (setq major-mode 'protobuf-mode
204 mode-name "Protocol-Buffers"
205 local-abbrev-table protobuf-mode-abbrev-table
206 abbrev-mode t)
207 (use-local-map protobuf-mode-map)
208 (c-initialize-cc-mode t)
209 (c-init-language-vars protobuf-mode)
210 (c-common-init 'protobuf-mode)
211 (easy-menu-add protobuf-menu)
212 (c-run-mode-hooks 'c-mode-common-hook 'protobuf-mode-hook)
213 (c-update-modeline))
214
215(provide 'protobuf-mode)
216
217;;; protobuf-mode.el ends here
2180
=== modified file 'examples/Makefile'
--- examples/Makefile 2009-06-24 00:19:03 +0000
+++ examples/Makefile 2010-01-18 04:34:16 +0000
@@ -22,10 +22,12 @@
22 @touch protoc_middleman22 @touch protoc_middleman
2323
24add_person_cpp: add_person.cc protoc_middleman24add_person_cpp: add_person.cc protoc_middleman
25 c++ add_person.cc addressbook.pb.cc -lprotobuf -lpthread -o add_person_cpp25 pkg-config --cflags protobuf # fails if protobuf is not installed
26 c++ add_person.cc addressbook.pb.cc -o add_person_cpp `pkg-config --cflags --libs protobuf`
2627
27list_people_cpp: list_people.cc protoc_middleman28list_people_cpp: list_people.cc protoc_middleman
28 c++ list_people.cc addressbook.pb.cc -lprotobuf -lpthread -o list_people_cpp29 pkg-config --cflags protobuf # fails if protobuf is not installed
30 c++ list_people.cc addressbook.pb.cc -o list_people_cpp `pkg-config --cflags --libs protobuf`
2931
30javac_middleman: AddPerson.java ListPeople.java protoc_middleman32javac_middleman: AddPerson.java ListPeople.java protoc_middleman
31 javac AddPerson.java ListPeople.java com/example/tutorial/AddressBookProtos.java33 javac AddPerson.java ListPeople.java com/example/tutorial/AddressBookProtos.java
3234
=== modified file 'examples/add_person.cc'
--- examples/add_person.cc 2008-08-03 11:01:44 +0000
+++ examples/add_person.cc 2010-01-18 04:34:16 +0000
@@ -88,5 +88,8 @@
88 }88 }
89 }89 }
9090
91 // Optional: Delete all global objects allocated by libprotobuf.
92 google::protobuf::ShutdownProtobufLibrary();
93
91 return 0;94 return 0;
92}95}
9396
=== modified file 'examples/list_people.cc'
--- examples/list_people.cc 2008-08-03 11:01:44 +0000
+++ examples/list_people.cc 2010-01-18 04:34:16 +0000
@@ -61,5 +61,8 @@
6161
62 ListPeople(address_book);62 ListPeople(address_book);
6363
64 // Optional: Delete all global objects allocated by libprotobuf.
65 google::protobuf::ShutdownProtobufLibrary();
66
64 return 0;67 return 0;
65}68}
6669
=== modified file 'generate_descriptor_proto.sh'
--- generate_descriptor_proto.sh 2008-12-18 01:26:29 +0000
+++ generate_descriptor_proto.sh 2010-01-18 04:34:16 +0000
@@ -5,6 +5,10 @@
5# itself, they cannot be generated automatically by a make rule. "make check"5# itself, they cannot be generated automatically by a make rule. "make check"
6# will fail if these files do not match what the protocol compiler would6# will fail if these files do not match what the protocol compiler would
7# generate.7# generate.
8#
9# HINT: Flags passed to generate_descriptor_proto.sh will be passed directly
10# to make when building protoc. This is particularly useful for passing
11# -j4 to run 4 jobs simultaneously.
812
9if test ! -e src/google/protobuf/stubs/common.h; then13if test ! -e src/google/protobuf/stubs/common.h; then
10 cat >&2 << __EOF__14 cat >&2 << __EOF__
@@ -23,5 +27,5 @@
23fi27fi
2428
25cd src29cd src
26make protoc && ./protoc --cpp_out=dllexport_decl=LIBPROTOBUF_EXPORT:. google/protobuf/descriptor.proto30make $@ protoc && ./protoc --cpp_out=dllexport_decl=LIBPROTOBUF_EXPORT:. google/protobuf/descriptor.proto
27cd ..31cd ..
2832
=== added directory 'gtest'
=== removed directory 'gtest'
=== added file 'gtest/CHANGES'
--- gtest/CHANGES 1970-01-01 00:00:00 +0000
+++ gtest/CHANGES 2010-01-18 04:34:16 +0000
@@ -0,0 +1,57 @@
1Changes for 1.3.0:
2
3 * New feature: death tests on Windows, Cygwin, and Mac.
4 * New feature: ability to use Google Test assertions in other testing
5 frameworks.
6 * New feature: ability to run disabled test via
7 --gtest_also_run_disabled_tests.
8 * New feature: the --help flag for printing the usage.
9 * New feature: access to Google Test flag values in user code.
10 * New feature: a script that packs Google Test into one .h and one
11 .cc file for easy deployment.
12 * New feature: support for distributing test functions to multiple
13 machines (requires support from the test runner).
14 * Bug fixes and implementation clean-up.
15
16Changes for 1.2.1:
17
18 * Compatibility fixes for Linux IA-64 and IBM z/OS.
19 * Added support for using Boost and other TR1 implementations.
20 * Changes to the build scripts to support upcoming release of Google C++
21 Mocking Framework.
22 * Added Makefile to the distribution package.
23 * Improved build instructions in README.
24
25Changes for 1.2.0:
26
27 * New feature: value-parameterized tests.
28 * New feature: the ASSERT/EXPECT_(NON)FATAL_FAILURE(_ON_ALL_THREADS)
29 macros.
30 * Changed the XML report format to match JUnit/Ant's.
31 * Added tests to the Xcode project.
32 * Added scons/SConscript for building with SCons.
33 * Added src/gtest-all.cc for building Google Test from a single file.
34 * Fixed compatibility with Solaris and z/OS.
35 * Enabled running Python tests on systems with python 2.3 installed,
36 e.g. Mac OS X 10.4.
37 * Bug fixes.
38
39Changes for 1.1.0:
40
41 * New feature: type-parameterized tests.
42 * New feature: exception assertions.
43 * New feature: printing elapsed time of tests.
44 * Improved the robustness of death tests.
45 * Added an Xcode project and samples.
46 * Adjusted the output format on Windows to be understandable by Visual Studio.
47 * Minor bug fixes.
48
49Changes for 1.0.1:
50
51 * Added project files for Visual Studio 7.1.
52 * Fixed issues with compiling on Mac OS X.
53 * Fixed issues with compiling on Cygwin.
54
55Changes for 1.0.0:
56
57 * Initial Open Source release of Google Test
058
=== removed file 'gtest/CHANGES'
--- gtest/CHANGES 2009-06-24 00:19:03 +0000
+++ gtest/CHANGES 1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
1Changes for 1.3.0:
2
3 * New feature: death tests on Windows, Cygwin, and Mac.
4 * New feature: ability to use Google Test assertions in other testing
5 frameworks.
6 * New feature: ability to run disabled test via
7 --gtest_also_run_disabled_tests.
8 * New feature: the --help flag for printing the usage.
9 * New feature: access to Google Test flag values in user code.
10 * New feature: a script that packs Google Test into one .h and one
11 .cc file for easy deployment.
12 * New feature: support for distributing test functions to multiple
13 machines (requires support from the test runner).
14 * Bug fixes and implementation clean-up.
15
16Changes for 1.2.1:
17
18 * Compatibility fixes for Linux IA-64 and IBM z/OS.
19 * Added support for using Boost and other TR1 implementations.
20 * Changes to the build scripts to support upcoming release of Google C++
21 Mocking Framework.
22 * Added Makefile to the distribution package.
23 * Improved build instructions in README.
24
25Changes for 1.2.0:
26
27 * New feature: value-parameterized tests.
28 * New feature: the ASSERT/EXPECT_(NON)FATAL_FAILURE(_ON_ALL_THREADS)
29 macros.
30 * Changed the XML report format to match JUnit/Ant's.
31 * Added tests to the Xcode project.
32 * Added scons/SConscript for building with SCons.
33 * Added src/gtest-all.cc for building Google Test from a single file.
34 * Fixed compatibility with Solaris and z/OS.
35 * Enabled running Python tests on systems with python 2.3 installed,
36 e.g. Mac OS X 10.4.
37 * Bug fixes.
38
39Changes for 1.1.0:
40
41 * New feature: type-parameterized tests.
42 * New feature: exception assertions.
43 * New feature: printing elapsed time of tests.
44 * Improved the robustness of death tests.
45 * Added an Xcode project and samples.
46 * Adjusted the output format on Windows to be understandable by Visual Studio.
47 * Minor bug fixes.
48
49Changes for 1.0.1:
50
51 * Added project files for Visual Studio 7.1.
52 * Fixed issues with compiling on Mac OS X.
53 * Fixed issues with compiling on Cygwin.
54
55Changes for 1.0.0:
56
57 * Initial Open Source release of Google Test
580
=== added file 'gtest/CONTRIBUTORS'
--- gtest/CONTRIBUTORS 1970-01-01 00:00:00 +0000
+++ gtest/CONTRIBUTORS 2010-01-18 04:34:16 +0000
@@ -0,0 +1,33 @@
1# This file contains a list of people who've made non-trivial
2# contribution to the Google C++ Testing Framework project. People
3# who commit code to the project are encouraged to add their names
4# here. Please keep the list sorted by first names.
5
6Ajay Joshi <jaj@google.com>
7Balázs Dán <balazs.dan@gmail.com>
8Bharat Mediratta <bharat@menalto.com>
9Chandler Carruth <chandlerc@google.com>
10Chris Prince <cprince@google.com>
11Chris Taylor <taylorc@google.com>
12Dan Egnor <egnor@google.com>
13Eric Roman <eroman@chromium.org>
14Jeffrey Yasskin <jyasskin@google.com>
15Jói Sigurðsson <joi@google.com>
16Keir Mierle <mierle@gmail.com>
17Keith Ray <keith.ray@gmail.com>
18Kenton Varda <kenton@google.com>
19Markus Heule <markus.heule@gmail.com>
20Mika Raento <mikie@iki.fi>
21Patrick Hanna <phanna@google.com>
22Patrick Riley <pfr@google.com>
23Peter Kaminski <piotrk@google.com>
24Preston Jackson <preston.jackson@gmail.com>
25Rainer Klaffenboeck <rainer.klaffenboeck@dynatrace.com>
26Russ Cox <rsc@google.com>
27Russ Rufer <russ@pentad.com>
28Sean Mcafee <eefacm@gmail.com>
29Sigurður Ásgeirsson <siggi@google.com>
30Tracy Bialik <tracy@pentad.com>
31Vadim Berman <vadimb@google.com>
32Vlad Losev <vladl@google.com>
33Zhanyong Wan <wan@google.com>
034
=== removed file 'gtest/CONTRIBUTORS'
--- gtest/CONTRIBUTORS 2009-06-24 00:19:03 +0000
+++ gtest/CONTRIBUTORS 1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
1# This file contains a list of people who've made non-trivial
2# contribution to the Google C++ Testing Framework project. People
3# who commit code to the project are encouraged to add their names
4# here. Please keep the list sorted by first names.
5
6Ajay Joshi <jaj@google.com>
7Balázs Dán <balazs.dan@gmail.com>
8Bharat Mediratta <bharat@menalto.com>
9Chandler Carruth <chandlerc@google.com>
10Chris Prince <cprince@google.com>
11Chris Taylor <taylorc@google.com>
12Dan Egnor <egnor@google.com>
13Eric Roman <eroman@chromium.org>
14Jeffrey Yasskin <jyasskin@google.com>
15Jói Sigurðsson <joi@google.com>
16Keir Mierle <mierle@gmail.com>
17Keith Ray <keith.ray@gmail.com>
18Kenton Varda <kenton@google.com>
19Markus Heule <markus.heule@gmail.com>
20Mika Raento <mikie@iki.fi>
21Patrick Hanna <phanna@google.com>
22Patrick Riley <pfr@google.com>
23Peter Kaminski <piotrk@google.com>
24Preston Jackson <preston.jackson@gmail.com>
25Rainer Klaffenboeck <rainer.klaffenboeck@dynatrace.com>
26Russ Cox <rsc@google.com>
27Russ Rufer <russ@pentad.com>
28Sean Mcafee <eefacm@gmail.com>
29Sigurður Ásgeirsson <siggi@google.com>
30Tracy Bialik <tracy@pentad.com>
31Vadim Berman <vadimb@google.com>
32Vlad Losev <vladl@google.com>
33Zhanyong Wan <wan@google.com>
340
=== added file 'gtest/COPYING'
--- gtest/COPYING 1970-01-01 00:00:00 +0000
+++ gtest/COPYING 2010-01-18 04:34:16 +0000
@@ -0,0 +1,28 @@
1Copyright 2008, Google Inc.
2All rights reserved.
3
4Redistribution and use in source and binary forms, with or without
5modification, are permitted provided that the following conditions are
6met:
7
8 * Redistributions of source code must retain the above copyright
9notice, this list of conditions and the following disclaimer.
10 * Redistributions in binary form must reproduce the above
11copyright notice, this list of conditions and the following disclaimer
12in the documentation and/or other materials provided with the
13distribution.
14 * Neither the name of Google Inc. nor the names of its
15contributors may be used to endorse or promote products derived from
16this software without specific prior written permission.
17
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
029
=== removed file 'gtest/COPYING'
--- gtest/COPYING 2009-06-24 00:19:03 +0000
+++ gtest/COPYING 1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
1Copyright 2008, Google Inc.
2All rights reserved.
3
4Redistribution and use in source and binary forms, with or without
5modification, are permitted provided that the following conditions are
6met:
7
8 * Redistributions of source code must retain the above copyright
9notice, this list of conditions and the following disclaimer.
10 * Redistributions in binary form must reproduce the above
11copyright notice, this list of conditions and the following disclaimer
12in the documentation and/or other materials provided with the
13distribution.
14 * Neither the name of Google Inc. nor the names of its
15contributors may be used to endorse or promote products derived from
16this software without specific prior written permission.
17
18THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
19"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
20LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
21A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
22OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
23SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
24LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
25DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
290
=== added file 'gtest/Makefile.am'
--- gtest/Makefile.am 1970-01-01 00:00:00 +0000
+++ gtest/Makefile.am 2010-01-18 04:34:16 +0000
@@ -0,0 +1,422 @@
1# Automake file
2
3# TODO(chandlerc@google.com): automate the generation of *.h from *.h.pump.
4
5# Nonstandard package files for distribution
6EXTRA_DIST = \
7 CHANGES \
8 CONTRIBUTORS \
9 include/gtest/gtest-param-test.h.pump \
10 include/gtest/internal/gtest-tuple.h.pump \
11 include/gtest/internal/gtest-type-util.h.pump \
12 include/gtest/internal/gtest-param-util-generated.h.pump \
13 make/Makefile \
14 scons/SConscript \
15 scripts/fuse_gtest_files.py \
16 scripts/gen_gtest_pred_impl.py \
17 scripts/test/Makefile \
18 test/gtest_all_test.cc
19
20# MSVC project files
21EXTRA_DIST += \
22 msvc/gtest.sln \
23 msvc/gtest.vcproj \
24 msvc/gtest_color_test_.vcproj \
25 msvc/gtest_env_var_test_.vcproj \
26 msvc/gtest_environment_test.vcproj \
27 msvc/gtest_main.vcproj \
28 msvc/gtest_output_test_.vcproj \
29 msvc/gtest_prod_test.vcproj \
30 msvc/gtest_uninitialized_test_.vcproj \
31 msvc/gtest_unittest.vcproj
32
33# xcode project files
34EXTRA_DIST += \
35 xcode/Config/DebugProject.xcconfig \
36 xcode/Config/FrameworkTarget.xcconfig \
37 xcode/Config/General.xcconfig \
38 xcode/Config/ReleaseProject.xcconfig \
39 xcode/Config/TestTarget.xcconfig \
40 xcode/Config/InternalTestTarget.xcconfig \
41 xcode/Config/InternalPythonTestTarget.xcconfig \
42 xcode/Resources/Info.plist \
43 xcode/Scripts/versiongenerate.py \
44 xcode/Scripts/runtests.sh \
45 xcode/gtest.xcodeproj/project.pbxproj
46
47# xcode sample files
48EXTRA_DIST += \
49 xcode/Samples/FrameworkSample/Info.plist \
50 xcode/Samples/FrameworkSample/widget_test.cc \
51 xcode/Samples/FrameworkSample/widget.cc \
52 xcode/Samples/FrameworkSample/widget.h \
53 xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
54
55# C++Builder project files
56EXTRA_DIST += \
57 codegear/gtest_all.cc \
58 codegear/gtest_link.cc \
59 codegear/gtest.cbproj \
60 codegear/gtest_main.cbproj \
61 codegear/gtest_unittest.cbproj \
62 codegear/gtest.groupproj
63
64# TODO(wan@google.com): integrate scripts/gen_gtest_pred_impl.py into
65# the build system such that a user can specify the maximum predicate
66# arity here and have the script automatically generate the
67# corresponding .h and .cc files.
68
69# Scripts and utilities
70bin_SCRIPTS = scripts/gtest-config
71CLEANFILES = $(bin_SCRIPTS)
72
73# Distribute and install M4 macro
74m4datadir = $(datadir)/aclocal
75m4data_DATA = m4/gtest.m4
76EXTRA_DIST += $(m4data_DATA)
77
78# We define the global AM_CPPFLAGS as everything we compile includes from these
79# directories.
80AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/include
81
82# Build rules for libraries.
83lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la
84
85lib_libgtest_la_SOURCES = src/gtest.cc \
86 src/gtest-death-test.cc \
87 src/gtest-filepath.cc \
88 src/gtest-internal-inl.h \
89 src/gtest-port.cc \
90 src/gtest-test-part.cc \
91 src/gtest-typed-test.cc
92
93pkginclude_HEADERS = include/gtest/gtest.h \
94 include/gtest/gtest-death-test.h \
95 include/gtest/gtest-message.h \
96 include/gtest/gtest-param-test.h \
97 include/gtest/gtest_pred_impl.h \
98 include/gtest/gtest_prod.h \
99 include/gtest/gtest-spi.h \
100 include/gtest/gtest-test-part.h \
101 include/gtest/gtest-typed-test.h
102
103pkginclude_internaldir = $(pkgincludedir)/internal
104pkginclude_internal_HEADERS = \
105 include/gtest/internal/gtest-death-test-internal.h \
106 include/gtest/internal/gtest-filepath.h \
107 include/gtest/internal/gtest-internal.h \
108 include/gtest/internal/gtest-linked_ptr.h \
109 include/gtest/internal/gtest-param-util-generated.h \
110 include/gtest/internal/gtest-param-util.h \
111 include/gtest/internal/gtest-port.h \
112 include/gtest/internal/gtest-string.h \
113 include/gtest/internal/gtest-tuple.h \
114 include/gtest/internal/gtest-type-util.h
115
116lib_libgtest_main_la_SOURCES = src/gtest_main.cc
117lib_libgtest_main_la_LIBADD = lib/libgtest.la
118
119# Bulid rules for samples and tests. Automake's naming for some of
120# these variables isn't terribly obvious, so this is a brief
121# reference:
122#
123# TESTS -- Programs run automatically by "make check"
124# check_PROGRAMS -- Programs built by "make check" but not necessarily run
125
126noinst_LTLIBRARIES = samples/libsamples.la
127
128samples_libsamples_la_SOURCES = samples/sample1.cc \
129 samples/sample1.h \
130 samples/sample2.cc \
131 samples/sample2.h \
132 samples/sample3-inl.h \
133 samples/sample4.cc \
134 samples/sample4.h
135
136TESTS=
137TESTS_ENVIRONMENT = GTEST_SOURCE_DIR="$(srcdir)/test" \
138 GTEST_BUILD_DIR="$(top_builddir)/test"
139check_PROGRAMS=
140
141TESTS += samples/sample1_unittest
142check_PROGRAMS += samples/sample1_unittest
143samples_sample1_unittest_SOURCES = samples/sample1_unittest.cc
144samples_sample1_unittest_LDADD = lib/libgtest_main.la \
145 samples/libsamples.la
146
147TESTS += samples/sample2_unittest
148check_PROGRAMS += samples/sample2_unittest
149samples_sample2_unittest_SOURCES = samples/sample2_unittest.cc
150samples_sample2_unittest_LDADD = lib/libgtest_main.la \
151 samples/libsamples.la
152
153TESTS += samples/sample3_unittest
154check_PROGRAMS += samples/sample3_unittest
155samples_sample3_unittest_SOURCES = samples/sample3_unittest.cc
156samples_sample3_unittest_LDADD = lib/libgtest_main.la \
157 samples/libsamples.la
158
159TESTS += samples/sample4_unittest
160check_PROGRAMS += samples/sample4_unittest
161samples_sample4_unittest_SOURCES = samples/sample4_unittest.cc
162samples_sample4_unittest_LDADD = lib/libgtest_main.la \
163 samples/libsamples.la
164
165TESTS += samples/sample5_unittest
166check_PROGRAMS += samples/sample5_unittest
167samples_sample5_unittest_SOURCES = samples/sample5_unittest.cc
168samples_sample5_unittest_LDADD = lib/libgtest_main.la \
169 samples/libsamples.la
170
171TESTS += samples/sample6_unittest
172check_PROGRAMS += samples/sample6_unittest
173samples_sample6_unittest_SOURCES = samples/prime_tables.h \
174 samples/sample6_unittest.cc
175samples_sample6_unittest_LDADD = lib/libgtest_main.la \
176 samples/libsamples.la
177
178TESTS += samples/sample7_unittest
179check_PROGRAMS += samples/sample7_unittest
180samples_sample7_unittest_SOURCES = samples/prime_tables.h \
181 samples/sample7_unittest.cc
182samples_sample7_unittest_LDADD = lib/libgtest_main.la \
183 samples/libsamples.la
184
185TESTS += samples/sample8_unittest
186check_PROGRAMS += samples/sample8_unittest
187samples_sample8_unittest_SOURCES = samples/prime_tables.h \
188 samples/sample8_unittest.cc
189samples_sample8_unittest_LDADD = lib/libgtest_main.la \
190 samples/libsamples.la
191
192TESTS += test/gtest-death-test_test
193check_PROGRAMS += test/gtest-death-test_test
194test_gtest_death_test_test_SOURCES = test/gtest-death-test_test.cc
195test_gtest_death_test_test_CXXFLAGS = $(AM_CXXFLAGS) $(PTHREAD_CFLAGS)
196test_gtest_death_test_test_LDADD = $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) \
197 lib/libgtest_main.la
198
199TESTS += test/gtest_environment_test
200check_PROGRAMS += test/gtest_environment_test
201test_gtest_environment_test_SOURCES = test/gtest_environment_test.cc
202test_gtest_environment_test_LDADD = lib/libgtest.la
203
204TESTS += test/gtest-filepath_test
205check_PROGRAMS += test/gtest-filepath_test
206test_gtest_filepath_test_SOURCES = test/gtest-filepath_test.cc
207test_gtest_filepath_test_LDADD = lib/libgtest_main.la
208
209TESTS += test/gtest-linked_ptr_test
210check_PROGRAMS += test/gtest-linked_ptr_test
211test_gtest_linked_ptr_test_SOURCES = test/gtest-linked_ptr_test.cc
212test_gtest_linked_ptr_test_LDADD = lib/libgtest_main.la
213
214TESTS += test/gtest_main_unittest
215check_PROGRAMS += test/gtest_main_unittest
216test_gtest_main_unittest_SOURCES = test/gtest_main_unittest.cc
217test_gtest_main_unittest_LDADD = lib/libgtest_main.la
218
219TESTS += test/gtest-message_test
220check_PROGRAMS += test/gtest-message_test
221test_gtest_message_test_SOURCES = test/gtest-message_test.cc
222test_gtest_message_test_LDADD = lib/libgtest_main.la
223
224TESTS += test/gtest_no_test_unittest
225check_PROGRAMS += test/gtest_no_test_unittest
226test_gtest_no_test_unittest_SOURCES = test/gtest_no_test_unittest.cc
227test_gtest_no_test_unittest_LDADD = lib/libgtest.la
228
229TESTS += test/gtest-options_test
230check_PROGRAMS += test/gtest-options_test
231test_gtest_options_test_SOURCES = test/gtest-options_test.cc
232test_gtest_options_test_LDADD = lib/libgtest_main.la
233
234TESTS += test/gtest-param-test_test
235check_PROGRAMS += test/gtest-param-test_test
236test_gtest_param_test_test_SOURCES = test/gtest-param-test_test.cc \
237 test/gtest-param-test2_test.cc \
238 test/gtest-param-test_test.h
239test_gtest_param_test_test_LDADD = lib/libgtest.la
240
241TESTS += test/gtest-port_test
242check_PROGRAMS += test/gtest-port_test
243test_gtest_port_test_SOURCES = test/gtest-port_test.cc
244test_gtest_port_test_LDADD = lib/libgtest_main.la
245
246TESTS += test/gtest_pred_impl_unittest
247check_PROGRAMS += test/gtest_pred_impl_unittest
248test_gtest_pred_impl_unittest_SOURCES = test/gtest_pred_impl_unittest.cc
249test_gtest_pred_impl_unittest_LDADD = lib/libgtest_main.la
250
251TESTS += test/gtest_prod_test
252check_PROGRAMS += test/gtest_prod_test
253test_gtest_prod_test_SOURCES = test/gtest_prod_test.cc \
254 test/production.cc \
255 test/production.h
256test_gtest_prod_test_LDADD = lib/libgtest_main.la
257
258TESTS += test/gtest_repeat_test
259check_PROGRAMS += test/gtest_repeat_test
260test_gtest_repeat_test_SOURCES = test/gtest_repeat_test.cc
261test_gtest_repeat_test_LDADD = lib/libgtest.la
262
263TESTS += test/gtest_sole_header_test
264check_PROGRAMS += test/gtest_sole_header_test
265test_gtest_sole_header_test_SOURCES = test/gtest_sole_header_test.cc
266test_gtest_sole_header_test_LDADD = lib/libgtest_main.la
267
268TESTS += test/gtest_stress_test
269check_PROGRAMS += test/gtest_stress_test
270test_gtest_stress_test_SOURCES = test/gtest_stress_test.cc
271test_gtest_stress_test_LDADD = lib/libgtest.la
272
273TESTS += test/gtest-test-part_test
274check_PROGRAMS += test/gtest-test-part_test
275test_gtest_test_part_test_SOURCES = test/gtest-test-part_test.cc
276test_gtest_test_part_test_LDADD = lib/libgtest_main.la
277
278TESTS += test/gtest_throw_on_failure_ex_test
279check_PROGRAMS += test/gtest_throw_on_failure_ex_test
280test_gtest_throw_on_failure_ex_test_SOURCES = \
281 test/gtest_throw_on_failure_ex_test.cc \
282 src/gtest-all.cc
283test_gtest_throw_on_failure_ex_test_CXXFLAGS = $(AM_CXXFLAGS) -fexceptions
284
285TESTS += test/gtest-typed-test_test
286check_PROGRAMS += test/gtest-typed-test_test
287test_gtest_typed_test_test_SOURCES = test/gtest-typed-test_test.cc \
288 test/gtest-typed-test2_test.cc \
289 test/gtest-typed-test_test.h
290test_gtest_typed_test_test_LDADD = lib/libgtest_main.la
291
292TESTS += test/gtest_unittest
293check_PROGRAMS += test/gtest_unittest
294test_gtest_unittest_SOURCES = test/gtest_unittest.cc
295test_gtest_unittest_LDADD = lib/libgtest_main.la
296
297TESTS += test/gtest-unittest-api_test
298check_PROGRAMS += test/gtest-unittest-api_test
299test_gtest_unittest_api_test_SOURCES = test/gtest-unittest-api_test.cc
300test_gtest_unittest_api_test_LDADD = lib/libgtest_main.la
301
302# Verifies that Google Test works when RTTI is disabled.
303TESTS += test/gtest_no_rtti_test
304check_PROGRAMS += test/gtest_no_rtti_test
305test_gtest_no_rtti_test_SOURCES = test/gtest_unittest.cc \
306 src/gtest-all.cc \
307 src/gtest_main.cc
308test_gtest_no_rtti_test_CXXFLAGS = $(AM_CXXFLAGS) -fno-rtti -DGTEST_HAS_RTTI=0
309
310# Verifies that Google Test's own TR1 tuple implementation works.
311TESTS += test/gtest-tuple_test
312check_PROGRAMS += test/gtest-tuple_test
313test_gtest_tuple_test_SOURCES = test/gtest-tuple_test.cc \
314 src/gtest-all.cc \
315 src/gtest_main.cc
316test_gtest_tuple_test_CXXFLAGS = $(AM_CXXFLAGS) -DGTEST_USE_OWN_TR1_TUPLE=1
317
318# Verifies that Google Test's features that use its own TR1 tuple work.
319TESTS += test/gtest_use_own_tuple_test
320check_PROGRAMS += test/gtest_use_own_tuple_test
321test_gtest_use_own_tuple_test_SOURCES = test/gtest-param-test_test.cc \
322 test/gtest-param-test2_test.cc \
323 src/gtest-all.cc
324test_gtest_use_own_tuple_test_CXXFLAGS = \
325 $(AM_CXXFLAGS) -DGTEST_USE_OWN_TR1_TUPLE=1
326
327# The following tests depend on the presence of a Python installation and are
328# keyed off of it. TODO(chandlerc@google.com): While we currently only attempt
329# to build and execute these tests if Autoconf has found Python v2.4 on the
330# system, we don't use the PYTHON variable it specified as the valid
331# interpreter. The problem is that TESTS_ENVIRONMENT is a global variable, and
332# thus we cannot distinguish between C++ unit tests and Python unit tests.
333if HAVE_PYTHON
334check_SCRIPTS =
335
336# These two Python modules are used by multiple Python tests below.
337check_SCRIPTS += test/gtest_test_utils.py \
338 test/gtest_xml_test_utils.py
339
340check_PROGRAMS += test/gtest_break_on_failure_unittest_
341test_gtest_break_on_failure_unittest__SOURCES = \
342 test/gtest_break_on_failure_unittest_.cc
343test_gtest_break_on_failure_unittest__LDADD = lib/libgtest.la
344check_SCRIPTS += test/gtest_break_on_failure_unittest.py
345TESTS += test/gtest_break_on_failure_unittest.py
346
347check_PROGRAMS += test/gtest_color_test_
348test_gtest_color_test__SOURCES = test/gtest_color_test_.cc
349test_gtest_color_test__LDADD = lib/libgtest.la
350check_SCRIPTS += test/gtest_color_test.py
351TESTS += test/gtest_color_test.py
352
353check_PROGRAMS += test/gtest_env_var_test_
354test_gtest_env_var_test__SOURCES = test/gtest_env_var_test_.cc
355test_gtest_env_var_test__LDADD = lib/libgtest.la
356check_SCRIPTS += test/gtest_env_var_test.py
357TESTS += test/gtest_env_var_test.py
358
359check_PROGRAMS += test/gtest_filter_unittest_
360test_gtest_filter_unittest__SOURCES = test/gtest_filter_unittest_.cc
361test_gtest_filter_unittest__LDADD = lib/libgtest.la
362check_SCRIPTS += test/gtest_filter_unittest.py
363TESTS += test/gtest_filter_unittest.py
364
365check_PROGRAMS += test/gtest_help_test_
366test_gtest_help_test__SOURCES = test/gtest_help_test_.cc
367test_gtest_help_test__LDADD = lib/libgtest_main.la
368check_SCRIPTS += test/gtest_help_test.py
369TESTS += test/gtest_help_test.py
370
371check_PROGRAMS += test/gtest_list_tests_unittest_
372test_gtest_list_tests_unittest__SOURCES = test/gtest_list_tests_unittest_.cc
373test_gtest_list_tests_unittest__LDADD = lib/libgtest.la
374check_SCRIPTS += test/gtest_list_tests_unittest.py
375TESTS += test/gtest_list_tests_unittest.py
376
377check_PROGRAMS += test/gtest_output_test_
378test_gtest_output_test__SOURCES = test/gtest_output_test_.cc
379test_gtest_output_test__LDADD = lib/libgtest.la
380check_SCRIPTS += test/gtest_output_test.py
381EXTRA_DIST += test/gtest_output_test_golden_lin.txt \
382 test/gtest_output_test_golden_win.txt
383TESTS += test/gtest_output_test.py
384
385check_PROGRAMS += test/gtest_throw_on_failure_test_
386test_gtest_throw_on_failure_test__SOURCES = \
387 test/gtest_throw_on_failure_test_.cc \
388 src/gtest-all.cc
389test_gtest_throw_on_failure_test__CXXFLAGS = $(AM_CXXFLAGS) -fno-exceptions
390check_SCRIPTS += test/gtest_throw_on_failure_test.py
391TESTS += test/gtest_throw_on_failure_test.py
392
393check_PROGRAMS += test/gtest_uninitialized_test_
394test_gtest_uninitialized_test__SOURCES = test/gtest_uninitialized_test_.cc
395test_gtest_uninitialized_test__LDADD = lib/libgtest.la
396check_SCRIPTS += test/gtest_uninitialized_test.py
397TESTS += test/gtest_uninitialized_test.py
398
399check_PROGRAMS += test/gtest_xml_outfile1_test_
400test_gtest_xml_outfile1_test__SOURCES = test/gtest_xml_outfile1_test_.cc
401test_gtest_xml_outfile1_test__LDADD = lib/libgtest_main.la
402check_PROGRAMS += test/gtest_xml_outfile2_test_
403test_gtest_xml_outfile2_test__SOURCES = test/gtest_xml_outfile2_test_.cc
404test_gtest_xml_outfile2_test__LDADD = lib/libgtest_main.la
405check_SCRIPTS += test/gtest_xml_outfiles_test.py
406TESTS += test/gtest_xml_outfiles_test.py
407
408check_PROGRAMS += test/gtest_xml_output_unittest_
409test_gtest_xml_output_unittest__SOURCES = test/gtest_xml_output_unittest_.cc
410test_gtest_xml_output_unittest__LDADD = lib/libgtest_main.la
411check_SCRIPTS += test/gtest_xml_output_unittest.py
412TESTS += test/gtest_xml_output_unittest.py
413
414# TODO(wan@google.com): make the build script compile and run the
415# negative-compilation tests. (The test/gtest_nc* files are unfinished
416# implementation of tests for verifying that certain kinds of misuse
417# of Google Test don't compile.)
418EXTRA_DIST += $(check_SCRIPTS) \
419 test/gtest_nc.cc \
420 test/gtest_nc_test.py
421
422endif
0423
=== removed file 'gtest/Makefile.am'
--- gtest/Makefile.am 2009-06-24 00:19:03 +0000
+++ gtest/Makefile.am 1970-01-01 00:00:00 +0000
@@ -1,390 +0,0 @@
1# Automake file
2
3# TODO(chandlerc@google.com): automate the generation of *.h from *.h.pump.
4
5# Nonstandard package files for distribution
6EXTRA_DIST = \
7 CHANGES \
8 CONTRIBUTORS \
9 include/gtest/gtest-param-test.h.pump \
10 include/gtest/internal/gtest-type-util.h.pump \
11 include/gtest/internal/gtest-param-util-generated.h.pump \
12 make/Makefile \
13 scons/SConscript \
14 scripts/fuse_gtest_files.py \
15 scripts/gen_gtest_pred_impl.py \
16 scripts/test/Makefile \
17 test/gtest_all_test.cc
18
19# MSVC project files
20EXTRA_DIST += \
21 msvc/gtest.sln \
22 msvc/gtest.vcproj \
23 msvc/gtest_color_test_.vcproj \
24 msvc/gtest_env_var_test_.vcproj \
25 msvc/gtest_environment_test.vcproj \
26 msvc/gtest_main.vcproj \
27 msvc/gtest_output_test_.vcproj \
28 msvc/gtest_prod_test.vcproj \
29 msvc/gtest_uninitialized_test_.vcproj \
30 msvc/gtest_unittest.vcproj
31
32# xcode project files
33EXTRA_DIST += \
34 xcode/Config/DebugProject.xcconfig \
35 xcode/Config/FrameworkTarget.xcconfig \
36 xcode/Config/General.xcconfig \
37 xcode/Config/ReleaseProject.xcconfig \
38 xcode/Config/TestTarget.xcconfig \
39 xcode/Config/InternalTestTarget.xcconfig \
40 xcode/Config/InternalPythonTestTarget.xcconfig \
41 xcode/Resources/Info.plist \
42 xcode/Scripts/versiongenerate.py \
43 xcode/Scripts/runtests.sh \
44 xcode/gtest.xcodeproj/project.pbxproj
45
46# xcode sample files
47EXTRA_DIST += \
48 xcode/Samples/FrameworkSample/Info.plist \
49 xcode/Samples/FrameworkSample/widget_test.cc \
50 xcode/Samples/FrameworkSample/widget.cc \
51 xcode/Samples/FrameworkSample/widget.h \
52 xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
53
54# C++Builder project files
55EXTRA_DIST += \
56 codegear/gtest_all.cc \
57 codegear/gtest_link.cc \
58 codegear/gtest.cbproj \
59 codegear/gtest_main.cbproj \
60 codegear/gtest_unittest.cbproj \
61 codegear/gtest.groupproj
62
63# TODO(wan@google.com): integrate scripts/gen_gtest_pred_impl.py into
64# the build system such that a user can specify the maximum predicate
65# arity here and have the script automatically generate the
66# corresponding .h and .cc files.
67
68# Scripts and utilities
69bin_SCRIPTS = scripts/gtest-config
70CLEANFILES = $(bin_SCRIPTS)
71
72# Distribute and install M4 macro
73m4datadir = $(datadir)/aclocal
74m4data_DATA = m4/gtest.m4
75EXTRA_DIST += $(m4data_DATA)
76
77# We define the global AM_CPPFLAGS as everything we compile includes from these
78# directories.
79AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/include
80
81# Build rules for libraries.
82lib_LTLIBRARIES = lib/libgtest.la lib/libgtest_main.la
83
84lib_libgtest_la_SOURCES = src/gtest.cc \
85 src/gtest-death-test.cc \
86 src/gtest-filepath.cc \
87 src/gtest-internal-inl.h \
88 src/gtest-port.cc \
89 src/gtest-test-part.cc \
90 src/gtest-typed-test.cc
91
92pkginclude_HEADERS = include/gtest/gtest.h \
93 include/gtest/gtest-death-test.h \
94 include/gtest/gtest-message.h \
95 include/gtest/gtest-param-test.h \
96 include/gtest/gtest_pred_impl.h \
97 include/gtest/gtest_prod.h \
98 include/gtest/gtest-spi.h \
99 include/gtest/gtest-test-part.h \
100 include/gtest/gtest-typed-test.h
101
102pkginclude_internaldir = $(pkgincludedir)/internal
103pkginclude_internal_HEADERS = \
104 include/gtest/internal/gtest-death-test-internal.h \
105 include/gtest/internal/gtest-filepath.h \
106 include/gtest/internal/gtest-internal.h \
107 include/gtest/internal/gtest-linked_ptr.h \
108 include/gtest/internal/gtest-param-util-generated.h \
109 include/gtest/internal/gtest-param-util.h \
110 include/gtest/internal/gtest-port.h \
111 include/gtest/internal/gtest-string.h \
112 include/gtest/internal/gtest-type-util.h
113
114lib_libgtest_main_la_SOURCES = src/gtest_main.cc
115lib_libgtest_main_la_LIBADD = lib/libgtest.la
116
117# Bulid rules for samples and tests. Automake's naming for some of
118# these variables isn't terribly obvious, so this is a brief
119# reference:
120#
121# TESTS -- Programs run automatically by "make check"
122# check_PROGRAMS -- Programs built by "make check" but not necessarily run
123
124noinst_LTLIBRARIES = samples/libsamples.la
125
126samples_libsamples_la_SOURCES = samples/sample1.cc \
127 samples/sample1.h \
128 samples/sample2.cc \
129 samples/sample2.h \
130 samples/sample3-inl.h \
131 samples/sample4.cc \
132 samples/sample4.h
133
134TESTS=
135TESTS_ENVIRONMENT = GTEST_SOURCE_DIR="$(srcdir)/test" \
136 GTEST_BUILD_DIR="$(top_builddir)/test"
137check_PROGRAMS=
138
139TESTS += samples/sample1_unittest
140check_PROGRAMS += samples/sample1_unittest
141samples_sample1_unittest_SOURCES = samples/sample1_unittest.cc
142samples_sample1_unittest_LDADD = lib/libgtest_main.la \
143 samples/libsamples.la
144
145TESTS += samples/sample2_unittest
146check_PROGRAMS += samples/sample2_unittest
147samples_sample2_unittest_SOURCES = samples/sample2_unittest.cc
148samples_sample2_unittest_LDADD = lib/libgtest_main.la \
149 samples/libsamples.la
150
151TESTS += samples/sample3_unittest
152check_PROGRAMS += samples/sample3_unittest
153samples_sample3_unittest_SOURCES = samples/sample3_unittest.cc
154samples_sample3_unittest_LDADD = lib/libgtest_main.la \
155 samples/libsamples.la
156
157TESTS += samples/sample4_unittest
158check_PROGRAMS += samples/sample4_unittest
159samples_sample4_unittest_SOURCES = samples/sample4_unittest.cc
160samples_sample4_unittest_LDADD = lib/libgtest_main.la \
161 samples/libsamples.la
162
163TESTS += samples/sample5_unittest
164check_PROGRAMS += samples/sample5_unittest
165samples_sample5_unittest_SOURCES = samples/sample5_unittest.cc
166samples_sample5_unittest_LDADD = lib/libgtest_main.la \
167 samples/libsamples.la
168
169TESTS += samples/sample6_unittest
170check_PROGRAMS += samples/sample6_unittest
171samples_sample6_unittest_SOURCES = samples/prime_tables.h \
172 samples/sample6_unittest.cc
173samples_sample6_unittest_LDADD = lib/libgtest_main.la \
174 samples/libsamples.la
175
176TESTS += samples/sample7_unittest
177check_PROGRAMS += samples/sample7_unittest
178samples_sample7_unittest_SOURCES = samples/prime_tables.h \
179 samples/sample7_unittest.cc
180samples_sample7_unittest_LDADD = lib/libgtest_main.la \
181 samples/libsamples.la
182
183TESTS += samples/sample8_unittest
184check_PROGRAMS += samples/sample8_unittest
185samples_sample8_unittest_SOURCES = samples/prime_tables.h \
186 samples/sample8_unittest.cc
187samples_sample8_unittest_LDADD = lib/libgtest_main.la \
188 samples/libsamples.la
189
190TESTS += test/gtest-death-test_test
191check_PROGRAMS += test/gtest-death-test_test
192test_gtest_death_test_test_SOURCES = test/gtest-death-test_test.cc
193test_gtest_death_test_test_CXXFLAGS = $(AM_CXXFLAGS) $(PTHREAD_CFLAGS)
194test_gtest_death_test_test_LDADD = $(PTHREAD_LIBS) $(PTHREAD_CFLAGS) \
195 lib/libgtest_main.la
196
197TESTS += test/gtest_environment_test
198check_PROGRAMS += test/gtest_environment_test
199test_gtest_environment_test_SOURCES = test/gtest_environment_test.cc
200test_gtest_environment_test_LDADD = lib/libgtest.la
201
202TESTS += test/gtest-filepath_test
203check_PROGRAMS += test/gtest-filepath_test
204test_gtest_filepath_test_SOURCES = test/gtest-filepath_test.cc
205test_gtest_filepath_test_LDADD = lib/libgtest_main.la
206
207TESTS += test/gtest-linked_ptr_test
208check_PROGRAMS += test/gtest-linked_ptr_test
209test_gtest_linked_ptr_test_SOURCES = test/gtest-linked_ptr_test.cc
210test_gtest_linked_ptr_test_LDADD = lib/libgtest_main.la
211
212TESTS += test/gtest_main_unittest
213check_PROGRAMS += test/gtest_main_unittest
214test_gtest_main_unittest_SOURCES = test/gtest_main_unittest.cc
215test_gtest_main_unittest_LDADD = lib/libgtest_main.la
216
217TESTS += test/gtest-message_test
218check_PROGRAMS += test/gtest-message_test
219test_gtest_message_test_SOURCES = test/gtest-message_test.cc
220test_gtest_message_test_LDADD = lib/libgtest_main.la
221
222TESTS += test/gtest_no_test_unittest
223check_PROGRAMS += test/gtest_no_test_unittest
224test_gtest_no_test_unittest_SOURCES = test/gtest_no_test_unittest.cc
225test_gtest_no_test_unittest_LDADD = lib/libgtest.la
226
227TESTS += test/gtest-options_test
228check_PROGRAMS += test/gtest-options_test
229test_gtest_options_test_SOURCES = test/gtest-options_test.cc
230test_gtest_options_test_LDADD = lib/libgtest_main.la
231
232TESTS += test/gtest-param-test_test
233check_PROGRAMS += test/gtest-param-test_test
234test_gtest_param_test_test_SOURCES = test/gtest-param-test_test.cc \
235 test/gtest-param-test2_test.cc \
236 test/gtest-param-test_test.h
237test_gtest_param_test_test_LDADD = lib/libgtest.la
238
239TESTS += test/gtest-port_test
240check_PROGRAMS += test/gtest-port_test
241test_gtest_port_test_SOURCES = test/gtest-port_test.cc
242test_gtest_port_test_LDADD = lib/libgtest_main.la
243
244TESTS += test/gtest_pred_impl_unittest
245check_PROGRAMS += test/gtest_pred_impl_unittest
246test_gtest_pred_impl_unittest_SOURCES = test/gtest_pred_impl_unittest.cc
247test_gtest_pred_impl_unittest_LDADD = lib/libgtest_main.la
248
249TESTS += test/gtest_prod_test
250check_PROGRAMS += test/gtest_prod_test
251test_gtest_prod_test_SOURCES = test/gtest_prod_test.cc \
252 test/production.cc \
253 test/production.h
254test_gtest_prod_test_LDADD = lib/libgtest_main.la
255
256TESTS += test/gtest_repeat_test
257check_PROGRAMS += test/gtest_repeat_test
258test_gtest_repeat_test_SOURCES = test/gtest_repeat_test.cc
259test_gtest_repeat_test_LDADD = lib/libgtest.la
260
261TESTS += test/gtest_sole_header_test
262check_PROGRAMS += test/gtest_sole_header_test
263test_gtest_sole_header_test_SOURCES = test/gtest_sole_header_test.cc
264test_gtest_sole_header_test_LDADD = lib/libgtest_main.la
265
266TESTS += test/gtest_stress_test
267check_PROGRAMS += test/gtest_stress_test
268test_gtest_stress_test_SOURCES = test/gtest_stress_test.cc
269test_gtest_stress_test_LDADD = lib/libgtest.la
270
271TESTS += test/gtest-test-part_test
272check_PROGRAMS += test/gtest-test-part_test
273test_gtest_test_part_test_SOURCES = test/gtest-test-part_test.cc
274test_gtest_test_part_test_LDADD = lib/libgtest_main.la
275
276TESTS += test/gtest_throw_on_failure_ex_test
277check_PROGRAMS += test/gtest_throw_on_failure_ex_test
278test_gtest_throw_on_failure_ex_test_SOURCES = \
279 test/gtest_throw_on_failure_ex_test.cc \
280 src/gtest-all.cc
281test_gtest_throw_on_failure_ex_test_CXXFLAGS = $(AM_CXXFLAGS) -fexceptions
282
283TESTS += test/gtest-typed-test_test
284check_PROGRAMS += test/gtest-typed-test_test
285test_gtest_typed_test_test_SOURCES = test/gtest-typed-test_test.cc \
286 test/gtest-typed-test2_test.cc \
287 test/gtest-typed-test_test.h
288test_gtest_typed_test_test_LDADD = lib/libgtest_main.la
289
290TESTS += test/gtest_unittest
291check_PROGRAMS += test/gtest_unittest
292test_gtest_unittest_SOURCES = test/gtest_unittest.cc
293test_gtest_unittest_LDADD = lib/libgtest_main.la
294
295# The following tests depend on the presence of a Python installation and are
296# keyed off of it. TODO(chandlerc@google.com): While we currently only attempt
297# to build and execute these tests if Autoconf has found Python v2.4 on the
298# system, we don't use the PYTHON variable it specified as the valid
299# interpreter. The problem is that TESTS_ENVIRONMENT is a global variable, and
300# thus we cannot distinguish between C++ unit tests and Python unit tests.
301if HAVE_PYTHON
302check_SCRIPTS =
303
304# These two Python modules are used by multiple Python tests below.
305check_SCRIPTS += test/gtest_test_utils.py \
306 test/gtest_xml_test_utils.py
307
308check_PROGRAMS += test/gtest_break_on_failure_unittest_
309test_gtest_break_on_failure_unittest__SOURCES = \
310 test/gtest_break_on_failure_unittest_.cc
311test_gtest_break_on_failure_unittest__LDADD = lib/libgtest.la
312check_SCRIPTS += test/gtest_break_on_failure_unittest.py
313TESTS += test/gtest_break_on_failure_unittest.py
314
315check_PROGRAMS += test/gtest_color_test_
316test_gtest_color_test__SOURCES = test/gtest_color_test_.cc
317test_gtest_color_test__LDADD = lib/libgtest.la
318check_SCRIPTS += test/gtest_color_test.py
319TESTS += test/gtest_color_test.py
320
321check_PROGRAMS += test/gtest_env_var_test_
322test_gtest_env_var_test__SOURCES = test/gtest_env_var_test_.cc
323test_gtest_env_var_test__LDADD = lib/libgtest.la
324check_SCRIPTS += test/gtest_env_var_test.py
325TESTS += test/gtest_env_var_test.py
326
327check_PROGRAMS += test/gtest_filter_unittest_
328test_gtest_filter_unittest__SOURCES = test/gtest_filter_unittest_.cc
329test_gtest_filter_unittest__LDADD = lib/libgtest.la
330check_SCRIPTS += test/gtest_filter_unittest.py
331TESTS += test/gtest_filter_unittest.py
332
333check_PROGRAMS += test/gtest_help_test_
334test_gtest_help_test__SOURCES = test/gtest_help_test_.cc
335test_gtest_help_test__LDADD = lib/libgtest_main.la
336check_SCRIPTS += test/gtest_help_test.py
337TESTS += test/gtest_help_test.py
338
339check_PROGRAMS += test/gtest_list_tests_unittest_
340test_gtest_list_tests_unittest__SOURCES = test/gtest_list_tests_unittest_.cc
341test_gtest_list_tests_unittest__LDADD = lib/libgtest.la
342check_SCRIPTS += test/gtest_list_tests_unittest.py
343TESTS += test/gtest_list_tests_unittest.py
344
345check_PROGRAMS += test/gtest_output_test_
346test_gtest_output_test__SOURCES = test/gtest_output_test_.cc
347test_gtest_output_test__LDADD = lib/libgtest.la
348check_SCRIPTS += test/gtest_output_test.py
349EXTRA_DIST += test/gtest_output_test_golden_lin.txt \
350 test/gtest_output_test_golden_win.txt
351TESTS += test/gtest_output_test.py
352
353check_PROGRAMS += test/gtest_throw_on_failure_test_
354test_gtest_throw_on_failure_test__SOURCES = \
355 test/gtest_throw_on_failure_test_.cc \
356 src/gtest-all.cc
357test_gtest_throw_on_failure_test__CXXFLAGS = $(AM_CXXFLAGS) -fno-exceptions
358check_SCRIPTS += test/gtest_throw_on_failure_test.py
359TESTS += test/gtest_throw_on_failure_test.py
360
361check_PROGRAMS += test/gtest_uninitialized_test_
362test_gtest_uninitialized_test__SOURCES = test/gtest_uninitialized_test_.cc
363test_gtest_uninitialized_test__LDADD = lib/libgtest.la
364check_SCRIPTS += test/gtest_uninitialized_test.py
365TESTS += test/gtest_uninitialized_test.py
366
367check_PROGRAMS += test/gtest_xml_outfile1_test_
368test_gtest_xml_outfile1_test__SOURCES = test/gtest_xml_outfile1_test_.cc
369test_gtest_xml_outfile1_test__LDADD = lib/libgtest_main.la
370check_PROGRAMS += test/gtest_xml_outfile2_test_
371test_gtest_xml_outfile2_test__SOURCES = test/gtest_xml_outfile2_test_.cc
372test_gtest_xml_outfile2_test__LDADD = lib/libgtest_main.la
373check_SCRIPTS += test/gtest_xml_outfiles_test.py
374TESTS += test/gtest_xml_outfiles_test.py
375
376check_PROGRAMS += test/gtest_xml_output_unittest_
377test_gtest_xml_output_unittest__SOURCES = test/gtest_xml_output_unittest_.cc
378test_gtest_xml_output_unittest__LDADD = lib/libgtest_main.la
379check_SCRIPTS += test/gtest_xml_output_unittest.py
380TESTS += test/gtest_xml_output_unittest.py
381
382# TODO(wan@google.com): make the build script compile and run the
383# negative-compilation tests. (The test/gtest_nc* files are unfinished
384# implementation of tests for verifying that certain kinds of misuse
385# of Google Test don't compile.)
386EXTRA_DIST += $(check_SCRIPTS) \
387 test/gtest_nc.cc \
388 test/gtest_nc_test.py
389
390endif
3910
=== added file 'gtest/Makefile.in'
--- gtest/Makefile.in 1970-01-01 00:00:00 +0000
+++ gtest/Makefile.in 2010-01-18 04:34:16 +0000
@@ -0,0 +1,2202 @@
1# Makefile.in generated by automake 1.10.1 from Makefile.am.
2# @configure_input@
3
4# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
6# This Makefile.in is free software; the Free Software Foundation
7# gives unlimited permission to copy and/or distribute it,
8# with or without modifications, as long as this notice is preserved.
9
10# This program is distributed in the hope that it will be useful,
11# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
12# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
13# PARTICULAR PURPOSE.
14
15@SET_MAKE@
16
17# Automake file
18
19# TODO(chandlerc@google.com): automate the generation of *.h from *.h.pump.
20
21
22
23
24VPATH = @srcdir@
25pkgdatadir = $(datadir)/@PACKAGE@
26pkglibdir = $(libdir)/@PACKAGE@
27pkgincludedir = $(includedir)/@PACKAGE@
28am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
29install_sh_DATA = $(install_sh) -c -m 644
30install_sh_PROGRAM = $(install_sh) -c
31install_sh_SCRIPT = $(install_sh) -c
32INSTALL_HEADER = $(INSTALL_DATA)
33transform = $(program_transform_name)
34NORMAL_INSTALL = :
35PRE_INSTALL = :
36POST_INSTALL = :
37NORMAL_UNINSTALL = :
38PRE_UNINSTALL = :
39POST_UNINSTALL = :
40build_triplet = @build@
41host_triplet = @host@
42TESTS = samples/sample1_unittest$(EXEEXT) \
43 samples/sample2_unittest$(EXEEXT) \
44 samples/sample3_unittest$(EXEEXT) \
45 samples/sample4_unittest$(EXEEXT) \
46 samples/sample5_unittest$(EXEEXT) \
47 samples/sample6_unittest$(EXEEXT) \
48 samples/sample7_unittest$(EXEEXT) \
49 samples/sample8_unittest$(EXEEXT) \
50 test/gtest-death-test_test$(EXEEXT) \
51 test/gtest_environment_test$(EXEEXT) \
52 test/gtest-filepath_test$(EXEEXT) \
53 test/gtest-linked_ptr_test$(EXEEXT) \
54 test/gtest_main_unittest$(EXEEXT) \
55 test/gtest-message_test$(EXEEXT) \
56 test/gtest_no_test_unittest$(EXEEXT) \
57 test/gtest-options_test$(EXEEXT) \
58 test/gtest-param-test_test$(EXEEXT) \
59 test/gtest-port_test$(EXEEXT) \
60 test/gtest_pred_impl_unittest$(EXEEXT) \
61 test/gtest_prod_test$(EXEEXT) test/gtest_repeat_test$(EXEEXT) \
62 test/gtest_sole_header_test$(EXEEXT) \
63 test/gtest_stress_test$(EXEEXT) \
64 test/gtest-test-part_test$(EXEEXT) \
65 test/gtest_throw_on_failure_ex_test$(EXEEXT) \
66 test/gtest-typed-test_test$(EXEEXT) \
67 test/gtest_unittest$(EXEEXT) \
68 test/gtest-unittest-api_test$(EXEEXT) \
69 test/gtest_no_rtti_test$(EXEEXT) \
70 test/gtest-tuple_test$(EXEEXT) \
71 test/gtest_use_own_tuple_test$(EXEEXT) $(am__append_2)
72check_PROGRAMS = samples/sample1_unittest$(EXEEXT) \
73 samples/sample2_unittest$(EXEEXT) \
74 samples/sample3_unittest$(EXEEXT) \
75 samples/sample4_unittest$(EXEEXT) \
76 samples/sample5_unittest$(EXEEXT) \
77 samples/sample6_unittest$(EXEEXT) \
78 samples/sample7_unittest$(EXEEXT) \
79 samples/sample8_unittest$(EXEEXT) \
80 test/gtest-death-test_test$(EXEEXT) \
81 test/gtest_environment_test$(EXEEXT) \
82 test/gtest-filepath_test$(EXEEXT) \
83 test/gtest-linked_ptr_test$(EXEEXT) \
84 test/gtest_main_unittest$(EXEEXT) \
85 test/gtest-message_test$(EXEEXT) \
86 test/gtest_no_test_unittest$(EXEEXT) \
87 test/gtest-options_test$(EXEEXT) \
88 test/gtest-param-test_test$(EXEEXT) \
89 test/gtest-port_test$(EXEEXT) \
90 test/gtest_pred_impl_unittest$(EXEEXT) \
91 test/gtest_prod_test$(EXEEXT) test/gtest_repeat_test$(EXEEXT) \
92 test/gtest_sole_header_test$(EXEEXT) \
93 test/gtest_stress_test$(EXEEXT) \
94 test/gtest-test-part_test$(EXEEXT) \
95 test/gtest_throw_on_failure_ex_test$(EXEEXT) \
96 test/gtest-typed-test_test$(EXEEXT) \
97 test/gtest_unittest$(EXEEXT) \
98 test/gtest-unittest-api_test$(EXEEXT) \
99 test/gtest_no_rtti_test$(EXEEXT) \
100 test/gtest-tuple_test$(EXEEXT) \
101 test/gtest_use_own_tuple_test$(EXEEXT) $(am__EXEEXT_1)
102@HAVE_PYTHON_TRUE@am__append_1 = \
103@HAVE_PYTHON_TRUE@ test/gtest_break_on_failure_unittest_ \
104@HAVE_PYTHON_TRUE@ test/gtest_color_test_ \
105@HAVE_PYTHON_TRUE@ test/gtest_env_var_test_ \
106@HAVE_PYTHON_TRUE@ test/gtest_filter_unittest_ \
107@HAVE_PYTHON_TRUE@ test/gtest_help_test_ \
108@HAVE_PYTHON_TRUE@ test/gtest_list_tests_unittest_ \
109@HAVE_PYTHON_TRUE@ test/gtest_output_test_ \
110@HAVE_PYTHON_TRUE@ test/gtest_throw_on_failure_test_ \
111@HAVE_PYTHON_TRUE@ test/gtest_uninitialized_test_ \
112@HAVE_PYTHON_TRUE@ test/gtest_xml_outfile1_test_ \
113@HAVE_PYTHON_TRUE@ test/gtest_xml_outfile2_test_ \
114@HAVE_PYTHON_TRUE@ test/gtest_xml_output_unittest_
115@HAVE_PYTHON_TRUE@am__append_2 = \
116@HAVE_PYTHON_TRUE@ test/gtest_break_on_failure_unittest.py \
117@HAVE_PYTHON_TRUE@ test/gtest_color_test.py \
118@HAVE_PYTHON_TRUE@ test/gtest_env_var_test.py \
119@HAVE_PYTHON_TRUE@ test/gtest_filter_unittest.py \
120@HAVE_PYTHON_TRUE@ test/gtest_help_test.py \
121@HAVE_PYTHON_TRUE@ test/gtest_list_tests_unittest.py \
122@HAVE_PYTHON_TRUE@ test/gtest_output_test.py \
123@HAVE_PYTHON_TRUE@ test/gtest_throw_on_failure_test.py \
124@HAVE_PYTHON_TRUE@ test/gtest_uninitialized_test.py \
125@HAVE_PYTHON_TRUE@ test/gtest_xml_outfiles_test.py \
126@HAVE_PYTHON_TRUE@ test/gtest_xml_output_unittest.py
127
128# TODO(wan@google.com): make the build script compile and run the
129# negative-compilation tests. (The test/gtest_nc* files are unfinished
130# implementation of tests for verifying that certain kinds of misuse
131# of Google Test don't compile.)
132@HAVE_PYTHON_TRUE@am__append_3 = \
133@HAVE_PYTHON_TRUE@ test/gtest_output_test_golden_lin.txt \
134@HAVE_PYTHON_TRUE@ test/gtest_output_test_golden_win.txt \
135@HAVE_PYTHON_TRUE@ $(check_SCRIPTS) test/gtest_nc.cc \
136@HAVE_PYTHON_TRUE@ test/gtest_nc_test.py
137subdir = .
138DIST_COMMON = README $(am__configure_deps) $(pkginclude_HEADERS) \
139 $(pkginclude_internal_HEADERS) $(srcdir)/Makefile.am \
140 $(srcdir)/Makefile.in $(top_srcdir)/build-aux/config.h.in \
141 $(top_srcdir)/configure $(top_srcdir)/scripts/gtest-config.in \
142 COPYING build-aux/config.guess build-aux/config.sub \
143 build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \
144 build-aux/missing
145ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
146am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \
147 $(top_srcdir)/configure.ac
148am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
149 $(ACLOCAL_M4)
150am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
151 configure.lineno config.status.lineno
152mkinstalldirs = $(install_sh) -d
153CONFIG_HEADER = $(top_builddir)/build-aux/config.h
154CONFIG_CLEAN_FILES = scripts/gtest-config
155am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
156am__vpath_adj = case $$p in \
157 $(srcdir)/*) f