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

Commit988106a

Browse files
committed
Merge pull requestfsharp#25 from knocte/master
Some final touches for xbuild integrationThis merge includes 5 commits:(473bcd4) install: symlink libs too from 4.5 to 4.0(0199232) autogen.sh: don't tell to install autoconf if autoreconf exists (46179e5) configure.ac: warn about not using the same prefix as mono(a4ea68d) configure.ac: warn if not using Mono >= 2.11.5(e22168a) configure.ac: fix typo
2 parents0609e6e +e4afd18 commit988106a

File tree

5 files changed

+21
-4
lines changed

5 files changed

+21
-4
lines changed

‎autogen.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/usr/bin/env sh
2-
which autoreconf> /dev/null&& autoreconf||echo"Please install autoconf"
3-
./configure$@
2+
which autoreconf> /dev/null||(echo"Please install autoconf"&&exit 1)
3+
autoreconf&&./configure$@

‎configure.ac‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ fi
1414

1515
PKG_CHECK_MODULES([MONO],[mono >= 2.9])
1616

17+
PKG_CHECK_MODULES([MONO_2_12],
18+
[mono >= 2.11.5], HAVE_MONO_2_12_OR_HIGHER=yes, HAVE_MONO_2_12_OR_HIGHER=no)
19+
20+
if test "x$HAVE_MONO_2_12_OR_HIGHER" = "xno" ; then
21+
AC_MSG_WARN([Mono 2.11.5 or higher is recommended, for better MSBuild (xbuild) compatibility])
22+
fi
1723

1824
# Checks for libraries.
1925

@@ -67,3 +73,7 @@ src/fsharp/FSharp.Compiler.Server.Shared/Makefile
6773
src/fsharp/fsi/Makefile
6874
])
6975
AC_OUTPUT
76+
77+
if ! test -e $prefix/bin/mono; then
78+
AC_WARN($prefix/bin/mono not found: it is recommended to use the same install prefix where mono is installed)
79+
fi

‎src/fsharp/FSharp.Core/Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,5 @@ $(tmpdir)FSCore.resources: $(srcdir)FSCore.resx
7979

8080
include$(topdir)/src/fsharp/targets.make
8181

82-
install: install-lib-2 install-lib-4
82+
install: install-lib-2 install-lib-4 install-lib-4-5
8383

‎src/fsharp/fsi/Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,5 @@ $(tmpdir)FSIstrings.resources: $(srcdir)/FSIstrings.txt
3737

3838
include$(topdir)/src/fsharp/targets.make
3939

40-
install: install-bin-2 install-bin-4
40+
install: install-bin-2 install-bin-4 install-bin-4-5
4141

‎src/fsharp/targets.make‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,13 @@ install-lib-2 install-lib-4:
107107
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.targets$(DESTDIR)/$(libdir)mono/$(TARGET)/;
108108
ln -fs$(DESTDIR)/$(libdir)mono/$(TARGET)/Microsoft.FSharp.targets$(DESTDIR)/$(libdir)mono/Microsoft\F#/v$(TARGET)/Microsoft.FSharp.Targets
109109

110+
install-lib-4-5: install-lib-4
111+
@iftest -e$(DESTDIR)$(libdir)mono/4.5/;then\
112+
ln -fs$(DESTDIR)$(libdir)mono/4.0/$(ASSEMBLY)$(DESTDIR)$(libdir)mono/4.5/$(ASSEMBLY);\
113+
ln -fs$(DESTDIR)$(libdir)mono/4.0/$(NAME).sigdata$(DESTDIR)$(libdir)mono/4.5/$(NAME).sigdata;\
114+
ln -fs$(DESTDIR)$(libdir)mono/4.0/$(NAME).optdata$(DESTDIR)$(libdir)mono/4.5/$(NAME).optdata;\
115+
fi
116+
110117
install-bin-2install-bin-4:
111118
sed -e's,[@]DIR[@],$(libdir)mono/$(TARGET),g' -e's,[@]TOOL[@],$(ASSEMBLY),g'<$(topdir)launcher.in>$(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)
112119
chmod +x$(outdir)$(subst fs,fsharp,$(NAME))$(VERSION)

0 commit comments

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