Skip to content

Commit 4469cda

Browse files
qwertieqwertie
committed
Create "symbol packages" so NuGet clients can hopefully step through source code.
Nuspecs: target="readme.txt" doesn't work, it creates a folder. Tweak Core readme.
1 parent bf555c7 commit 4469cda

10 files changed

+57
-27
lines changed

‎Core/Loyc.Collections.nuspec

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@
1818
</dependencies>
1919
</metadata>
2020
<files>
21-
<file src="readme.md" target="readme.txt" />
22-
21+
<file src="readme.md" />
22+
2323
<file src="Bin\Release.NET3\Loyc.Collections.*" target="lib\net35-client\" />
2424
<file src="Bin\Release.NET4\Loyc.Collections.*" target="lib\net40-client\" />
2525
<file src="Bin\Release.NET45\Loyc.Collections.*" target="lib\net45\" />
26+
<file src="Loyc.Collections\**\*.cs" target="src" />
27+
<file src="Loyc.Collections\**\*.ecs" target="src" />
2628
</files>
2729
</package>

‎Core/Loyc.Essentials.nuspec

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@
2020
</dependencies>
2121
</metadata>
2222
<files>
23-
<file src="readme.md" target="readme.txt" />
23+
<file src="readme.md" />
2424

2525
<file src="Lib\DotNet35\Theraot.Core.dll" target="lib\net35-client\" />
2626

2727
<file src="Bin\Release.NET3\Loyc.Essentials.*" target="lib\net35-client\" />
2828
<file src="Bin\Release.NET4\Loyc.Essentials.*" target="lib\net40-client\" />
2929
<file src="Bin\Release.NET45\Loyc.Essentials.*" target="lib\net45\" />
30+
<file src="Loyc.Essentials\**\*.cs" target="src" />
31+
<file src="Loyc.Essentials\**\*.ecs" target="src" />
3032
</files>
3133
</package>

‎Core/Loyc.Math.nuspec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,13 @@
1818
</dependencies>
1919
</metadata>
2020
<files>
21-
<file src="readme.md" target="readme.txt" />
21+
<file src="readme.md" />
2222

2323
<file src="Bin\Release.NET3\Loyc.Math.*" target="lib\net35-client\" />
2424
<file src="Bin\Release.NET4\Loyc.Math.*" target="lib\net40-client\" />
2525
<file src="Bin\Release.NET45\Loyc.Math.*" target="lib\net45\" />
26+
<file src="Loyc.Math\**\*.cs" target="src" />
27+
<file src="Loyc.Math\**\*.ecs" target="src" />
28+
<file src="Loyc.Math\**\*.tt" target="src" />
2629
</files>
2730
</package>

‎Core/Loyc.Syntax.nuspec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,13 @@
1919
</dependencies>
2020
</metadata>
2121
<files>
22-
<file src="readme.md" target="readme.txt" />
22+
<file src="readme.md" />
2323

2424
<file src="Bin\Release.NET3\Loyc.Syntax.*" target="lib\net35-client\" />
2525
<file src="Bin\Release.NET4\Loyc.Syntax.*" target="lib\net40-client\" />
2626
<file src="Bin\Release.NET45\Loyc.Syntax.*" target="lib\net45\" />
27+
<file src="Loyc.Syntax\**\*.cs" target="src" />
28+
<file src="Loyc.Syntax\**\*.les" target="src" />
29+
<file src="Loyc.Syntax\**\*.ecs" target="src" />
2730
</files>
2831
</package>

‎Core/Loyc.Utilities.nuspec

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@
2121
</dependencies>
2222
</metadata>
2323
<files>
24-
<file src="readme.md" target="readme.txt" />
24+
<file src="readme.md" />
2525

2626
<file src="Bin\Release.NET3\Loyc.Utilities.*" target="lib\net35-client\" />
2727
<file src="Bin\Release.NET4\Loyc.Utilities.*" target="lib\net40-client\" />
2828
<file src="Bin\Release.NET45\Loyc.Utilities.*" target="lib\net45\" />
29+
<file src="Loyc.Utilities\**\*.cs" target="src" />
30+
<file src="Loyc.Utilities\**\*.ecs" target="src" />
2931
</files>
3032
</package>

‎Core/Readme.md

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,31 @@ README
33

44
The Loyc Core project is a set of general-purpose .NET libraries. LoycCore is especially focused on collections - classes, interfaces, adapters, and extension methods - but also has code in other areas, most notably parsing and syntax trees.
55

6-
**IMPORTANT**: Development occurs primarily in the [Enhanced C# repository](https://github.com/loycnet/ecsharp), which contains this repo as a "git subtree". However, `git subtree push` mysteriously stopped working which means that synchronization with this repo has become a manual process. As a result I would ask you **not to use this repo anymore**. We'll just do everything in ecsharp.
7-
86
Contributors are welcome: more unit tests, code reviews, and new features are desired, anything relatively small (under about 3000 lines of code) that fits the theme "things that should have been built into the .NET framework, but aren't".
97

108
Please visit http://core.loyc.net for documentation.
119

10+
**NOTE**: Development occurs primarily in the [Enhanced C# repository](https://github.com/loycnet/ecsharp), which contains the LoycCore repo as a "git subtree". However, `git subtree push` mysteriously stopped working which means that synchronization with this repo has become a manual process. As a result I would ask you **not to use that repo anymore**. We'll just do everything in ecsharp.
11+
1212
Dependency tree
1313
---------------
1414

1515
Low-level libraries on top:
1616

1717
Loyc.Essentials
18-
|
19-
Loyc.Collections
20-
^ ^
21-
| |
18+
^ ^
19+
| |
2220
| +----------------+
23-
| |
2421
| |
25-
Loyc.Utilities Loyc.Syntax
22+
Loyc.Collections Loyc.Math
23+
^ ^
24+
| |
25+
Loyc.Syntax |
26+
^ |
27+
| |
28+
+---------+----------+
29+
|
30+
Loyc.Utilities
2631

2732
These projects use couple of tricks to support .NET 3.5, .NET 4 and .NET 4.5 in a single solution file. The tricks are documented here: http://stackoverflow.com/questions/5006397/targetting-multiple-net-framework-versions-by-using-different-project-configura/23705790#23705790
2833

‎Main/LLLPG.nuspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,7 @@
3131
<file src="..\Bin\Release.NET3\LLLPG.*" target="lib\net35-client\" />
3232
<file src="..\Bin\Release.NET4\LLLPG.*" target="lib\net40-client\" />
3333
<file src="..\Bin\Release.NET45\LLLPG.*" target="lib\net45\" />
34+
<file src="LLLPG\**\*.cs" target="src" />
35+
<file src="LLLPG\**\*.ecs" target="src" />
3436
</files>
3537
</package>

‎Main/LeMP.nuspec

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,17 @@
2626
</dependencies>
2727
</metadata>
2828
<files>
29-
<file src="..\readme.md" target="readme.txt" />
29+
<file src="..\readme.md" />
30+
31+
<file src="..\Lib\ICSharpCode.TextEditor.dll" target="lib\net40-client\" />
32+
<file src="..\Lib\ICSharpCode.TextEditor.dll" target="lib\net45\" />
33+
3034
<file src="..\Bin\Release.NET3\LeMP.*" target="lib\net35-client\" />
3135
<file src="..\Bin\Release.NET4\LeMP.*" target="lib\net40-client\" />
3236
<file src="..\Bin\Release.NET45\LeMP.*" target="lib\net45\" />
37+
<file src="LeMP\**\*.cs" target="src\LeMP" />
38+
<file src="LeMP\**\*.ecs" target="src\LeMP" />
39+
<file src="LeMP.StdMacros\**\*.cs" target="src\LeMP.StdMacros" />
40+
<file src="LeMP.StdMacros\**\*.ecs" target="src\LeMP.StdMacros" />
3341
</files>
3442
</package>

‎Main/Loyc.Ecs.nuspec

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,12 @@
2525
</dependencies>
2626
</metadata>
2727
<files>
28-
<file src="..\readme.md" target="readme.txt" />
28+
<file src="..\readme.md" />
2929
<file src="..\Bin\Release.NET3\Loyc.Ecs.*" target="lib\net35-client\" />
3030
<file src="..\Bin\Release.NET4\Loyc.Ecs.*" target="lib\net40-client\" />
3131
<file src="..\Bin\Release.NET45\Loyc.Ecs.*" target="lib\net45\" />
32+
<file src="Ecs\**\*.cs" target="src" />
33+
<file src="Ecs\**\*.ecs" target="src" />
34+
<file src="Ecs\**\*.les" target="src" />
3235
</files>
3336
</package>

‎appveyor.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@ after_build:
2525
# - Loyc.Syntax.dll (Loyc.Syntax.$PKG_VERSION.nupkg)
2626
# - Loyc.Utilities.dll (Loyc.Utilities.$PKG_VERSION.nupkg)
2727
# - All 5 together (LoycCore.$PKG_VERSION.nupkg)
28-
- nuget pack -Version %PKG_VERSION% Core\Loyc.Essentials.nuspec
29-
- nuget pack -Version %PKG_VERSION% Core\Loyc.Collections.nuspec
30-
- nuget pack -Version %PKG_VERSION% Core\Loyc.Math.nuspec
31-
- nuget pack -Version %PKG_VERSION% Core\Loyc.Syntax.nuspec
32-
- nuget pack -Version %PKG_VERSION% Core\Loyc.Utilities.nuspec
33-
- nuget pack -Version %PKG_VERSION% Core\LoycCore.nuspec
28+
- nuget pack -Version %PKG_VERSION% -symbols Core\Loyc.Essentials.nuspec
29+
- nuget pack -Version %PKG_VERSION% -symbols Core\Loyc.Collections.nuspec
30+
- nuget pack -Version %PKG_VERSION% -symbols Core\Loyc.Math.nuspec
31+
- nuget pack -Version %PKG_VERSION% -symbols Core\Loyc.Syntax.nuspec
32+
- nuget pack -Version %PKG_VERSION% -symbols Core\Loyc.Utilities.nuspec
33+
- nuget pack -Version %PKG_VERSION% -symbols Core\LoycCore.nuspec
3434

3535
# Package the Main libraries:
3636
# - Loyc.Ecs.dll (Loyc.Ecs.$PKG_VERSION.nupkg)
3737
# - LeMP.exe (LeMP.$PKG_VERSION.nupkg)
3838
# - LLLPG.exe (LLLPG.$PKG_VERSION.nupkg)
39-
- nuget pack -Version %PKG_VERSION% Main\Loyc.Ecs.nuspec
40-
- nuget pack -Version %PKG_VERSION% Main\LeMP.nuspec
41-
- nuget pack -Version %PKG_VERSION% Main\LLLPG.nuspec
39+
- nuget pack -Version %PKG_VERSION% -symbols Main\Loyc.Ecs.nuspec
40+
- nuget pack -Version %PKG_VERSION% -symbols Main\LeMP.nuspec
41+
- nuget pack -Version %PKG_VERSION% -symbols Main\LLLPG.nuspec
4242

4343
test_script:
4444
# Unfortunately, test set 8 (LLLPG) sometimes fails due to nondeterminism.
@@ -63,8 +63,8 @@ deploy:
6363
server:
6464
api_key:
6565
secure: DHTp3wMjKqyca2PWftol2wq7DxE9KdL8AizHVIS14T4DSSMXgc0bIiCGvvA8SkTH
66-
skip_symbols: true
66+
skip_symbols: false # Whether to not publish symbol pkgs (src/pdb)
6767
artifact: /.*\.nupkg/
6868
on:
69-
branch: master # Release from master branch only.
69+
branch: master # Release from master branch only.
7070
appveyor_repo_tag: true # Deploy on tag push only.

0 commit comments

Comments
 (0)