Cleanup

ni-webtech · Aug 30, 2012 · 1b1ba75 · 1b1ba75
1 parent e1d2ff2
commit 1b1ba75
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 47 deletions.
diff --git a/bits/packs/ejscript.pak b/bits/packs/ejscript.pak
@@ -40,8 +40,8 @@ if (path) {
             dir.rename(ejs)
             tgz.remove()
             tar.remove()
-            for each (n in ['Makefile', 'bit.h', 'deps.c', 'ejsmod.c', 'pcre.c', 'pcre.h', 'product.bit', 
-                    'sqlite3.c', 'sqlite3.h', 'start.bit']) {
+            for each (n in ['Makefile', 'bit.h', 'deps.c', 'ejsmod.c', 'pcre.c', 'pcre.h', 'sqlite3.c', 
+                    'sqlite3.h', 'start.bit']) {
                 ejs.join(n).remove()
             }
             trace('Done', 'Ejscript distribution')

diff --git a/doc/api/mpr.html b/doc/api/mpr.html
@@ -12,16 +12,23 @@
     <!--[if IE]>
     <link href="../iehacks.css" rel="stylesheet" type="text/css" />
     <![endif]-->
-    <link href="http://www.google.com/cse/style/look/default.css" type="text/css" rel="stylesheet" />
 </head>
 <body>
     <div class="top">
         <a class="logo" href="http://appwebserver.org/">&nbsp;</a>
         <div class="topRight">
              <div class="search">
-                <div id="cse-search-form"></div>
-                <div class="version"><!--TITLE-->Embedthis Appweb 4.0.0</div>
-            </div>
+                 <form method="get" action="http://www.google.com/search" title="Search embedthis.com">
+                     <p>
+                        <label title="Search">Search</label> 
+                        <input type="text" id="q" name="q" size="15" maxlength="255" />
+                        <input type="submit" id="submit" value="Go" /> 
+                        <input type="hidden" name="domains" value="embedthis.com" /> 
+                        <input type="hidden" name="sitesearch" value="embedthis.com" />
+                    </p>
+                 </form>
+              </div>
+            <!--TITLE-->Embedthis Appweb 4.0.0
         </div>
         <div class="crumbs">
             <a href="../index.html">Home</a>
@@ -35,15 +42,17 @@
 
 
 <!-- BeginDsi "dsi/see.html" -->
+            <!--
 				<h1>See Also</h1>
 				<ul class="nav">
 					<li><a href="../ref/appweb/index.html">Programmers Reference</a></li>
 					<li><a href="../api/native.html">Native APIs</a></li>
 				</ul>
+            -->
 <!-- EndDsi -->
             <h2>Quick Nav</h2>
             <ul>
-                <li><a href="#Components">Components</a></li>
+                <li><a href="#Modules">Modules</a></li>
                 <li><a href="#Typedefs">Typedefs</a></li>
                 <li><a href="#Functions">Functions</a></li>
                 <li><a href="#Defines">Defines</a></li>
@@ -13714,9 +13723,12 @@ <h2>Typedefs</h2>
           '000262706376373952077:1hs0lhenihk');
         customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
         var options = new google.search.DrawOptions();
-        options.enableSearchboxOnly("http://appwebserver.org/search.html");
+        options.enableSearchboxOnly("http://embedthis.com/search.html");
         customSearchControl.draw('cse-search-form', options);
       }, true);
     </script>
 </body>
 </html>
