Skip to content

Commit 065249c

Browse files
committed
Fix build.proj to include the AOT assets in the zip files (for sourceforge distribution) for .NET 9.0 and above builds.
1 parent faaa37f commit 065249c

File tree

1 file changed

+22
-2
lines changed

1 file changed

+22
-2
lines changed

Clojure/build.proj

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,28 @@
286286
/>
287287
</Target>
288288

289+
290+
<Target Name="MoveAOT" DependsOnTargets="PackAll">
289291

290-
<Target Name="ZipAll" DependsOnTargets="PackAll;ILMerge462;ILMerge481">
292+
<ItemGroup>
293+
<Net_9_0_AOT_Assets Include= "$(RootDir)Clojure.Main\bin\$(Configuration)\net9.0\*.clj*.dll"/>
294+
<Net_10_0_AOT_Assets Include= "$(RootDir)Clojure.Main\bin\$(Configuration)\net9.0\*.clj*.dll"/>
295+
<Net_11_0_AOT_Assets Include= "$(RootDir)Clojure.Main\bin\$(Configuration)\net9.0\*.clj*.dll"/>
296+
</ItemGroup>
297+
298+
<Copy SkipUnchangedFiles="true"
299+
SourceFiles="@(Net_9_0_AOT_Assets)"
300+
DestinationFolder="$(RootDir)Clojure.Main\bin\$(Configuration)\net9.0\publish" />
301+
<Copy SkipUnchangedFiles="true"
302+
SourceFiles="@(Net_10_0_AOT_Assets)"
303+
DestinationFolder="$(RootDir)Clojure.Main\bin\$(Configuration)\net10.0\publish" />
304+
<Copy SkipUnchangedFiles="true"
305+
SourceFiles="@(Net_11_0_AOT_Assets)"
306+
DestinationFolder="$(RootDir)Clojure.Main\bin\$(Configuration)\net11.0\publish" />
307+
308+
</Target>
309+
310+
<Target Name="ZipAll" DependsOnTargets="PackAll;MoveAOT;ILMerge462;ILMerge481">
291311

292312
<ZipDirectory SourceDirectory="$(RootDir)Clojure.Main\bin\$(Configuration)\net11.0\publish"
293313
DestinationFile ="$(StageDir)\clojure-clr-$(ZipVersion)-$(Configuration)-net11.0.zip"
@@ -309,7 +329,7 @@
309329
DestinationFile ="$(StageDir)\clojure-clr-$(ZipVersion)-$(Configuration)-net6.0.zip"
310330
Overwrite="true"/>
311331

312-
<!-- TOOD: Merge the 462 and 481 versions -->
332+
<!-- TOOD: Can we merge all these versions? -->
313333
<ItemGroup>
314334
<ClojureCompile462Assets Include="$(RootDir)Clojure.Compile\bin\$(Configuration)\net462\Clojure.Compile.*" />
315335
<ClojureMain462Assets Include="$(RootDir)Clojure.Main461\bin\$(Configuration)\net462\**\*" />

0 commit comments

Comments
 (0)