From dc48b1eef7c8c5cbd1122df8100accfcfcd5eae7 Mon Sep 17 00:00:00 2001 From: Nat! Date: Wed, 14 Jun 2017 01:35:07 +0200 Subject: [PATCH] fix some problems with podspec and webserved dox --- CMakeLists.txt | 2 +- MulleScion.podspec | 2 +- MulleScion.xcodeproj/project.pbxproj | 6 +++--- RELEASENOTES.md | 6 ++++++ dox/__scion_navigation.scion | 3 ++- src/MulleMongoose.m | 3 ++- src/MulleScionParser+Parsing.m | 7 ++++++- 7 files changed, 21 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3fe910c..4359fe4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ FIND_PACKAGE( ZLIB REQUIRED) message( STATUS "FOUNDATION_LIBRARY is ${FOUNDATION_LIBRARY}") message( STATUS "ZLIB_LIBRARIES is ${ZLIB_LIBRARIES}") -add_definitions( -DPROJECT_VERSION=1856) +add_definitions( -DPROJECT_VERSION=1857) add_library( MulleScion STATIC diff --git a/MulleScion.podspec b/MulleScion.podspec index b85448f..7c7764f 100644 --- a/MulleScion.podspec +++ b/MulleScion.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "MulleScion" - s.version = '1855' + s.version = '1857' s.summary = "MulleScion a modern Template library for ObjC." s.description = <<-DESC MulleScion is indeed a modern Template library for ObjC. diff --git a/MulleScion.xcodeproj/project.pbxproj b/MulleScion.xcodeproj/project.pbxproj index b9a830e..195cab3 100644 --- a/MulleScion.xcodeproj/project.pbxproj +++ b/MulleScion.xcodeproj/project.pbxproj @@ -1963,7 +1963,7 @@ baseConfigurationReference = 413C51611CC284CA00F62468 /* Debug.xcconfig */; buildSettings = { CLANG_WARN_INT_CONVERSION = YES; - CURRENT_PROJECT_VERSION = 1856; + CURRENT_PROJECT_VERSION = 1857; DYLIB_COMPATIBILITY_VERSION = 1848.0; DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)"; GCC_OPTIMIZATION_LEVEL = 0; @@ -1995,7 +1995,7 @@ baseConfigurationReference = 413C516B1CC284CA00F62468 /* Release.xcconfig */; buildSettings = { CLANG_WARN_INT_CONVERSION = YES; - CURRENT_PROJECT_VERSION = 1856; + CURRENT_PROJECT_VERSION = 1857; DYLIB_COMPATIBILITY_VERSION = 1848.0; DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -2064,7 +2064,7 @@ baseConfigurationReference = 413C516B1CC284CA00F62468 /* Release.xcconfig */; buildSettings = { CLANG_WARN_INT_CONVERSION = YES; - CURRENT_PROJECT_VERSION = 1856; + CURRENT_PROJECT_VERSION = 1857; DYLIB_COMPATIBILITY_VERSION = 1848.0; DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)"; GCC_PREPROCESSOR_DEFINITIONS = ( diff --git a/RELEASENOTES.md b/RELEASENOTES.md index e24a707..c27938e 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,3 +1,9 @@ +## 1857 + +* fix missing menu due to change of root dox +* fix podspec version +* add dump of includes for debugging + ## 1856 * clarify usage output diff --git a/dox/__scion_navigation.scion b/dox/__scion_navigation.scion index 8e8907c..7b5b5f8 100644 --- a/dox/__scion_navigation.scion +++ b/dox/__scion_navigation.scion @@ -1,7 +1,8 @@ {% includes "__scion_macros.scion" %} {% result = @(); fileManager = [NSFileManager defaultManager]; - for file in [[fileManager directoryContentsAtPath:@"/tmp/MulleScionDox"] sortedArrayUsingSelector:@selector( compare:)] + workingDir = [fileManager currentDirectoryPath]; + for file in [[fileManager directoryContentsAtPath:workingDir] sortedArrayUsingSelector:@selector( compare:)] if [file hasSuffix:@".scion"] and not [file hasPrefix:@"_"] and not [file hasPrefix:@"index."] diff --git a/src/MulleMongoose.m b/src/MulleMongoose.m index bf0fc24..b4b693d 100644 --- a/src/MulleMongoose.m +++ b/src/MulleMongoose.m @@ -184,7 +184,7 @@ static void signal_handler( int sig_num) static int log_message( const struct mg_connection *conn, const char *message) { - NSLog(@"%s", message); + NSLog( @"%s", message); return( 0); } @@ -210,6 +210,7 @@ static void start_mongoose( void *datasource, char **options) { if( strcmp( *p, "document_root")) continue; + if( *++p) { dir = [NSString stringWithCString:*p]; diff --git a/src/MulleScionParser+Parsing.m b/src/MulleScionParser+Parsing.m index 2979429..fbbc923 100644 --- a/src/MulleScionParser+Parsing.m +++ b/src/MulleScionParser+Parsing.m @@ -138,7 +138,8 @@ - (void) parserError:(parser_error_info *) info MULLESCION_NO_HASHBANG = 0x02, MULLESCION_DUMP_MACROS = 0x04, MULLESCION_DUMP_COMMANDS = 0x08, - MULLESCION_DUMP_EXPRESSIONS = 0x10 + MULLESCION_DUMP_EXPRESSIONS = 0x10, + MULLESCION_DUMP_FILE_INCLUDES = 0x20 }; static void parser_skip_after_newline( parser *p); @@ -172,6 +173,7 @@ static void parser_init( parser *p, unsigned char *buf, size_t len) p->environment |= getenv( "MULLESCION_NO_HASHBANG") ? MULLESCION_NO_HASHBANG : 0; p->environment |= getenv( "MULLESCION_DUMP_COMMANDS") ? MULLESCION_DUMP_COMMANDS : 0; p->environment |= getenv( "MULLESCION_DUMP_EXPRESSIONS") ? MULLESCION_DUMP_EXPRESSIONS : 0; + p->environment |= getenv( "MULLESCION_DUMP_FILE_INCLUDES") ? MULLESCION_DUMP_FILE_INCLUDES : 0; } @@ -2256,6 +2258,9 @@ static void parser_add_dependency( parser *p, NSString *fileName, NSString *inc if( ! [fileName length]) parser_error( p, "a filename was expected as a quoted string"); + if( p->environment & MULLESCION_DUMP_FILE_INCLUDES) + fprintf( stderr, "-> opening \"%s\"\n", [fileName UTF8String]); + if( verbatim) { s = [[NSString alloc] initWithContentsOfFile:fileName];