Skip to content

Commit 2d7a393

Browse files
oliverbockoliverbock
committed
Merge pull request #19 from skbkontur/master
Build fixed
2 parents 1b017f2 + afce4fe commit 2d7a393

35 files changed

+1405
-2355
lines changed

‎.gitmodules

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
[submodule "v8"]
2-
path = v8
3-
url = https://github.com/v8/v8.git
4-
branch = 3.27
5-
1+
[submodule "depot_tools"]
2+
path = depot_tools
3+
url = https://chromium.googlesource.com/chromium/tools/depot_tools.git

‎.nuget/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="NUnit.Runners" version="2.6.3" />
44
</packages>

‎BuildProcessTemplates/DefaultTemplate.11.1.xaml

-543
This file was deleted.

‎BuildProcessTemplates/LabDefaultTemplate.11.xaml

-208
This file was deleted.

‎BuildProcessTemplates/UpgradeTemplate.xaml

-76
This file was deleted.

‎Fiddling/Fiddling.csproj

+12-22
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -9,28 +9,10 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Fiddling</RootNamespace>
1111
<AssemblyName>Fiddling</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>$(TargetFrameworkVersion)</TargetFrameworkVersion>
13+
<TargetFrameworkProfile>$(TargetFrameworkProfile)</TargetFrameworkProfile>
1314
<FileAlignment>512</FileAlignment>
1415
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<PlatformTarget>x64</PlatformTarget>
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<PlatformTarget>AnyCPU</PlatformTarget>
27-
<DebugType>pdbonly</DebugType>
28-
<Optimize>true</Optimize>
29-
<OutputPath>bin\Release\</OutputPath>
30-
<DefineConstants>TRACE</DefineConstants>
31-
<ErrorReport>prompt</ErrorReport>
32-
<WarningLevel>4</WarningLevel>
33-
</PropertyGroup>
3416
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
3517
<DebugSymbols>true</DebugSymbols>
3618
<OutputPath>bin\x86\Debug\</OutputPath>
@@ -49,6 +31,14 @@
4931
<ErrorReport>prompt</ErrorReport>
5032
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
5133
</PropertyGroup>
34+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
35+
<PlatformTarget>x64</PlatformTarget>
36+
<OutputPath>bin\x64\Debug\</OutputPath>
37+
</PropertyGroup>
38+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
39+
<PlatformTarget>x64</PlatformTarget>
40+
<OutputPath>bin\x64\Release\</OutputPath>
41+
</PropertyGroup>
5242
<ItemGroup>
5343
<Reference Include="System" />
5444
<Reference Include="System.Core" />
@@ -63,7 +53,7 @@
6353
<Compile Include="Properties\AssemblyInfo.cs" />
6454
</ItemGroup>
6555
<ItemGroup>
66-
<ProjectReference Include="..\Source\Noesis.Javascript\Noesis.Javascript.VS2012.vcxproj">
56+
<ProjectReference Include="..\Source\Noesis.Javascript\Noesis.Javascript.VS2013.vcxproj">
6757
<Project>{af1d460b-d372-40f7-8ddb-3f6ee4489eb4}</Project>
6858
<Name>Noesis.Javascript</Name>
6959
</ProjectReference>

‎Fiddling/Program.cs

+13-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
using System;
1+
using System;
22
using System.Collections.Generic;
33
using System.Linq;
4+
using System.Runtime.Remoting.Contexts;
45
using System.Text;
56
using Noesis.Javascript;
67

@@ -20,13 +21,23 @@ static void Main(string[] args)
2021
_context.SetParameter("bozo", new Bozo(ints));
2122
try {
2223
//_context.Run("a=[]; while(true) a.push(0)");
23-
_context.Run("function f() { f(); } f()");
24+
//_context.Run("function f() { f(); } f()");
25+
while(true) {
26+
Console.Write("> ");
27+
var input = Console.ReadLine();
28+
if (input == "quit")
29+
break;
30+
var result = _context.Run(input);
31+
Console.WriteLine("Result is: `{0}`", result);
32+
}
2433
} catch (Exception ex) {
2534
string s = (string)ex.Data["V8StackTrace"];
2635
Console.WriteLine(s);
2736
}
2837
//Console.WriteLine(ints[1]);
2938
}
39+
Console.WriteLine("Press any key to end");
40+
Console.ReadKey();
3041
}
3142

3243
static void FatalErrorHandler(string a, string b)

‎Noesis.Javascript.VS2008.sln

-43
This file was deleted.

‎Noesis.Javascript.VS2010.sln

