summaryrefslogtreecommitdiffstats
path: root/Tools/msi
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2015-03-08 19:59:00 (GMT)
committerSteve Dower <steve.dower@microsoft.com>2015-03-08 19:59:00 (GMT)
commit1872f93fd128161a7ebebf1a479dc31a6b5eb434 (patch)
treed6af015a7de397bdf2efee7d62e53ac29d451db1 /Tools/msi
parent5bd7bf5bab3a961a3952e36b053eb93818553e13 (diff)
downloadcpython-1872f93fd128161a7ebebf1a479dc31a6b5eb434.zip
cpython-1872f93fd128161a7ebebf1a479dc31a6b5eb434.tar.gz
cpython-1872f93fd128161a7ebebf1a479dc31a6b5eb434.tar.bz2
Minor updates to Windows installer upload script.
Diffstat (limited to 'Tools/msi')
-rw-r--r--Tools/msi/uploadrelease.bat3
-rw-r--r--Tools/msi/uploadrelease.proj4
2 files changed, 4 insertions, 3 deletions
diff --git a/Tools/msi/uploadrelease.bat b/Tools/msi/uploadrelease.bat
index 2064a67..c91d229 100644
--- a/Tools/msi/uploadrelease.bat
+++ b/Tools/msi/uploadrelease.bat
@@ -30,9 +30,10 @@ if not defined PSCP echo Cannot locate pscp.exe & exit /B 1
echo Found pscp.exe at %PSCP%
call "%PCBUILD%env.bat" > nul 2> nul
+pushd "%D%"
msbuild /v:m /nologo uploadrelease.proj /t:Upload /p:Platform=x86
msbuild /v:m /nologo uploadrelease.proj /t:Upload /p:Platform=x64 /p:IncludeDoc=false
-
+popd
exit /B 0
:Help
diff --git a/Tools/msi/uploadrelease.proj b/Tools/msi/uploadrelease.proj
index a3ebe57..56aff4a 100644
--- a/Tools/msi/uploadrelease.proj
+++ b/Tools/msi/uploadrelease.proj
@@ -41,14 +41,14 @@
<Target Name="_Upload" Condition="!$(DryRun)">
<Exec Command="&quot;$(PLINK)&quot; $(User)@$(Host) mkdir %(File.CopyTo) ^&amp;^&amp; chgrp downloads %(File.CopyTo) ^&amp;^&amp; chmod g-w,o+rx %(File.CopyTo)
&quot;$(PSCP)&quot; @(File,' ') $(User)@$(Host):%(File.CopyTo)
-&quot;$(PLINK)&quot; $(User)@$(Host) chgrp downloads %(File.CopyTo)/* ^&amp;^&amp; chmod g-w,o+r %(File.CopyTo)/*
+&quot;$(PLINK)&quot; $(User)@$(Host) chgrp downloads %(File.CopyTo)/*; chmod g-w,o+r %(File.CopyTo)/*
" />
</Target>
<Target Name="_PrintNames" Condition="$(DryRun)">
<Exec Command="echo &quot;$(PLINK)&quot; $(User)@$(Host) mkdir %(File.CopyTo) ^&amp;^&amp; chgrp downloads %(File.CopyTo) ^&amp;^&amp; chmod g-w,o+rx %(File.CopyTo)
echo &quot;$(PSCP)&quot; @(File,' ') $(User)@$(Host):%(File.CopyTo)
-echo &quot;$(PLINK)&quot; $(User)@$(Host) chgrp downloads %(File.CopyTo)/* ^&amp;^&amp; chmod g-w,o+r %(File.CopyTo)/*
+echo &quot;$(PLINK)&quot; $(User)@$(Host) chgrp downloads %(File.CopyTo)/*; chmod g-w,o+r %(File.CopyTo)/*
echo.
echo." />
</Target>