added support of the local folder installation on WP8

rhomobile · Mar 12, 2013 · c070d82 · c070d82
1 parent f6a2494
commit c070d82
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 37 deletions.
diff --git a/lib/commonAPI/coreapi/ext/platform/wp8/Coreapi.vcxproj b/lib/commonAPI/coreapi/ext/platform/wp8/Coreapi.vcxproj
@@ -150,9 +150,9 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\shared\generated\cpp\NetworkAccessBase.cpp" />
+    <ClCompile Include="..\..\shared\generated\cpp\NetworkBase.cpp" />
-    <ClCompile Include="..\..\shared\generated\cpp\NetworkAccess_js_wrap.cpp" />
+    <ClCompile Include="..\..\shared\generated\cpp\Network_js_wrap.cpp" />
-    <ClCompile Include="..\..\shared\generated\cpp\NetworkAccess_ruby_wrap.cpp" />
+    <ClCompile Include="..\..\shared\generated\cpp\Network_ruby_wrap.cpp" />
     <ClCompile Include="..\..\shared\generated\cpp\SQLite3Base.cpp">
       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
@@ -189,9 +189,9 @@
       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="..\..\shared\generated\networkaccess_api_init.cpp" />
+    <ClCompile Include="..\..\shared\generated\network_api_init.cpp" />
-    <ClCompile Include="..\..\shared\generated\networkaccess_js_api.cpp" />
+    <ClCompile Include="..\..\shared\generated\network_js_api.cpp" />
-    <ClCompile Include="..\..\shared\generated\networkaccess_ruby_api.c" />
+    <ClCompile Include="..\..\shared\generated\network_ruby_api.c" />
     <ClCompile Include="..\..\shared\generated\sqlite3_api_init.cpp">
       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
@@ -235,7 +235,7 @@
       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="..\..\shared\NetworkAccessImpl.cpp" />
+    <ClCompile Include="..\..\shared\NetworkImpl.cpp" />
     <ClCompile Include="..\..\shared\SQLite3Impl.cpp">
       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
@@ -269,10 +269,10 @@
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\shared\generated\cpp\INetworkAccess.h" />
+    <ClInclude Include="..\..\shared\generated\cpp\INetwork.h" />
     <ClInclude Include="..\..\shared\generated\cpp\ISQLite3.h" />
     <ClInclude Include="..\..\shared\generated\cpp\ISystem.h" />
-    <ClInclude Include="..\..\shared\generated\cpp\NetworkAccessBase.h" />
+    <ClInclude Include="..\..\shared\generated\cpp\NetworkBase.h" />
     <ClInclude Include="..\..\shared\generated\cpp\SQLite3Base.h" />
     <ClInclude Include="..\..\shared\generated\cpp\SystemBase.h" />
   </ItemGroup>
@@ -290,7 +290,7 @@
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="..\..\NetworkAccess.xml">
+    <CustomBuild Include="..\..\Network.xml">
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(RHO_ROOT)\bin\rhogen api %(FullPath)</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(InputDir)shared/generated</Outputs>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

diff --git a/lib/commonAPI/coreapi/ext/platform/wp8/Coreapi.vcxproj.filters b/lib/commonAPI/coreapi/ext/platform/wp8/Coreapi.vcxproj.filters
@@ -92,25 +92,25 @@
     <ClCompile Include="..\..\shared\SQLite3Impl.cpp">
       <Filter>SQLite3\shared</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\shared\NetworkAccessImpl.cpp">
+    <ClCompile Include="..\..\shared\NetworkImpl.cpp">
       <Filter>NetworkAccess</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\shared\generated\networkaccess_api_init.cpp">
+    <ClCompile Include="..\..\shared\generated\network_api_init.cpp">
       <Filter>NetworkAccess\shared\generated</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\shared\generated\networkaccess_js_api.cpp">
+    <ClCompile Include="..\..\shared\generated\network_js_api.cpp">
       <Filter>NetworkAccess\shared\generated</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\shared\generated\networkaccess_ruby_api.c">
+    <ClCompile Include="..\..\shared\generated\network_ruby_api.c">
       <Filter>NetworkAccess\shared\generated</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\shared\generated\cpp\NetworkAccess_js_wrap.cpp">
+    <ClCompile Include="..\..\shared\generated\cpp\NetworkBase.cpp">
       <Filter>NetworkAccess\shared\generated\cpp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\shared\generated\cpp\NetworkAccess_ruby_wrap.cpp">
+    <ClCompile Include="..\..\shared\generated\cpp\Network_js_wrap.cpp">
       <Filter>NetworkAccess\shared\generated\cpp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\shared\generated\cpp\NetworkAccessBase.cpp">
+    <ClCompile Include="..\..\shared\generated\cpp\Network_ruby_wrap.cpp">
       <Filter>NetworkAccess\shared\generated\cpp</Filter>
     </ClCompile>
   </ItemGroup>
@@ -127,10 +127,10 @@
     <ClInclude Include="..\..\shared\generated\cpp\SQLite3Base.h">
       <Filter>SQLite3\shared\generated\cpp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\shared\generated\cpp\INetworkAccess.h">
