Skip to content

Move AngouriMath up a folder and fix paths #644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Happypig375 merged 2 commits into from
Jan 2, 2026
Merged

Move AngouriMath up a folder and fix paths #644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3d7f55
Fix paths
Happypig375 Jan 2, 2026
27b4a1c
Fix one more
Happypig375 Jan 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/CSharpBuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ jobs:

- name: Build AngouriMath
run: |
cd Sources/AngouriMath/AngouriMath
cd Sources/AngouriMath
dotnet build
2 changes: 1 addition & 1 deletion .github/workflows/EverythingBuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
dotnet-quality: 'preview'

- name: Build AM
run: dotnet build Sources/AngouriMath/AngouriMath/AngouriMath.csproj
run: dotnet build Sources/AngouriMath/AngouriMath.csproj

- name: Build FSharp
run: dotnet build Sources/Wrappers/AngouriMath.FSharp/AngouriMath.FSharp.fsproj
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/IntegrationTest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

env:
package_version: 99.99.99
packed_path: D:\a\AngouriMath\AngouriMath\Sources\AngouriMath\AngouriMath\bin\release
packed_path: D:\a\AngouriMath\AngouriMath\Sources\AngouriMath\bin\release

library_version: 33.33.33
library_packed_path: D:\a\AngouriMath\AngouriMath\testlib\bin\release
Expand All @@ -27,7 +27,7 @@ jobs:

- name: 'Pack AngouriMath'
run: |
cd Sources/AngouriMath/AngouriMath
cd Sources/AngouriMath
dotnet restore AngouriMath.csproj
dotnet build AngouriMath.csproj -c release
dotnet pack AngouriMath.csproj -c release -p:PackageVersion=${{ env.package_version }}
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:

- name: 'Pack AngouriMath'
run: |
cd Sources/AngouriMath/AngouriMath
cd Sources/AngouriMath
dotnet restore AngouriMath.csproj
dotnet build AngouriMath.csproj -c release
dotnet pack AngouriMath.csproj -c release -p:PackageVersion=${{ env.package_version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/Nuget.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
echo "name is $name"

# AngouriMath
cd AngouriMath/AngouriMath
cd AngouriMath
dotnet restore AngouriMath.csproj
dotnet build AngouriMath.csproj -c release
dotnet pack AngouriMath.csproj -c release -p:PackageVersion=$name
Expand Down
8 changes: 7 additions & 1 deletion Sources/AngouriMath.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 18
VisualStudioVersion = 18.1.11312.151 d18.0
VisualStudioVersion = 18.1.11312.151
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AngouriMath", "AngouriMath", "{F604DFEB-8939-4B4F-8E37-1FDC06E26D5A}"
EndProject
Expand Down Expand Up @@ -50,6 +50,12 @@ EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "AngouriMath.Terminal.Lib", "Terminal\AngouriMath.Terminal.Lib\AngouriMath.Terminal.Lib.fsproj", "{405E214B-17A6-83E0-90A1-4F8B7213954F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utils", "Utils", "{DC3A3E46-854E-403D-8FA5-561DF66277D4}"
ProjectSection(SolutionItems) = preProject
Utils\antlr_rerun.bat = Utils\antlr_rerun.bat
Utils\generate_additional_extensions.bat = Utils\generate_additional_extensions.bat
Utils\generate_additional_extensions_tests.bat = Utils\generate_additional_extensions_tests.bat
Utils\generate_exports.bat = Utils\generate_exports.bat
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Utils", "Utils\Utils\Utils.csproj", "{9E733914-18F8-CD3A-EDB8-F32FFEF4A3DA}"
EndProject
Expand Down
2 changes: 1 addition & 1 deletion Sources/AngouriMath/AngouriMath.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

<!--Project dependencies-->
<PackageReference Include="HonkSharp" Version="1.0.3" />
<PackageReference Include="Antlr4.Runtime.Standard" Version="4.9.2" />
<PackageReference Include="Antlr4.Runtime.Standard" Version="4.13.1" />
<PackageReference Include="GenericTensor" Version="1.0.4" />
<PackageReference Include="PeterO.Numbers" Version="1.8.0" />
<PackageReference Include="Nullable" Version="1.3.0" PrivateAssets="all" />
Expand Down
2 changes: 1 addition & 1 deletion Sources/Utils/antlr_rerun.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ cd ../AngouriMath/Core/Antlr
:;# AngouriMath.Core.Antlr is the namespace of the generated lexer and parser source files
java -jar ./antlr-4.13.1-complete.jar -package AngouriMath.Core.Antlr ./AngouriMath.g

cd ../../../../Utils
cd ../../../Utils

:;# Antlr's generated classes should be internal, not public
dotnet run --project Utils -c release AntlrPostProcessorReplacePublicWithInternal
Expand Down
Loading