+<!-- EndDsi -->
+</body>
+</html>
diff --git a/main.bit b/main.bit
@@ -45,11 +45,11 @@ Bit.load({
         /* Must build locally to build tools */
         platforms: [ 'local' ],
         sync: ['http', 'mpr', 'pcre', 'sqlite'],
-        _minimal: ['doxygen', 'dsi', 'ejs', 'man', 'man2html', 'pmaker', 'ssl', 'ejscript', 'php', 'matrixssl', 'openssl' ],
-        minimal: ['doxygen', 'dsi', 'ejs', 'man', 'man2html', 'pmaker', 'ejscript', 'php', 'matrixssl', ],
+        minimal: ['doxygen', 'dsi', 'ejs', 'man', 'man2html', 'pmaker', 'ssl', 'ejscript', 'php', 'matrixssl', 'openssl' ],
+        _minimal: ['doxygen', 'dsi', 'ejs', 'man', 'man2html', 'pmaker', ],
         '+required': [ 'pcre'],
         '+optional': [ 'cgi', 'dir', 'doxygen', 'dsi', 'ejs', 'ejscript', 'esp', 'man', 'man2html', 'openssl', 
-            'matrixssl', 'pmaker', 'php', 'sqlite', 'ssl', 'utest', 'zip' ],
+            'matrixssl', 'pmaker', 'php', 'sqlite', 'ssl', 'utest', 'zip', 'zlib' ],
     },
 
     usage: {

diff --git a/projects/appweb-windows/mod_ejs.vcxproj → projects/appweb-windows/test.js.vcxproj b/projects/appweb-windows/mod_ejs.vcxproj → projects/appweb-windows/test.js.vcxproj
@@ -1,19 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(IncDir);..\..\ejs.h;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{dc9c1be7-bab6-4d43-87e5-18f5513da9c7}</ProjectGuid>
+    <ProjectGuid>{5c6ca8b6-e9ec-4983-9440-efac4fa29282}</ProjectGuid>
     <RootNamespace />
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
@@ -83,40 +72,29 @@
     <_ProjectFileVersion>10</_ProjectFileVersion>
 
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(BinDir)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ObjDir)\mod_ejs\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ObjDir)\test.js\</IntDir>
     <CustomBuildBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">PreBuildEvent</CustomBuildBeforeTargets>
 
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(BinDir)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ObjDir)\mod_ejs\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ObjDir)\test.js\</IntDir>
     <CustomBuildBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">PreBuildEvent</CustomBuildBeforeTargets>
 
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(BinDir)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ObjDir)\mod_ejs\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ObjDir)\test.js\</IntDir>
     <CustomBuildBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">PreBuildEvent</CustomBuildBeforeTargets>
 
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(BinDir)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ObjDir)\mod_ejs\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ObjDir)\test.js\</IntDir>
     <CustomBuildBeforeTargets Condition="'$(Configuration)|$(Platform)'=='Release|x64'">PreBuildEvent</CustomBuildBeforeTargets>
   </PropertyGroup>
-
-  <ItemGroup>
-    <ClCompile Include="..\..\src\modules\ejsHandler.c" />
-  </ItemGroup>
 
   <ItemDefinitionGroup>
   <Link>
-    <AdditionalDependencies>ejs;libmpr.lib;libmprssl.lib;libhttp.lib;libpcre.lib;libappweb.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    <AdditionalDependencies>;%(AdditionalDependencies)</AdditionalDependencies>
     <AdditionalLibraryDirectories>$(OutDir);$(Cfg)\bin;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
   </Link>
   </ItemDefinitionGroup>
 
-<ItemGroup>
-  <ProjectReference Include="libappweb.vcxproj">
-  <Project>66002183-4b43-4751-b3f4-36ad8e08be3c</Project>
-  <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-  </ProjectReference>
-</ItemGroup>
-
   <Import Project="$(VCTargetsPath)Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

diff --git a/src/modules/modules.bit b/src/modules/modules.bit
@@ -16,7 +16,7 @@ Bit.load({
             enable: 'bit.packs.ejscript.enable',
             type: 'lib',
             sources: [ 'ejsHandler.c' ],
-            libraries: [ 'libejs' ],
+            depends: [ 'libejs' ],
         },
         mod_php: {
             enable: 'bit.packs.php.enable',

diff --git a/test/security/dos.tst b/test/security/dos.tst
@@ -15,13 +15,13 @@ if (Config.OS != 'windows') {
     //  Try to crash with DOS attack
     for (i in 2000) {
         let s = new Socket
-    try {
-        s.connect(HTTP.address)
-    } catch (e) {
-        print("ERROR", i)
-        print(e)
-        throw e
-    }
+        try {
+            s.connect(HTTP.address)
+        } catch (e) {
+            print("ERROR", i)
+            print(e)
+            throw e
+        }
         let written = s.write("Any Text")
         assert(written == 8)
         s.close()

diff --git a/test/test.bit b/test/test.bit
@@ -91,6 +91,9 @@ Bit.load({
                 trace('Copy', 'ESP JS files')
                 cp('../src/esp/www/files/static/js', 'web/js')
             ",
+            'generate-sh': "
+                cp -r ../src/esp/www/files/static/js 'web/js'
+            ",
         },
 
         test: {