zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed build issues with AWstat and WSPTransportAgent creating empty update files

Browse source
This commit is contained in:
Virtuworks 2012-08-13 01:52:11 -04:00
parent e47a46ac00
commit 082152b3bc
3 changed files with 37 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
WebsitePanel.Installer/Sources/WebsitePanel.Installer/Updater.exe
View file

Binary file not shown.

2
WebsitePanel/Sources/Tools/WSPTransportAgent/WSPTransportAgent.csproj
View file

@ -25,7 +25,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath> <OutputPath>.\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>

31
WebsitePanel/build.xml
View file

@ -32,8 +32,7 @@
<ImportCsvSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.CsvBulk\bin\$(BuildConfiguration)</ImportCsvSrc> <ImportCsvSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.CsvBulk\bin\$(BuildConfiguration)</ImportCsvSrc>
<ImportEnterpriseSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.Enterprise\bin\$(BuildConfiguration)</ImportEnterpriseSrc> <ImportEnterpriseSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.Import.Enterprise\bin\$(BuildConfiguration)</ImportEnterpriseSrc>
<AWStatsViewerSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.AWStats.Viewer</AWStatsViewerSrc> <AWStatsViewerSrc>$(TrunkFolder)\Sources\Tools\WebsitePanel.AWStats.Viewer</AWStatsViewerSrc>
<WSPTransportAgentSrc>$(TrunkFolder)\Sources\Tools\WSPTransportAgent</WSPTransportAgentSrc>
<WSPTransportAgentSrc>$(TrunkFolder)\Sources\Tools\WSPTransportAgent</WSPTransportAgentSrc>
<ServerBuild>$(BuildFolder)\Server</ServerBuild> <ServerBuild>$(BuildFolder)\Server</ServerBuild>
<EnterpriseServerBuild>$(BuildFolder)\EnterpriseServer</EnterpriseServerBuild> <EnterpriseServerBuild>$(BuildFolder)\EnterpriseServer</EnterpriseServerBuild>
@ -41,8 +40,7 @@
<ImportCsvBuild>$(BuildFolder)\Import.CsvBulk</ImportCsvBuild> <ImportCsvBuild>$(BuildFolder)\Import.CsvBulk</ImportCsvBuild>
<ImportEnterpriseBuild>$(BuildFolder)\Import.Enterprise</ImportEnterpriseBuild> <ImportEnterpriseBuild>$(BuildFolder)\Import.Enterprise</ImportEnterpriseBuild>
<AWStatsViewerBuild>$(BuildFolder)\AWStats.Viewer</AWStatsViewerBuild> <AWStatsViewerBuild>$(BuildFolder)\AWStats.Viewer</AWStatsViewerBuild>
<WSPTransportAgentBuild>$(BuildFolder)\WSPTransportAgent</WSPTransportAgentBuild>
<WSPTransportAgentBuild>$(BuildFolder)\WSPTransportAgent</WSPTransportAgentBuild>
</PropertyGroup> </PropertyGroup>
@ -186,17 +184,14 @@
<Copy SourceFiles="@(AWStatsViewerBuildFiles)" DestinationFolder="$(AWStatsViewerBuild)\%(RecursiveDir)" /> <Copy SourceFiles="@(AWStatsViewerBuildFiles)" DestinationFolder="$(AWStatsViewerBuild)\%(RecursiveDir)" />
</Target> </Target>
<Target Name="Build" DependsOnTargets="CreateAWStatsViewerBuild"> <Target Name="CreateWSPTransportAgentBuild" DependsOnTargets="CreateAWStatsViewerBuild">
<!-- Do nothing -->
</Target>
<Target Name="CreateWSPTransportAgentBuild" DependsOnTargets="CreateImportEnterpriseBuild">
<ItemGroup> <ItemGroup>
<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\.svn\**" /> <WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\.svn\**" />
<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\obj\**" /> <WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\obj\**" />
<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\bin\*.xml" /> <WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\bin\*.xml" />
<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\Release\**" /> <WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.cache" />
<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\Debug\**" /> <WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\app.config" />
<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.txt" />
<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.pdb" Condition="'$(BuildConfiguration)' == 'Release'" /> <WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.pdb" Condition="'$(BuildConfiguration)' == 'Release'" />
<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.user" /> <WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.user" />
<WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.suo" /> <WSPTransportAgentBuildExclude Include="$(WSPTransportAgentSrc)\**\*.suo" />
@ -213,7 +208,6 @@
<!-- Do nothing --> <!-- Do nothing -->
</Target> </Target>
<!-- Create full distributives --> <!-- Create full distributives -->
<PropertyGroup> <PropertyGroup>
<InstallFolder>$(DeployFolder)\Install</InstallFolder> <InstallFolder>$(DeployFolder)\Install</InstallFolder>
@ -296,7 +290,7 @@
<Copy SourceFiles="$(RootFolder)\LICENSE.txt" DestinationFolder="$(ImportEnterpriseInstall)" /> <Copy SourceFiles="$(RootFolder)\LICENSE.txt" DestinationFolder="$(ImportEnterpriseInstall)" />
</Target> </Target>
<Target Name="CreateAWStatsViewerInstall" DependsOnTargets="CreateImportEnterpriseInstall"> <Target Name="CreateAWStatsViewerInstall" DependsOnTargets="CreateWSPTransportAgentInstall">
<ItemGroup> <ItemGroup>
<AWStatsViewerDeployFiles Include="$(AWStatsViewerBuild)\**\*.*" /> <AWStatsViewerDeployFiles Include="$(AWStatsViewerBuild)\**\*.*" />
</ItemGroup> </ItemGroup>
@ -306,6 +300,16 @@
<Copy SourceFiles="$(RootFolder)\LICENSE.txt" DestinationFolder="$(AWStatsViewerInstall)" /> <Copy SourceFiles="$(RootFolder)\LICENSE.txt" DestinationFolder="$(AWStatsViewerInstall)" />
</Target> </Target>
<Target Name="CreateWSPTransportAgentInstall" DependsOnTargets="CreateImportEnterpriseInstall">
<ItemGroup>
<WSPTransportAgentDeployFiles Include="$(WSPTransportAgentBuild)\**\*.*" />
</ItemGroup>
<RemoveDir Directories="$(WSPTransportAgentInstall)"/>
<MakeDir Directories="$(WSPTransportAgentInstall)"/>
<Copy SourceFiles="@(WSPTransportAgentDeployFiles)" DestinationFolder="$(WSPTransportAgentInstall)\%(RecursiveDir)" />
<Copy SourceFiles="$(RootFolder)\LICENSE.txt" DestinationFolder="$(WSPTransportAgentInstall)" />
</Target>
<!-- Create update from previous version --> <!-- Create update from previous version -->
<PropertyGroup> <PropertyGroup>
<UpdateFolder>$(DeployFolder)\Update</UpdateFolder> <UpdateFolder>$(DeployFolder)\Update</UpdateFolder>
@ -426,6 +430,7 @@
<ImportCsvInstallFiles Include="$(ImportCsvInstall)\**\*.*" /> <ImportCsvInstallFiles Include="$(ImportCsvInstall)\**\*.*" />
<ImportEnterpriseInstallFiles Include="$(ImportEnterpriseInstall)\**\*.*" /> <ImportEnterpriseInstallFiles Include="$(ImportEnterpriseInstall)\**\*.*" />
<AWStatsViewerInstallFiles Include="$(AWStatsViewerInstall)\**\*.*" /> <AWStatsViewerInstallFiles Include="$(AWStatsViewerInstall)\**\*.*" />
<WSPTransportAgentInstallFiles Include="$(WSPTransportAgentInstall)\**\*.*" />
</ItemGroup> </ItemGroup>
<!-- Assemble "Standalone" package --> <!-- Assemble "Standalone" package -->