Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/workflows/build-mruby-compiler.android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ on:
workflow_dispatch:

env:
MRUBY_DIR: ${{ github.workspace }}/src/MRubyCS.Compiler/mruby
CONFIG_DIR: ${{ github.workspace }}/src/MRubyCS.Compiler
MRUBY_DIR: ${{ github.workspace }}/src/ChibiRuby.Compiler/mruby
CONFIG_DIR: ${{ github.workspace }}/src/ChibiRuby.Compiler

jobs:
build-android:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-mruby-compiler.ios.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ on:
workflow_dispatch:

env:
MRUBY_DIR: ${{ github.workspace }}/src/MRubyCS.Compiler/mruby
CONFIG_DIR: ${{ github.workspace }}/src/MRubyCS.Compiler
MRUBY_DIR: ${{ github.workspace }}/src/ChibiRuby.Compiler/mruby
CONFIG_DIR: ${{ github.workspace }}/src/ChibiRuby.Compiler

jobs:
build-ios:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-mruby-compiler.linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ on:
workflow_dispatch:

env:
MRUBY_DIR: ${{ github.workspace }}/src/MRubyCS.Compiler/mruby
CONFIG_DIR: ${{ github.workspace }}/src/MRubyCS.Compiler
BENCHMARK_MRUBY_DIR: ${{ github.workspace }}/sandbox/MRubyCS.Benchmark/mruby
BENCHMARK_CONFIG_DIR: ${{ github.workspace }}/sandbox/MRubyCS.Benchmark
MRUBY_DIR: ${{ github.workspace }}/src/ChibiRuby.Compiler/mruby
CONFIG_DIR: ${{ github.workspace }}/src/ChibiRuby.Compiler
BENCHMARK_MRUBY_DIR: ${{ github.workspace }}/sandbox/ChibiRuby.Benchmark/mruby
BENCHMARK_CONFIG_DIR: ${{ github.workspace }}/sandbox/ChibiRuby.Benchmark

jobs:
build-linux:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-mruby-compiler.macOS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ on:
workflow_dispatch:

env:
MRUBY_DIR: ${{ github.workspace }}/src/MRubyCS.Compiler/mruby
CONFIG_DIR: ${{ github.workspace }}/src/MRubyCS.Compiler
BENCHMARK_MRUBY_DIR: ${{ github.workspace }}/sandbox/MRubyCS.Benchmark/mruby
BENCHMARK_CONFIG_DIR: ${{ github.workspace }}/sandbox/MRubyCS.Benchmark
MRUBY_DIR: ${{ github.workspace }}/src/ChibiRuby.Compiler/mruby
CONFIG_DIR: ${{ github.workspace }}/src/ChibiRuby.Compiler
BENCHMARK_MRUBY_DIR: ${{ github.workspace }}/sandbox/ChibiRuby.Benchmark/mruby
BENCHMARK_CONFIG_DIR: ${{ github.workspace }}/sandbox/ChibiRuby.Benchmark

jobs:
build-macOS:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-mruby-compiler.wasm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ on:
workflow_dispatch:

env:
MRUBY_DIR: ${{ github.workspace }}/src/MRubyCS.Compiler/mruby
CONFIG_DIR: ${{ github.workspace }}/src/MRubyCS.Compiler
MRUBY_DIR: ${{ github.workspace }}/src/ChibiRuby.Compiler/mruby
CONFIG_DIR: ${{ github.workspace }}/src/ChibiRuby.Compiler

jobs:
build-wasm:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build-mruby-compiler.windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ on:
workflow_dispatch:

env:
MRUBY_DIR: ${{ github.workspace }}\src/MRubyCS.Compiler\mruby
CONFIG_DIR: ${{ github.workspace }}\src/MRubyCS.Compiler
BENCHMARK_MRUBY_DIR: ${{ github.workspace }}\sandbox/MRubyCS.Benchmark\mruby
BENCHMARK_CONFIG_DIR: ${{ github.workspace }}\sandbox/MRubyCS.Benchmark
MRUBY_DIR: ${{ github.workspace }}\src/ChibiRuby.Compiler\mruby
CONFIG_DIR: ${{ github.workspace }}\src/ChibiRuby.Compiler
BENCHMARK_MRUBY_DIR: ${{ github.workspace }}\sandbox/ChibiRuby.Benchmark\mruby
BENCHMARK_CONFIG_DIR: ${{ github.workspace }}\sandbox/ChibiRuby.Benchmark

