Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 15:29:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #580 from MihaelaStoica/build-fix

Browse Source 
Build fix, changes
This commit is contained in:
Gabor Apati-Nagy 2015-07-27 14:31:47 +01:00
commit b2ab78eb32
14 changed files with 245 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
XenAdmin/XenAdmin.csproj
View File

@ -11,7 +11,7 @@
<RootNamespace>XenAdmin</RootNamespace> <RootNamespace>XenAdmin</RootNamespace>
<AssemblyName>XenCenterMain</AssemblyName> <AssemblyName>XenCenterMain</AssemblyName>
<ApplicationIcon>AppIcon.ico</ApplicationIcon> <ApplicationIcon>AppIcon.ico</ApplicationIcon>
<SignManifests>false</SignManifests> <SignManifests>true</SignManifests>
<ManifestCertificateThumbprint>4C1DD393E361B8BBCFA1E1D09539C446F88C0A11</ManifestCertificateThumbprint> <ManifestCertificateThumbprint>4C1DD393E361B8BBCFA1E1D09539C446F88C0A11</ManifestCertificateThumbprint>
<ManifestTimestampUrl>http://timestamp.verisign.com/scripts/timestamp.dll</ManifestTimestampUrl> <ManifestTimestampUrl>http://timestamp.verisign.com/scripts/timestamp.dll</ManifestTimestampUrl>
<FileUpgradeFlags> <FileUpgradeFlags>
@ -6788,7 +6788,7 @@
</Target> </Target>
--> -->
<PropertyGroup> <PropertyGroup>
<PostBuildEvent Condition=" '$(Configuration)' == 'Release' ">"C:\Program Files\Microsoft SDKs\Windows\v6.0A\bin\mt.exe" -manifest "$(ProjectDir)$(ProjectName).manifest" -outputresource:"$(TargetDir)..\..\bin\$(Configuration)\$(TargetFileName)";#1</PostBuildEvent> <PostBuildEvent Condition=" '$(Configuration)' == 'Release' ">mt.exe -nologo -manifest "$(ProjectDir)$(ProjectName).manifest" -outputresource:"$(TargetDir)..\..\bin\$(Configuration)\$(TargetFileName)";#1</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<PostBuildEvent>copy "$(ProjectDir)\ReportViewer\resource_report.rdlc" "$(TargetDir)" <PostBuildEvent>copy "$(ProjectDir)\ReportViewer\resource_report.rdlc" "$(TargetDir)"

1
devtools/check-roaming.sh Normal file → Executable file
View File

@ -32,6 +32,7 @@
set -eu set -eu
echo "INFO: check roaming"
dir=$(readlink -f $(dirname "$0")) dir=$(readlink -f $(dirname "$0"))
src=$(readlink -f "$dir/../XenAdmin") src=$(readlink -f "$dir/../XenAdmin")

2
devtools/deadcheck/deadcheck.sh Normal file → Executable file
View File

@ -32,6 +32,8 @@
set -eu set -eu
echo "INFO: deadcheck"
dir="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" dir="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
src="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )/../../XenAdmin" && pwd )" src="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )/../../XenAdmin" && pwd )"
if [ ! -d "${src}" ]; then if [ ! -d "${src}" ]; then

2
devtools/spellcheck/spellcheck.sh Normal file → Executable file
View File

@ -32,6 +32,8 @@
set -eu set -eu
echo "INFO: spellcheck"
dir="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" dir="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
src="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )" src="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"

10
mk/build.sh
View File