+35-41
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,35 @@
1-
Microsoft Visual Studio Solution File, Format Version 11.00
2-
# Visual Studio 2010
3-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Noesis.Javascript.Tests.VS2010", "Tests\Noesis.Javascript.Tests\Noesis.Javascript.Tests.VS2010.csproj", "{3594F612-97BB-41C2-90A1-867E78812F4E}"
4-
EndProject
5-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Noesis.Javascript", "Source\Noesis.Javascript\Noesis.Javascript.VS2010.vcxproj", "{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}"
6-
EndProject
7-
Global
8-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9-
Debug|Any CPU = Debug|Any CPU
10-
Debug|Win32 = Debug|Win32
11-
Debug|x64 = Debug|x64
12-
Release|Any CPU = Release|Any CPU
13-
Release|Win32 = Release|Win32
14-
Release|x64 = Release|x64
15-
EndGlobalSection
16-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
17-
{3594F612-97BB-41C2-90A1-867E78812F4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
18-
{3594F612-97BB-41C2-90A1-867E78812F4E}.Debug|Win32.ActiveCfg = Debug|x86
19-
{3594F612-97BB-41C2-90A1-867E78812F4E}.Debug|Win32.Build.0 = Debug|x86
20-
{3594F612-97BB-41C2-90A1-867E78812F4E}.Debug|x64.ActiveCfg = Debug|Any CPU
21-
{3594F612-97BB-41C2-90A1-867E78812F4E}.Debug|x64.Build.0 = Debug|Any CPU
22-
{3594F612-97BB-41C2-90A1-867E78812F4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
23-
{3594F612-97BB-41C2-90A1-867E78812F4E}.Release|Win32.ActiveCfg = Release|x86
24-
{3594F612-97BB-41C2-90A1-867E78812F4E}.Release|Win32.Build.0 = Release|x86
25-
{3594F612-97BB-41C2-90A1-867E78812F4E}.Release|x64.ActiveCfg = Release|Any CPU
26-
{3594F612-97BB-41C2-90A1-867E78812F4E}.Release|x64.Build.0 = Release|Any CPU
27-
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Debug|Any CPU.ActiveCfg = Debug|Win32
28-
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Debug|Win32.ActiveCfg = Debug|Win32
29-
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Debug|Win32.Build.0 = Debug|Win32
30-
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Debug|x64.ActiveCfg = Debug|x64
31-
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Debug|x64.Build.0 = Debug|x64
32-
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Release|Any CPU.ActiveCfg = Release|Win32
33-
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Release|Win32.ActiveCfg = Release|Win32
34-
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Release|Win32.Build.0 = Release|Win32
35-
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Release|x64.ActiveCfg = Release|x64
36-
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Release|x64.Build.0 = Release|x64
37-
EndGlobalSection
38-
GlobalSection(SolutionProperties) = preSolution
39-
HideSolutionNode = FALSE
40-
EndGlobalSection
41-
EndGlobal
1+
Microsoft Visual Studio Solution File, Format Version 11.00
2+
# Visual Studio 2010
3+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Noesis.Javascript.Tests.VS2010", "Tests\Noesis.Javascript.Tests\Noesis.Javascript.Tests.VS2010.csproj", "{3594F612-97BB-41C2-90A1-867E78812F4E}"
4+
EndProject
5+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Noesis.Javascript", "Source\Noesis.Javascript\Noesis.Javascript.VS2010.vcxproj", "{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}"
6+
EndProject
7+
Global
8+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
9+
Debug|Win32 = Debug|Win32
10+
Debug|x64 = Debug|x64
11+
Release|Win32 = Release|Win32
12+
Release|x64 = Release|x64
13+
EndGlobalSection
14+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
15+
{3594F612-97BB-41C2-90A1-867E78812F4E}.Debug|Win32.ActiveCfg = Debug|x64
16+
{3594F612-97BB-41C2-90A1-867E78812F4E}.Debug|Win32.Build.0 = Debug|x64
17+
{3594F612-97BB-41C2-90A1-867E78812F4E}.Debug|x64.ActiveCfg = Debug|x64
18+
{3594F612-97BB-41C2-90A1-867E78812F4E}.Debug|x64.Build.0 = Debug|x64
19+
{3594F612-97BB-41C2-90A1-867E78812F4E}.Release|Win32.ActiveCfg = Release|x86
20+
{3594F612-97BB-41C2-90A1-867E78812F4E}.Release|Win32.Build.0 = Release|x86
21+
{3594F612-97BB-41C2-90A1-867E78812F4E}.Release|x64.ActiveCfg = Release|x64
22+
{3594F612-97BB-41C2-90A1-867E78812F4E}.Release|x64.Build.0 = Release|x64
23+
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Debug|Win32.ActiveCfg = Debug|Win32
24+
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Debug|Win32.Build.0 = Debug|Win32
25+
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Debug|x64.ActiveCfg = Debug|x64
26+
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Debug|x64.Build.0 = Debug|x64
27+
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Release|Win32.ActiveCfg = Release|Win32
28+
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Release|Win32.Build.0 = Release|Win32
29+
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Release|x64.ActiveCfg = Release|x64
30+
{AF1D460B-D372-40F7-8DDB-3F6EE4489EB4}.Release|x64.Build.0 = Release|x64
31+
EndGlobalSection
32+
GlobalSection(SolutionProperties) = preSolution
33+
HideSolutionNode = FALSE
34+
EndGlobalSection
35+
EndGlobal

0 commit comments

Comments
 (0)