Skip to content

Commit c4287b3

Browse files
[Tools] Adds icon to nemish.
Cleanups project files. git-svn-id: https://nemerle.googlecode.com/svn/nemerle/trunk@8813 c8a6711f-211a-0410-a8d5-2f220496d6d1
1 parent c561b02 commit c4287b3

File tree

5 files changed

+22
-16
lines changed

5 files changed

+22
-16
lines changed

Tools.sln

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
12
Microsoft Visual Studio Solution File, Format Version 10.00
23
# Visual Studio 2008
4+
# SharpDevelop 3.2.0.5505
35
Project("{EDCC3B85-0BAD-11DB-BC1A-00112FDE8B61}") = "Nemerle.Evaluation", "tools\Nemerle.Evaluation.nproj", "{30EC93B9-43DD-47C2-A18D-AA6B907EF4BE}"
46
EndProject
57
Project("{EDCC3B85-0BAD-11DB-BC1A-00112FDE8B61}") = "nemish", "tools\nemish.nproj", "{70754C6C-3ACA-438A-9C52-03C544EC0A8D}"
@@ -26,10 +28,6 @@ Global
2628
{48ADC8E6-B8EE-40BF-883A-6BCAEE53AB2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
2729
{48ADC8E6-B8EE-40BF-883A-6BCAEE53AB2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
2830
{48ADC8E6-B8EE-40BF-883A-6BCAEE53AB2A}.Release|Any CPU.Build.0 = Release|Any CPU
29-
{1C715AEC-1328-45C8-9606-7FCD90D6E256}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30-
{1C715AEC-1328-45C8-9606-7FCD90D6E256}.Debug|Any CPU.Build.0 = Debug|Any CPU
31-
{1C715AEC-1328-45C8-9606-7FCD90D6E256}.Release|Any CPU.ActiveCfg = Release|Any CPU
32-
{1C715AEC-1328-45C8-9606-7FCD90D6E256}.Release|Any CPU.Build.0 = Release|Any CPU
3331
{C35C79B4-8107-4B5F-BC8A-64783F24726F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3432
{C35C79B4-8107-4B5F-BC8A-64783F24726F}.Debug|Any CPU.Build.0 = Debug|Any CPU
3533
{C35C79B4-8107-4B5F-BC8A-64783F24726F}.Release|Any CPU.ActiveCfg = Release|Any CPU

tools/Nemerle.Evaluation.nproj

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,6 @@
3838
<ItemGroup>
3939
<Reference Include="mscorlib" />
4040
<Reference Include="System" />
41-
</ItemGroup>
42-
<ItemGroup>
43-
<Compile Include="nemerlish\eval.n">
44-
<SubType>Code</SubType>
45-
</Compile>
46-
</ItemGroup>
47-
<ItemGroup>
4841
<Reference Include="Nemerle">
4942
<SpecificVersion>False</SpecificVersion>
5043
<HintPath>$(Nemerle)\Nemerle.dll</HintPath>
@@ -53,11 +46,20 @@
5346
<SpecificVersion>False</SpecificVersion>
5447
<HintPath>$(Nemerle)\Nemerle.Compiler.dll</HintPath>
5548
</Reference>
49+
<!-- It is needed to load correctly standard macros in runtime -->
50+
<Reference Include="Nemerle.Macros">
51+
<SpecificVersion>False</SpecificVersion>
52+
<HintPath>$(Nemerle)\Nemerle.Macros.dll</HintPath>
53+
</Reference>
54+
</ItemGroup>
55+
<ItemGroup>
56+
<Compile Include="nemerlish\eval.n">
57+
<SubType>Code</SubType>
58+
</Compile>
5659
</ItemGroup>
5760
<ItemGroup>
5861
<Folder Include="nemerlish\" />
5962
</ItemGroup>
60-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
6163
<Import Project="$(Nemerle)\Nemerle.MSBuild.targets" />
6264
<!--
6365
To modify your build process, add your task inside one of the targets below and uncomment it.

tools/nemerlish/eval.n

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,14 @@ namespace Nemerle.Evaluation
5353
public this (persistent_mode : bool, path : string = null) {
5454
base (CompilationOptions ());
5555
this.persistentMode = persistent_mode;
56-
this.InitOutput (System.Console.Out);
56+
this.InitOutput (System.Console.Out);
5757

5858
when (path != null) {
5959
// We need to add the application directory to the search path, so
6060
// the assemblies in nemish.exe directory can be loaded.
6161
Options.LibraryPaths ::= path;
6262
}
63+
Options.ColorMessages = false;
6364
Options.CompileToMemory = true;
6465
Options.IgnoreConfusion = true;
6566
Options.ProgressBar = false;

tools/nemerlish/icon.res

65.2 KB
Binary file not shown.

tools/nemish.nproj

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<NoStdLib>true</NoStdLib>
55
<Nemerle Condition=" '$(Nemerle)' == '' ">$(ProgramFiles)\Nemerle</Nemerle>
66
<Name>nemish</Name>
7+
<Win32Resource>nemerlish\icon.res</Win32Resource>
78
</PropertyGroup>
89
<PropertyGroup>
910
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -37,6 +38,7 @@
3738
</PropertyGroup>
3839
<ItemGroup>
3940
<Reference Include="mscorlib" />
41+
<Reference Include="System" />
4042
<Reference Include="Nemerle">
4143
<SpecificVersion>False</SpecificVersion>
4244
<HintPath>$(Nemerle)\Nemerle.dll</HintPath>
@@ -45,7 +47,11 @@
4547
<SpecificVersion>False</SpecificVersion>
4648
<HintPath>$(Nemerle)\Nemerle.Compiler.dll</HintPath>
4749
</Reference>
48-
<Reference Include="System" />
50+
<!-- It is needed to load correctly standard macros in runtime -->
51+
<Reference Include="Nemerle.Macros">
52+
<SpecificVersion>False</SpecificVersion>
53+
<HintPath>$(Nemerle)\Nemerle.Macros.dll</HintPath>
54+
</Reference>
4955
</ItemGroup>
5056
<ItemGroup>
5157
<Compile Include="nemerlish\interp.n">
@@ -73,7 +79,6 @@
7379
<SubType>Content</SubType>
7480
</Content>
7581
</ItemGroup>
76-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7782
<Import Project="$(Nemerle)\Nemerle.MSBuild.targets" />
7883
<!--
7984
To modify your build process, add your task inside one of the targets below and uncomment it.

0 commit comments

Comments
 (0)