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

Commit01f3555

Browse files
committed
Merge pull requestfsharp#76 from funnelweb/tb2
use Microsoft.FSharp.Targets tofixfsharp#75
2 parents6c4d215 +d0a7924 commit01f3555

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ plus some files for xbuild support
112112
/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/Microsoft\ F#/v4.0/*
113113
/Library/Frameworks/Mono.framework/Versions/Current/lib/mono/Microsoft\ SDKs/F#/3.0/Framework/*
114114

115-
(these names are the canonical names for Microsoft.FSharp.targets used by project files coming from Visual Studio)
115+
(these names are the canonical names for Microsoft.FSharp.Targets used by project files coming from Visual Studio)
116116

117117
plus scripts
118118

‎src/FSharpSource.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@
449449
<IntermediateOutputPath>obj\$(ConfigurationOutputDirectory)\$(TargetFrameworkVersionShort)\</IntermediateOutputPath>
450450
</PropertyGroup>
451451

452-
<!-- Build with LKG compiler (location is determined by Microsoft.FSharp.targets). The output compiler has suffix "-proto"-->
452+
<!-- Build with LKG compiler (location is determined by Microsoft.FSharp.Targets). The output compiler has suffix "-proto"-->
453453
<PropertyGroupCondition=" '$(BuildWith)' == 'LKG' And '$(ProjectLanguage)' == 'FSharp'">
454454
<FsBuildSuffix>-proto</FsBuildSuffix>
455455
<OutputPath>$(FSharpSourcesRoot)\..\lib\$(ConfigurationOutputDirectory)\$(TargetFrameworkVersionShort)</OutputPath>
@@ -469,7 +469,7 @@
469469
Condition="Exists('..\lib\proto\$(protoCLIDir)\Microsoft.FSharp-proto.targets') AND '$(BuildWith)' == '' AND '$(ProjectLanguage)' == 'FSharp'"/>
470470
<!-- Include the bootstrap targets file when building the proto compiler using the bootstrap-->
471471
<!-- Also include it if Proto targets file doesn't exist, e.g. when cleaning the build with /t:Clean-->
472-
<ImportProject="$(LkgPath)\Microsoft.FSharp.targets"
472+
<ImportProject="$(LkgPath)\Microsoft.FSharp.Targets"
473473
Condition="(!Exists('..\lib\proto\$(protoCLIDir)\Microsoft.FSharp-proto.targets') OR '$(BuildWith)' == 'LKG') AND '$(ProjectLanguage)' == 'FSharp'" />
474474
<ImportProject="Silverlight\$(SilverlightVersion)\FSharpSource.Silverlight.Common.targets"
475475
Condition="'$(TargetFramework)'=='sl3' or '$(TargetFramework)'=='sl4' or '$(TargetFramework)'=='sl5' or '$(TargetFramework)'=='sl5-compiler'"/>

‎src/fsharp/FSharp.Build-proto/Microsoft.FSharp-proto.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
***********************************************************************************************
3-
Microsoft.FSharp.targets
3+
Microsoft.FSharp-proto.targets
44
55
WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
66
created a backup copy. Incorrect changes to this file will make it

‎src/fsharp/FSharp.Build/FSharp.Build.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<CompileInclude="Fsc.fs" />
4343
<CompileInclude="CreateFSharpManifestResourceName.fsi" />
4444
<CompileInclude="CreateFSharpManifestResourceName.fs" />
45-
<NoneInclude="Microsoft.FSharp.targets">
45+
<NoneInclude="Microsoft.FSharp.Targets">
4646
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
4747
</None>
4848
</ItemGroup>

‎src/fsharp/FSharp.Build/Microsoft.FSharp.targets‎renamed to ‎src/fsharp/FSharp.Build/Microsoft.FSharp.Targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
***********************************************************************************************
3-
Microsoft.FSharp.targets
3+
Microsoft.FSharp.Targets
44
55
WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
66
created a backup copy. Incorrect changes to this file will make it

