Merge remote-tracking branch 'origin/master'

.gitignore

@@ -9,17 +9,15 @@ emiMobileServer/doc/
 emiMobileServer/Win32/
 emiMobileServer/*.log
 emiMobileServer/*.txt
+emiMobileServer/bin/logs/
+emiMobileServer/bin/static/
 emiMobileServer/Source/__history
 emiMobileServer/Source/__recovery/
-emiMobileServer/logs/*
-
 
 *.local
 *.exe
 *.identcache
 *.res
 *.tvsconfig
-
 *.dxsettings
-
 *.zip

emiMobileServer/emiMobileServer.ini → emiMobileServer/bin/emiMobileServer.ini

 [Settings]
-LogFileNum=614
+LogFileNum=616
 webClientVersion=0.1.0
 

emiMobileServer/emiMobileServer.dproj

@@ -104,7 +104,7 @@
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
-        <DCC_ExeOutput>.</DCC_ExeOutput>
+        <DCC_ExeOutput>.\bin</DCC_ExeOutput>
         <VerInfo_MajorVer>0</VerInfo_MajorVer>
         <VerInfo_MinorVer>9</VerInfo_MinorVer>
         <VerInfo_Release>3</VerInfo_Release>
@@ -185,12 +185,7 @@
                 <Source>
                     <Source Name="MainSource">emiMobileServer.dpr</Source>
                 </Source>
-                <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k290.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp290.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp290.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
-                </Excluded_Packages>
+                <Excluded_Packages/>
             </Delphi.Personality>
             <Deployment Version="5">
                 <DeployFile LocalName="emiMobileServer.exe" Configuration="Debug" Class="ProjectOutput">

webEMIMobile/webEmiMobile.dproj

@@ -96,8 +96,9 @@
         <VerInfo_MajorVer>0</VerInfo_MajorVer>
         <VerInfo_Release>3</VerInfo_Release>
         <TMSWebBrowser>1</TMSWebBrowser>
-        <TMSWebSingleInstance>1</TMSWebSingleInstance>
         <TMSUseJSDebugger>2</TMSUseJSDebugger>
+        <TMSWebOutputPath>..\emiMobileServer\bin\static</TMSWebOutputPath>
+        <TMSWebSingleInstance>1</TMSWebSingleInstance>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
@@ -505,12 +506,7 @@
                 <Source>
                     <Source Name="MainSource">webEmiMobile.dpr</Source>
                 </Source>
-                <Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcboffice2k290.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\bcbofficexp290.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-                    <Excluded_Packages Name="$(BDSBIN)\dclofficexp290.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
-                </Excluded_Packages>
+                <Excluded_Packages/>
             </Delphi.Personality>
             <Deployment Version="5">
                 <DeployFile LocalName="Win32\Debug\webCharms.exe" Configuration="Debug" Class="ProjectOutput"/>