@ -39,7 +39,7 @@
FATAL="" FATAL=""
for DEP in nunit-console.exe zip unzip mkisofs wget curl hg git patch for DEP in nunit-console.exe zip unzip mkisofs wget curl hg git patch mt.exe signtool.exe candle.exe light.exe
do do
which $DEP >/dev/null 2>&1 which $DEP >/dev/null 2>&1
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -52,9 +52,9 @@ if [ -n "${FATAL}" ]; then
fi fi
if [ -n "${DEBUG+xxx}" ]; if [ -v DEBUG ];
then then
echo "DEBUG mode activated (verbose)" echo "INFO: DEBUG mode activated (verbose)"
set -x set -x
fi fi
@ -84,7 +84,7 @@ fi
production_jenkins_build() production_jenkins_build()
{ {
#source ${XENADMIN_DIR}/mk/bumpBuildNumber.sh source ${XENADMIN_DIR}/mk/bumpBuildNumber.sh
source ${XENADMIN_DIR}/devtools/check-roaming.sh source ${XENADMIN_DIR}/devtools/check-roaming.sh
source ${XENADMIN_DIR}/devtools/i18ncheck/i18ncheck.sh source ${XENADMIN_DIR}/devtools/i18ncheck/i18ncheck.sh
source ${XENADMIN_DIR}/devtools/deadcheck/deadcheck.sh source ${XENADMIN_DIR}/devtools/deadcheck/deadcheck.sh
@ -111,7 +111,7 @@ private_jenkins_build()
if [ -z "${PRIVATE_BUILD_MODE+xxx}" ]; then if [ -z "${PRIVATE_BUILD_MODE+xxx}" ]; then
production_jenkins_build production_jenkins_build
else else
echo "Running private Jenkins build" echo "INFO: Running private Jenkins build"
private_jenkins_build private_jenkins_build
fi fi
unset PRIVATE_BUILD_MODE unset PRIVATE_BUILD_MODE

14
mk/bumpBuildNumber.sh Normal file → Executable file
View File

@ -29,7 +29,7 @@
# SUCH DAMAGE. # SUCH DAMAGE.
set -eu set -eu
echo "INFO: bump build number"
if [ $get_JOB_NAME = "devbuild" ] ; then if [ $get_JOB_NAME = "devbuild" ] ; then
echo Warning: devbuild detected so we will skip the build number increment. All dev builds will have build number 0. echo Warning: devbuild detected so we will skip the build number increment. All dev builds will have build number 0.
exit 0 exit 0
@ -45,17 +45,17 @@ else
fi fi
url="${JENKINS_SERVER}/job/${get_JOB_NAME}/" url="${JENKINS_SERVER}/job/${get_JOB_NAME}/"
if curl -n -s --head --fail "${url}"; then if curl -n -s --fail "${url}" -o out.tmp ; then
echo "URL exists: ${url}" echo "INFO: URL exists: ${url}"
else else
echo "URL does not exist: ${url}" echo "ERROR: URL does not exist: ${url}"
exit 1 exit 1
fi fi
NEXT_BN=$(curl -n "http://hg.uk.xensource.com/cgi/next-xenadmin?job=$get_JOB_NAME&number=$get_BUILD_NUMBER&rev=$get_REVISION") NEXT_BN=$(curl -s -n "http://hg.uk.xensource.com/cgi/next-xenadmin?job=$get_JOB_NAME&number=$get_BUILD_NUMBER&rev=$get_REVISION")
echo NEXT_BN=${NEXT_BN} echo "INFO: NEXT_BN=${NEXT_BN}"
curl -n --data "nextBuildNumber=${NEXT_BN}" --header "Content-Type: application/x-www-form-urlencoded" ${JENKINS_SERVER}/job/${get_JOB_NAME}/nextbuildnumber/submit curl -s -n --data "nextBuildNumber=${NEXT_BN}" --header "Content-Type: application/x-www-form-urlencoded" ${JENKINS_SERVER}/job/${get_JOB_NAME}/nextbuildnumber/submit
set +u set +u

4
mk/colour.sh Normal file → Executable file
View File

@ -39,7 +39,7 @@ ROOTURL=https://xenbuilder.uk.xensource.com
DEFAULT_OUTPUT=Red DEFAULT_OUTPUT=Red
#Get the cookie #Get the cookie
curl -n -q -s -k $ROOTURL/plainlogin -o /dev/null -c /tmp/cookie$$ curl -n -s -k $ROOTURL/plainlogin -o /dev/null -c /tmp/cookie$$
#If this fails then declare the trunk red as there is a problem with the server #If this fails then declare the trunk red as there is a problem with the server
#otherwise try to work out the actual color of the trunk #otherwise try to work out the actual color of the trunk
@ -47,7 +47,7 @@ if [ $? -ne 0 ]; then
echo $DEFAULT_OUTPUT echo $DEFAULT_OUTPUT
exit 1 exit 1
else else
curl -n -q -s -k $ROOTURL/ -o - -b /tmp/cookie$$ | sed -ne 's/.*Trunk is.*\(Green\|Red\|Orange\).*/\1/Ip' curl -n -s -k $ROOTURL/ -o - -b /tmp/cookie$$ | sed -ne 's/.*Trunk is.*\(Green\|Red\|Orange\).*/\1/Ip'
rm /tmp/cookie$$ rm /tmp/cookie$$
fi fi

27
mk/declarations.sh
View File

@ -40,7 +40,7 @@
if [ -n "${DEBUG+xxx}" ]; if [ -n "${DEBUG+xxx}" ];
then then
set -x set -x
fi fi
# that's the code to get the branch name of the repository # that's the code to get the branch name of the repository
@ -58,25 +58,25 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
if [ -z "${JOB_NAME+xxx}" ] if [ -z "${JOB_NAME+xxx}" ]
then then
JOB_NAME="devbuild" JOB_NAME="devbuild"
echo "Warning: JOB_NAME env var not set, we will use ${JOB_NAME}" echo "WARN: JOB_NAME env var not set, we will use ${JOB_NAME}"
fi fi
if [ -z "${BUILD_NUMBER+xxx}" ] if [ -z "${BUILD_NUMBER+xxx}" ]
then then
BUILD_NUMBER="0" BUILD_NUMBER="0"
echo "Warning: BUILD_NUMBER env var not set, we will use ${BUILD_NUMBER}" echo "WARN: BUILD_NUMBER env var not set, we will use ${BUILD_NUMBER}"
fi fi
if [ -z "${BUILD_ID+xxx}" ] if [ -z "${BUILD_ID+xxx}" ]
then then
BUILD_ID=$(date +"%Y-%m-%d_%H-%M-%S") BUILD_ID=$(date +"%Y-%m-%d_%H-%M-%S")
echo "Warning: BUILD_ID env var not set, we will use ${BUILD_ID}" echo "WARN: BUILD_ID env var not set, we will use ${BUILD_ID}"
fi fi
if [ -z "${BUILD_URL+xxx}" ] if [ -z "${BUILD_URL+xxx}" ]
then then
BUILD_URL="n/a" BUILD_URL="n/a"
echo "Warning: BUILD_URL env var not set, we will use 'n/a'" echo "WARN: BUILD_URL env var not set, we will use 'n/a'"
fi fi
if [ -d "$DIR/../.git" ] if [ -d "$DIR/../.git" ]
@ -84,17 +84,22 @@ then
if [ -z "${GIT_COMMIT-}" ] if [ -z "${GIT_COMMIT-}" ]
then then
get_REVISION="none" get_REVISION="none"
echo "Warning: GIT_COMMIT env var not set, we will use 'none'" echo "WARN: GIT_COMMIT env var not set, we will use 'none'"
else else
get_REVISION="${GIT_COMMIT}" get_REVISION="${GIT_COMMIT}"
fi fi
XS_BRANCH=`cd $DIR;git config --get remote.origin.url|sed -e 's@.*carbon/\(.*\)/xenadmin.git.*@\1@'` XS_BRANCH=`cd $DIR;git config --get remote.origin.url|sed -e 's@.*carbon/\(.*\)/xenadmin.git.*@\1@'`
if [[ $XS_BRANCH == *"/"* ]]
then
XS_BRANCH="trunk"
echo "WARN: Failed to detect XS_BRANCH we will fallback to ${XS_BRANCH}"
fi
else else
if [ -z "${MERCURIAL_REVISION+xxx}" ] if [ -z "${MERCURIAL_REVISION+xxx}" ]
then then
MERCURIAL_REVISION="none" MERCURIAL_REVISION="none"
echo "Warning: MERCURIAL_REVISION env var not set, we will use $MERCURIAL_REVISION" echo "WARN: MERCURIAL_REVISION env var not set, we will use $MERCURIAL_REVISION"
fi fi
get_REVISION=${MERCURIAL_REVISION} get_REVISION=${MERCURIAL_REVISION}
XS_BRANCH=`cd $DIR;hg showconfig paths.default|sed -e 's@.*carbon/\(.*\)/xenadmin.hg.*@\1@'` XS_BRANCH=`cd $DIR;hg showconfig paths.default|sed -e 's@.*carbon/\(.*\)/xenadmin.hg.*@\1@'`
@ -102,10 +107,10 @@ fi
if [ -z "${XS_BRANCH+xxx}" ] if [ -z "${XS_BRANCH+xxx}" ]
then then
echo Failed to detect the branch, stopping here because this would break things much later. echo "ERROR: Failed to detect the branch, stopping here because this would break things much later."
exit 1 exit 1
else else
echo Running on branch: $XS_BRANCH echo "INFO: Running on branch: $XS_BRANCH"
fi fi
#rename Jenkins environment variables to distinguish them from ours; remember to use them as get only #rename Jenkins environment variables to distinguish them from ours; remember to use them as get only
@ -119,7 +124,7 @@ if [ -z "${WORKSPACE+xxx}" ]
then then
DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )" DIR="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
WORKSPACE="${DIR}" WORKSPACE="${DIR}"
echo "Warning: WORKSPACE env var not set, we will use ${WORKSPACE}" echo "WARN: WORKSPACE env var not set, we will use ${WORKSPACE}"
fi fi
if which cygpath >/dev/null; then if which cygpath >/dev/null; then
@ -128,7 +133,7 @@ else
ROOT=${WORKSPACE} ROOT=${WORKSPACE}
fi fi
echo "Workspace located in: $ROOT" echo "INFO: Workspace located in: $ROOT"
REPO=${XENADMIN_DIR} REPO=${XENADMIN_DIR}
REF_REPO=${ROOT}/xenadmin-ref.hg REF_REPO=${ROOT}/xenadmin-ref.hg
SCRATCH_DIR=${ROOT}/scratch SCRATCH_DIR=${ROOT}/scratch

23
mk/tests-checks.sh Normal file → Executable file
View File

@ -48,7 +48,23 @@ cd ${TEST_DIR} && tar xzf XenAdminTests.tgz && chmod -R 777 Release
set +e set +e
nunit-console /nologo /nodots /process=separate /noshadow /labels /err="$(cygpath -d ${TEST_DIR})\error.nunit.log" /timeout=40000 /output="$(cygpath -d ${TEST_DIR})\output.nunit.log" /xml="$(cygpath -d ${TEST_DIR})\XenAdminTests.xml" "$(cygpath -d ${TEST_DIR})\Release\XenAdminTests.dll" "/framework=net-4.0" &
{
# failure timeout COUNTE*DELAY = 600 seconds
COUNTER=60
DELAY=10
echo -en "INFO: Aquiring GUI testing lock "
until [ $COUNTER -lt 1 ]; do
flock --conflict-exit-code 123 -w $DELAY 200
RESULT=$?
if [ "$RESULT" == "123" ]; then echo -n "."; fi
if [ "$?" != "0" ]; then echo "\nERROR: Failed to aquire lock, timeout exceeded."; exit 1; fi
let COUNTER-=1
done
echo -e "\nINFO: Lock aquired and starting execution"
# /output="$(cygpath -d ${TEST_DIR})\output.nunit.log"
nunit-console /nologo /labels /stoponerror /nodots /process=separate /noshadow /labels /err="$(cygpath -d ${TEST_DIR})\error.nunit.log" /timeout=40000 /xml="$(cygpath -d ${TEST_DIR})\XenAdminTests.xml" "$(cygpath -d ${TEST_DIR})\Release\XenAdminTests.dll" "/framework=net-4.5" &
pid=$! pid=$!
(sleep 3000 ; kill $pid 2>/dev/null ) & (sleep 3000 ; kill $pid 2>/dev/null ) &
@ -58,6 +74,11 @@ if [ $? = 143 ]
then then
echo "Tests were terminated due to 3000 timeout." echo "Tests were terminated due to 3000 timeout."
fi fi
echo "INFO: Done, releasing lock"
} 200>/tmp/busy-gui.log
set -e set -e
sleeperpid2=$((ps | grep ${sleeperpid} | grep 'sleep$' | cut -b-10) || true) sleeperpid2=$((ps | grep ${sleeperpid} | grep 'sleep$' | cut -b-10) || true)

53
mk/xenadmin-build.sh
View File

@ -186,23 +186,14 @@ version_brand_csharp "XenAdmin CommandLib XenCenterLib XenModel XenOvfApi XenOvf
#build #build
run_msbuild() MSBUILD="MSBuild.exe /nologo /m /verbosity:minimal /p:Configuration=Release /p:TargetFrameworkVersion=v4.0"
{
MSBuild.exe /nologo /verbosity:quiet /p:Configuration=Release /p:TargetFrameworkVersion=v4.0
}
run_vcbuild() cd ${REPO}
{ $MSBUILD XenAdmin.sln
"/cygdrive/c/Program Files/Microsoft Visual Studio 9.0/VC/VCPackages/VCBuild.exe" $1 "Release|Win32" $MSBUILD xe/Xe.csproj
} $MSBUILD VNCControl/VNCControl.sln
SOLUTIONDIR=$(cygpath.exe -w "${REPO}/XenAdmin")
cd ${REPO}/XenAdmin && run_msbuild $MSBUILD /p:SolutionDir="$SOLUTIONDIR" splash/splash.vcxproj
cd ${REPO}/Xe && run_msbuild
cd ${REPO}/xva_verify && run_msbuild
cd ${REPO}/splash && run_vcbuild "Splash.vcproj"
cp ${REPO}/splash/XenAdmin/bin/Release/XenCenter.* ${REPO}/XenAdmin/bin/Release/
cd ${REPO}/VNCControl && run_msbuild
cd ${REPO}/XenServerHealthCheck && run_msbuild
#sign (splash has already been signed through a post-build event) #sign (splash has already been signed through a post-build event)
for file in XenCenter.exe XenCenterMain.exe CommandLib.dll MSTSCLib.dll XenCenterLib.dll XenCenterVNC.dll XenModel.dll XenOvf.dll XenOvfTransport.dll for file in XenCenter.exe XenCenterMain.exe CommandLib.dll MSTSCLib.dll XenCenterLib.dll XenCenterVNC.dll XenModel.dll XenOvf.dll XenOvfTransport.dll
@ -230,9 +221,10 @@ cd ${REPO}/XenServerHealthCheck/bin/Release && ${REPO}/sign.bat XenServerHealthC
WIX=${REPO}/WixInstaller WIX=${REPO}/WixInstaller
WIX_BIN=${WIX}/bin WIX_BIN=${WIX}/bin
WIX_SRC=${SCRATCH_DIR}/wixsrc WIX_SRC=${SCRATCH_DIR}/wixsrc
CANDLE=${WIX_BIN}/candle.exe # ${WIX_BIN}/
LIT=${WIX_BIN}/lit.exe CANDLE="candle.exe -nologo"
LIGHT=${WIX_BIN}/light.exe LIT="lit.exe -nologo"
LIGHT="light.exe -nologo"
mkdir_clean ${WIX_SRC} mkdir_clean ${WIX_SRC}
${UNZIP} ${SCRATCH_DIR}/wix3.5.2519.0-sources.zip -d ${SCRATCH_DIR}/wixsrc ${UNZIP} ${SCRATCH_DIR}/wix3.5.2519.0-sources.zip -d ${SCRATCH_DIR}/wixsrc
@ -279,9 +271,9 @@ compile_installer()
if [ "${name}" = "VNCControl" ] if [ "${name}" = "VNCControl" ]
then then
${LIGHT} obj${name}/$1.wixobj lib/WixUI_InstallDir.wixlib -loc wixlib/wixui_$2.wxl -ext WiXNetFxExtension -out out${name}/${name}.msi ${LIGHT} -nologo obj${name}/$1.wixobj lib/WixUI_InstallDir.wixlib -loc wixlib/wixui_$2.wxl -ext WiXNetFxExtension -out out${name}/${name}.msi
else else
${LIGHT} obj${name}/$1.wixobj lib/WixUI_InstallDir.wixlib -loc wixlib/wixui_$2.wxl -loc $2.wxl -ext WiXNetFxExtension -out out${name}/${name}.msi ${LIGHT} -nologo obj${name}/$1.wixobj lib/WixUI_InstallDir.wixlib -loc wixlib/wixui_$2.wxl -loc $2.wxl -ext WiXNetFxExtension -out out${name}/${name}.msi
fi fi
} }
@ -332,13 +324,13 @@ cd ${WIX} && chmod a+rw XenCenter.l10n.msi && ${REPO}/sign.bat XenCenter.l10n.ms
#create bundle exe installers - msi installers embedded #create bundle exe installers - msi installers embedded
DOTNETINST=${REPO}/dotNetInstaller DOTNETINST=${REPO}/dotNetInstaller
DOTNETINST_BIN='/cygdrive/c/Program Files/dotNetInstaller/Bin'
cp ${MICROSOFT_DOTNET_FRAMEWORK_INSTALLER_DIR}/dotNetFx40_Full_setup.exe ${DOTNETINST} cp ${MICROSOFT_DOTNET_FRAMEWORK_INSTALLER_DIR}/dotNetFx40_Full_setup.exe ${DOTNETINST}
cp ${WIX}/outXenCenter/XenCenter.msi ${DOTNETINST} cp ${WIX}/outXenCenter/XenCenter.msi ${DOTNETINST}
cp ${WIX}/XenCenter.l10n.msi ${DOTNETINST} cp ${WIX}/XenCenter.l10n.msi ${DOTNETINST}
cp "${DOTNETINST_BIN}"/* ${DOTNETINST}
cd ${DOTNETINST} && "${DOTNETINST}/InstallerLinker.exe" "/Output:XenCenterSetup.exe" "/Template:dotNetInstaller.exe" "/Configuration:XenCenterSetupBootstrapper.xml" "/e+" "/v+" cp "$(which dotNetInstaller.exe)" ${DOTNETINST}
cd ${DOTNETINST} && "${DOTNETINST}/InstallerLinker.exe" "/Output:XenCenterSetup.l10n.exe" "/Template:dotNetInstaller.exe" "/Configuration:XenCenterSetupBootstrapper_l10n.xml" "/e+" "/v+" cd ${DOTNETINST} && InstallerLinker.exe "/Output:XenCenterSetup.exe" "/Template:dotNetInstaller.exe" "/Configuration:XenCenterSetupBootstrapper.xml" "/e+" "/v+"
cd ${DOTNETINST} && InstallerLinker.exe "/Output:XenCenterSetup.l10n.exe" "/Template:dotNetInstaller.exe" "/Configuration:XenCenterSetupBootstrapper_l10n.xml" "/e+" "/v+"
sign_files() sign_files()
{ {
@ -357,14 +349,15 @@ mv -f ${WIX}/vnccontrol.wxs.tmp ${WIX}/vnccontrol.wxs
compile_installer "VNCControl" "en-us" && sign_msi "VNCControl" compile_installer "VNCControl" "en-us" && sign_msi "VNCControl"
#build the tests #build the tests
cd ${REPO}/XenAdminTests && run_msbuild echo "INFO: Build the tests..."
cd ${REPO}/XenAdminTests && $MSBUILD
#this script is used by XenRT #this script is used by XenRT
cp ${REPO}/mk/xenadmintests.sh ${REPO}/XenAdminTests/bin/Release/ cp ${REPO}/mk/xenadmintests.sh ${REPO}/XenAdminTests/bin/Release/
cp ${REPO}/XenAdmin/ReportViewer/* ${REPO}/XenAdminTests/bin/Release/ cp ${REPO}/XenAdmin/ReportViewer/* ${REPO}/XenAdminTests/bin/Release/
cd ${REPO}/XenAdminTests/bin/ && tar -czf XenAdminTests.tgz ./Release cd ${REPO}/XenAdminTests/bin/ && tar -czf XenAdminTests.tgz ./Release
#build the CFUValidator #build the CFUValidator
cd ${REPO}/CFUValidator && run_msbuild cd ${REPO}/CFUValidator && $MSBUILD
cd ${REPO}/CFUValidator/bin/ && tar -czf CFUValidator.tgz ./Release cd ${REPO}/CFUValidator/bin/ && tar -czf CFUValidator.tgz ./Release
#include resources script and collect the resources for translations #include resources script and collect the resources for translations
@ -392,7 +385,7 @@ cp ${REPO}/XenAdmin/bin/Release/{XS56EFP1002,XS56E008,XS60E001,XS62E006,XS65ESP1
${REPO}/XenServerHealthCheck/bin/Release/XenServerHealthCheck.pdb \ ${REPO}/XenServerHealthCheck/bin/Release/XenServerHealthCheck.pdb \
${OUTPUT_DIR} ${OUTPUT_DIR}
#create english iso files echo "INFO: Create English iso files"
ISO_DIR=${SCRATCH_DIR}/iso-staging ISO_DIR=${SCRATCH_DIR}/iso-staging
mkdir_clean ${ISO_DIR} mkdir_clean ${ISO_DIR}
install -m 755 ${EN_CD_DIR}/XenCenterSetup.exe ${ISO_DIR}/XenCenterSetup.exe install -m 755 ${EN_CD_DIR}/XenCenterSetup.exe ${ISO_DIR}/XenCenterSetup.exe
@ -400,7 +393,7 @@ cp ${REPO}/mk/ISO_files/* ${ISO_DIR}
cp ${EN_CD_DIR}/XenCenter.ico ${ISO_DIR}/XenCenter.ico cp ${EN_CD_DIR}/XenCenter.ico ${ISO_DIR}/XenCenter.ico
mkisofs -J -r -v -hfs -probe -publisher "${COMPANY_NAME_LEGAL}" -p "${COMPANY_NAME_LEGAL}" -V "XenCenter" -o "${OUTPUT_DIR}/XenCenter.iso" "${ISO_DIR}" mkisofs -J -r -v -hfs -probe -publisher "${COMPANY_NAME_LEGAL}" -p "${COMPANY_NAME_LEGAL}" -V "XenCenter" -o "${OUTPUT_DIR}/XenCenter.iso" "${ISO_DIR}"
#create l10n iso file echo "INFO: Create l10n iso file"
L10N_ISO_DIR=${SCRATCH_DIR}/l10n-iso-staging L10N_ISO_DIR=${SCRATCH_DIR}/l10n-iso-staging
mkdir_clean ${L10N_ISO_DIR} mkdir_clean ${L10N_ISO_DIR}
# -o root -g root # -o root -g root
@ -441,7 +434,7 @@ fi
echo "xc_product_version=${XC_PRODUCT_VERSION}" >> ${OUTPUT_DIR}/xcversion echo "xc_product_version=${XC_PRODUCT_VERSION}" >> ${OUTPUT_DIR}/xcversion
echo "build_number=${BUILD_NUMBER}" >> ${OUTPUT_DIR}/xcversion echo "build_number=${BUILD_NUMBER}" >> ${OUTPUT_DIR}/xcversion
echo "Build phase succeeded at " echo "INFO: Build phase succeeded at "
date date
set +u set +u

2
mk/xenadmintests.sh Normal file → Executable file
View File

@ -55,7 +55,7 @@ ${MYSCP} ./output/xenadmin/XenAdminTests.tgz Administrator@$ADDR:/tmp/
${MYTESTSSH} 'cd /tmp && tar xzf /tmp/XenAdminTests.tgz && chmod -R 777 /tmp/Release' ${MYTESTSSH} 'cd /tmp && tar xzf /tmp/XenAdminTests.tgz && chmod -R 777 /tmp/Release'
set +e set +e
$VIADAEMON $ADDR 'C:/NUnit/bin/net-2.0/nunit-console.exe /process=separate /noshadow /err="C:\cygwin\tmp\error.nunit.log" /timeout=40000 /output="C:\cygwin\tmp\output.nunit.log" /xml="C:\cygwin\tmp\XenAdminTests.xml" "C:\cygwin\tmp\Release\XenAdminTests.dll" "/framework=net-4.0"' & $VIADAEMON $ADDR 'nunit-console.exe /process=separate /noshadow /err="C:\cygwin\tmp\error.nunit.log" /timeout=40000 /output="C:\cygwin\tmp\output.nunit.log" /xml="C:\cygwin\tmp\XenAdminTests.xml" "C:\cygwin\tmp\Release\XenAdminTests.dll" "/framework=net-4.0"' &
pid=$! pid=$!
(sleep $TIMEOUT ; kill $pid 2>/dev/null ) & (sleep $TIMEOUT ; kill $pid 2>/dev/null ) &
sleeperpid=$! sleeperpid=$!

10
splash/splash.vcxproj
View File

@ -44,6 +44,12 @@
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<TargetName>XenCenter</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<TargetName>XenCenter</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
@ -58,7 +64,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>$(OutDir)XenCenter.exe</OutputFile> <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress> <RandomizedBaseAddress>false</RandomizedBaseAddress>
@ -82,7 +88,7 @@
<DisableSpecificWarnings>4995;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4995;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
<OutputFile>$(OutDir)XenCenter.exe</OutputFile> <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>

4
xe/Xe.csproj Normal file → Executable file
View File

@ -11,7 +11,7 @@
<RootNamespace>ThinCLI</RootNamespace> <RootNamespace>ThinCLI</RootNamespace>
<AssemblyName>xe</AssemblyName> <AssemblyName>xe</AssemblyName>
<ApplicationIcon>AppIcon.ico</ApplicationIcon> <ApplicationIcon>AppIcon.ico</ApplicationIcon>
<SignManifests>false</SignManifests> <SignManifests>true</SignManifests>
<ManifestCertificateThumbprint>4C1DD393E361B8BBCFA1E1D09539C446F88C0A11</ManifestCertificateThumbprint> <ManifestCertificateThumbprint>4C1DD393E361B8BBCFA1E1D09539C446F88C0A11</ManifestCertificateThumbprint>
<ManifestTimestampUrl>http://timestamp.verisign.com/scripts/timestamp.dll</ManifestTimestampUrl> <ManifestTimestampUrl>http://timestamp.verisign.com/scripts/timestamp.dll</ManifestTimestampUrl>
<FileUpgradeFlags> <FileUpgradeFlags>
@ -74,6 +74,6 @@
</Target> </Target>
--> -->
<PropertyGroup> <PropertyGroup>
<PostBuildEvent Condition=" '$(Configuration)' == 'Release' ">"C:\Program Files\Microsoft SDKs\Windows\v6.0A\bin\mt.exe" -manifest "$(ProjectDir)$(ProjectName).manifest" -outputresource:"$(TargetDir)..\..\bin\Release\$(TargetFileName)";#1</PostBuildEvent> <PostBuildEvent Condition=" '$(Configuration)' == 'Release' ">"mt.exe" -nologo -manifest "$(ProjectDir)$(ProjectName).manifest" -outputresource:"$(TargetDir)..\..\bin\Release\$(TargetFileName)";#1</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

4
xva_verify/xva_verify.csproj Normal file → Executable file
View File

@ -12,7 +12,7 @@
<AssemblyName>xva_verify</AssemblyName> <AssemblyName>xva_verify</AssemblyName>
<ApplicationIcon>AppIcon.ico</ApplicationIcon> <ApplicationIcon>AppIcon.ico</ApplicationIcon>
<StartupObject>MainClass</StartupObject> <StartupObject>MainClass</StartupObject>
<SignManifests>false</SignManifests> <SignManifests>true</SignManifests>
<ManifestCertificateThumbprint>4C1DD393E361B8BBCFA1E1D09539C446F88C0A11</ManifestCertificateThumbprint> <ManifestCertificateThumbprint>4C1DD393E361B8BBCFA1E1D09539C446F88C0A11</ManifestCertificateThumbprint>
<ManifestTimestampUrl>http://timestamp.verisign.com/scripts/timestamp.dll</ManifestTimestampUrl> <ManifestTimestampUrl>http://timestamp.verisign.com/scripts/timestamp.dll</ManifestTimestampUrl>
<FileUpgradeFlags> <FileUpgradeFlags>
@ -72,6 +72,6 @@
</Target> </Target>
--> -->
<PropertyGroup> <PropertyGroup>
<PostBuildEvent Condition=" '$(Configuration)' == 'Release' ">"C:\Program Files\Microsoft SDKs\Windows\v6.0A\bin\mt.exe" -manifest "$(ProjectDir)$(ProjectName).manifest" -outputresource:"$(TargetDir)..\..\bin\Release\$(TargetFileName)";#1</PostBuildEvent> <PostBuildEvent Condition=" '$(Configuration)' == 'Release' ">mt.exe -nologo -manifest "$(ProjectDir)$(ProjectName).manifest" -outputresource:"$(TargetDir)..\..\bin\Release\$(TargetFileName)";#1</PostBuildEvent>
</PropertyGroup> </PropertyGroup>
</Project> </Project>