Skip to content
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

Jump to bottom

Update tests and library paths to work better cross-platform #78

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update tests and library paths to work better cross-platform #78

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
6aa9602
Update tests and library paths to work better cross-platform
austinleroy Jun 6, 2024
a3f4506
Realized I forgot to add the encoding to the binary writers
austinleroy Jun 6, 2024
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
82 changes: 12 additions & 70 deletions Source/AtlusScriptCompiler/AtlusScriptCompiler.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,79 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{58E13E8A-EA32-4627-A798-58E4648D812E}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>AtlusScriptCompiler</RootNamespace>
<AssemblyName>AtlusScriptCompiler</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\Build\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\Build\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<Project Sdk="Microsoft.NET.Sdk">

<ItemGroup>
<Compile Include="FileAndConsoleLogListener.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="UEWrapper.cs" />
<ProjectReference Include="..\AtlusScriptLibrary\AtlusScriptLibrary.csproj" />
</ItemGroup>

<ItemGroup>
<None Include="App.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Resources\Include\p5.flow" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\AtlusScriptLibrary\AtlusScriptLibrary.csproj">
<Project>{62ee486f-ae33-4dbb-ac4c-409a22cb04ad}</Project>
<Name>AtlusScriptLibrary</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="GitInfo">
<Version>2.3.0</Version>
</PackageReference>
<PackageReference Include="MSBuildTasks">
<Version>1.5.0.235</Version>
<PackageReference Include="GitInfo" Version="3.3.5">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

<PropertyGroup>
<PostBuildEvent>
</PostBuildEvent>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
</Project>

