Updating exec for OSX by putting the whole command in a single line. …

…There was a change in MSBuild where we changed the way the exec command is treated.
radical · Oct 5, 2018 · 48ed870 · 48ed870
1 parent 68b7810
commit 48ed870
Showing 1 changed file with 2 additions and 14 deletions.
diff --git a/build/package/Installer.PKG.targets b/build/package/Installer.PKG.targets
@@ -118,13 +118,7 @@
         Glob="$(SdkPkgScriptFile)"
         Mode="ugo+x" />
 
-      <Exec Command="pkgbuild
-                     --root '$(SdkLayoutOutputDirectory)'
-                     --identifier '$(SdkComponentId)'
-                     --version '$(SdkVersion)'
-                     --install-location '$(PkgInstallDirectory)'
-                     --scripts '$(SdkPkgDestinationScriptsDirectory)'
-                     '$(SdkInstallerFile)'" />
+      <Exec Command="pkgbuild --root '$(SdkLayoutOutputDirectory)' --identifier '$(SdkComponentId)' --version '$(SdkVersion)' --install-location '$(PkgInstallDirectory)' --scripts '$(SdkPkgDestinationScriptsDirectory)' '$(SdkInstallerFile)'" />
     </Target>
 
     <Target Name="GenerateSdkProductArchive"
@@ -153,13 +147,7 @@
         ReplacementPatterns="@(DistributionTemplateReplacement -> '%(Identity)')"
         ReplacementStrings="@(DistributionTemplateReplacement -> '%(ReplacementString)')" />
 
-      <Exec Command="productbuild
-                     --version '$(SdkVersion)'
-                     --identifier '$(SdkProductArchiveId)'
-                     --package-path '$(PkgIntermediateDirectory)'
-                     --resources '$(SdkProductArchiveResourcesDirectory)'
-                     --distribution '$(SdkProductArchiveDistributionFile)'
-                     '$(CombinedFrameworkSdkHostInstallerFile)'" />
+      <Exec Command="productbuild --version '$(SdkVersion)' --identifier '$(SdkProductArchiveId)' --package-path '$(PkgIntermediateDirectory)' --resources '$(SdkProductArchiveResourcesDirectory)' --distribution '$(SdkProductArchiveDistributionFile)' '$(CombinedFrameworkSdkHostInstallerFile)'" />
     </Target>
 
     <Target Name="GeneratePkgs"