Author: [email protected]
Branch: windowsinstaller
Changeset: r95815:14976c9f5538
Date: 2018-12-31 19:39 +0000
http://bitbucket.org/pypy/pypy/changeset/14976c9f5538/
Log: Further renaming
diff --git a/pypy/tool/release/windowsinstaller/bundle/bundle.targets
b/pypy/tool/release/windowsinstaller/bundle/bundle.targets
--- a/pypy/tool/release/windowsinstaller/bundle/bundle.targets
+++ b/pypy/tool/release/windowsinstaller/bundle/bundle.targets
@@ -67,7 +67,7 @@
<Package Include="..\exe\exe*.wixproj" />
<Package Include="..\lib_python\lib_python*.wixproj" />
<Package Include="..\libs\libs*.wixproj" />
- <Package Include="..\site-packages\site-packages*.wixproj" />
+ <Package Include="..\site_packages\site_packages*.wixproj" />
</ItemGroup>
<PropertyGroup>
diff --git
a/pypy/tool/release/windowsinstaller/bundle/packagegroups/site-packages.wxs
b/pypy/tool/release/windowsinstaller/bundle/packagegroups/sitepackages.wxs
rename from
pypy/tool/release/windowsinstaller/bundle/packagegroups/site-packages.wxs
rename to
pypy/tool/release/windowsinstaller/bundle/packagegroups/sitepackages.wxs
--- a/pypy/tool/release/windowsinstaller/bundle/packagegroups/site-packages.wxs
+++ b/pypy/tool/release/windowsinstaller/bundle/packagegroups/sitepackages.wxs
@@ -1,22 +1,22 @@
<?xml version="1.0"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
<Fragment>
- <PackageGroup Id="site-packages">
- <MsiPackage Id="site-packages_AllUsers"
- SourceFile="site-packages.msi"
+ <PackageGroup Id="site_packages">
+ <MsiPackage Id="site_packages_AllUsers"
+ SourceFile="site_packages.msi"
Compressed="$(var.CompressMSI)"
DownloadUrl="$(var.DownloadUrl)"
ForcePerMachine="yes"
- InstallCondition="InstallAllUsers and
Include_site-packages and not LauncherOnly">
+ InstallCondition="InstallAllUsers and
Include_site_packages and not LauncherOnly">
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY"
Value="[OptionalFeaturesRegistryKey]" />
</MsiPackage>
- <MsiPackage Id="site-packages_JustForMe"
- SourceFile="site-packages.msi"
+ <MsiPackage Id="site_packages_JustForMe"
+ SourceFile="site_packages.msi"
Compressed="$(var.CompressMSI)"
DownloadUrl="$(var.DownloadUrl)"
ForcePerMachine="no"
- InstallCondition="not InstallAllUsers and
Include_site-packages and not LauncherOnly">
+ InstallCondition="not InstallAllUsers and
Include_site_packages and not LauncherOnly">
<MsiProperty Name="TARGETDIR" Value="[TargetDir]" />
<MsiProperty Name="OPTIONALFEATURESREGISTRYKEY"
Value="[OptionalFeaturesRegistryKey]" />
</MsiPackage>
diff --git
a/pypy/tool/release/windowsinstaller/sitepackages/site-packages.wixproj
b/pypy/tool/release/windowsinstaller/sitepackages/sitepackages.wixproj
rename from
pypy/tool/release/windowsinstaller/sitepackages/site-packages.wixproj
rename to pypy/tool/release/windowsinstaller/sitepackages/sitepackages.wixproj
--- a/pypy/tool/release/windowsinstaller/sitepackages/site-packages.wixproj
+++ b/pypy/tool/release/windowsinstaller/sitepackages/sitepackages.wixproj
@@ -3,23 +3,25 @@
<PropertyGroup>
<ProjectGuid>{CB35E339-9711-49F0-A231-5FB2B1211BDB}</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
- <OutputName Condition="'$(OutputName)' ==
''">site-packages</OutputName>
+ <OutputName Condition="'$(OutputName)' ==
''">site_packages</OutputName>
<OutputType>Package</OutputType>
</PropertyGroup>
<Import Project="..\msi.props" />
<ItemGroup>
- <Compile Include="site-packages.wxs" />
+ <Compile Include="site_packages.wxs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="*.wxl" />
</ItemGroup>
<ItemGroup>
- <InstallFiles Include="$(PySourcePath)site-packages\*">
+ <InstallFiles Include="$(PySourcePath)site-packages\*"
+
Exclude="@(ExcludeFolders->'$(PySourcePath)%(Identity)\*');
+
@(ExcludeFolders->'$(PySourcePath)%(Identity)\**\*')">
<SourceBase>$(PySourcePath)</SourceBase>
<Source>!(bindpath.src)</Source>
<TargetBase>$(PySourcePath)</TargetBase>
<Target_></Target_>
- <Group>site-packages</Group>
+ <Group>site_packages</Group>
</InstallFiles>
</ItemGroup>
<Import Project="..\msi.targets" />
diff --git a/pypy/tool/release/windowsinstaller/sitepackages/site-packages.wxs
b/pypy/tool/release/windowsinstaller/sitepackages/sitepackages.wxs
rename from pypy/tool/release/windowsinstaller/sitepackages/site-packages.wxs
rename to pypy/tool/release/windowsinstaller/sitepackages/sitepackages.wxs
--- a/pypy/tool/release/windowsinstaller/sitepackages/site-packages.wxs
+++ b/pypy/tool/release/windowsinstaller/sitepackages/sitepackages.wxs
@@ -7,7 +7,7 @@
<PropertyRef Id="UpgradeTable" />
<Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)"
Description="!(loc.Description)">
- <ComponentGroupRef Id="site-packages" />
+ <ComponentGroupRef Id="site_packages" />
<ComponentRef Id="OptionalFeature" />
</Feature>
</Product>
diff --git
a/pypy/tool/release/windowsinstaller/sitepackages/site-packages_en-US.wxl
b/pypy/tool/release/windowsinstaller/sitepackages/sitepackages_en-US.wxl
rename from
pypy/tool/release/windowsinstaller/sitepackages/site-packages_en-US.wxl
rename to pypy/tool/release/windowsinstaller/sitepackages/sitepackages_en-US.wxl
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
