Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-23 20:36:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added Json.NET dll in the installer. Updated README.

Browse Source 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2017-12-08 13:34:31 +00:00
parent 3d2e4c70cd
commit 69bf32394b
4 changed files with 74 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
README.md
View File

@ -16,32 +16,38 @@ The preferable way to contribute patches is to fork the repository on Github and
then submit a pull request. If for some reason you can't use Github to submit a
pull request, then you may send your patch for review to the
xs-devel@lists.xenserver.org mailing list, with a link to a public git repository
for review. Please see the CONTRIB.md file for some general guidelines on submitting
changes.
for review. Please see the [CONTRIB](CONTRIB) file for some general guidelines
on submitting changes.
License
-------
This code is licensed under the BSD 2-Clause license. Please see the LICENSE
file for more information.
This code is licensed under the BSD 2-Clause license. Please see the
[LICENSE](LICENSE) file for more information.
How to build XenCenter
----------------------
To build XenCenter, you need
* the source from xenadmin repository
* Visual Studio 2013
* the source from xenadmin repository
* Visual Studio 2013
and also some libraries which we do not store in the source tree:
* CookComputing.XmlRpcV2.dll
* DiscUtils.dll
* ICSharpCode.SharpZipLib.dll
* Ionic.Zip.dll
* log4net.dll
You can find the source code of these libraries (along with some patches) in dotnet-packages repository.
* CookComputing.XmlRpcV2.dll
* Newtonsoft.Json.dll
* DiscUtils.dll
* ICSharpCode.SharpZipLib.dll
* Ionic.Zip.dll
* log4net.dll
You can find the source code of these libraries (along with some patches) in
[dotnet-packages](https://github.com/xenserver/dotnet-packages) repository.
You also need NUnit libraries
* nunit.framework.dll
* Moq.dll
which can be obtained from http://www.nunit.org/
* nunit.framework.dll
* Moq.dll
which can be obtained from <http://www.nunit.org/>.

16
WixInstaller/XenCenter.l10n.diff
View File

@ -28,8 +28,8 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
--- XenCenter.wxs Mon May 23 11:07:59 2016
+++ XenCenter.l10n.wxs Mon May 23 11:09:01 2016
--- XenCenter.wxs Fri Dec 8 13:23:08 2017
+++ XenCenter.l10n.wxs Fri Dec 8 13:23:08 2017
@@ -40,7 +40,7 @@
<?define HiddenFeatures="[BRANDING_HIDDEN_FEATURES]"?>
<?define AdditionalFeatures="[BRANDING_ADDITIONAL_FEATURES]"?>
@ -39,7 +39,7 @@
<Media Id="1" Cabinet="XenCenter.cab" EmbedCab="yes" />
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFilesFolder">
@@ -84,70 +84,72 @@
@@ -85,70 +85,72 @@
<File Id="XenOvfTransport" Source="..\XenAdmin\bin\Release\XenOvfTransport.dll" />
<!-- Homepage -->
<File Id="XenCenterHomePage" Source="..\XenAdmin\bin\Release\HomePage.mht" />
@ -135,7 +135,7 @@
</Extension>
</ProgId>
</Component>
@@ -172,12 +174,34 @@
@@ -173,12 +175,34 @@
</Directory>
<?else?>
<Component Id="readmefile" Guid="[BRANDING_README_FILE_GUID]">
@ -171,7 +171,7 @@
</Component>
</Directory>
<Directory Id="EXTERNALTOOLS" ShortName="External" Name="External Tools">
@@ -222,7 +246,7 @@
@@ -223,7 +247,7 @@
Vital="no"
Name="XenServerHealthCheck"
DisplayName="[Citrix] [XenServer] Health Check Service"
@ -180,7 +180,7 @@
Start="auto"
Account="LocalSystem"
ErrorControl="normal"
@@ -277,13 +301,15 @@
@@ -278,13 +302,15 @@
<Feature Id="MainProgram" Title="[Citrix] [XenCenter]" Description="[Citrix] [XenCenter]" Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no" InstallDefault="local" Absent="disallow" >
<ComponentRef Id="MainExecutable" />
<ComponentRef Id="HelpFiles" />
@ -197,7 +197,7 @@
<ComponentRef Id="SchemasFilesComponent" />
<ComponentRef Id="ExternalToolsComponent" />
<ComponentRef Id="RegistryEntries" />
@@ -291,7 +317,7 @@
@@ -292,7 +318,7 @@
<ComponentRef Id="ProgramFilesShortcut" />
<?if "$(env.Branding)"="XenCenter"?>
@ -206,7 +206,7 @@
<ComponentRef Id="XenServerHealthCheck" />
</Feature>
<?else ?>
@@ -310,7 +336,7 @@
@@ -311,7 +337,7 @@
<Property Id="ARPPRODUCTICON" Value="XenCenterICO" />
<MajorUpgrade AllowDowngrades="no" AllowSameVersionUpgrades="yes" DowngradeErrorMessage="!(loc.ErrorNewerProduct)" Schedule="afterInstallInitialize"/>
<PropertyRef Id="WIX_IS_NETFRAMEWORK_46_OR_LATER_INSTALLED" />

1
WixInstaller/XenCenter.wxs
View File

@ -72,6 +72,7 @@
<!-- DLLs -->
<File Id="CommandLibDLL" Source="..\XenAdmin\bin\Release\CommandLib.dll" />
<File Id="CookComputingDLL" Source="..\XenAdmin\bin\Release\CookComputing.XmlRpcV2.dll" />
<File Id="NewtonsoftJsonDLL" Source="..\XenAdmin\bin\Release\Newtonsoft.Json.dll" />
<File Id="log4netDLL" Source="..\XenAdmin\bin\Release\log4net.dll" />
<File Id="SharpZipLibDLL" Source="..\XenAdmin\bin\Release\ICSharpCode.SharpZipLib.dll" />
<File Id="IonicZipDLL" Source="..\XenAdmin\bin\Release\Ionic.Zip.dll" />

3
mk/build-installers.sh
View File

@ -49,6 +49,7 @@ do
done
cd ${REPO}/XenAdmin/bin/Release && ${REPO}/mk/sign.bat CookComputing.XmlRpcV2.dll "XML-RPC.NET by Charles Cook, signed by ${BRANDING_COMPANY_NAME_SHORT}"
cd ${REPO}/XenAdmin/bin/Release && ${REPO}/mk/sign.bat Newtonsoft.Json.dll "JSON.NET by James Newton-King, signed by ${BRANDING_COMPANY_NAME_SHORT}"
cd ${REPO}/XenAdmin/bin/Release && ${REPO}/mk/sign.bat log4net.dll "Log4Net by The Apache Software Foundation, signed by ${BRANDING_COMPANY_NAME_SHORT}"
cd ${REPO}/XenAdmin/bin/Release && ${REPO}/mk/sign.bat ICSharpCode.SharpZipLib.dll "SharpZipLib by IC#Code, signed by ${BRANDING_COMPANY_NAME_SHORT}"
cd ${REPO}/XenAdmin/bin/Release && ${REPO}/mk/sign.bat DiscUtils.dll "DiscUtils by Kenneth Bell, signed by ${BRANDING_COMPANY_NAME_SHORT}"
@ -56,7 +57,7 @@ cd ${REPO}/XenAdmin/bin/Release && ${REPO}/mk/sign.bat Ionic.Zip.dll "OSS, signe
cd ${REPO}/XenAdmin/bin/Release && ${REPO}/mk/sign.bat putty.exe "PuTTY by Simon Tatham, signed by ${BRANDING_COMPANY_NAME_SHORT}"
#copy signed files in XenServerHealthService folder
cp ${REPO}/XenAdmin/bin/Release/{CommandLib.dll,XenCenterLib.dll,XenModel.dll,CookComputing.XmlRpcV2.dll,log4net.dll,ICSharpCode.SharpZipLib.dll,Ionic.Zip.dll} \
cp ${REPO}/XenAdmin/bin/Release/{CommandLib.dll,XenCenterLib.dll,XenModel.dll,CookComputing.XmlRpcV2.dll,Newtonsoft.Json.dll,log4net.dll,ICSharpCode.SharpZipLib.dll,Ionic.Zip.dll} \
${REPO}/XenServerHealthCheck/bin/Release
#sign XenServerHealthService