Merge remote-tracking branch 'upstream/master'

BaseFiles/Windows/Windows.csproj

@@ -24,7 +24,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\HomeGenie\bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -42,24 +42,24 @@
     <Compile Include="dummy.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="lame.exe">
+    <None Include="lame.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="sqlite3.dll">
+    </None>
+    <None Include="sqlite3.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="System.Data.SQLite.dll">
+    </None>
+    <None Include="System.Data.SQLite.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="System.Data.SQLite.Linq.dll">
+    </None>
+    <None Include="System.Data.SQLite.Linq.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x64\SQLite.Interop.dll">
+    </None>
+    <None Include="x64\SQLite.Interop.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="x86\SQLite.Interop.dll">
+    </None>
+    <None Include="x86\SQLite.Interop.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <None Include="homegenie_stats.db">

README.md

@@ -3,13 +3,34 @@
 **Project info and documentation**:
 http://homegenie.it
 
+
 ## Supported IDEs
 
-**MonoDevelop / Xamarin Studio**:
-HomeGenie_Linux/HomeGenie_Linux.sln
+- **MonoDevelop / Xamarin Studio**
+- **Microsoft Visual Studio**
+
+
+## Building, debugging and packaging HomeGenie
+
+**Linux**
+- Open the *HomeGenie_Linux/HomeGenie_Linux.sln* solution file
+- Prepare base files by building the *BaseFiles/Linux* project
+- Build/Debug the main *HomeGenie* project
+- To bundle a debian setup package, build the *Packger* project (even if this appear to be disabled, it will lauch a script in a terminal window)
+
+**Windows**
+- Open the *HomeGenie_Windows/HomeGenie_VS10.sln* solution file
+- Prepare base files by building the *BaseFiles/Windows* project
+- Build/Run/Debug the main *HomeGenie* project
+- To bundle a setup package, open and run the InnoSetup file located in the *HomeGenie_Windows/Packager* folder.
+
+**Mac**
+- Open the *HomeGenie_Mac/HomeGenie_Mac.sln* solution file
+- Build/Debug the main *HomeGenie* project
+- no setup packaging currently supported for Mac
+
+
 
-**Microsoft Visual Studio**:
-HomeGenie_Windows/HomeGenie_VS10.sln
 
 ## Precompiled packages and install instructions