CLEAN

yulsfish · Mar 30, 2015 · deac6a2 · deac6a2
1 parent 6658b71
commit deac6a2
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15,064 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,3 +35,4 @@ appweb-macosx-mine*
 *.mdb
 .DS_Store
 *.dmp
+cache/
diff --git a/dist/appweb.h b/dist/appweb.h
@@ -283,17 +283,9 @@ PUBLIC int maWriteAuthFile(HttpAuth *auth, char *path);
 /*
     Internal
  */
-PUBLIC int maCgiHandlerInit(Http *http, MprModule *mp);
-PUBLIC int maDirHandlerInit(Http *http, MprModule *mp);
-PUBLIC int maEjsHandlerInit(Http *http, MprModule *mp);
-PUBLIC int maEspHandlerInit(Http *http, MprModule *mp);
-PUBLIC int maPhpHandlerInit(Http *http, MprModule *mp);
-PUBLIC int maSslModuleInit(Http *http, MprModule *mp);
-
-/*
-    This is exported from slink.c which is either manually created or generated locally
- */
-PUBLIC void appwebStaticInitialize();
+PUBLIC int httpCgiInit(Http *http, MprModule *mp);
+PUBLIC int httpEspInit(Http *http, MprModule *mp);
+PUBLIC int httpSslInit(Http *http, MprModule *mp);
 
 #ifdef __cplusplus
 } /* extern C */

diff --git a/dist/appweb.me b/dist/appweb.me
@@ -14,7 +14,7 @@ Me.load({
             type: 'lib',
             sources: [ 'appwebLib.c' ],
             headers: [ '*.h' ],
-            depends: [ 'libhttp', 'libpcre', 'libmpr' ],
+            depends: [ 'libesp', 'libhttp', 'libpcre', 'libmpr' ],
             ifdef: [ 'appweb' ],
         },
         authpass: {
@@ -24,10 +24,10 @@ Me.load({
             platforms: [ 'local' ],
             postblend: function (target) {
                 if (target.static && me.targets.ssl.enable) {
-                    target.depends += ['libmprssl']
+                    target.depends += [ 'libmprssl' ]
                 }
             },
             enable: 'me.settings.appweb && me.settings.appweb.authpass',
-        },
-    },
+        }
+    }
 })
diff --git a/dist/appwebLib.c b/dist/appwebLib.c
diff --git a/installs/appweb.me b/installs/appweb.me
@@ -14,7 +14,7 @@ Me.load({
             type: 'lib',
             sources: [ 'appwebLib.c' ],
             headers: [ '*.h' ],
-            depends: [ 'libhttp', 'libpcre', 'libmpr' ],
+            depends: [ 'libesp', 'libhttp', 'libpcre', 'libmpr' ],
             ifdef: [ 'appweb' ],
         },
         authpass: {
@@ -24,10 +24,10 @@ Me.load({
             platforms: [ 'local' ],
             postblend: function (target) {
                 if (target.static && me.targets.ssl.enable) {
-                    target.depends += ['libmprssl']
+                    target.depends += [ 'libmprssl' ]
                 }
             },
             enable: 'me.settings.appweb && me.settings.appweb.authpass',
-        },
-    },
+        }
+    }
 })
diff --git a/main.me b/main.me
@@ -8,7 +8,6 @@ Me.load({
     blend: [
         'esp',
         'src/libappweb.me',
-        'src/modules/modules.me',
         'src/utils/utils.me',
         'src/server/server.me',
         'test/test.me',
@@ -54,11 +53,6 @@ Me.load({
         /* Must build locally to build tools */
         platforms: [ 'local' ],
 
-        /*
-            Set to true for a static (non-shared library) build
-         */
-        static: false,
-
         http: {
             /* Use PAM (Plugable Authentication Module) to store passwords */
             pam: true,

diff --git a/src/modules/sslModule.c b/src/modules/sslModule.c
@@ -282,12 +282,6 @@ PUBLIC int httpSslInit(Http *http, MprModule *module)
 #endif
     return 0;
 }
-#else
-
-PUBLIC int httpSslInit(Http *http, MprModule *mp)
-{
-    return 0;
-}
 #endif /* ME_COM_SSL */
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,3 +35,4 @@ appweb-macosx-mine* @@
     *.mdb
     .DS_Store
     *.dmp
+    cache/