From a721837ed0c1b9783deb72a09d51dfad79411262 Mon Sep 17 00:00:00 2001 From: frsyuki Date: Sun, 15 Feb 2009 09:09:57 +0000 Subject: [PATCH] lang/c/msgpack: added license notifications git-svn-id: file:///Users/frsyuki/project/msgpack-git/svn/x@60 5a5092ae-2292-43ba-b2d5-dcab9c1a2731 --- AUTHORS | 1 + COPYING | 14 ++++++++++++++ c/AUTHORS | 1 + c/COPYING | 14 ++++++++++++++ c/Makefile.am | 3 +++ c/README | 21 +++++++++++++++++++++ c/configure.in | 2 +- c/msgpack.h | 19 +++++++++++++++++++ c/pack.h | 17 +++++++++++++++++ c/pack_inline.h | 17 +++++++++++++++++ c/unpack.c | 2 +- configure.in | 2 +- cpp/AUTHORS | 1 + cpp/COPYING | 14 ++++++++++++++ cpp/Makefile.am | 7 ++++++- cpp/README | 21 +++++++++++++++++++++ cpp/configure.in | 2 +- cpp/msgpack.hpp | 21 +++++++++++++++++++++ cpp/object.cpp | 17 +++++++++++++++++ cpp/object.hpp | 17 +++++++++++++++++ cpp/pack.hpp | 17 +++++++++++++++++ cpp/test.cpp | 5 +++-- cpp/unpack.cpp | 17 +++++++++++++++++ cpp/unpack.hpp | 17 +++++++++++++++++ cpp/unpack_context.hpp | 17 +++++++++++++++++ cpp/unpack_inline.cpp | 17 +++++++++++++++++ cpp/zone.cpp | 17 +++++++++++++++++ cpp/zone.hpp.erb | 17 +++++++++++++++++ ruby/gem/Manifest.txt | 1 - ruby/gem/lib/msgpack/version.rb | 4 ++-- ruby/{gem.sh => gengem.sh} | 1 - 31 files changed, 332 insertions(+), 11 deletions(-) create mode 100644 COPYING create mode 100644 c/COPYING create mode 100644 c/msgpack.h create mode 100644 cpp/COPYING create mode 100644 cpp/msgpack.hpp rename ruby/{gem.sh => gengem.sh} (90%) diff --git a/AUTHORS b/AUTHORS index e69de29b..ababacb0 100644 --- a/AUTHORS +++ b/AUTHORS @@ -0,0 +1 @@ +FURUHASHI Sadayuki diff --git a/COPYING b/COPYING new file mode 100644 index 00000000..5f100cd0 --- /dev/null +++ b/COPYING @@ -0,0 +1,14 @@ +Copyright (C) 2008 FURUHASHI Sadayuki + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/c/AUTHORS b/c/AUTHORS index e69de29b..ababacb0 100644 --- a/c/AUTHORS +++ b/c/AUTHORS @@ -0,0 +1 @@ +FURUHASHI Sadayuki diff --git a/c/COPYING b/c/COPYING new file mode 100644 index 00000000..5f100cd0 --- /dev/null +++ b/c/COPYING @@ -0,0 +1,14 @@ +Copyright (C) 2008 FURUHASHI Sadayuki + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/c/Makefile.am b/c/Makefile.am index 15cf753c..af8f3adb 100644 --- a/c/Makefile.am +++ b/c/Makefile.am @@ -6,6 +6,7 @@ libmsgpackc_la_SOURCES = \ unpack_inline.c nobase_include_HEADERS = \ + msgpack.h \ msgpack/pack.h \ msgpack/unpack.h @@ -13,3 +14,5 @@ noinst_HEADERS = \ pack_inline.h \ unpack_context.h +libmsgpackc_la_LDFLAGS = -version-info 0:0:0 + diff --git a/c/README b/c/README index e69de29b..609b67d7 100644 --- a/c/README +++ b/c/README @@ -0,0 +1,21 @@ +MessagePack for C +----------------- +MessagePack is a binary-based efficient data interchange format. + + + +Copyright (C) 2008 FURUHASHI Sadayuki + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + diff --git a/c/configure.in b/c/configure.in index 0f374601..4bc7e3e5 100644 --- a/c/configure.in +++ b/c/configure.in @@ -1,5 +1,5 @@ AC_INIT(pack.h) -AM_INIT_AUTOMAKE(msgpackc, 0.1) +AM_INIT_AUTOMAKE(msgpackc, 0.1.0) AC_CONFIG_HEADER(config.h) AC_PROG_CC diff --git a/c/msgpack.h b/c/msgpack.h new file mode 100644 index 00000000..7a15f71f --- /dev/null +++ b/c/msgpack.h @@ -0,0 +1,19 @@ +/* + * MessagePack for C + * + * Copyright (C) 2008 FURUHASHI Sadayuki + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include "msgpack/pack.h" +#include "msgpack/unpack.h" diff --git a/c/pack.h b/c/pack.h index 8107d9f4..3144f37d 100644 --- a/c/pack.h +++ b/c/pack.h @@ -1,3 +1,20 @@ +/* + * MessagePack packing routine for C + * + * Copyright (C) 2008 FURUHASHI Sadayuki + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #ifndef MSGPACK_PACK_H__ #define MSGPACK_PACK_H__ diff --git a/c/pack_inline.h b/c/pack_inline.h index b1f9e63b..acd96fa6 100644 --- a/c/pack_inline.h +++ b/c/pack_inline.h @@ -1,3 +1,20 @@ +/* + * MessagePack packing routine for C + * + * Copyright (C) 2008 FURUHASHI Sadayuki + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #ifndef PACK_INLINE_H__ #define PACK_INLINE_H__ diff --git a/c/unpack.c b/c/unpack.c index 9fe36959..012888e8 100644 --- a/c/unpack.c +++ b/c/unpack.c @@ -1,5 +1,5 @@ /* - * MessagePack packing routine for C + * MessagePack unpacking routine for C * * Copyright (C) 2008 FURUHASHI Sadayuki * diff --git a/configure.in b/configure.in index 941168c0..9b6f6d41 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ AC_INIT(msgpack/unpack/inline_impl.h) -AM_INIT_AUTOMAKE(msgpack, 0.1) +AM_INIT_AUTOMAKE(msgpack, 0.1.0) AC_CONFIG_HEADER(config.h) AC_PROG_LIBTOOL diff --git a/cpp/AUTHORS b/cpp/AUTHORS index e69de29b..ababacb0 100644 --- a/cpp/AUTHORS +++ b/cpp/AUTHORS @@ -0,0 +1 @@ +FURUHASHI Sadayuki diff --git a/cpp/COPYING b/cpp/COPYING new file mode 100644 index 00000000..5f100cd0 --- /dev/null +++ b/cpp/COPYING @@ -0,0 +1,14 @@ +Copyright (C) 2008 FURUHASHI Sadayuki + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/cpp/Makefile.am b/cpp/Makefile.am index 664f1ed7..b9ecb1d2 100644 --- a/cpp/Makefile.am +++ b/cpp/Makefile.am @@ -7,6 +7,7 @@ libmsgpack_la_SOURCES = \ zone.cpp nobase_include_HEADERS = \ + msgpack.hpp \ msgpack/pack.hpp \ msgpack/unpack.hpp \ msgpack/object.hpp \ @@ -15,6 +16,10 @@ nobase_include_HEADERS = \ noinst_HEADERS = \ unpack_context.hpp -zone.hpp: zone.hpp.erb +msgpack/zone.hpp: msgpack/zone.hpp.erb erb $< > $@ +MOSTLYCLEANFILES = zone.hpp + +libmsgpack_la_LDFLAGS = -version-info 0:0:0 + diff --git a/cpp/README b/cpp/README index e69de29b..eceff1ba 100644 --- a/cpp/README +++ b/cpp/README @@ -0,0 +1,21 @@ +MessagePack for C++ +------------------- +MessagePack is a binary-based efficient data interchange format. + + + +Copyright (C) 2008 FURUHASHI Sadayuki + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + diff --git a/cpp/configure.in b/cpp/configure.in index a94738ad..e9e21ea1 100644 --- a/cpp/configure.in +++ b/cpp/configure.in @@ -1,5 +1,5 @@ AC_INIT(object.hpp) -AM_INIT_AUTOMAKE(msgpack, 0.1) +AM_INIT_AUTOMAKE(msgpack, 0.1.0) AC_CONFIG_HEADER(config.h) AC_PROG_CXX diff --git a/cpp/msgpack.hpp b/cpp/msgpack.hpp new file mode 100644 index 00000000..9f635d07 --- /dev/null +++ b/cpp/msgpack.hpp @@ -0,0 +1,21 @@ +// +// MessagePack for C++ +// +// Copyright (C) 2008 FURUHASHI Sadayuki +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#include "msgpack/object.hpp" +#include "msgpack/zone.hpp" +#include "msgpack/pack.hpp" +#include "msgpack/unpack.hpp" diff --git a/cpp/object.cpp b/cpp/object.cpp index 947e8dda..d6815ac4 100644 --- a/cpp/object.cpp +++ b/cpp/object.cpp @@ -1,3 +1,20 @@ +// +// MessagePack for C++ dynamic typed objects +// +// Copyright (C) 2008 FURUHASHI Sadayuki +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// #include "msgpack/object.hpp" #include "msgpack/pack.hpp" diff --git a/cpp/object.hpp b/cpp/object.hpp index f029e328..b1f53690 100644 --- a/cpp/object.hpp +++ b/cpp/object.hpp @@ -1,3 +1,20 @@ +// +// MessagePack for C++ dynamic typed objects +// +// Copyright (C) 2008 FURUHASHI Sadayuki +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// #ifndef MSGPACK_OBJECT_HPP__ #define MSGPACK_OBJECT_HPP__ diff --git a/cpp/pack.hpp b/cpp/pack.hpp index 89f8cee9..ac7bb832 100644 --- a/cpp/pack.hpp +++ b/cpp/pack.hpp @@ -1,3 +1,20 @@ +// +// MessagePack for C++ serializing routine +// +// Copyright (C) 2008 FURUHASHI Sadayuki +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// #ifndef MSGPACK_PACK_HPP__ #define MSGPACK_PACK_HPP__ diff --git a/cpp/test.cpp b/cpp/test.cpp index e236d0fe..7c91fbdf 100644 --- a/cpp/test.cpp +++ b/cpp/test.cpp @@ -1,7 +1,8 @@ #include #include -#include -#include +//#include +//#include +#include #include #include diff --git a/cpp/unpack.cpp b/cpp/unpack.cpp index 6a6a4e85..a0128bbb 100644 --- a/cpp/unpack.cpp +++ b/cpp/unpack.cpp @@ -1,3 +1,20 @@ +// +// MessagePack for C++ deserializing routine +// +// Copyright (C) 2008 FURUHASHI Sadayuki +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// #include "msgpack/unpack.hpp" #include "unpack_context.hpp" #include diff --git a/cpp/unpack.hpp b/cpp/unpack.hpp index 9bda5445..452a2311 100644 --- a/cpp/unpack.hpp +++ b/cpp/unpack.hpp @@ -1,3 +1,20 @@ +// +// MessagePack for C++ deserializing routine +// +// Copyright (C) 2008 FURUHASHI Sadayuki +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// #ifndef MSGPACK_UNPACK_HPP__ #define MSGPACK_UNPACK_HPP__ diff --git a/cpp/unpack_context.hpp b/cpp/unpack_context.hpp index 49a93e43..59bd8720 100644 --- a/cpp/unpack_context.hpp +++ b/cpp/unpack_context.hpp @@ -1,3 +1,20 @@ +// +// MessagePack for C++ deserializing routine +// +// Copyright (C) 2008 FURUHASHI Sadayuki +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// #ifndef UNPACK_CONTEXT_HPP__ #define UNPACK_CONTEXT_HPP__ diff --git a/cpp/unpack_inline.cpp b/cpp/unpack_inline.cpp index 90023277..37e0b666 100644 --- a/cpp/unpack_inline.cpp +++ b/cpp/unpack_inline.cpp @@ -1,3 +1,20 @@ +// +// MessagePack for C++ deserializing routine +// +// Copyright (C) 2008 FURUHASHI Sadayuki +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// #include "unpack_context.hpp" diff --git a/cpp/zone.cpp b/cpp/zone.cpp index ea4c7e4e..22be7592 100644 --- a/cpp/zone.cpp +++ b/cpp/zone.cpp @@ -1,3 +1,20 @@ +// +// MessagePack for C++ memory pool +// +// Copyright (C) 2008 FURUHASHI Sadayuki +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// #include "zone.hpp" namespace msgpack { diff --git a/cpp/zone.hpp.erb b/cpp/zone.hpp.erb index 5c0e0d8d..ac08595c 100644 --- a/cpp/zone.hpp.erb +++ b/cpp/zone.hpp.erb @@ -1,3 +1,20 @@ +// +// MessagePack for C++ memory pool +// +// Copyright (C) 2008 FURUHASHI Sadayuki +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// #ifndef MSGPACK_ZONE_HPP__ #define MSGPACK_ZONE_HPP__ #include diff --git a/ruby/gem/Manifest.txt b/ruby/gem/Manifest.txt index fac85552..299a4e02 100644 --- a/ruby/gem/Manifest.txt +++ b/ruby/gem/Manifest.txt @@ -13,7 +13,6 @@ ext/unpack.c ext/unpack.h ext/unpack_context.h ext/unpack_inline.c -msgpack/pack/inline_context.h msgpack/pack/inline_impl.h msgpack/unpack/inline_context.h msgpack/unpack/inline_impl.h diff --git a/ruby/gem/lib/msgpack/version.rb b/ruby/gem/lib/msgpack/version.rb index 44d1dc02..c65972f4 100644 --- a/ruby/gem/lib/msgpack/version.rb +++ b/ruby/gem/lib/msgpack/version.rb @@ -1,8 +1,8 @@ module MessagePack module VERSION #:nodoc: MAJOR = 0 - MINOR = 0 - TINY = 1 + MINOR = 1 + TINY = 0 STRING = [MAJOR, MINOR, TINY].join('.') end diff --git a/ruby/gem.sh b/ruby/gengem.sh similarity index 90% rename from ruby/gem.sh rename to ruby/gengem.sh index 9d9f4294..4f8623cc 100755 --- a/ruby/gem.sh +++ b/ruby/gengem.sh @@ -10,7 +10,6 @@ cp unpack.h gem/ext/ cp unpack_context.h gem/ext/ cp unpack_inline.c gem/ext/ cp ../README gem/README.txt -cp ../msgpack/pack/inline_context.h gem/msgpack/pack/ cp ../msgpack/pack/inline_impl.h gem/msgpack/pack/ cp ../msgpack/unpack/inline_context.h gem/msgpack/unpack/ cp ../msgpack/unpack/inline_impl.h gem/msgpack/unpack/