+    <ClInclude Include="..\..\shared\generated\cpp\INetwork.h">
       <Filter>NetworkAccess\shared\generated\cpp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\shared\generated\cpp\NetworkAccessBase.h">
+    <ClInclude Include="..\..\shared\generated\cpp\NetworkBase.h">
       <Filter>NetworkAccess\shared\generated\cpp</Filter>
     </ClInclude>
   </ItemGroup>
@@ -141,10 +141,6 @@
     <CustomBuild Include="..\..\sqlite3.xml">
       <Filter>SQLite3\shared</Filter>
     </CustomBuild>
-  </ItemGroup>
+    <CustomBuild Include="..\..\Network.xml" />
-  <ItemGroup>
-    <Xml Include="..\..\NetworkAccess.xml">
-      <Filter>NetworkAccess\shared</Filter>
-    </Xml>
   </ItemGroup>
 </Project>
diff --git a/platform/wp8/build/wp.rake b/platform/wp8/build/wp.rake
@@ -123,10 +123,11 @@ def addbundletoxap()
     appsFiles = FileList.new 
     appsFiles.include(File.join($srcdir, "apps", "*.*"))
 
-    cp_r File.join($srcdir, "public"), tmp_dir
+    #cp_r File.join($srcdir, "public"), tmp_dir
     cp   File.join($srcdir, "RhoBundleMap.txt"), tmp_dir
     cp_r File.join($srcdir, "apps"), rho_dir
     #cp_r appsFiles, File.join(rho_dir, 'apps')
+	cp_r File.join($srcdir, "public"), File.join(rho_dir, 'apps')
     cp_r File.join($srcdir, "lib"), rho_dir
     cp_r File.join($srcdir, "db"), rho_dir
 
@@ -205,9 +206,9 @@ namespace "build" do
         if f.start_with?('db')          ||
            f.end_with?('.rb')           ||
            f.end_with?('.erb')          ||
-           f == "apps/app_manifest.txt" ||
+           #f == "apps/app_manifest.txt" ||
-           f == "apps/rhoconfig.txt"    ||
+           #f == "apps/rhoconfig.txt"    ||
-           f == "apps/rhoconfig.txt.timestamp" ||
+           #f == "apps/rhoconfig.txt.timestamp" ||
            f == "RhoBundleMap.txt"
           next;
         end

diff --git a/platform/wp8/rhodes/App.xaml.cs b/platform/wp8/rhodes/App.xaml.cs
@@ -28,6 +28,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
+using System.IO;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Documents;
@@ -178,7 +179,9 @@ private void InitializePhoneApplication()
             // Ensure we don't initialize again
             phoneApplicationInitialized = true;
 
-            //CRhoResourceMap.deployContent();//we have to create rho folder before
+            Directory.SetCurrentDirectory(Windows.Storage.ApplicationData.Current.LocalFolder.Path);
+
+            CRhoResourceMap.deployContent();
         }
 
         // Do not add any additional code to this method

diff --git a/platform/wp8/rholib/rholib.vcxproj b/platform/wp8/rholib/rholib.vcxproj
@@ -268,7 +268,6 @@
     <ClInclude Include="..\..\shared\logging\RhoLogCat.h" />
     <ClInclude Include="..\..\shared\logging\RhoLogConf.h" />
     <ClInclude Include="..\..\shared\logging\RhoLogSink.h" />
-    <ClInclude Include="..\..\shared\net\AsyncHttp.h" />
     <ClInclude Include="..\..\shared\net\CompatWince.h" />
     <ClInclude Include="..\..\shared\net\HttpServer.h" />
     <ClInclude Include="..\..\shared\net\INetRequest.h" />
@@ -304,7 +303,6 @@
     <ClCompile Include="..\..\shared\logging\RhoLogConf.cpp" />
     <ClCompile Include="..\..\shared\logging\RhoLogSink.cpp" />
     <ClCompile Include="..\..\shared\logging\RhoPlainLog.cpp" />
-    <ClCompile Include="..\..\shared\net\AsyncHttp.cpp" />
     <ClCompile Include="..\..\shared\net\CompatWince.cpp" />
     <ClCompile Include="..\..\shared\net\HttpServer.cpp" />
     <ClCompile Include="..\..\shared\net\INetRequest.cpp" />

diff --git a/platform/wp8/rholib/rholib.vcxproj.filters b/platform/wp8/rholib/rholib.vcxproj.filters
@@ -157,9 +157,6 @@
     <ClInclude Include="..\..\shared\statistic\RhoProfiler.h">
       <Filter>statistic</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\shared\net\AsyncHttp.h">
-      <Filter>net</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\shared\net\CompatWince.h">
       <Filter>net</Filter>
     </ClInclude>
@@ -267,9 +264,6 @@
     <ClCompile Include="..\..\shared\statistic\RhoProfiler.cpp">
       <Filter>statistic</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\shared\net\AsyncHttp.cpp">
-      <Filter>net</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\shared\net\CompatWince.cpp">
       <Filter>net</Filter>
     </ClCompile>