Browse code

fix some problems with podspec and webserved dox

Nat! authored on 14/06/2017 01:35:07
Showing 7 changed files
... ...
@@ -39,7 +39,7 @@ FIND_PACKAGE( ZLIB REQUIRED)
39 39
 message( STATUS "FOUNDATION_LIBRARY is ${FOUNDATION_LIBRARY}")
40 40
 message( STATUS "ZLIB_LIBRARIES is ${ZLIB_LIBRARIES}")
41 41
 
42
-add_definitions( -DPROJECT_VERSION=1856)
42
+add_definitions( -DPROJECT_VERSION=1857)
43 43
 
44 44
 
45 45
 add_library( MulleScion STATIC
... ...
@@ -1,6 +1,6 @@
1 1
 Pod::Spec.new do |s|
2 2
   s.name             = "MulleScion"
3
-  s.version          = '1855'
3
+  s.version          = '1857'
4 4
   s.summary          = "MulleScion a modern Template library for ObjC."
5 5
   s.description      = <<-DESC
6 6
                        MulleScion is indeed a modern Template library for ObjC.
... ...
@@ -1963,7 +1963,7 @@
1963 1963
 			baseConfigurationReference = 413C51611CC284CA00F62468 /* Debug.xcconfig */;
1964 1964
 			buildSettings = {
1965 1965
 				CLANG_WARN_INT_CONVERSION = YES;
1966
-				CURRENT_PROJECT_VERSION = 1856;
1966
+				CURRENT_PROJECT_VERSION = 1857;
1967 1967
 				DYLIB_COMPATIBILITY_VERSION = 1848.0;
1968 1968
 				DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)";
1969 1969
 				GCC_OPTIMIZATION_LEVEL = 0;
... ...
@@ -1995,7 +1995,7 @@
1995 1995
 			baseConfigurationReference = 413C516B1CC284CA00F62468 /* Release.xcconfig */;
1996 1996
 			buildSettings = {
1997 1997
 				CLANG_WARN_INT_CONVERSION = YES;
1998
-				CURRENT_PROJECT_VERSION = 1856;
1998
+				CURRENT_PROJECT_VERSION = 1857;
1999 1999
 				DYLIB_COMPATIBILITY_VERSION = 1848.0;
2000 2000
 				DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)";
2001 2001
 				GCC_PREPROCESSOR_DEFINITIONS = (
... ...
@@ -2064,7 +2064,7 @@
2064 2064
 			baseConfigurationReference = 413C516B1CC284CA00F62468 /* Release.xcconfig */;
2065 2065
 			buildSettings = {
2066 2066
 				CLANG_WARN_INT_CONVERSION = YES;
2067
-				CURRENT_PROJECT_VERSION = 1856;
2067
+				CURRENT_PROJECT_VERSION = 1857;
2068 2068
 				DYLIB_COMPATIBILITY_VERSION = 1848.0;
2069 2069
 				DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)";
2070 2070
 				GCC_PREPROCESSOR_DEFINITIONS = (
... ...
@@ -1,3 +1,9 @@
1
+## 1857
2
+
3
+* fix missing menu due to change of root dox
4
+* fix podspec version
5
+* add dump of includes for debugging
6
+
1 7
 ## 1856
2 8
 
3 9
 * clarify usage output
... ...
@@ -1,7 +1,8 @@
1 1
 {% includes "__scion_macros.scion" %}
2 2
 {% result = @();
3 3
    fileManager = [NSFileManager defaultManager];
4
-   for file in [[fileManager directoryContentsAtPath:@"/tmp/MulleScionDox"] sortedArrayUsingSelector:@selector( compare:)]
4
+   workingDir  = [fileManager currentDirectoryPath];
5
+   for file in [[fileManager directoryContentsAtPath:workingDir] sortedArrayUsingSelector:@selector( compare:)]
5 6
       if [file hasSuffix:@".scion"] and 
6 7
          not [file hasPrefix:@"_"] and 
7 8
          not [file hasPrefix:@"index."]
... ...
@@ -184,7 +184,7 @@ static void signal_handler( int sig_num)
184 184
 
185 185
 static int log_message( const struct mg_connection *conn, const char *message)
186 186
 {
187
-   NSLog(@"%s", message);
187
+   NSLog( @"%s", message);
188 188
    return( 0);
189 189
 }
190 190
 
... ...
@@ -210,6 +210,7 @@ static void   start_mongoose( void  *datasource, char **options)
210 210
    {
211 211
       if( strcmp( *p, "document_root"))
212 212
          continue;
213
+
213 214
       if( *++p)
214 215
       {
215 216
          dir = [NSString stringWithCString:*p];
... ...
@@ -138,7 +138,8 @@ enum
138 138
    MULLESCION_NO_HASHBANG               = 0x02,
139 139
    MULLESCION_DUMP_MACROS               = 0x04,
140 140
    MULLESCION_DUMP_COMMANDS             = 0x08,
141
-   MULLESCION_DUMP_EXPRESSIONS          = 0x10
141
+   MULLESCION_DUMP_EXPRESSIONS          = 0x10,
142
+   MULLESCION_DUMP_FILE_INCLUDES        = 0x20
142 143
 };
143 144
 
144 145
 static void   parser_skip_after_newline( parser *p);
... ...
@@ -172,6 +173,7 @@ static void   parser_init( parser *p, unsigned char *buf, size_t len)
172 172
    p->environment |= getenv( "MULLESCION_NO_HASHBANG") ? MULLESCION_NO_HASHBANG : 0;
173 173
    p->environment |= getenv( "MULLESCION_DUMP_COMMANDS") ? MULLESCION_DUMP_COMMANDS : 0;
174 174
    p->environment |= getenv( "MULLESCION_DUMP_EXPRESSIONS") ? MULLESCION_DUMP_EXPRESSIONS : 0;
175
+   p->environment |= getenv( "MULLESCION_DUMP_FILE_INCLUDES") ? MULLESCION_DUMP_FILE_INCLUDES : 0;
175 176
 }
176 177
 
177 178
 
... ...
@@ -2256,6 +2258,9 @@ retry:
2256 2256
    if( ! [fileName length])
2257 2257
       parser_error( p, "a filename was expected as a quoted string");
2258 2258
 
2259
+   if( p->environment & MULLESCION_DUMP_FILE_INCLUDES)
2260
+      fprintf( stderr, "-> opening \"%s\"\n", [fileName UTF8String]);
2261
+   
2259 2262
    if( verbatim)
2260 2263
    {
2261 2264
       s = [[NSString alloc] initWithContentsOfFile:fileName];