Skip to content

Commit 611582a

Browse files
xieguigangxieguigang
committed
2 parents 4602367 + 27965f5 commit 611582a

File tree

9 files changed

+40
-3
lines changed

9 files changed

+40
-3
lines changed

‎R_system.NET5.sln‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,8 @@ Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "Microsoft.VisualBasic.Drawi
225225
EndProject
226226
Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "text.yaml", "..\runtime\sciBASIC#\mime\text%yaml\text.yaml.vbproj", "{6808D39F-AA81-4EE9-BED8-1744F224B6D8}"
227227
EndProject
228+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "RscriptInterop", "studio\Rserver\RscriptInterop\RscriptInterop.shproj", "{7CC55445-6669-4765-918B-E642D6602F69}"
229+
EndProject
228230
Global
229231
GlobalSection(SolutionConfigurationPlatforms) = preSolution
230232
Biodeep|Any CPU = Biodeep|Any CPU
@@ -13656,6 +13658,7 @@ Global
1365613658
{D4CE07AA-5999-4EED-9718-71C2A98628DC} = {EAAB5697-0FBC-4127-82BE-A3AB0480DDFF}
1365713659
{3837B8E4-4044-45AA-8537-FC70BCAFC606} = {AC58D495-6BB9-4CBB-88B7-CEA59BFEF351}
1365813660
{6808D39F-AA81-4EE9-BED8-1744F224B6D8} = {E410DD05-DAC6-4051-B8B6-82AEFD2468C3}
13661+
{7CC55445-6669-4765-918B-E642D6602F69} = {DB9C6014-424E-40B5-8860-F65F4B95065F}
1365913662
EndGlobalSection
1366013663
GlobalSection(ExtensibilityGlobals) = postSolution
1366113664
SolutionGuid = {685F6825-92A4-45A5-8738-721B2AA306B3}
@@ -13674,11 +13677,13 @@ Global
1367413677
Library\shares\dataframeHelper\dataframeHelper.projitems*{700b6326-6278-4677-9dd3-0d63a3486fec}*SharedItemsImports = 5
1367513678
Library\shares\R_graphic.interop\R_graphic.interop.projitems*{700b6326-6278-4677-9dd3-0d63a3486fec}*SharedItemsImports = 5
1367613679
Library\shares\xgboostDataSet_helper\xgboostDataSet_helper.projitems*{78c60f4e-50f9-4a84-8290-2886728a4b34}*SharedItemsImports = 13
13680+
studio\Rserver\RscriptInterop\RscriptInterop.projitems*{7cc55445-6669-4765-918b-e642d6602f69}*SharedItemsImports = 13
1367713681
Library\shares\dataframeHelper\dataframeHelper.projitems*{843b6786-8992-48bf-99be-6579b9645961}*SharedItemsImports = 13
1367813682
studio\Rstudio.common\Rstudio.common.projitems*{9aa7a0bd-50a7-4f14-a2cf-345519a55a3f}*SharedItemsImports = 5
1367913683
Library\shares\JsonHelper\JsonHelper.projitems*{b2ae1422-d7da-4053-a386-eb2ea9326d68}*SharedItemsImports = 13
1368013684
Library\shares\dataframeHelper\dataframeHelper.projitems*{c16d56c1-461b-41d8-87b9-23b0c7785770}*SharedItemsImports = 5
1368113685
Library\shares\JsonHelper\JsonHelper.projitems*{c16d56c1-461b-41d8-87b9-23b0c7785770}*SharedItemsImports = 5
13686+
studio\Rserver\RscriptInterop\RscriptInterop.projitems*{c97e077f-466f-44f2-8363-d606fc093e5e}*SharedItemsImports = 5
1368213687
studio\Rstudio.common\Rstudio.common.projitems*{c97e077f-466f-44f2-8363-d606fc093e5e}*SharedItemsImports = 5
1368313688
studio\Rstudio.common\Rstudio.common.projitems*{e1995e16-ba23-44ea-81bb-187e93f3d906}*SharedItemsImports = 5
1368413689
Library\shares\dataframeHelper\dataframeHelper.projitems*{eaaf480e-e0bd-428f-bfc1-d76e0b5a96a7}*SharedItemsImports = 5

