diff --git a/.travis.yml b/.travis.yml index 3e760dad..dc68d676 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ script: Scripts/cibuild deploy: provider: releases api_key: - secure: L/cNyt66n6D2CxGAN4QZxr/G29U1DD6MTGykB4MBfh7jnZcFVODN3pyuVGIcJ6d8mnfhPCcYar+y3LoyUHMFZMRRTr+gfji8rzG4xO1imTlg2iUS6JoLlqJYkGtU5iZJgISMpHovTwcejLAFIqDcZd/sKcdbV8ONQ8bzQ8ef07VftFGl+vzjgoGRMLYh2jW7bRYWPLX2Cd5EBwGZEm8xdzRN2TUOqTExtLr49OVOY4ZoI/C0MM5SLvFrYUuMwZ/702AQRrp6KfdCXE+vQbNvdSjEwrqcwTtUOgm8SZgL24/23BzbVhNUZ2xBTnc+xz5OrrG3CZAMrfxaHFVJdxMHS/yCovhnpOhY3mv8EjnAKmkkp1ClpPe5Lyc97rER1VMNjol0x4pIMkrue3xaary5LWfpbWorxR4P+Hi73A5vSmXO+9KF0DLs06i2Io3hdc3Bnb7xAE7agxzGqbvWrXLULAC1HY++H5QKEsWTpELRq1ZxYw8QT80dWCqnbjP0jkHEwOcwx8zY7AZWySPdOwdteb93DjzJ2ZEkdo9bpvhkZpxmHvo8CwlqVtc1SQrYl0DU+O+AJp8gwxhvrqEYBJqXKkWP0enMHMD/7PvggJIA/m4lJl87JtLIUiksFLoSdsnq6+OmDFcN53x+nIqD3tbX5nGhDosdKijEeeCSXFNrAcw= + secure: YLp5tePMt+kFha5nT43+CHTm31LN1UOJCt6zZ1sEkdmpiZx6XyexJDaZoSxB3BlTTcCDA1DGcMyBP9+mly5TYl/0I5FTsR4HDenYHBl09qHzFJ1aeGrM+mxT7RV4dmgIf4/Czb+Zau0Zr2TDe23uHdyMKoGOpIbKasajw4U4zk2ozn8SpZaZ23MMVq3oNCJEJthfXH8Qr74gy8hooj1VjT7CGPX4gLXThDRlRq5mdeE46jS5OcOXKNPHbeYC/5MWrm2eFPLJgKiFvJ/1FsxE6i3OdSbBn+Yhp0UlNR9/qalvyCYofD4cePy1jsTcDqCxqDX6uspWqaTvVVluNlwfsKsVWHaO60cKjEYupIymtgWEIWDMEK40bgAaejp20OkD+vuvY/+eUNdAZhqE+C/QTTuanyHR6BRk8it2217xtqEuRP5MKAckH2mTgA5qWwYDfL7mPTX9gHcwOAZMb9F+JVdF23CGNUAt7lL+6+QUpONzCOq6VX7Mox3Scp5h4v5i5OtmB2qPp0LjfgwkbDIic9CA0tjBPyX3IokI1pQU7BgOS7QqZI5kkaeG88pt2aaOMx85EhvK+CGT7I9mryiyUMSalRjqNbZDxA1shPnbZDWN4PtfkyreeLQ3UhYPUID2w4i/5txE73JMTJKHLRcAATuu0rK8+LkIBBO0we17KLM= file: Platinum.framework.zip skip_cleanup: true on: diff --git a/Build/Targets/universal-apple-macosx/Platinum.xcodeproj/project.pbxproj b/Build/Targets/universal-apple-macosx/Platinum.xcodeproj/project.pbxproj index 83a7aee9..bebf72e7 100644 --- a/Build/Targets/universal-apple-macosx/Platinum.xcodeproj/project.pbxproj +++ b/Build/Targets/universal-apple-macosx/Platinum.xcodeproj/project.pbxproj @@ -294,8 +294,6 @@ E44E2B861AE761220092347B /* PltDeviceData.h in Headers */ = {isa = PBXBuildFile; fileRef = E43155090D6FFDEB00899579 /* PltDeviceData.h */; settings = {ATTRIBUTES = (Public, ); }; }; E44E2BC41AE76E0F0092347B /* Platinum.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E44E2B8B1AE761220092347B /* Platinum.framework */; }; E44E2BC51AE76E330092347B /* Platinum.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = E44E2B8B1AE761220092347B /* Platinum.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - E44E2BC61AE76E910092347B /* Neptune.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E44E2B8D1AE7622F0092347B /* Neptune.framework */; }; - E44E2BCA1AE76FF50092347B /* Neptune.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E40616C01ADE5C9A008BDAEB /* Neptune.framework */; }; E44E2BCB1AE76FF90092347B /* Neptune.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E44E2B8D1AE7622F0092347B /* Neptune.framework */; }; E44E2BCC1AE770150092347B /* Neptune.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E40616C01ADE5C9A008BDAEB /* Neptune.framework */; }; E44E2BCD1AE7701D0092347B /* Neptune.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E40616C01ADE5C9A008BDAEB /* Neptune.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; @@ -326,8 +324,10 @@ E45332B21AAED318004A52FD /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = E45332B11AAED318004A52FD /* main.m */; }; E45332B51AAED318004A52FD /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E45332B41AAED318004A52FD /* AppDelegate.m */; }; E45332B81AAED318004A52FD /* ViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = E45332B71AAED318004A52FD /* ViewController.mm */; }; + E45BD1F71FC95BFC00F1D812 /* Neptune.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E40616C01ADE5C9A008BDAEB /* Neptune.framework */; }; E48EAA811AF1EDD800D9EDC0 /* Neptune.h in Headers */ = {isa = PBXBuildFile; fileRef = E48EAA801AF1EDD800D9EDC0 /* Neptune.h */; settings = {ATTRIBUTES = (Public, ); }; }; E48EAA821AF1EDD800D9EDC0 /* Neptune.h in Headers */ = {isa = PBXBuildFile; fileRef = E48EAA801AF1EDD800D9EDC0 /* Neptune.h */; settings = {ATTRIBUTES = (Public, ); }; }; + E4B2A5A71FC90AE500C891D7 /* Neptune.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E44E2B8D1AE7622F0092347B /* Neptune.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -601,7 +601,7 @@ E42D3A9C0FDC85E70045379C /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; E42D3A9D0FDC85E70045379C /* PltMicroMediaController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PltMicroMediaController.cpp; sourceTree = ""; }; E42D3A9E0FDC85E70045379C /* PltMicroMediaController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PltMicroMediaController.h; sourceTree = ""; }; - E42D3AAB0FDC86A60045379C /* FileMediaServerTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileMediaServerTest.cpp; sourceTree = ""; }; + E42D3AAB0FDC86A60045379C /* FileMediaServerTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileMediaServerTest.cpp; sourceTree = ""; usesTabs = 0; }; E42D3AAD0FDC86A60045379C /* HttpTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HttpTest.cpp; sourceTree = ""; }; E42D3AAF0FDC86A60045379C /* PltLightSample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PltLightSample.h; sourceTree = ""; }; E42D3AB00FDC86A60045379C /* LightSampleTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LightSampleTest.cpp; sourceTree = ""; }; @@ -735,7 +735,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - E44E2BCA1AE76FF50092347B /* Neptune.framework in Frameworks */, + E45BD1F71FC95BFC00F1D812 /* Neptune.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -852,7 +852,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - E44E2BC61AE76E910092347B /* Neptune.framework in Frameworks */, + E4B2A5A71FC90AE500C891D7 /* Neptune.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1464,6 +1464,7 @@ E410161D1ACFA826000E994F /* Frameworks */, E410161E1ACFA826000E994F /* Headers */, E410161F1ACFA826000E994F /* Resources */, + E4B2A5A41FC8F8EB00C891D7 /* Copy Products to Carthage/Build/iOS */, ); buildRules = ( ); @@ -1688,6 +1689,7 @@ E44E2B571AE761220092347B /* Frameworks */, E44E2B591AE761220092347B /* Headers */, E44E2B871AE761220092347B /* Resources */, + E4B2A5A51FC8F8F100C891D7 /* Copy Products to Carthage/Build/iOS */, ); buildRules = ( ); @@ -1825,6 +1827,34 @@ shellPath = /bin/sh; shellScript = "# shell script goes here\n# Build the doxygen documentation for the project and load the docset into Xcode.\n\n# Use the following to adjust the value of the $DOXYGEN_PATH User-Defined Setting:\n# Binary install location: /Applications/Doxygen.app/Contents/Resources/doxygen\n# Source build install location: /usr/local/bin/doxygen\n\n\ncd \"$SOURCE_ROOT/../../../Docs/Doxygen\"\nDIR=\"$( cd \"$( dirname \"${BASH_SOURCE[0]}\" )\" && pwd )\"\necho $(pwd)\n\nif ! [ -f Doxyfile ] \nthen \n echo doxygen config file does not exist\nfi\n\nVERSION=$(python ../../Scripts/version.py)\n\n# Run doxygen on the updated config file.\n# Note: doxygen creates a Makefile that does most of the heavy lifting.\n\n( cat Doxyfile ; echo \"PROJECT_NUMBER=$VERSION\" ) | /usr/local/bin/doxygen -\n\n# make will invoke docsetutil. Take a look at the Makefile to see how this is done.\n\nmake -C Platinum-HTML install\n\n# Construct a temporary applescript file to tell Xcode to load a docset.\n\nrm -f \"$TEMP_DIR/loadDocSet.scpt\"\n\necho \"tell application \\\"Xcode\\\"\" >> \"$TEMP_DIR/loadDocSet.scpt\"\necho \"load documentation set with path \\\"/Users/$USER/Library/Developer/Shared/Documentation/DocSets/\\\"\" \n >> $TEMP_DIR/loadDocSet.scpt\necho \"end tell\" >> \"$TEMP_DIR/loadDocSet.scpt\"\n\n# Run the load-docset applescript command.\n\nosascript \"$TEMP_DIR/loadDocSet.scpt\"\n\nexit 0"; }; + E4B2A5A41FC8F8EB00C891D7 /* Copy Products to Carthage/Build/iOS */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Copy Products to Carthage/Build/iOS"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "build_dir=\"$SRCROOT/../../../Carthage/Build\"\n\n# Only copy when the Carthage/Build directory is a symlink\nif ! [ -L \"$build_dir\" ]; then exit 0; fi\n\nrsync --delete -av \"$BUILT_PRODUCTS_DIR/$PRODUCT_NAME\"* \"$build_dir/iOS\""; + }; + E4B2A5A51FC8F8F100C891D7 /* Copy Products to Carthage/Build/iOS */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Copy Products to Carthage/Build/iOS"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "build_dir=\"$SRCROOT/../../../Carthage/Build\"\n\n# Only copy when the Carthage/Build directory is a symlink\nif ! [ -L \"$build_dir\" ]; then exit 0; fi\n\nrsync --delete -av \"$BUILT_PRODUCTS_DIR/$PRODUCT_NAME\"* \"$build_dir/Mac\""; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -2228,6 +2258,7 @@ 1DEB91F108733DB70010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ENABLE_OBJC_ARC = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1.0; @@ -2275,7 +2306,6 @@ E410163B1ACFA826000E994F /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -2335,7 +2365,6 @@ E410163C1ACFA826000E994F /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -3134,7 +3163,6 @@ E44E2B891AE761220092347B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -3192,7 +3220,6 @@ E44E2B8A1AE761220092347B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ALWAYS_SEARCH_USER_PATHS = YES; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -3381,6 +3408,7 @@ E46270E90F81F4F8007FE869 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ENABLE_OBJC_ARC = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1.0; diff --git a/Cartfile b/Cartfile index 96357641..aecd951e 100644 --- a/Cartfile +++ b/Cartfile @@ -1,2 +1,2 @@ # Neptune -github "plutinosoft/Neptune" ~> 1.1.9 +github "plutinosoft/Neptune" ~> 1.2.2 diff --git a/Cartfile.private b/Cartfile.private new file mode 100644 index 00000000..df86d2ba --- /dev/null +++ b/Cartfile.private @@ -0,0 +1 @@ +github "Carthage/workflows" "master" \ No newline at end of file diff --git a/Cartfile.resolved b/Cartfile.resolved index 7f48ec35..4afe5639 100644 --- a/Cartfile.resolved +++ b/Cartfile.resolved @@ -1 +1,2 @@ -github "plutinosoft/Neptune" "1.1.11" +github "Carthage/workflows" "c99422ac2f77555707ed3ba9cefd4f788f229d21" +github "plutinosoft/Neptune" "1.2.3" diff --git a/Docs/Doxygen/html/PltHttp_8h_source.html b/Docs/Doxygen/html/PltHttp_8h_source.html index b95b3278..2a559ffc 100644 --- a/Docs/Doxygen/html/PltHttp_8h_source.html +++ b/Docs/Doxygen/html/PltHttp_8h_source.html @@ -218,35 +218,37 @@
180 #define PLT_LOG_HTTP_RESPONSE(_level,_prefix,_response) PLT_LOG_HTTP_RESPONSE_L(_NPT_LocalLogger,(_level),(_prefix),(_response))
181 
182 #else /* NPT_CONFIG_ENABLE_LOGGING */
-
183 #define PLT_LOG_HTTP_MESSAGE_L(_logger, _level, _prefix, _msg)
-
184 #define PLT_LOG_HTTP_MESSAGE(_level, _prefix, _msg)
-
185 #endif /* NPT_CONFIG_ENABLE_LOGGING */
-
186 
-
187 /*----------------------------------------------------------------------
-
188 | PLT_HttpRequestHandler
-
189 +---------------------------------------------------------------------*/
-
194 class PLT_HttpRequestHandler : public NPT_HttpRequestHandler
-
195 {
-
196 public:
-
197  PLT_HttpRequestHandler(NPT_HttpRequestHandler* delegate) :
-
198  m_Delegate(delegate) {}
-
199  virtual ~PLT_HttpRequestHandler() {}
-
200 
-
201  // NPT_HttpRequestHandler methods
-
202  NPT_Result SetupResponse(NPT_HttpRequest& request,
-
203  const NPT_HttpRequestContext& context,
-
204  NPT_HttpResponse& response) {
-
205  return m_Delegate->SetupResponse(request, context, response);
-
206  }
-
207 
-
208 private:
-
209  NPT_HttpRequestHandler* m_Delegate;
-
210 };
-
211 
-
212 #endif /* _PLT_HTTP_H_ */
+
183 #define PLT_LOG_HTTP_REQUEST_L(_logger, _level, _prefix, _request)
+
184 #define PLT_LOG_HTTP_RESPONSE_L(_logger, _level, _prefix, _response)
+
185 #define PLT_LOG_HTTP_REQUEST(_level,_prefix,_request)
+
186 #define PLT_LOG_HTTP_RESPONSE(_level,_prefix,_response)
+
187 #endif /* NPT_CONFIG_ENABLE_LOGGING */
+
188 
+
189 /*----------------------------------------------------------------------
+
190 | PLT_HttpRequestHandler
+
191 +---------------------------------------------------------------------*/
+
196 class PLT_HttpRequestHandler : public NPT_HttpRequestHandler
+
197 {
+
198 public:
+
199  PLT_HttpRequestHandler(NPT_HttpRequestHandler* delegate) :
+
200  m_Delegate(delegate) {}
+
201  virtual ~PLT_HttpRequestHandler() {}
+
202 
+
203  // NPT_HttpRequestHandler methods
+
204  NPT_Result SetupResponse(NPT_HttpRequest& request,
+
205  const NPT_HttpRequestContext& context,
+
206  NPT_HttpResponse& response) {
+
207  return m_Delegate->SetupResponse(request, context, response);
+
208  }
+
209 
+
210 private:
+
211  NPT_HttpRequestHandler* m_Delegate;
+
212 };
+
213 
+
214 #endif /* _PLT_HTTP_H_ */
PLT_HttpHelper
The PLT_HttpHelper class is a set of utility functions for manipulating HTTP headers, entities and messages.
Definition: PltHttp.h:81
PLT_HttpRequestContext
The PLT_HttpRequestContext class holds information about the request sent, the local & remote ip addr...
Definition: PltHttp.h:111
-
PLT_HttpRequestHandler
The PLT_HttpRequestHandler class delegates the handling of the response of a received HTTP request by...
Definition: PltHttp.h:194
+
PLT_HttpRequestHandler
The PLT_HttpRequestHandler class delegates the handling of the response of a received HTTP request by...
Definition: PltHttp.h:196
diff --git a/Scripts/cibuild b/Scripts/cibuild index 0fb3761f..67e7b740 100755 --- a/Scripts/cibuild +++ b/Scripts/cibuild @@ -22,8 +22,8 @@ main () { import_certs - carthage bootstrap --platform ios - carthage build --platform ios --no-skip-current + carthage bootstrap + carthage build --no-skip-current carthage archive Platinum local status=$? exit $status diff --git a/Source/Core/PltCtrlPoint.cpp b/Source/Core/PltCtrlPoint.cpp index e7d6d295..bae65457 100644 --- a/Source/Core/PltCtrlPoint.cpp +++ b/Source/Core/PltCtrlPoint.cpp @@ -1732,6 +1732,8 @@ PLT_CtrlPoint::ProcessActionResponse(NPT_Result res, PLT_ActionReference& action, void* userdata) { + NPT_COMPILER_UNUSED(request); + NPT_String service_type; NPT_String str; NPT_XmlElementNode* xml = NULL; @@ -1749,6 +1751,7 @@ PLT_CtrlPoint::ProcessActionResponse(NPT_Result res, // check context validity if (NPT_FAILED(res) || response == NULL) { PLT_Service* service = action_desc.GetService(); + NPT_COMPILER_UNUSED(service); NPT_LOG_WARNING_4("Failed to reach %s for %s.%s (%d)", request.GetUrl().ToString().GetChars(), service->GetDevice()->GetUUID().GetChars(), diff --git a/Source/Core/PltHttp.h b/Source/Core/PltHttp.h index 84a84d57..750f8575 100644 --- a/Source/Core/PltHttp.h +++ b/Source/Core/PltHttp.h @@ -180,8 +180,10 @@ do { \ #define PLT_LOG_HTTP_RESPONSE(_level,_prefix,_response) PLT_LOG_HTTP_RESPONSE_L(_NPT_LocalLogger,(_level),(_prefix),(_response)) #else /* NPT_CONFIG_ENABLE_LOGGING */ -#define PLT_LOG_HTTP_MESSAGE_L(_logger, _level, _prefix, _msg) -#define PLT_LOG_HTTP_MESSAGE(_level, _prefix, _msg) +#define PLT_LOG_HTTP_REQUEST_L(_logger, _level, _prefix, _request) +#define PLT_LOG_HTTP_RESPONSE_L(_logger, _level, _prefix, _response) +#define PLT_LOG_HTTP_REQUEST(_level,_prefix,_request) +#define PLT_LOG_HTTP_RESPONSE(_level,_prefix,_response) #endif /* NPT_CONFIG_ENABLE_LOGGING */ /*----------------------------------------------------------------------