Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3322ad3

Browse files
committed
Add build of fsiAnyCpu.exe to Makefile
1 parent9a1ba4a commit3322ad3

File tree

7 files changed

+57
-5
lines changed

7 files changed

+57
-5
lines changed

‎configure.ac‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ src/fsharp/Fsc/Makefile
8383
src/fsharp/FSharp.Compiler.Interactive.Settings/Makefile
8484
src/fsharp/FSharp.Compiler.Server.Shared/Makefile
8585
src/fsharp/fsi/Makefile
86+
src/fsharp/fsiAnyCpu/Makefile
8687
src/fsharp/policy.2.0.FSharp.Core/Makefile
8788
src/fsharp/policy.4.0.FSharp.Core/Makefile
8889
src/fsharp/policy.2.3.FSharp.Core/Makefile

‎src/fsharp-compiler-build.proj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<ProjectFilesInclude="fsharp\FSharp.Compiler.Server.Shared\FSharp.Compiler.Server.Shared.fsproj"/>
2020
<ProjectFilesInclude="fsharp\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj"/>
2121
<ProjectFilesInclude="fsharp\Fsc\Fsc.fsproj"/>
22-
<ProjectFilesInclude="fsharp\Fsi\Fsi.fsproj"/>
23-
<ProjectFilesInclude="fsharp\Fsi\FsiAnyCpu.fsproj"/>
22+
<ProjectFilesInclude="fsharp\fsi\Fsi.fsproj"/>
23+
<ProjectFilesInclude="fsharp\fsiAnyCpu\FsiAnyCpu.fsproj"/>
2424
</ItemGroup>
2525

2626

‎src/fsharp/Makefile.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ do-final install:
2020
$(MAKE) -C FSharp.Compiler.Interactive.Settings$@
2121
$(MAKE) -C FSharp.Compiler.Server.Shared$@
2222
$(MAKE) -C fsi$@
23+
$(MAKE) -C fsiAnyCpu$@
2324
$(MAKE) -C policy.2.0.FSharp.Core$@
2425
$(MAKE) -C policy.4.0.FSharp.Core$@
2526
$(MAKE) -C policy.2.3.FSharp.Core$@
@@ -36,6 +37,7 @@ clean clean-2-0 clean-4-0:
3637
$(MAKE) -C FSharp.Compiler.Interactive.Settings$@
3738
$(MAKE) -C FSharp.Compiler.Server.Shared$@
3839
$(MAKE) -C fsi$@
40+
$(MAKE) -C fsiAnyCpu$@
3941
$(MAKE) -C policy.2.0.FSharp.Core$@
4042
$(MAKE) -C policy.4.0.FSharp.Core$@
4143
$(MAKE) -C policy.2.3.FSharp.Core$@
File renamed without changes.

‎src/fsharp/fsiAnyCpu/Makefile.in‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
NAME=fsiAnyCpu
2+
ASSEMBLY =$(NAME).exe
3+
TOKEN=$(SIGN_TOKEN)
4+
5+
srcdir := @abs_srcdir@/
6+
7+
include @abs_top_builddir@/config.make
8+
9+
FSC=$(protodir)fsc-proto.exe
10+
11+
FLAGS +=\
12+
$(SIGN_FLAGS)\
13+
--platform:anycpu\
14+
--target:exe
15+
16+
REFERENCES +=\
17+
-r:$(outdir)FSharp.Core.dll\
18+
-r:$(outdir)FSharp.Compiler.dll\
19+
-r:$(outdir)FSharp.Compiler.Interactive.Settings.dll\
20+
-r:$(outdir)FSharp.Compiler.Server.Shared.dll\
21+
-r:$(monolibdir)System.Windows.Forms.dll\
22+
-r:$(monolibdir)System.Drawing.dll
23+
24+
sources =\
25+
$(tmpdir)FSIstrings.fs\
26+
../../assemblyinfo/assemblyinfo.fsi.exe.fs\
27+
../InternalCollections.fsi\
28+
../InternalCollections.fs\
29+
../fsi/console.fs\
30+
../fsi/fsi.fs\
31+
../fsi/fsimain.fs
32+
33+
RESOURCES =\
34+
$(tmpdir)FSIstrings.resources
35+
36+
$(tmpdir)FSIstrings.fs$(tmpdir)FSIstrings.resources: ../fsi/FSIstrings.txt
37+
mono$(MONO_OPTIONS)$(FSSRGEN)$<$(tmpdir)FSIstrings.fs$(tmpdir)FSIstrings.resx
38+
resgen$(tmpdir)FSIstrings.resx$(tmpdir)FSIstrings.resources
39+
40+
include$(topdir)/src/fsharp/targets.make
41+
42+
do-final: do-4-0
43+
44+
clean: clean-4-0
45+
46+
install: install-bin-4 install-lib-4-5
47+
48+
49+
File renamed without changes.

‎tests/hosting/hosted.fsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22

3-
#r@"../../lib/debug/4.0/FSharp.Compiler.dll"
4-
#r@"../../lib/debug/4.0/fsiAnyCpu.exe"
3+
#r@"../../lib/release/4.0/FSharp.Compiler.dll"
4+
#r@"../../lib/release/4.0/fsiAnyCpu.exe"
55

66
openMicrosoft.FSharp.Compiler.Interactive.Shell
77

@@ -15,8 +15,8 @@ let stderrStream = new CompilerOutputStream()
1515
letstderr=new System.IO.StreamWriter(stderrStream)
1616

1717
stdinStream.Add("printfn\"hello world\";;\n")
18-
stdinStream.Add("printfn\"this is me\";;\n")
1918
stdinStream.Add("let x = 1;;\n")
19+
stdinStream.Add("printfn\"this is me, x =%d\" x;;\n\n")
2020
stdinStream.Add("let x = 1;;\n")
2121

2222
letsession= FsiEvaluationSession([|"fsiAnyCpu.exe"|], stdin, stdout, stderr)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp