renaming: ndn-cpp to ndn-cpp-dev

Change-Id: Iff3e4ff53a0005b7dd35c57d03da76b347170d03
This commit is contained in:
Yingdi Yu authored and Alexander Afanasyev committed 2014-01-20 15:35:52 -08:00
1 parent b4500d9568
commit 61ec2726de
126 files changed
+132 -133

No files matched your search

+1 -1
View File
@@ -24,7 +24,7 @@ config.log
/include/config.h
/_configs.sed
/stamp-h1
/include/ndn-cpp/ndn-cpp-config.h
/include/ndn-cpp-dev/ndn-cpp-config.h
/include/stamp-h1
/aclocal.m4
/libtool
+6 -6
View File
@@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = subdir-objects
## to provide a way for the user to supply additional arguments.
ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
lib_LTLIBRARIES = libndn-c.la libndn-cpp.la
lib_LTLIBRARIES = libndn-cpp-dev.la
# "make install" will also install the include headers.
SUBDIRS = include . tools examples
@@ -81,7 +81,7 @@ libndn_c_la_CFLAGS = @OPENSSL_INCLUDES@
# C++ code and also the C code.
## To regenerate:
## for i in `find src -name '*.cpp' -or -name '*.hpp' -or -name '*.h' -and -not -path 'src/c/*'`; do echo " $i \\"; done
libndn_cpp_la_SOURCES = $(libndn_c_la_SOURCES) \
libndn_cpp_dev_la_SOURCES = $(libndn_c_la_SOURCES) \
src/common.cpp \
src/data.cpp \
src/encoding/binary-xml-decoder.hpp \
@@ -124,13 +124,13 @@ libndn_cpp_la_SOURCES = $(libndn_c_la_SOURCES) \
src/util/time.hpp
if HAVE_OSX_SECURITY
libndn_cpp_la_SOURCES += src/security/sec-tpm-osx.cpp
libndn_cpp_dev_la_SOURCES += src/security/sec-tpm-osx.cpp
else
EXTRA_DIST = src/security/sec-tpm-osx.cpp
endif
libndn_cpp_la_LIBADD = @OPENSSL_LIBS@ @CRYPTOPP_LIBS@ @OSX_SECURITY_LIBS@ @BOOST_SYSTEM_LIB@
libndn_cpp_la_LDFLAGS = @OPENSSL_LDFLAGS@ @CRYPTOPP_LDFLAGS@ @SQLITE3_LDFLAGS@ @BOOST_LDFLAGS@
libndn_cpp_la_CFLAGS = @OPENSSL_INCLUDES@ @CRYPTOPP_INCLUDES@ @SQLITE3_CFLAGS@ @BOOST_CPPFLAGS@
libndn_cpp_dev_la_LIBADD = @OPENSSL_LIBS@ @CRYPTOPP_LIBS@ @OSX_SECURITY_LIBS@ @BOOST_SYSTEM_LIB@
libndn_cpp_dev_la_LDFLAGS = @OPENSSL_LDFLAGS@ @CRYPTOPP_LDFLAGS@ @SQLITE3_LDFLAGS@ @BOOST_LDFLAGS@
libndn_cpp_dev_la_CFLAGS = @OPENSSL_INCLUDES@ @CRYPTOPP_INCLUDES@ @SQLITE3_CFLAGS@ @BOOST_CPPFLAGS@
dist_noinst_SCRIPTS = autogen.sh
+2 -2
View File
@@ -1,7 +1,7 @@
# To build using autotools, see the Development section of the file INSTALL.
AC_PREREQ([2.59])
AC_INIT([ndn-cpp], [0.2], [ndn-lib@lists.cs.ucla.edu], [ndn-cpp], [https://github.com/named-data/ndn-cpp])
AC_INIT([ndn-cpp-dev], [0.2.1], [ndn-lib@lists.cs.ucla.edu], [ndn-cpp-dev], [https://github.com/named-data/ndn-cpp])
AM_INIT_AUTOMAKE([1.10 -Wall no-define foreign])
AC_CONFIG_MACRO_DIR([m4])
@@ -9,7 +9,7 @@ AC_CONFIG_SRCDIR([configure.ac])
# Create config.h without prefixes. Put it in the include directory so CFLAGS will have -I./include .
AC_CONFIG_HEADERS(include/config.h)
# Add prefixes and output to a unique file name which will go into the ndn-cpp include install directory.
AX_PREFIX_CONFIG_H(include/ndn-cpp/ndn-cpp-config.h)
AX_PREFIX_CONFIG_H(include/ndn-cpp-dev/ndn-cpp-config.h, ndn-cpp)
AM_MAINTAINER_MODE
AM_PROG_AR
AC_PROG_LIBTOOL
+1 -1
View File
@@ -1,5 +1,5 @@
LDADD = ../libndn-cpp.la @BOOST_SYSTEM_LIB@
LDADD = ../libndn-cpp-dev.la @BOOST_SYSTEM_LIB@
noinst_PROGRAMS=consumer producer
+1 -1
View File
@@ -5,7 +5,7 @@
* See COPYING for copyright and distribution information.
*/
#include <ndn-cpp/face.hpp>
#include <ndn-cpp-dev/face.hpp>
#include <stdexcept>
#if NDN_CPP_HAVE_CXX11
+2 -2
View File
@@ -5,9 +5,9 @@
* See COPYING for copyright and distribution information.
*/
#include <ndn-cpp/face.hpp>
#include <ndn-cpp-dev/face.hpp>
#include <ndn-cpp/security/key-chain.hpp>
#include <ndn-cpp-dev/security/key-chain.hpp>
#if NDN_CPP_HAVE_CXX11
// In the std library, the placeholders are in a different namespace than boost.
+12 -12
View File
@@ -1,24 +1,24 @@
# "make install" will install these in the install include directory, for example
# /usr/local/ndn-cpp/name.hpp.
# /usr/local/ndn-cpp-dev/name.hpp.
# These files are included by the application with, for example
# #include <ndn-cpp/namp.hpp>
# #include <ndn-cpp-dev/namp.hpp>
# Internal include headers are not put in this public install directory.
# Public C headers.
ndn_cpp_c_headers = \
$(wildcard ndn-cpp/*.h) \
$(wildcard ndn-cpp/c/*.*) \
$(wildcard ndn-cpp/c/encoding/*.*) \
$(wildcard ndn-cpp/c/util/*.*)
$(wildcard ndn-cpp-dev/*.h) \
$(wildcard ndn-cpp-dev/c/*.*) \
$(wildcard ndn-cpp-dev/c/encoding/*.*) \
$(wildcard ndn-cpp-dev/c/util/*.*)
# Public C++ headers.
# Use ndn-cpp/*.hpp instead of *.* to not overwrite *.h from above.
# Use ndn-cpp-dev/*.hpp instead of *.* to not overwrite *.h from above.
ndn_cpp_cpp_headers = \
$(wildcard ndn-cpp/*.hpp) \
$(wildcard ndn-cpp/encoding/*.*) \
$(wildcard ndn-cpp/security/*.*) \
$(wildcard ndn-cpp/transport/*.*) \
$(wildcard ndn-cpp/util/*.*)
$(wildcard ndn-cpp-dev/*.hpp) \
$(wildcard ndn-cpp-dev/encoding/*.*) \
$(wildcard ndn-cpp-dev/security/*.*) \
$(wildcard ndn-cpp-dev/transport/*.*) \
$(wildcard ndn-cpp-dev/util/*.*)
ndnboost_headers = \
$(wildcard ndnboost/*.*) \
@@ -7,7 +7,7 @@
#ifndef NDN_COMMON_H
#define NDN_COMMON_H
#include <ndn-cpp/ndn-cpp-config.h>
#include <ndn-cpp-dev/ndn-cpp-config.h>
#include <stdint.h>
// TODO: Is stddef.h portable?
#include <stddef.h>
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -9,7 +9,7 @@
#include <openssl/ssl.h>
#include <openssl/rsa.h>
#include <ndn-cpp/c/common.h>
#include <ndn-cpp-dev/c/common.h>
#ifdef __cplusplus
extern "C" {
@@ -15,7 +15,7 @@
#if NDN_CPP_HAVE_CXX11
#if (__cplusplus < 201103L)
#error "NDN-CPP library is configured and compiled in C++11 mode, but the current compiler is not C++11 enabled"
#error "NDN-CPP-DEV library is configured and compiled in C++11 mode, but the current compiler is not C++11 enabled"
#endif
// Depending on where ./configure found shared_ptr, define the ptr_lib namespace.
@@ -43,8 +43,8 @@ namespace ndn { namespace func_lib = boost; }
#else // use embedded boost headers
/* Use the boost header files in this distribution that were extracted with:
cd <BOOST DEVELOPMENT DIRECTORY WITH boost SUBDIRECTORY>
dist/bin/bcp --namespace=ndnboost shared_ptr make_shared weak_ptr function bind any iostreams <NDN-CPP ROOT>/include
cd <NDN-CPP ROOT>/include
dist/bin/bcp --namespace=ndnboost shared_ptr make_shared weak_ptr function bind any iostreams <NDN-CPP-DEV ROOT>/include
cd <NDN-CPP-DEV ROOT>/include
rm -rf boost.css boost.png Jamroot libs
mv boost ndnboost
cd ndnboost
File renamed without changes.
@@ -10,7 +10,7 @@
#ifndef NDN_BLOCK_HPP
#define NDN_BLOCK_HPP
#include <ndn-cpp/common.hpp>
#include <ndn-cpp-dev/common.hpp>
#include <list>
#include <exception>
@@ -10,7 +10,7 @@
#ifndef NDN_BUFFER_HPP
#define NDN_BUFFER_HPP
#include <ndn-cpp/common.hpp>
#include <ndn-cpp-dev/common.hpp>
#include <boost/iostreams/detail/ios.hpp>
#include <boost/iostreams/categories.hpp>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -10,7 +10,7 @@
#define NDN_SEC_PUBLIC_INFO_SQLITE3_HPP
// Only compile if ndn-cpp-config.h defines NDN_CPP_HAVE_SQLITE3.
#include <ndn-cpp/ndn-cpp-config.h>
#include <ndn-cpp-dev/ndn-cpp-config.h>
#ifdef NDN_CPP_HAVE_SQLITE3
#include <sqlite3.h>
@@ -9,7 +9,7 @@
#define NDN_SEC_TPM_OSX_HPP
// Only compile if ndn-cpp-config.h defines NDN_CPP_HAVE_OSX_SECURITY 1.
#include <ndn-cpp/ndn-cpp-config.h>
#include <ndn-cpp-dev/ndn-cpp-config.h>
#if NDN_CPP_HAVE_OSX_SECURITY
#include "../common.hpp"
File renamed without changes.
File renamed without changes.
@@ -8,7 +8,7 @@
#ifndef NDN_TRANSPORT_HPP
#define NDN_TRANSPORT_HPP
#include <ndn-cpp/common.hpp>
#include <ndn-cpp-dev/common.hpp>
#include <vector>
#include <boost/asio.hpp>
File renamed without changes.
+1 -1
View File
@@ -7,7 +7,7 @@
#ifndef NDN_DATA_H
#define NDN_DATA_H
#include <ndn-cpp/c/data-types.h>
#include <ndn-cpp-dev/c/data-types.h>
#include "name.h"
#include "publisher-public-key-digest.h"
#include "key-locator.h"
+1 -1
View File
@@ -7,7 +7,7 @@
#ifndef NDN_BINARYXMLDECODER_H
#define NDN_BINARYXMLDECODER_H
#include <ndn-cpp/c/common.h>
#include <ndn-cpp-dev/c/common.h>
#include "../errors.h"
#include "../util/blob.h"
+1 -1
View File
@@ -7,7 +7,7 @@
#ifndef NDN_BINARY_XML_ELEMENT_READER_H
#define NDN_BINARY_XML_ELEMENT_READER_H
#include <ndn-cpp/c/encoding/element-listener.h>
#include <ndn-cpp-dev/c/encoding/element-listener.h>
#include "../errors.h"
#include "binary-xml-structure-decoder.h"
#include "../util/dynamic-uint8-array.h"
@@ -7,7 +7,7 @@
#ifndef NDN_BINARYXMLSTRUCTUREDECODER_H
#define NDN_BINARYXMLSTRUCTUREDECODER_H
#include <ndn-cpp/c/common.h>
#include <ndn-cpp-dev/c/common.h>
#include "../errors.h"
#ifdef __cplusplus
+2 -2
View File
@@ -7,8 +7,8 @@
#ifndef NDN_FORWARDING_ENTRY_H
#define NDN_FORWARDING_ENTRY_H
#include <ndn-cpp/c/common.h>
#include <ndn-cpp/c/forwarding-flags.h>
#include <ndn-cpp-dev/c/common.h>
#include <ndn-cpp-dev/c/forwarding-flags.h>
#include "name.h"
#include "publisher-public-key-digest.h"
+1 -1
View File
@@ -7,7 +7,7 @@
#ifndef NDN_INTEREST_H
#define NDN_INTEREST_H
#include <ndn-cpp/c/interest-types.h>
#include <ndn-cpp-dev/c/interest-types.h>
#include "name.h"
#include "publisher-public-key-digest.h"
+1 -1
View File
@@ -7,7 +7,7 @@
#ifndef NDN_KEY_LOCATOR_H
#define NDN_KEY_LOCATOR_H
#include <ndn-cpp/c/key-types.h>
#include <ndn-cpp-dev/c/key-types.h>
#include "name.h"
#ifdef __cplusplus
+1 -1
View File
@@ -7,7 +7,7 @@
#ifndef NDN_NAME_H
#define NDN_NAME_H
#include <ndn-cpp/c/common.h>
#include <ndn-cpp-dev/c/common.h>
#include "errors.h"
#include "util/blob.h"
+1 -1
View File
@@ -7,7 +7,7 @@
#ifndef NDN_PUBLISHERPUBLICKEYDIGEST_H
#define NDN_PUBLISHERPUBLICKEYDIGEST_H
#include <ndn-cpp/c/common.h>
#include <ndn-cpp-dev/c/common.h>
#include "util/blob.h"
#ifdef __cplusplus
+1 -1
View File
@@ -8,7 +8,7 @@
#define NDN_SOCKETTRANSPORT_H
#include <sys/socket.h>
#include <ndn-cpp/c/common.h>
#include <ndn-cpp-dev/c/common.h>
#include "../errors.h"
#ifdef __cplusplus
+1 -1
View File
@@ -7,7 +7,7 @@
#ifndef NDN_BLOB_H
#define NDN_BLOB_H
#include <ndn-cpp/c/common.h>
#include <ndn-cpp-dev/c/common.h>
#ifdef __cplusplus
extern "C" {
+1 -1
View File
@@ -4,7 +4,7 @@
* See COPYING for copyright and distribution information.
*/
#include "ndn-cpp/c/util/crypto.h"
#include "ndn-cpp-dev/c/util/crypto.h"
void ndn_digestSha256(const uint8_t *data, size_t dataLength, uint8_t *digest)
{
+1 -1
View File
@@ -11,7 +11,7 @@
#ifndef NDN_MEMORY_H
#define NDN_MEMORY_H
#include <ndn-cpp/c/common.h>
#include <ndn-cpp-dev/c/common.h>
#ifdef __cplusplus
extern "C" {
+1 -1
View File
@@ -4,7 +4,7 @@
* See COPYING for copyright and distribution information.
*/
#include <ndn-cpp/ndn-cpp-config.h>
#include <ndn-cpp-dev/ndn-cpp-config.h>
#if NDN_CPP_HAVE_TIME_H
#include <time.h>
#endif
+1 -1
View File
@@ -7,7 +7,7 @@
#ifndef NDN_TIME_H
#define NDN_TIME_H
#include <ndn-cpp/c/common.h>
#include <ndn-cpp-dev/c/common.h>
#include "../errors.h"
#ifdef __cplusplus
+1 -1
View File
@@ -6,7 +6,7 @@
*/
#include <sstream>
#include <ndn-cpp/common.hpp>
#include <ndn-cpp-dev/common.hpp>
#if NDN_CPP_HAVE_TIME_H
#include <time.h>
+2 -2
View File
@@ -5,8 +5,8 @@
* See COPYING for copyright and distribution information.
*/
#include <ndn-cpp/common.hpp>
#include <ndn-cpp/data.hpp>
#include <ndn-cpp-dev/common.hpp>
#include <ndn-cpp-dev/data.hpp>
using namespace std;
+1 -1
View File
@@ -9,7 +9,7 @@
#define NDN_BINARYXMLENCODER_HPP
#include <vector>
#include <ndn-cpp/common.hpp>
#include <ndn-cpp-dev/common.hpp>
#include "../util/dynamic-uint8-vector.hpp"
#include "../c/encoding/binary-xml-encoder.h"
+4 -4
View File
@@ -6,10 +6,10 @@
*/
#include <stdexcept>
#include <ndn-cpp/interest.hpp>
#include <ndn-cpp/data.hpp>
#include <ndn-cpp/forwarding-entry.hpp>
#include <ndn-cpp/encoding/binary-xml-wire-format.hpp>
#include <ndn-cpp-dev/interest.hpp>
#include <ndn-cpp-dev/data.hpp>
#include <ndn-cpp-dev/forwarding-entry.hpp>
#include <ndn-cpp-dev/encoding/binary-xml-wire-format.hpp>
#include "../c/encoding/binary-xml-interest.h"
#include "../c/encoding/binary-xml-data.h"
#include "../c/encoding/binary-xml-forwarding-entry.h"
+2 -2
View File
@@ -7,8 +7,8 @@
* Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
*/
#include <ndn-cpp/encoding/block.hpp>
#include <ndn-cpp/encoding/tlv.hpp>
#include <ndn-cpp-dev/encoding/block.hpp>
#include <ndn-cpp-dev/encoding/tlv.hpp>
namespace ndn {
+1 -1
View File
@@ -6,7 +6,7 @@
* See COPYING for copyright and distribution information.
*/
#include <ndn-cpp/ndn-cpp-config.h>
#include <ndn-cpp-dev/ndn-cpp-config.h>
#include "asn_ext.hpp"
#if NDN_CPP_HAVE_TIME_H
+1 -1
View File
@@ -23,7 +23,7 @@
#endif
#include <stdexcept>
#include <ndn-cpp/common.hpp>
#include <ndn-cpp-dev/common.hpp>
#include <cryptopp/asn.h>
namespace ndn {
+1 -1
View File
@@ -5,7 +5,7 @@
* See COPYING for copyright and distribution information.
*/
#include <ndn-cpp/encoding/element-listener.hpp>
#include <ndn-cpp-dev/encoding/element-listener.hpp>
namespace ndn {
+1 -1
View File
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <sstream>
#include <ndn-cpp/encoding/oid.hpp>
#include <ndn-cpp-dev/encoding/oid.hpp>
#include <cryptopp/asn.h>
using namespace std;
+1 -1
View File
@@ -6,7 +6,7 @@
*/
#include <stdexcept>
#include <ndn-cpp/encoding/wire-format.hpp>
#include <ndn-cpp-dev/encoding/wire-format.hpp>
using namespace std;
+1 -1
View File
@@ -8,7 +8,7 @@
* Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
*/
#include <ndn-cpp/exclude.hpp>
#include <ndn-cpp-dev/exclude.hpp>
namespace ndn
{
+1 -1
View File
@@ -5,7 +5,7 @@
* See COPYING for copyright and distribution information.
*/
#include <ndn-cpp/face.hpp>
#include <ndn-cpp-dev/face.hpp>
using namespace std;
+2 -2
View File
@@ -6,8 +6,8 @@
*/
#include <stdexcept>
#include <ndn-cpp/common.hpp>
#include <ndn-cpp/interest.hpp>
#include <ndn-cpp-dev/common.hpp>
#include <ndn-cpp-dev/interest.hpp>
#if __clang__
#pragma clang diagnostic push
+1 -1
View File
@@ -9,7 +9,7 @@
#include <stdexcept>
#include <algorithm>
#include <string.h>
#include <ndn-cpp/name.hpp>
#include <ndn-cpp-dev/name.hpp>
#include "c/util/ndn_memory.h"
#include "c/util/time.h"
+5 -5
View File
@@ -8,14 +8,14 @@
#include <stdexcept>
#include "c/util/time.h"
#include <ndn-cpp/forwarding-entry.hpp>
#include <ndn-cpp/face-instance.hpp>
#include <ndn-cpp/node.hpp>
#include <ndn-cpp-dev/forwarding-entry.hpp>
#include <ndn-cpp-dev/face-instance.hpp>
#include <ndn-cpp-dev/node.hpp>
#include "util/ndnd-id-fetcher.hpp"
#include <ndn-cpp/security/signature-sha256-with-rsa.hpp>
#include <ndn-cpp/status-response.hpp>
#include <ndn-cpp-dev/security/signature-sha256-with-rsa.hpp>
#include <ndn-cpp-dev/status-response.hpp>
using namespace std;
#if NDN_CPP_HAVE_CXX11
+1 -1
View File
@@ -18,7 +18,7 @@
#pragma GCC diagnostic ignored "-Wunused-function"
#endif
#include <ndn-cpp/security/certificate-extension.hpp>
#include <ndn-cpp-dev/security/certificate-extension.hpp>
#include <cryptopp/asn.h>
using namespace std;
@@ -18,7 +18,7 @@
#pragma GCC diagnostic ignored "-Wunused-function"
#endif
#include <ndn-cpp/security/certificate-subject-description.hpp>
#include <ndn-cpp-dev/security/certificate-subject-description.hpp>
#include <cryptopp/asn.h>
using namespace std;
+2 -2
View File
@@ -18,9 +18,9 @@
#pragma GCC diagnostic ignored "-Wunused-function"
#endif
#include <ndn-cpp/common.hpp>
#include <ndn-cpp-dev/common.hpp>
#include <ndn-cpp/security/certificate.hpp>
#include <ndn-cpp-dev/security/certificate.hpp>
#include "../util/logging.hpp"
#include "../util/time.hpp"
+1 -1
View File
@@ -6,7 +6,7 @@
* See COPYING for copyright and distribution information.
*/
#include <ndn-cpp/security/identity-certificate.hpp>
#include <ndn-cpp-dev/security/identity-certificate.hpp>
using namespace std;
+2 -2
View File
@@ -18,8 +18,8 @@
#pragma GCC diagnostic ignored "-Wunused-function"
#endif
#include <ndn-cpp/common.hpp>
#include <ndn-cpp/security/public-key.hpp>
#include <ndn-cpp-dev/common.hpp>
#include <ndn-cpp-dev/security/public-key.hpp>
#include <cryptopp/rsa.h>
#include <cryptopp/base64.h>
+1 -1
View File
@@ -6,7 +6,7 @@
* See COPYING for copyright and distribution information.
*/
#include <ndn-cpp/security/sec-policy-no-verify.hpp>
#include <ndn-cpp-dev/security/sec-policy-no-verify.hpp>
using namespace std;
Loaded 100 of 126 files, more files were not shown because too many files have changed in this diff. Show more