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

merge commit

Browse source
This commit is contained in:
robvde 2013-01-12 09:03:08 +04:00
commit 696a24d339
2 changed files with 44 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
WebsitePanel.WHMCSModule/includes/hooks/websitepanel_addons.php
View file

@ -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;

28
WebsitePanel/build.xml
View file

@ -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>
@ -59,6 +59,11 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Label="WebPlatformFeed">
<!-- URI where to locate the installer's distributive online -->
<InstallerRemoteUri>http://www.websitepanel.net/files/$(Version)/WebsitePanelInstaller-$(Version)-webpi.msi</InstallerRemoteUri>
</PropertyGroup>
<Target Name="GenerateBuildVersionFilesInstaller"> <Target Name="GenerateBuildVersionFilesInstaller">
<AssemblyInfo CodeLanguage="CS" OutputFile="$(RootFolder)\WebsitePanel.Installer\Sources\VersionInfo.cs" AssemblyCompany="Outercurve Foundation" AssemblyCopyright="Copyright © 2012 Outercurve Foundation." AssemblyVersion="$(VersionLabel)" AssemblyFileVersion="$(FileVersion)" AssemblyInformationalVersion="$(Version)" /> <AssemblyInfo CodeLanguage="CS" OutputFile="$(RootFolder)\WebsitePanel.Installer\Sources\VersionInfo.cs" AssemblyCompany="Outercurve Foundation" AssemblyCopyright="Copyright © 2012 Outercurve Foundation." AssemblyVersion="$(VersionLabel)" AssemblyFileVersion="$(FileVersion)" AssemblyInformationalVersion="$(Version)" />
</Target> </Target>
@ -634,9 +639,15 @@
</Target> </Target>
<Target Name="BuildWebPlatformInstallerFeed" DependsOnTargets="Deploy"> <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 -->
<Target Name="BuildWebPlatformInstallerFeed" DependsOnTargets="uploadtoftp">
<ItemGroup> <ItemGroup>
<InstallerFilePath Include="$(DeployFolder)\WebsitePanelInstaller.msi" /> <!-- This will generate path to a temporary file that will be used by WebDownload task below to download the installer's distributive locally -->
<InstallerFilePath Include="$([System.IO.Path]::GetTempFileName())" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<GetFileSizeScript> <GetFileSizeScript>
@ -663,13 +674,14 @@
]]> ]]>
</ComputeChecksumScript> </ComputeChecksumScript>
</PropertyGroup> </PropertyGroup>
<WebDownload FileUri="$(InstallerRemoteUri)" FileName="%(InstallerFilePath.FullPath)" />
<Script Language="C#" Code="$(ComputeChecksumScript)"> <Script Language="C#" Code="$(ComputeChecksumScript)">
<Output TaskParameter="ReturnValue" PropertyName="InstallerFileChecksum" /> <Output TaskParameter="ReturnValue" PropertyName="InstallerFileChecksum" />
</Script> </Script>
<Script Language="C#" Code="$(GetFileSizeScript)"> <Script Language="C#" Code="$(GetFileSizeScript)">
<Output TaskParameter="ReturnValue" PropertyName="InstallerFileSize" /> <Output TaskParameter="ReturnValue" PropertyName="InstallerFileSize" />
</Script> </Script>
<Delete Files="%(InstallerFilePath.FullPath)" />
<ItemGroup> <ItemGroup>
<Tokens Include="ProductVersion"> <Tokens Include="ProductVersion">
<ReplacementValue>$(Version)</ReplacementValue> <ReplacementValue>$(Version)</ReplacementValue>
@ -687,13 +699,13 @@
<ReplacementValue>$(InstallerFileChecksum)</ReplacementValue> <ReplacementValue>$(InstallerFileChecksum)</ReplacementValue>
</Tokens> </Tokens>
<Tokens Include="InstallerFileUrl"> <Tokens Include="InstallerFileUrl">
<ReplacementValue>TODO: Evaluate MSI file URL</ReplacementValue> <ReplacementValue>$(InstallerRemoteUri)</ReplacementValue>
</Tokens> </Tokens>
</ItemGroup> </ItemGroup>
<TemplateFile Template="$(TrunkFolder)\WebsitePanelFeedTemplate.xml" OutputFilename="$(DeployFolder)\WebsitePanelFeed.xml" Tokens="@(Tokens)" /> <TemplateFile Template="$(TrunkFolder)\WebsitePanelFeedTemplate.xml" OutputFilename="$(DeployFolder)\WebsitePanelFeed.xml" Tokens="@(Tokens)" />
</Target> </Target>
<Target Name="uploadtoftp"> <Target Name="uploadtoftp">
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/WebsitePanel-Portal-$(Version).zip" LocalFile="$(DeployFolder)\WebsitePanel-Portal-$(Version).zip" /> <FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/WebsitePanel-Portal-$(Version).zip" LocalFile="$(DeployFolder)\WebsitePanel-Portal-$(Version).zip" />
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/WebsitePanel-EnterpriseServer-$(Version).zip" LocalFile="$(DeployFolder)\WebsitePanel-EnterpriseServer-$(Version).zip" /> <FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/WebsitePanel-EnterpriseServer-$(Version).zip" LocalFile="$(DeployFolder)\WebsitePanel-EnterpriseServer-$(Version).zip" />
@ -709,11 +721,11 @@
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/WebsitePanel-WSPTransportAgent-$(Version).zip" LocalFile="$(ToolsFolder)\WebsitePanel-WSPTransportAgent-$(Version).zip" /> <FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/WebsitePanel-WSPTransportAgent-$(Version).zip" LocalFile="$(ToolsFolder)\WebsitePanel-WSPTransportAgent-$(Version).zip" />
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/WebsitePanel.LocalizationToolkit-$(Version).msi" LocalFile="$(ToolsFolder)\WebsitePanel.LocalizationToolkit.msi" /> <FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/WebsitePanel.LocalizationToolkit-$(Version).msi" LocalFile="$(ToolsFolder)\WebsitePanel.LocalizationToolkit.msi" />
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/WebsitePanelInstaller-$(Version).msi" LocalFile="$(DeployFolder)\WebsitePanelInstaller.msi" /> <FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/WebsitePanelInstaller-$(Version).msi" LocalFile="$(DeployFolder)\WebsitePanelInstaller.msi" />
<FtpUpload Username="$(ftpUsername)" password="$(ftpPassword)" RemoteUri="ftp://$(ftphost)/WebsitePanelInstaller-$(Version)-webpi.msi" LocalFile="$(DeployFolder)\WebsitePanelInstaller.msi" />
<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"/>