jobs:
build-windows:
Expand Down Expand Up @@ -38,7 +38,7 @@ jobs:
run: |
rake clean
rm -fr ./build
MRUBY_CONFIG=${GITHUB_WORKSPACE}/src/MRubyCS.Compiler/build_config.windows.rb rake
MRUBY_CONFIG=${GITHUB_WORKSPACE}/src/ChibiRuby.Compiler/build_config.windows.rb rake

- uses: actions/upload-artifact@v4
id: upload-windows-build
Expand All @@ -52,7 +52,7 @@ jobs:
run: |
rake clean
rm -fr ./build
MRUBY_CONFIG=${GITHUB_WORKSPACE}/sandbox/MRubyCS.Benchmark/build_config.windows.rb rake
MRUBY_CONFIG=${GITHUB_WORKSPACE}/sandbox/ChibiRuby.Benchmark/build_config.windows.rb rake

- uses: actions/upload-artifact@v4
id: upload-benchmark-build
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/update-version-number.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,12 @@ jobs:

- name: Update README.md ${{ steps.configure.outputs.git-tag }}
run: |
ruby -i -pe 'gsub(%r{(https://github.com/hadashiA/MRubyCS.git\?path=src/MRubyCS.Unity/Assets/MRubyCS.Compiler.Unity#)[\d\.]+}, %q{\1${{ steps.configure.outputs.git-tag }}})' README.md
ruby -i -pe 'gsub(%r{(https://github.com/hadashiA/MRubyCS.git\?path=src/MRubyCS.Unity/Assets/MRubyCS.Serializer.Unity#)[\d\.]+}, %q{\1${{ steps.configure.outputs.git-tag }}})' README.md
ruby -i -pe 'gsub(%r{(https://github.com/hadashiA/ChibiRuby.git\?path=src/ChibiRuby.Unity/Assets/ChibiRuby.Compiler.Unity#)[\d\.]+}, %q{\1${{ steps.configure.outputs.git-tag }}})' README.md
ruby -i -pe 'gsub(%r{(https://github.com/hadashiA/ChibiRuby.git\?path=src/ChibiRuby.Unity/Assets/ChibiRuby.Serializer.Unity#)[\d\.]+}, %q{\1${{ steps.configure.outputs.git-tag }}})' README.md
- name: Update package.json ${{ steps.configure.outputs.git-tag }}
run: |
ruby -i -pe 'gsub(/"version"\s*:\s*"([\w\.-]+)"/, %q{"version": "${{ steps.configure.outputs.git-tag }}"})' src/MRubyCS.Unity/Assets/MRubyCS.Compiler.Unity/package.json
ruby -i -pe 'gsub(/"version"\s*:\s*"([\w\.-]+)"/, %q{"version": "${{ steps.configure.outputs.git-tag }}"})' src/MRubyCS.Unity/Assets/MRubyCS.Serializer.Unity/package.json
ruby -i -pe 'gsub(/"version"\s*:\s*"([\w\.-]+)"/, %q{"version": "${{ steps.configure.outputs.git-tag }}"})' src/ChibiRuby.Unity/Assets/ChibiRuby.Compiler.Unity/package.json
ruby -i -pe 'gsub(/"version"\s*:\s*"([\w\.-]+)"/, %q{"version": "${{ steps.configure.outputs.git-tag }}"})' src/ChibiRuby.Unity/Assets/ChibiRuby.Serializer.Unity/package.json
ruby -i -pe 'gsub(/"version"\s*:\s*"([\w\.-]+)"/, %q{"version": "${{ steps.configure.outputs.git-tag }}"})' editor-extensions/vscode/package.json

- name: Check update on git
Expand Down
20 changes: 10 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -482,14 +482,14 @@ $RECYCLE.BIN/

# Unity

