From fc3d44392e1d772517dd7a862dceb65df8f4428c Mon Sep 17 00:00:00 2001 From: James Moore Date: Tue, 25 Mar 2014 15:53:15 -0700 Subject: [PATCH 01/33] first blob of the build script --- ios/build.sh | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100755 ios/build.sh diff --git a/ios/build.sh b/ios/build.sh new file mode 100755 index 00000000..03b20ea2 --- /dev/null +++ b/ios/build.sh @@ -0,0 +1,49 @@ +#!/bin/sh + +# build.sh +# serval-dna +# +# Created by James Moore on 3/25/14. +# Copyright (c) 2014 The Serval Project. All rights reserved. + +# Add the homebrew tools to the path since automake no longer is apart of Xcode +PATH=/usr/local/bin:$PATH +ARCHS=(arvm7 arvm7s arm64 i386 x86_64) +SDK_VERSION=7.1 +DEVELOPER=`xcode-select -print-path` + +set -ex + +command -v autoreconf >/dev/null 2>&1 || { echo "In order to build this library you must have the autoreconf tool installed. It's available via homebrew."; exit 1; } + +buildIOS() +{ + ARCH=$1 + + if [[ "${ARCH}" == "i386" || "${ARCH}" == "x86_64" ]]; then + PLATFORM="iPhoneSimulator" + else + PLATFORM="iPhoneOS" + fi + + CROSS_TOP="${DEVELOPER}/Platforms/${PLATFORM}.platform/Developer" + CROSS_SDK="${PLATFORM}${SDK_VERSION}.sdk" + export CFLAGS="-isysroot ${CROSS_TOP}/SDKs/${CROSS_SDK} -miphoneos-version-min=${SDK_VERSION}" + export CC="clang -arch ${ARCH}" + + echo "Building serval-dna for ${PLATFORM} ${SDK_VERSION} ${ARCH}" + + ./configure --prefix="/tmp/serval-dna-${ARCH}" --disable-voiptest #&> "/tmp/serval-dna-${ARCH}.log" + + make >> "/tmp/serval-dna-${ARCH}.log" #2>&1 + make install >> "/tmp/serval-dna-${ARCH}.log" #2>&1 + make clean >> "/tmp/serval-dna-${ARCH}.log" #2>&1 +} + +# Generate configure +autoreconf -f -i + +mkdir -p build/include/serval-dna +rm -rf "/tmp/serval-dna-*" + +buildIOS "i386" \ No newline at end of file From 28bc251090a3cfb3a090825787665fe7fb2760a4 Mon Sep 17 00:00:00 2001 From: James Moore Date: Fri, 4 Apr 2014 16:31:26 -0700 Subject: [PATCH 02/33] added some rules to modify serval files in place to support building on the mac --- ios/build.sh | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/ios/build.sh b/ios/build.sh index 03b20ea2..a6523798 100755 --- a/ios/build.sh +++ b/ios/build.sh @@ -19,31 +19,56 @@ command -v autoreconf >/dev/null 2>&1 || { echo "In order to build this library buildIOS() { ARCH=$1 - - if [[ "${ARCH}" == "i386" || "${ARCH}" == "x86_64" ]]; then + HOST="" + + if [[ "${ARCH}" == "i386" ]]; then + PLATFORM="iPhoneSimulator" + HOST="--host=i386-apple-darwin" + elif [[ "${ARCH}" == "x86_64" ]]; then PLATFORM="iPhoneSimulator" else PLATFORM="iPhoneOS" + HOST="--host=arm-apple-darwin" fi CROSS_TOP="${DEVELOPER}/Platforms/${PLATFORM}.platform/Developer" CROSS_SDK="${PLATFORM}${SDK_VERSION}.sdk" - export CFLAGS="-isysroot ${CROSS_TOP}/SDKs/${CROSS_SDK} -miphoneos-version-min=${SDK_VERSION}" - export CC="clang -arch ${ARCH}" + SDKROOT="${CROSS_TOP}/SDKs/${CROSS_SDK}" + + export CFLAGS="-arch ${ARCH} -pipe -no-cpp-precomp -isysroot $SDKROOT -I$SDKROOT/usr/include -miphoneos-version-min=${SDK_VERSION}" + export CC="clang" echo "Building serval-dna for ${PLATFORM} ${SDK_VERSION} ${ARCH}" - ./configure --prefix="/tmp/serval-dna-${ARCH}" --disable-voiptest #&> "/tmp/serval-dna-${ARCH}.log" + ./configure $HOST --prefix="/tmp/serval-dna-${ARCH}" --disable-voiptest #&> "/tmp/serval-dna-${ARCH}.log" make >> "/tmp/serval-dna-${ARCH}.log" #2>&1 make install >> "/tmp/serval-dna-${ARCH}.log" #2>&1 make clean >> "/tmp/serval-dna-${ARCH}.log" #2>&1 + + # don't know why these don't get removed + rm directory_service.o + rm config_test.o } +# remove duplicated function +perl -p -i -e 's/^(void rotbuf_log\(struct __sourceloc __whence, int log_level, const char \*prefix, const struct rotbuf \*rb\);)/\/\/\1/' rotbuf.h + +# install -D doesn't work with the OS X install +perl -p -i -e 's/^\t\$\(INSTALL_PROGRAM\) -D servald \$\(DESTDIR\)\$\(sbindir\)\/servald/\tmkdir -p \$\(DESTDIR\)\$\(sbindir\) +\t\$\(INSTALL_PROGRAM\) servald \$\(DESTDIR\)\$\(sbindir\)\/servald/' Makefile.in + +# use CFLAGS when building version file to support cross-compilation +perl -p -i -e 's/&& \$\(CC\) -c version_servald.c/&& \$\(CC\) \$\(CFLAGS\) -c version_servald.c/' Makefile.in + # Generate configure autoreconf -f -i mkdir -p build/include/serval-dna rm -rf "/tmp/serval-dna-*" -buildIOS "i386" \ No newline at end of file +buildIOS "armv7" + +# for arch in $ARCHS; do +# buildIOS "${arch}" +# done From b154e5b61a4fc153ad61cea53cb16b8d731a10dd Mon Sep 17 00:00:00 2001 From: James Moore Date: Sat, 5 Apr 2014 10:25:06 -0700 Subject: [PATCH 03/33] don't need this header and its not included in iOS --- lsif.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lsif.c b/lsif.c index 73374bef..1376e651 100644 --- a/lsif.c +++ b/lsif.c @@ -43,7 +43,6 @@ #ifndef SIOCGIFCONF #include #endif -#include #if __MACH__ #include #endif From 60c843666ea214a74c0a4a646ba3ec633eaf23d0 Mon Sep 17 00:00:00 2001 From: James Moore Date: Sat, 5 Apr 2014 10:25:55 -0700 Subject: [PATCH 04/33] use CFLAGS for cross-compiling --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index afac0487..91f2bee2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -76,10 +76,10 @@ sqlite-amalgamation-3070900/sqlite3.o: sqlite-amalgamation-3070900/sqlite3.c @$(CC) $(CFLAGS) $(DEFS) -c $< -o sqlite-amalgamation-3070900/sqlite3.o version.o: *.h *.c version_string.sh VERSION.txt COPYRIGHT.txt Makefile - @echo CC version_servald.c + @echo CC $(CFLAGS) version_servald.c @V=`./version_string.sh --ignore-untracked` \ && C="`sed -e :a -e N -e '$$!ba' -e 's/[\\\\"]/\\\\&/g' -e 's/\\n/\\\\n/g' COPYRIGHT.txt`" \ - && $(CC) -c version_servald.c -o $@ -DSERVALD_VERSION="\"$$V\"" -DSERVALD_COPYRIGHT="\"$$C\"" + && $(CC) $(CFLAGS) -c version_servald.c -o $@ -DSERVALD_VERSION="\"$$V\"" -DSERVALD_COPYRIGHT="\"$$C\"" VERSION.txt: From 41be08d073ac124d6d53ad74a1398c281ddd600a Mon Sep 17 00:00:00 2001 From: James Moore Date: Sat, 5 Apr 2014 10:26:54 -0700 Subject: [PATCH 05/33] ignore our build folder --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index af9db6be..2945dc1b 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,5 @@ serval.c *.so test.*.log testlog + +build From 5aa3dfa66ec7f3a9f7ce98deda00d9e9c2cff841 Mon Sep 17 00:00:00 2001 From: James Moore Date: Sat, 5 Apr 2014 10:34:36 -0700 Subject: [PATCH 06/33] create fat binary --- ios/build.sh | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/ios/build.sh b/ios/build.sh index a6523798..308ec490 100755 --- a/ios/build.sh +++ b/ios/build.sh @@ -6,14 +6,15 @@ # Created by James Moore on 3/25/14. # Copyright (c) 2014 The Serval Project. All rights reserved. +set -x + # Add the homebrew tools to the path since automake no longer is apart of Xcode PATH=/usr/local/bin:$PATH -ARCHS=(arvm7 arvm7s arm64 i386 x86_64) +ARCHS="armv7 armv7s arm64 i386 x86_64" SDK_VERSION=7.1 +PREFIX=$(pwd)/build DEVELOPER=`xcode-select -print-path` -set -ex - command -v autoreconf >/dev/null 2>&1 || { echo "In order to build this library you must have the autoreconf tool installed. It's available via homebrew."; exit 1; } buildIOS() @@ -40,11 +41,11 @@ buildIOS() echo "Building serval-dna for ${PLATFORM} ${SDK_VERSION} ${ARCH}" - ./configure $HOST --prefix="/tmp/serval-dna-${ARCH}" --disable-voiptest #&> "/tmp/serval-dna-${ARCH}.log" + ./configure $HOST --prefix="${PREFIX}/serval-dna-${ARCH}" --disable-voiptest &> "${PREFIX}/serval-dna-${ARCH}.log" - make >> "/tmp/serval-dna-${ARCH}.log" #2>&1 - make install >> "/tmp/serval-dna-${ARCH}.log" #2>&1 - make clean >> "/tmp/serval-dna-${ARCH}.log" #2>&1 + make >> "${PREFIX}/serval-dna-${ARCH}.log" 2>&1 + make install >> "${PREFIX}/serval-dna-${ARCH}.log" 2>&1 + make clean >> "${PREFIX}/serval-dna-${ARCH}.log" 2>&1 # don't know why these don't get removed rm directory_service.o @@ -59,16 +60,25 @@ perl -p -i -e 's/^\t\$\(INSTALL_PROGRAM\) -D servald \$\(DESTDIR\)\$\(sbindir\)\ \t\$\(INSTALL_PROGRAM\) servald \$\(DESTDIR\)\$\(sbindir\)\/servald/' Makefile.in # use CFLAGS when building version file to support cross-compilation -perl -p -i -e 's/&& \$\(CC\) -c version_servald.c/&& \$\(CC\) \$\(CFLAGS\) -c version_servald.c/' Makefile.in +# perl -p -i -e 's/&& \$\(CC\) -c version_servald.c/&& \$\(CC\) \$\(CFLAGS\) -c version_servald.c/' Makefile.in # Generate configure autoreconf -f -i -mkdir -p build/include/serval-dna -rm -rf "/tmp/serval-dna-*" +#mkdir -p build/include/serval-dna +rm -rf "${PREFIX}/serval-dna-*" + +for arch in ${ARCHS}; do + buildIOS "${arch}" +done + +echo "Building fat binary" -buildIOS "armv7" +lipo \ + "${PREFIX}/serval-dna-armv7/sbin/servald" \ + "${PREFIX}/serval-dna-armv7s/sbin/servald" \ + "${PREFIX}/serval-dna-arm64/sbin/servald" \ + "${PREFIX}/serval-dna-i386/sbin/servald" \ + "${PREFIX}/serval-dna-x86_64/sbin/servald" \ + -create -output ${PREFIX}/servald -# for arch in $ARCHS; do -# buildIOS "${arch}" -# done From 540401c472893372de1555197d2f77324f1521e7 Mon Sep 17 00:00:00 2001 From: James Moore Date: Sat, 5 Apr 2014 12:17:33 -0700 Subject: [PATCH 07/33] adding Xcode wrapper project --- ios/build.sh | 46 +++-- ios/servald.xcodeproj/project.pbxproj | 179 ++++++++++++++++++ .../contents.xcworkspacedata | 7 + .../UserInterfaceState.xcuserstate | Bin 0 -> 23563 bytes .../xcschemes/servald.xcscheme | 59 ++++++ .../xcschemes/xcschememanagement.plist | 22 +++ 6 files changed, 295 insertions(+), 18 deletions(-) create mode 100644 ios/servald.xcodeproj/project.pbxproj create mode 100644 ios/servald.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 ios/servald.xcodeproj/project.xcworkspace/xcuserdata/james.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 ios/servald.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/servald.xcscheme create mode 100644 ios/servald.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/ios/build.sh b/ios/build.sh index 308ec490..4bbac7a2 100755 --- a/ios/build.sh +++ b/ios/build.sh @@ -1,12 +1,18 @@ #!/bin/sh # build.sh -# serval-dna +# servald # # Created by James Moore on 3/25/14. # Copyright (c) 2014 The Serval Project. All rights reserved. -set -x +# set -x + +# if we're building inside of xcode we need to back up a level +if [[ -n $DEVELOPER_DIR ]]; then + cd .. + pwd +fi # Add the homebrew tools to the path since automake no longer is apart of Xcode PATH=/usr/local/bin:$PATH @@ -39,19 +45,24 @@ buildIOS() export CFLAGS="-arch ${ARCH} -pipe -no-cpp-precomp -isysroot $SDKROOT -I$SDKROOT/usr/include -miphoneos-version-min=${SDK_VERSION}" export CC="clang" - echo "Building serval-dna for ${PLATFORM} ${SDK_VERSION} ${ARCH}" + echo "=> Building servald for ${PLATFORM} ${SDK_VERSION} ${ARCH}" - ./configure $HOST --prefix="${PREFIX}/serval-dna-${ARCH}" --disable-voiptest &> "${PREFIX}/serval-dna-${ARCH}.log" + ./configure $HOST --prefix="${PREFIX}/servald-${ARCH}" --disable-voiptest &> "${PREFIX}/servald-${ARCH}.log" - make >> "${PREFIX}/serval-dna-${ARCH}.log" 2>&1 - make install >> "${PREFIX}/serval-dna-${ARCH}.log" 2>&1 - make clean >> "${PREFIX}/serval-dna-${ARCH}.log" 2>&1 + make >> "${PREFIX}/servald-${ARCH}.log" 2>&1 + make install >> "${PREFIX}/servald-${ARCH}.log" 2>&1 + make clean >> "${PREFIX}/servald-${ARCH}.log" 2>&1 # don't know why these don't get removed rm directory_service.o rm config_test.o } +# +# Start the build +# + + # remove duplicated function perl -p -i -e 's/^(void rotbuf_log\(struct __sourceloc __whence, int log_level, const char \*prefix, const struct rotbuf \*rb\);)/\/\/\1/' rotbuf.h @@ -59,26 +70,25 @@ perl -p -i -e 's/^(void rotbuf_log\(struct __sourceloc __whence, int log_level, perl -p -i -e 's/^\t\$\(INSTALL_PROGRAM\) -D servald \$\(DESTDIR\)\$\(sbindir\)\/servald/\tmkdir -p \$\(DESTDIR\)\$\(sbindir\) \t\$\(INSTALL_PROGRAM\) servald \$\(DESTDIR\)\$\(sbindir\)\/servald/' Makefile.in -# use CFLAGS when building version file to support cross-compilation -# perl -p -i -e 's/&& \$\(CC\) -c version_servald.c/&& \$\(CC\) \$\(CFLAGS\) -c version_servald.c/' Makefile.in - # Generate configure autoreconf -f -i -#mkdir -p build/include/serval-dna -rm -rf "${PREFIX}/serval-dna-*" +rm -rf ${PREFIX}/servald-* for arch in ${ARCHS}; do buildIOS "${arch}" done -echo "Building fat binary" +echo "=> Building fat binary" lipo \ - "${PREFIX}/serval-dna-armv7/sbin/servald" \ - "${PREFIX}/serval-dna-armv7s/sbin/servald" \ - "${PREFIX}/serval-dna-arm64/sbin/servald" \ - "${PREFIX}/serval-dna-i386/sbin/servald" \ - "${PREFIX}/serval-dna-x86_64/sbin/servald" \ + "${PREFIX}/servald-armv7/sbin/servald" \ + "${PREFIX}/servald-armv7s/sbin/servald" \ + "${PREFIX}/servald-arm64/sbin/servald" \ + "${PREFIX}/servald-i386/sbin/servald" \ + "${PREFIX}/servald-x86_64/sbin/servald" \ -create -output ${PREFIX}/servald +rm -rf ${PREFIX}/servald-* + +echo "=> Done" \ No newline at end of file diff --git a/ios/servald.xcodeproj/project.pbxproj b/ios/servald.xcodeproj/project.pbxproj new file mode 100644 index 00000000..6e039e54 --- /dev/null +++ b/ios/servald.xcodeproj/project.pbxproj @@ -0,0 +1,179 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXFileReference section */ + 1A5334BE18F087CF00C7BD93 /* build.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = build.sh; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXGroup section */ + 1A5334B318F087B500C7BD93 = { + isa = PBXGroup; + children = ( + 1A5334BE18F087CF00C7BD93 /* build.sh */, + ); + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXLegacyTarget section */ + 1A5334B818F087B500C7BD93 /* servald */ = { + isa = PBXLegacyTarget; + buildArgumentsString = "$(ACTION)"; + buildConfigurationList = 1A5334BB18F087B500C7BD93 /* Build configuration list for PBXLegacyTarget "servald" */; + buildPhases = ( + ); + buildToolPath = "$(SRCROOT)/build.sh"; + buildWorkingDirectory = ""; + dependencies = ( + ); + name = servald; + passBuildSettingsInEnvironment = 0; + productName = servald; + }; +/* End PBXLegacyTarget section */ + +/* Begin PBXProject section */ + 1A5334B418F087B500C7BD93 /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 0510; + ORGANIZATIONNAME = "The Serval Project"; + }; + buildConfigurationList = 1A5334B718F087B500C7BD93 /* Build configuration list for PBXProject "servald" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 1A5334B318F087B500C7BD93; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 1A5334B818F087B500C7BD93 /* servald */, + ); + }; +/* End PBXProject section */ + +/* Begin XCBuildConfiguration section */ + 1A5334B918F087B500C7BD93 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.9; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + }; + name = Debug; + }; + 1A5334BA18F087B500C7BD93 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = YES; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_ENABLE_OBJC_EXCEPTIONS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.9; + SDKROOT = macosx; + }; + name = Release; + }; + 1A5334BC18F087B500C7BD93 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEBUGGING_SYMBOLS = YES; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 1A5334BD18F087B500C7BD93 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + OTHER_CFLAGS = ""; + OTHER_LDFLAGS = ""; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 1A5334B718F087B500C7BD93 /* Build configuration list for PBXProject "servald" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 1A5334B918F087B500C7BD93 /* Debug */, + 1A5334BA18F087B500C7BD93 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 1A5334BB18F087B500C7BD93 /* Build configuration list for PBXLegacyTarget "servald" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 1A5334BC18F087B500C7BD93 /* Debug */, + 1A5334BD18F087B500C7BD93 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 1A5334B418F087B500C7BD93 /* Project object */; +} diff --git a/ios/servald.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/servald.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..e629be39 --- /dev/null +++ b/ios/servald.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/ios/servald.xcodeproj/project.xcworkspace/xcuserdata/james.xcuserdatad/UserInterfaceState.xcuserstate b/ios/servald.xcodeproj/project.xcworkspace/xcuserdata/james.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000000000000000000000000000000000..4c8066c7a8731d2d2a0885caa492e0007251694c GIT binary patch literal 23563 zcmdsfcYIVu_xH@Lo4)B~H-+@Jo2}X1)U8Q2bV6@2Bnw1B5>n{+%taAI#fB9{lF-CL z5gS(QSO5_a3!orPMZrRo2j6pdvq=^ZpXc|!fBZf#;j`u5nKNf*&Ybc+XYZuuhWgev zm1-}-h(a`C5Q{j;7|GbtsWV+It@TZfqf?tE-R!DuYaNqX(^5ON9xe}0ZEI={L-_Vp z8$+ovh({6>jv`PbQXnPDLn@?38l*)!q(}M4fQ-nBY{-rrs6QHthM_UYg(jmZXez2l zH=}8&0Zm6U&>XY?-GUaPThRk(IeHL1gdRqZphwYTXcg)}YteIPBie*Eqb+DFdJVmf z-av1oPtd1mC)$NRM_-@==o|DcI*Cr9-_Y;q4|EQlM;Fj#9EgK(Fb=^|9E!tm6pq6Q zxF1f&DL4&hVkl$5nVZ9)U;VQMel4glq65JQ+{J4R|_k$20LP zJR8r!3vd@+hu7n0@UwU`-hyAmFX315Yxpg^9lwX)#~Kq`WYqY|iODxJ!q)RciLrYuxB)t?$f4W~v^ z6RA3CD%D8MpxUUp)GgF))KY30wVZm4T1BmMt76{&WBxNC(jobON17C(-@rWIBaTrImCZt)kU*Azefl(`I@I zJ(M0sSJA`i5%d^(JUxM)NKc}h=tcDH^kRAmeFwdizLUO-zMEb~-$SpV*V60g_4HHp z2Ks6G8TwiJIeH`g9{oQ30sSGpgZ_yAnEr(Rl-^12r@y6tpns%)p?{-)r!UYK>3=hr zVHtlWmkgbCLOrW!OMAhz(|=*l0F}O<+^l95$ELv3jbR-gTy7pGaErMm+}+&0+)_UKYq>4l^W0YM1@1-e zZSEcJUG6>ZeeM(PQ|@zaFZU()9e0HLf%}pBh5LiM#8W)Y2k?P>C?Cbk`F?yVpT=kM zS-gT*@><@&8~GC6#`ot3@Wc5Ld<{Q|ujT7_7vIj$CQYC4UbV-IJQ<5XemE=h@5~HL&BF{-I$T5EGnt;^n2+dkdZ*j6n~%`em2bULe1Vb$3*3Z28GR~R)K zo5HFo)7jJ}i_u^#^9~$^`k~wnC>q6}SQLk3NRHxB0!lf4%Hs@mXcYgtpvh+zX-tEJI)*QE9-Q|cS1jH+*}Yno+s zO|6+(-_!!s+$3DX+8gbz*0%b_nl`Wt<2@IvYNxuUyQ-zC0X3~{wx;RL4K5gJh-f=n z+h9#R_pLRpt~z&z`nEa4T+K}_uvj79b@Pk|EW`|R)j}T+d)~X<+*z8N%V3>bos9$Q z8|!;`1@3&l+nO3%n;Kkx-bFT{VwBs33Q!>`BB3OVgmK-hs=Zm9&DGs}+Ehz3ZZyPzrYYXJ zdbut`6)3j@m6OO0@F|TU-sW9Wz}7k!TWCE!9u1 zZ*Udl<>ifNg+0i-xn{bnHP7yv>1t?dcD3Ze#hEn?in_*{y!xiryh-i#4Ry-ase4cr z8jePwkz+kV-w54Cdp^2aM+~ZhJ?KQE&}h%c(Sxc6yL|#LyJJx`%3Y1dq48(}nn+?v z9FYs#w5HMne3 zYg%e*+gvTfY8t1wCREhdxhxG0&eqm;7l=&SRh_C_4X`V&I^SL?mY2^gOC0jx$}#g) zxk+lhUbjFpQv9e|;F)?OYO0oo52_m2-c|!++Uw!aG&KUBU8oT?qtW9BRrOx;PP+xQ zqufr^irPpDN$W&2(JYcds(p8BzI$gND93K)}ak3tP`zAPZ2HAb)u)yGel4FiD3eean^xGt)E=)0!1!`?;^#4 zHB%bv+uB8))~|QPeFp69mST39k@(MZQkv28o#Kh`4*mjq*=O)q&^BTs1;j8U#k_cG zpN?;$wi|zw&=B5Fvx0SnaXIe>QyS6!D=^YdxYv50kYS( z);2VOy&5FyPN1Sus=Tc2MxUYFRjWup&vxuZ`#aD+VkI_E9-h5Vvb&mHjj-mm^)A>n zQLTQ7z5?~ptyw?>y5P#!Ze0prJcJIS!yV`lagcF)(Rb(wItt4EdvpxVM<>R#x-}YT zqcLq>T{*6<+v5PeOv*_aNhRamDlYZNyZ|q+KcJt*W&9ESgiezR;v|(_=ofSbohALr z05XvD8|gVPBRz~)OOyMosjsB=IW2!L&ZD|jmS;v6#Ti{9gUC29KmW#zs9LU|zc9iW zQ3?o%!_*%?j4%{2~!~SFh84YfY_%~ME?i3qrYE3ijNs@cJl0ct;HEWxb zWCIswN>dB0b+t6sd&qqox$mX^?c89yn;UB840K!gls?V8V~nh6Xa|GPr&WBPR=x}6 zq0)CDy;MYD>O;i6NH`p=>A(?WBq`j30&p~r!Leh&rnk1WfWjf8#)~#w0X|!OqpQv> zOIU{G;5hY4le=XXT#iSh!7Nv~zk7%$qBW~Xp%h86M+~>))K2lZc?hNBjB083M7p)} z)w;0@XW}e0`k$JC=!06hx^wrg;~bppIWe$5f4gkn#wx4_KLV?<25Yg7+(c@~BvQK? z=VJplViTz&O{AI35k=y^upZa52RBgI*K6*TtgB}UQr9h6-D}uwgFG{JHcoExT<}iN zjIE&Rv4yxgu#HTXaHPCX7tf%cnY41>(L3)Mp{V= z8UO#ze-X9c;?Kf=R(LsY#52G*!%euEw3C^gxCOV8S!DLLTJIX}y?V?`X)d1UkzntI zTkyRoccU~E{|gf=;Dz{Bd>dYbZ^w)A5_|_D+P+9f!^2P~~fl3WG`m zbo8b&g~?)bD9ZE(J;b<%GMzTRFP%+pI^-HUT8r9fFEf}F+A=X%);lZ;t3wZ8^X+Pb zU0-H%l!4{#34HJiZaNFEp<^=X^L6U7e1*}NuUF`7Mu@lb9d?C5qt>c5FlW8S(3j3O zH=WzAp`$lh9X7obl$~TH% zEq06DVKwCI08HpzpB-*GORu40)and2wbr08+3iNy_k5eeqSrYT`Z9w>qte+drhI!} zIy>ET?z)DK8sx;Hw!zX^_4zO_n?+$Us^CRquvknsSaPeiFP+cbbe3I1$6zqzt5jNz zqReIke)27_a~iEyp)*>H4u{&N*QxY<=^Sv=x%V16`6{hZW7lgGMy(CxPzQ@-aTow` z0jR}hv01d%GM{xm=%#c3HFUIq+NgBKe1%@6*Ma;PR6wGvOkuNVj5dqWs8OkX_&MUH zv-}!5M!QX;)q^OjRQW2H4J?w;4u?!%majFK!1sg&>^rX$ZaNQLLq})S*wjXtlE!9& zb%sq+SS%JhuxC^2?UsC%M(49%Ke_2Vat$4$%49E7>5U4T!wzx?r&ENbYznnWt#;(= z^>(Y?XMN7P={$A~oic-6Ybdkp75N4Y@MF{36_&CxI3{+T#-N9F*Vuf{={Yx@$FHHI zRoQGd9qhYSXEy;jrg12Y2GAg7Won&CW73ux)WDBB5XBeqpQ5F_L{@g-%j8MXQug?F z*H~e9f?BS=DSAzhzSkyI24prWZ5Di)%(K~+v~ zn*pxIDQ#2TK3dN;dre!7lqRdm+C7vEy2+_{5yGj1%XS2|gRF7;WK<%RG@-|}6FYUm zrG9AiNB|$;o2O9(%B+?~0i@LjT=IJHT~rp8E&6qTbN_}8 z9hFNdz3b}PnC=~;G?ec8H;hz)_Xbr+p7!oUiMSJ`_y-il!HybKJchW3mzjBN6bGeR6^B-wnuao+Tfb32UVkvyuJs_7v!i9GKm z;}XeCCR?vZ=3Q#KhutOQ1uwhNR1+0TUi32CLdDwRa-$m;O(M{wrT=&@{nOMLa963Hsb9!Wva6FiOZ`fAlh51%0-Rz1aO-Pb-UD1MjqJH* z5p%L_0C~2z0Gg9rH?ytI-4eyviA-F%4R^i>7FrX2^c>1v$_~b2N|6kT1!v04so+RsjKD zsJ}Zc01!r1`*acf_0Xlh9ISHLh&v-i5qNFqmCAsYqT|&hV z4yCFmd20eNMKdf{SoELO0zAu0LZoprd1_jYT4(6avHAH21O^57AQRm=HGsn`Z2(nF z0?}-R+*%-^$5ge~*1BAEuDZ`d!~DaeVy}~t>x_sb3}HK?V+aSSu>i1(WlfE3&=T;W zrk1_&35otm{gPAQdR6^g7mPZ&tf6K~D|{CvI>nssnRIB7RLrhH>PR`Dy|%utrW}lY zooj?sVQp%t+moJ=nRUH9NcV7^nc2MwkX(hoGEW5@j1o^F%*)M5m6#Q@st_1`e;}vP zdRgq$WW#rTzE3)#Q!idLnyRH?eb%MUBPE>$+1I`9_AmgPgtS_BRmNwnxM|26_OVJ0(gHJ)K)x>R-#paC$B;4&{I%d@iO2; z9|FXA06@s^(Q&Az_zN>oI}w8up<*HjV3`73jw=C$7z9-kC=Y=F%y$M?9Ahg$)AAb>e6f>cx_S>eVSZUwYq z0iXRc_Zy6e*c!*GK^ zOl1&wt04NatL-p|T9*&FLcUQ^1|#XqOeV+yI3S$pVcXeQ2K4~o?Ymr!9t1bH?+iS1 z>z%}i#`+oUuHFPmwKNf$yN#6V`t0@{Ys!=#!PXKQzQ(_{TSW58NjeQrg~o2P&* zrEWoP(mb_J2Oo_F-GT*PBXKYNn7Etw(f892(97uu>4)ft=||{C1q`?pC16^>jDT4I za{}fCED^BZQ}hayOg}-dq@Sc$!KY4?D!}my5paNj8wA`U;Pv9S=K*`~HxA|nJPoLs z8m~h^WXVGxkbY4Xp<5Xw!NrIT{0B>`Scy>Mttx08P&22g9jXsPugS1_ zS9KG;O20f!4X;wk!7`ZYKr zkiDSaqPNp;qig|33OEhU2V^k>JXpZB0-&LZq~BP`HUJ01LE1d-jb{nnf(IoTjde9G zb>hm3^Xi6^r4b`N#dx0YRqd0e1FAQ+Pe*Au^ysecaMwn7mJ_m3?t+irdJHJOXmPcI z+vQDvhI&dVTrGV!MjYFFU8J;^-bL@GKLfS12Mwb4()++BiMGbGnBr6hx$`H{Q(TSp z?cJ$T@x-`hw|VZwG<)*?9-jN$5+Eo7r4l9J)cy1q^Z^*-OZqGNYZzw_eF!JhhjG8r z;Nv#bwYVBbf{O*bkE<0)H@11yd{SL^Hq2uQ#r(bREXRonqV5@sWAzhoih!f{(cjTW zV7R07_w+IPIDLXXNuL6#yc%AZ*n8AHG6gNB*VH%mUKY={2mlP8?CsloPrwNRjumi{ zfMWz4UoFjZ!{uVRiAVNzGC0WgoLb`+%rNr z69IY6|Da1J6Dd;vPnvcsFeaLTz^8)&aZB%D;sl%_hB|4Ulh>{O{!SryNhB~yB8fx+ zXLc~KURk8y@PQ!n-ur1x77FWP(wPh*TV0Ms-)5 zRe||voZ|l2Q&Qv3(MI~V?JnejVAtn*xvOcqtF2{@XXiAqbBtEN${yg4$!AJX?mEW6 z7#R~&z!Wk?OtFCT1gsLUTEH3sLwlWo_3M~Y#>`k4EBx6}tAO(bY!I+R!2R9-2Y@Tp zZ@g$qMD$J6HRC*-xOoS={daOIB7$xk*?qLd-~&{IS2tYep3HmCF&p%nSa#iew8wex zL9!pJ^dO>F)-*$zou@QN+3cx9^KQ%#W)uqh`vM+jv{=Byj6?S_69jA&D|iG*tiorz zxLtprqV+6yjkw&C1YFQ3smHjO$zq{`fPqwDZz;mjeLU~{iP%wrbbsPKTfmATDZcpzYl z0EyY2(gV+|?*!MIxl6#-o;*Es?={(ZQIFh@);Yx!&iXT-3m5`e&)V*X6hHF?b3nl3 z1U#`PNMpWc4)ramVh%Ik3V6H#xpza)qNSMUzvYfHy@MQMPWp5@#rz=PY60Iw485xd zy*Byu`h__w>iIJQp45R-MV}v(7kFo44J~LsKn}&__l|LnIq#DSXD%_9p}V_ujrq5L zUEMQd5zLImEQBDF1zg`VGnQo~eVJtaSbqUe5%5%C5^SMIy{4G!Z|ch=8^VV9^a^Jq z1bnlAq3i)*5a`#}RZTIEf6J$LEGzS_J}VdSbT5xkAJfSuv0&U91*j76R@1SmY)0SF z&?{^fF$uVd7*foF%7?UqRbACoBQ~8OHf>7sX`0VM5~PbYutpYIfU#*4aC;Y9$QH51 z0-h=0|k`Uqw!A3fIIC-&0b4H8&8yz`dT~%Uhb- zo1sG=1*g%QK*8zr7eIwD=ytXi?O#P~p3jr}e69!Mz=AN|)(yXKqjo%Vt7*=05tZmNFDc*frz!KlKtiUc5@KOQaN1&9! zog!ryv3H0fbvwJ5T_WH+1q>$Y?k;vIdnXH@mI?SC0pAOLTbt;)Oa_EwpsTgDW{PV} zYx|`7?(*sQs;RDqhNLRDE=zJY&g`y>O>*yHwRD`VrZJ-}$u-+mo0RdN)s*+GE6+&E z9MqK5+Fm;~X)^3^Qd3J(U408|e^bkxEYDglciYUN^`38!^jX;z?$7^)bU(?i1w+rS zVmsJQwu@cOt`YD<0)AM)j|lit0fV7kv6fxOu4hG|ep-yt9~W?kfICI;T`LCXAOav4 zJt8Pp-ip!fHNq=u9j_F6B6$(B^2nOkU%OW3M0BI)bovZpbxm$+>DIV#W;`UtxU9-H zP;@ujTd$_(m4X-8mrz&-`=WrK=wM$K@Jg>z^cXjbn}2WP*Vs2e7qYJl_{k3TO#!bW z{k)FCkiU_BZ`b$O4|>P>P{3Wig7`7}X)o2C0$weaBY9->Gxl@w)*b=FDe(+AdQ$g~ z4!ms+uwV63{#wB6dMO`bA-g8l+j`p`VZZND=Ens5lvkObL~FX(Q|u4yj{@Ex;AaKA zsrTgl%%1J5rrBTF-vs=$fS(bUN<_7K_C&-wQq0X}AJu(<{nMxWWfn}`a{}H7Rd>+Y zW3)Uy?|Q3mPmbc)zCAgP;|07~z+1cn_uy7O1B1`@pB=SpAT0MG;)2lOP5^k@0HD3t z;|6nK9N5A2TsRlOMRHMGG#A6ga&ZC%$$3e@AUUrHc$OjQ^umAN z3K&H0cLDO~pkky~!)yOLalk%6rFUrta)aUcaf1ZBqk{tn|08ia{}r;p4d+IRB*0() zxPu!d;7@#!1#TQyeH~D^O_;Yu-2YT^9wN%~XzIhZ;H*C<01-ji6R~-!6 z>VXM8)4v1GIk%Jp%fDB^`@7>rZkZS-?t?fHq8?ARe7BlND)1zg3RHT?E4fib?tZcH z7dHqhxrar#PrzTf@xK32N!N|}=u;5KJt-EB3HaduXc*6$bc!O;CE&yV6t8mYxMv`O z@8s!xRacR{RIG+yFf z6GwZQdxhJ^fsQ>cU_eYx3i#Cjx_FiQfD>zGI56@*{&P^s?c{cgt>O5b?%?3~{45@u zzxe?Zw-20SZa)VS_ltnf_LykyEAC)lOUWGO4!c9%Gh!&^8|iXKx#K=`?=%Pi(=dEsI(`O!Uv&2dS@+T6O?+XG0P;lwCF$N% zz7+P9H}e*O@)M|lo;~I5e0kq}La*>n2-~456t>AX!siF_L#}E%Ol%q`Hua70`H}oM zIN|&#el$OZA1hG70tNn(RG>mv^W)*tM7~;}!rWK-36w@WCI1+=!$I;!89hEKsM8*M z;T!IY_TirZ1n;6v=BGof#82U;^7Z`9{4~BnpuzwZpD491<@kU18-goeK_V&I@pyGRb-^0UCLc}=b#z7RnoPVg7#KQuW z)Jx(q{_(3B@D99+Uk^SF-@$kCUHoc(4ZoIOCs4@(l_F570+l9E=>nA@P?_s^a71|s zY~l4eexpETiMy5U*|Z#iQi=?URWTqbJ@V8ClyN6E+`pT=x{-*$H+VwO-bN9%-k;_5 zW-CAd#Z*<_0s0~^y`4pDrf(~^k7J$V9zERU#ejN#yefh--lO38@p-Ge$8{E53l$O` z6}ZifEqFe^E-HgJ_%{VASD+LkN}tr~es)1Yw|nG$PwLL76sSk}=2rN3`S*Kw?*oC# z>)pMN_)kO~bU!##9sH*PrRoV;`Q5yT{_>v*l-es<|Kt(5V`u&g{yT_6_yhcx{8#+f z{5SkT{t$nd|5l*10;Lluy+Gv)ltG}30tGs$K%ff6?LW$Y&mV*L6Z}bd{XvufP>RI@ zRU&>Y6{x}D`w&qS{(lAQ`18Fm5`U@B=YIoO$AdXEcY}2j3{oMXB(y+*l_={m5fV<~ z2YO$^OC$ni6)0P$#9tC1P=st2#wVK#!IS)SwN5C1qkIi~|G!diYkJUQoecvjBG{HOdb5L+n-SgIr&o_(W-C*Sm! z43~_QjFya*jF-41QzZ40X_D!ZCdpFCX33k96OuEMOOikRD8B%|etwyLdOxdQxu4Uo zzuyqQVSdB?M*7wIx%{U1)%!i|_p;wMzt{ZU@R#^U`X~FR`ltJ6`e*y+`YZhl{fqre z{Vo1Be}{j$ztew?|7!m|0XRS%a8tnifI9;23Ro6!U%&$a4+cCHuqEK7fL8)u4R}4^ zqkvrjp9Op#a3J8TfNug01^g87S71tDZlFG}Ah0}eK;WRjA%P{@Z-TN zgI5K22CokODEN3tP>439Dr9zu5OQ0{?IBA-?h9EF@9f*}(#_K6r7uWd zk{$^S4K;^O32h6V6*?z$e&{WsBy@S`6QP}Kq~6Z&502cbJc zzX<&yEI2GWEHx}EEGJA6rU}!9<%b!=Okvir5n&Ue-R;^v5kh>nQoA~r>AiP#!( zD&kzkg@{WLmm}4YC6VSxYotALPUP*8OCpy>-W9n$a%bf3$UTvJqx_rljru)0D>^^g7+nxu6g?yQmS_^aF#5LW zSEApK{xJHZ=ucvBOmK`eCM+f*#u+m*W^~NhnDH_9#jK3!i0O)18?!!UL(KazyJB|7 z?1?!Xb0p^bm=iIlVt$PIJ?4DO#h5>1rLifoirBnZb*v^<7n>hziyakPA3H5}dTdkd z>{t@JD0Xq|y|F7}*Tg;(`$FvY*!N@i#C{$7d+eWa5pmgZhPZ;bqPWsHOPnokNL*Fi zh`7;lW8=oh)yFl&HO9?|YmIAkvKX067B5SZCCgG}3Yki# zk?CYkS%29;*&x{v*)UnPtVUKVYmha|T4eu{EtK6RTP(XncBgE)>|xoXvK6vTvMsW$ zvKM48$zGAYFWVveShiEPTee5`wd|1WTiFrWdD%tTpR&ucD{>?cl1t@b@<@5KJXW4A z&ywfJm2#C_BQKPf$jx%Ae3X2Qe4Ko|e4_j&`E+@+yhYwFpCz9oUnpNBUo5{vzEZwQ z-YM^ruaU2lZ?X6@d@!s@rrm=ye3{BZ-_U=m&H5d`^OK89}+(-eq8*-_?zM<#m|bL6F)D0 ze*7)*B>wLB`{S3#KNP)uwuC1WUQXDa@KM4i2|E*ZC+tbsoA6!2$%G#geoFW`;g5v# z2^SOoO!#+Vdg5@1pzcV#Gx5H}m5FN-*Cjrc_;liy#I1=hCcd1wE%BYi_Y-#}ew}zE z@%zN%i6;|(Nj#hQTjC#y=aWzppCnCgO>R$Kn0!z2eaR0bKbZV*@}tQslGi71NPZ^y zx#UgBTavdXznJ`W3QEaN8J;pBWpYYm%B++*DGO8XNLiNBnX)?N*_2HwTT-^Byq>Zr zWpB#QjxW1*t`;C8_3AYpOl9Ds_44%c&RBBGc??lhYQaJ(2ce+B<3c)4ojmChc(Ak+frJ zC)0jR`#J4wI+M<)`=tk_hopz4N2W)o$EC~D6VkKOi_`n3&r4sH{(AcE^uy^FG6FMV zGjcQXGBg?b3}Z%NMoESx!=6!|F*ajD#!VTMGU_rWXVhmjWHe>W$Y{;DCF9|YH5spE ze2{T46JiwLj}{)|G5JJ2^Wi+n8OD zU7TH-U6DO8yEc1H_QLFEv$td)%s!WWG5gQ#D>*2~FDEc3BquZ{F2|nZ%xTS;pVOJM zF6YynuW}CNe4BGL=XlP^Txo86Zc=VaZhCH3ZceT$w>a0HTb^5)J1}>6?x@@`x#M#u z<}S_c%-xpzPVW1;J90nHJ&=1M_lMlmxo2{J%RQHSG54|}KoP76RYWMF6>*AqMWUjg zLa8WFj8N1o7Ad+E8x=bg`xQqO#}p?NrxZUbPAh&Pfsa&c?)eKdeYNl$AYM$yg)#Ivls?Dl5R3E55Qhlo0t@>Q`jp~rgUv()UT-D zR_{{pRqt0HP#;u(t3Ikerv62JLBnb!ngC6(Myd(Zq-(Sqod%vAps{PpHBQX{&0x(? z%~(yfW|GFGnWAaa%+bu#EYK{}EYd8|EY&R6JfYd3*{Ip9d0z9f=2gubnzuB2G+%2@ zYJSw5)|}D&rujp2MN4Zrt)DhP8>5ZaCTja>)3uq}94$QaKx@-hXe+e?v_rL3+L7AP z+8S-6wp}}0J5PIyc9C|8_D=0G?Y-Jf+IO`lw7=_koxd(fC)I`PqI9u3xh_$ctkdfZ zx&mFX&aAWQ9J&f!rEZ{Zus9&UCtY50XTYr!Kaeaq=wSJxc8U0567X4QJ zcKwI?kM%qCpXm?izt$hpf2TjHKdJv+eNaJXu%Q)3I z&Ddz1VQe+dH{M~q%Xp9Re&d72hmEU^Ym94+>y0lMUp8(tzHWTW__pz5;~wKa;{oH> z#)HNmjK3Jq8hvV&uz*KB1H4QY4G}W4>nr=2Vm}Z#T zOtVaLOm~?cH0?4SFdZ}qSXfw6XeqQ8mKTmK9A8*n zSW{SA=qj9AIIXa;a7JNk;q8S_7Cu|}ZsD%NV?~l8c~M4@uEL^-Ww65s6qRmCm7rj{Ya?$ppcZ)tK+EKK>=vdLoq92QX zE;?KEd(ru#OT~W0fyE)kVa1WfF~xDk@x_V7WyMv+Ba25Dk1L)~TwUB&Jgaza@q%Jf zd~5Mb#cvhASNvh|$Hku(?=Swc_?zNOC3Fc_;#U${5?7K@l3k)G$t$TVSy*yU$$cdc zlsr`Oamn72FG{{D`KIKzQdH_!8dw@q8de%vno!!WG_^FnG^;eHR99M3>MX4(Z7iKt zI=6H|DJi|R^sdrnrT3QJU%I^Xq0+6TpOyY@4l>7?tF!whPG7mKm zH;**mY;HBrHqSHPVkYLh&G(y^n;$Z-Ft0Rsn7ho+m|ro!VSdZ}w)q3|N9Iq>yUYj7 z$IQpgC(NhJ=gb$)f10mYu!Xh+T0$)mmS{_?CEbz(50}WZ=qv_Hfu+deune<|vW&5e zv)p8qFK@tShWfSl3#gvOZ&d&ia~lhxHTd zF6$oaKI<3OZ>`6yC#^qPPg^fp|FU5lZIjsiZ9%pWTZ}EumTk+mDQ#Mt9v*>G0MA+& zVjE){Z>zRVvbk)Hwi&iI+br8$+kD%Tw&!i1+0NRo*aPgr_E39-J=z{;kGE&r6?PT; z1WRW(*bD4M_A2{Adx!l!`(FET`)~Gh_KWt*_P-q15$p(cL^z@yaSpj7)uDFi90o^$ zqu5dE7~mM_7~~k@nBr)2%yP_iEN~FVLdQLh`yCHD9&xO2JmJ{jc*XIW<4wogj`tiN zIzD#nbR2Yi>p0>#<~ZRv<@m|*i{orrR9Ru!u(H`@%gZ*DZ7(}e_FdVLvhT}Im;GAy zN7;q4OXcz9Y2})7eYvr`u)L()Tt2XTNO@KH$nr7ec>3C>AQmvgG~X6G#DEl$CCn{%;qne#s9a_7U&N1ZF3 z8=PC6dn+}Sg_T8>C6(q%XJuvOfXWe-BP&N&x+=k#Rh6BUt1F+Xe5P_^<>tz5l^;}oQn|Bocjdmy1C?J_9;`fG`CH|M%1f1(`{Vvh if4;w8|FHh4{j>V#xhqo;1&_%P|4Alz-o3B=)&B>uiz-3@ literal 0 HcmV?d00001 diff --git a/ios/servald.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/servald.xcscheme b/ios/servald.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/servald.xcscheme new file mode 100644 index 00000000..1fb57455 --- /dev/null +++ b/ios/servald.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/servald.xcscheme @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/servald.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/xcschememanagement.plist b/ios/servald.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 00000000..1c61a251 --- /dev/null +++ b/ios/servald.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,22 @@ + + + + + SchemeUserState + + servald.xcscheme + + orderHint + 0 + + + SuppressBuildableAutocreation + + 1A5334B818F087B500C7BD93 + + primary + + + + + From 56240828ae74fe24f2b08122d94cd182d4a3fa97 Mon Sep 17 00:00:00 2001 From: James Moore Date: Sat, 5 Apr 2014 12:40:32 -0700 Subject: [PATCH 08/33] more work on the Xcode project --- .gitignore | 2 +- ios/build.sh | 5 +- ios/servald.xcodeproj/project.pbxproj | 67 ------------------ .../UserInterfaceState.xcuserstate | Bin 23563 -> 0 bytes 4 files changed, 5 insertions(+), 69 deletions(-) delete mode 100644 ios/servald.xcodeproj/project.xcworkspace/xcuserdata/james.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/.gitignore b/.gitignore index 2945dc1b..830f46d5 100644 --- a/.gitignore +++ b/.gitignore @@ -26,5 +26,5 @@ serval.c *.so test.*.log testlog - build +/ios/servald.xcodeproj/project.xcworkspace/xcuserdata/* diff --git a/ios/build.sh b/ios/build.sh index 4bbac7a2..a210f041 100755 --- a/ios/build.sh +++ b/ios/build.sh @@ -47,7 +47,7 @@ buildIOS() echo "=> Building servald for ${PLATFORM} ${SDK_VERSION} ${ARCH}" - ./configure $HOST --prefix="${PREFIX}/servald-${ARCH}" --disable-voiptest &> "${PREFIX}/servald-${ARCH}.log" + ./configure $HOST --prefix="${PREFIX}/servald-${ARCH}" --disable-voiptest &> "${PREFIX}/servald-${ARCH}.log" || { echo "configure failed"; exit 1; } make >> "${PREFIX}/servald-${ARCH}.log" 2>&1 make install >> "${PREFIX}/servald-${ARCH}.log" 2>&1 @@ -62,6 +62,9 @@ buildIOS() # Start the build # +if [[ -f ${PREFIX}/servald ]]; then + rm ${PREFIX}/servald +fi # remove duplicated function perl -p -i -e 's/^(void rotbuf_log\(struct __sourceloc __whence, int log_level, const char \*prefix, const struct rotbuf \*rb\);)/\/\/\1/' rotbuf.h diff --git a/ios/servald.xcodeproj/project.pbxproj b/ios/servald.xcodeproj/project.pbxproj index 6e039e54..9dc090bb 100644 --- a/ios/servald.xcodeproj/project.pbxproj +++ b/ios/servald.xcodeproj/project.pbxproj @@ -64,91 +64,24 @@ 1A5334B918F087B500C7BD93 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; }; name = Debug; }; 1A5334BA18F087B500C7BD93 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.9; - SDKROOT = macosx; }; name = Release; }; 1A5334BC18F087B500C7BD93 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - DEBUGGING_SYMBOLS = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; }; 1A5334BD18F087B500C7BD93 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; }; diff --git a/ios/servald.xcodeproj/project.xcworkspace/xcuserdata/james.xcuserdatad/UserInterfaceState.xcuserstate b/ios/servald.xcodeproj/project.xcworkspace/xcuserdata/james.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 4c8066c7a8731d2d2a0885caa492e0007251694c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23563 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 From c931b34410ab8f2eb9c39ac93a37a926c5063f4e Mon Sep 17 00:00:00 2001 From: James Moore Date: Sat, 5 Apr 2014 12:43:49 -0700 Subject: [PATCH 09/33] conditionally clean and build --- ios/build.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ios/build.sh b/ios/build.sh index a210f041..01528375 100755 --- a/ios/build.sh +++ b/ios/build.sh @@ -62,8 +62,17 @@ buildIOS() # Start the build # +if [[ $ACTION == "clean" ]]; then + echo "=> Cleaning..." + if [[ -f ${PREFIX}/servald ]]; then + rm ${PREFIX}/servald + fi + exit +fi + if [[ -f ${PREFIX}/servald ]]; then - rm ${PREFIX}/servald + echo "Servald has already been build...skipping" + exit fi # remove duplicated function From 1abbc2c5ec4e92642effcb58df491d1dec1b7fcc Mon Sep 17 00:00:00 2001 From: James Moore Date: Sat, 5 Apr 2014 12:47:13 -0700 Subject: [PATCH 10/33] error handling --- ios/build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ios/build.sh b/ios/build.sh index 01528375..b0ce4150 100755 --- a/ios/build.sh +++ b/ios/build.sh @@ -49,9 +49,9 @@ buildIOS() ./configure $HOST --prefix="${PREFIX}/servald-${ARCH}" --disable-voiptest &> "${PREFIX}/servald-${ARCH}.log" || { echo "configure failed"; exit 1; } - make >> "${PREFIX}/servald-${ARCH}.log" 2>&1 - make install >> "${PREFIX}/servald-${ARCH}.log" 2>&1 - make clean >> "${PREFIX}/servald-${ARCH}.log" 2>&1 + make >> "${PREFIX}/servald-${ARCH}.log" 2>&1 || { echo "make failed"; exit 1; } + make install >> "${PREFIX}/servald-${ARCH}.log" 2>&1 || { echo "make install failed"; exit 1; } + make clean >> "${PREFIX}/servald-${ARCH}.log" 2>&1 || { echo "make clean failed"; exit 1; } # don't know why these don't get removed rm directory_service.o @@ -71,7 +71,7 @@ if [[ $ACTION == "clean" ]]; then fi if [[ -f ${PREFIX}/servald ]]; then - echo "Servald has already been build...skipping" + echo "Servald has already been built...skipping" exit fi From ef5760d618d10c8176f97b303654e66ac44b127e Mon Sep 17 00:00:00 2001 From: James Moore Date: Sat, 5 Apr 2014 15:08:48 -0700 Subject: [PATCH 11/33] build as a static library --- Makefile.in | 4 ++++ ios/build.sh | 35 +++++++++++++++++++++-------------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/Makefile.in b/Makefile.in index 91f2bee2..9fe37258 100644 --- a/Makefile.in +++ b/Makefile.in @@ -128,6 +128,10 @@ libserval.so: $(SERVALD_OBJS) version.o @echo LINK $@ @$(CC) $(CFLAGS) -Wall -shared -o $@ $(SERVALD_OBJS) version.o $(LDFLAGS) +libserval.a: $(SERVALD_OBJS) version.o + @echo AR $@ + @$(AR) -cr $@ $(SERVALD_OBJS) version.o + libmonitorclient.so: $(MONITOR_CLIENT_OBJS) version.o @echo LINK $@ @$(CC) $(CFLAGS) -Wall -shared -o $@ $(MONITOR_CLIENT_OBJS) version.o $(LDFLAGS) diff --git a/ios/build.sh b/ios/build.sh index b0ce4150..a4501a90 100755 --- a/ios/build.sh +++ b/ios/build.sh @@ -45,17 +45,17 @@ buildIOS() export CFLAGS="-arch ${ARCH} -pipe -no-cpp-precomp -isysroot $SDKROOT -I$SDKROOT/usr/include -miphoneos-version-min=${SDK_VERSION}" export CC="clang" - echo "=> Building servald for ${PLATFORM} ${SDK_VERSION} ${ARCH}" + echo "=> Building libserval for ${PLATFORM} ${SDK_VERSION} ${ARCH}" ./configure $HOST --prefix="${PREFIX}/servald-${ARCH}" --disable-voiptest &> "${PREFIX}/servald-${ARCH}.log" || { echo "configure failed"; exit 1; } - make >> "${PREFIX}/servald-${ARCH}.log" 2>&1 || { echo "make failed"; exit 1; } - make install >> "${PREFIX}/servald-${ARCH}.log" 2>&1 || { echo "make install failed"; exit 1; } + make libserval.a >> "${PREFIX}/servald-${ARCH}.log" 2>&1 || { echo "make failed"; exit 1; } + cp libserval.a ${PREFIX}/libserval-${ARCH}.a make clean >> "${PREFIX}/servald-${ARCH}.log" 2>&1 || { echo "make clean failed"; exit 1; } # don't know why these don't get removed - rm directory_service.o - rm config_test.o + # rm directory_service.o + # rm config_test.o } # @@ -85,7 +85,9 @@ perl -p -i -e 's/^\t\$\(INSTALL_PROGRAM\) -D servald \$\(DESTDIR\)\$\(sbindir\)\ # Generate configure autoreconf -f -i -rm -rf ${PREFIX}/servald-* +mkdir -p ${PREFIX} + +rm -rf ${PREFIX}/libserval-* for arch in ${ARCHS}; do buildIOS "${arch}" @@ -94,13 +96,18 @@ done echo "=> Building fat binary" lipo \ - "${PREFIX}/servald-armv7/sbin/servald" \ - "${PREFIX}/servald-armv7s/sbin/servald" \ - "${PREFIX}/servald-arm64/sbin/servald" \ - "${PREFIX}/servald-i386/sbin/servald" \ - "${PREFIX}/servald-x86_64/sbin/servald" \ - -create -output ${PREFIX}/servald - -rm -rf ${PREFIX}/servald-* + "${PREFIX}/libserval-armv7.a" \ + "${PREFIX}/libserval-armv7s.a" \ + "${PREFIX}/libserval-arm64.a" \ + "${PREFIX}/libserval-i386.a" \ + "${PREFIX}/libserval-x86_64.a" \ + -create -output ${PREFIX}/libserval.a || { echo "failed building fat library"; exit 1; } + +rm -rf ${PREFIX}/libserval-* + +# if [[ -f ".git" ]]; then +# git checkout -- Makefile.in +# git checkout -- rotbuf.h +# fi echo "=> Done" \ No newline at end of file From 725bc31d4dc5fc131d7bfb4f979fb206312aa26b Mon Sep 17 00:00:00 2001 From: James Moore Date: Sat, 5 Apr 2014 13:05:16 -0700 Subject: [PATCH 12/33] make build folder --- ios/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/build.sh b/ios/build.sh index a4501a90..df01c87d 100755 --- a/ios/build.sh +++ b/ios/build.sh @@ -110,4 +110,4 @@ rm -rf ${PREFIX}/libserval-* # git checkout -- rotbuf.h # fi -echo "=> Done" \ No newline at end of file +echo "=> Done" From c95961d4acb31906618c71ef02d8f7a79b33fd5b Mon Sep 17 00:00:00 2001 From: James Moore Date: Sat, 5 Apr 2014 15:14:49 -0700 Subject: [PATCH 13/33] renamed --- .../project.pbxproj | 14 +++++++------- .../project.xcworkspace/contents.xcworkspacedata | 2 +- .../UserInterfaceState.xcuserstate | Bin 0 -> 8244 bytes .../WorkspaceSettings.xcsettings | 10 ++++++++++ .../james.xcuserdatad/xcschemes/servald.xcscheme | 4 ++-- .../xcschemes/xcschememanagement.plist | 0 6 files changed, 20 insertions(+), 10 deletions(-) rename ios/{servald.xcodeproj => libserval.xcodeproj}/project.pbxproj (91%) rename ios/{servald.xcodeproj => libserval.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (70%) create mode 100644 ios/libserval.xcodeproj/project.xcworkspace/xcuserdata/james.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 ios/libserval.xcodeproj/project.xcworkspace/xcuserdata/james.xcuserdatad/WorkspaceSettings.xcsettings rename ios/{servald.xcodeproj => libserval.xcodeproj}/xcuserdata/james.xcuserdatad/xcschemes/servald.xcscheme (94%) rename ios/{servald.xcodeproj => libserval.xcodeproj}/xcuserdata/james.xcuserdatad/xcschemes/xcschememanagement.plist (100%) diff --git a/ios/servald.xcodeproj/project.pbxproj b/ios/libserval.xcodeproj/project.pbxproj similarity index 91% rename from ios/servald.xcodeproj/project.pbxproj rename to ios/libserval.xcodeproj/project.pbxproj index 9dc090bb..030401b5 100644 --- a/ios/servald.xcodeproj/project.pbxproj +++ b/ios/libserval.xcodeproj/project.pbxproj @@ -21,17 +21,17 @@ /* End PBXGroup section */ /* Begin PBXLegacyTarget section */ - 1A5334B818F087B500C7BD93 /* servald */ = { + 1A5334B818F087B500C7BD93 /* libserval */ = { isa = PBXLegacyTarget; buildArgumentsString = "$(ACTION)"; - buildConfigurationList = 1A5334BB18F087B500C7BD93 /* Build configuration list for PBXLegacyTarget "servald" */; + buildConfigurationList = 1A5334BB18F087B500C7BD93 /* Build configuration list for PBXLegacyTarget "libserval" */; buildPhases = ( ); buildToolPath = "$(SRCROOT)/build.sh"; buildWorkingDirectory = ""; dependencies = ( ); - name = servald; + name = libserval; passBuildSettingsInEnvironment = 0; productName = servald; }; @@ -44,7 +44,7 @@ LastUpgradeCheck = 0510; ORGANIZATIONNAME = "The Serval Project"; }; - buildConfigurationList = 1A5334B718F087B500C7BD93 /* Build configuration list for PBXProject "servald" */; + buildConfigurationList = 1A5334B718F087B500C7BD93 /* Build configuration list for PBXProject "libserval" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -55,7 +55,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 1A5334B818F087B500C7BD93 /* servald */, + 1A5334B818F087B500C7BD93 /* libserval */, ); }; /* End PBXProject section */ @@ -88,7 +88,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1A5334B718F087B500C7BD93 /* Build configuration list for PBXProject "servald" */ = { + 1A5334B718F087B500C7BD93 /* Build configuration list for PBXProject "libserval" */ = { isa = XCConfigurationList; buildConfigurations = ( 1A5334B918F087B500C7BD93 /* Debug */, @@ -97,7 +97,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 1A5334BB18F087B500C7BD93 /* Build configuration list for PBXLegacyTarget "servald" */ = { + 1A5334BB18F087B500C7BD93 /* Build configuration list for PBXLegacyTarget "libserval" */ = { isa = XCConfigurationList; buildConfigurations = ( 1A5334BC18F087B500C7BD93 /* Debug */, diff --git a/ios/servald.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/libserval.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 70% rename from ios/servald.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to ios/libserval.xcodeproj/project.xcworkspace/contents.xcworkspacedata index e629be39..5df34e69 100644 --- a/ios/servald.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/ios/libserval.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:libserval.xcodeproj"> diff --git a/ios/libserval.xcodeproj/project.xcworkspace/xcuserdata/james.xcuserdatad/UserInterfaceState.xcuserstate b/ios/libserval.xcodeproj/project.xcworkspace/xcuserdata/james.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000000000000000000000000000000000..7c2ad2b92c6d2c47edb4b297f25e8aebf9cc0b04 GIT binary patch literal 8244 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 Y>e8xvt6t$e50p0jUX_0%->owK7kC3R9smFU literal 0 HcmV?d00001 diff --git a/ios/libserval.xcodeproj/project.xcworkspace/xcuserdata/james.xcuserdatad/WorkspaceSettings.xcsettings b/ios/libserval.xcodeproj/project.xcworkspace/xcuserdata/james.xcuserdatad/WorkspaceSettings.xcsettings new file mode 100644 index 00000000..bfffcfe0 --- /dev/null +++ b/ios/libserval.xcodeproj/project.xcworkspace/xcuserdata/james.xcuserdatad/WorkspaceSettings.xcsettings @@ -0,0 +1,10 @@ + + + + + HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges + + SnapshotAutomaticallyBeforeSignificantChanges + + + diff --git a/ios/servald.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/servald.xcscheme b/ios/libserval.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/servald.xcscheme similarity index 94% rename from ios/servald.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/servald.xcscheme rename to ios/libserval.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/servald.xcscheme index 1fb57455..8793c76f 100644 --- a/ios/servald.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/servald.xcscheme +++ b/ios/libserval.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/servald.xcscheme @@ -16,8 +16,8 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "1A5334B818F087B500C7BD93" BuildableName = "servald" - BlueprintName = "servald" - ReferencedContainer = "container:servald.xcodeproj"> + BlueprintName = "libserval" + ReferencedContainer = "container:libserval.xcodeproj"> diff --git a/ios/servald.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/xcschememanagement.plist b/ios/libserval.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 100% rename from ios/servald.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/xcschememanagement.plist rename to ios/libserval.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/xcschememanagement.plist From 9e404b13e95d629a0d8415ed862439024e4f92f1 Mon Sep 17 00:00:00 2001 From: James Moore Date: Sat, 5 Apr 2014 15:26:52 -0700 Subject: [PATCH 14/33] renamed to libserval --- .gitignore | 3 +- ios/build.sh | 21 +++---- ios/libserval.xcodeproj/project.pbxproj | 20 +++++- .../UserInterfaceState.xcuserstate | Bin 8244 -> 0 bytes .../xcschemes/servald.xcscheme | 59 ------------------ 5 files changed, 28 insertions(+), 75 deletions(-) delete mode 100644 ios/libserval.xcodeproj/project.xcworkspace/xcuserdata/james.xcuserdatad/UserInterfaceState.xcuserstate delete mode 100644 ios/libserval.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/servald.xcscheme diff --git a/.gitignore b/.gitignore index 830f46d5..b1cbc6d2 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,5 @@ serval.c test.*.log testlog build -/ios/servald.xcodeproj/project.xcworkspace/xcuserdata/* +/ios/libserval.xcodeproj/project.xcworkspace/xcuserdata/* +/ios/libserval.xcodeproj/xcuserdata/* diff --git a/ios/build.sh b/ios/build.sh index df01c87d..42f8acc6 100755 --- a/ios/build.sh +++ b/ios/build.sh @@ -1,8 +1,5 @@ #!/bin/sh -# build.sh -# servald -# # Created by James Moore on 3/25/14. # Copyright (c) 2014 The Serval Project. All rights reserved. @@ -47,11 +44,11 @@ buildIOS() echo "=> Building libserval for ${PLATFORM} ${SDK_VERSION} ${ARCH}" - ./configure $HOST --prefix="${PREFIX}/servald-${ARCH}" --disable-voiptest &> "${PREFIX}/servald-${ARCH}.log" || { echo "configure failed"; exit 1; } + ./configure $HOST --disable-voiptest &> "${PREFIX}/libserval-${ARCH}.log" || { echo "configure failed"; exit 1; } - make libserval.a >> "${PREFIX}/servald-${ARCH}.log" 2>&1 || { echo "make failed"; exit 1; } + make libserval.a >> "${PREFIX}/libserval-${ARCH}.log" 2>&1 || { echo "make failed"; exit 1; } cp libserval.a ${PREFIX}/libserval-${ARCH}.a - make clean >> "${PREFIX}/servald-${ARCH}.log" 2>&1 || { echo "make clean failed"; exit 1; } + make clean >> "${PREFIX}/libserval-${ARCH}.log" 2>&1 || { echo "make clean failed"; exit 1; } # don't know why these don't get removed # rm directory_service.o @@ -64,24 +61,20 @@ buildIOS() if [[ $ACTION == "clean" ]]; then echo "=> Cleaning..." - if [[ -f ${PREFIX}/servald ]]; then - rm ${PREFIX}/servald + if [[ -f ${PREFIX}/libserval.a ]]; then + rm ${PREFIX}/libserval.a fi exit fi -if [[ -f ${PREFIX}/servald ]]; then - echo "Servald has already been built...skipping" +if [[ -f ${PREFIX}/libserval.a ]]; then + echo "libserval has already been built...skipping" exit fi # remove duplicated function perl -p -i -e 's/^(void rotbuf_log\(struct __sourceloc __whence, int log_level, const char \*prefix, const struct rotbuf \*rb\);)/\/\/\1/' rotbuf.h -# install -D doesn't work with the OS X install -perl -p -i -e 's/^\t\$\(INSTALL_PROGRAM\) -D servald \$\(DESTDIR\)\$\(sbindir\)\/servald/\tmkdir -p \$\(DESTDIR\)\$\(sbindir\) -\t\$\(INSTALL_PROGRAM\) servald \$\(DESTDIR\)\$\(sbindir\)\/servald/' Makefile.in - # Generate configure autoreconf -f -i diff --git a/ios/libserval.xcodeproj/project.pbxproj b/ios/libserval.xcodeproj/project.pbxproj index 030401b5..8f37ca50 100644 --- a/ios/libserval.xcodeproj/project.pbxproj +++ b/ios/libserval.xcodeproj/project.pbxproj @@ -7,14 +7,32 @@ objects = { /* Begin PBXFileReference section */ + 1A09828C18F0B8E200C4652C /* libserval.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libserval.a; path = ../build/libserval.a; sourceTree = ""; }; 1A5334BE18F087CF00C7BD93 /* build.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = build.sh; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXGroup section */ - 1A5334B318F087B500C7BD93 = { + 1A09828A18F0B81E00C4652C /* libserval */ = { isa = PBXGroup; children = ( 1A5334BE18F087CF00C7BD93 /* build.sh */, + 1A09828B18F0B82500C4652C /* Products */, + ); + name = libserval; + sourceTree = ""; + }; + 1A09828B18F0B82500C4652C /* Products */ = { + isa = PBXGroup; + children = ( + 1A09828C18F0B8E200C4652C /* libserval.a */, + ); + name = Products; + sourceTree = ""; + }; + 1A5334B318F087B500C7BD93 = { + isa = PBXGroup; + children = ( + 1A09828A18F0B81E00C4652C /* libserval */, ); sourceTree = ""; }; diff --git a/ios/libserval.xcodeproj/project.xcworkspace/xcuserdata/james.xcuserdatad/UserInterfaceState.xcuserstate b/ios/libserval.xcodeproj/project.xcworkspace/xcuserdata/james.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 7c2ad2b92c6d2c47edb4b297f25e8aebf9cc0b04..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8244 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 Y>e8xvt6t$e50p0jUX_0%->owK7kC3R9smFU diff --git a/ios/libserval.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/servald.xcscheme b/ios/libserval.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/servald.xcscheme deleted file mode 100644 index 8793c76f..00000000 --- a/ios/libserval.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/servald.xcscheme +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - From a342f15c333e8db66146613e40b683838fe49a2e Mon Sep 17 00:00:00 2001 From: James Moore Date: Sat, 5 Apr 2014 15:55:15 -0700 Subject: [PATCH 15/33] include headers --- .gitignore | 4 +- ios/build.sh | 14 +++- ios/libserval.xcodeproj/project.pbxproj | 82 +++++++++++++++++++ .../xcschemes/xcschememanagement.plist | 22 ----- 4 files changed, 94 insertions(+), 28 deletions(-) delete mode 100644 ios/libserval.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/.gitignore b/.gitignore index b1cbc6d2..7c2bf25a 100644 --- a/.gitignore +++ b/.gitignore @@ -27,5 +27,5 @@ serval.c test.*.log testlog build -/ios/libserval.xcodeproj/project.xcworkspace/xcuserdata/* -/ios/libserval.xcodeproj/xcuserdata/* +ios/libserval.xcodeproj/project.xcworkspace/xcuserdata/ +ios/libserval.xcodeproj/xcuserdata/ diff --git a/ios/build.sh b/ios/build.sh index 42f8acc6..9fa93a03 100755 --- a/ios/build.sh +++ b/ios/build.sh @@ -98,9 +98,15 @@ lipo \ rm -rf ${PREFIX}/libserval-* -# if [[ -f ".git" ]]; then -# git checkout -- Makefile.in -# git checkout -- rotbuf.h -# fi +echo "=> Copying Headers" +mkdir -p ${PREFIX}/include + +cp *.h ${PREFIX}/include + +# Roll back the changes we made to these files +if [[ -f ".git" ]]; then + git checkout -- Makefile.in + git checkout -- rotbuf.h +fi echo "=> Done" diff --git a/ios/libserval.xcodeproj/project.pbxproj b/ios/libserval.xcodeproj/project.pbxproj index 8f37ca50..d34da010 100644 --- a/ios/libserval.xcodeproj/project.pbxproj +++ b/ios/libserval.xcodeproj/project.pbxproj @@ -8,6 +8,43 @@ /* Begin PBXFileReference section */ 1A09828C18F0B8E200C4652C /* libserval.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libserval.a; path = ../build/libserval.a; sourceTree = ""; }; + 1A13A3B118F0C05D00A6233B /* cli.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = cli.h; path = ../cli.h; sourceTree = ""; }; + 1A13A3B218F0C05D00A6233B /* conf_schema.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = conf_schema.h; path = ../conf_schema.h; sourceTree = ""; }; + 1A13A3B318F0C05D00A6233B /* conf.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = conf.h; path = ../conf.h; sourceTree = ""; }; + 1A13A3B418F0C05D00A6233B /* constants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = constants.h; path = ../constants.h; sourceTree = ""; }; + 1A13A3B518F0C05D00A6233B /* crypto.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = crypto.h; path = ../crypto.h; sourceTree = ""; }; + 1A13A3B618F0C05D00A6233B /* dataformats.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = dataformats.h; path = ../dataformats.h; sourceTree = ""; }; + 1A13A3B718F0C05D00A6233B /* fdqueue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = fdqueue.h; path = ../fdqueue.h; sourceTree = ""; }; + 1A13A3B818F0C05D00A6233B /* fifo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = fifo.h; path = ../fifo.h; sourceTree = ""; }; + 1A13A3B918F0C05D00A6233B /* golay.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = golay.h; path = ../golay.h; sourceTree = ""; }; + 1A13A3BA18F0C05D00A6233B /* http_server.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = http_server.h; path = ../http_server.h; sourceTree = ""; }; + 1A13A3BB18F0C05D00A6233B /* httpd.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = httpd.h; path = ../httpd.h; sourceTree = ""; }; + 1A13A3BC18F0C05D00A6233B /* instance.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = instance.h; path = ../instance.h; sourceTree = ""; }; + 1A13A3BD18F0C05D00A6233B /* keyring.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = keyring.h; path = ../keyring.h; sourceTree = ""; }; + 1A13A3BE18F0C05D00A6233B /* log.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = log.h; path = ../log.h; sourceTree = ""; }; + 1A13A3BF18F0C05D00A6233B /* mdp_client.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mdp_client.h; path = ../mdp_client.h; sourceTree = ""; }; + 1A13A3C018F0C05D00A6233B /* mem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mem.h; path = ../mem.h; sourceTree = ""; }; + 1A13A3C118F0C05D00A6233B /* meshms.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = meshms.h; path = ../meshms.h; sourceTree = ""; }; + 1A13A3C218F0C05D00A6233B /* monitor-client.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "monitor-client.h"; path = "../monitor-client.h"; sourceTree = ""; }; + 1A13A3C318F0C05D00A6233B /* msp_client.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = msp_client.h; path = ../msp_client.h; sourceTree = ""; }; + 1A13A3C418F0C05D00A6233B /* net.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = net.h; path = ../net.h; sourceTree = ""; }; + 1A13A3C518F0C05D00A6233B /* os.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = os.h; path = ../os.h; sourceTree = ""; }; + 1A13A3C618F0C05D00A6233B /* overlay_address.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = overlay_address.h; path = ../overlay_address.h; sourceTree = ""; }; + 1A13A3C718F0C05D00A6233B /* overlay_buffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = overlay_buffer.h; path = ../overlay_buffer.h; sourceTree = ""; }; + 1A13A3C818F0C05D00A6233B /* overlay_interface.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = overlay_interface.h; path = ../overlay_interface.h; sourceTree = ""; }; + 1A13A3C918F0C05D00A6233B /* overlay_packet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = overlay_packet.h; path = ../overlay_packet.h; sourceTree = ""; }; + 1A13A3CA18F0C05D00A6233B /* radio_link.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = radio_link.h; path = ../radio_link.h; sourceTree = ""; }; + 1A13A3CB18F0C05D00A6233B /* rhizome.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = rhizome.h; path = ../rhizome.h; sourceTree = ""; }; + 1A13A3CC18F0C05D00A6233B /* rotbuf.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = rotbuf.h; path = ../rotbuf.h; sourceTree = ""; }; + 1A13A3CD18F0C05D00A6233B /* serval.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = serval.h; path = ../serval.h; sourceTree = ""; }; + 1A13A3CE18F0C05D00A6233B /* sha2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = sha2.h; path = ../sha2.h; sourceTree = ""; }; + 1A13A3CF18F0C05D00A6233B /* socket.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = socket.h; path = ../socket.h; sourceTree = ""; }; + 1A13A3D018F0C05D00A6233B /* str.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = str.h; path = ../str.h; sourceTree = ""; }; + 1A13A3D118F0C05D00A6233B /* strbuf_helpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = strbuf_helpers.h; path = ../strbuf_helpers.h; sourceTree = ""; }; + 1A13A3D218F0C05D00A6233B /* strbuf.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = strbuf.h; path = ../strbuf.h; sourceTree = ""; }; + 1A13A3D318F0C05D00A6233B /* strlcpy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = strlcpy.h; path = ../strlcpy.h; sourceTree = ""; }; + 1A13A3D418F0C05D00A6233B /* uuid.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = uuid.h; path = ../uuid.h; sourceTree = ""; }; + 1A13A3D518F0C05D00A6233B /* xprintf.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = xprintf.h; path = ../xprintf.h; sourceTree = ""; }; 1A5334BE18F087CF00C7BD93 /* build.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = build.sh; sourceTree = ""; }; /* End PBXFileReference section */ @@ -16,6 +53,7 @@ isa = PBXGroup; children = ( 1A5334BE18F087CF00C7BD93 /* build.sh */, + 1A13A3B018F0C01500A6233B /* headers */, 1A09828B18F0B82500C4652C /* Products */, ); name = libserval; @@ -29,6 +67,50 @@ name = Products; sourceTree = ""; }; + 1A13A3B018F0C01500A6233B /* headers */ = { + isa = PBXGroup; + children = ( + 1A13A3B118F0C05D00A6233B /* cli.h */, + 1A13A3B218F0C05D00A6233B /* conf_schema.h */, + 1A13A3B318F0C05D00A6233B /* conf.h */, + 1A13A3B418F0C05D00A6233B /* constants.h */, + 1A13A3B518F0C05D00A6233B /* crypto.h */, + 1A13A3B618F0C05D00A6233B /* dataformats.h */, + 1A13A3B718F0C05D00A6233B /* fdqueue.h */, + 1A13A3B818F0C05D00A6233B /* fifo.h */, + 1A13A3B918F0C05D00A6233B /* golay.h */, + 1A13A3BA18F0C05D00A6233B /* http_server.h */, + 1A13A3BB18F0C05D00A6233B /* httpd.h */, + 1A13A3BC18F0C05D00A6233B /* instance.h */, + 1A13A3BD18F0C05D00A6233B /* keyring.h */, + 1A13A3BE18F0C05D00A6233B /* log.h */, + 1A13A3BF18F0C05D00A6233B /* mdp_client.h */, + 1A13A3C018F0C05D00A6233B /* mem.h */, + 1A13A3C118F0C05D00A6233B /* meshms.h */, + 1A13A3C218F0C05D00A6233B /* monitor-client.h */, + 1A13A3C318F0C05D00A6233B /* msp_client.h */, + 1A13A3C418F0C05D00A6233B /* net.h */, + 1A13A3C518F0C05D00A6233B /* os.h */, + 1A13A3C618F0C05D00A6233B /* overlay_address.h */, + 1A13A3C718F0C05D00A6233B /* overlay_buffer.h */, + 1A13A3C818F0C05D00A6233B /* overlay_interface.h */, + 1A13A3C918F0C05D00A6233B /* overlay_packet.h */, + 1A13A3CA18F0C05D00A6233B /* radio_link.h */, + 1A13A3CB18F0C05D00A6233B /* rhizome.h */, + 1A13A3CC18F0C05D00A6233B /* rotbuf.h */, + 1A13A3CD18F0C05D00A6233B /* serval.h */, + 1A13A3CE18F0C05D00A6233B /* sha2.h */, + 1A13A3CF18F0C05D00A6233B /* socket.h */, + 1A13A3D018F0C05D00A6233B /* str.h */, + 1A13A3D118F0C05D00A6233B /* strbuf_helpers.h */, + 1A13A3D218F0C05D00A6233B /* strbuf.h */, + 1A13A3D318F0C05D00A6233B /* strlcpy.h */, + 1A13A3D418F0C05D00A6233B /* uuid.h */, + 1A13A3D518F0C05D00A6233B /* xprintf.h */, + ); + name = headers; + sourceTree = ""; + }; 1A5334B318F087B500C7BD93 = { isa = PBXGroup; children = ( diff --git a/ios/libserval.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/xcschememanagement.plist b/ios/libserval.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index 1c61a251..00000000 --- a/ios/libserval.xcodeproj/xcuserdata/james.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,22 +0,0 @@ - - - - - SchemeUserState - - servald.xcscheme - - orderHint - 0 - - - SuppressBuildableAutocreation - - 1A5334B818F087B500C7BD93 - - primary - - - - - From 8280f75c2cc6eb91896487855ca20f64ede5c6a6 Mon Sep 17 00:00:00 2001 From: James Moore Date: Sat, 5 Apr 2014 15:56:53 -0700 Subject: [PATCH 16/33] better cleanup --- ios/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ios/build.sh b/ios/build.sh index 9fa93a03..72c81148 100755 --- a/ios/build.sh +++ b/ios/build.sh @@ -63,6 +63,8 @@ if [[ $ACTION == "clean" ]]; then echo "=> Cleaning..." if [[ -f ${PREFIX}/libserval.a ]]; then rm ${PREFIX}/libserval.a + rm -rf ${PREFIX}/libserval-* + rm -rf ${PREFIX}/include fi exit fi @@ -80,8 +82,6 @@ autoreconf -f -i mkdir -p ${PREFIX} -rm -rf ${PREFIX}/libserval-* - for arch in ${ARCHS}; do buildIOS "${arch}" done @@ -100,7 +100,6 @@ rm -rf ${PREFIX}/libserval-* echo "=> Copying Headers" mkdir -p ${PREFIX}/include - cp *.h ${PREFIX}/include # Roll back the changes we made to these files From 86b4a794e4d9e9839363545383610520fae13415 Mon Sep 17 00:00:00 2001 From: James Moore Date: Sat, 5 Apr 2014 16:35:32 -0700 Subject: [PATCH 17/33] adding confdefs --- ios/build.sh | 4 +--- ios/confdefs.h | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 ios/confdefs.h diff --git a/ios/build.sh b/ios/build.sh index 72c81148..0cbc6ed4 100755 --- a/ios/build.sh +++ b/ios/build.sh @@ -96,11 +96,9 @@ lipo \ "${PREFIX}/libserval-x86_64.a" \ -create -output ${PREFIX}/libserval.a || { echo "failed building fat library"; exit 1; } -rm -rf ${PREFIX}/libserval-* - echo "=> Copying Headers" mkdir -p ${PREFIX}/include -cp *.h ${PREFIX}/include +cp *.h ios/confdefs.h ${PREFIX}/include # Roll back the changes we made to these files if [[ -f ".git" ]]; then diff --git a/ios/confdefs.h b/ios/confdefs.h new file mode 100644 index 00000000..3f517bc4 --- /dev/null +++ b/ios/confdefs.h @@ -0,0 +1,64 @@ +// These were taken from the confdefs section of the config.log. This file might have to be regenerated in the future. + +#define PACKAGE_NAME "servald" +#define PACKAGE_TARNAME "servald" +#define PACKAGE_VERSION "0.9" +#define PACKAGE_STRING "servald 0.9" +#define PACKAGE_BUGREPORT "" +#define PACKAGE_URL "" +#define STDC_HEADERS 1 +#define HAVE_SYS_TYPES_H 1 +#define HAVE_SYS_STAT_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STRING_H 1 +#define HAVE_MEMORY_H 1 +#define HAVE_STRINGS_H 1 +#define HAVE_INTTYPES_H 1 +#define HAVE_STDINT_H 1 +#define HAVE_UNISTD_H 1 +#define HAVE_PTHREAD_PRIO_INHERIT 1 +#define HAVE_PTHREAD 1 +#define HAVE_MATH_H 1 +#define HAVE_FLOAT_H 1 +#define HAVE_LIBC 1 +#define HAVE_GETPEEREID 1 +#define HAVE_BCOPY 1 +#define HAVE_BZERO 1 +#define HAVE_BCMP 1 +#define SIZEOF_OFF_T 8 +#define HAVE_STDIO_H 1 +#define HAVE_ERRNO_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STRINGS_H 1 +#define HAVE_UNISTD_H 1 +#define HAVE_STRING_H 1 +#define HAVE_ARPA_INET_H 1 +#define HAVE_SYS_SOCKET_H 1 +#define HAVE_SYS_MMAN_H 1 +#define HAVE_SYS_TIME_H 1 +#define HAVE_SYS_UCRED_H 1 +#define HAVE_POLL_H 1 +#define HAVE_NETDB_H 1 +#define HAVE_NET_IF_H 1 +#define HAVE_NETINET_IN_H 1 +#define HAVE_IFADDRS_H 1 +#define HAVE_NET_ROUTE_H 1 +#define HAVE_SIGNAL_H 1 +#define HAVE_JNI_H 1 +#define HAVE_SYS_FILIO_H 1 +#define HAVE_SYS_SOCKIO_H 1 +#define HAVE_SYS_SOCKET_H 1 +#define HAVE_SINF 1 +#define HAVE_COSF 1 +#define HAVE_TANF 1 +#define HAVE_ASINF 1 +#define HAVE_ACOSF 1 +#define HAVE_ATANF 1 +#define HAVE_ATAN2F 1 +#define HAVE_CEILF 1 +#define HAVE_FLOORF 1 +#define HAVE_POWF 1 +#define HAVE_EXPF 1 +#define HAVE_LOGF 1 +#define HAVE_LOG10F 1 +#define HAVE_STRLCPY 1 From a241c7df6da07a5d7540746daf47bad3213b5e3e Mon Sep 17 00:00:00 2001 From: James Moore Date: Sat, 5 Apr 2014 16:37:54 -0700 Subject: [PATCH 18/33] added confdefs to project --- ios/libserval.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ios/libserval.xcodeproj/project.pbxproj b/ios/libserval.xcodeproj/project.pbxproj index d34da010..da9c5cfc 100644 --- a/ios/libserval.xcodeproj/project.pbxproj +++ b/ios/libserval.xcodeproj/project.pbxproj @@ -45,6 +45,7 @@ 1A13A3D318F0C05D00A6233B /* strlcpy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = strlcpy.h; path = ../strlcpy.h; sourceTree = ""; }; 1A13A3D418F0C05D00A6233B /* uuid.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = uuid.h; path = ../uuid.h; sourceTree = ""; }; 1A13A3D518F0C05D00A6233B /* xprintf.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = xprintf.h; path = ../xprintf.h; sourceTree = ""; }; + 1A13A3D918F0CB4300A6233B /* confdefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = confdefs.h; sourceTree = ""; }; 1A5334BE18F087CF00C7BD93 /* build.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = build.sh; sourceTree = ""; }; /* End PBXFileReference section */ @@ -70,6 +71,7 @@ 1A13A3B018F0C01500A6233B /* headers */ = { isa = PBXGroup; children = ( + 1A13A3D918F0CB4300A6233B /* confdefs.h */, 1A13A3B118F0C05D00A6233B /* cli.h */, 1A13A3B218F0C05D00A6233B /* conf_schema.h */, 1A13A3B318F0C05D00A6233B /* conf.h */, From 0a3a528c19a5b977ab62c22c2fc957daafc0a6d5 Mon Sep 17 00:00:00 2001 From: James Moore Date: Sat, 5 Apr 2014 16:40:09 -0700 Subject: [PATCH 19/33] disable JNI --- ios/confdefs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/confdefs.h b/ios/confdefs.h index 3f517bc4..60062fd9 100644 --- a/ios/confdefs.h +++ b/ios/confdefs.h @@ -44,7 +44,7 @@ #define HAVE_IFADDRS_H 1 #define HAVE_NET_ROUTE_H 1 #define HAVE_SIGNAL_H 1 -#define HAVE_JNI_H 1 +#define HAVE_JNI_H 0 #define HAVE_SYS_FILIO_H 1 #define HAVE_SYS_SOCKIO_H 1 #define HAVE_SYS_SOCKET_H 1 From 6e0e74a24f043fb8902fbd73d51815a56f210f0e Mon Sep 17 00:00:00 2001 From: James Moore Date: Sat, 5 Apr 2014 16:48:01 -0700 Subject: [PATCH 20/33] switching the source of the headers --- ios/libserval.xcodeproj/project.pbxproj | 152 ++++++++++++------------ 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/ios/libserval.xcodeproj/project.pbxproj b/ios/libserval.xcodeproj/project.pbxproj index da9c5cfc..37c9a78a 100644 --- a/ios/libserval.xcodeproj/project.pbxproj +++ b/ios/libserval.xcodeproj/project.pbxproj @@ -8,44 +8,44 @@ /* Begin PBXFileReference section */ 1A09828C18F0B8E200C4652C /* libserval.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libserval.a; path = ../build/libserval.a; sourceTree = ""; }; - 1A13A3B118F0C05D00A6233B /* cli.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = cli.h; path = ../cli.h; sourceTree = ""; }; - 1A13A3B218F0C05D00A6233B /* conf_schema.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = conf_schema.h; path = ../conf_schema.h; sourceTree = ""; }; - 1A13A3B318F0C05D00A6233B /* conf.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = conf.h; path = ../conf.h; sourceTree = ""; }; - 1A13A3B418F0C05D00A6233B /* constants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = constants.h; path = ../constants.h; sourceTree = ""; }; - 1A13A3B518F0C05D00A6233B /* crypto.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = crypto.h; path = ../crypto.h; sourceTree = ""; }; - 1A13A3B618F0C05D00A6233B /* dataformats.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = dataformats.h; path = ../dataformats.h; sourceTree = ""; }; - 1A13A3B718F0C05D00A6233B /* fdqueue.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = fdqueue.h; path = ../fdqueue.h; sourceTree = ""; }; - 1A13A3B818F0C05D00A6233B /* fifo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = fifo.h; path = ../fifo.h; sourceTree = ""; }; - 1A13A3B918F0C05D00A6233B /* golay.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = golay.h; path = ../golay.h; sourceTree = ""; }; - 1A13A3BA18F0C05D00A6233B /* http_server.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = http_server.h; path = ../http_server.h; sourceTree = ""; }; - 1A13A3BB18F0C05D00A6233B /* httpd.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = httpd.h; path = ../httpd.h; sourceTree = ""; }; - 1A13A3BC18F0C05D00A6233B /* instance.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = instance.h; path = ../instance.h; sourceTree = ""; }; - 1A13A3BD18F0C05D00A6233B /* keyring.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = keyring.h; path = ../keyring.h; sourceTree = ""; }; - 1A13A3BE18F0C05D00A6233B /* log.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = log.h; path = ../log.h; sourceTree = ""; }; - 1A13A3BF18F0C05D00A6233B /* mdp_client.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mdp_client.h; path = ../mdp_client.h; sourceTree = ""; }; - 1A13A3C018F0C05D00A6233B /* mem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = mem.h; path = ../mem.h; sourceTree = ""; }; - 1A13A3C118F0C05D00A6233B /* meshms.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = meshms.h; path = ../meshms.h; sourceTree = ""; }; - 1A13A3C218F0C05D00A6233B /* monitor-client.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "monitor-client.h"; path = "../monitor-client.h"; sourceTree = ""; }; - 1A13A3C318F0C05D00A6233B /* msp_client.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = msp_client.h; path = ../msp_client.h; sourceTree = ""; }; - 1A13A3C418F0C05D00A6233B /* net.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = net.h; path = ../net.h; sourceTree = ""; }; - 1A13A3C518F0C05D00A6233B /* os.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = os.h; path = ../os.h; sourceTree = ""; }; - 1A13A3C618F0C05D00A6233B /* overlay_address.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = overlay_address.h; path = ../overlay_address.h; sourceTree = ""; }; - 1A13A3C718F0C05D00A6233B /* overlay_buffer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = overlay_buffer.h; path = ../overlay_buffer.h; sourceTree = ""; }; - 1A13A3C818F0C05D00A6233B /* overlay_interface.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = overlay_interface.h; path = ../overlay_interface.h; sourceTree = ""; }; - 1A13A3C918F0C05D00A6233B /* overlay_packet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = overlay_packet.h; path = ../overlay_packet.h; sourceTree = ""; }; - 1A13A3CA18F0C05D00A6233B /* radio_link.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = radio_link.h; path = ../radio_link.h; sourceTree = ""; }; - 1A13A3CB18F0C05D00A6233B /* rhizome.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = rhizome.h; path = ../rhizome.h; sourceTree = ""; }; - 1A13A3CC18F0C05D00A6233B /* rotbuf.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = rotbuf.h; path = ../rotbuf.h; sourceTree = ""; }; - 1A13A3CD18F0C05D00A6233B /* serval.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = serval.h; path = ../serval.h; sourceTree = ""; }; - 1A13A3CE18F0C05D00A6233B /* sha2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = sha2.h; path = ../sha2.h; sourceTree = ""; }; - 1A13A3CF18F0C05D00A6233B /* socket.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = socket.h; path = ../socket.h; sourceTree = ""; }; - 1A13A3D018F0C05D00A6233B /* str.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = str.h; path = ../str.h; sourceTree = ""; }; - 1A13A3D118F0C05D00A6233B /* strbuf_helpers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = strbuf_helpers.h; path = ../strbuf_helpers.h; sourceTree = ""; }; - 1A13A3D218F0C05D00A6233B /* strbuf.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = strbuf.h; path = ../strbuf.h; sourceTree = ""; }; - 1A13A3D318F0C05D00A6233B /* strlcpy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = strlcpy.h; path = ../strlcpy.h; sourceTree = ""; }; - 1A13A3D418F0C05D00A6233B /* uuid.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = uuid.h; path = ../uuid.h; sourceTree = ""; }; - 1A13A3D518F0C05D00A6233B /* xprintf.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = xprintf.h; path = ../xprintf.h; sourceTree = ""; }; - 1A13A3D918F0CB4300A6233B /* confdefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = confdefs.h; sourceTree = ""; }; + 1A13A3DA18F0CD9B00A6233B /* cli.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cli.h; path = ../build/include/cli.h; sourceTree = ""; }; + 1A13A3DB18F0CD9B00A6233B /* conf_schema.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = conf_schema.h; path = ../build/include/conf_schema.h; sourceTree = ""; }; + 1A13A3DC18F0CD9B00A6233B /* conf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = conf.h; path = ../build/include/conf.h; sourceTree = ""; }; + 1A13A3DD18F0CD9B00A6233B /* confdefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = confdefs.h; path = ../build/include/confdefs.h; sourceTree = ""; }; + 1A13A3DE18F0CD9B00A6233B /* constants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = constants.h; path = ../build/include/constants.h; sourceTree = ""; }; + 1A13A3DF18F0CD9B00A6233B /* crypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = crypto.h; path = ../build/include/crypto.h; sourceTree = ""; }; + 1A13A3E018F0CD9B00A6233B /* dataformats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dataformats.h; path = ../build/include/dataformats.h; sourceTree = ""; }; + 1A13A3E118F0CD9B00A6233B /* fdqueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fdqueue.h; path = ../build/include/fdqueue.h; sourceTree = ""; }; + 1A13A3E218F0CD9B00A6233B /* fifo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fifo.h; path = ../build/include/fifo.h; sourceTree = ""; }; + 1A13A3E318F0CD9B00A6233B /* golay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = golay.h; path = ../build/include/golay.h; sourceTree = ""; }; + 1A13A3E418F0CD9B00A6233B /* http_server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = http_server.h; path = ../build/include/http_server.h; sourceTree = ""; }; + 1A13A3E518F0CD9B00A6233B /* httpd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = httpd.h; path = ../build/include/httpd.h; sourceTree = ""; }; + 1A13A3E618F0CD9B00A6233B /* instance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = instance.h; path = ../build/include/instance.h; sourceTree = ""; }; + 1A13A3E718F0CD9B00A6233B /* keyring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = keyring.h; path = ../build/include/keyring.h; sourceTree = ""; }; + 1A13A3E818F0CD9B00A6233B /* log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = log.h; path = ../build/include/log.h; sourceTree = ""; }; + 1A13A3E918F0CD9B00A6233B /* mdp_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mdp_client.h; path = ../build/include/mdp_client.h; sourceTree = ""; }; + 1A13A3EA18F0CD9B00A6233B /* mem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mem.h; path = ../build/include/mem.h; sourceTree = ""; }; + 1A13A3EB18F0CD9B00A6233B /* meshms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = meshms.h; path = ../build/include/meshms.h; sourceTree = ""; }; + 1A13A3EC18F0CD9B00A6233B /* monitor-client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "monitor-client.h"; path = "../build/include/monitor-client.h"; sourceTree = ""; }; + 1A13A3ED18F0CD9B00A6233B /* msp_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = msp_client.h; path = ../build/include/msp_client.h; sourceTree = ""; }; + 1A13A3EE18F0CD9B00A6233B /* net.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = net.h; path = ../build/include/net.h; sourceTree = ""; }; + 1A13A3EF18F0CD9B00A6233B /* os.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = os.h; path = ../build/include/os.h; sourceTree = ""; }; + 1A13A3F018F0CD9B00A6233B /* overlay_address.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = overlay_address.h; path = ../build/include/overlay_address.h; sourceTree = ""; }; + 1A13A3F118F0CD9B00A6233B /* overlay_buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = overlay_buffer.h; path = ../build/include/overlay_buffer.h; sourceTree = ""; }; + 1A13A3F218F0CD9B00A6233B /* overlay_interface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = overlay_interface.h; path = ../build/include/overlay_interface.h; sourceTree = ""; }; + 1A13A3F318F0CD9B00A6233B /* overlay_packet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = overlay_packet.h; path = ../build/include/overlay_packet.h; sourceTree = ""; }; + 1A13A3F418F0CD9B00A6233B /* radio_link.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = radio_link.h; path = ../build/include/radio_link.h; sourceTree = ""; }; + 1A13A3F518F0CD9B00A6233B /* rhizome.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rhizome.h; path = ../build/include/rhizome.h; sourceTree = ""; }; + 1A13A3F618F0CD9B00A6233B /* rotbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rotbuf.h; path = ../build/include/rotbuf.h; sourceTree = ""; }; + 1A13A3F718F0CD9B00A6233B /* serval.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = serval.h; path = ../build/include/serval.h; sourceTree = ""; }; + 1A13A3F818F0CD9B00A6233B /* sha2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sha2.h; path = ../build/include/sha2.h; sourceTree = ""; }; + 1A13A3F918F0CD9B00A6233B /* socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = socket.h; path = ../build/include/socket.h; sourceTree = ""; }; + 1A13A3FA18F0CD9B00A6233B /* str.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = str.h; path = ../build/include/str.h; sourceTree = ""; }; + 1A13A3FB18F0CD9B00A6233B /* strbuf_helpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = strbuf_helpers.h; path = ../build/include/strbuf_helpers.h; sourceTree = ""; }; + 1A13A3FC18F0CD9B00A6233B /* strbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = strbuf.h; path = ../build/include/strbuf.h; sourceTree = ""; }; + 1A13A3FD18F0CD9B00A6233B /* strlcpy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = strlcpy.h; path = ../build/include/strlcpy.h; sourceTree = ""; }; + 1A13A3FE18F0CD9B00A6233B /* uuid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = uuid.h; path = ../build/include/uuid.h; sourceTree = ""; }; + 1A13A3FF18F0CD9B00A6233B /* xprintf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xprintf.h; path = ../build/include/xprintf.h; sourceTree = ""; }; 1A5334BE18F087CF00C7BD93 /* build.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = build.sh; sourceTree = ""; }; /* End PBXFileReference section */ @@ -71,44 +71,44 @@ 1A13A3B018F0C01500A6233B /* headers */ = { isa = PBXGroup; children = ( - 1A13A3D918F0CB4300A6233B /* confdefs.h */, - 1A13A3B118F0C05D00A6233B /* cli.h */, - 1A13A3B218F0C05D00A6233B /* conf_schema.h */, - 1A13A3B318F0C05D00A6233B /* conf.h */, - 1A13A3B418F0C05D00A6233B /* constants.h */, - 1A13A3B518F0C05D00A6233B /* crypto.h */, - 1A13A3B618F0C05D00A6233B /* dataformats.h */, - 1A13A3B718F0C05D00A6233B /* fdqueue.h */, - 1A13A3B818F0C05D00A6233B /* fifo.h */, - 1A13A3B918F0C05D00A6233B /* golay.h */, - 1A13A3BA18F0C05D00A6233B /* http_server.h */, - 1A13A3BB18F0C05D00A6233B /* httpd.h */, - 1A13A3BC18F0C05D00A6233B /* instance.h */, - 1A13A3BD18F0C05D00A6233B /* keyring.h */, - 1A13A3BE18F0C05D00A6233B /* log.h */, - 1A13A3BF18F0C05D00A6233B /* mdp_client.h */, - 1A13A3C018F0C05D00A6233B /* mem.h */, - 1A13A3C118F0C05D00A6233B /* meshms.h */, - 1A13A3C218F0C05D00A6233B /* monitor-client.h */, - 1A13A3C318F0C05D00A6233B /* msp_client.h */, - 1A13A3C418F0C05D00A6233B /* net.h */, - 1A13A3C518F0C05D00A6233B /* os.h */, - 1A13A3C618F0C05D00A6233B /* overlay_address.h */, - 1A13A3C718F0C05D00A6233B /* overlay_buffer.h */, - 1A13A3C818F0C05D00A6233B /* overlay_interface.h */, - 1A13A3C918F0C05D00A6233B /* overlay_packet.h */, - 1A13A3CA18F0C05D00A6233B /* radio_link.h */, - 1A13A3CB18F0C05D00A6233B /* rhizome.h */, - 1A13A3CC18F0C05D00A6233B /* rotbuf.h */, - 1A13A3CD18F0C05D00A6233B /* serval.h */, - 1A13A3CE18F0C05D00A6233B /* sha2.h */, - 1A13A3CF18F0C05D00A6233B /* socket.h */, - 1A13A3D018F0C05D00A6233B /* str.h */, - 1A13A3D118F0C05D00A6233B /* strbuf_helpers.h */, - 1A13A3D218F0C05D00A6233B /* strbuf.h */, - 1A13A3D318F0C05D00A6233B /* strlcpy.h */, - 1A13A3D418F0C05D00A6233B /* uuid.h */, - 1A13A3D518F0C05D00A6233B /* xprintf.h */, + 1A13A3DA18F0CD9B00A6233B /* cli.h */, + 1A13A3DB18F0CD9B00A6233B /* conf_schema.h */, + 1A13A3DC18F0CD9B00A6233B /* conf.h */, + 1A13A3DD18F0CD9B00A6233B /* confdefs.h */, + 1A13A3DE18F0CD9B00A6233B /* constants.h */, + 1A13A3DF18F0CD9B00A6233B /* crypto.h */, + 1A13A3E018F0CD9B00A6233B /* dataformats.h */, + 1A13A3E118F0CD9B00A6233B /* fdqueue.h */, + 1A13A3E218F0CD9B00A6233B /* fifo.h */, + 1A13A3E318F0CD9B00A6233B /* golay.h */, + 1A13A3E418F0CD9B00A6233B /* http_server.h */, + 1A13A3E518F0CD9B00A6233B /* httpd.h */, + 1A13A3E618F0CD9B00A6233B /* instance.h */, + 1A13A3E718F0CD9B00A6233B /* keyring.h */, + 1A13A3E818F0CD9B00A6233B /* log.h */, + 1A13A3E918F0CD9B00A6233B /* mdp_client.h */, + 1A13A3EA18F0CD9B00A6233B /* mem.h */, + 1A13A3EB18F0CD9B00A6233B /* meshms.h */, + 1A13A3EC18F0CD9B00A6233B /* monitor-client.h */, + 1A13A3ED18F0CD9B00A6233B /* msp_client.h */, + 1A13A3EE18F0CD9B00A6233B /* net.h */, + 1A13A3EF18F0CD9B00A6233B /* os.h */, + 1A13A3F018F0CD9B00A6233B /* overlay_address.h */, + 1A13A3F118F0CD9B00A6233B /* overlay_buffer.h */, + 1A13A3F218F0CD9B00A6233B /* overlay_interface.h */, + 1A13A3F318F0CD9B00A6233B /* overlay_packet.h */, + 1A13A3F418F0CD9B00A6233B /* radio_link.h */, + 1A13A3F518F0CD9B00A6233B /* rhizome.h */, + 1A13A3F618F0CD9B00A6233B /* rotbuf.h */, + 1A13A3F718F0CD9B00A6233B /* serval.h */, + 1A13A3F818F0CD9B00A6233B /* sha2.h */, + 1A13A3F918F0CD9B00A6233B /* socket.h */, + 1A13A3FA18F0CD9B00A6233B /* str.h */, + 1A13A3FB18F0CD9B00A6233B /* strbuf_helpers.h */, + 1A13A3FC18F0CD9B00A6233B /* strbuf.h */, + 1A13A3FD18F0CD9B00A6233B /* strlcpy.h */, + 1A13A3FE18F0CD9B00A6233B /* uuid.h */, + 1A13A3FF18F0CD9B00A6233B /* xprintf.h */, ); name = headers; sourceTree = ""; From 6a0ed0bee66a04cfd6a6f58418409d62c4849729 Mon Sep 17 00:00:00 2001 From: James Moore Date: Sat, 5 Apr 2014 16:53:22 -0700 Subject: [PATCH 21/33] wrong flag --- ios/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/build.sh b/ios/build.sh index 0cbc6ed4..57b67700 100755 --- a/ios/build.sh +++ b/ios/build.sh @@ -101,7 +101,7 @@ mkdir -p ${PREFIX}/include cp *.h ios/confdefs.h ${PREFIX}/include # Roll back the changes we made to these files -if [[ -f ".git" ]]; then +if [[ -d ".git" ]]; then git checkout -- Makefile.in git checkout -- rotbuf.h fi From 9dffd2bd8b9bd5fbbd21f74538c10a78c1aea43e Mon Sep 17 00:00:00 2001 From: James Moore Date: Thu, 10 Apr 2014 19:55:45 -0700 Subject: [PATCH 22/33] tem prefix --- ios/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/build.sh b/ios/build.sh index 57b67700..ab82ffec 100755 --- a/ios/build.sh +++ b/ios/build.sh @@ -44,7 +44,7 @@ buildIOS() echo "=> Building libserval for ${PLATFORM} ${SDK_VERSION} ${ARCH}" - ./configure $HOST --disable-voiptest &> "${PREFIX}/libserval-${ARCH}.log" || { echo "configure failed"; exit 1; } + ./configure $HOST --disable-voiptest --prefix /tmp/serval &> "${PREFIX}/libserval-${ARCH}.log" || { echo "configure failed"; exit 1; } make libserval.a >> "${PREFIX}/libserval-${ARCH}.log" 2>&1 || { echo "make failed"; exit 1; } cp libserval.a ${PREFIX}/libserval-${ARCH}.a From 1a7b95df4eb07cdb8c8098bc5ad25153a0082ebb Mon Sep 17 00:00:00 2001 From: James Moore Date: Thu, 10 Apr 2014 21:37:10 -0700 Subject: [PATCH 23/33] clean up based on upstream changes --- ios/build.sh | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/ios/build.sh b/ios/build.sh index ab82ffec..594e4b2e 100755 --- a/ios/build.sh +++ b/ios/build.sh @@ -38,21 +38,18 @@ buildIOS() CROSS_TOP="${DEVELOPER}/Platforms/${PLATFORM}.platform/Developer" CROSS_SDK="${PLATFORM}${SDK_VERSION}.sdk" SDKROOT="${CROSS_TOP}/SDKs/${CROSS_SDK}" - + export CFLAGS="-arch ${ARCH} -pipe -no-cpp-precomp -isysroot $SDKROOT -I$SDKROOT/usr/include -miphoneos-version-min=${SDK_VERSION}" export CC="clang" echo "=> Building libserval for ${PLATFORM} ${SDK_VERSION} ${ARCH}" - ./configure $HOST --disable-voiptest --prefix /tmp/serval &> "${PREFIX}/libserval-${ARCH}.log" || { echo "configure failed"; exit 1; } + ./configure $HOST --prefix /tmp/serval &> "${PREFIX}/libserval-${ARCH}.log" || { echo "configure failed"; exit 1; } make libserval.a >> "${PREFIX}/libserval-${ARCH}.log" 2>&1 || { echo "make failed"; exit 1; } cp libserval.a ${PREFIX}/libserval-${ARCH}.a make clean >> "${PREFIX}/libserval-${ARCH}.log" 2>&1 || { echo "make clean failed"; exit 1; } - # don't know why these don't get removed - # rm directory_service.o - # rm config_test.o } # @@ -61,11 +58,9 @@ buildIOS() if [[ $ACTION == "clean" ]]; then echo "=> Cleaning..." - if [[ -f ${PREFIX}/libserval.a ]]; then - rm ${PREFIX}/libserval.a - rm -rf ${PREFIX}/libserval-* - rm -rf ${PREFIX}/include - fi + rm ${PREFIX}/libserval.a 2>&1 /deb/null + rm -rf ${PREFIX}/libserval-* 2>&1 /deb/null + rm -rf ${PREFIX}/include 2>&1 /deb/null exit fi @@ -74,9 +69,6 @@ if [[ -f ${PREFIX}/libserval.a ]]; then exit fi -# remove duplicated function -perl -p -i -e 's/^(void rotbuf_log\(struct __sourceloc __whence, int log_level, const char \*prefix, const struct rotbuf \*rb\);)/\/\/\1/' rotbuf.h - # Generate configure autoreconf -f -i @@ -100,10 +92,4 @@ echo "=> Copying Headers" mkdir -p ${PREFIX}/include cp *.h ios/confdefs.h ${PREFIX}/include -# Roll back the changes we made to these files -if [[ -d ".git" ]]; then - git checkout -- Makefile.in - git checkout -- rotbuf.h -fi - echo "=> Done" From 4e34ee5b05b12b4f19fa6459b304d75957cad024 Mon Sep 17 00:00:00 2001 From: James Moore Date: Thu, 10 Apr 2014 21:37:53 -0700 Subject: [PATCH 24/33] typo --- ios/build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ios/build.sh b/ios/build.sh index 594e4b2e..39201613 100755 --- a/ios/build.sh +++ b/ios/build.sh @@ -58,9 +58,9 @@ buildIOS() if [[ $ACTION == "clean" ]]; then echo "=> Cleaning..." - rm ${PREFIX}/libserval.a 2>&1 /deb/null - rm -rf ${PREFIX}/libserval-* 2>&1 /deb/null - rm -rf ${PREFIX}/include 2>&1 /deb/null + rm ${PREFIX}/libserval.a 2> /dev/null + rm -rf ${PREFIX}/libserval-* 2> /dev/null + rm -rf ${PREFIX}/include 2> /dev/null exit fi From 3a58d272580ea58327beb2941db4484f0fd9a097 Mon Sep 17 00:00:00 2001 From: James Moore Date: Sat, 12 Apr 2014 20:57:40 -0700 Subject: [PATCH 25/33] remove JNI mention --- ios/confdefs.h | 1 - 1 file changed, 1 deletion(-) diff --git a/ios/confdefs.h b/ios/confdefs.h index 60062fd9..f01ab883 100644 --- a/ios/confdefs.h +++ b/ios/confdefs.h @@ -44,7 +44,6 @@ #define HAVE_IFADDRS_H 1 #define HAVE_NET_ROUTE_H 1 #define HAVE_SIGNAL_H 1 -#define HAVE_JNI_H 0 #define HAVE_SYS_FILIO_H 1 #define HAVE_SYS_SOCKIO_H 1 #define HAVE_SYS_SOCKET_H 1 From d0aa5b8444e13aa3a54179183e082181aba1b332 Mon Sep 17 00:00:00 2001 From: James Moore Date: Sat, 12 Apr 2014 20:57:54 -0700 Subject: [PATCH 26/33] use a different prefix for device vs simulator --- ios/build.sh | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/ios/build.sh b/ios/build.sh index 39201613..8114d6fb 100755 --- a/ios/build.sh +++ b/ios/build.sh @@ -17,6 +17,7 @@ ARCHS="armv7 armv7s arm64 i386 x86_64" SDK_VERSION=7.1 PREFIX=$(pwd)/build DEVELOPER=`xcode-select -print-path` +SYMROOT="build" command -v autoreconf >/dev/null 2>&1 || { echo "In order to build this library you must have the autoreconf tool installed. It's available via homebrew."; exit 1; } @@ -24,6 +25,7 @@ buildIOS() { ARCH=$1 HOST="" + PREFIX="/tmp/servald" if [[ "${ARCH}" == "i386" ]]; then PLATFORM="iPhoneSimulator" @@ -33,6 +35,7 @@ buildIOS() else PLATFORM="iPhoneOS" HOST="--host=arm-apple-darwin" + PREFIX="/Library/servald" fi CROSS_TOP="${DEVELOPER}/Platforms/${PLATFORM}.platform/Developer" @@ -44,11 +47,11 @@ buildIOS() echo "=> Building libserval for ${PLATFORM} ${SDK_VERSION} ${ARCH}" - ./configure $HOST --prefix /tmp/serval &> "${PREFIX}/libserval-${ARCH}.log" || { echo "configure failed"; exit 1; } + ./configure $HOST --prefix $PREFIX &> "${SYMROOT}/libserval-${ARCH}.log" || { echo "configure failed"; exit 1; } - make libserval.a >> "${PREFIX}/libserval-${ARCH}.log" 2>&1 || { echo "make failed"; exit 1; } - cp libserval.a ${PREFIX}/libserval-${ARCH}.a - make clean >> "${PREFIX}/libserval-${ARCH}.log" 2>&1 || { echo "make clean failed"; exit 1; } + make libserval.a >> "${SYMROOT}/libserval-${ARCH}.log" 2>&1 || { echo "make failed"; exit 1; } + cp libserval.a ${SYMROOT}/libserval-${ARCH}.a + make clean >> "${SYMROOT}/libserval-${ARCH}.log" 2>&1 || { echo "make clean failed"; exit 1; } } @@ -58,13 +61,13 @@ buildIOS() if [[ $ACTION == "clean" ]]; then echo "=> Cleaning..." - rm ${PREFIX}/libserval.a 2> /dev/null - rm -rf ${PREFIX}/libserval-* 2> /dev/null - rm -rf ${PREFIX}/include 2> /dev/null + rm ${SYMROOT}/libserval.a 2> /dev/null + rm -rf ${SYMROOT}/libserval-* 2> /dev/null + rm -rf ${SYMROOT}/include 2> /dev/null exit fi -if [[ -f ${PREFIX}/libserval.a ]]; then +if [[ -f ${SYMROOT}/libserval.a ]]; then echo "libserval has already been built...skipping" exit fi @@ -72,7 +75,7 @@ fi # Generate configure autoreconf -f -i -mkdir -p ${PREFIX} +mkdir -p ${SYMROOT} for arch in ${ARCHS}; do buildIOS "${arch}" @@ -81,15 +84,15 @@ done echo "=> Building fat binary" lipo \ - "${PREFIX}/libserval-armv7.a" \ - "${PREFIX}/libserval-armv7s.a" \ - "${PREFIX}/libserval-arm64.a" \ - "${PREFIX}/libserval-i386.a" \ - "${PREFIX}/libserval-x86_64.a" \ - -create -output ${PREFIX}/libserval.a || { echo "failed building fat library"; exit 1; } + "${SYMROOT}/libserval-armv7.a" \ + "${SYMROOT}/libserval-armv7s.a" \ + "${SYMROOT}/libserval-arm64.a" \ + "${SYMROOT}/libserval-i386.a" \ + "${SYMROOT}/libserval-x86_64.a" \ + -create -output ${SYMROOT}/libserval.a || { echo "failed building fat library"; exit 1; } echo "=> Copying Headers" -mkdir -p ${PREFIX}/include -cp *.h ios/confdefs.h ${PREFIX}/include +mkdir -p ${SYMROOT}/include +cp *.h ios/confdefs.h ${SYMROOT}/include echo "=> Done" From 907ed556ff394a24b5ce14cf4dc7d150e2dcfaac Mon Sep 17 00:00:00 2001 From: James Moore Date: Sat, 12 Apr 2014 21:21:36 -0700 Subject: [PATCH 27/33] configuration file --- ios/serval.conf | 1 + 1 file changed, 1 insertion(+) create mode 100644 ios/serval.conf diff --git a/ios/serval.conf b/ios/serval.conf new file mode 100644 index 00000000..949484ec --- /dev/null +++ b/ios/serval.conf @@ -0,0 +1 @@ +debug.verbose=true From bf6ece8f2df1739856b8b14742591398f7f55df5 Mon Sep 17 00:00:00 2001 From: James Moore Date: Sun, 13 Apr 2014 12:58:44 -0700 Subject: [PATCH 28/33] better static lib support --- ios/libserval.xcodeproj/project.pbxproj | 1336 ++++++++++++++++++++++- ios/serval/serval-Prefix.pch | 11 + 2 files changed, 1307 insertions(+), 40 deletions(-) create mode 100644 ios/serval/serval-Prefix.pch diff --git a/ios/libserval.xcodeproj/project.pbxproj b/ios/libserval.xcodeproj/project.pbxproj index 37c9a78a..d09677b5 100644 --- a/ios/libserval.xcodeproj/project.pbxproj +++ b/ios/libserval.xcodeproj/project.pbxproj @@ -6,12 +6,185 @@ objectVersion = 46; objects = { +/* Begin PBXBuildFile section */ + 1A64168D18FADF2E00A769B2 /* cli.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64163418FADF2E00A769B2 /* cli.c */; }; + 1A64168E18FADF2E00A769B2 /* commandline.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64163518FADF2E00A769B2 /* commandline.c */; }; + 1A64168F18FADF2E00A769B2 /* conf_om.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64163618FADF2E00A769B2 /* conf_om.c */; }; + 1A64169018FADF2E00A769B2 /* conf_parse.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64163718FADF2E00A769B2 /* conf_parse.c */; }; + 1A64169118FADF2E00A769B2 /* conf_schema.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64163818FADF2E00A769B2 /* conf_schema.c */; }; + 1A64169218FADF2E00A769B2 /* conf.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64163918FADF2E00A769B2 /* conf.c */; }; + 1A64169418FADF2E00A769B2 /* context1.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64163B18FADF2E00A769B2 /* context1.c */; }; + 1A64169518FADF2E00A769B2 /* crypto.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64163C18FADF2E00A769B2 /* crypto.c */; }; + 1A64169618FADF2E00A769B2 /* dataformats.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64163D18FADF2E00A769B2 /* dataformats.c */; }; + 1A64169718FADF2E00A769B2 /* directory_client.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64163E18FADF2E00A769B2 /* directory_client.c */; }; + 1A64169918FADF2E00A769B2 /* dna_helper.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64164018FADF2E00A769B2 /* dna_helper.c */; }; + 1A64169B18FADF2E00A769B2 /* fdqueue.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64164218FADF2E00A769B2 /* fdqueue.c */; }; + 1A64169C18FADF2E00A769B2 /* fifo.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64164318FADF2E00A769B2 /* fifo.c */; }; + 1A64169D18FADF2E00A769B2 /* golay.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64164418FADF2E00A769B2 /* golay.c */; }; + 1A64169E18FADF2E00A769B2 /* http_server.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64164518FADF2E00A769B2 /* http_server.c */; }; + 1A64169F18FADF2E00A769B2 /* httpd.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64164618FADF2E00A769B2 /* httpd.c */; }; + 1A6416A018FADF2E00A769B2 /* instance.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64164718FADF2E00A769B2 /* instance.c */; }; + 1A6416A218FADF2E00A769B2 /* keyring.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64164918FADF2E00A769B2 /* keyring.c */; }; + 1A6416A318FADF2E00A769B2 /* log_util.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64164A18FADF2E00A769B2 /* log_util.c */; }; + 1A6416A418FADF2E00A769B2 /* log.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64164B18FADF2E00A769B2 /* log.c */; }; + 1A6416A518FADF2E00A769B2 /* lsif.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64164C18FADF2E00A769B2 /* lsif.c */; }; + 1A6416A618FADF2E00A769B2 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64164D18FADF2E00A769B2 /* main.c */; }; + 1A6416A718FADF2E00A769B2 /* mdp_client.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64164E18FADF2E00A769B2 /* mdp_client.c */; }; + 1A6416A818FADF2E00A769B2 /* mdp_filter.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64164F18FADF2E00A769B2 /* mdp_filter.c */; }; + 1A6416A918FADF2E00A769B2 /* mdp_net.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64165018FADF2E00A769B2 /* mdp_net.c */; }; + 1A6416AA18FADF2E00A769B2 /* mem.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64165118FADF2E00A769B2 /* mem.c */; }; + 1A6416AB18FADF2E00A769B2 /* meshms_restful.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64165218FADF2E00A769B2 /* meshms_restful.c */; }; + 1A6416AC18FADF2E00A769B2 /* meshms.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64165318FADF2E00A769B2 /* meshms.c */; }; + 1A6416AD18FADF2E00A769B2 /* monitor-cli.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64165418FADF2E00A769B2 /* monitor-cli.c */; }; + 1A6416AE18FADF2E00A769B2 /* monitor-client.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64165518FADF2E00A769B2 /* monitor-client.c */; }; + 1A6416AF18FADF2E00A769B2 /* monitor.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64165618FADF2E00A769B2 /* monitor.c */; }; + 1A6416B018FADF2E00A769B2 /* msp_client.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64165718FADF2E00A769B2 /* msp_client.c */; }; + 1A6416B118FADF2E00A769B2 /* msp_proxy.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64165818FADF2E00A769B2 /* msp_proxy.c */; }; + 1A6416B218FADF2E00A769B2 /* net.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64165918FADF2E00A769B2 /* net.c */; }; + 1A6416B318FADF2E00A769B2 /* nonce.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64165A18FADF2E00A769B2 /* nonce.c */; }; + 1A6416B418FADF2E00A769B2 /* os.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64165B18FADF2E00A769B2 /* os.c */; }; + 1A6416B518FADF2E00A769B2 /* overlay_address.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64165C18FADF2E00A769B2 /* overlay_address.c */; }; + 1A6416B618FADF2E00A769B2 /* overlay_buffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64165D18FADF2E00A769B2 /* overlay_buffer.c */; }; + 1A6416B718FADF2E00A769B2 /* overlay_interface.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64165E18FADF2E00A769B2 /* overlay_interface.c */; }; + 1A6416B818FADF2E00A769B2 /* overlay_link.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64165F18FADF2E00A769B2 /* overlay_link.c */; }; + 1A6416B918FADF2E00A769B2 /* overlay_mdp_services.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64166018FADF2E00A769B2 /* overlay_mdp_services.c */; }; + 1A6416BA18FADF2E00A769B2 /* overlay_mdp.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64166118FADF2E00A769B2 /* overlay_mdp.c */; }; + 1A6416BB18FADF2E00A769B2 /* overlay_olsr.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64166218FADF2E00A769B2 /* overlay_olsr.c */; }; + 1A6416BC18FADF2E00A769B2 /* overlay_packetformats.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64166318FADF2E00A769B2 /* overlay_packetformats.c */; }; + 1A6416BD18FADF2E00A769B2 /* overlay_packetradio.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64166418FADF2E00A769B2 /* overlay_packetradio.c */; }; + 1A6416BE18FADF2E00A769B2 /* overlay_payload.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64166518FADF2E00A769B2 /* overlay_payload.c */; }; + 1A6416BF18FADF2E00A769B2 /* overlay_queue.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64166618FADF2E00A769B2 /* overlay_queue.c */; }; + 1A6416C018FADF2E00A769B2 /* overlay.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64166718FADF2E00A769B2 /* overlay.c */; }; + 1A6416C118FADF2E00A769B2 /* performance_timing.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64166818FADF2E00A769B2 /* performance_timing.c */; }; + 1A6416C218FADF2E00A769B2 /* radio_link.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64166918FADF2E00A769B2 /* radio_link.c */; }; + 1A6416C318FADF2E00A769B2 /* randombytes.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64166A18FADF2E00A769B2 /* randombytes.c */; }; + 1A6416C418FADF2E00A769B2 /* rhizome_bundle.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64166B18FADF2E00A769B2 /* rhizome_bundle.c */; }; + 1A6416C518FADF2E00A769B2 /* rhizome_crypto.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64166C18FADF2E00A769B2 /* rhizome_crypto.c */; }; + 1A6416C618FADF2E00A769B2 /* rhizome_database.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64166D18FADF2E00A769B2 /* rhizome_database.c */; }; + 1A6416C718FADF2E00A769B2 /* rhizome_direct_http.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64166E18FADF2E00A769B2 /* rhizome_direct_http.c */; }; + 1A6416C818FADF2E00A769B2 /* rhizome_direct.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64166F18FADF2E00A769B2 /* rhizome_direct.c */; }; + 1A6416C918FADF2E00A769B2 /* rhizome_fetch.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64167018FADF2E00A769B2 /* rhizome_fetch.c */; }; + 1A6416CA18FADF2E00A769B2 /* rhizome_http.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64167118FADF2E00A769B2 /* rhizome_http.c */; }; + 1A6416CB18FADF2E00A769B2 /* rhizome_packetformats.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64167218FADF2E00A769B2 /* rhizome_packetformats.c */; }; + 1A6416CC18FADF2E00A769B2 /* rhizome_restful.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64167318FADF2E00A769B2 /* rhizome_restful.c */; }; + 1A6416CD18FADF2E00A769B2 /* rhizome_store.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64167418FADF2E00A769B2 /* rhizome_store.c */; }; + 1A6416CE18FADF2E00A769B2 /* rhizome_sync.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64167518FADF2E00A769B2 /* rhizome_sync.c */; }; + 1A6416CF18FADF2E00A769B2 /* rhizome.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64167618FADF2E00A769B2 /* rhizome.c */; }; + 1A6416D018FADF2E00A769B2 /* rotbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64167718FADF2E00A769B2 /* rotbuf.c */; }; + 1A6416D118FADF2E00A769B2 /* route_link.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64167818FADF2E00A769B2 /* route_link.c */; }; + 1A6416D218FADF2E00A769B2 /* serval_packetvisualise.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64167918FADF2E00A769B2 /* serval_packetvisualise.c */; }; + 1A6416D418FADF2E00A769B2 /* server.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64167B18FADF2E00A769B2 /* server.c */; }; + 1A6416D518FADF2E00A769B2 /* sha2.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64167C18FADF2E00A769B2 /* sha2.c */; }; + 1A6416D618FADF2E00A769B2 /* sighandlers.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64167D18FADF2E00A769B2 /* sighandlers.c */; }; + 1A6416D718FADF2E00A769B2 /* socket.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64167E18FADF2E00A769B2 /* socket.c */; }; + 1A6416D818FADF2E00A769B2 /* srandomdev.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64167F18FADF2E00A769B2 /* srandomdev.c */; }; + 1A6416D918FADF2E00A769B2 /* str.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64168018FADF2E00A769B2 /* str.c */; }; + 1A6416DA18FADF2E00A769B2 /* strbuf_helpers.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64168118FADF2E00A769B2 /* strbuf_helpers.c */; }; + 1A6416DB18FADF2E00A769B2 /* strbuf.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64168218FADF2E00A769B2 /* strbuf.c */; }; + 1A6416DC18FADF2E00A769B2 /* strlcpy.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64168318FADF2E00A769B2 /* strlcpy.c */; }; + 1A6416E018FADF2E00A769B2 /* uuid.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64168718FADF2E00A769B2 /* uuid.c */; }; + 1A6416E118FADF2E00A769B2 /* version_servald.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64168818FADF2E00A769B2 /* version_servald.c */; }; + 1A6416E218FADF2E00A769B2 /* vomp_console.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64168918FADF2E00A769B2 /* vomp_console.c */; }; + 1A6416E318FADF2E00A769B2 /* vomp.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64168A18FADF2E00A769B2 /* vomp.c */; }; + 1A6416E418FADF2E00A769B2 /* xprintf.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64168B18FADF2E00A769B2 /* xprintf.c */; }; + 1A6416E918FADF4A00A769B2 /* encode.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A6416E618FADF4A00A769B2 /* encode.c */; }; + 1A6416EA18FADF4A00A769B2 /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A6416E718FADF4A00A769B2 /* sqlite3.c */; }; + 1A6417CB18FADF6800A769B2 /* hmac.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64170B18FADF6800A769B2 /* hmac.c */; }; + 1A6417CC18FADF6800A769B2 /* verify.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64170C18FADF6800A769B2 /* verify.c */; }; + 1A6417CD18FADF6800A769B2 /* hmac.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64171018FADF6800A769B2 /* hmac.c */; }; + 1A6417CE18FADF6800A769B2 /* verify.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64171118FADF6800A769B2 /* verify.c */; }; + 1A6417CF18FADF6800A769B2 /* after.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64171318FADF6800A769B2 /* after.c */; }; + 1A6417D018FADF6800A769B2 /* before.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64171518FADF6800A769B2 /* before.c */; }; + 1A6417D118FADF6800A769B2 /* box.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64171618FADF6800A769B2 /* box.c */; }; + 1A6417D218FADF6800A769B2 /* keypair.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64171818FADF6800A769B2 /* keypair.c */; }; + 1A6417D318FADF6800A769B2 /* core.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64171B18FADF6800A769B2 /* core.c */; }; + 1A6417D418FADF6800A769B2 /* core.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64172018FADF6800A769B2 /* core.c */; }; + 1A6417D518FADF6800A769B2 /* core.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64172518FADF6800A769B2 /* core.c */; }; + 1A6417D618FADF6800A769B2 /* core.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64172A18FADF6800A769B2 /* core.c */; }; + 1A6417D718FADF6800A769B2 /* hash.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64173018FADF6800A769B2 /* hash.c */; }; + 1A6417D818FADF6800A769B2 /* hash.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64173518FADF6800A769B2 /* hash.c */; }; + 1A6417D918FADF6800A769B2 /* blocks.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64173918FADF6800A769B2 /* blocks.c */; }; + 1A6417DA18FADF6800A769B2 /* blocks.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64173E18FADF6800A769B2 /* blocks.c */; }; + 1A6417DB18FADF6800A769B2 /* auth.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64174318FADF6800A769B2 /* auth.c */; }; + 1A6417DC18FADF6800A769B2 /* verify.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64174518FADF6800A769B2 /* verify.c */; }; + 1A6417DD18FADF6800A769B2 /* base.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64174818FADF6800A769B2 /* base.c */; }; + 1A6417DE18FADF6800A769B2 /* smult.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64174B18FADF6800A769B2 /* smult.c */; }; + 1A6417DF18FADF6800A769B2 /* box.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64174E18FADF6800A769B2 /* box.c */; }; + 1A64180B18FADF6800A769B2 /* stream.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A6417AB18FADF6800A769B2 /* stream.c */; }; + 1A64180C18FADF6800A769B2 /* xor.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A6417AC18FADF6800A769B2 /* xor.c */; }; + 1A64180D18FADF6800A769B2 /* stream.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A6417B118FADF6800A769B2 /* stream.c */; }; + 1A64180E18FADF6800A769B2 /* xor.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A6417B218FADF6800A769B2 /* xor.c */; }; + 1A64180F18FADF6800A769B2 /* stream.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A6417B718FADF6800A769B2 /* stream.c */; }; + 1A64181018FADF6800A769B2 /* xor.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A6417B818FADF6800A769B2 /* xor.c */; }; + 1A64181118FADF6800A769B2 /* stream.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A6417BD18FADF6800A769B2 /* stream.c */; }; + 1A64181218FADF6800A769B2 /* xor.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A6417BE18FADF6800A769B2 /* xor.c */; }; + 1A64181318FADF6800A769B2 /* verify.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A6417C218FADF6800A769B2 /* verify.c */; }; + 1A64181418FADF6800A769B2 /* verify.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A6417C618FADF6800A769B2 /* verify.c */; }; + 1A64181518FADF6800A769B2 /* PROTOTYPES.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A6417C918FADF6800A769B2 /* PROTOTYPES.c */; }; + 1A64182918FB17EC00A769B2 /* ccsds_tables.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64181B18FB17C900A769B2 /* ccsds_tables.c */; }; + 1A64182A18FB17EC00A769B2 /* decode_rs_8.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64181E18FB17C900A769B2 /* decode_rs_8.c */; }; + 1A64182B18FB17EC00A769B2 /* encode_rs_8.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64182018FB17C900A769B2 /* encode_rs_8.c */; }; + 1A64182C18FB17F000A769B2 /* init_rs_char.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64182518FB17C900A769B2 /* init_rs_char.c */; }; + 1A64183018FB1C7600A769B2 /* fe_0.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64176718FADF6800A769B2 /* fe_0.c */; }; + 1A64183118FB1C7600A769B2 /* fe_1.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64176818FADF6800A769B2 /* fe_1.c */; }; + 1A64183218FB1CC400A769B2 /* fe_add.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64176918FADF6800A769B2 /* fe_add.c */; }; + 1A64183318FB1CC400A769B2 /* fe_cmov.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64176A18FADF6800A769B2 /* fe_cmov.c */; }; + 1A64183418FB1CC400A769B2 /* fe_copy.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64176B18FADF6800A769B2 /* fe_copy.c */; }; + 1A64183518FB1CC400A769B2 /* fe_frombytes.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64176C18FADF6800A769B2 /* fe_frombytes.c */; }; + 1A64183618FB1CC400A769B2 /* fe_invert.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64176D18FADF6800A769B2 /* fe_invert.c */; }; + 1A64183718FB1CC400A769B2 /* fe_isnegative.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64176E18FADF6800A769B2 /* fe_isnegative.c */; }; + 1A64183818FB1CC400A769B2 /* fe_isnonzero.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64176F18FADF6800A769B2 /* fe_isnonzero.c */; }; + 1A64183918FB1CC400A769B2 /* fe_mul.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64177018FADF6800A769B2 /* fe_mul.c */; }; + 1A64183A18FB1CC400A769B2 /* fe_neg.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64177118FADF6800A769B2 /* fe_neg.c */; }; + 1A64183B18FB1CC400A769B2 /* fe_pow22523.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64177218FADF6800A769B2 /* fe_pow22523.c */; }; + 1A64183C18FB1CC400A769B2 /* fe_sq.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64177318FADF6800A769B2 /* fe_sq.c */; }; + 1A64183D18FB1CC400A769B2 /* fe_sq2.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64177418FADF6800A769B2 /* fe_sq2.c */; }; + 1A64183E18FB1CC400A769B2 /* fe_sub.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64177518FADF6800A769B2 /* fe_sub.c */; }; + 1A64183F18FB1CC400A769B2 /* fe_tobytes.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64177618FADF6800A769B2 /* fe_tobytes.c */; }; + 1A64184018FB1CC400A769B2 /* ge25519.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64177818FADF6800A769B2 /* ge25519.c */; }; + 1A64184118FB1CC400A769B2 /* ge_add.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64177B18FADF6800A769B2 /* ge_add.c */; }; + 1A64184218FB1CC400A769B2 /* ge_double_scalarmult.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64177E18FADF6800A769B2 /* ge_double_scalarmult.c */; }; + 1A64184318FB1CC400A769B2 /* ge_frombytes.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64177F18FADF6800A769B2 /* ge_frombytes.c */; }; + 1A64184418FB1CC400A769B2 /* ge_madd.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64178018FADF6800A769B2 /* ge_madd.c */; }; + 1A64184518FB1CC400A769B2 /* ge_msub.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64178318FADF6800A769B2 /* ge_msub.c */; }; + 1A64184618FB1CC400A769B2 /* ge_p1p1_to_p2.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64178618FADF6800A769B2 /* ge_p1p1_to_p2.c */; }; + 1A64184718FB1CC400A769B2 /* ge_p1p1_to_p3.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64178718FADF6800A769B2 /* ge_p1p1_to_p3.c */; }; + 1A64184818FB1CC400A769B2 /* ge_p2_0.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64178818FADF6800A769B2 /* ge_p2_0.c */; }; + 1A64184918FB1CC400A769B2 /* ge_p2_dbl.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64178918FADF6800A769B2 /* ge_p2_dbl.c */; }; + 1A64184A18FB1CC400A769B2 /* ge_p3_0.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64178C18FADF6800A769B2 /* ge_p3_0.c */; }; + 1A64184B18FB1CC400A769B2 /* ge_p3_dbl.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64178D18FADF6800A769B2 /* ge_p3_dbl.c */; }; + 1A64184C18FB1CC400A769B2 /* ge_p3_to_cached.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64178E18FADF6800A769B2 /* ge_p3_to_cached.c */; }; + 1A64184D18FB1CC400A769B2 /* ge_p3_to_p2.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64178F18FADF6800A769B2 /* ge_p3_to_p2.c */; }; + 1A64184E18FB1CC400A769B2 /* ge_p3_tobytes.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64179018FADF6800A769B2 /* ge_p3_tobytes.c */; }; + 1A64184F18FB1CC400A769B2 /* ge_precomp_0.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64179118FADF6800A769B2 /* ge_precomp_0.c */; }; + 1A64185018FB1CC400A769B2 /* ge_scalarmult_base.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64179218FADF6800A769B2 /* ge_scalarmult_base.c */; }; + 1A64185118FB1CC400A769B2 /* ge_sub.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64179318FADF6800A769B2 /* ge_sub.c */; }; + 1A64185218FB1CC400A769B2 /* ge_tobytes.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64179618FADF6800A769B2 /* ge_tobytes.c */; }; + 1A64185318FB1CC400A769B2 /* keypair.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64179818FADF6800A769B2 /* keypair.c */; }; + 1A64185418FB1CC400A769B2 /* open.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A64179918FADF6800A769B2 /* open.c */; }; + 1A64185518FB1CC400A769B2 /* sc25519.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A6417A018FADF6800A769B2 /* sc25519.c */; }; + 1A64185618FB1CC400A769B2 /* sc_muladd.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A6417A218FADF6800A769B2 /* sc_muladd.c */; }; + 1A64185718FB1CC400A769B2 /* sc_reduce.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A6417A318FADF6800A769B2 /* sc_reduce.c */; }; + 1A64185818FB1CC400A769B2 /* sign.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A6417A418FADF6800A769B2 /* sign.c */; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 1A64160A18FADE6500A769B2 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = "include/$(PRODUCT_NAME)"; + dstSubfolderSpec = 16; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ - 1A09828C18F0B8E200C4652C /* libserval.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libserval.a; path = ../build/libserval.a; sourceTree = ""; }; 1A13A3DA18F0CD9B00A6233B /* cli.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cli.h; path = ../build/include/cli.h; sourceTree = ""; }; 1A13A3DB18F0CD9B00A6233B /* conf_schema.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = conf_schema.h; path = ../build/include/conf_schema.h; sourceTree = ""; }; 1A13A3DC18F0CD9B00A6233B /* conf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = conf.h; path = ../build/include/conf.h; sourceTree = ""; }; - 1A13A3DD18F0CD9B00A6233B /* confdefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = confdefs.h; path = ../build/include/confdefs.h; sourceTree = ""; }; + 1A13A3DD18F0CD9B00A6233B /* confdefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = confdefs.h; path = ../../build/include/confdefs.h; sourceTree = ""; }; 1A13A3DE18F0CD9B00A6233B /* constants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = constants.h; path = ../build/include/constants.h; sourceTree = ""; }; 1A13A3DF18F0CD9B00A6233B /* crypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = crypto.h; path = ../build/include/crypto.h; sourceTree = ""; }; 1A13A3E018F0CD9B00A6233B /* dataformats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dataformats.h; path = ../build/include/dataformats.h; sourceTree = ""; }; @@ -46,35 +219,318 @@ 1A13A3FD18F0CD9B00A6233B /* strlcpy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = strlcpy.h; path = ../build/include/strlcpy.h; sourceTree = ""; }; 1A13A3FE18F0CD9B00A6233B /* uuid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = uuid.h; path = ../build/include/uuid.h; sourceTree = ""; }; 1A13A3FF18F0CD9B00A6233B /* xprintf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xprintf.h; path = ../build/include/xprintf.h; sourceTree = ""; }; - 1A5334BE18F087CF00C7BD93 /* build.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = build.sh; sourceTree = ""; }; + 1A64160C18FADE6500A769B2 /* libserval.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libserval.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 1A64161218FADE6500A769B2 /* serval-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "serval-Prefix.pch"; sourceTree = ""; }; + 1A64163418FADF2E00A769B2 /* cli.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cli.c; path = ../../cli.c; sourceTree = ""; }; + 1A64163518FADF2E00A769B2 /* commandline.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = commandline.c; path = ../../commandline.c; sourceTree = ""; }; + 1A64163618FADF2E00A769B2 /* conf_om.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = conf_om.c; path = ../../conf_om.c; sourceTree = ""; }; + 1A64163718FADF2E00A769B2 /* conf_parse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = conf_parse.c; path = ../../conf_parse.c; sourceTree = ""; }; + 1A64163818FADF2E00A769B2 /* conf_schema.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = conf_schema.c; path = ../../conf_schema.c; sourceTree = ""; }; + 1A64163918FADF2E00A769B2 /* conf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = conf.c; path = ../../conf.c; sourceTree = ""; }; + 1A64163B18FADF2E00A769B2 /* context1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = context1.c; path = ../../context1.c; sourceTree = ""; }; + 1A64163C18FADF2E00A769B2 /* crypto.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = crypto.c; path = ../../crypto.c; sourceTree = ""; }; + 1A64163D18FADF2E00A769B2 /* dataformats.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dataformats.c; path = ../../dataformats.c; sourceTree = ""; }; + 1A64163E18FADF2E00A769B2 /* directory_client.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = directory_client.c; path = ../../directory_client.c; sourceTree = ""; }; + 1A64164018FADF2E00A769B2 /* dna_helper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dna_helper.c; path = ../../dna_helper.c; sourceTree = ""; }; + 1A64164218FADF2E00A769B2 /* fdqueue.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fdqueue.c; path = ../../fdqueue.c; sourceTree = ""; }; + 1A64164318FADF2E00A769B2 /* fifo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fifo.c; path = ../../fifo.c; sourceTree = ""; }; + 1A64164418FADF2E00A769B2 /* golay.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = golay.c; path = ../../golay.c; sourceTree = ""; }; + 1A64164518FADF2E00A769B2 /* http_server.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = http_server.c; path = ../../http_server.c; sourceTree = ""; }; + 1A64164618FADF2E00A769B2 /* httpd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = httpd.c; path = ../../httpd.c; sourceTree = ""; }; + 1A64164718FADF2E00A769B2 /* instance.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = instance.c; path = ../../instance.c; sourceTree = ""; }; + 1A64164918FADF2E00A769B2 /* keyring.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = keyring.c; path = ../../keyring.c; sourceTree = ""; }; + 1A64164A18FADF2E00A769B2 /* log_util.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = log_util.c; path = ../../log_util.c; sourceTree = ""; }; + 1A64164B18FADF2E00A769B2 /* log.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = log.c; path = ../../log.c; sourceTree = ""; }; + 1A64164C18FADF2E00A769B2 /* lsif.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = lsif.c; path = ../../lsif.c; sourceTree = ""; }; + 1A64164D18FADF2E00A769B2 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = ../../main.c; sourceTree = ""; }; + 1A64164E18FADF2E00A769B2 /* mdp_client.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mdp_client.c; path = ../../mdp_client.c; sourceTree = ""; }; + 1A64164F18FADF2E00A769B2 /* mdp_filter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mdp_filter.c; path = ../../mdp_filter.c; sourceTree = ""; }; + 1A64165018FADF2E00A769B2 /* mdp_net.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mdp_net.c; path = ../../mdp_net.c; sourceTree = ""; }; + 1A64165118FADF2E00A769B2 /* mem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mem.c; path = ../../mem.c; sourceTree = ""; }; + 1A64165218FADF2E00A769B2 /* meshms_restful.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = meshms_restful.c; path = ../../meshms_restful.c; sourceTree = ""; }; + 1A64165318FADF2E00A769B2 /* meshms.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = meshms.c; path = ../../meshms.c; sourceTree = ""; }; + 1A64165418FADF2E00A769B2 /* monitor-cli.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "monitor-cli.c"; path = "../../monitor-cli.c"; sourceTree = ""; }; + 1A64165518FADF2E00A769B2 /* monitor-client.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = "monitor-client.c"; path = "../../monitor-client.c"; sourceTree = ""; }; + 1A64165618FADF2E00A769B2 /* monitor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = monitor.c; path = ../../monitor.c; sourceTree = ""; }; + 1A64165718FADF2E00A769B2 /* msp_client.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = msp_client.c; path = ../../msp_client.c; sourceTree = ""; }; + 1A64165818FADF2E00A769B2 /* msp_proxy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = msp_proxy.c; path = ../../msp_proxy.c; sourceTree = ""; }; + 1A64165918FADF2E00A769B2 /* net.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = net.c; path = ../../net.c; sourceTree = ""; }; + 1A64165A18FADF2E00A769B2 /* nonce.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = nonce.c; path = ../../nonce.c; sourceTree = ""; }; + 1A64165B18FADF2E00A769B2 /* os.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = os.c; path = ../../os.c; sourceTree = ""; }; + 1A64165C18FADF2E00A769B2 /* overlay_address.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = overlay_address.c; path = ../../overlay_address.c; sourceTree = ""; }; + 1A64165D18FADF2E00A769B2 /* overlay_buffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = overlay_buffer.c; path = ../../overlay_buffer.c; sourceTree = ""; }; + 1A64165E18FADF2E00A769B2 /* overlay_interface.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = overlay_interface.c; path = ../../overlay_interface.c; sourceTree = ""; }; + 1A64165F18FADF2E00A769B2 /* overlay_link.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = overlay_link.c; path = ../../overlay_link.c; sourceTree = ""; }; + 1A64166018FADF2E00A769B2 /* overlay_mdp_services.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = overlay_mdp_services.c; path = ../../overlay_mdp_services.c; sourceTree = ""; }; + 1A64166118FADF2E00A769B2 /* overlay_mdp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = overlay_mdp.c; path = ../../overlay_mdp.c; sourceTree = ""; }; + 1A64166218FADF2E00A769B2 /* overlay_olsr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = overlay_olsr.c; path = ../../overlay_olsr.c; sourceTree = ""; }; + 1A64166318FADF2E00A769B2 /* overlay_packetformats.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = overlay_packetformats.c; path = ../../overlay_packetformats.c; sourceTree = ""; }; + 1A64166418FADF2E00A769B2 /* overlay_packetradio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = overlay_packetradio.c; path = ../../overlay_packetradio.c; sourceTree = ""; }; + 1A64166518FADF2E00A769B2 /* overlay_payload.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = overlay_payload.c; path = ../../overlay_payload.c; sourceTree = ""; }; + 1A64166618FADF2E00A769B2 /* overlay_queue.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = overlay_queue.c; path = ../../overlay_queue.c; sourceTree = ""; }; + 1A64166718FADF2E00A769B2 /* overlay.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = overlay.c; path = ../../overlay.c; sourceTree = ""; }; + 1A64166818FADF2E00A769B2 /* performance_timing.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = performance_timing.c; path = ../../performance_timing.c; sourceTree = ""; }; + 1A64166918FADF2E00A769B2 /* radio_link.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = radio_link.c; path = ../../radio_link.c; sourceTree = ""; }; + 1A64166A18FADF2E00A769B2 /* randombytes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = randombytes.c; path = ../../randombytes.c; sourceTree = ""; }; + 1A64166B18FADF2E00A769B2 /* rhizome_bundle.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rhizome_bundle.c; path = ../../rhizome_bundle.c; sourceTree = ""; }; + 1A64166C18FADF2E00A769B2 /* rhizome_crypto.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rhizome_crypto.c; path = ../../rhizome_crypto.c; sourceTree = ""; }; + 1A64166D18FADF2E00A769B2 /* rhizome_database.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rhizome_database.c; path = ../../rhizome_database.c; sourceTree = ""; }; + 1A64166E18FADF2E00A769B2 /* rhizome_direct_http.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rhizome_direct_http.c; path = ../../rhizome_direct_http.c; sourceTree = ""; }; + 1A64166F18FADF2E00A769B2 /* rhizome_direct.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rhizome_direct.c; path = ../../rhizome_direct.c; sourceTree = ""; }; + 1A64167018FADF2E00A769B2 /* rhizome_fetch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rhizome_fetch.c; path = ../../rhizome_fetch.c; sourceTree = ""; }; + 1A64167118FADF2E00A769B2 /* rhizome_http.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rhizome_http.c; path = ../../rhizome_http.c; sourceTree = ""; }; + 1A64167218FADF2E00A769B2 /* rhizome_packetformats.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rhizome_packetformats.c; path = ../../rhizome_packetformats.c; sourceTree = ""; }; + 1A64167318FADF2E00A769B2 /* rhizome_restful.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rhizome_restful.c; path = ../../rhizome_restful.c; sourceTree = ""; }; + 1A64167418FADF2E00A769B2 /* rhizome_store.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rhizome_store.c; path = ../../rhizome_store.c; sourceTree = ""; }; + 1A64167518FADF2E00A769B2 /* rhizome_sync.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rhizome_sync.c; path = ../../rhizome_sync.c; sourceTree = ""; }; + 1A64167618FADF2E00A769B2 /* rhizome.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rhizome.c; path = ../../rhizome.c; sourceTree = ""; }; + 1A64167718FADF2E00A769B2 /* rotbuf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rotbuf.c; path = ../../rotbuf.c; sourceTree = ""; }; + 1A64167818FADF2E00A769B2 /* route_link.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = route_link.c; path = ../../route_link.c; sourceTree = ""; }; + 1A64167918FADF2E00A769B2 /* serval_packetvisualise.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = serval_packetvisualise.c; path = ../../serval_packetvisualise.c; sourceTree = ""; }; + 1A64167B18FADF2E00A769B2 /* server.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = server.c; path = ../../server.c; sourceTree = ""; }; + 1A64167C18FADF2E00A769B2 /* sha2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sha2.c; path = ../../sha2.c; sourceTree = ""; }; + 1A64167D18FADF2E00A769B2 /* sighandlers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sighandlers.c; path = ../../sighandlers.c; sourceTree = ""; }; + 1A64167E18FADF2E00A769B2 /* socket.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = socket.c; path = ../../socket.c; sourceTree = ""; }; + 1A64167F18FADF2E00A769B2 /* srandomdev.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = srandomdev.c; path = ../../srandomdev.c; sourceTree = ""; }; + 1A64168018FADF2E00A769B2 /* str.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = str.c; path = ../../str.c; sourceTree = ""; }; + 1A64168118FADF2E00A769B2 /* strbuf_helpers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = strbuf_helpers.c; path = ../../strbuf_helpers.c; sourceTree = ""; }; + 1A64168218FADF2E00A769B2 /* strbuf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = strbuf.c; path = ../../strbuf.c; sourceTree = ""; }; + 1A64168318FADF2E00A769B2 /* strlcpy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = strlcpy.c; path = ../../strlcpy.c; sourceTree = ""; }; + 1A64168718FADF2E00A769B2 /* uuid.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = uuid.c; path = ../../uuid.c; sourceTree = ""; }; + 1A64168818FADF2E00A769B2 /* version_servald.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = version_servald.c; path = ../../version_servald.c; sourceTree = ""; }; + 1A64168918FADF2E00A769B2 /* vomp_console.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vomp_console.c; path = ../../vomp_console.c; sourceTree = ""; }; + 1A64168A18FADF2E00A769B2 /* vomp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vomp.c; path = ../../vomp.c; sourceTree = ""; }; + 1A64168B18FADF2E00A769B2 /* xprintf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = xprintf.c; path = ../../xprintf.c; sourceTree = ""; }; + 1A6416E618FADF4A00A769B2 /* encode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = encode.c; path = "../../sqlite-amalgamation-3070900/encode.c"; sourceTree = ""; }; + 1A6416E718FADF4A00A769B2 /* sqlite3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sqlite3.c; sourceTree = ""; }; + 1A6416E818FADF4A00A769B2 /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqlite3.h; sourceTree = ""; }; + 1A6416ED18FADF6800A769B2 /* api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = api.h; sourceTree = ""; }; + 1A6416EE18FADF6800A769B2 /* crypto_auth_hmacsha256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_auth_hmacsha256.h; sourceTree = ""; }; + 1A6416EF18FADF6800A769B2 /* crypto_auth_hmacsha512256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_auth_hmacsha512256.h; sourceTree = ""; }; + 1A6416F018FADF6800A769B2 /* crypto_box_curve25519xsalsa20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_box_curve25519xsalsa20poly1305.h; sourceTree = ""; }; + 1A6416F118FADF6800A769B2 /* crypto_core_hsalsa20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_hsalsa20.h; sourceTree = ""; }; + 1A6416F218FADF6800A769B2 /* crypto_core_salsa20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_salsa20.h; sourceTree = ""; }; + 1A6416F318FADF6800A769B2 /* crypto_core_salsa2012.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_salsa2012.h; sourceTree = ""; }; + 1A6416F418FADF6800A769B2 /* crypto_core_salsa208.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core_salsa208.h; sourceTree = ""; }; + 1A6416F518FADF6800A769B2 /* crypto_hash_sha256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_hash_sha256.h; sourceTree = ""; }; + 1A6416F618FADF6800A769B2 /* crypto_hash_sha512.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_hash_sha512.h; sourceTree = ""; }; + 1A6416F718FADF6800A769B2 /* crypto_hashblocks_sha256.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_hashblocks_sha256.h; sourceTree = ""; }; + 1A6416F818FADF6800A769B2 /* crypto_hashblocks_sha512.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_hashblocks_sha512.h; sourceTree = ""; }; + 1A6416F918FADF6800A769B2 /* crypto_onetimeauth_poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_onetimeauth_poly1305.h; sourceTree = ""; }; + 1A6416FA18FADF6800A769B2 /* crypto_scalarmult_curve25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_scalarmult_curve25519.h; sourceTree = ""; }; + 1A6416FB18FADF6800A769B2 /* crypto_secretbox_xsalsa20poly1305.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_secretbox_xsalsa20poly1305.h; sourceTree = ""; }; + 1A6416FC18FADF6800A769B2 /* crypto_sign_edwards25519sha512batch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_sign_edwards25519sha512batch.h; sourceTree = ""; }; + 1A6416FD18FADF6800A769B2 /* crypto_stream_salsa20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_salsa20.h; sourceTree = ""; }; + 1A6416FE18FADF6800A769B2 /* crypto_stream_salsa2012.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_salsa2012.h; sourceTree = ""; }; + 1A6416FF18FADF6800A769B2 /* crypto_stream_salsa208.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_salsa208.h; sourceTree = ""; }; + 1A64170018FADF6800A769B2 /* crypto_stream_xsalsa20.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream_xsalsa20.h; sourceTree = ""; }; + 1A64170118FADF6800A769B2 /* crypto_uint32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_uint32.h; sourceTree = ""; }; + 1A64170218FADF6800A769B2 /* crypto_verify_16.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_verify_16.h; sourceTree = ""; }; + 1A64170318FADF6800A769B2 /* crypto_verify_32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_verify_32.h; sourceTree = ""; }; + 1A64170418FADF6800A769B2 /* nacl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nacl.h; sourceTree = ""; }; + 1A64170518FADF6800A769B2 /* randombytes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = randombytes.h; sourceTree = ""; }; + 1A64170918FADF6800A769B2 /* api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = api.h; sourceTree = ""; }; + 1A64170A18FADF6800A769B2 /* crypto_auth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_auth.h; sourceTree = ""; }; + 1A64170B18FADF6800A769B2 /* hmac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hmac.c; sourceTree = ""; }; + 1A64170C18FADF6800A769B2 /* verify.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = verify.c; sourceTree = ""; }; + 1A64170E18FADF6800A769B2 /* api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = api.h; sourceTree = ""; }; + 1A64170F18FADF6800A769B2 /* crypto_auth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_auth.h; sourceTree = ""; }; + 1A64171018FADF6800A769B2 /* hmac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hmac.c; sourceTree = ""; }; + 1A64171118FADF6800A769B2 /* verify.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = verify.c; sourceTree = ""; }; + 1A64171318FADF6800A769B2 /* after.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = after.c; sourceTree = ""; }; + 1A64171418FADF6800A769B2 /* api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = api.h; sourceTree = ""; }; + 1A64171518FADF6800A769B2 /* before.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = before.c; sourceTree = ""; }; + 1A64171618FADF6800A769B2 /* box.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = box.c; sourceTree = ""; }; + 1A64171718FADF6800A769B2 /* crypto_box.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_box.h; sourceTree = ""; }; + 1A64171818FADF6800A769B2 /* keypair.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = keypair.c; sourceTree = ""; }; + 1A64171A18FADF6800A769B2 /* api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = api.h; sourceTree = ""; }; + 1A64171B18FADF6800A769B2 /* core.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = core.c; sourceTree = ""; }; + 1A64171C18FADF6800A769B2 /* crypto_core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core.h; sourceTree = ""; }; + 1A64171D18FADF6800A769B2 /* implementors */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = implementors; sourceTree = ""; }; + 1A64171F18FADF6800A769B2 /* api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = api.h; sourceTree = ""; }; + 1A64172018FADF6800A769B2 /* core.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = core.c; sourceTree = ""; }; + 1A64172118FADF6800A769B2 /* crypto_core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core.h; sourceTree = ""; }; + 1A64172218FADF6800A769B2 /* implementors */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = implementors; sourceTree = ""; }; + 1A64172418FADF6800A769B2 /* api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = api.h; sourceTree = ""; }; + 1A64172518FADF6800A769B2 /* core.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = core.c; sourceTree = ""; }; + 1A64172618FADF6800A769B2 /* crypto_core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core.h; sourceTree = ""; }; + 1A64172718FADF6800A769B2 /* implementors */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = implementors; sourceTree = ""; }; + 1A64172918FADF6800A769B2 /* api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = api.h; sourceTree = ""; }; + 1A64172A18FADF6800A769B2 /* core.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = core.c; sourceTree = ""; }; + 1A64172B18FADF6800A769B2 /* crypto_core.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_core.h; sourceTree = ""; }; + 1A64172C18FADF6800A769B2 /* implementors */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = implementors; sourceTree = ""; }; + 1A64172E18FADF6800A769B2 /* api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = api.h; sourceTree = ""; }; + 1A64172F18FADF6800A769B2 /* crypto_hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_hash.h; sourceTree = ""; }; + 1A64173018FADF6800A769B2 /* hash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hash.c; sourceTree = ""; }; + 1A64173118FADF6800A769B2 /* implementors */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = implementors; sourceTree = ""; }; + 1A64173318FADF6800A769B2 /* api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = api.h; sourceTree = ""; }; + 1A64173418FADF6800A769B2 /* crypto_hash.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_hash.h; sourceTree = ""; }; + 1A64173518FADF6800A769B2 /* hash.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hash.c; sourceTree = ""; }; + 1A64173618FADF6800A769B2 /* implementors */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = implementors; sourceTree = ""; }; + 1A64173818FADF6800A769B2 /* api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = api.h; sourceTree = ""; }; + 1A64173918FADF6800A769B2 /* blocks.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = blocks.c; sourceTree = ""; }; + 1A64173A18FADF6800A769B2 /* crypto_hashblocks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_hashblocks.h; sourceTree = ""; }; + 1A64173B18FADF6800A769B2 /* implementors */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = implementors; sourceTree = ""; }; + 1A64173D18FADF6800A769B2 /* api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = api.h; sourceTree = ""; }; + 1A64173E18FADF6800A769B2 /* blocks.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = blocks.c; sourceTree = ""; }; + 1A64173F18FADF6800A769B2 /* crypto_hashblocks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_hashblocks.h; sourceTree = ""; }; + 1A64174018FADF6800A769B2 /* implementors */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = implementors; sourceTree = ""; }; + 1A64174218FADF6800A769B2 /* api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = api.h; sourceTree = ""; }; + 1A64174318FADF6800A769B2 /* auth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = auth.c; sourceTree = ""; }; + 1A64174418FADF6800A769B2 /* crypto_onetimeauth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_onetimeauth.h; sourceTree = ""; }; + 1A64174518FADF6800A769B2 /* verify.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = verify.c; sourceTree = ""; }; + 1A64174718FADF6800A769B2 /* api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = api.h; sourceTree = ""; }; + 1A64174818FADF6800A769B2 /* base.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = base.c; sourceTree = ""; }; + 1A64174918FADF6800A769B2 /* crypto_scalarmult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_scalarmult.h; sourceTree = ""; }; + 1A64174A18FADF6800A769B2 /* implementors */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = implementors; sourceTree = ""; }; + 1A64174B18FADF6800A769B2 /* smult.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = smult.c; sourceTree = ""; }; + 1A64174D18FADF6800A769B2 /* api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = api.h; sourceTree = ""; }; + 1A64174E18FADF6800A769B2 /* box.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = box.c; sourceTree = ""; }; + 1A64174F18FADF6800A769B2 /* crypto_secretbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_secretbox.h; sourceTree = ""; }; + 1A64175118FADF6800A769B2 /* api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = api.h; sourceTree = ""; }; + 1A64175218FADF6800A769B2 /* base.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = base.h; sourceTree = ""; }; + 1A64175318FADF6800A769B2 /* base.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = base.py; sourceTree = ""; }; + 1A64175418FADF6800A769B2 /* base2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = base2.h; sourceTree = ""; }; + 1A64175518FADF6800A769B2 /* base2.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = base2.py; sourceTree = ""; }; + 1A64175618FADF6800A769B2 /* crypto_int16.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_int16.h; sourceTree = ""; }; + 1A64175718FADF6800A769B2 /* crypto_int32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_int32.h; sourceTree = ""; }; + 1A64175818FADF6800A769B2 /* crypto_int64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_int64.h; sourceTree = ""; }; + 1A64175918FADF6800A769B2 /* crypto_int8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_int8.h; sourceTree = ""; }; + 1A64175A18FADF6800A769B2 /* crypto_sign.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_sign.h; sourceTree = ""; }; + 1A64175B18FADF6800A769B2 /* crypto_uint16.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_uint16.h; sourceTree = ""; }; + 1A64175C18FADF6800A769B2 /* crypto_uint32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_uint32.h; sourceTree = ""; }; + 1A64175D18FADF6800A769B2 /* crypto_uint64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_uint64.h; sourceTree = ""; }; + 1A64175E18FADF6800A769B2 /* crypto_uint8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_uint8.h; sourceTree = ""; }; + 1A64175F18FADF6800A769B2 /* d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = d.h; sourceTree = ""; }; + 1A64176018FADF6800A769B2 /* d.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = d.py; sourceTree = ""; }; + 1A64176118FADF6800A769B2 /* d2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = d2.h; sourceTree = ""; }; + 1A64176218FADF6800A769B2 /* d2.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = d2.py; sourceTree = ""; }; + 1A64176318FADF6800A769B2 /* ed25519.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ed25519.c; sourceTree = ""; }; + 1A64176418FADF6800A769B2 /* fe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fe.h; sourceTree = ""; }; + 1A64176518FADF6800A769B2 /* fe25519.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fe25519.c; sourceTree = ""; }; + 1A64176618FADF6800A769B2 /* fe25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fe25519.h; sourceTree = ""; }; + 1A64176718FADF6800A769B2 /* fe_0.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fe_0.c; sourceTree = ""; }; + 1A64176818FADF6800A769B2 /* fe_1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fe_1.c; sourceTree = ""; }; + 1A64176918FADF6800A769B2 /* fe_add.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fe_add.c; sourceTree = ""; }; + 1A64176A18FADF6800A769B2 /* fe_cmov.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fe_cmov.c; sourceTree = ""; }; + 1A64176B18FADF6800A769B2 /* fe_copy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fe_copy.c; sourceTree = ""; }; + 1A64176C18FADF6800A769B2 /* fe_frombytes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fe_frombytes.c; sourceTree = ""; }; + 1A64176D18FADF6800A769B2 /* fe_invert.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fe_invert.c; sourceTree = ""; }; + 1A64176E18FADF6800A769B2 /* fe_isnegative.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fe_isnegative.c; sourceTree = ""; }; + 1A64176F18FADF6800A769B2 /* fe_isnonzero.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fe_isnonzero.c; sourceTree = ""; }; + 1A64177018FADF6800A769B2 /* fe_mul.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fe_mul.c; sourceTree = ""; }; + 1A64177118FADF6800A769B2 /* fe_neg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fe_neg.c; sourceTree = ""; }; + 1A64177218FADF6800A769B2 /* fe_pow22523.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fe_pow22523.c; sourceTree = ""; }; + 1A64177318FADF6800A769B2 /* fe_sq.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fe_sq.c; sourceTree = ""; }; + 1A64177418FADF6800A769B2 /* fe_sq2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fe_sq2.c; sourceTree = ""; }; + 1A64177518FADF6800A769B2 /* fe_sub.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fe_sub.c; sourceTree = ""; }; + 1A64177618FADF6800A769B2 /* fe_tobytes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fe_tobytes.c; sourceTree = ""; }; + 1A64177718FADF6800A769B2 /* ge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ge.h; sourceTree = ""; }; + 1A64177818FADF6800A769B2 /* ge25519.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ge25519.c; sourceTree = ""; }; + 1A64177918FADF6800A769B2 /* ge25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ge25519.h; sourceTree = ""; }; + 1A64177A18FADF6800A769B2 /* ge25519_base.data */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ge25519_base.data; sourceTree = ""; }; + 1A64177B18FADF6800A769B2 /* ge_add.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ge_add.c; sourceTree = ""; }; + 1A64177C18FADF6800A769B2 /* ge_add.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ge_add.h; sourceTree = ""; }; + 1A64177D18FADF6800A769B2 /* ge_add.q */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ge_add.q; sourceTree = ""; }; + 1A64177E18FADF6800A769B2 /* ge_double_scalarmult.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ge_double_scalarmult.c; sourceTree = ""; }; + 1A64177F18FADF6800A769B2 /* ge_frombytes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ge_frombytes.c; sourceTree = ""; }; + 1A64178018FADF6800A769B2 /* ge_madd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ge_madd.c; sourceTree = ""; }; + 1A64178118FADF6800A769B2 /* ge_madd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ge_madd.h; sourceTree = ""; }; + 1A64178218FADF6800A769B2 /* ge_madd.q */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ge_madd.q; sourceTree = ""; }; + 1A64178318FADF6800A769B2 /* ge_msub.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ge_msub.c; sourceTree = ""; }; + 1A64178418FADF6800A769B2 /* ge_msub.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ge_msub.h; sourceTree = ""; }; + 1A64178518FADF6800A769B2 /* ge_msub.q */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ge_msub.q; sourceTree = ""; }; + 1A64178618FADF6800A769B2 /* ge_p1p1_to_p2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ge_p1p1_to_p2.c; sourceTree = ""; }; + 1A64178718FADF6800A769B2 /* ge_p1p1_to_p3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ge_p1p1_to_p3.c; sourceTree = ""; }; + 1A64178818FADF6800A769B2 /* ge_p2_0.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ge_p2_0.c; sourceTree = ""; }; + 1A64178918FADF6800A769B2 /* ge_p2_dbl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ge_p2_dbl.c; sourceTree = ""; }; + 1A64178A18FADF6800A769B2 /* ge_p2_dbl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ge_p2_dbl.h; sourceTree = ""; }; + 1A64178B18FADF6800A769B2 /* ge_p2_dbl.q */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ge_p2_dbl.q; sourceTree = ""; }; + 1A64178C18FADF6800A769B2 /* ge_p3_0.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ge_p3_0.c; sourceTree = ""; }; + 1A64178D18FADF6800A769B2 /* ge_p3_dbl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ge_p3_dbl.c; sourceTree = ""; }; + 1A64178E18FADF6800A769B2 /* ge_p3_to_cached.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ge_p3_to_cached.c; sourceTree = ""; }; + 1A64178F18FADF6800A769B2 /* ge_p3_to_p2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ge_p3_to_p2.c; sourceTree = ""; }; + 1A64179018FADF6800A769B2 /* ge_p3_tobytes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ge_p3_tobytes.c; sourceTree = ""; }; + 1A64179118FADF6800A769B2 /* ge_precomp_0.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ge_precomp_0.c; sourceTree = ""; }; + 1A64179218FADF6800A769B2 /* ge_scalarmult_base.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ge_scalarmult_base.c; sourceTree = ""; }; + 1A64179318FADF6800A769B2 /* ge_sub.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ge_sub.c; sourceTree = ""; }; + 1A64179418FADF6800A769B2 /* ge_sub.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ge_sub.h; sourceTree = ""; }; + 1A64179518FADF6800A769B2 /* ge_sub.q */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ge_sub.q; sourceTree = ""; }; + 1A64179618FADF6800A769B2 /* ge_tobytes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ge_tobytes.c; sourceTree = ""; }; + 1A64179718FADF6800A769B2 /* implementors */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = implementors; sourceTree = ""; }; + 1A64179818FADF6800A769B2 /* keypair.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = keypair.c; sourceTree = ""; }; + 1A64179918FADF6800A769B2 /* open.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = open.c; sourceTree = ""; }; + 1A64179A18FADF6800A769B2 /* pow22523.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pow22523.h; sourceTree = ""; }; + 1A64179B18FADF6800A769B2 /* pow22523.q */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = pow22523.q; sourceTree = ""; }; + 1A64179C18FADF6800A769B2 /* pow225521.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pow225521.h; sourceTree = ""; }; + 1A64179D18FADF6800A769B2 /* pow225521.q */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = pow225521.q; sourceTree = ""; }; + 1A64179E18FADF6800A769B2 /* q2h.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = q2h.sh; sourceTree = ""; }; + 1A64179F18FADF6800A769B2 /* sc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sc.h; sourceTree = ""; }; + 1A6417A018FADF6800A769B2 /* sc25519.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sc25519.c; sourceTree = ""; }; + 1A6417A118FADF6800A769B2 /* sc25519.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sc25519.h; sourceTree = ""; }; + 1A6417A218FADF6800A769B2 /* sc_muladd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sc_muladd.c; sourceTree = ""; }; + 1A6417A318FADF6800A769B2 /* sc_reduce.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sc_reduce.c; sourceTree = ""; }; + 1A6417A418FADF6800A769B2 /* sign.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sign.c; sourceTree = ""; }; + 1A6417A518FADF6800A769B2 /* sqrtm1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqrtm1.h; sourceTree = ""; }; + 1A6417A618FADF6800A769B2 /* sqrtm1.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = sqrtm1.py; sourceTree = ""; }; + 1A6417A818FADF6800A769B2 /* api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = api.h; sourceTree = ""; }; + 1A6417A918FADF6800A769B2 /* crypto_stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream.h; sourceTree = ""; }; + 1A6417AA18FADF6800A769B2 /* implementors */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = implementors; sourceTree = ""; }; + 1A6417AB18FADF6800A769B2 /* stream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stream.c; sourceTree = ""; }; + 1A6417AC18FADF6800A769B2 /* xor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xor.c; sourceTree = ""; }; + 1A6417AE18FADF6800A769B2 /* api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = api.h; sourceTree = ""; }; + 1A6417AF18FADF6800A769B2 /* crypto_stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream.h; sourceTree = ""; }; + 1A6417B018FADF6800A769B2 /* implementors */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = implementors; sourceTree = ""; }; + 1A6417B118FADF6800A769B2 /* stream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stream.c; sourceTree = ""; }; + 1A6417B218FADF6800A769B2 /* xor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xor.c; sourceTree = ""; }; + 1A6417B418FADF6800A769B2 /* api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = api.h; sourceTree = ""; }; + 1A6417B518FADF6800A769B2 /* crypto_stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream.h; sourceTree = ""; }; + 1A6417B618FADF6800A769B2 /* implementors */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = implementors; sourceTree = ""; }; + 1A6417B718FADF6800A769B2 /* stream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stream.c; sourceTree = ""; }; + 1A6417B818FADF6800A769B2 /* xor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xor.c; sourceTree = ""; }; + 1A6417BA18FADF6800A769B2 /* api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = api.h; sourceTree = ""; }; + 1A6417BB18FADF6800A769B2 /* crypto_stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_stream.h; sourceTree = ""; }; + 1A6417BC18FADF6800A769B2 /* implementors */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = implementors; sourceTree = ""; }; + 1A6417BD18FADF6800A769B2 /* stream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stream.c; sourceTree = ""; }; + 1A6417BE18FADF6800A769B2 /* xor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xor.c; sourceTree = ""; }; + 1A6417C018FADF6800A769B2 /* api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = api.h; sourceTree = ""; }; + 1A6417C118FADF6800A769B2 /* crypto_verify.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_verify.h; sourceTree = ""; }; + 1A6417C218FADF6800A769B2 /* verify.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = verify.c; sourceTree = ""; }; + 1A6417C418FADF6800A769B2 /* api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = api.h; sourceTree = ""; }; + 1A6417C518FADF6800A769B2 /* crypto_verify.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_verify.h; sourceTree = ""; }; + 1A6417C618FADF6800A769B2 /* verify.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = verify.c; sourceTree = ""; }; + 1A6417C918FADF6800A769B2 /* PROTOTYPES.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = PROTOTYPES.c; sourceTree = ""; }; + 1A64181B18FB17C900A769B2 /* ccsds_tables.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ccsds_tables.c; sourceTree = ""; }; + 1A64181C18FB17C900A769B2 /* char.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = char.h; sourceTree = ""; }; + 1A64181D18FB17C900A769B2 /* decode_rs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = decode_rs.h; sourceTree = ""; }; + 1A64181E18FB17C900A769B2 /* decode_rs_8.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = decode_rs_8.c; sourceTree = ""; }; + 1A64181F18FB17C900A769B2 /* encode_rs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = encode_rs.h; sourceTree = ""; }; + 1A64182018FB17C900A769B2 /* encode_rs_8.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = encode_rs_8.c; sourceTree = ""; }; + 1A64182118FB17C900A769B2 /* fec.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = fec.h; sourceTree = ""; }; + 1A64182218FB17C900A769B2 /* fixed.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = fixed.h; sourceTree = ""; }; + 1A64182318FB17C900A769B2 /* gen_ccsds.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = gen_ccsds.c; sourceTree = ""; }; + 1A64182418FB17C900A769B2 /* init_rs.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = init_rs.h; sourceTree = ""; }; + 1A64182518FB17C900A769B2 /* init_rs_char.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = init_rs_char.c; sourceTree = ""; }; + 1A64182818FB17C900A769B2 /* rs-common.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "rs-common.h"; sourceTree = ""; }; /* End PBXFileReference section */ -/* Begin PBXGroup section */ - 1A09828A18F0B81E00C4652C /* libserval */ = { - isa = PBXGroup; - children = ( - 1A5334BE18F087CF00C7BD93 /* build.sh */, - 1A13A3B018F0C01500A6233B /* headers */, - 1A09828B18F0B82500C4652C /* Products */, - ); - name = libserval; - sourceTree = ""; - }; - 1A09828B18F0B82500C4652C /* Products */ = { - isa = PBXGroup; - children = ( - 1A09828C18F0B8E200C4652C /* libserval.a */, +/* Begin PBXFrameworksBuildPhase section */ + 1A64160918FADE6500A769B2 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( ); - name = Products; - sourceTree = ""; + runOnlyForDeploymentPostprocessing = 0; }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ 1A13A3B018F0C01500A6233B /* headers */ = { isa = PBXGroup; children = ( 1A13A3DA18F0CD9B00A6233B /* cli.h */, 1A13A3DB18F0CD9B00A6233B /* conf_schema.h */, 1A13A3DC18F0CD9B00A6233B /* conf.h */, - 1A13A3DD18F0CD9B00A6233B /* confdefs.h */, 1A13A3DE18F0CD9B00A6233B /* constants.h */, 1A13A3DF18F0CD9B00A6233B /* crypto.h */, 1A13A3E018F0CD9B00A6233B /* dataformats.h */, @@ -111,33 +567,598 @@ 1A13A3FF18F0CD9B00A6233B /* xprintf.h */, ); name = headers; + path = ..; sourceTree = ""; }; 1A5334B318F087B500C7BD93 = { isa = PBXGroup; children = ( - 1A09828A18F0B81E00C4652C /* libserval */, + 1A64161018FADE6500A769B2 /* serval */, + 1A64158E18FADC5B00A769B2 /* Products */, + ); + sourceTree = ""; + }; + 1A64158E18FADC5B00A769B2 /* Products */ = { + isa = PBXGroup; + children = ( + 1A64160C18FADE6500A769B2 /* libserval.a */, + ); + name = Products; + sourceTree = ""; + }; + 1A64161018FADE6500A769B2 /* serval */ = { + isa = PBXGroup; + children = ( + 1A64163218FADF1300A769B2 /* src */, + 1A13A3B018F0C01500A6233B /* headers */, + 1A64161118FADE6500A769B2 /* Supporting Files */, + ); + path = serval; + sourceTree = ""; + }; + 1A64161118FADE6500A769B2 /* Supporting Files */ = { + isa = PBXGroup; + children = ( + 1A13A3DD18F0CD9B00A6233B /* confdefs.h */, + 1A64161218FADE6500A769B2 /* serval-Prefix.pch */, + ); + name = "Supporting Files"; + sourceTree = ""; + }; + 1A64163218FADF1300A769B2 /* src */ = { + isa = PBXGroup; + children = ( + 1A64181718FB156E00A769B2 /* serval */, + 1A6416EB18FADF6800A769B2 /* nacl */, + 1A64181A18FB17C900A769B2 /* fec-3.0.1 */, + 1A6416E518FADF4A00A769B2 /* sqlite-amalgamation-3070900 */, + ); + name = src; + sourceTree = ""; + }; + 1A6416E518FADF4A00A769B2 /* sqlite-amalgamation-3070900 */ = { + isa = PBXGroup; + children = ( + 1A6416E718FADF4A00A769B2 /* sqlite3.c */, + 1A6416E818FADF4A00A769B2 /* sqlite3.h */, + ); + name = "sqlite-amalgamation-3070900"; + path = "../../sqlite-amalgamation-3070900"; + sourceTree = ""; + }; + 1A6416EB18FADF6800A769B2 /* nacl */ = { + isa = PBXGroup; + children = ( + 1A6416EC18FADF6800A769B2 /* include */, + 1A64170718FADF6800A769B2 /* src */, + ); + name = nacl; + path = ../../nacl; + sourceTree = ""; + }; + 1A6416EC18FADF6800A769B2 /* include */ = { + isa = PBXGroup; + children = ( + 1A6416ED18FADF6800A769B2 /* api.h */, + 1A6416EE18FADF6800A769B2 /* crypto_auth_hmacsha256.h */, + 1A6416EF18FADF6800A769B2 /* crypto_auth_hmacsha512256.h */, + 1A6416F018FADF6800A769B2 /* crypto_box_curve25519xsalsa20poly1305.h */, + 1A6416F118FADF6800A769B2 /* crypto_core_hsalsa20.h */, + 1A6416F218FADF6800A769B2 /* crypto_core_salsa20.h */, + 1A6416F318FADF6800A769B2 /* crypto_core_salsa2012.h */, + 1A6416F418FADF6800A769B2 /* crypto_core_salsa208.h */, + 1A6416F518FADF6800A769B2 /* crypto_hash_sha256.h */, + 1A6416F618FADF6800A769B2 /* crypto_hash_sha512.h */, + 1A6416F718FADF6800A769B2 /* crypto_hashblocks_sha256.h */, + 1A6416F818FADF6800A769B2 /* crypto_hashblocks_sha512.h */, + 1A6416F918FADF6800A769B2 /* crypto_onetimeauth_poly1305.h */, + 1A6416FA18FADF6800A769B2 /* crypto_scalarmult_curve25519.h */, + 1A6416FB18FADF6800A769B2 /* crypto_secretbox_xsalsa20poly1305.h */, + 1A6416FC18FADF6800A769B2 /* crypto_sign_edwards25519sha512batch.h */, + 1A6416FD18FADF6800A769B2 /* crypto_stream_salsa20.h */, + 1A6416FE18FADF6800A769B2 /* crypto_stream_salsa2012.h */, + 1A6416FF18FADF6800A769B2 /* crypto_stream_salsa208.h */, + 1A64170018FADF6800A769B2 /* crypto_stream_xsalsa20.h */, + 1A64170118FADF6800A769B2 /* crypto_uint32.h */, + 1A64170218FADF6800A769B2 /* crypto_verify_16.h */, + 1A64170318FADF6800A769B2 /* crypto_verify_32.h */, + 1A64170418FADF6800A769B2 /* nacl.h */, + 1A64170518FADF6800A769B2 /* randombytes.h */, + ); + path = include; + sourceTree = ""; + }; + 1A64170718FADF6800A769B2 /* src */ = { + isa = PBXGroup; + children = ( + 1A64170818FADF6800A769B2 /* crypto_auth_hmacsha256_ref */, + 1A64170D18FADF6800A769B2 /* crypto_auth_hmacsha512256_ref */, + 1A64171218FADF6800A769B2 /* crypto_box_curve25519xsalsa20poly1305_ref */, + 1A64171918FADF6800A769B2 /* crypto_core_hsalsa20_ref */, + 1A64171E18FADF6800A769B2 /* crypto_core_salsa2012_ref */, + 1A64172318FADF6800A769B2 /* crypto_core_salsa208_ref */, + 1A64172818FADF6800A769B2 /* crypto_core_salsa20_ref */, + 1A64172D18FADF6800A769B2 /* crypto_hash_sha256_ref */, + 1A64173218FADF6800A769B2 /* crypto_hash_sha512_ref */, + 1A64173718FADF6800A769B2 /* crypto_hashblocks_sha256_ref */, + 1A64173C18FADF6800A769B2 /* crypto_hashblocks_sha512_ref */, + 1A64174118FADF6800A769B2 /* crypto_onetimeauth_poly1305_ref */, + 1A64174618FADF6800A769B2 /* crypto_scalarmult_curve25519_ref */, + 1A64174C18FADF6800A769B2 /* crypto_secretbox_xsalsa20poly1305_ref */, + 1A64175018FADF6800A769B2 /* crypto_sign_edwards25519sha512batch_ref */, + 1A6417A718FADF6800A769B2 /* crypto_stream_salsa2012_ref */, + 1A6417AD18FADF6800A769B2 /* crypto_stream_salsa208_ref */, + 1A6417B318FADF6800A769B2 /* crypto_stream_salsa20_ref */, + 1A6417B918FADF6800A769B2 /* crypto_stream_xsalsa20_ref */, + 1A6417BF18FADF6800A769B2 /* crypto_verify_16_ref */, + 1A6417C318FADF6800A769B2 /* crypto_verify_32_ref */, + 1A6417C918FADF6800A769B2 /* PROTOTYPES.c */, + ); + path = src; + sourceTree = ""; + }; + 1A64170818FADF6800A769B2 /* crypto_auth_hmacsha256_ref */ = { + isa = PBXGroup; + children = ( + 1A64170918FADF6800A769B2 /* api.h */, + 1A64170A18FADF6800A769B2 /* crypto_auth.h */, + 1A64170B18FADF6800A769B2 /* hmac.c */, + 1A64170C18FADF6800A769B2 /* verify.c */, + ); + path = crypto_auth_hmacsha256_ref; + sourceTree = ""; + }; + 1A64170D18FADF6800A769B2 /* crypto_auth_hmacsha512256_ref */ = { + isa = PBXGroup; + children = ( + 1A64170E18FADF6800A769B2 /* api.h */, + 1A64170F18FADF6800A769B2 /* crypto_auth.h */, + 1A64171018FADF6800A769B2 /* hmac.c */, + 1A64171118FADF6800A769B2 /* verify.c */, + ); + path = crypto_auth_hmacsha512256_ref; + sourceTree = ""; + }; + 1A64171218FADF6800A769B2 /* crypto_box_curve25519xsalsa20poly1305_ref */ = { + isa = PBXGroup; + children = ( + 1A64171318FADF6800A769B2 /* after.c */, + 1A64171418FADF6800A769B2 /* api.h */, + 1A64171518FADF6800A769B2 /* before.c */, + 1A64171618FADF6800A769B2 /* box.c */, + 1A64171718FADF6800A769B2 /* crypto_box.h */, + 1A64171818FADF6800A769B2 /* keypair.c */, + ); + path = crypto_box_curve25519xsalsa20poly1305_ref; + sourceTree = ""; + }; + 1A64171918FADF6800A769B2 /* crypto_core_hsalsa20_ref */ = { + isa = PBXGroup; + children = ( + 1A64171A18FADF6800A769B2 /* api.h */, + 1A64171B18FADF6800A769B2 /* core.c */, + 1A64171C18FADF6800A769B2 /* crypto_core.h */, + 1A64171D18FADF6800A769B2 /* implementors */, + ); + path = crypto_core_hsalsa20_ref; + sourceTree = ""; + }; + 1A64171E18FADF6800A769B2 /* crypto_core_salsa2012_ref */ = { + isa = PBXGroup; + children = ( + 1A64171F18FADF6800A769B2 /* api.h */, + 1A64172018FADF6800A769B2 /* core.c */, + 1A64172118FADF6800A769B2 /* crypto_core.h */, + 1A64172218FADF6800A769B2 /* implementors */, + ); + path = crypto_core_salsa2012_ref; + sourceTree = ""; + }; + 1A64172318FADF6800A769B2 /* crypto_core_salsa208_ref */ = { + isa = PBXGroup; + children = ( + 1A64172418FADF6800A769B2 /* api.h */, + 1A64172518FADF6800A769B2 /* core.c */, + 1A64172618FADF6800A769B2 /* crypto_core.h */, + 1A64172718FADF6800A769B2 /* implementors */, + ); + path = crypto_core_salsa208_ref; + sourceTree = ""; + }; + 1A64172818FADF6800A769B2 /* crypto_core_salsa20_ref */ = { + isa = PBXGroup; + children = ( + 1A64172918FADF6800A769B2 /* api.h */, + 1A64172A18FADF6800A769B2 /* core.c */, + 1A64172B18FADF6800A769B2 /* crypto_core.h */, + 1A64172C18FADF6800A769B2 /* implementors */, ); + path = crypto_core_salsa20_ref; + sourceTree = ""; + }; + 1A64172D18FADF6800A769B2 /* crypto_hash_sha256_ref */ = { + isa = PBXGroup; + children = ( + 1A64172E18FADF6800A769B2 /* api.h */, + 1A64172F18FADF6800A769B2 /* crypto_hash.h */, + 1A64173018FADF6800A769B2 /* hash.c */, + 1A64173118FADF6800A769B2 /* implementors */, + ); + path = crypto_hash_sha256_ref; + sourceTree = ""; + }; + 1A64173218FADF6800A769B2 /* crypto_hash_sha512_ref */ = { + isa = PBXGroup; + children = ( + 1A64173318FADF6800A769B2 /* api.h */, + 1A64173418FADF6800A769B2 /* crypto_hash.h */, + 1A64173518FADF6800A769B2 /* hash.c */, + 1A64173618FADF6800A769B2 /* implementors */, + ); + path = crypto_hash_sha512_ref; + sourceTree = ""; + }; + 1A64173718FADF6800A769B2 /* crypto_hashblocks_sha256_ref */ = { + isa = PBXGroup; + children = ( + 1A64173818FADF6800A769B2 /* api.h */, + 1A64173918FADF6800A769B2 /* blocks.c */, + 1A64173A18FADF6800A769B2 /* crypto_hashblocks.h */, + 1A64173B18FADF6800A769B2 /* implementors */, + ); + path = crypto_hashblocks_sha256_ref; + sourceTree = ""; + }; + 1A64173C18FADF6800A769B2 /* crypto_hashblocks_sha512_ref */ = { + isa = PBXGroup; + children = ( + 1A64173D18FADF6800A769B2 /* api.h */, + 1A64173E18FADF6800A769B2 /* blocks.c */, + 1A64173F18FADF6800A769B2 /* crypto_hashblocks.h */, + 1A64174018FADF6800A769B2 /* implementors */, + ); + path = crypto_hashblocks_sha512_ref; + sourceTree = ""; + }; + 1A64174118FADF6800A769B2 /* crypto_onetimeauth_poly1305_ref */ = { + isa = PBXGroup; + children = ( + 1A64174218FADF6800A769B2 /* api.h */, + 1A64174318FADF6800A769B2 /* auth.c */, + 1A64174418FADF6800A769B2 /* crypto_onetimeauth.h */, + 1A64174518FADF6800A769B2 /* verify.c */, + ); + path = crypto_onetimeauth_poly1305_ref; + sourceTree = ""; + }; + 1A64174618FADF6800A769B2 /* crypto_scalarmult_curve25519_ref */ = { + isa = PBXGroup; + children = ( + 1A64174718FADF6800A769B2 /* api.h */, + 1A64174818FADF6800A769B2 /* base.c */, + 1A64174918FADF6800A769B2 /* crypto_scalarmult.h */, + 1A64174A18FADF6800A769B2 /* implementors */, + 1A64174B18FADF6800A769B2 /* smult.c */, + ); + path = crypto_scalarmult_curve25519_ref; + sourceTree = ""; + }; + 1A64174C18FADF6800A769B2 /* crypto_secretbox_xsalsa20poly1305_ref */ = { + isa = PBXGroup; + children = ( + 1A64174D18FADF6800A769B2 /* api.h */, + 1A64174E18FADF6800A769B2 /* box.c */, + 1A64174F18FADF6800A769B2 /* crypto_secretbox.h */, + ); + path = crypto_secretbox_xsalsa20poly1305_ref; + sourceTree = ""; + }; + 1A64175018FADF6800A769B2 /* crypto_sign_edwards25519sha512batch_ref */ = { + isa = PBXGroup; + children = ( + 1A64175118FADF6800A769B2 /* api.h */, + 1A64175218FADF6800A769B2 /* base.h */, + 1A64175318FADF6800A769B2 /* base.py */, + 1A64175418FADF6800A769B2 /* base2.h */, + 1A64175518FADF6800A769B2 /* base2.py */, + 1A64175618FADF6800A769B2 /* crypto_int16.h */, + 1A64175718FADF6800A769B2 /* crypto_int32.h */, + 1A64175818FADF6800A769B2 /* crypto_int64.h */, + 1A64175918FADF6800A769B2 /* crypto_int8.h */, + 1A64175A18FADF6800A769B2 /* crypto_sign.h */, + 1A64175B18FADF6800A769B2 /* crypto_uint16.h */, + 1A64175C18FADF6800A769B2 /* crypto_uint32.h */, + 1A64175D18FADF6800A769B2 /* crypto_uint64.h */, + 1A64175E18FADF6800A769B2 /* crypto_uint8.h */, + 1A64175F18FADF6800A769B2 /* d.h */, + 1A64176018FADF6800A769B2 /* d.py */, + 1A64176118FADF6800A769B2 /* d2.h */, + 1A64176218FADF6800A769B2 /* d2.py */, + 1A64176318FADF6800A769B2 /* ed25519.c */, + 1A64176418FADF6800A769B2 /* fe.h */, + 1A64176518FADF6800A769B2 /* fe25519.c */, + 1A64176618FADF6800A769B2 /* fe25519.h */, + 1A64176718FADF6800A769B2 /* fe_0.c */, + 1A64176818FADF6800A769B2 /* fe_1.c */, + 1A64176918FADF6800A769B2 /* fe_add.c */, + 1A64176A18FADF6800A769B2 /* fe_cmov.c */, + 1A64176B18FADF6800A769B2 /* fe_copy.c */, + 1A64176C18FADF6800A769B2 /* fe_frombytes.c */, + 1A64176D18FADF6800A769B2 /* fe_invert.c */, + 1A64176E18FADF6800A769B2 /* fe_isnegative.c */, + 1A64176F18FADF6800A769B2 /* fe_isnonzero.c */, + 1A64177018FADF6800A769B2 /* fe_mul.c */, + 1A64177118FADF6800A769B2 /* fe_neg.c */, + 1A64177218FADF6800A769B2 /* fe_pow22523.c */, + 1A64177318FADF6800A769B2 /* fe_sq.c */, + 1A64177418FADF6800A769B2 /* fe_sq2.c */, + 1A64177518FADF6800A769B2 /* fe_sub.c */, + 1A64177618FADF6800A769B2 /* fe_tobytes.c */, + 1A64177718FADF6800A769B2 /* ge.h */, + 1A64177818FADF6800A769B2 /* ge25519.c */, + 1A64177918FADF6800A769B2 /* ge25519.h */, + 1A64177A18FADF6800A769B2 /* ge25519_base.data */, + 1A64177B18FADF6800A769B2 /* ge_add.c */, + 1A64177C18FADF6800A769B2 /* ge_add.h */, + 1A64177D18FADF6800A769B2 /* ge_add.q */, + 1A64177E18FADF6800A769B2 /* ge_double_scalarmult.c */, + 1A64177F18FADF6800A769B2 /* ge_frombytes.c */, + 1A64178018FADF6800A769B2 /* ge_madd.c */, + 1A64178118FADF6800A769B2 /* ge_madd.h */, + 1A64178218FADF6800A769B2 /* ge_madd.q */, + 1A64178318FADF6800A769B2 /* ge_msub.c */, + 1A64178418FADF6800A769B2 /* ge_msub.h */, + 1A64178518FADF6800A769B2 /* ge_msub.q */, + 1A64178618FADF6800A769B2 /* ge_p1p1_to_p2.c */, + 1A64178718FADF6800A769B2 /* ge_p1p1_to_p3.c */, + 1A64178818FADF6800A769B2 /* ge_p2_0.c */, + 1A64178918FADF6800A769B2 /* ge_p2_dbl.c */, + 1A64178A18FADF6800A769B2 /* ge_p2_dbl.h */, + 1A64178B18FADF6800A769B2 /* ge_p2_dbl.q */, + 1A64178C18FADF6800A769B2 /* ge_p3_0.c */, + 1A64178D18FADF6800A769B2 /* ge_p3_dbl.c */, + 1A64178E18FADF6800A769B2 /* ge_p3_to_cached.c */, + 1A64178F18FADF6800A769B2 /* ge_p3_to_p2.c */, + 1A64179018FADF6800A769B2 /* ge_p3_tobytes.c */, + 1A64179118FADF6800A769B2 /* ge_precomp_0.c */, + 1A64179218FADF6800A769B2 /* ge_scalarmult_base.c */, + 1A64179318FADF6800A769B2 /* ge_sub.c */, + 1A64179418FADF6800A769B2 /* ge_sub.h */, + 1A64179518FADF6800A769B2 /* ge_sub.q */, + 1A64179618FADF6800A769B2 /* ge_tobytes.c */, + 1A64179718FADF6800A769B2 /* implementors */, + 1A64179818FADF6800A769B2 /* keypair.c */, + 1A64179918FADF6800A769B2 /* open.c */, + 1A64179A18FADF6800A769B2 /* pow22523.h */, + 1A64179B18FADF6800A769B2 /* pow22523.q */, + 1A64179C18FADF6800A769B2 /* pow225521.h */, + 1A64179D18FADF6800A769B2 /* pow225521.q */, + 1A64179E18FADF6800A769B2 /* q2h.sh */, + 1A64179F18FADF6800A769B2 /* sc.h */, + 1A6417A018FADF6800A769B2 /* sc25519.c */, + 1A6417A118FADF6800A769B2 /* sc25519.h */, + 1A6417A218FADF6800A769B2 /* sc_muladd.c */, + 1A6417A318FADF6800A769B2 /* sc_reduce.c */, + 1A6417A418FADF6800A769B2 /* sign.c */, + 1A6417A518FADF6800A769B2 /* sqrtm1.h */, + 1A6417A618FADF6800A769B2 /* sqrtm1.py */, + ); + path = crypto_sign_edwards25519sha512batch_ref; + sourceTree = ""; + }; + 1A6417A718FADF6800A769B2 /* crypto_stream_salsa2012_ref */ = { + isa = PBXGroup; + children = ( + 1A6417A818FADF6800A769B2 /* api.h */, + 1A6417A918FADF6800A769B2 /* crypto_stream.h */, + 1A6417AA18FADF6800A769B2 /* implementors */, + 1A6417AB18FADF6800A769B2 /* stream.c */, + 1A6417AC18FADF6800A769B2 /* xor.c */, + ); + path = crypto_stream_salsa2012_ref; + sourceTree = ""; + }; + 1A6417AD18FADF6800A769B2 /* crypto_stream_salsa208_ref */ = { + isa = PBXGroup; + children = ( + 1A6417AE18FADF6800A769B2 /* api.h */, + 1A6417AF18FADF6800A769B2 /* crypto_stream.h */, + 1A6417B018FADF6800A769B2 /* implementors */, + 1A6417B118FADF6800A769B2 /* stream.c */, + 1A6417B218FADF6800A769B2 /* xor.c */, + ); + path = crypto_stream_salsa208_ref; + sourceTree = ""; + }; + 1A6417B318FADF6800A769B2 /* crypto_stream_salsa20_ref */ = { + isa = PBXGroup; + children = ( + 1A6417B418FADF6800A769B2 /* api.h */, + 1A6417B518FADF6800A769B2 /* crypto_stream.h */, + 1A6417B618FADF6800A769B2 /* implementors */, + 1A6417B718FADF6800A769B2 /* stream.c */, + 1A6417B818FADF6800A769B2 /* xor.c */, + ); + path = crypto_stream_salsa20_ref; + sourceTree = ""; + }; + 1A6417B918FADF6800A769B2 /* crypto_stream_xsalsa20_ref */ = { + isa = PBXGroup; + children = ( + 1A6417BA18FADF6800A769B2 /* api.h */, + 1A6417BB18FADF6800A769B2 /* crypto_stream.h */, + 1A6417BC18FADF6800A769B2 /* implementors */, + 1A6417BD18FADF6800A769B2 /* stream.c */, + 1A6417BE18FADF6800A769B2 /* xor.c */, + ); + path = crypto_stream_xsalsa20_ref; + sourceTree = ""; + }; + 1A6417BF18FADF6800A769B2 /* crypto_verify_16_ref */ = { + isa = PBXGroup; + children = ( + 1A6417C018FADF6800A769B2 /* api.h */, + 1A6417C118FADF6800A769B2 /* crypto_verify.h */, + 1A6417C218FADF6800A769B2 /* verify.c */, + ); + path = crypto_verify_16_ref; + sourceTree = ""; + }; + 1A6417C318FADF6800A769B2 /* crypto_verify_32_ref */ = { + isa = PBXGroup; + children = ( + 1A6417C418FADF6800A769B2 /* api.h */, + 1A6417C518FADF6800A769B2 /* crypto_verify.h */, + 1A6417C618FADF6800A769B2 /* verify.c */, + ); + path = crypto_verify_32_ref; + sourceTree = ""; + }; + 1A64181718FB156E00A769B2 /* serval */ = { + isa = PBXGroup; + children = ( + 1A64181918FB15D900A769B2 /* daemon */, + 1A64181818FB15CE00A769B2 /* client */, + 1A64168818FADF2E00A769B2 /* version_servald.c */, + ); + name = serval; + sourceTree = ""; + }; + 1A64181818FB15CE00A769B2 /* client */ = { + isa = PBXGroup; + children = ( + 1A64163D18FADF2E00A769B2 /* dataformats.c */, + 1A64164318FADF2E00A769B2 /* fifo.c */, + 1A64164718FADF2E00A769B2 /* instance.c */, + 1A64163618FADF2E00A769B2 /* conf_om.c */, + 1A64163718FADF2E00A769B2 /* conf_parse.c */, + 1A64163818FADF2E00A769B2 /* conf_schema.c */, + 1A64163918FADF2E00A769B2 /* conf.c */, + 1A64164A18FADF2E00A769B2 /* log_util.c */, + 1A64164B18FADF2E00A769B2 /* log.c */, + 1A64165118FADF2E00A769B2 /* mem.c */, + 1A64165918FADF2E00A769B2 /* net.c */, + 1A64165B18FADF2E00A769B2 /* os.c */, + 1A64166A18FADF2E00A769B2 /* randombytes.c */, + 1A64167718FADF2E00A769B2 /* rotbuf.c */, + 1A64167E18FADF2E00A769B2 /* socket.c */, + 1A64167F18FADF2E00A769B2 /* srandomdev.c */, + 1A64168018FADF2E00A769B2 /* str.c */, + 1A64168118FADF2E00A769B2 /* strbuf_helpers.c */, + 1A64168218FADF2E00A769B2 /* strbuf.c */, + 1A64168318FADF2E00A769B2 /* strlcpy.c */, + 1A64168718FADF2E00A769B2 /* uuid.c */, + 1A64168B18FADF2E00A769B2 /* xprintf.c */, + ); + name = client; + sourceTree = ""; + }; + 1A64181918FB15D900A769B2 /* daemon */ = { + isa = PBXGroup; + children = ( + 1A64163418FADF2E00A769B2 /* cli.c */, + 1A64163518FADF2E00A769B2 /* commandline.c */, + 1A64163C18FADF2E00A769B2 /* crypto.c */, + 1A64163E18FADF2E00A769B2 /* directory_client.c */, + 1A64164018FADF2E00A769B2 /* dna_helper.c */, + 1A6416E618FADF4A00A769B2 /* encode.c */, + 1A64164218FADF2E00A769B2 /* fdqueue.c */, + 1A64164418FADF2E00A769B2 /* golay.c */, + 1A64164518FADF2E00A769B2 /* http_server.c */, + 1A64164618FADF2E00A769B2 /* httpd.c */, + 1A64164918FADF2E00A769B2 /* keyring.c */, + 1A64164C18FADF2E00A769B2 /* lsif.c */, + 1A64164D18FADF2E00A769B2 /* main.c */, + 1A64166918FADF2E00A769B2 /* radio_link.c */, + 1A64165218FADF2E00A769B2 /* meshms_restful.c */, + 1A64165318FADF2E00A769B2 /* meshms.c */, + 1A64164E18FADF2E00A769B2 /* mdp_client.c */, + 1A64165018FADF2E00A769B2 /* mdp_net.c */, + 1A64165718FADF2E00A769B2 /* msp_client.c */, + 1A64165818FADF2E00A769B2 /* msp_proxy.c */, + 1A64165418FADF2E00A769B2 /* monitor-cli.c */, + 1A64165518FADF2E00A769B2 /* monitor-client.c */, + 1A64165618FADF2E00A769B2 /* monitor.c */, + 1A64165A18FADF2E00A769B2 /* nonce.c */, + 1A64166718FADF2E00A769B2 /* overlay.c */, + 1A64165C18FADF2E00A769B2 /* overlay_address.c */, + 1A64165D18FADF2E00A769B2 /* overlay_buffer.c */, + 1A64165E18FADF2E00A769B2 /* overlay_interface.c */, + 1A64165F18FADF2E00A769B2 /* overlay_link.c */, + 1A64166418FADF2E00A769B2 /* overlay_packetradio.c */, + 1A64166018FADF2E00A769B2 /* overlay_mdp_services.c */, + 1A64166118FADF2E00A769B2 /* overlay_mdp.c */, + 1A64166618FADF2E00A769B2 /* overlay_queue.c */, + 1A64164F18FADF2E00A769B2 /* mdp_filter.c */, + 1A64166218FADF2E00A769B2 /* overlay_olsr.c */, + 1A64166318FADF2E00A769B2 /* overlay_packetformats.c */, + 1A64166518FADF2E00A769B2 /* overlay_payload.c */, + 1A64166818FADF2E00A769B2 /* performance_timing.c */, + 1A64167818FADF2E00A769B2 /* route_link.c */, + 1A64166B18FADF2E00A769B2 /* rhizome_bundle.c */, + 1A64166C18FADF2E00A769B2 /* rhizome_crypto.c */, + 1A64166D18FADF2E00A769B2 /* rhizome_database.c */, + 1A64166E18FADF2E00A769B2 /* rhizome_direct_http.c */, + 1A64166F18FADF2E00A769B2 /* rhizome_direct.c */, + 1A64167018FADF2E00A769B2 /* rhizome_fetch.c */, + 1A64167118FADF2E00A769B2 /* rhizome_http.c */, + 1A64167318FADF2E00A769B2 /* rhizome_restful.c */, + 1A64167218FADF2E00A769B2 /* rhizome_packetformats.c */, + 1A64167418FADF2E00A769B2 /* rhizome_store.c */, + 1A64167518FADF2E00A769B2 /* rhizome_sync.c */, + 1A64167618FADF2E00A769B2 /* rhizome.c */, + 1A64167918FADF2E00A769B2 /* serval_packetvisualise.c */, + 1A64167B18FADF2E00A769B2 /* server.c */, + 1A64167C18FADF2E00A769B2 /* sha2.c */, + 1A64167D18FADF2E00A769B2 /* sighandlers.c */, + 1A64168A18FADF2E00A769B2 /* vomp.c */, + 1A64168918FADF2E00A769B2 /* vomp_console.c */, + 1A64163B18FADF2E00A769B2 /* context1.c */, + ); + name = daemon; + sourceTree = ""; + }; + 1A64181A18FB17C900A769B2 /* fec-3.0.1 */ = { + isa = PBXGroup; + children = ( + 1A64181B18FB17C900A769B2 /* ccsds_tables.c */, + 1A64181C18FB17C900A769B2 /* char.h */, + 1A64181D18FB17C900A769B2 /* decode_rs.h */, + 1A64181E18FB17C900A769B2 /* decode_rs_8.c */, + 1A64181F18FB17C900A769B2 /* encode_rs.h */, + 1A64182018FB17C900A769B2 /* encode_rs_8.c */, + 1A64182118FB17C900A769B2 /* fec.h */, + 1A64182218FB17C900A769B2 /* fixed.h */, + 1A64182318FB17C900A769B2 /* gen_ccsds.c */, + 1A64182418FB17C900A769B2 /* init_rs.h */, + 1A64182518FB17C900A769B2 /* init_rs_char.c */, + 1A64182818FB17C900A769B2 /* rs-common.h */, + ); + name = "fec-3.0.1"; + path = "../../fec-3.0.1"; sourceTree = ""; }; /* End PBXGroup section */ -/* Begin PBXLegacyTarget section */ - 1A5334B818F087B500C7BD93 /* libserval */ = { - isa = PBXLegacyTarget; - buildArgumentsString = "$(ACTION)"; - buildConfigurationList = 1A5334BB18F087B500C7BD93 /* Build configuration list for PBXLegacyTarget "libserval" */; +/* Begin PBXNativeTarget section */ + 1A64160B18FADE6500A769B2 /* serval */ = { + isa = PBXNativeTarget; + buildConfigurationList = 1A64163018FADE6500A769B2 /* Build configuration list for PBXNativeTarget "serval" */; buildPhases = ( + 1A64160818FADE6500A769B2 /* Sources */, + 1A64160918FADE6500A769B2 /* Frameworks */, + 1A64160A18FADE6500A769B2 /* CopyFiles */, + ); + buildRules = ( ); - buildToolPath = "$(SRCROOT)/build.sh"; - buildWorkingDirectory = ""; dependencies = ( ); - name = libserval; - passBuildSettingsInEnvironment = 0; - productName = servald; + name = serval; + productName = serval; + productReference = 1A64160C18FADE6500A769B2 /* libserval.a */; + productType = "com.apple.product-type.library.static"; }; -/* End PBXLegacyTarget section */ +/* End PBXNativeTarget section */ /* Begin PBXProject section */ 1A5334B418F087B500C7BD93 /* Project object */ = { @@ -154,36 +1175,272 @@ en, ); mainGroup = 1A5334B318F087B500C7BD93; + productRefGroup = 1A64158E18FADC5B00A769B2 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 1A5334B818F087B500C7BD93 /* libserval */, + 1A64160B18FADE6500A769B2 /* serval */, ); }; /* End PBXProject section */ +/* Begin PBXSourcesBuildPhase section */ + 1A64160818FADE6500A769B2 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 1A64182C18FB17F000A769B2 /* init_rs_char.c in Sources */, + 1A64184818FB1CC400A769B2 /* ge_p2_0.c in Sources */, + 1A6417D618FADF6800A769B2 /* core.c in Sources */, + 1A64184E18FB1CC400A769B2 /* ge_p3_tobytes.c in Sources */, + 1A6416AC18FADF2E00A769B2 /* meshms.c in Sources */, + 1A64168D18FADF2E00A769B2 /* cli.c in Sources */, + 1A64182B18FB17EC00A769B2 /* encode_rs_8.c in Sources */, + 1A64169B18FADF2E00A769B2 /* fdqueue.c in Sources */, + 1A64184618FB1CC400A769B2 /* ge_p1p1_to_p2.c in Sources */, + 1A64181318FADF6800A769B2 /* verify.c in Sources */, + 1A64168E18FADF2E00A769B2 /* commandline.c in Sources */, + 1A6417D818FADF6800A769B2 /* hash.c in Sources */, + 1A64180B18FADF6800A769B2 /* stream.c in Sources */, + 1A64180E18FADF6800A769B2 /* xor.c in Sources */, + 1A6416C618FADF2E00A769B2 /* rhizome_database.c in Sources */, + 1A6416A418FADF2E00A769B2 /* log.c in Sources */, + 1A6416B118FADF2E00A769B2 /* msp_proxy.c in Sources */, + 1A6417DC18FADF6800A769B2 /* verify.c in Sources */, + 1A6416B618FADF2E00A769B2 /* overlay_buffer.c in Sources */, + 1A6416E918FADF4A00A769B2 /* encode.c in Sources */, + 1A64183918FB1CC400A769B2 /* fe_mul.c in Sources */, + 1A6416D818FADF2E00A769B2 /* srandomdev.c in Sources */, + 1A64182918FB17EC00A769B2 /* ccsds_tables.c in Sources */, + 1A64168F18FADF2E00A769B2 /* conf_om.c in Sources */, + 1A6416AF18FADF2E00A769B2 /* monitor.c in Sources */, + 1A6417D218FADF6800A769B2 /* keypair.c in Sources */, + 1A64169718FADF2E00A769B2 /* directory_client.c in Sources */, + 1A64183E18FB1CC400A769B2 /* fe_sub.c in Sources */, + 1A6416A318FADF2E00A769B2 /* log_util.c in Sources */, + 1A6416B318FADF2E00A769B2 /* nonce.c in Sources */, + 1A6416C418FADF2E00A769B2 /* rhizome_bundle.c in Sources */, + 1A6416DC18FADF2E00A769B2 /* strlcpy.c in Sources */, + 1A64169C18FADF2E00A769B2 /* fifo.c in Sources */, + 1A6416CB18FADF2E00A769B2 /* rhizome_packetformats.c in Sources */, + 1A64184A18FB1CC400A769B2 /* ge_p3_0.c in Sources */, + 1A64185418FB1CC400A769B2 /* open.c in Sources */, + 1A64184218FB1CC400A769B2 /* ge_double_scalarmult.c in Sources */, + 1A6417CF18FADF6800A769B2 /* after.c in Sources */, + 1A6416D618FADF2E00A769B2 /* sighandlers.c in Sources */, + 1A6417DA18FADF6800A769B2 /* blocks.c in Sources */, + 1A6416E018FADF2E00A769B2 /* uuid.c in Sources */, + 1A64184718FB1CC400A769B2 /* ge_p1p1_to_p3.c in Sources */, + 1A6416D218FADF2E00A769B2 /* serval_packetvisualise.c in Sources */, + 1A6416B418FADF2E00A769B2 /* os.c in Sources */, + 1A64183A18FB1CC400A769B2 /* fe_neg.c in Sources */, + 1A6416EA18FADF4A00A769B2 /* sqlite3.c in Sources */, + 1A64169E18FADF2E00A769B2 /* http_server.c in Sources */, + 1A64183618FB1CC400A769B2 /* fe_invert.c in Sources */, + 1A6416AE18FADF2E00A769B2 /* monitor-client.c in Sources */, + 1A6417CB18FADF6800A769B2 /* hmac.c in Sources */, + 1A6416DA18FADF2E00A769B2 /* strbuf_helpers.c in Sources */, + 1A64183718FB1CC400A769B2 /* fe_isnegative.c in Sources */, + 1A6417D118FADF6800A769B2 /* box.c in Sources */, + 1A6416DB18FADF2E00A769B2 /* strbuf.c in Sources */, + 1A64169518FADF2E00A769B2 /* crypto.c in Sources */, + 1A64185218FB1CC400A769B2 /* ge_tobytes.c in Sources */, + 1A6416D718FADF2E00A769B2 /* socket.c in Sources */, + 1A6416A018FADF2E00A769B2 /* instance.c in Sources */, + 1A64181118FADF6800A769B2 /* stream.c in Sources */, + 1A6416E318FADF2E00A769B2 /* vomp.c in Sources */, + 1A64181418FADF6800A769B2 /* verify.c in Sources */, + 1A6416C518FADF2E00A769B2 /* rhizome_crypto.c in Sources */, + 1A6416B518FADF2E00A769B2 /* overlay_address.c in Sources */, + 1A64183818FB1CC400A769B2 /* fe_isnonzero.c in Sources */, + 1A64185118FB1CC400A769B2 /* ge_sub.c in Sources */, + 1A6416CF18FADF2E00A769B2 /* rhizome.c in Sources */, + 1A6416C718FADF2E00A769B2 /* rhizome_direct_http.c in Sources */, + 1A64184B18FB1CC400A769B2 /* ge_p3_dbl.c in Sources */, + 1A6416A718FADF2E00A769B2 /* mdp_client.c in Sources */, + 1A6416B918FADF2E00A769B2 /* overlay_mdp_services.c in Sources */, + 1A6416C118FADF2E00A769B2 /* performance_timing.c in Sources */, + 1A6417DB18FADF6800A769B2 /* auth.c in Sources */, + 1A64184F18FB1CC400A769B2 /* ge_precomp_0.c in Sources */, + 1A6417D318FADF6800A769B2 /* core.c in Sources */, + 1A6416A518FADF2E00A769B2 /* lsif.c in Sources */, + 1A6417CE18FADF6800A769B2 /* verify.c in Sources */, + 1A64185818FB1CC400A769B2 /* sign.c in Sources */, + 1A6416A818FADF2E00A769B2 /* mdp_filter.c in Sources */, + 1A6416B018FADF2E00A769B2 /* msp_client.c in Sources */, + 1A64184518FB1CC400A769B2 /* ge_msub.c in Sources */, + 1A6417DD18FADF6800A769B2 /* base.c in Sources */, + 1A6417D718FADF6800A769B2 /* hash.c in Sources */, + 1A64181018FADF6800A769B2 /* xor.c in Sources */, + 1A6416C918FADF2E00A769B2 /* rhizome_fetch.c in Sources */, + 1A6417CD18FADF6800A769B2 /* hmac.c in Sources */, + 1A6416E418FADF2E00A769B2 /* xprintf.c in Sources */, + 1A64181218FADF6800A769B2 /* xor.c in Sources */, + 1A64185318FB1CC400A769B2 /* keypair.c in Sources */, + 1A6416BB18FADF2E00A769B2 /* overlay_olsr.c in Sources */, + 1A6416E118FADF2E00A769B2 /* version_servald.c in Sources */, + 1A6416AB18FADF2E00A769B2 /* meshms_restful.c in Sources */, + 1A64169918FADF2E00A769B2 /* dna_helper.c in Sources */, + 1A6416BE18FADF2E00A769B2 /* overlay_payload.c in Sources */, + 1A6416C018FADF2E00A769B2 /* overlay.c in Sources */, + 1A6416D018FADF2E00A769B2 /* rotbuf.c in Sources */, + 1A64180C18FADF6800A769B2 /* xor.c in Sources */, + 1A64181518FADF6800A769B2 /* PROTOTYPES.c in Sources */, + 1A6416BA18FADF2E00A769B2 /* overlay_mdp.c in Sources */, + 1A64183018FB1C7600A769B2 /* fe_0.c in Sources */, + 1A6416AA18FADF2E00A769B2 /* mem.c in Sources */, + 1A6417D018FADF6800A769B2 /* before.c in Sources */, + 1A6416AD18FADF2E00A769B2 /* monitor-cli.c in Sources */, + 1A6416B218FADF2E00A769B2 /* net.c in Sources */, + 1A6416A918FADF2E00A769B2 /* mdp_net.c in Sources */, + 1A64184C18FB1CC400A769B2 /* ge_p3_to_cached.c in Sources */, + 1A6417D518FADF6800A769B2 /* core.c in Sources */, + 1A6417D918FADF6800A769B2 /* blocks.c in Sources */, + 1A64185618FB1CC400A769B2 /* sc_muladd.c in Sources */, + 1A64185518FB1CC400A769B2 /* sc25519.c in Sources */, + 1A6416E218FADF2E00A769B2 /* vomp_console.c in Sources */, + 1A64182A18FB17EC00A769B2 /* decode_rs_8.c in Sources */, + 1A6416C218FADF2E00A769B2 /* radio_link.c in Sources */, + 1A64183F18FB1CC400A769B2 /* fe_tobytes.c in Sources */, + 1A64185018FB1CC400A769B2 /* ge_scalarmult_base.c in Sources */, + 1A6416D118FADF2E00A769B2 /* route_link.c in Sources */, + 1A64183118FB1C7600A769B2 /* fe_1.c in Sources */, + 1A64169218FADF2E00A769B2 /* conf.c in Sources */, + 1A6416A618FADF2E00A769B2 /* main.c in Sources */, + 1A64183C18FB1CC400A769B2 /* fe_sq.c in Sources */, + 1A64184918FB1CC400A769B2 /* ge_p2_dbl.c in Sources */, + 1A64169618FADF2E00A769B2 /* dataformats.c in Sources */, + 1A64169118FADF2E00A769B2 /* conf_schema.c in Sources */, + 1A64183D18FB1CC400A769B2 /* fe_sq2.c in Sources */, + 1A6416D418FADF2E00A769B2 /* server.c in Sources */, + 1A6416CC18FADF2E00A769B2 /* rhizome_restful.c in Sources */, + 1A64183318FB1CC400A769B2 /* fe_cmov.c in Sources */, + 1A6416CE18FADF2E00A769B2 /* rhizome_sync.c in Sources */, + 1A64184318FB1CC400A769B2 /* ge_frombytes.c in Sources */, + 1A6417DF18FADF6800A769B2 /* box.c in Sources */, + 1A64184D18FB1CC400A769B2 /* ge_p3_to_p2.c in Sources */, + 1A6416A218FADF2E00A769B2 /* keyring.c in Sources */, + 1A64183218FB1CC400A769B2 /* fe_add.c in Sources */, + 1A64169D18FADF2E00A769B2 /* golay.c in Sources */, + 1A64169F18FADF2E00A769B2 /* httpd.c in Sources */, + 1A6417DE18FADF6800A769B2 /* smult.c in Sources */, + 1A64180D18FADF6800A769B2 /* stream.c in Sources */, + 1A6416BC18FADF2E00A769B2 /* overlay_packetformats.c in Sources */, + 1A6417D418FADF6800A769B2 /* core.c in Sources */, + 1A64183518FB1CC400A769B2 /* fe_frombytes.c in Sources */, + 1A64184018FB1CC400A769B2 /* ge25519.c in Sources */, + 1A6416B818FADF2E00A769B2 /* overlay_link.c in Sources */, + 1A6416BD18FADF2E00A769B2 /* overlay_packetradio.c in Sources */, + 1A64183B18FB1CC400A769B2 /* fe_pow22523.c in Sources */, + 1A6416D518FADF2E00A769B2 /* sha2.c in Sources */, + 1A6416BF18FADF2E00A769B2 /* overlay_queue.c in Sources */, + 1A6416CD18FADF2E00A769B2 /* rhizome_store.c in Sources */, + 1A64184418FB1CC400A769B2 /* ge_madd.c in Sources */, + 1A64180F18FADF6800A769B2 /* stream.c in Sources */, + 1A64169018FADF2E00A769B2 /* conf_parse.c in Sources */, + 1A6416C318FADF2E00A769B2 /* randombytes.c in Sources */, + 1A64185718FB1CC400A769B2 /* sc_reduce.c in Sources */, + 1A6416CA18FADF2E00A769B2 /* rhizome_http.c in Sources */, + 1A6416B718FADF2E00A769B2 /* overlay_interface.c in Sources */, + 1A64169418FADF2E00A769B2 /* context1.c in Sources */, + 1A6416D918FADF2E00A769B2 /* str.c in Sources */, + 1A64183418FB1CC400A769B2 /* fe_copy.c in Sources */, + 1A64184118FB1CC400A769B2 /* ge_add.c in Sources */, + 1A6417CC18FADF6800A769B2 /* verify.c in Sources */, + 1A6416C818FADF2E00A769B2 /* rhizome_direct.c in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + /* Begin XCBuildConfiguration section */ 1A5334B918F087B500C7BD93 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; }; name = Debug; }; 1A5334BA18F087B500C7BD93 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + SDKROOT = iphoneos; }; name = Release; }; - 1A5334BC18F087B500C7BD93 /* Debug */ = { + 1A64162C18FADE6500A769B2 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DSTROOT = /tmp/serval.dst; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PRECOMPILE_PREFIX_HEADER = NO; + GCC_PREFIX_HEADER = "serval/serval-Prefix.pch"; + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../nacl/include\""; + IPHONEOS_DEPLOYMENT_TARGET = 7.1; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; }; name = Debug; }; - 1A5334BD18F087B500C7BD93 /* Release */ = { + 1A64162D18FADE6500A769B2 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = YES; + DSTROOT = /tmp/serval.dst; + ENABLE_NS_ASSERTIONS = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_PRECOMPILE_PREFIX_HEADER = NO; + GCC_PREFIX_HEADER = "serval/serval-Prefix.pch"; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = "\"$(SRCROOT)/../nacl/include\""; + IPHONEOS_DEPLOYMENT_TARGET = 7.1; + OTHER_LDFLAGS = "-ObjC"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SKIP_INSTALL = YES; + VALIDATE_PRODUCT = YES; }; name = Release; }; @@ -199,14 +1456,13 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 1A5334BB18F087B500C7BD93 /* Build configuration list for PBXLegacyTarget "libserval" */ = { + 1A64163018FADE6500A769B2 /* Build configuration list for PBXNativeTarget "serval" */ = { isa = XCConfigurationList; buildConfigurations = ( - 1A5334BC18F087B500C7BD93 /* Debug */, - 1A5334BD18F087B500C7BD93 /* Release */, + 1A64162C18FADE6500A769B2 /* Debug */, + 1A64162D18FADE6500A769B2 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/ios/serval/serval-Prefix.pch b/ios/serval/serval-Prefix.pch new file mode 100644 index 00000000..79f682f8 --- /dev/null +++ b/ios/serval/serval-Prefix.pch @@ -0,0 +1,11 @@ +// +// Prefix header +// +// The contents of this file are implicitly included at the beginning of every source file. +// + +//#ifdef __OBJC__ +// #import +//#endif + +#include "confdefs.h" From c4a9c2a804a2d2c65ef7c51e7c8eb97478f8aeef Mon Sep 17 00:00:00 2001 From: James Moore Date: Sun, 13 Apr 2014 20:23:51 -0700 Subject: [PATCH 29/33] renamed function to avoid a conflict on iOS --- rhizome_database.c | 4 ++-- uuid.c | 2 +- uuid.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rhizome_database.c b/rhizome_database.c index b3c35e90..868e5438 100644 --- a/rhizome_database.c +++ b/rhizome_database.c @@ -289,7 +289,7 @@ int rhizome_opendb() if (r) { if (!str_to_uuid(buf, &rhizome_db_uuid, NULL)) { WHYF("IDENTITY table contains malformed UUID %s -- overwriting", alloca_str_toprint(buf)); - if (uuid_generate_random(&rhizome_db_uuid) == -1) + if (serval_uuid_generate_random(&rhizome_db_uuid) == -1) RETURN(WHY("Cannot generate new UUID for Rhizome database")); if (sqlite_exec_void_retry(&retry, "UPDATE IDENTITY SET uuid = ? LIMIT 1;", SERVAL_UUID_T, &rhizome_db_uuid, END) == -1) RETURN(WHY("Failed to update new UUID in Rhizome database")); @@ -297,7 +297,7 @@ int rhizome_opendb() DEBUGF("Updated Rhizome database UUID to %s", alloca_uuid_str(rhizome_db_uuid)); } } else if (r == 0) { - if (uuid_generate_random(&rhizome_db_uuid) == -1) + if (serval_uuid_generate_random(&rhizome_db_uuid) == -1) RETURN(WHY("Cannot generate UUID for Rhizome database")); if (sqlite_exec_void_retry(&retry, "INSERT INTO IDENTITY (uuid) VALUES (?);", SERVAL_UUID_T, &rhizome_db_uuid, END) == -1) RETURN(WHY("Failed to insert UUID into Rhizome database")); diff --git a/uuid.c b/uuid.c index 88c4696c..b259f04e 100644 --- a/uuid.c +++ b/uuid.c @@ -55,7 +55,7 @@ void uuid_set_version(serval_uuid_t *uuid, enum uuid_version version) uuid->u.record.time_hi_and_version = htons((ntohs(uuid->u.record.time_hi_and_version) & 0xfff) | version_bits); } -int uuid_generate_random(serval_uuid_t *uuid) +int serval_uuid_generate_random(serval_uuid_t *uuid) { if (urandombytes(uuid->u.binary, sizeof uuid->u.binary) == -1) return -1; diff --git a/uuid.h b/uuid.h index 12749f0b..2670c4ea 100644 --- a/uuid.h +++ b/uuid.h @@ -89,7 +89,7 @@ void uuid_set_version(serval_uuid_t *valid_uuid, enum uuid_version); /* Returns -1 if error (eg, cannot open /dev/urandom), 0 if successful. */ -int uuid_generate_random(serval_uuid_t *dest_uuid); +int serval_uuid_generate_random(serval_uuid_t *dest_uuid); /* Formats the given valid UUID in its canonical string representation: * XXXXXXXX-VXXX-MXXX-XXXXXXXXXXXX From 266c1597e3effed3ef188369e74bc169a1593923 Mon Sep 17 00:00:00 2001 From: James Moore Date: Sun, 13 Apr 2014 20:24:46 -0700 Subject: [PATCH 30/33] switched headers --- ios/libserval.xcodeproj/project.pbxproj | 78 ++++++++++++------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/ios/libserval.xcodeproj/project.pbxproj b/ios/libserval.xcodeproj/project.pbxproj index d09677b5..879312e1 100644 --- a/ios/libserval.xcodeproj/project.pbxproj +++ b/ios/libserval.xcodeproj/project.pbxproj @@ -181,44 +181,44 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 1A13A3DA18F0CD9B00A6233B /* cli.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cli.h; path = ../build/include/cli.h; sourceTree = ""; }; - 1A13A3DB18F0CD9B00A6233B /* conf_schema.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = conf_schema.h; path = ../build/include/conf_schema.h; sourceTree = ""; }; - 1A13A3DC18F0CD9B00A6233B /* conf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = conf.h; path = ../build/include/conf.h; sourceTree = ""; }; - 1A13A3DD18F0CD9B00A6233B /* confdefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = confdefs.h; path = ../../build/include/confdefs.h; sourceTree = ""; }; - 1A13A3DE18F0CD9B00A6233B /* constants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = constants.h; path = ../build/include/constants.h; sourceTree = ""; }; - 1A13A3DF18F0CD9B00A6233B /* crypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = crypto.h; path = ../build/include/crypto.h; sourceTree = ""; }; - 1A13A3E018F0CD9B00A6233B /* dataformats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dataformats.h; path = ../build/include/dataformats.h; sourceTree = ""; }; - 1A13A3E118F0CD9B00A6233B /* fdqueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fdqueue.h; path = ../build/include/fdqueue.h; sourceTree = ""; }; - 1A13A3E218F0CD9B00A6233B /* fifo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fifo.h; path = ../build/include/fifo.h; sourceTree = ""; }; - 1A13A3E318F0CD9B00A6233B /* golay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = golay.h; path = ../build/include/golay.h; sourceTree = ""; }; - 1A13A3E418F0CD9B00A6233B /* http_server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = http_server.h; path = ../build/include/http_server.h; sourceTree = ""; }; - 1A13A3E518F0CD9B00A6233B /* httpd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = httpd.h; path = ../build/include/httpd.h; sourceTree = ""; }; - 1A13A3E618F0CD9B00A6233B /* instance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = instance.h; path = ../build/include/instance.h; sourceTree = ""; }; - 1A13A3E718F0CD9B00A6233B /* keyring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = keyring.h; path = ../build/include/keyring.h; sourceTree = ""; }; - 1A13A3E818F0CD9B00A6233B /* log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = log.h; path = ../build/include/log.h; sourceTree = ""; }; - 1A13A3E918F0CD9B00A6233B /* mdp_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mdp_client.h; path = ../build/include/mdp_client.h; sourceTree = ""; }; - 1A13A3EA18F0CD9B00A6233B /* mem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mem.h; path = ../build/include/mem.h; sourceTree = ""; }; - 1A13A3EB18F0CD9B00A6233B /* meshms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = meshms.h; path = ../build/include/meshms.h; sourceTree = ""; }; - 1A13A3EC18F0CD9B00A6233B /* monitor-client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "monitor-client.h"; path = "../build/include/monitor-client.h"; sourceTree = ""; }; - 1A13A3ED18F0CD9B00A6233B /* msp_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = msp_client.h; path = ../build/include/msp_client.h; sourceTree = ""; }; - 1A13A3EE18F0CD9B00A6233B /* net.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = net.h; path = ../build/include/net.h; sourceTree = ""; }; - 1A13A3EF18F0CD9B00A6233B /* os.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = os.h; path = ../build/include/os.h; sourceTree = ""; }; - 1A13A3F018F0CD9B00A6233B /* overlay_address.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = overlay_address.h; path = ../build/include/overlay_address.h; sourceTree = ""; }; - 1A13A3F118F0CD9B00A6233B /* overlay_buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = overlay_buffer.h; path = ../build/include/overlay_buffer.h; sourceTree = ""; }; - 1A13A3F218F0CD9B00A6233B /* overlay_interface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = overlay_interface.h; path = ../build/include/overlay_interface.h; sourceTree = ""; }; - 1A13A3F318F0CD9B00A6233B /* overlay_packet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = overlay_packet.h; path = ../build/include/overlay_packet.h; sourceTree = ""; }; - 1A13A3F418F0CD9B00A6233B /* radio_link.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = radio_link.h; path = ../build/include/radio_link.h; sourceTree = ""; }; - 1A13A3F518F0CD9B00A6233B /* rhizome.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rhizome.h; path = ../build/include/rhizome.h; sourceTree = ""; }; - 1A13A3F618F0CD9B00A6233B /* rotbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rotbuf.h; path = ../build/include/rotbuf.h; sourceTree = ""; }; - 1A13A3F718F0CD9B00A6233B /* serval.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = serval.h; path = ../build/include/serval.h; sourceTree = ""; }; - 1A13A3F818F0CD9B00A6233B /* sha2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sha2.h; path = ../build/include/sha2.h; sourceTree = ""; }; - 1A13A3F918F0CD9B00A6233B /* socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = socket.h; path = ../build/include/socket.h; sourceTree = ""; }; - 1A13A3FA18F0CD9B00A6233B /* str.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = str.h; path = ../build/include/str.h; sourceTree = ""; }; - 1A13A3FB18F0CD9B00A6233B /* strbuf_helpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = strbuf_helpers.h; path = ../build/include/strbuf_helpers.h; sourceTree = ""; }; - 1A13A3FC18F0CD9B00A6233B /* strbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = strbuf.h; path = ../build/include/strbuf.h; sourceTree = ""; }; - 1A13A3FD18F0CD9B00A6233B /* strlcpy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = strlcpy.h; path = ../build/include/strlcpy.h; sourceTree = ""; }; - 1A13A3FE18F0CD9B00A6233B /* uuid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = uuid.h; path = ../build/include/uuid.h; sourceTree = ""; }; - 1A13A3FF18F0CD9B00A6233B /* xprintf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = xprintf.h; path = ../build/include/xprintf.h; sourceTree = ""; }; + 1A13A3DA18F0CD9B00A6233B /* cli.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cli.h; sourceTree = ""; }; + 1A13A3DB18F0CD9B00A6233B /* conf_schema.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = conf_schema.h; sourceTree = ""; }; + 1A13A3DC18F0CD9B00A6233B /* conf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = conf.h; sourceTree = ""; }; + 1A13A3DD18F0CD9B00A6233B /* confdefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = confdefs.h; path = ../confdefs.h; sourceTree = ""; }; + 1A13A3DE18F0CD9B00A6233B /* constants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = constants.h; sourceTree = ""; }; + 1A13A3DF18F0CD9B00A6233B /* crypto.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto.h; sourceTree = ""; }; + 1A13A3E018F0CD9B00A6233B /* dataformats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dataformats.h; sourceTree = ""; }; + 1A13A3E118F0CD9B00A6233B /* fdqueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fdqueue.h; sourceTree = ""; }; + 1A13A3E218F0CD9B00A6233B /* fifo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fifo.h; sourceTree = ""; }; + 1A13A3E318F0CD9B00A6233B /* golay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = golay.h; sourceTree = ""; }; + 1A13A3E418F0CD9B00A6233B /* http_server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = http_server.h; sourceTree = ""; }; + 1A13A3E518F0CD9B00A6233B /* httpd.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = httpd.h; sourceTree = ""; }; + 1A13A3E618F0CD9B00A6233B /* instance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = instance.h; sourceTree = ""; }; + 1A13A3E718F0CD9B00A6233B /* keyring.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keyring.h; sourceTree = ""; }; + 1A13A3E818F0CD9B00A6233B /* log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = log.h; sourceTree = ""; }; + 1A13A3E918F0CD9B00A6233B /* mdp_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mdp_client.h; sourceTree = ""; }; + 1A13A3EA18F0CD9B00A6233B /* mem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mem.h; sourceTree = ""; }; + 1A13A3EB18F0CD9B00A6233B /* meshms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = meshms.h; sourceTree = ""; }; + 1A13A3EC18F0CD9B00A6233B /* monitor-client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "monitor-client.h"; sourceTree = ""; }; + 1A13A3ED18F0CD9B00A6233B /* msp_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = msp_client.h; sourceTree = ""; }; + 1A13A3EE18F0CD9B00A6233B /* net.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = net.h; sourceTree = ""; }; + 1A13A3EF18F0CD9B00A6233B /* os.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = os.h; sourceTree = ""; }; + 1A13A3F018F0CD9B00A6233B /* overlay_address.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = overlay_address.h; sourceTree = ""; }; + 1A13A3F118F0CD9B00A6233B /* overlay_buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = overlay_buffer.h; sourceTree = ""; }; + 1A13A3F218F0CD9B00A6233B /* overlay_interface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = overlay_interface.h; sourceTree = ""; }; + 1A13A3F318F0CD9B00A6233B /* overlay_packet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = overlay_packet.h; sourceTree = ""; }; + 1A13A3F418F0CD9B00A6233B /* radio_link.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = radio_link.h; sourceTree = ""; }; + 1A13A3F518F0CD9B00A6233B /* rhizome.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rhizome.h; sourceTree = ""; }; + 1A13A3F618F0CD9B00A6233B /* rotbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rotbuf.h; sourceTree = ""; }; + 1A13A3F718F0CD9B00A6233B /* serval.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = serval.h; sourceTree = ""; }; + 1A13A3F818F0CD9B00A6233B /* sha2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sha2.h; sourceTree = ""; }; + 1A13A3F918F0CD9B00A6233B /* socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = socket.h; sourceTree = ""; }; + 1A13A3FA18F0CD9B00A6233B /* str.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = str.h; sourceTree = ""; }; + 1A13A3FB18F0CD9B00A6233B /* strbuf_helpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = strbuf_helpers.h; sourceTree = ""; }; + 1A13A3FC18F0CD9B00A6233B /* strbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = strbuf.h; sourceTree = ""; }; + 1A13A3FD18F0CD9B00A6233B /* strlcpy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = strlcpy.h; sourceTree = ""; }; + 1A13A3FE18F0CD9B00A6233B /* uuid.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = uuid.h; sourceTree = ""; }; + 1A13A3FF18F0CD9B00A6233B /* xprintf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xprintf.h; sourceTree = ""; }; 1A64160C18FADE6500A769B2 /* libserval.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libserval.a; sourceTree = BUILT_PRODUCTS_DIR; }; 1A64161218FADE6500A769B2 /* serval-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "serval-Prefix.pch"; sourceTree = ""; }; 1A64163418FADF2E00A769B2 /* cli.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cli.c; path = ../../cli.c; sourceTree = ""; }; @@ -568,7 +568,7 @@ ); name = headers; path = ..; - sourceTree = ""; + sourceTree = SOURCE_ROOT; }; 1A5334B318F087B500C7BD93 = { isa = PBXGroup; From e057e5655a49409cf29a7ea6c792952c3a825ae3 Mon Sep 17 00:00:00 2001 From: James Moore Date: Mon, 14 Apr 2014 20:12:40 -0700 Subject: [PATCH 31/33] got the last of the defines fixed up --- ios/confdefs.h | 1 - ios/libserval.xcodeproj/project.pbxproj | 30 +++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/ios/confdefs.h b/ios/confdefs.h index f01ab883..55efad0c 100644 --- a/ios/confdefs.h +++ b/ios/confdefs.h @@ -42,7 +42,6 @@ #define HAVE_NET_IF_H 1 #define HAVE_NETINET_IN_H 1 #define HAVE_IFADDRS_H 1 -#define HAVE_NET_ROUTE_H 1 #define HAVE_SIGNAL_H 1 #define HAVE_SYS_FILIO_H 1 #define HAVE_SYS_SOCKIO_H 1 diff --git a/ios/libserval.xcodeproj/project.pbxproj b/ios/libserval.xcodeproj/project.pbxproj index 879312e1..d81781c1 100644 --- a/ios/libserval.xcodeproj/project.pbxproj +++ b/ios/libserval.xcodeproj/project.pbxproj @@ -1390,8 +1390,20 @@ GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "serval/serval-Prefix.pch"; + "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*]" = ( + "LOCALSTATEDIR=\"\\\"/Library/servald\\\"\"", + "SYSCONFDIR=\"\\\"/Library/servald\\\"\"", + "SERVALD_VERSION=\"\\\"iOS\\\"\"", + "SERVALD_COPYRIGHT=\"\\\"XXX\\\"\"", + ); + "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = ( + "LOCALSTATEDIR=\"\\\"/tmp/servald/\\\"\"", + "SYSCONFDIR=\"\\\"/tmp/servald/etc\\\"\"", + "SERVALD_VERSION=\"\\\"iOS\\\"\"", + "SERVALD_COPYRIGHT=\"\\\"XXX\\\"\"", + ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; @@ -1403,6 +1415,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 7.1; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; + RUN_CLANG_STATIC_ANALYZER = NO; SKIP_INSTALL = YES; }; name = Debug; @@ -1427,8 +1440,20 @@ DSTROOT = /tmp/serval.dst; ENABLE_NS_ASSERTIONS = NO; GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_PRECOMPILE_PREFIX_HEADER = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "serval/serval-Prefix.pch"; + "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*]" = ( + "LOCALSTATEDIR=\"\\\"/Library/servald\\\"\"", + "SYSCONFDIR=\"\\\"/Library/servald\\\"\"", + "SERVALD_VERSION=\"\\\"iOS\\\"\"", + "SERVALD_COPYRIGHT=\"\\\"XXX\\\"\"", + ); + "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = ( + "LOCALSTATEDIR=\"\\\"/tmp/servald/\\\"\"", + "SYSCONFDIR=\"\\\"/tmp/servald/etc\\\"\"", + "SERVALD_VERSION=\"\\\"iOS\\\"\"", + "SERVALD_COPYRIGHT=\"\\\"XXX\\\"\"", + ); GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; GCC_WARN_UNDECLARED_SELECTOR = YES; @@ -1439,6 +1464,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 7.1; OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; + RUN_CLANG_STATIC_ANALYZER = NO; SKIP_INSTALL = YES; VALIDATE_PRODUCT = YES; }; From 3f5f6e956e47af1da11bc22710a91c82d5f0e3b4 Mon Sep 17 00:00:00 2001 From: James Moore Date: Mon, 14 Apr 2014 20:27:16 -0700 Subject: [PATCH 32/33] we need these types --- ios/serval/serval-Prefix.pch | 1 + 1 file changed, 1 insertion(+) diff --git a/ios/serval/serval-Prefix.pch b/ios/serval/serval-Prefix.pch index 79f682f8..7091f0df 100644 --- a/ios/serval/serval-Prefix.pch +++ b/ios/serval/serval-Prefix.pch @@ -9,3 +9,4 @@ //#endif #include "confdefs.h" +#include \ No newline at end of file From 3ed5ac6b1f16dd2690d43acf6627b48fe0424486 Mon Sep 17 00:00:00 2001 From: James Moore Date: Mon, 14 Apr 2014 20:34:35 -0700 Subject: [PATCH 33/33] removed trailing slashes --- ios/libserval.xcodeproj/project.pbxproj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ios/libserval.xcodeproj/project.pbxproj b/ios/libserval.xcodeproj/project.pbxproj index d81781c1..201a2f3f 100644 --- a/ios/libserval.xcodeproj/project.pbxproj +++ b/ios/libserval.xcodeproj/project.pbxproj @@ -1399,7 +1399,7 @@ "SERVALD_COPYRIGHT=\"\\\"XXX\\\"\"", ); "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = ( - "LOCALSTATEDIR=\"\\\"/tmp/servald/\\\"\"", + "LOCALSTATEDIR=\"\\\"/tmp/servald\\\"\"", "SYSCONFDIR=\"\\\"/tmp/servald/etc\\\"\"", "SERVALD_VERSION=\"\\\"iOS\\\"\"", "SERVALD_COPYRIGHT=\"\\\"XXX\\\"\"", @@ -1449,7 +1449,7 @@ "SERVALD_COPYRIGHT=\"\\\"XXX\\\"\"", ); "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = ( - "LOCALSTATEDIR=\"\\\"/tmp/servald/\\\"\"", + "LOCALSTATEDIR=\"\\\"/tmp/servald\\\"\"", "SYSCONFDIR=\"\\\"/tmp/servald/etc\\\"\"", "SERVALD_VERSION=\"\\\"iOS\\\"\"", "SERVALD_COPYRIGHT=\"\\\"XXX\\\"\"", @@ -1489,6 +1489,7 @@ 1A64162D18FADE6500A769B2 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ };