diff --git a/builds/mastic-dev.pri b/builds/mastic-dev.pri index 253feaeb6..31f648e1d 100644 --- a/builds/mastic-dev.pri +++ b/builds/mastic-dev.pri @@ -19,53 +19,31 @@ win32:{ QMAKE_CXXFLAGS += -std=c11 -# INCLUDEPATH += $$PWD/getopt \ - -# HEADERS += $$PWD/getopt/getopt_win32.h -# SOURCES += $$PWD/getopt/getopt_win32.c - CONFIG(debug, debug|release){ #configuration DEBUG DESTDIR = $$OUT_PWD/debug - libzyre_path = $$PWD/zyre/bin/Win32/Debug/v140/dynamic - libyajl_path = $$PWD/yajl/lloyd-yajl-2.1.0/MSVS/VS2013/x86/DebugDLL - install_libs.path += "C:/mastic/lib/debug" + libs_path = $$PWD/../dependencies/windows/libs/win32/Debug }else { #configuration RELEASE DESTDIR = $$OUT_PWD/release - libzyre_path = $$PWD/zyre/bin/Win32/Release/v140/dynamic - libyajl_path = $$PWD/yajl/lloyd-yajl-2.1.0/MSVS/VS2013/x86/ReleaseDLL - install_libs.path += "C:/mastic/lib/release" + libs_path = $$PWD/../dependencies/windows/libs/win32/Release } - #Copy includes -# install_headers.files += $$PWD/../src/include/*.h \ -# $$PWD/../src/include/uthash \ -# $$PWD/getopt - install_headers.path += "C:/mastic/include" - install_headers.files += $$PWD/../src/include/mastic.h \ - + #UNIX functions + SOURCES += $$PWD/../dependencies/windows/unix/unixfunctions.c \ - #Add the make step 'install' to copy the dll files to the output folder - install_libs.files += $$libzyre_path/* \ - $$libyajl_path/* \ - $$DESTDIR/* + HEADERS += $$PWD/../dependencies/windows/unix/unixfunctions.h \ - - #Add installation options - INSTALLS += install_libs \ - install_headers + INCLUDEPATH += $$PWD/../dependencies/windows/unix \ #Add librairies - LIBS += -L$$libzyre_path -llibzmq \ - -L$$libzyre_path -llibczmq \ - -L$$libzyre_path -llibzyre \ - -L$$libyajl_path -lyajl + LIBS += -L$$libs_path -llibzyre -llibczmq -lyajl - #to get the Ip address into the network.c - LIBS += -L$$C:/Windows/System32 -lwsock32 - LIBS += -L$$C:/Windows/System32 -lIPHLPAPI - LIBS += -L$$C:/Windows/System32 -lws2_32 + #To get the Ip address into the network.c + LIBS += -L$$C:/Windows/System32 -lwsock32 -lIPHLPAPI -lws2_32 + + #include the pri to copy files to C:\ + include ("$$PWD/../dependencies/windows/common/pri/mastic-job-copy.pri") } macx:{ @@ -204,12 +182,13 @@ unix:{ #--------- COMMON ---------# ##Add headers from dependencies -INCLUDEPATH += $$PWD/czmq/include \ - $$PWD/zyre/include \ - $$PWD/yajl/lloyd-yajl-2.1.0/include \ +zyre_include_path = $$PWD/../dependencies/windows/headers/zyre_suite +yajl_include_path = $$PWD/../dependencies/yajl/src/api + +INCLUDEPATH += $$zyre_include_path \ + $$yajl_include_path \ -DEPENDPATH += $$PWD/czmq/include \ - $$PWD/zyre/include \ - $$PWD/yajl/lloyd-yajl-2.1.0/include \ +DEPENDPATH += $$zyre_include_path \ + $$yajl_include_path \ diff --git a/builds/mastic.pro b/builds/mastic.pro index b0328f857..c56ffc520 100644 --- a/builds/mastic.pro +++ b/builds/mastic.pro @@ -23,5 +23,5 @@ win32:{ #CONFIG+=raspberry_compilation -include ('../dependencies/mastic_api_crossplateform.pri') +include ('mastic-dev.pri') diff --git a/dependencies/windows/common/pri/mastic-job-copy.pri b/dependencies/windows/common/pri/mastic-job-copy.pri new file mode 100644 index 000000000..1e75d42f2 --- /dev/null +++ b/dependencies/windows/common/pri/mastic-job-copy.pri @@ -0,0 +1,32 @@ + + +#Mastic.h +header_source_path = $$shell_path($$clean_path($$absolute_path($$PWD/../../../../src/include/mastic.h))) +header_dest_path = $$shell_path($$clean_path("C:/mastic/include/*")) + +#Create a command, using the 'cmd' command line and Window's 'xcopy' +copyHeaders.commands = $$quote(cmd /c xcopy /S /Y /I $${header_source_path} $${header_dest_path}) + +#dll +win32:{ + dependencies_src_path = $$shell_path($$clean_path($$absolute_path( $${libs_path}/*))) + mastic_dependencies_src_path = $$shell_path($$clean_path($$absolute_path( $$DESTDIR/mastic.*))) + + CONFIG(debug, debug|release){ + dependencies_dest_path = $$shell_path($$clean_path("C:/mastic/libs/debug/*")) + }else { + dependencies_dest_path = $$shell_path($$clean_path("C:/mastic/libs/release/*")) + } +} + +copyDependencies.commands = $$quote(cmd /c xcopy /S /Y /I $${dependencies_src_path} $${dependencies_dest_path}) +copyMasticDLL.commands = $$quote( cmd /c xcopy /S /Y /I $${mastic_dependencies_src_path} $${dependencies_dest_path} ) + +#Add the command to Qt. +QMAKE_EXTRA_TARGETS += copyHeaders \ + copyDependencies \ + copyMasticDLL \ + +POST_TARGETDEPS += copyHeaders \ + copyDependencies \ + copyMasticDLL \ diff --git a/dependencies/windows/getopt/getopt_win32.c b/dependencies/windows/getopt/getopt_win32.c deleted file mode 100644 index 2c88a7366..000000000 --- a/dependencies/windows/getopt/getopt_win32.c +++ /dev/null @@ -1,560 +0,0 @@ -/* $OpenBSD: getopt_long.c,v 1.23 2007/10/31 12:34:57 chl Exp $ */ -/* $NetBSD: getopt_long.c,v 1.15 2002/01/31 22:43:40 tv Exp $ */ - -/* - * Copyright (c) 2002 Todd C. Miller - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Sponsored in part by the Defense Advanced Research Projects - * Agency (DARPA) and Air Force Research Laboratory, Air Force - * Materiel Command, USAF, under agreement number F39502-99-1-0512. - */ -/*- - * Copyright (c) 2000 The NetBSD Foundation, Inc. - * All rights reserved. - * - * This code is derived from software contributed to The NetBSD Foundation - * by Dieter Baron and Thomas Klausner. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS - * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include -#include -#include - -#define REPLACE_GETOPT /* use this getopt as the system getopt(3) */ - -#ifdef REPLACE_GETOPT -int opterr = 1; /* if error message should be printed */ -int optind = 1; /* index into parent argv vector */ -int optopt = '?'; /* character checked for validity */ -#undef optreset /* see getopt.h */ -#define optreset __mingw_optreset -int optreset; /* reset getopt */ -char *optarg; /* argument associated with option */ -#endif - -#define PRINT_ERROR ((opterr) && (*options != ':')) - -#define FLAG_PERMUTE 0x01 /* permute non-options to the end of argv */ -#define FLAG_ALLARGS 0x02 /* treat non-options as args to option "-1" */ -#define FLAG_LONGONLY 0x04 /* operate as getopt_long_only */ - -/* return values */ -#define BADCH (int)'?' -#define BADARG ((*options == ':') ? (int)':' : (int)'?') -#define INORDER (int)1 - -#ifndef __CYGWIN__ -#define __progname __argv[0] -#else -extern char __declspec(dllimport) *__progname; -#endif - -#ifdef __CYGWIN__ -static char EMSG[] = ""; -#else -#define EMSG "" -#endif - -static int getopt_internal(int, char * const *, const char *, - const struct option *, int *, int); -static int parse_long_options(char * const *, const char *, - const struct option *, int *, int); -static int gcd(int, int); -static void permute_args(int, int, int, char * const *); - -static char *place = EMSG; /* option letter processing */ - -/* XXX: set optreset to 1 rather than these two */ -static int nonopt_start = -1; /* first non option argument (for permute) */ -static int nonopt_end = -1; /* first option after non options (for permute) */ - -/* Error messages */ -static const char recargchar[] = "option requires an argument -- %c"; -static const char recargstring[] = "option requires an argument -- %s"; -static const char ambig[] = "ambiguous option -- %.*s"; -static const char noarg[] = "option doesn't take an argument -- %.*s"; -static const char illoptchar[] = "unknown option -- %c"; -static const char illoptstring[] = "unknown option -- %s"; - -static void -_vwarnx(const char *fmt,va_list ap) -{ - (void)fprintf(stderr,"%s: ",__progname); - if (fmt != NULL) - (void)vfprintf(stderr,fmt,ap); - (void)fprintf(stderr,"\n"); -} - -static void -warnx(const char *fmt,...) -{ - va_list ap; - va_start(ap,fmt); - _vwarnx(fmt,ap); - va_end(ap); -} - -/* - * Compute the greatest common divisor of a and b. - */ -static int -gcd(int a, int b) -{ - int c; - - c = a % b; - while (c != 0) { - a = b; - b = c; - c = a % b; - } - - return (b); -} - -/* - * Exchange the block from nonopt_start to nonopt_end with the block - * from nonopt_end to opt_end (keeping the same order of arguments - * in each block). - */ -static void -permute_args(int panonopt_start, int panonopt_end, int opt_end, - char * const *nargv) -{ - int cstart, cyclelen, i, j, ncycle, nnonopts, nopts, pos; - char *swap; - - /* - * compute lengths of blocks and number and size of cycles - */ - nnonopts = panonopt_end - panonopt_start; - nopts = opt_end - panonopt_end; - ncycle = gcd(nnonopts, nopts); - cyclelen = (opt_end - panonopt_start) / ncycle; - - for (i = 0; i < ncycle; i++) { - cstart = panonopt_end+i; - pos = cstart; - for (j = 0; j < cyclelen; j++) { - if (pos >= panonopt_end) - pos -= nnonopts; - else - pos += nopts; - swap = nargv[pos]; - /* LINTED const cast */ - ((char **) nargv)[pos] = nargv[cstart]; - /* LINTED const cast */ - ((char **)nargv)[cstart] = swap; - } - } -} - -/* - * parse_long_options -- - * Parse long options in argc/argv argument vector. - * Returns -1 if short_too is set and the option does not match long_options. - */ -static int -parse_long_options(char * const *nargv, const char *options, - const struct option *long_options, int *idx, int short_too) -{ - char *current_argv, *has_equal; - size_t current_argv_len; - int i, ambiguous, match; - -#define IDENTICAL_INTERPRETATION(_x, _y) \ - (long_options[(_x)].has_arg == long_options[(_y)].has_arg && \ - long_options[(_x)].flag == long_options[(_y)].flag && \ - long_options[(_x)].val == long_options[(_y)].val) - - current_argv = place; - match = -1; - ambiguous = 0; - - optind++; - - if ((has_equal = strchr(current_argv, '=')) != NULL) { - /* argument found (--option=arg) */ - current_argv_len = has_equal - current_argv; - has_equal++; - } else - current_argv_len = strlen(current_argv); - - for (i = 0; long_options[i].name; i++) { - /* find matching long option */ - if (strncmp(current_argv, long_options[i].name, - current_argv_len)) - continue; - - if (strlen(long_options[i].name) == current_argv_len) { - /* exact match */ - match = i; - ambiguous = 0; - break; - } - /* - * If this is a known short option, don't allow - * a partial match of a single character. - */ - if (short_too && current_argv_len == 1) - continue; - - if (match == -1) /* partial match */ - match = i; - else if (!IDENTICAL_INTERPRETATION(i, match)) - ambiguous = 1; - } - if (ambiguous) { - /* ambiguous abbreviation */ - if (PRINT_ERROR) - warnx(ambig, (int)current_argv_len, - current_argv); - optopt = 0; - return (BADCH); - } - if (match != -1) { /* option found */ - if (long_options[match].has_arg == no_argument - && has_equal) { - if (PRINT_ERROR) - warnx(noarg, (int)current_argv_len, - current_argv); - /* - * XXX: GNU sets optopt to val regardless of flag - */ - if (long_options[match].flag == NULL) - optopt = long_options[match].val; - else - optopt = 0; - return (BADARG); - } - if (long_options[match].has_arg == required_argument || - long_options[match].has_arg == optional_argument) { - if (has_equal) - optarg = has_equal; - else if (long_options[match].has_arg == - required_argument) { - /* - * optional argument doesn't use next nargv - */ - optarg = nargv[optind++]; - } - } - if ((long_options[match].has_arg == required_argument) - && (optarg == NULL)) { - /* - * Missing argument; leading ':' indicates no error - * should be generated. - */ - if (PRINT_ERROR) - warnx(recargstring, - current_argv); - /* - * XXX: GNU sets optopt to val regardless of flag - */ - if (long_options[match].flag == NULL) - optopt = long_options[match].val; - else - optopt = 0; - --optind; - return (BADARG); - } - } else { /* unknown option */ - if (short_too) { - --optind; - return (-1); - } - if (PRINT_ERROR) - warnx(illoptstring, current_argv); - optopt = 0; - return (BADCH); - } - if (idx) - *idx = match; - if (long_options[match].flag) { - *long_options[match].flag = long_options[match].val; - return (0); - } else - return (long_options[match].val); -#undef IDENTICAL_INTERPRETATION -} - -/* - * getopt_internal -- - * Parse argc/argv argument vector. Called by user level routines. - */ -static int -getopt_internal(int nargc, char * const *nargv, const char *options, - const struct option *long_options, int *idx, int flags) -{ - char *oli; /* option letter list index */ - int optchar, short_too; - static int posixly_correct = -1; - - if (options == NULL) - return (-1); - - /* - * XXX Some GNU programs (like cvs) set optind to 0 instead of - * XXX using optreset. Work around this braindamage. - */ - if (optind == 0) - optind = optreset = 1; - - /* - * Disable GNU extensions if POSIXLY_CORRECT is set or options - * string begins with a '+'. - * - * CV, 2009-12-14: Check POSIXLY_CORRECT anew if optind == 0 or - * optreset != 0 for GNU compatibility. - */ - if (posixly_correct == -1 || optreset != 0) - posixly_correct = (getenv("POSIXLY_CORRECT") != NULL); - if (*options == '-') - flags |= FLAG_ALLARGS; - else if (posixly_correct || *options == '+') - flags &= ~FLAG_PERMUTE; - if (*options == '+' || *options == '-') - options++; - - optarg = NULL; - if (optreset) - nonopt_start = nonopt_end = -1; -start: - if (optreset || !*place) { /* update scanning pointer */ - optreset = 0; - if (optind >= nargc) { /* end of argument vector */ - place = EMSG; - if (nonopt_end != -1) { - /* do permutation, if we have to */ - permute_args(nonopt_start, nonopt_end, - optind, nargv); - optind -= nonopt_end - nonopt_start; - } - else if (nonopt_start != -1) { - /* - * If we skipped non-options, set optind - * to the first of them. - */ - optind = nonopt_start; - } - nonopt_start = nonopt_end = -1; - return (-1); - } - if (*(place = nargv[optind]) != '-' || - (place[1] == '\0' && strchr(options, '-') == NULL)) { - place = EMSG; /* found non-option */ - if (flags & FLAG_ALLARGS) { - /* - * GNU extension: - * return non-option as argument to option 1 - */ - optarg = nargv[optind++]; - return (INORDER); - } - if (!(flags & FLAG_PERMUTE)) { - /* - * If no permutation wanted, stop parsing - * at first non-option. - */ - return (-1); - } - /* do permutation */ - if (nonopt_start == -1) - nonopt_start = optind; - else if (nonopt_end != -1) { - permute_args(nonopt_start, nonopt_end, - optind, nargv); - nonopt_start = optind - - (nonopt_end - nonopt_start); - nonopt_end = -1; - } - optind++; - /* process next argument */ - goto start; - } - if (nonopt_start != -1 && nonopt_end == -1) - nonopt_end = optind; - - /* - * If we have "-" do nothing, if "--" we are done. - */ - if (place[1] != '\0' && *++place == '-' && place[1] == '\0') { - optind++; - place = EMSG; - /* - * We found an option (--), so if we skipped - * non-options, we have to permute. - */ - if (nonopt_end != -1) { - permute_args(nonopt_start, nonopt_end, - optind, nargv); - optind -= nonopt_end - nonopt_start; - } - nonopt_start = nonopt_end = -1; - return (-1); - } - } - - /* - * Check long options if: - * 1) we were passed some - * 2) the arg is not just "-" - * 3) either the arg starts with -- we are getopt_long_only() - */ - if (long_options != NULL && place != nargv[optind] && - (*place == '-' || (flags & FLAG_LONGONLY))) { - short_too = 0; - if (*place == '-') - place++; /* --foo long option */ - else if (*place != ':' && strchr(options, *place) != NULL) - short_too = 1; /* could be short option too */ - - optchar = parse_long_options(nargv, options, long_options, - idx, short_too); - if (optchar != -1) { - place = EMSG; - return (optchar); - } - } - - if ((optchar = (int)*place++) == (int)':' || - (optchar == (int)'-' && *place != '\0') || - (oli = strchr(options, optchar)) == NULL) { - /* - * If the user specified "-" and '-' isn't listed in - * options, return -1 (non-option) as per POSIX. - * Otherwise, it is an unknown option character (or ':'). - */ - if (optchar == (int)'-' && *place == '\0') - return (-1); - if (!*place) - ++optind; - if (PRINT_ERROR) - warnx(illoptchar, optchar); - optopt = optchar; - return (BADCH); - } - if (long_options != NULL && optchar == 'W' && oli[1] == ';') { - /* -W long-option */ - if (*place) /* no space */ - /* NOTHING */; - else if (++optind >= nargc) { /* no arg */ - place = EMSG; - if (PRINT_ERROR) - warnx(recargchar, optchar); - optopt = optchar; - return (BADARG); - } else /* white space */ - place = nargv[optind]; - optchar = parse_long_options(nargv, options, long_options, - idx, 0); - place = EMSG; - return (optchar); - } - if (*++oli != ':') { /* doesn't take argument */ - if (!*place) - ++optind; - } else { /* takes (optional) argument */ - optarg = NULL; - if (*place) /* no white space */ - optarg = place; - else if (oli[1] != ':') { /* arg not optional */ - if (++optind >= nargc) { /* no arg */ - place = EMSG; - if (PRINT_ERROR) - warnx(recargchar, optchar); - optopt = optchar; - return (BADARG); - } else - optarg = nargv[optind]; - } - place = EMSG; - ++optind; - } - /* dump back option letter */ - return (optchar); -} - -#ifdef REPLACE_GETOPT -/* - * getopt -- - * Parse argc/argv argument vector. - * - * [eventually this will replace the BSD getopt] - */ -int -getopt(int nargc, char * const *nargv, const char *options) -{ - - /* - * We don't pass FLAG_PERMUTE to getopt_internal() since - * the BSD getopt(3) (unlike GNU) has never done this. - * - * Furthermore, since many privileged programs call getopt() - * before dropping privileges it makes sense to keep things - * as simple (and bug-free) as possible. - */ - return (getopt_internal(nargc, nargv, options, NULL, NULL, 0)); -} -#endif /* REPLACE_GETOPT */ - -/* - * getopt_long -- - * Parse argc/argv argument vector. - */ -int getopt_long(int nargc, char * const *nargv, const char *options, - const struct option *long_options, int *idx) -{ - - return (getopt_internal(nargc, nargv, options, long_options, idx, - FLAG_PERMUTE)); -} - -/* - * getopt_long_only -- - * Parse argc/argv argument vector. - */ -int getopt_long_only(int nargc, char * const *nargv, const char *options, - const struct option *long_options, int *idx) -{ - - return (getopt_internal(nargc, nargv, options, long_options, idx, - FLAG_PERMUTE|FLAG_LONGONLY)); -} diff --git a/dependencies/windows/getopt/getopt_win32.h b/dependencies/windows/getopt/getopt_win32.h deleted file mode 100644 index cf1faaeb5..000000000 --- a/dependencies/windows/getopt/getopt_win32.h +++ /dev/null @@ -1,95 +0,0 @@ -#ifndef __GETOPT_H__ -/** - * DISCLAIMER - * This file has no copyright assigned and is placed in the Public Domain. - * This file is a part of the w64 mingw-runtime package. - * - * The w64 mingw-runtime package and its code is distributed in the hope that it - * will be useful but WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESSED OR - * IMPLIED ARE HEREBY DISCLAIMED. This includes but is not limited to - * warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - */ - -#define __GETOPT_H__ - -/* All the headers include this file. */ -#include - -#ifdef __cplusplus -extern "C" { -#endif - -extern int optind; /* index of first non-option in argv */ -extern int optopt; /* single option character, as parsed */ -extern int opterr; /* flag to enable built-in diagnostics... */ - /* (user may set to zero, to suppress) */ - -extern char *optarg; /* pointer to argument of current option */ - -extern int getopt(int nargc, char * const *nargv, const char *options); - -#ifdef _BSD_SOURCE -/* - * BSD adds the non-standard `optreset' feature, for reinitialisation - * of `getopt' parsing. We support this feature, for applications which - * proclaim their BSD heritage, before including this header; however, - * to maintain portability, developers are advised to avoid it. - */ -# define optreset __mingw_optreset -extern int optreset; -#endif -#ifdef __cplusplus -} -#endif -/* - * POSIX requires the `getopt' API to be specified in `unistd.h'; - * thus, `unistd.h' includes this header. However, we do not want - * to expose the `getopt_long' or `getopt_long_only' APIs, when - * included in this manner. Thus, close the standard __GETOPT_H__ - * declarations block, and open an additional __GETOPT_LONG_H__ - * specific block, only when *not* __UNISTD_H_SOURCED__, in which - * to declare the extended API. - */ -#endif /* !defined(__GETOPT_H__) */ - -#if !defined(__UNISTD_H_SOURCED__) && !defined(__GETOPT_LONG_H__) -#define __GETOPT_LONG_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -struct option /* specification for a long form option... */ -{ - const char *name; /* option name, without leading hyphens */ - int has_arg; /* does it take an argument? */ - int *flag; /* where to save its status, or NULL */ - int val; /* its associated status value */ -}; - -enum /* permitted values for its `has_arg' field... */ -{ - no_argument = 0, /* option never takes an argument */ - required_argument, /* option always requires an argument */ - optional_argument /* option may take an argument */ -}; - -int getopt_long(int nargc, char * const *nargv, const char *options, - const struct option *long_options, int *idx); -int getopt_long_only(int nargc, char * const *nargv, const char *options, - const struct option *long_options, int *idx); -/* - * Previous MinGW implementation had... - */ -#ifndef HAVE_DECL_GETOPT -/* - * ...for the long form API only; keep this for compatibility. - */ -# define HAVE_DECL_GETOPT 1 -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* !defined(__UNISTD_H_SOURCED__) && !defined(__GETOPT_LONG_H__) */ diff --git a/dependencies/windows/libs/Tuto_Compilation_Win32_Libsodium_Zyre_Yajl.docx b/dependencies/windows/libs/Tuto_Compilation_Win32_Libsodium_Zyre_Yajl.docx new file mode 100644 index 000000000..7b4971210 Binary files /dev/null and b/dependencies/windows/libs/Tuto_Compilation_Win32_Libsodium_Zyre_Yajl.docx differ diff --git a/dependencies/windows/libs/versions.txt b/dependencies/windows/libs/versions.txt new file mode 100644 index 000000000..756cdd6a1 --- /dev/null +++ b/dependencies/windows/libs/versions.txt @@ -0,0 +1,5 @@ +propriétés -> détails +zyre 2.0.1.0 +czmq 4.0.3.0 +zmq 4.2.20.1 +sodium 1.0.15.0 diff --git a/dependencies/windows/libs/win32/Debug/libczmq.dll b/dependencies/windows/libs/win32/Debug/libczmq.dll new file mode 100644 index 000000000..9afdc4e28 Binary files /dev/null and b/dependencies/windows/libs/win32/Debug/libczmq.dll differ diff --git a/dependencies/windows/libs/win32/Debug/libczmq.ilk b/dependencies/windows/libs/win32/Debug/libczmq.ilk new file mode 100644 index 000000000..48c8be2ac Binary files /dev/null and b/dependencies/windows/libs/win32/Debug/libczmq.ilk differ diff --git a/dependencies/windows/libs/win32/Debug/libczmq.lib b/dependencies/windows/libs/win32/Debug/libczmq.lib new file mode 100644 index 000000000..e456c5231 Binary files /dev/null and b/dependencies/windows/libs/win32/Debug/libczmq.lib differ diff --git a/dependencies/windows/libs/win32/Debug/libczmq.pdb b/dependencies/windows/libs/win32/Debug/libczmq.pdb new file mode 100644 index 000000000..650e6e513 Binary files /dev/null and b/dependencies/windows/libs/win32/Debug/libczmq.pdb differ diff --git a/dependencies/windows/libs/win32/Debug/libzmq.dll b/dependencies/windows/libs/win32/Debug/libzmq.dll new file mode 100644 index 000000000..c520f8f05 Binary files /dev/null and b/dependencies/windows/libs/win32/Debug/libzmq.dll differ diff --git a/dependencies/windows/libs/win32/Debug/libzmq.exp b/dependencies/windows/libs/win32/Debug/libzmq.exp new file mode 100644 index 000000000..7d1590aaa Binary files /dev/null and b/dependencies/windows/libs/win32/Debug/libzmq.exp differ diff --git a/dependencies/windows/libs/win32/Debug/libzmq.ilk b/dependencies/windows/libs/win32/Debug/libzmq.ilk new file mode 100644 index 000000000..2d7e29c9d Binary files /dev/null and b/dependencies/windows/libs/win32/Debug/libzmq.ilk differ diff --git a/dependencies/windows/libs/win32/Debug/libzmq.lib b/dependencies/windows/libs/win32/Debug/libzmq.lib new file mode 100644 index 000000000..00d0cf4a4 Binary files /dev/null and b/dependencies/windows/libs/win32/Debug/libzmq.lib differ diff --git a/dependencies/windows/libs/win32/Debug/libzmq.pdb b/dependencies/windows/libs/win32/Debug/libzmq.pdb new file mode 100644 index 000000000..919baf6b2 Binary files /dev/null and b/dependencies/windows/libs/win32/Debug/libzmq.pdb differ diff --git a/dependencies/windows/libs/win32/Debug/libzyre.dll b/dependencies/windows/libs/win32/Debug/libzyre.dll new file mode 100644 index 000000000..b29e58fae Binary files /dev/null and b/dependencies/windows/libs/win32/Debug/libzyre.dll differ diff --git a/dependencies/windows/libs/win32/Debug/libzyre.exp b/dependencies/windows/libs/win32/Debug/libzyre.exp new file mode 100644 index 000000000..ffcf730bd Binary files /dev/null and b/dependencies/windows/libs/win32/Debug/libzyre.exp differ diff --git a/dependencies/windows/libs/win32/Debug/libzyre.ilk b/dependencies/windows/libs/win32/Debug/libzyre.ilk new file mode 100644 index 000000000..21d892977 Binary files /dev/null and b/dependencies/windows/libs/win32/Debug/libzyre.ilk differ diff --git a/dependencies/windows/libs/win32/Debug/libzyre.lib b/dependencies/windows/libs/win32/Debug/libzyre.lib new file mode 100644 index 000000000..bd13f42fc Binary files /dev/null and b/dependencies/windows/libs/win32/Debug/libzyre.lib differ diff --git a/dependencies/windows/libs/win32/Debug/libzyre.log b/dependencies/windows/libs/win32/Debug/libzyre.log new file mode 100644 index 000000000..805ca9bd0 --- /dev/null +++ b/dependencies/windows/libs/win32/Debug/libzyre.log @@ -0,0 +1,22 @@ + ConfigurationType : DynamicLibrary + Configuration : DebugDLL + PlatformToolset : v140 + TargetPath : D:\DEVELOPPEMENT\compile\zyre\builds\msvc\vs2015\libzyre\..\..\..\..\bin\Win32\Debug\v140\dynamic\libzyre.dll + Will copy D:\DEVELOPPEMENT\compile\zyre\builds\msvc\vs2015\libzyre\..\..\platform.h -> D:\DEVELOPPEMENT\compile\zyre\builds\msvc\vs2015\libzyre\..\..\..\..\include\platform.h + Linkage-libzmq: dynamic + Linkage-czmq: dynamic + 1 fichier(s) copié(s). + zyre.c + zyre_event.c + zre_msg.c + zyre_peer.c +..\..\..\..\src\zyre_peer.c(156): warning C4244: 'argument' : conversion de 'uint64_t' en 'int', perte possible de données + zyre_group.c + zyre_node.c + Création de la bibliothèque D:\DEVELOPPEMENT\compile\zyre\builds\msvc\vs2015\libzyre\..\..\..\..\bin\Win32\Debug\v140\dynamic\libzyre.lib et de l'objet D:\DEVELOPPEMENT\compile\zyre\builds\msvc\vs2015\libzyre\..\..\..\..\bin\Win32\Debug\v140\dynamic\libzyre.exp + libzyre.vcxproj -> D:\DEVELOPPEMENT\compile\zyre\builds\msvc\vs2015\libzyre\..\..\..\..\bin\Win32\Debug\v140\dynamic\libzyre.dll + libzyre.vcxproj -> D:\DEVELOPPEMENT\compile\zyre\builds\msvc\vs2015\libzyre\..\..\..\..\bin\Win32\Debug\v140\dynamic\libzyre.pdb (Full PDB) + Copying libzmq.dll -> D:\DEVELOPPEMENT\compile\zyre\bin\Win32\Debug\v140\dynamic\libzmq.dll + Copying libzmq.pdb -> D:\DEVELOPPEMENT\compile\zyre\bin\Win32\Debug\v140\dynamic\libzmq.pdb + Copying libczmq.dll -> D:\DEVELOPPEMENT\compile\zyre\bin\Win32\Debug\v140\dynamic\libczmq.dll + Copying libczmq.pdb -> D:\DEVELOPPEMENT\compile\zyre\bin\Win32\Debug\v140\dynamic\libczmq.pdb diff --git a/dependencies/windows/libs/win32/Debug/libzyre.pdb b/dependencies/windows/libs/win32/Debug/libzyre.pdb new file mode 100644 index 000000000..ee151082e Binary files /dev/null and b/dependencies/windows/libs/win32/Debug/libzyre.pdb differ diff --git a/dependencies/windows/libs/win32/Debug/yajl.dll b/dependencies/windows/libs/win32/Debug/yajl.dll new file mode 100644 index 000000000..c7bff4190 Binary files /dev/null and b/dependencies/windows/libs/win32/Debug/yajl.dll differ diff --git a/dependencies/windows/libs/win32/Debug/yajl.lib b/dependencies/windows/libs/win32/Debug/yajl.lib new file mode 100644 index 000000000..06a76133c Binary files /dev/null and b/dependencies/windows/libs/win32/Debug/yajl.lib differ diff --git a/dependencies/windows/libs/win32/Debug/yajl.pdb b/dependencies/windows/libs/win32/Debug/yajl.pdb new file mode 100644 index 000000000..69a4f371a Binary files /dev/null and b/dependencies/windows/libs/win32/Debug/yajl.pdb differ diff --git a/dependencies/windows/libs/win32/Release/libczmq.dll b/dependencies/windows/libs/win32/Release/libczmq.dll new file mode 100644 index 000000000..93139df88 Binary files /dev/null and b/dependencies/windows/libs/win32/Release/libczmq.dll differ diff --git a/dependencies/windows/libs/win32/Release/libczmq.exp b/dependencies/windows/libs/win32/Release/libczmq.exp new file mode 100644 index 000000000..5c201af85 Binary files /dev/null and b/dependencies/windows/libs/win32/Release/libczmq.exp differ diff --git a/dependencies/windows/libs/win32/Release/libczmq.lib b/dependencies/windows/libs/win32/Release/libczmq.lib new file mode 100644 index 000000000..8f9d6c028 Binary files /dev/null and b/dependencies/windows/libs/win32/Release/libczmq.lib differ diff --git a/dependencies/windows/libs/win32/Release/libczmq.pdb b/dependencies/windows/libs/win32/Release/libczmq.pdb new file mode 100644 index 000000000..f12aa50d5 Binary files /dev/null and b/dependencies/windows/libs/win32/Release/libczmq.pdb differ diff --git a/dependencies/windows/libs/win32/Release/libzmq.dll b/dependencies/windows/libs/win32/Release/libzmq.dll new file mode 100644 index 000000000..0ca2c4522 Binary files /dev/null and b/dependencies/windows/libs/win32/Release/libzmq.dll differ diff --git a/dependencies/windows/libs/win32/Release/libzmq.exp b/dependencies/windows/libs/win32/Release/libzmq.exp new file mode 100644 index 000000000..74458873b Binary files /dev/null and b/dependencies/windows/libs/win32/Release/libzmq.exp differ diff --git a/dependencies/windows/libs/win32/Release/libzmq.lib b/dependencies/windows/libs/win32/Release/libzmq.lib new file mode 100644 index 000000000..7f28e2d5f Binary files /dev/null and b/dependencies/windows/libs/win32/Release/libzmq.lib differ diff --git a/dependencies/windows/libs/win32/Release/libzmq.pdb b/dependencies/windows/libs/win32/Release/libzmq.pdb new file mode 100644 index 000000000..e0ea1efe4 Binary files /dev/null and b/dependencies/windows/libs/win32/Release/libzmq.pdb differ diff --git a/dependencies/windows/libs/win32/Release/libzyre.dll b/dependencies/windows/libs/win32/Release/libzyre.dll new file mode 100644 index 000000000..96fa7a54f Binary files /dev/null and b/dependencies/windows/libs/win32/Release/libzyre.dll differ diff --git a/dependencies/windows/libs/win32/Release/libzyre.exp b/dependencies/windows/libs/win32/Release/libzyre.exp new file mode 100644 index 000000000..c66f28387 Binary files /dev/null and b/dependencies/windows/libs/win32/Release/libzyre.exp differ diff --git a/dependencies/windows/libs/win32/Release/libzyre.lib b/dependencies/windows/libs/win32/Release/libzyre.lib new file mode 100644 index 000000000..64ca0013e Binary files /dev/null and b/dependencies/windows/libs/win32/Release/libzyre.lib differ diff --git a/dependencies/windows/libs/win32/Release/libzyre.pdb b/dependencies/windows/libs/win32/Release/libzyre.pdb new file mode 100644 index 000000000..db36ce71f Binary files /dev/null and b/dependencies/windows/libs/win32/Release/libzyre.pdb differ diff --git a/dependencies/windows/libs/win32/Release/yajl.dll b/dependencies/windows/libs/win32/Release/yajl.dll new file mode 100644 index 000000000..2240b5494 Binary files /dev/null and b/dependencies/windows/libs/win32/Release/yajl.dll differ diff --git a/dependencies/windows/libs/win32/Release/yajl.lib b/dependencies/windows/libs/win32/Release/yajl.lib new file mode 100644 index 000000000..2dadde99a Binary files /dev/null and b/dependencies/windows/libs/win32/Release/yajl.lib differ diff --git a/dependencies/windows/unix/unixfunctions.c b/dependencies/windows/unix/unixfunctions.c new file mode 100644 index 000000000..2f3903342 --- /dev/null +++ b/dependencies/windows/unix/unixfunctions.c @@ -0,0 +1,16 @@ +#include + +char *strndup(const char *str, int chars) +{ + char *buffer; + int n; + + buffer = (char *) malloc(chars +1); + if (buffer) + { + for (n = 0; ((n < chars) && (str[n] != 0)) ; n++) buffer[n] = str[n]; + buffer[n] = 0; + } + + return buffer; +} diff --git a/dependencies/windows/unix/unixfunctions.h b/dependencies/windows/unix/unixfunctions.h new file mode 100644 index 000000000..db2575fa0 --- /dev/null +++ b/dependencies/windows/unix/unixfunctions.h @@ -0,0 +1 @@ +char *strndup(const char *str, int chars); diff --git a/dependencies/yajl-src/BUILDING b/dependencies/yajl/BUILDING similarity index 100% rename from dependencies/yajl-src/BUILDING rename to dependencies/yajl/BUILDING diff --git a/dependencies/yajl-src/BUILDING.win32 b/dependencies/yajl/BUILDING.win32 similarity index 100% rename from dependencies/yajl-src/BUILDING.win32 rename to dependencies/yajl/BUILDING.win32 diff --git a/dependencies/yajl-src/CMakeLists.txt b/dependencies/yajl/CMakeLists.txt similarity index 100% rename from dependencies/yajl-src/CMakeLists.txt rename to dependencies/yajl/CMakeLists.txt diff --git a/dependencies/yajl-src/COPYING b/dependencies/yajl/COPYING similarity index 100% rename from dependencies/yajl-src/COPYING rename to dependencies/yajl/COPYING diff --git a/dependencies/yajl-src/ChangeLog b/dependencies/yajl/ChangeLog similarity index 100% rename from dependencies/yajl-src/ChangeLog rename to dependencies/yajl/ChangeLog diff --git a/dependencies/yajl-src/README b/dependencies/yajl/README similarity index 100% rename from dependencies/yajl-src/README rename to dependencies/yajl/README diff --git a/dependencies/yajl-src/TODO b/dependencies/yajl/TODO similarity index 100% rename from dependencies/yajl-src/TODO rename to dependencies/yajl/TODO diff --git a/dependencies/yajl-src/YAJLDoc.cmake b/dependencies/yajl/YAJLDoc.cmake similarity index 100% rename from dependencies/yajl-src/YAJLDoc.cmake rename to dependencies/yajl/YAJLDoc.cmake diff --git a/dependencies/yajl-src/configure b/dependencies/yajl/configure old mode 100755 new mode 100644 similarity index 100% rename from dependencies/yajl-src/configure rename to dependencies/yajl/configure diff --git a/dependencies/yajl-src/example/CMakeLists.txt b/dependencies/yajl/example/CMakeLists.txt similarity index 100% rename from dependencies/yajl-src/example/CMakeLists.txt rename to dependencies/yajl/example/CMakeLists.txt diff --git a/dependencies/yajl-src/example/README.md b/dependencies/yajl/example/README.md similarity index 100% rename from dependencies/yajl-src/example/README.md rename to dependencies/yajl/example/README.md diff --git a/dependencies/yajl-src/example/parse_config.c b/dependencies/yajl/example/parse_config.c similarity index 100% rename from dependencies/yajl-src/example/parse_config.c rename to dependencies/yajl/example/parse_config.c diff --git a/dependencies/yajl-src/example/sample.config b/dependencies/yajl/example/sample.config similarity index 100% rename from dependencies/yajl-src/example/sample.config rename to dependencies/yajl/example/sample.config diff --git a/dependencies/yajl-src/perf/CMakeLists.txt b/dependencies/yajl/perf/CMakeLists.txt similarity index 100% rename from dependencies/yajl-src/perf/CMakeLists.txt rename to dependencies/yajl/perf/CMakeLists.txt diff --git a/dependencies/yajl-src/perf/documents.c b/dependencies/yajl/perf/documents.c similarity index 100% rename from dependencies/yajl-src/perf/documents.c rename to dependencies/yajl/perf/documents.c diff --git a/dependencies/yajl-src/perf/documents.h b/dependencies/yajl/perf/documents.h similarity index 100% rename from dependencies/yajl-src/perf/documents.h rename to dependencies/yajl/perf/documents.h diff --git a/dependencies/yajl-src/perf/perftest.c b/dependencies/yajl/perf/perftest.c similarity index 100% rename from dependencies/yajl-src/perf/perftest.c rename to dependencies/yajl/perf/perftest.c diff --git a/dependencies/yajl-src/reformatter/CMakeLists.txt b/dependencies/yajl/reformatter/CMakeLists.txt similarity index 100% rename from dependencies/yajl-src/reformatter/CMakeLists.txt rename to dependencies/yajl/reformatter/CMakeLists.txt diff --git a/dependencies/yajl-src/reformatter/json_reformat.c b/dependencies/yajl/reformatter/json_reformat.c similarity index 100% rename from dependencies/yajl-src/reformatter/json_reformat.c rename to dependencies/yajl/reformatter/json_reformat.c diff --git a/dependencies/yajl-src/src/CMakeLists.txt b/dependencies/yajl/src/CMakeLists.txt similarity index 100% rename from dependencies/yajl-src/src/CMakeLists.txt rename to dependencies/yajl/src/CMakeLists.txt diff --git a/dependencies/yajl-src/src/YAJL.dxy b/dependencies/yajl/src/YAJL.dxy similarity index 100% rename from dependencies/yajl-src/src/YAJL.dxy rename to dependencies/yajl/src/YAJL.dxy diff --git a/dependencies/yajl-src/src/api/yajl_common.h b/dependencies/yajl/src/api/yajl_common.h similarity index 100% rename from dependencies/yajl-src/src/api/yajl_common.h rename to dependencies/yajl/src/api/yajl_common.h diff --git a/dependencies/yajl-src/src/api/yajl_gen.h b/dependencies/yajl/src/api/yajl_gen.h similarity index 99% rename from dependencies/yajl-src/src/api/yajl_gen.h rename to dependencies/yajl/src/api/yajl_gen.h index ddd152729..db14fb369 100644 --- a/dependencies/yajl-src/src/api/yajl_gen.h +++ b/dependencies/yajl/src/api/yajl_gen.h @@ -19,7 +19,7 @@ * Interface to YAJL's JSON generation facilities. */ -#include +#include #ifndef __YAJL_GEN_H__ #define __YAJL_GEN_H__ diff --git a/dependencies/yajl-src/src/api/yajl_parse.h b/dependencies/yajl/src/api/yajl_parse.h similarity index 100% rename from dependencies/yajl-src/src/api/yajl_parse.h rename to dependencies/yajl/src/api/yajl_parse.h diff --git a/dependencies/yajl-src/src/api/yajl_tree.h b/dependencies/yajl/src/api/yajl_tree.h similarity index 99% rename from dependencies/yajl-src/src/api/yajl_tree.h rename to dependencies/yajl/src/api/yajl_tree.h index 1c1e06a58..08c55eb15 100644 --- a/dependencies/yajl-src/src/api/yajl_tree.h +++ b/dependencies/yajl/src/api/yajl_tree.h @@ -31,7 +31,7 @@ #ifndef YAJL_TREE_H #define YAJL_TREE_H 1 -#include +#include #ifdef __cplusplus extern "C" { diff --git a/dependencies/yajl-src/src/api/yajl_version.h b/dependencies/yajl/src/api/yajl_version.h similarity index 100% rename from dependencies/yajl-src/src/api/yajl_version.h rename to dependencies/yajl/src/api/yajl_version.h diff --git a/dependencies/yajl-src/src/api/yajl_version.h.cmake b/dependencies/yajl/src/api/yajl_version.h.cmake similarity index 100% rename from dependencies/yajl-src/src/api/yajl_version.h.cmake rename to dependencies/yajl/src/api/yajl_version.h.cmake diff --git a/dependencies/yajl-src/src/yajl b/dependencies/yajl/src/yajl similarity index 100% rename from dependencies/yajl-src/src/yajl rename to dependencies/yajl/src/yajl diff --git a/dependencies/yajl-src/src/yajl.c b/dependencies/yajl/src/yajl.c similarity index 100% rename from dependencies/yajl-src/src/yajl.c rename to dependencies/yajl/src/yajl.c diff --git a/dependencies/yajl-src/src/yajl.pc.cmake b/dependencies/yajl/src/yajl.pc.cmake similarity index 100% rename from dependencies/yajl-src/src/yajl.pc.cmake rename to dependencies/yajl/src/yajl.pc.cmake diff --git a/dependencies/yajl-src/src/yajl_alloc.c b/dependencies/yajl/src/yajl_alloc.c similarity index 100% rename from dependencies/yajl-src/src/yajl_alloc.c rename to dependencies/yajl/src/yajl_alloc.c diff --git a/dependencies/yajl-src/src/yajl_alloc.h b/dependencies/yajl/src/yajl_alloc.h similarity index 100% rename from dependencies/yajl-src/src/yajl_alloc.h rename to dependencies/yajl/src/yajl_alloc.h diff --git a/dependencies/yajl-src/src/yajl_buf.c b/dependencies/yajl/src/yajl_buf.c similarity index 100% rename from dependencies/yajl-src/src/yajl_buf.c rename to dependencies/yajl/src/yajl_buf.c diff --git a/dependencies/yajl-src/src/yajl_buf.h b/dependencies/yajl/src/yajl_buf.h similarity index 100% rename from dependencies/yajl-src/src/yajl_buf.h rename to dependencies/yajl/src/yajl_buf.h diff --git a/dependencies/yajl-src/src/yajl_bytestack.h b/dependencies/yajl/src/yajl_bytestack.h similarity index 100% rename from dependencies/yajl-src/src/yajl_bytestack.h rename to dependencies/yajl/src/yajl_bytestack.h diff --git a/dependencies/yajl-src/src/yajl_encode.c b/dependencies/yajl/src/yajl_encode.c similarity index 100% rename from dependencies/yajl-src/src/yajl_encode.c rename to dependencies/yajl/src/yajl_encode.c diff --git a/dependencies/yajl-src/src/yajl_encode.h b/dependencies/yajl/src/yajl_encode.h similarity index 100% rename from dependencies/yajl-src/src/yajl_encode.h rename to dependencies/yajl/src/yajl_encode.h diff --git a/dependencies/yajl-src/src/yajl_gen.c b/dependencies/yajl/src/yajl_gen.c similarity index 100% rename from dependencies/yajl-src/src/yajl_gen.c rename to dependencies/yajl/src/yajl_gen.c diff --git a/dependencies/yajl-src/src/yajl_lex.c b/dependencies/yajl/src/yajl_lex.c similarity index 100% rename from dependencies/yajl-src/src/yajl_lex.c rename to dependencies/yajl/src/yajl_lex.c diff --git a/dependencies/yajl-src/src/yajl_lex.h b/dependencies/yajl/src/yajl_lex.h similarity index 100% rename from dependencies/yajl-src/src/yajl_lex.h rename to dependencies/yajl/src/yajl_lex.h diff --git a/dependencies/yajl-src/src/yajl_parser.c b/dependencies/yajl/src/yajl_parser.c similarity index 100% rename from dependencies/yajl-src/src/yajl_parser.c rename to dependencies/yajl/src/yajl_parser.c diff --git a/dependencies/yajl-src/src/yajl_parser.h b/dependencies/yajl/src/yajl_parser.h similarity index 100% rename from dependencies/yajl-src/src/yajl_parser.h rename to dependencies/yajl/src/yajl_parser.h diff --git a/dependencies/yajl-src/src/yajl_tree.c b/dependencies/yajl/src/yajl_tree.c similarity index 100% rename from dependencies/yajl-src/src/yajl_tree.c rename to dependencies/yajl/src/yajl_tree.c diff --git a/dependencies/yajl-src/src/yajl_version.c b/dependencies/yajl/src/yajl_version.c similarity index 100% rename from dependencies/yajl-src/src/yajl_version.c rename to dependencies/yajl/src/yajl_version.c diff --git a/dependencies/yajl-src/test/CMakeLists.txt b/dependencies/yajl/test/CMakeLists.txt similarity index 100% rename from dependencies/yajl-src/test/CMakeLists.txt rename to dependencies/yajl/test/CMakeLists.txt diff --git a/dependencies/yajl-src/test/api/CMakeLists.txt b/dependencies/yajl/test/api/CMakeLists.txt similarity index 100% rename from dependencies/yajl-src/test/api/CMakeLists.txt rename to dependencies/yajl/test/api/CMakeLists.txt diff --git a/dependencies/yajl-src/test/api/gen-extra-close.c b/dependencies/yajl/test/api/gen-extra-close.c similarity index 100% rename from dependencies/yajl-src/test/api/gen-extra-close.c rename to dependencies/yajl/test/api/gen-extra-close.c diff --git a/dependencies/yajl-src/test/api/run_tests.sh b/dependencies/yajl/test/api/run_tests.sh old mode 100755 new mode 100644 similarity index 100% rename from dependencies/yajl-src/test/api/run_tests.sh rename to dependencies/yajl/test/api/run_tests.sh diff --git a/dependencies/yajl-src/test/parsing/CMakeLists.txt b/dependencies/yajl/test/parsing/CMakeLists.txt similarity index 100% rename from dependencies/yajl-src/test/parsing/CMakeLists.txt rename to dependencies/yajl/test/parsing/CMakeLists.txt diff --git a/dependencies/yajl-src/test/parsing/cases/ac_difficult_json_c_test_case_with_comments.json b/dependencies/yajl/test/parsing/cases/ac_difficult_json_c_test_case_with_comments.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/ac_difficult_json_c_test_case_with_comments.json rename to dependencies/yajl/test/parsing/cases/ac_difficult_json_c_test_case_with_comments.json diff --git a/dependencies/yajl-src/test/parsing/cases/ac_difficult_json_c_test_case_with_comments.json.gold b/dependencies/yajl/test/parsing/cases/ac_difficult_json_c_test_case_with_comments.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/ac_difficult_json_c_test_case_with_comments.json.gold rename to dependencies/yajl/test/parsing/cases/ac_difficult_json_c_test_case_with_comments.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/ac_simple_with_comments.json b/dependencies/yajl/test/parsing/cases/ac_simple_with_comments.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/ac_simple_with_comments.json rename to dependencies/yajl/test/parsing/cases/ac_simple_with_comments.json diff --git a/dependencies/yajl-src/test/parsing/cases/ac_simple_with_comments.json.gold b/dependencies/yajl/test/parsing/cases/ac_simple_with_comments.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/ac_simple_with_comments.json.gold rename to dependencies/yajl/test/parsing/cases/ac_simple_with_comments.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/ag_false_then_garbage.json b/dependencies/yajl/test/parsing/cases/ag_false_then_garbage.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/ag_false_then_garbage.json rename to dependencies/yajl/test/parsing/cases/ag_false_then_garbage.json diff --git a/dependencies/yajl-src/test/parsing/cases/ag_false_then_garbage.json.gold b/dependencies/yajl/test/parsing/cases/ag_false_then_garbage.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/ag_false_then_garbage.json.gold rename to dependencies/yajl/test/parsing/cases/ag_false_then_garbage.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/ag_null_then_garbage.json b/dependencies/yajl/test/parsing/cases/ag_null_then_garbage.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/ag_null_then_garbage.json rename to dependencies/yajl/test/parsing/cases/ag_null_then_garbage.json diff --git a/dependencies/yajl-src/test/parsing/cases/ag_null_then_garbage.json.gold b/dependencies/yajl/test/parsing/cases/ag_null_then_garbage.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/ag_null_then_garbage.json.gold rename to dependencies/yajl/test/parsing/cases/ag_null_then_garbage.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/ag_true_then_garbage.json b/dependencies/yajl/test/parsing/cases/ag_true_then_garbage.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/ag_true_then_garbage.json rename to dependencies/yajl/test/parsing/cases/ag_true_then_garbage.json diff --git a/dependencies/yajl-src/test/parsing/cases/ag_true_then_garbage.json.gold b/dependencies/yajl/test/parsing/cases/ag_true_then_garbage.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/ag_true_then_garbage.json.gold rename to dependencies/yajl/test/parsing/cases/ag_true_then_garbage.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/am_eof.json b/dependencies/yajl/test/parsing/cases/am_eof.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/am_eof.json rename to dependencies/yajl/test/parsing/cases/am_eof.json diff --git a/dependencies/yajl-src/test/parsing/cases/am_eof.json.gold b/dependencies/yajl/test/parsing/cases/am_eof.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/am_eof.json.gold rename to dependencies/yajl/test/parsing/cases/am_eof.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/am_integers.json b/dependencies/yajl/test/parsing/cases/am_integers.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/am_integers.json rename to dependencies/yajl/test/parsing/cases/am_integers.json diff --git a/dependencies/yajl-src/test/parsing/cases/am_integers.json.gold b/dependencies/yajl/test/parsing/cases/am_integers.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/am_integers.json.gold rename to dependencies/yajl/test/parsing/cases/am_integers.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/am_multiple.json b/dependencies/yajl/test/parsing/cases/am_multiple.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/am_multiple.json rename to dependencies/yajl/test/parsing/cases/am_multiple.json diff --git a/dependencies/yajl-src/test/parsing/cases/am_multiple.json.gold b/dependencies/yajl/test/parsing/cases/am_multiple.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/am_multiple.json.gold rename to dependencies/yajl/test/parsing/cases/am_multiple.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/am_stuff.json b/dependencies/yajl/test/parsing/cases/am_stuff.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/am_stuff.json rename to dependencies/yajl/test/parsing/cases/am_stuff.json diff --git a/dependencies/yajl-src/test/parsing/cases/am_stuff.json.gold b/dependencies/yajl/test/parsing/cases/am_stuff.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/am_stuff.json.gold rename to dependencies/yajl/test/parsing/cases/am_stuff.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/ap_array_open.json b/dependencies/yajl/test/parsing/cases/ap_array_open.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/ap_array_open.json rename to dependencies/yajl/test/parsing/cases/ap_array_open.json diff --git a/dependencies/yajl-src/test/parsing/cases/ap_array_open.json.gold b/dependencies/yajl/test/parsing/cases/ap_array_open.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/ap_array_open.json.gold rename to dependencies/yajl/test/parsing/cases/ap_array_open.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/ap_eof_str.json b/dependencies/yajl/test/parsing/cases/ap_eof_str.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/ap_eof_str.json rename to dependencies/yajl/test/parsing/cases/ap_eof_str.json diff --git a/dependencies/yajl-src/test/parsing/cases/ap_eof_str.json.gold b/dependencies/yajl/test/parsing/cases/ap_eof_str.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/ap_eof_str.json.gold rename to dependencies/yajl/test/parsing/cases/ap_eof_str.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/ap_map_open.json b/dependencies/yajl/test/parsing/cases/ap_map_open.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/ap_map_open.json rename to dependencies/yajl/test/parsing/cases/ap_map_open.json diff --git a/dependencies/yajl-src/test/parsing/cases/ap_map_open.json.gold b/dependencies/yajl/test/parsing/cases/ap_map_open.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/ap_map_open.json.gold rename to dependencies/yajl/test/parsing/cases/ap_map_open.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/ap_partial_ok.json b/dependencies/yajl/test/parsing/cases/ap_partial_ok.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/ap_partial_ok.json rename to dependencies/yajl/test/parsing/cases/ap_partial_ok.json diff --git a/dependencies/yajl-src/test/parsing/cases/ap_partial_ok.json.gold b/dependencies/yajl/test/parsing/cases/ap_partial_ok.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/ap_partial_ok.json.gold rename to dependencies/yajl/test/parsing/cases/ap_partial_ok.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/array.json b/dependencies/yajl/test/parsing/cases/array.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/array.json rename to dependencies/yajl/test/parsing/cases/array.json diff --git a/dependencies/yajl-src/test/parsing/cases/array.json.gold b/dependencies/yajl/test/parsing/cases/array.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/array.json.gold rename to dependencies/yajl/test/parsing/cases/array.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/array_close.json b/dependencies/yajl/test/parsing/cases/array_close.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/array_close.json rename to dependencies/yajl/test/parsing/cases/array_close.json diff --git a/dependencies/yajl-src/test/parsing/cases/array_close.json.gold b/dependencies/yajl/test/parsing/cases/array_close.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/array_close.json.gold rename to dependencies/yajl/test/parsing/cases/array_close.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/bignums.json b/dependencies/yajl/test/parsing/cases/bignums.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/bignums.json rename to dependencies/yajl/test/parsing/cases/bignums.json diff --git a/dependencies/yajl-src/test/parsing/cases/bignums.json.gold b/dependencies/yajl/test/parsing/cases/bignums.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/bignums.json.gold rename to dependencies/yajl/test/parsing/cases/bignums.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/bogus_char.json b/dependencies/yajl/test/parsing/cases/bogus_char.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/bogus_char.json rename to dependencies/yajl/test/parsing/cases/bogus_char.json diff --git a/dependencies/yajl-src/test/parsing/cases/bogus_char.json.gold b/dependencies/yajl/test/parsing/cases/bogus_char.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/bogus_char.json.gold rename to dependencies/yajl/test/parsing/cases/bogus_char.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/codepoints_from_unicode_org.json b/dependencies/yajl/test/parsing/cases/codepoints_from_unicode_org.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/codepoints_from_unicode_org.json rename to dependencies/yajl/test/parsing/cases/codepoints_from_unicode_org.json diff --git a/dependencies/yajl-src/test/parsing/cases/codepoints_from_unicode_org.json.gold b/dependencies/yajl/test/parsing/cases/codepoints_from_unicode_org.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/codepoints_from_unicode_org.json.gold rename to dependencies/yajl/test/parsing/cases/codepoints_from_unicode_org.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/deep_arrays.json b/dependencies/yajl/test/parsing/cases/deep_arrays.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/deep_arrays.json rename to dependencies/yajl/test/parsing/cases/deep_arrays.json diff --git a/dependencies/yajl-src/test/parsing/cases/deep_arrays.json.gold b/dependencies/yajl/test/parsing/cases/deep_arrays.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/deep_arrays.json.gold rename to dependencies/yajl/test/parsing/cases/deep_arrays.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/difficult_json_c_test_case.json b/dependencies/yajl/test/parsing/cases/difficult_json_c_test_case.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/difficult_json_c_test_case.json rename to dependencies/yajl/test/parsing/cases/difficult_json_c_test_case.json diff --git a/dependencies/yajl-src/test/parsing/cases/difficult_json_c_test_case.json.gold b/dependencies/yajl/test/parsing/cases/difficult_json_c_test_case.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/difficult_json_c_test_case.json.gold rename to dependencies/yajl/test/parsing/cases/difficult_json_c_test_case.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/doubles.json b/dependencies/yajl/test/parsing/cases/doubles.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/doubles.json rename to dependencies/yajl/test/parsing/cases/doubles.json diff --git a/dependencies/yajl-src/test/parsing/cases/doubles.json.gold b/dependencies/yajl/test/parsing/cases/doubles.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/doubles.json.gold rename to dependencies/yajl/test/parsing/cases/doubles.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/doubles_in_array.json b/dependencies/yajl/test/parsing/cases/doubles_in_array.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/doubles_in_array.json rename to dependencies/yajl/test/parsing/cases/doubles_in_array.json diff --git a/dependencies/yajl-src/test/parsing/cases/doubles_in_array.json.gold b/dependencies/yajl/test/parsing/cases/doubles_in_array.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/doubles_in_array.json.gold rename to dependencies/yajl/test/parsing/cases/doubles_in_array.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/empty_array.json b/dependencies/yajl/test/parsing/cases/empty_array.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/empty_array.json rename to dependencies/yajl/test/parsing/cases/empty_array.json diff --git a/dependencies/yajl-src/test/parsing/cases/empty_array.json.gold b/dependencies/yajl/test/parsing/cases/empty_array.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/empty_array.json.gold rename to dependencies/yajl/test/parsing/cases/empty_array.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/empty_string.json b/dependencies/yajl/test/parsing/cases/empty_string.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/empty_string.json rename to dependencies/yajl/test/parsing/cases/empty_string.json diff --git a/dependencies/yajl-src/test/parsing/cases/empty_string.json.gold b/dependencies/yajl/test/parsing/cases/empty_string.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/empty_string.json.gold rename to dependencies/yajl/test/parsing/cases/empty_string.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/escaped_bulgarian.json b/dependencies/yajl/test/parsing/cases/escaped_bulgarian.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/escaped_bulgarian.json rename to dependencies/yajl/test/parsing/cases/escaped_bulgarian.json diff --git a/dependencies/yajl-src/test/parsing/cases/escaped_bulgarian.json.gold b/dependencies/yajl/test/parsing/cases/escaped_bulgarian.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/escaped_bulgarian.json.gold rename to dependencies/yajl/test/parsing/cases/escaped_bulgarian.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/escaped_foobar.json b/dependencies/yajl/test/parsing/cases/escaped_foobar.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/escaped_foobar.json rename to dependencies/yajl/test/parsing/cases/escaped_foobar.json diff --git a/dependencies/yajl-src/test/parsing/cases/escaped_foobar.json.gold b/dependencies/yajl/test/parsing/cases/escaped_foobar.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/escaped_foobar.json.gold rename to dependencies/yajl/test/parsing/cases/escaped_foobar.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/false.json b/dependencies/yajl/test/parsing/cases/false.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/false.json rename to dependencies/yajl/test/parsing/cases/false.json diff --git a/dependencies/yajl-src/test/parsing/cases/false.json.gold b/dependencies/yajl/test/parsing/cases/false.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/false.json.gold rename to dependencies/yajl/test/parsing/cases/false.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/fg_false_then_garbage.json b/dependencies/yajl/test/parsing/cases/fg_false_then_garbage.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/fg_false_then_garbage.json rename to dependencies/yajl/test/parsing/cases/fg_false_then_garbage.json diff --git a/dependencies/yajl-src/test/parsing/cases/fg_false_then_garbage.json.gold b/dependencies/yajl/test/parsing/cases/fg_false_then_garbage.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/fg_false_then_garbage.json.gold rename to dependencies/yajl/test/parsing/cases/fg_false_then_garbage.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/fg_issue_7.json b/dependencies/yajl/test/parsing/cases/fg_issue_7.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/fg_issue_7.json rename to dependencies/yajl/test/parsing/cases/fg_issue_7.json diff --git a/dependencies/yajl-src/test/parsing/cases/fg_issue_7.json.gold b/dependencies/yajl/test/parsing/cases/fg_issue_7.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/fg_issue_7.json.gold rename to dependencies/yajl/test/parsing/cases/fg_issue_7.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/fg_null_then_garbage.json b/dependencies/yajl/test/parsing/cases/fg_null_then_garbage.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/fg_null_then_garbage.json rename to dependencies/yajl/test/parsing/cases/fg_null_then_garbage.json diff --git a/dependencies/yajl-src/test/parsing/cases/fg_null_then_garbage.json.gold b/dependencies/yajl/test/parsing/cases/fg_null_then_garbage.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/fg_null_then_garbage.json.gold rename to dependencies/yajl/test/parsing/cases/fg_null_then_garbage.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/fg_true_then_garbage.json b/dependencies/yajl/test/parsing/cases/fg_true_then_garbage.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/fg_true_then_garbage.json rename to dependencies/yajl/test/parsing/cases/fg_true_then_garbage.json diff --git a/dependencies/yajl-src/test/parsing/cases/fg_true_then_garbage.json.gold b/dependencies/yajl/test/parsing/cases/fg_true_then_garbage.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/fg_true_then_garbage.json.gold rename to dependencies/yajl/test/parsing/cases/fg_true_then_garbage.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/four_byte_utf8.json b/dependencies/yajl/test/parsing/cases/four_byte_utf8.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/four_byte_utf8.json rename to dependencies/yajl/test/parsing/cases/four_byte_utf8.json diff --git a/dependencies/yajl-src/test/parsing/cases/four_byte_utf8.json.gold b/dependencies/yajl/test/parsing/cases/four_byte_utf8.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/four_byte_utf8.json.gold rename to dependencies/yajl/test/parsing/cases/four_byte_utf8.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/high_overflow.json b/dependencies/yajl/test/parsing/cases/high_overflow.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/high_overflow.json rename to dependencies/yajl/test/parsing/cases/high_overflow.json diff --git a/dependencies/yajl-src/test/parsing/cases/high_overflow.json.gold b/dependencies/yajl/test/parsing/cases/high_overflow.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/high_overflow.json.gold rename to dependencies/yajl/test/parsing/cases/high_overflow.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/integers.json b/dependencies/yajl/test/parsing/cases/integers.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/integers.json rename to dependencies/yajl/test/parsing/cases/integers.json diff --git a/dependencies/yajl-src/test/parsing/cases/integers.json.gold b/dependencies/yajl/test/parsing/cases/integers.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/integers.json.gold rename to dependencies/yajl/test/parsing/cases/integers.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/invalid_utf8.json b/dependencies/yajl/test/parsing/cases/invalid_utf8.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/invalid_utf8.json rename to dependencies/yajl/test/parsing/cases/invalid_utf8.json diff --git a/dependencies/yajl-src/test/parsing/cases/invalid_utf8.json.gold b/dependencies/yajl/test/parsing/cases/invalid_utf8.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/invalid_utf8.json.gold rename to dependencies/yajl/test/parsing/cases/invalid_utf8.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/isolated_surrogate_marker.json b/dependencies/yajl/test/parsing/cases/isolated_surrogate_marker.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/isolated_surrogate_marker.json rename to dependencies/yajl/test/parsing/cases/isolated_surrogate_marker.json diff --git a/dependencies/yajl-src/test/parsing/cases/isolated_surrogate_marker.json.gold b/dependencies/yajl/test/parsing/cases/isolated_surrogate_marker.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/isolated_surrogate_marker.json.gold rename to dependencies/yajl/test/parsing/cases/isolated_surrogate_marker.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/leading_zero_in_number.json b/dependencies/yajl/test/parsing/cases/leading_zero_in_number.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/leading_zero_in_number.json rename to dependencies/yajl/test/parsing/cases/leading_zero_in_number.json diff --git a/dependencies/yajl-src/test/parsing/cases/leading_zero_in_number.json.gold b/dependencies/yajl/test/parsing/cases/leading_zero_in_number.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/leading_zero_in_number.json.gold rename to dependencies/yajl/test/parsing/cases/leading_zero_in_number.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/lonely_minus_sign.json b/dependencies/yajl/test/parsing/cases/lonely_minus_sign.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/lonely_minus_sign.json rename to dependencies/yajl/test/parsing/cases/lonely_minus_sign.json diff --git a/dependencies/yajl-src/test/parsing/cases/lonely_minus_sign.json.gold b/dependencies/yajl/test/parsing/cases/lonely_minus_sign.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/lonely_minus_sign.json.gold rename to dependencies/yajl/test/parsing/cases/lonely_minus_sign.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/lonely_number.json b/dependencies/yajl/test/parsing/cases/lonely_number.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/lonely_number.json rename to dependencies/yajl/test/parsing/cases/lonely_number.json diff --git a/dependencies/yajl-src/test/parsing/cases/lonely_number.json.gold b/dependencies/yajl/test/parsing/cases/lonely_number.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/lonely_number.json.gold rename to dependencies/yajl/test/parsing/cases/lonely_number.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/low_overflow.json b/dependencies/yajl/test/parsing/cases/low_overflow.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/low_overflow.json rename to dependencies/yajl/test/parsing/cases/low_overflow.json diff --git a/dependencies/yajl-src/test/parsing/cases/low_overflow.json.gold b/dependencies/yajl/test/parsing/cases/low_overflow.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/low_overflow.json.gold rename to dependencies/yajl/test/parsing/cases/low_overflow.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/map_close.json b/dependencies/yajl/test/parsing/cases/map_close.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/map_close.json rename to dependencies/yajl/test/parsing/cases/map_close.json diff --git a/dependencies/yajl-src/test/parsing/cases/map_close.json.gold b/dependencies/yajl/test/parsing/cases/map_close.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/map_close.json.gold rename to dependencies/yajl/test/parsing/cases/map_close.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/missing_integer_after_decimal_point.json b/dependencies/yajl/test/parsing/cases/missing_integer_after_decimal_point.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/missing_integer_after_decimal_point.json rename to dependencies/yajl/test/parsing/cases/missing_integer_after_decimal_point.json diff --git a/dependencies/yajl-src/test/parsing/cases/missing_integer_after_decimal_point.json.gold b/dependencies/yajl/test/parsing/cases/missing_integer_after_decimal_point.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/missing_integer_after_decimal_point.json.gold rename to dependencies/yajl/test/parsing/cases/missing_integer_after_decimal_point.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/missing_integer_after_exponent.json b/dependencies/yajl/test/parsing/cases/missing_integer_after_exponent.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/missing_integer_after_exponent.json rename to dependencies/yajl/test/parsing/cases/missing_integer_after_exponent.json diff --git a/dependencies/yajl-src/test/parsing/cases/missing_integer_after_exponent.json.gold b/dependencies/yajl/test/parsing/cases/missing_integer_after_exponent.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/missing_integer_after_exponent.json.gold rename to dependencies/yajl/test/parsing/cases/missing_integer_after_exponent.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/multiple.json b/dependencies/yajl/test/parsing/cases/multiple.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/multiple.json rename to dependencies/yajl/test/parsing/cases/multiple.json diff --git a/dependencies/yajl-src/test/parsing/cases/multiple.json.gold b/dependencies/yajl/test/parsing/cases/multiple.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/multiple.json.gold rename to dependencies/yajl/test/parsing/cases/multiple.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/non_utf8_char_in_string.json b/dependencies/yajl/test/parsing/cases/non_utf8_char_in_string.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/non_utf8_char_in_string.json rename to dependencies/yajl/test/parsing/cases/non_utf8_char_in_string.json diff --git a/dependencies/yajl-src/test/parsing/cases/non_utf8_char_in_string.json.gold b/dependencies/yajl/test/parsing/cases/non_utf8_char_in_string.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/non_utf8_char_in_string.json.gold rename to dependencies/yajl/test/parsing/cases/non_utf8_char_in_string.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/np_partial_bad.json b/dependencies/yajl/test/parsing/cases/np_partial_bad.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/np_partial_bad.json rename to dependencies/yajl/test/parsing/cases/np_partial_bad.json diff --git a/dependencies/yajl-src/test/parsing/cases/np_partial_bad.json.gold b/dependencies/yajl/test/parsing/cases/np_partial_bad.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/np_partial_bad.json.gold rename to dependencies/yajl/test/parsing/cases/np_partial_bad.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/null.json b/dependencies/yajl/test/parsing/cases/null.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/null.json rename to dependencies/yajl/test/parsing/cases/null.json diff --git a/dependencies/yajl-src/test/parsing/cases/null.json.gold b/dependencies/yajl/test/parsing/cases/null.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/null.json.gold rename to dependencies/yajl/test/parsing/cases/null.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/nulls_and_bools.json b/dependencies/yajl/test/parsing/cases/nulls_and_bools.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/nulls_and_bools.json rename to dependencies/yajl/test/parsing/cases/nulls_and_bools.json diff --git a/dependencies/yajl-src/test/parsing/cases/nulls_and_bools.json.gold b/dependencies/yajl/test/parsing/cases/nulls_and_bools.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/nulls_and_bools.json.gold rename to dependencies/yajl/test/parsing/cases/nulls_and_bools.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/simple.json b/dependencies/yajl/test/parsing/cases/simple.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/simple.json rename to dependencies/yajl/test/parsing/cases/simple.json diff --git a/dependencies/yajl-src/test/parsing/cases/simple.json.gold b/dependencies/yajl/test/parsing/cases/simple.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/simple.json.gold rename to dependencies/yajl/test/parsing/cases/simple.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/simple_with_comments.json b/dependencies/yajl/test/parsing/cases/simple_with_comments.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/simple_with_comments.json rename to dependencies/yajl/test/parsing/cases/simple_with_comments.json diff --git a/dependencies/yajl-src/test/parsing/cases/simple_with_comments.json.gold b/dependencies/yajl/test/parsing/cases/simple_with_comments.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/simple_with_comments.json.gold rename to dependencies/yajl/test/parsing/cases/simple_with_comments.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/string_invalid_escape.json b/dependencies/yajl/test/parsing/cases/string_invalid_escape.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/string_invalid_escape.json rename to dependencies/yajl/test/parsing/cases/string_invalid_escape.json diff --git a/dependencies/yajl-src/test/parsing/cases/string_invalid_escape.json.gold b/dependencies/yajl/test/parsing/cases/string_invalid_escape.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/string_invalid_escape.json.gold rename to dependencies/yajl/test/parsing/cases/string_invalid_escape.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/string_invalid_hex_char.json b/dependencies/yajl/test/parsing/cases/string_invalid_hex_char.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/string_invalid_hex_char.json rename to dependencies/yajl/test/parsing/cases/string_invalid_hex_char.json diff --git a/dependencies/yajl-src/test/parsing/cases/string_invalid_hex_char.json.gold b/dependencies/yajl/test/parsing/cases/string_invalid_hex_char.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/string_invalid_hex_char.json.gold rename to dependencies/yajl/test/parsing/cases/string_invalid_hex_char.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/string_with_escapes.json b/dependencies/yajl/test/parsing/cases/string_with_escapes.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/string_with_escapes.json rename to dependencies/yajl/test/parsing/cases/string_with_escapes.json diff --git a/dependencies/yajl-src/test/parsing/cases/string_with_escapes.json.gold b/dependencies/yajl/test/parsing/cases/string_with_escapes.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/string_with_escapes.json.gold rename to dependencies/yajl/test/parsing/cases/string_with_escapes.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/string_with_invalid_newline.json b/dependencies/yajl/test/parsing/cases/string_with_invalid_newline.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/string_with_invalid_newline.json rename to dependencies/yajl/test/parsing/cases/string_with_invalid_newline.json diff --git a/dependencies/yajl-src/test/parsing/cases/string_with_invalid_newline.json.gold b/dependencies/yajl/test/parsing/cases/string_with_invalid_newline.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/string_with_invalid_newline.json.gold rename to dependencies/yajl/test/parsing/cases/string_with_invalid_newline.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/three_byte_utf8.json b/dependencies/yajl/test/parsing/cases/three_byte_utf8.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/three_byte_utf8.json rename to dependencies/yajl/test/parsing/cases/three_byte_utf8.json diff --git a/dependencies/yajl-src/test/parsing/cases/three_byte_utf8.json.gold b/dependencies/yajl/test/parsing/cases/three_byte_utf8.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/three_byte_utf8.json.gold rename to dependencies/yajl/test/parsing/cases/three_byte_utf8.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/true.json b/dependencies/yajl/test/parsing/cases/true.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/true.json rename to dependencies/yajl/test/parsing/cases/true.json diff --git a/dependencies/yajl-src/test/parsing/cases/true.json.gold b/dependencies/yajl/test/parsing/cases/true.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/true.json.gold rename to dependencies/yajl/test/parsing/cases/true.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/unescaped_bulgarian.json b/dependencies/yajl/test/parsing/cases/unescaped_bulgarian.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/unescaped_bulgarian.json rename to dependencies/yajl/test/parsing/cases/unescaped_bulgarian.json diff --git a/dependencies/yajl-src/test/parsing/cases/unescaped_bulgarian.json.gold b/dependencies/yajl/test/parsing/cases/unescaped_bulgarian.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/unescaped_bulgarian.json.gold rename to dependencies/yajl/test/parsing/cases/unescaped_bulgarian.json.gold diff --git a/dependencies/yajl-src/test/parsing/cases/zerobyte.json b/dependencies/yajl/test/parsing/cases/zerobyte.json similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/zerobyte.json rename to dependencies/yajl/test/parsing/cases/zerobyte.json diff --git a/dependencies/yajl-src/test/parsing/cases/zerobyte.json.gold b/dependencies/yajl/test/parsing/cases/zerobyte.json.gold similarity index 100% rename from dependencies/yajl-src/test/parsing/cases/zerobyte.json.gold rename to dependencies/yajl/test/parsing/cases/zerobyte.json.gold diff --git a/dependencies/yajl-src/test/parsing/run_tests.sh b/dependencies/yajl/test/parsing/run_tests.sh old mode 100755 new mode 100644 similarity index 100% rename from dependencies/yajl-src/test/parsing/run_tests.sh rename to dependencies/yajl/test/parsing/run_tests.sh diff --git a/dependencies/yajl-src/test/parsing/yajl_test.c b/dependencies/yajl/test/parsing/yajl_test.c similarity index 100% rename from dependencies/yajl-src/test/parsing/yajl_test.c rename to dependencies/yajl/test/parsing/yajl_test.c diff --git a/dependencies/yajl-src/verify/CMakeLists.txt b/dependencies/yajl/verify/CMakeLists.txt similarity index 100% rename from dependencies/yajl-src/verify/CMakeLists.txt rename to dependencies/yajl/verify/CMakeLists.txt diff --git a/dependencies/yajl-src/verify/json_verify.c b/dependencies/yajl/verify/json_verify.c similarity index 100% rename from dependencies/yajl-src/verify/json_verify.c rename to dependencies/yajl/verify/json_verify.c diff --git a/dependencies/yajl-src/yajl_tree.c ligne 434 - yaj.textClipping b/dependencies/yajl/yajl_tree.c ligne 434 - yaj.textClipping similarity index 100% rename from dependencies/yajl-src/yajl_tree.c ligne 434 - yaj.textClipping rename to dependencies/yajl/yajl_tree.c ligne 434 - yaj.textClipping diff --git a/src/admin.c b/src/admin.c index 12ea514cc..487fcf9ba 100644 --- a/src/admin.c +++ b/src/admin.c @@ -11,6 +11,9 @@ #include #include #include +#ifdef _WIN32 +#include "unixfunctions.h" +#endif #if defined(__unix__) || defined(__unix) || \ (defined(__APPLE__) && defined(__MACH__)) @@ -84,7 +87,7 @@ void admin_computeTime(char *dest) { struct timeval tick; gettimeofday(&tick, NULL); - struct tm *tm = localtime(&tick.tv_sec); + struct tm *tm = localtime(&tick.tv_sec); snprintf(dest,128,"%02d/%02d/%d;%02d:%02d:%02d.%06d", tm->tm_mday, tm->tm_mon + 1, tm->tm_year + 1900, tm->tm_hour, tm->tm_min, tm->tm_sec, tick.tv_usec); } diff --git a/src/definition.c b/src/definition.c index 3ffe8a2dd..4589a6107 100644 --- a/src/definition.c +++ b/src/definition.c @@ -16,6 +16,9 @@ #include "mastic_private.h" #include "uthash/uthash.h" #include "uthash/utlist.h" +#ifdef _WIN32 +#include "unixfunctions.h" +#endif definition * mtic_internal_definition = NULL; diff --git a/src/mapping.c b/src/mapping.c index 3ce0181e1..497d7c69b 100644 --- a/src/mapping.c +++ b/src/mapping.c @@ -13,6 +13,9 @@ #include #include +#ifdef _WIN32 +#include "unixfunctions.h" +#endif #include "mastic_private.h" mapping_t* mtic_internal_mapping = NULL; diff --git a/src/network.c b/src/network.c index a428114ca..75e025c84 100644 --- a/src/network.c +++ b/src/network.c @@ -29,6 +29,9 @@ #include #include +#ifdef _WIN32 +#include "unixfunctions.h" +#endif #include "uthash/uthash.h" #include "uthash/utlist.h" #include "mastic_private.h" diff --git a/src/parser.c b/src/parser.c index ba88ca7cf..15acf8117 100644 --- a/src/parser.c +++ b/src/parser.c @@ -9,9 +9,12 @@ #include #include +#ifdef _WIN32 +#include "unixfunctions.h" +#endif -#include "yajl/yajl_tree.h" -#include "yajl/yajl_gen.h" +#include "yajl_tree.h" +#include "yajl_gen.h" #include "mastic_private.h" #define STR_CATEGORY "category"