‎src/fsharp/targets.make‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ do-2-0: $(objdir) $(objdir)$(TARGET_2_0) $(objdir)$(TARGET_4_0) $(objdir)$(TARGE
5656
@iftest"x$(DELAY_SIGN)" ="x1";then\
5757
sn -q -R$(outdir)$(ASSEMBLY)$(srcdir)../../../mono.snk;\
5858
fi
59-
@iftest -e Microsoft.FSharp.targets;then\
60-
cp Microsoft.FSharp.targets$(outdir)Microsoft.FSharp.targets;\
59+
@iftest -e Microsoft.FSharp.Targets;then\
60+
cp Microsoft.FSharp.Targets$(outdir)Microsoft.FSharp.Targets;\
6161
fi
6262

6363
do-2-1: DEFINES +=$(DEFINES_2_1)
@@ -84,8 +84,8 @@ do-2-1: $(objdir) $(objdir)$(TARGET_2_1) $(objdir)$(TARGET_4_0) $(objdir)$(TARGE
8484
@iftest"x$(DELAY_SIGN)" ="x1";then\
8585
sn -q -R$(outdir)$(ASSEMBLY)$(srcdir)../../../mono.snk;\
8686
fi
87-
@iftest -e Microsoft.FSharp.targets;then\
88-
cp Microsoft.FSharp.targets$(outdir)Microsoft.FSharp.targets;\
87+
@iftest -e Microsoft.FSharp.Targets;then\
88+
cp Microsoft.FSharp.Targets$(outdir)Microsoft.FSharp.Targets;\
8989
fi
9090

9191
do-4-0: DEFINES +=$(DEFINES_4_0)
@@ -112,8 +112,8 @@ do-4-0: $(objdir) $(objdir)$(TARGET_2_0) $(objdir)$(TARGET_4_0) $(objdir)$(TARGE
112112
@iftest"x$(DELAY_SIGN)" ="x1";then\
113113
sn -q -R$(outdir)$(ASSEMBLY)$(srcdir)../../../mono.snk;\
114114
fi
115-
@iftest -e Microsoft.FSharp.targets;then\
116-
cp Microsoft.FSharp.targets$(outdir)Microsoft.FSharp.targets;\
115+
@iftest -e Microsoft.FSharp.Targets;then\
116+
cp Microsoft.FSharp.Targets$(outdir)Microsoft.FSharp.Targets;\
117117
fi
118118

119119
install-lib-2: TARGET :=$(TARGET_2_0)
@@ -136,24 +136,24 @@ install-bin-4: TARGET := $(TARGET_4_0)
136136

137137
# Install the library binaries in the GAC and the framework directory,
138138
# Install .optdata/.sigdata if they exist (they go alongside FSharp.Core)
139-
# Install the .targets file. The XBuild targets file gets installed into the place(s) expected for standard F# project
139+
# Install the .Targets file. The XBuild targets file gets installed into the place(s) expected for standard F# project
140140
# files. For F# 2.0 project files this is
141-
# .../Microsoft F#/v4.0/Microsoft.FSharp.targets
141+
# .../Microsoft F#/v4.0/Microsoft.FSharp.Targets
142142
# For F# 3.0 project files this is
143-
# .../Microsoft SDKs/F#/3.0/Framework/v4.0/Microsoft.FSharp.targets
143+
# .../Microsoft SDKs/F#/3.0/Framework/v4.0/Microsoft.FSharp.Targets
144144
#
145145
install-lib-2install-lib-2-1install-lib-4:
146146
@echo"Installing$(ASSEMBLY)"
147147
@mkdir -p$(DESTDIR)$(monodir)/$(TARGET)
148148
gacutil -i$(outdir)$(ASSEMBLY) -root$(DESTDIR)$(monorootdir) -package$(TARGET)
149-
@iftest -e$(outdir)Microsoft.FSharp.targets;then\
149+
@iftest -e$(outdir)Microsoft.FSharp.Targets;then\
150150
mkdir -p$(DESTDIR)$(monodir)/Microsoft\F#/v$(TARGET)/;\
151151
mkdir -p$(DESTDIR)$(monodir)/Microsoft\SDKs/F#/3.0/Framework/v$(TARGET)/;\
152152
ln -fs ../../$(TARGET)/$(ASSEMBLY)$(DESTDIR)$(monodir)/Microsoft\F#/v$(TARGET)/$(ASSEMBLY);\
153153
ln -fs ../../../../../$(TARGET)/$(ASSEMBLY)$(DESTDIR)$(monodir)/Microsoft\SDKs/F#/3.0/Framework/v$(TARGET)/$(ASSEMBLY);\
154-
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.targets$(DESTDIR)$(monodir)/$(TARGET)/;\
155-
ln -fs ../../$(TARGET)/Microsoft.FSharp.targets$(DESTDIR)$(monodir)/Microsoft\F#/v$(TARGET)/Microsoft.FSharp.targets;\
156-
ln -fs ../../../../../$(TARGET)/Microsoft.FSharp.targets$(DESTDIR)$(monodir)/Microsoft\SDKs/F#/3.0/Framework/v$(TARGET)/Microsoft.FSharp.targets;\
154+
$(INSTALL_LIB)$(outdir)Microsoft.FSharp.Targets$(DESTDIR)$(monodir)/$(TARGET)/;\
155+
ln -fs ../../$(TARGET)/Microsoft.FSharp.Targets$(DESTDIR)$(monodir)/Microsoft\F#/v$(TARGET)/Microsoft.FSharp.Targets;\
156+
ln -fs ../../../../../$(TARGET)/Microsoft.FSharp.Targets$(DESTDIR)$(monodir)/Microsoft\SDKs/F#/3.0/Framework/v$(TARGET)/Microsoft.FSharp.Targets;\
157157
fi
158158
@iftest -e$(outdir)$(NAME).xml;then\
159159
$(INSTALL_LIB)$(outdir)$(NAME).xml$(DESTDIR)$(monodir)/gac/$(NAME)/$(VERSION)__$(TOKEN);\

0 commit comments

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