Merge pull request #99 from microsoft/richcala/MRO-353-Updates

Changes for MRO-3.5.3
microsoft · May 15, 2019 · 7616012 · 7616012
2 parents 4fd0f58 + f833d01
commit 7616012
Show file tree

Hide file tree

Showing 116 changed files with 8,367 additions and 4,736 deletions.
diff --git a/additionalPackages/RevoIOQ/inst/unitTests/Revo/common/runit.revo.common.MKL.R b/additionalPackages/RevoIOQ/inst/unitTests/Revo/common/runit.revo.common.MKL.R
@@ -4,9 +4,7 @@
 ## This test is part of the Micrsoft R Server Validation Suite
 
 test.dgemm.crossprod <- function(){
-
-    DEACTIVATED("Bug 74384: SQLPAL: setMKLthreads(1) crashes sqlpal (RevoIOQ test test.dgemm.crossprod)")	
-
+
     loaded.packages <- search()
     if ("package:RevoUtilsMath" %in% loaded.packages)
     {

diff --git a/additionalPackages/RevoIOQ/inst/unitTests/Revo/common/runit.revo.common.version.R b/additionalPackages/RevoIOQ/inst/unitTests/Revo/common/runit.revo.common.version.R
@@ -26,7 +26,7 @@ if (!identical(system.file(package="RevoMods"), ""))
     "test.revor.RevoIOQ.version" <- function() checkTrue("checkPackageVersion"(pkg = "RevoIOQ", ver = revover))
     "test.revor.RUnit.version" <- function() checkTrue("checkPackageVersion"(pkg = "RUnit", ver = "0.4.26"))
     "test.revoparallelr.doParallel.version" <- function() checkTrue("checkPackageVersion"(pkg = "doParallel", ver = "1.0.14"))
-    "test.revor.RevoUtils.version" <- function() checkTrue("checkPackageVersion"(pkg = "RevoUtils", ver = "11.0.2"))
+    "test.revor.RevoUtils.version" <- function() checkTrue("checkPackageVersion"(pkg = "RevoUtils", ver = "11.0.3"))
     "test.revor.RevoMods.version" <- function() checkTrue("checkPackageVersion"(pkg = "RevoMods", ver = "11.0.1"))
 } else
 {

diff --git a/additionalPackages/RevoUtils/DESCRIPTION b/additionalPackages/RevoUtils/DESCRIPTION
@@ -1,11 +1,11 @@
 Package: RevoUtils
-Version: 11.0.2
-Date: 2019-02-15
+Version: 11.0.3
+Date: 2019-05-10
 Title: Microsoft R Utility Package
 Author: Microsoft Corporation
 Maintainer: Microsoft Corporation <mrspack@microsoft.com>
 SystemRequirements: R (>= 3.0.0)
 Description: Utility functions for Microsoft R
 License: GPL-2
 Copyright: Microsoft Corporation
-MRANDate: 2019-02-01
+MRANDate: 2019-04-15
diff --git a/setup-MRO/ROpen/Product.wxs b/setup-MRO/ROpen/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-    <Product Id="*" Name="Microsoft R Open $(var.MroShortVersion)" Language="1033" Version="$(var.MroVersion)" Manufacturer="Microsoft Corporation" UpgradeCode="9A23D6F4-30E1-49A1-A071-06BAE69CF879">
+    <Product Id="*" Name="Microsoft R Open $(var.MroShortVersion)" Language="1033" Version="$(var.MroVersion)" Manufacturer="Microsoft Corporation" UpgradeCode="8ACB5527-CE3E-4F65-BF00-D47C63FBBBF0">
 		<Package InstallerVersion="500" Compressed="yes" InstallScope="perMachine" Platform="x64" />
 
 		<PropertyRef Id="NETFRAMEWORK45"/>

diff --git a/setup-MRO/ROpen/Setup_en-us.wxl b/setup-MRO/ROpen/Setup_en-us.wxl
@@ -13,7 +13,7 @@
 	<String Id="MklInstallDlgLearnMoreLinkText">Intel MKL</String>
 	<String Id="MklLicenseDlgTitle">{\WixUI_Font_Title}MKL Licensing Information</String>
 	<String Id="MklLicenseDlgLicenseAcceptedCheckBox">I accept the MKL license terms</String>
-	<String Id="ShortcutRguiName">Microsoft R Open 3.5.2</String>
+	<String Id="ShortcutRguiName">Microsoft R Open 3.5.3</String>
 	<String Id="ExitDialogDescription">Click the Finish button to exit the Setup Wizard and install any additional required software.</String>
 	<String Id="InvalidNetFramework">This application requires .NET Framework 4.5. Please install the .NET Framework then run this installer again.</String>
 </WixLocalization>
diff --git a/setup-MRO/ROpenSetupBootstrapper/Bundle.wxs b/setup-MRO/ROpenSetupBootstrapper/Bundle.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:bal ="http://schemas.microsoft.com/wix/BalExtension" xmlns:util ="http://schemas.microsoft.com/wix/UtilExtension">
-	<Bundle Name="Microsoft R Open $(var.MroShortVersion)" Version="$(var.MroShortVersion).$(var.BuildNumber)" Manufacturer="Microsoft" UpgradeCode="D9F0EF80-3113-449E-8359-6B067DCFAECE">
+	<Bundle Name="Microsoft R Open $(var.MroShortVersion)" Version="$(var.MroShortVersion).$(var.BuildNumber)" Manufacturer="Microsoft" UpgradeCode="D1916AAE-1475-4A40-8A93-91B5A83D9927">
     <BootstrapperApplicationRef Id="ManagedBootstrapperApplicationHost">
       <PayloadGroupRef Id ="RSetup"/>
       <PayloadGroupRef Id="RInstaller"/>

diff --git a/setup-MRO/ROpenSetupBootstrapper/productResource.json b/setup-MRO/ROpenSetupBootstrapper/productResource.json
@@ -3,7 +3,7 @@
   "productStrings": {
     "marketingPrefix": "Microsoft",
     "marketingPostfix": "R Open",
-    "marketingVersion": "3.5.2",
+    "marketingVersion": "3.5.3",
     "marketingDescriptionPrimary": "Microsoft R Open is the enhanced distribution of R from Microsoft Corporation. It is a complete open source platform for statistical analysis and data science.",
     "marketingDescriptionSecondary": "You can get more information about Microsoft R Open at",
     "marketingUrl": "https://aka.ms/microsoft-r-open-docs",

diff --git a/setup-MRO/build.cake b/setup-MRO/build.cake
@@ -703,6 +703,8 @@ RBuildEnvironment.Override("Build", () => {
         CreateDirectory("target/MRO/Linux");
         CreateDirectory("target/MRO/SLES");
         CreateDirectory("stage/tarballStage/microsoft-r-open/rpm");
+        CreateDirectory("stage/tarballStage/microsoft-r-open/rpm/rhel");
+        CreateDirectory("stage/tarballStage/microsoft-r-open/rpm/sles");
         CreateDirectory("stage/tarballStage/microsoft-r-open/deb");
         CopyFile("packageFiles/installScript/install.sh", "stage/tarballStage/microsoft-r-open/install.sh");
         ChMod("a+x", "stage/tarballStage/microsoft-r-open/install.sh");
@@ -766,7 +768,7 @@ Task("AssembleDeliverables").Does(() => {
         if (System.IO.Directory.Exists("cmake_build_mro")) 
         {
             CopyFiles("cmake_build_mro/microsoft-r-open*.deb", "stage/tarballStage/microsoft-r-open/deb");
-            CopyFiles("cmake_build_mro/microsoft-r-open*.rpm", "stage/tarballStage/microsoft-r-open/rpm");
+            CopyFiles("cmake_build_mro/microsoft-r-open*.rpm", "stage/tarballStage/microsoft-r-open/rpm/rhel");
 
             var tarArgs = "-czvf target/MRO/Linux/microsoft-r-open.tar.gz -C stage/tarballStage microsoft-r-open/";
             RunCommand("tar", tarArgs);
@@ -775,7 +777,7 @@ Task("AssembleDeliverables").Does(() => {
         }
         else if(System.IO.Directory.Exists("cmake_build_mro_rpm_sles"))
         {
-            CopyFiles("cmake_build_mro_rpm_sles/microsoft-r-open*.rpm", "stage/tarballStage/microsoft-r-open/rpm");
+            CopyFiles("cmake_build_mro_rpm_sles/microsoft-r-open*.rpm", "stage/tarballStage/microsoft-r-open/rpm/sles");
 
             var tarArgs = "-czvf target/MRO/SLES/microsoft-r-open.tar.gz -C stage/tarballStage microsoft-r-open/";
             RunCommand("tar", tarArgs);  

diff --git a/setup-MRO/global.props b/setup-MRO/global.props
@@ -7,15 +7,15 @@
 
     <MlmVersion Condition="'$(MlmVersion)' == '' ">9.4.7.0</MlmVersion>
     <MklVersion Condition="'$(MklVersion)' == '' ">2019.2.0.0</MklVersion>
-    <MroVersion Condition="'$(MroVersion)' == '' ">3.5.2.0</MroVersion>
-    <SroVersion Condition="'$(SroVersion)' == '' ">3.5.2.0</SroVersion>
+    <MroVersion Condition="'$(MroVersion)' == '' ">3.5.3.0</MroVersion>
+    <SroVersion Condition="'$(SroVersion)' == '' ">3.5.3.0</SroVersion>
     <SrsVersion Condition="'$(SrsVersion)' == '' ">9.4.7.0</SrsVersion>
     <SpoVersion Condition="'$(SpoVersion)' == '' ">9.4.7.0</SpoVersion>
     <SpsVersion Condition="'$(SpsVersion)' == '' ">9.4.7.0</SpsVersion>
 
-    <MroPkgsVersion Condition="'$(MroPkgsVersion)' == '' ">3.5.2.0</MroPkgsVersion>
+    <MroPkgsVersion Condition="'$(MroPkgsVersion)' == '' ">3.5.3.0</MroPkgsVersion>
 
-    <MroShortVersion Condition="'$(MroShortVersion)' == '' ">3.5.2</MroShortVersion>
+    <MroShortVersion Condition="'$(MroShortVersion)' == '' ">3.5.3</MroShortVersion>
     <SrsShortVersion Condition="'$(SrsShortVersion)' == '' ">9.4.7</SrsShortVersion>
 
     <OutputBase Condition="'$(OutputBase)' == ''">$(CodeRoot)\target\$(Configuration)</OutputBase>

diff --git a/setup-MRO/packageFiles/installScript/install.sh b/setup-MRO/packageFiles/installScript/install.sh
@@ -18,6 +18,7 @@ USE_YUM=false
 USE_ZYPPER=false
 USE_DPKG=false
 USE_RPM=false
+DISTRO_NAME=""
 
 INTERNET_CONNECTION=false
 
@@ -101,10 +102,12 @@ function check_getopt {
 function detect_package_manager {
   if [ -f /etc/redhat-release ]; then
     USE_YUM=true
+    DISTRO_NAME="rhel"
   elif [ -f /etc/debian_version ]; then
     USE_DPKG=true
-  elif [ -f /etc/SuSE-brand ] || [ -f /etc/SuSE-release ]; then
+  elif [ -f /etc/SuSE-brand ] || [ -f /etc/SuSE-release ] || [ -f /etc/os-release ]; then
     USE_ZYPPER=true
+    DISTRO_NAME="sles"
   else
     echo "Unsupported OS"
     exit 1
@@ -290,15 +293,15 @@ function install_deb_dpkg {
 function install {
   if [[ ${USE_YUM} == true ]]; then
     mkdir -p ${SCRIPT_DIR}/logs
-    install_rpm_yum ${SCRIPT_DIR}/rpm/microsoft-r-open-mro*.rpm ${SCRIPT_DIR}/logs/mro.txt
+    install_rpm_yum ${SCRIPT_DIR}/rpm/${DISTRO_NAME}/microsoft-r-open-mro*.rpm ${SCRIPT_DIR}/logs/mro.txt
     if [[ ${MKL_EULA_ACCEPTED} == true ]]; then
-      install_rpm_yum ${SCRIPT_DIR}/rpm/microsoft-r-open-mkl*.rpm ${SCRIPT_DIR}/logs/mkl.txt
+      install_rpm_yum ${SCRIPT_DIR}/rpm/${DISTRO_NAME}/microsoft-r-open-mkl*.rpm ${SCRIPT_DIR}/logs/mkl.txt
     fi
   elif [[ ${USE_ZYPPER} == true ]]; then
     mkdir -p ${SCRIPT_DIR}/logs
-    install_rpm_zypper ${SCRIPT_DIR}/rpm/microsoft-r-open-mro*.rpm ${SCRIPT_DIR}/logs/mro.txt
+    install_rpm_zypper ${SCRIPT_DIR}/rpm/${DISTRO_NAME}/microsoft-r-open-mro*.rpm ${SCRIPT_DIR}/logs/mro.txt
     if [[ ${MKL_EULA_ACCEPTED} == true ]]; then
-      install_rpm_zypper ${SCRIPT_DIR}/rpm/microsoft-r-open-mkl*.rpm ${SCRIPT_DIR}/logs/mkl.txt
+      install_rpm_zypper ${SCRIPT_DIR}/rpm/${DISTRO_NAME}/microsoft-r-open-mkl*.rpm ${SCRIPT_DIR}/logs/mkl.txt
     fi
   elif [[ ${USE_DPKG} == true ]]; then
     mkdir -p ${SCRIPT_DIR}/logs

diff --git a/setup-MRO/packageScripts/intel-mkl/rpm/postinst b/setup-MRO/packageScripts/intel-mkl/rpm/postinst
@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSION="3.5.2"
+VERSION="3.5.3"
 INSTALL_PREFIX="${RPM_INSTALL_PREFIX}/ropen/${VERSION}"
 
 set +f

diff --git a/setup-MRO/packageScripts/intel-mkl/rpm/postrm b/setup-MRO/packageScripts/intel-mkl/rpm/postrm
@@ -3,7 +3,7 @@
 #Enable shell globbing
 set +f
 
-VERSION="3.5.2"
+VERSION="3.5.3"
 INSTALL_PREFIX="${RPM_INSTALL_PREFIX}/ropen/${VERSION}"
 
 # We will let postinst of installing RPM take care of this if upgrade

diff --git a/setup-MRO/packageScripts/intel-mkl/rpm/prerm b/setup-MRO/packageScripts/intel-mkl/rpm/prerm
@@ -8,7 +8,7 @@ if [[ "$1" == "1" ]]; then
     exit 0
 fi
 
-VERSION="3.5.2"
+VERSION="3.5.3"
 INSTALL_DIR="${RPM_INSTALL_PREFIX}/ropen/${VERSION}"
 DIRECTORY="${INSTALL_DIR}/lib64/R"
 if [ -e "${INSTALL_DIR}/MKL_EULA.txt" ]; then

diff --git a/setup-MRO/packageScripts/mro/rpm/prerm b/setup-MRO/packageScripts/mro/rpm/prerm
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=3.5.2
+VERSION=3.5.3
 INSTALL_PREFIX="${RPM_INSTALL_PREFIX}/ropen/${VERSION}"
 
 for file in R Rscript

diff --git a/source/SVN-REVISION b/source/SVN-REVISION
@@ -1,2 +1,2 @@
-Revision: 75870
-Last Changed Date: 2018-12-20
+Revision: 76217
+Last Changed Date: 2019-03-11
diff --git a/source/VERSION b/source/VERSION
@@ -1 +1 @@
-3.5.2
+3.5.3
diff --git a/source/VERSION-NICK b/source/VERSION-NICK
@@ -1 +1 @@
-Eggshell Igloo
+Great Truth