</Project>
34 changes: 0 additions & 34 deletions Source/AtlusScriptCompiler/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions Source/AtlusScriptLibrary/AtlusScriptLibrary.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@
<PackageReference Include="morelinq">
<Version>3.3.2</Version>
</PackageReference>
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
<PackageReference Include="System.Text.Json" Version="5.0.2" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
</ItemGroup>
<PropertyGroup />
Expand Down
1 change: 1 addition & 0 deletions Source/AtlusScriptLibrary/FlowScriptLanguage/BinaryModel/IO/FlowScriptBinaryReader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public sealed class FlowScriptBinaryReader : IDisposable
public FlowScriptBinaryReader(Stream stream, BinaryFormatVersion version, bool leaveOpen = false)
{
mPositionBase = stream.Position;
System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
mReader = new EndianBinaryReader(stream, Encoding.GetEncoding(932), leaveOpen, version.HasFlag(BinaryFormatVersion.BigEndian) ? Endianness.BigEndian : Endianness.LittleEndian);
mVersion = version;
}
Expand Down
1 change: 1 addition & 0 deletions Source/AtlusScriptLibrary/FlowScriptLanguage/BinaryModel/IO/FlowScriptBinaryWriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public sealed class FlowScriptBinaryWriter : IDisposable
public FlowScriptBinaryWriter(Stream stream, BinaryFormatVersion version, bool leaveOpen = false)
{
mPositionBase = stream.Position;
System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
mWriter = new EndianBinaryWriter(stream, Encoding.GetEncoding(932), leaveOpen, version.HasFlag(BinaryFormatVersion.BigEndian) ? Endianness.BigEndian : Endianness.LittleEndian);
mVersion = version;
}
Expand Down
4 changes: 2 additions & 2 deletions Source/AtlusScriptLibrary/Libraries/DigitalDevilSaga.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Name": "Digital Devil Saga",
"ShortName": "dds",
"FlowScriptModulesPath": "DigitalDevilSaga\\FlowScriptModules.json",
"MessageScriptLibraryPath": "DigitalDevilSaga\\MessageScriptLibrary.json"
"FlowScriptModulesPath": "DigitalDevilSaga/FlowScriptModules.json",
"MessageScriptLibraryPath": "DigitalDevilSaga/MessageScriptLibrary.json"
}
4 changes: 2 additions & 2 deletions Source/AtlusScriptLibrary/Libraries/DigitalDevilSaga/FlowScriptModules.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ShortName": "Common",
"Description": "Non-domain specific commonly used functions.",
"ConstantsPath": "",
"EnumsPath": "DigitalDevilSaga\\Modules\\Common\\Enums.json",
"FunctionsPath": "DigitalDevilSaga\\Modules\\Common\\Functions.json"
"EnumsPath": "DigitalDevilSaga/Modules/Common/Enums.json",
"FunctionsPath": "DigitalDevilSaga/Modules/Common/Functions.json"
}
]
4 changes: 2 additions & 2 deletions Source/AtlusScriptLibrary/Libraries/Nocturne.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Name": "Shin Megami Tensei III: Nocturne",
"ShortName": "smt3",
"FlowScriptModulesPath": "Nocturne\\FlowScriptModules.json",
"MessageScriptLibraryPath": "Nocturne\\MessageScriptLibrary.json"
"FlowScriptModulesPath": "Nocturne/FlowScriptModules.json",
"MessageScriptLibraryPath": "Nocturne/MessageScriptLibrary.json"
}
4 changes: 2 additions & 2 deletions Source/AtlusScriptLibrary/Libraries/Nocturne/FlowScriptModules.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ShortName": "Common",
"Description": "Non-domain specific commonly used functions.",
"ConstantsPath": "",
"EnumsPath": "Nocturne\\Modules\\Common\\Enums.json",
"FunctionsPath": "Nocturne\\Modules\\Common\\Functions.json"
"EnumsPath": "Nocturne/Modules/Common/Enums.json",
"FunctionsPath": "Nocturne/Modules/Common/Functions.json"
}
]
4 changes: 2 additions & 2 deletions Source/AtlusScriptLibrary/Libraries/Persona3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Name": "Persona 3",
"ShortName": "p3",
"FlowScriptModulesPath": "Persona3\\FlowScriptModules.json",
"MessageScriptLibraryPath": "Persona3\\MessageScriptLibrary.json"
"FlowScriptModulesPath": "Persona3/FlowScriptModules.json",
"MessageScriptLibraryPath": "Persona3/MessageScriptLibrary.json"
}
2 changes: 1 addition & 1 deletion Source/AtlusScriptLibrary/Libraries/Persona3/FlowScriptModules.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"Description": "Non-domain specific commonly used functions.",
"ConstantsPath": "",
"EnumsPath": "",
"FunctionsPath": "Persona3\\Modules\\Common\\Functions.json"
"FunctionsPath": "Persona3/Modules/Common/Functions.json"
}
]
4 changes: 2 additions & 2 deletions Source/AtlusScriptLibrary/Libraries/Persona3FES.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Name": "Persona 3 FES",
"ShortName": "p3f",
"FlowScriptModulesPath": "Persona3FES\\FlowScriptModules.json",
"MessageScriptLibraryPath": "Persona3FES\\MessageScriptLibrary.json"
"FlowScriptModulesPath": "Persona3FES/FlowScriptModules.json",
"MessageScriptLibraryPath": "Persona3FES/MessageScriptLibrary.json"
}
4 changes: 2 additions & 2 deletions Source/AtlusScriptLibrary/Libraries/Persona3FES/FlowScriptModules.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"ShortName": "Common",
"Description": "Non-domain specific commonly used functions.",
"ConstantsPath": "",
"EnumsPath": "Persona3FES\\Modules\\Common\\Enums.json",
"FunctionsPath": "Persona3FES\\Modules\\Common\\Functions.json"
"EnumsPath": "Persona3FES/Modules/Common/Enums.json",
"FunctionsPath": "Persona3FES/Modules/Common/Functions.json"
}
]
4 changes: 2 additions & 2 deletions Source/AtlusScriptLibrary/Libraries/Persona3Portable.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Name": "Persona 3 Portable",
"ShortName": "p3p",
"FlowScriptModulesPath": "Persona3Portable\\FlowScriptModules.json",
"MessageScriptLibraryPath": "Persona3Portable\\MessageScriptLibrary.json"
"FlowScriptModulesPath": "Persona3Portable/FlowScriptModules.json",
"MessageScriptLibraryPath": "Persona3Portable/MessageScriptLibrary.json"
}
22 changes: 11 additions & 11 deletions Source/AtlusScriptLibrary/Libraries/Persona3Portable/FlowScriptModules.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,47 +4,47 @@
"ShortName": "Common",
"Description": "Non-domain specific commonly used functions.",
"ConstantsPath": "",
"EnumsPath": "Persona3Portable\\Enums.json",
"FunctionsPath": "Persona3Portable\\Modules\\Common\\Functions.json"
"EnumsPath": "Persona3Portable/Enums.json",
"FunctionsPath": "Persona3Portable/Modules/Common/Functions.json"
},
{
"Name": "Field",
"ShortName": "Field",
"Description": "Field related functions.",
"ConstantsPath": "",
"EnumsPath": "Persona3Portable\\Enums.json",
"FunctionsPath": "Persona3Portable\\Modules\\Field\\Functions.json"
"EnumsPath": "Persona3Portable/Enums.json",
"FunctionsPath": "Persona3Portable/Modules/Field/Functions.json"
},
{
"Name": "AI",
"ShortName": "AI",
"Description": "AI related functions.",
"ConstantsPath": "",
"EnumsPath": "Persona3Portable\\Enums.json",
"FunctionsPath": "Persona3Portable\\Modules\\AI\\Functions.json"
"EnumsPath": "Persona3Portable/Enums.json",
"FunctionsPath": "Persona3Portable/Modules/AI/Functions.json"
},
{
"Name": "Event",
"ShortName": "Event",
"Description": "Event related functions.",
"ConstantsPath": "",
"EnumsPath": "",
"FunctionsPath": "Persona3Portable\\Modules\\Event\\Functions.json"
"FunctionsPath": "Persona3Portable/Modules/Event/Functions.json"
},
{
"Name": "Facility",
"ShortName": "Facility",
"Description": "Facility/Call related functions.",
"ConstantsPath": "",
"EnumsPath": "Persona3Portable\\Enums.json",
"FunctionsPath": "Persona3Portable\\Modules\\Facility\\Functions.json"
"EnumsPath": "Persona3Portable/Enums.json",
"FunctionsPath": "Persona3Portable/Modules/Facility/Functions.json"
},
{
"Name": "Shared",
"ShortName": "Shared data",
"Description": "",
"ConstantsPath": "",
"EnumsPath": "Persona3Portable\\Enums.json",
"FunctionsPath": "Persona3Portable\\Modules\\Shared\\Functions.json"
"EnumsPath": "Persona3Portable/Enums.json",
"FunctionsPath": "Persona3Portable/Modules/Shared/Functions.json"
}
]
4 changes: 2 additions & 2 deletions Source/AtlusScriptLibrary/Libraries/Persona3Reload.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Name": "Persona 3 Reload",
"ShortName": "p3re",
"FlowScriptModulesPath": "Persona3Reload\\FlowScriptModules.json",
"MessageScriptLibraryPath": "Persona3Reload\\MessageScriptLibrary.json"
"FlowScriptModulesPath": "Persona3Reload/FlowScriptModules.json",
"MessageScriptLibraryPath": "Persona3Reload/MessageScriptLibrary.json"
}
12 changes: 6 additions & 6 deletions Source/AtlusScriptLibrary/Libraries/Persona3Reload/FlowScriptModules.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,46 +5,46 @@
"Description": "Battle related functions (AI + BTL)",
"ConstantsPath": "",
"EnumsPath": "",
"FunctionsPath": "Persona3Reload\\Modules\\Battle\\Functions.json"
"FunctionsPath": "Persona3Reload/Modules/Battle/Functions.json"
},
{
"Name": "Common",
"ShortName": "Common",
"Description": "Non-domain specific commonly used functions.",
"ConstantsPath": "",
"EnumsPath": "",
"FunctionsPath": "Persona3Reload\\Modules\\Common\\Functions.json"
"FunctionsPath": "Persona3Reload/Modules/Common/Functions.json"
},
{
"Name": "Community",
"ShortName": "Community",
"Description": "Social Link related functions.",
"ConstantsPath": "",
"EnumsPath": "",
"FunctionsPath": "Persona3Reload\\Modules\\Community\\Functions.json"
"FunctionsPath": "Persona3Reload/Modules/Community/Functions.json"
},
{
"Name": "Event",
"ShortName": "Event",
"Description": "Event related functions",
"ConstantsPath": "",
"EnumsPath": "",
"FunctionsPath": "Persona3Reload\\Modules\\Event\\Functions.json"
"FunctionsPath": "Persona3Reload/Modules/Event/Functions.json"
},
{
"Name": "Facility",
"ShortName": "Facility",
"Description": "Facility related functions.",
"ConstantsPath": "",
"EnumsPath": "",
"FunctionsPath": "Persona3Reload\\Modules\\Facility\\Functions.json"
"FunctionsPath": "Persona3Reload/Modules/Facility/Functions.json"
},
{
"Name": "Field",
"ShortName": "Field",
"Description": "Field related functions.",
"ConstantsPath": "",
"EnumsPath": "",
"FunctionsPath": "Persona3Reload\\Modules\\Field\\Functions.json"
"FunctionsPath": "Persona3Reload/Modules/Field/Functions.json"
}
]
4 changes: 2 additions & 2 deletions Source/AtlusScriptLibrary/Libraries/Persona4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"Name": "Persona 4",
"ShortName": "p4",
"FlowScriptModulesPath": "Persona4\\FlowScriptModules.json",
"MessageScriptLibraryPath": "Persona4\\MessageScriptLibrary.json"
"FlowScriptModulesPath": "Persona4/FlowScriptModules.json",
"MessageScriptLibraryPath": "Persona4/MessageScriptLibrary.json"
}
Loading