Browse code

Fix broken merge.

Nat! authored on 21-09-2015 19:05:48
Showing 2 changed files
... ...
@@ -1,4 +1,4 @@
1
-1853.0
1
+1853
2 2
 
3 3
 Made mulle-scion brew compatible. You can now brew it. As I wanted to use
4 4
 mulle-scion to produce brew formulae, I needed some options in the way
... ...
@@ -27,7 +27,7 @@ The way libraries are created and headers are written has been standardized and
27 27
 improved. There is some support for a future "mulle-bootstrap", in case you are
28 28
 wondering what the .bootstrap folder does.
29 29
 
30
-1852.0
30
+1852
31 31
 
32 32
 ### API change
33 33
 
... ...
@@ -90,7 +90,8 @@ static MulleScionTemplate   *acquireTemplateFromPath( NSString *fileName)
90 90
    MulleScionTemplate   *template;
91 91
    NSString             *string;
92 92
    NSData               *data;
93
-
93
+   NSURL                *url;
94
+   
94 95
    template = nil;
95 96
    //
96 97
    // if fileName stars with '{' assume, that it's a command line template
... ...
@@ -392,8 +393,6 @@ static int   _archive_main( int argc, const char * argv[], int keyed)
392 393
    NSEnumerator         *rover;
393 394
    NSString             *archiveName;
394 395
    NSString             *fileName;
395
-   NSString             *string;
396
-   NSData               *data;
397 396
 
398 397
    arguments = [[NSProcessInfo processInfo] arguments];
399 398
    rover     = [arguments objectEnumerator];
... ...
@@ -448,48 +447,6 @@ static int   _main(int argc, const char * argv[])
448 447
 }
449 448
 
450 449
 
451
-#ifndef DONT_HAVE_WEBSERVER
452
-int    main_www( int argc, const char * argv[])
453
-{
454
-   id      plist;
455
-   char   *s;
456
-   NSString *path;
457
-
458
-   loadBundles();
459
-
460
-   // hack to get something else going
461
-   s = getenv( "WWW_ROOT");
462
-   if( s)
463
-      default_options[ 1] = s;
464
-
465
-   s = getenv( "WWW_PORT");
466
-   if( s)
467
-      default_options[ 3] = s;
468
-
469
-   path = @"/tmp/MulleScionDox/properties.plist";
470
-   s = getenv( "WWW_PLIST");
471
-   if( s)
472
-      path = [NSString stringWithCString:s];
473
-
474
-   if( ! [path isEqualToString:@"-"])
475
-   {
476
-      plist = [NSDictionary dictionaryWithContentsOfFile:path];
477
-      if( ! plist)
478
-      {
479
-         NSLog( @"/tmp/MulleScionDox/properties.plist not found");
480
-         return( -5);
481
-      }
482
-   }
483
-
484
-   if( ! plist)
485
-      plist = [NSDictionary dictionary];
486
-
487
-   mulle_mongoose_main( plist, default_options);
488
-   return( 0);
489
-}
490
-#endif
491
-
492
-
493 450
 int main( int argc, const char * argv[])
494 451
 {
495 452
    NSAutoreleasePool   *pool;