‎snowFall/Context/RunParallel.vb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Imports SMRUCC.Rsharp.Runtime.Components
7676
Imports SMRUCC.Rsharp.Runtime.Internal.Object
7777
Imports SMRUCC.Rsharp.Runtime.Vectorization
7878
Imports snowFall.Context.RPC
79-
Imports R = Rserver.RscriptCommandLine.Rscript
79+
Imports R = snowFall.RscriptCommandLine.Rscript
8080
Imports Rset = SMRUCC.Rsharp.Runtime.Internal.Invokes.set
8181
Imports RInternal = SMRUCC.Rsharp.Runtime.Internal
8282

‎snowFall/Protocol/HostProtocol.vb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
Imports Darwinism.HPC.Parallel
5656
Imports Microsoft.VisualBasic.CommandLine.InteropService
57-
Imports R = Rserver.RscriptCommandLine.Rscript
57+
Imports R = snowFall.RscriptCommandLine.Rscript
5858

5959
Namespace Protocol
6060

‎snowFall/snowFall-netcore5.vbproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,10 @@
241241
<ProjectReference Include="..\..\runtime\sciBASIC#\Microsoft.VisualBasic.Core\src\Core.vbproj" />
242242
<ProjectReference Include="..\..\runtime\sciBASIC#\mime\application%json\JSON-netcore5.vbproj" />
243243
<ProjectReference Include="..\R#\Rsharp-netcore5.vbproj" />
244-
<ProjectReference Include="..\studio\Rserver\Rserver.NET5.vbproj" />
245244
</ItemGroup>
246245

247246
<Import Project="..\studio\Rstudio.common\Rstudio.common.projitems" Label="Shared" />
248247

248+
<Import Project="..\studio\Rserver\RscriptInterop\RscriptInterop.projitems" Label="Shared" />
249+
249250
</Project>

‎studio/Rserver/Rscript.vb‎ renamed to ‎studio/Rserver/RscriptInterop/Rscript.vb‎

File renamed without changes.

‎studio/Rserver/RscriptInterop/RscriptInterop.projitems‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
5+
<HasSharedItems>true</HasSharedItems>
6+
<SharedGUID>7cc55445-6669-4765-918b-e642d6602f69</SharedGUID>
7+
</PropertyGroup>
8+
<PropertyGroup Label="Configuration">
9+
<Import_RootNamespace>RscriptInterop</Import_RootNamespace>
10+
</PropertyGroup>
11+
<ItemGroup>
12+
<Compile Include="$(MSBuildThisFileDirectory)Rscript.vb" />
13+
</ItemGroup>
14+
</Project>

‎studio/Rserver/RscriptInterop/RscriptInterop.shproj‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup Label="Globals">
4+
<ProjectGuid>7cc55445-6669-4765-918b-e642d6602f69</ProjectGuid>
5+
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
6+
</PropertyGroup>
7+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
8+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
9+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
10+
<PropertyGroup />
11+
<Import Project="RscriptInterop.projitems" Label="Shared" />
12+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.VisualBasic.targets" />
13+
</Project>

‎studio/Rserver/Rscript_cli.cmd‎ renamed to ‎studio/Rserver/RscriptInterop/Rscript_cli.cmd‎

File renamed without changes.

‎studio/Rserver/Rserver.NET5.vbproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,10 @@
316316
<DefineConstants>write_csv=1</DefineConstants>
317317
</PropertyGroup>
318318

319+
<ItemGroup>
320+
<None Remove="RscriptInterop\RscriptInterop.projitems" />
321+
</ItemGroup>
322+
319323
<ItemGroup>
320324
<ProjectReference Include="..\..\..\runtime\Darwinism\src\networking\networking.vbproj" />
321325
<ProjectReference Include="..\..\..\runtime\httpd\src\Flute\Flute.NET5.vbproj" />

0 commit comments

Comments
 (0)