Merge from wsp20Archive
This commit is contained in:
commit
6a5daeef05
2 changed files with 7 additions and 4 deletions
|
@ -54,7 +54,7 @@ function websitepanel_addons_AddonActivation($params)
|
||||||
|
|
||||||
// Retrieve the WebsitePanel Addons module settings
|
// Retrieve the WebsitePanel Addons module settings
|
||||||
$modSettings = websitepanel_addons_GetSettings();
|
$modSettings = websitepanel_addons_GetSettings();
|
||||||
if (empty($modSettings['username']) || empty($modSettings['password'])) || empty($modSettings['serverhost'])) || empty($modSettings['serverport'])))
|
if (empty($modSettings['username']) || empty($modSettings['password']) || empty($modSettings['serverhost']) || empty($modSettings['serverport']))
|
||||||
{
|
{
|
||||||
// The module is disabled or has not yet been configured - stop
|
// The module is disabled or has not yet been configured - stop
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
<Version>2.1.0</Version>
|
<Version>2.1.0</Version>
|
||||||
<FileVersion>$(BUILD_NUMBER)</FileVersion>
|
<FileVersion>$(BUILD_NUMBER)</FileVersion>
|
||||||
<VersionLabel>$(BUILD_NUMBER)</VersionLabel>
|
<VersionLabel>$(BUILD_NUMBER)</VersionLabel>
|
||||||
<ReleaseDate>2012-12-27</ReleaseDate>
|
<ReleaseDate>2012-1-11</ReleaseDate>
|
||||||
<BuildConfiguration></BuildConfiguration>
|
<BuildConfiguration></BuildConfiguration>
|
||||||
<RootFolder>..</RootFolder>
|
<RootFolder>..</RootFolder>
|
||||||
<TrunkFolder>$(RootFolder)\WebsitePanel</TrunkFolder>
|
<TrunkFolder>$(RootFolder)\WebsitePanel</TrunkFolder>
|
||||||
|
@ -639,6 +639,10 @@
|
||||||
|
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
|
<Target Name="uploadwebpi" DependsOnTargets="BuildWebPlatformInstallerFeed">
|
||||||
|
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/WebsitePanelFeed-$(Version).xml" LocalFile="$(DeployFolder)\WebsitePanelFeed.xml" />
|
||||||
|
</Target>
|
||||||
|
|
||||||
<!-- This task depends on FTP upload task and will be run afterwards -->
|
<!-- This task depends on FTP upload task and will be run afterwards -->
|
||||||
<Target Name="BuildWebPlatformInstallerFeed" DependsOnTargets="uploadtoftp">
|
<Target Name="BuildWebPlatformInstallerFeed" DependsOnTargets="uploadtoftp">
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
@ -721,7 +725,6 @@
|
||||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/WebsitePanel-HyperVUtils-$(Version).zip" LocalFile="$(ToolsFolder)\WebsitePanel-HyperVUtils-$(Version).zip" />
|
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/WebsitePanel-HyperVUtils-$(Version).zip" LocalFile="$(ToolsFolder)\WebsitePanel-HyperVUtils-$(Version).zip" />
|
||||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/WebsitePanel-VMConfig-$(Version).zip" LocalFile="$(ToolsFolder)\WebsitePanel-VMConfig-$(Version).zip" />
|
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/WebsitePanel-VMConfig-$(Version).zip" LocalFile="$(ToolsFolder)\WebsitePanel-VMConfig-$(Version).zip" />
|
||||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/Manual-Update-$(Version).zip" LocalFile="$(DeployFolder)\Manual-Update.zip" />
|
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/Manual-Update-$(Version).zip" LocalFile="$(DeployFolder)\Manual-Update.zip" />
|
||||||
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/WebsitePanelFeed-$(Version).xml" LocalFile="$(DeployFolder)\WebsitePanelFeed.xml" />
|
|
||||||
</Target>
|
</Target>
|
||||||
|
|
||||||
<Import Project="$(RootFolder)\tools\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets"/>
|
<Import Project="$(RootFolder)\tools\MSBuildCommunityTasks\MSBuild.Community.Tasks.Targets"/>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue