Skip to content

Commit

Permalink
fix some problems with podspec and webserved dox
Browse files Browse the repository at this point in the history
  • Loading branch information
mulle-nat committed Jun 13, 2017
1 parent 1c36bfd commit dc48b1e
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 8 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion MulleScion.podspec
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
6 changes: 3 additions & 3 deletions MulleScion.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 = (
Expand Down Expand Up @@ -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 = (
Expand Down
6 changes: 6 additions & 0 deletions RELEASENOTES.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion dox/__scion_navigation.scion
Original file line number Diff line number Diff line change
@@ -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."]
Expand Down
3 changes: 2 additions & 1 deletion src/MulleMongoose.m
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand All @@ -210,6 +210,7 @@ static void start_mongoose( void *datasource, char **options)
{
if( strcmp( *p, "document_root"))
continue;

if( *++p)
{
dir = [NSString stringWithCString:*p];
Expand Down
7 changes: 6 additions & 1 deletion src/MulleScionParser+Parsing.m
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}


Expand Down Expand Up @@ -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];
Expand Down

0 comments on commit dc48b1e

Please sign in to comment.