src/MRubyCS.Unity/Library/*
src/MRubyCS.Unity/Temp/*
src/MRubyCS.Unity/Logs/*
src/MRubyCS.Unity/*.csproj
src/MRubyCS.Unity/*.sln
src/MRubyCS.Unity/UserSettings
!src/MRubyCS.Unity/Assets/MRubyCS.Compiler.Unity
!src/MRubyCS.Unity/Assets/MRubyCS.Serializer.Unity

src/MRubyCS.Unity/Assets/Packages/*
src/ChibiRuby.Unity/Library/*
src/ChibiRuby.Unity/Temp/*
src/ChibiRuby.Unity/Logs/*
src/ChibiRuby.Unity/*.csproj
src/ChibiRuby.Unity/*.sln
src/ChibiRuby.Unity/UserSettings
!src/ChibiRuby.Unity/Assets/ChibiRuby.Compiler.Unity
!src/ChibiRuby.Unity/Assets/ChibiRuby.Serializer.Unity

src/ChibiRuby.Unity/Assets/Packages/*

12 changes: 6 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[submodule "src/MRubyCS.Compiler/mruby"]
path = src/MRubyCS.Compiler/mruby
[submodule "src/ChibiRuby.Compiler/mruby"]
path = src/ChibiRuby.Compiler/mruby
url = https://github.com/mruby/mruby.git
[submodule "sandbox/MRubyCS.Benchmark/mruby"]
path = sandbox/MRubyCS.Benchmark/mruby
[submodule "sandbox/ChibiRuby.Benchmark/mruby"]
path = sandbox/ChibiRuby.Benchmark/mruby
url = https://github.com/mruby/mruby.git
[submodule "src/MRubyCS.Compiler/mruby-compiler2"]
path = src/MRubyCS.Compiler/mruby-compiler2
[submodule "src/ChibiRuby.Compiler/mruby-compiler2"]
path = src/ChibiRuby.Compiler/mruby-compiler2
url = git@github.com:hadashiA/mruby-compiler2.git
branch = master
23 changes: 23 additions & 0 deletions ChibiRuby.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<Solution>
<Folder Name="/sandbox/">
<Project Path="sandbox\ChibiRuby.Benchmark\ChibiRuby.Benchmark.csproj" Type="Classic C#" />
<Project Path="sandbox\SampleConsoleApp\SampleConsoleApp.csproj" Type="Classic C#" />
<Project Path="sandbox\SampleDebuggerEmbedded\SampleDebuggerEmbedded.csproj" Type="Classic C#" />
</Folder>
<Folder Name="/src/">
<Project Path="src\ChibiRuby.Compiler.Cli\ChibiRuby.Compiler.Cli.csproj" Type="Classic C#" />
<Project Path="src\ChibiRuby.Compiler\ChibiRuby.Compiler.csproj" Type="Classic C#" />
<Project Path="src\ChibiRuby.Debugger\ChibiRuby.Debugger.csproj" Type="Classic C#" />
<Project Path="src\ChibiRuby.Debugger.Dap\ChibiRuby.Debugger.Dap.csproj" Type="Classic C#" />
<Project Path="src\ChibiRuby.Serializer.SourceGenerator\ChibiRuby.Serializer.SourceGenerator.csproj" Type="Classic C#" />
<Project Path="src\ChibiRuby.Serializer\ChibiRuby.Serializer.csproj" Type="Classic C#" />
<Project Path="src\ChibiRuby.SourceGenerator\ChibiRuby.SourceGenerator.csproj" Type="Classic C#" />
<Project Path="src\ChibiRuby\ChibiRuby.csproj" Type="Classic C#" />
</Folder>
<Folder Name="/tests/">
<Project Path="tests\ChibiRuby.Debugger.Tests\ChibiRuby.Debugger.Tests.csproj" Type="Classic C#" />
<Project Path="tests\ChibiRuby.Debugger.Dap.Tests\ChibiRuby.Debugger.Dap.Tests.csproj" Type="Classic C#" />
<Project Path="tests\ChibiRuby.Serializer.Tests\ChibiRuby.Serializer.Tests.csproj" Type="Classic C#" />
<Project Path="tests\ChibiRuby.Tests\ChibiRuby.Tests.csproj" Type="Classic C#" />
</Folder>
</Solution>
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- NuGet Packaging -->
<PackageVersion>0.108.0</PackageVersion>
<Authors>hadashiA</Authors>
<PackageProjectUrl>https://github.com/hadashiA/MRubyCS</PackageProjectUrl>
<PackageProjectUrl>https://github.com/hadashiA/ChibiRuby</PackageProjectUrl>
<RepositoryUrl>$(PackageProjectUrl)</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand Down
23 changes: 0 additions & 23 deletions MRubyCS.slnx

This file was deleted.

Loading
Loading