Skip to content

Commit 99281b7

Browse files
committed
Fixed Python location.
Added a UAC manifest.
1 parent 7c7ce29 commit 99281b7

File tree

4 files changed

+15
-2
lines changed

4 files changed

+15
-2
lines changed

BSPEngine.dll

0 Bytes
Binary file not shown.

DebugPackages/ESP8266DebugPackage/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
[assembly: AssemblyCulture("")]
1717
[assembly: ComVisible(false)]
1818

19-
[assembly: AssemblyVersion("2.0.1602.0")]
20-
[assembly: AssemblyFileVersion("2.0.1602.0")]
19+
[assembly: AssemblyVersion("2.0.1609.0")]
20+
[assembly: AssemblyFileVersion("2.0.1609.0")]

ExtraDeviceSupport/Renesas/RenesasToolchainManager/RenesasToolchainController.cs

+9
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,10 @@ public void Integrate()
218218
if (idx == -1)
219219
throw new Exception("Failed to determine the prefix from the gcc path");
220220

221+
Status = "Locating Python...";
222+
string pythonExe = Directory.GetFiles(E2StudioPath, "python27.dll", SearchOption.AllDirectories).FirstOrDefault() ?? throw new Exception("Could not find python27.dll in " + E2StudioPath);
223+
string pythonDir = Path.GetDirectoryName(pythonExe);
224+
221225
BuildBSP(gccVersion.Target);
222226

223227
Toolchain tc = new Toolchain
@@ -236,6 +240,11 @@ public void Integrate()
236240
{
237241
BSPDirectoryName
238242
},
243+
ExtraEnvironment = new[]
244+
{
245+
$"PATH=%PATH%;{pythonDir}",
246+
$"PYTHONHOME={pythonDir}"
247+
}
239248
};
240249

241250
Status = "Writing configuration files...";

ExtraDeviceSupport/Renesas/RenesasToolchainManager/RenesasToolchainManager.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
<ErrorReport>prompt</ErrorReport>
3333
<WarningLevel>4</WarningLevel>
3434
</PropertyGroup>
35+
<PropertyGroup>
36+
<ApplicationManifest>app.manifest</ApplicationManifest>
37+
</PropertyGroup>
3538
<ItemGroup>
3639
<Reference Include="BSPEngine">
3740
<HintPath>..\..\..\BSPEngine.dll</HintPath>
@@ -89,6 +92,7 @@
8992
<Generator>ResXFileCodeGenerator</Generator>
9093
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
9194
</EmbeddedResource>
95+
<None Include="app.manifest" />
9296
<None Include="Properties\Settings.settings">
9397
<Generator>SettingsSingleFileGenerator</Generator>
9498
<LastGenOutput>Settings.Designer.cs</LastGenOutput>

0 commit comments

Comments
 (0)