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.

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

generate_emu_config overhaul (a lot of bugfixes, improvements, new features, new file structure, new helper tools) #2

Draft
wants to merge 34 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
3e5c8c4
extra bat files for easier build on Windows
alex47exe Jul 29, 2024
34dd0ba
Add files via upload
alex47exe Jul 30, 2024
ae979f1
* [alex47exe] major overhaul of **generate_emu_config** - custom conf…
alex47exe Jul 30, 2024
06c228b
delete the no longer required mod_images folder
alex47exe Jul 30, 2024
6431c17
extra_acw.zip instead of extra_acw.7z - fixes gse_acw_helper
alex47exe Aug 2, 2024
a37feca
add missing lines for steam_api64 and steamclient64 - fixes gse_debu…
alex47exe Aug 3, 2024
32eaea9
fix compatibility with upstream fork, re-enabling auto-merge function…
alex47exe Aug 3, 2024
5616b3b
Merge branch 'dev' into dev
alex47exe Aug 3, 2024
fb8edcc
* manually push latest steam api 7z archives required by gse_debug_sw…
alex47exe Aug 3, 2024
0714772
Merge branch 'Detanup01:dev' into dev
alex47exe Aug 5, 2024
d17334b
Merge branch 'dev' into dev
alex47exe Aug 18, 2024
4f521cf
Merge branch 'dev' into dev
alex47exe Aug 19, 2024
6eb6634
remove outdated tools from README
alex47exe Aug 19, 2024
08e7473
- manually push latest steam api 7z archives required by gse_debug_sw…
alex47exe Aug 19, 2024
d7f6576
Merge branch 'dev' into dev
alex47exe Aug 22, 2024
f73af37
Merge branch 'Detanup01:dev' into dev
alex47exe Aug 23, 2024
ab40864
Merge branch 'dev' into dev
alex47exe Aug 25, 2024
71d6aa7
- manually push latest steam api 7z archives required by gse_debug_sw…
alex47exe Aug 25, 2024
93ba291
Merge branch 'dev' into dev
alex47exe Aug 26, 2024
4f0a36f
Merge branch 'Detanup01:dev' into dev
alex47exe Aug 27, 2024
3fbe0d3
Merge branch 'Detanup01:dev' into dev
alex47exe Sep 2, 2024
8b2b141
Merge branch 'Detanup01:dev' into dev
alex47exe Sep 6, 2024
c0b071e
Merge branch 'dev' into dev
alex47exe Sep 16, 2024
ea28ed6
Merge branch 'Detanup01:dev' into dev
alex47exe Sep 18, 2024
8141643
- manually push latest steam api 7z archives required by gse_debug_sw…
alex47exe Sep 23, 2024
1d68c3d
Merge branch 'dev' into dev
alex47exe Oct 6, 2024
398ae35
fix steam id for generated codex ini
alex47exe Oct 7, 2024
6c5819b
release workflow improvements
alex47exe Oct 7, 2024
9c18c68
Merge branch 'Detanup01:dev' into dev
alex47exe Oct 10, 2024
3ccce93
fix generate_emu_config login, thanks to Sak32009
alex47exe Oct 13, 2024
21c33b3
generate_emu_config and migrate_gse:
alex47exe Oct 14, 2024
174d2df
generate_emu_config and migrate_gse:
alex47exe Oct 14, 2024
0745935
is_beta_branch fix, as pointed by wizark952
alex47exe Oct 14, 2024
766b685
update top_owners_ids.txt for generate_emu_config
alex47exe Oct 14, 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
15 changes: 15 additions & 0 deletions .github/workflows/gen_emu_config-build-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,21 @@ jobs:
with:
ref: "third-party/build/win"
path: "${{env.THIRD_PARTY_BASE_DIR}}/build/win"

## clone this for 7za.exe
- name: "Clone third-party deps (deps/win)"
uses: actions/checkout@v4
with:
ref: "third-party/deps/win"
path: "${{env.THIRD_PARTY_BASE_DIR}}/deps/win"

# download artifacts
- name: "Download emu build artifacts (Win)"
uses: actions/download-artifact@v4
with:
path: "build/win"
pattern: "emu-win-*"
merge-multiple: true

# env
- name: "Install env"
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/migrate_gse-build-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,21 @@ jobs:
with:
ref: "third-party/build/win"
path: "${{env.THIRD_PARTY_BASE_DIR}}/build/win"

## clone this for 7za.exe
- name: "Clone third-party deps (deps/win)"
uses: actions/checkout@v4
with:
ref: "third-party/deps/win"
path: "${{env.THIRD_PARTY_BASE_DIR}}/deps/win"

# download artifacts
- name: "Download emu build artifacts (Win)"
uses: actions/download-artifact@v4
with:
path: "build/win"
pattern: "emu-win-*"
merge-multiple: true

# env
- name: "Install env"
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ jobs:
retention-days: 7

gen_emu_script-win:
needs: ["emu-win-all"] # add emu-win-all to wait for emu build to complete, so that we include the latest dlls and tools in generate_emu_config
name: "Gen emu config win"
if: ${{ !cancelled() }}
uses: "./.github/workflows/gen_emu_config-build-win.yml"
Expand Down Expand Up @@ -247,6 +248,7 @@ jobs:
retention-days: 7

gen_emu_script-linux:
needs: ["emu-linux-all"] # add emu-linux-all to wait for emu build to complete (not really needed but included for better build matrix visualization)
name: "Gen emu config linux"
if: ${{ !cancelled() }}
uses: "./.github/workflows/gen_emu_config-build-linux.yml"
Expand Down Expand Up @@ -299,6 +301,7 @@ jobs:
retention-days: 7

migrate_gse_script-win:
needs: ["emu-win-all"] # add emu-win-all to wait for emu build to complete, so that we include the latest dlls and tools in migrate_gse
name: "Migrate GSE win"
if: ${{ !cancelled() }}
uses: "./.github/workflows/migrate_gse-build-win.yml"
Expand Down Expand Up @@ -359,6 +362,7 @@ jobs:
retention-days: 7

migrate_gse_script-linux:
needs: ["emu-linux-all"] # add emu-linux-all to wait for emu build to complete (not really needed but included for better build matrix visualization)
name: Migrate GSE linux
if: ${{ !cancelled() }}
uses: "./.github/workflows/migrate_gse-build-linux.yml"
Expand Down
41 changes: 38 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,48 @@
/tools/generate_emu_config/.env*/
/tools/generate_emu_config/bin

/tools/generate_emu_config/backup/
/tools/generate_emu_config/_DEFAULT/0/steam_api.dll
/tools/generate_emu_config/_DEFAULT/0/steam_api.7z
/tools/generate_emu_config/_DEFAULT/0/steam_api64.dll
/tools/generate_emu_config/_DEFAULT/0/steam_api64.7z

/tools/generate_emu_config/_DEFAULT/0/steam_api.7z
/tools/generate_emu_config/_DEFAULT/0/steam_api64.dll
/tools/generate_emu_config/_DEFAULT/0/steam_api64.7z

/tools/generate_emu_config/_DEFAULT/0/steam_misc/tools/generate_interfaces/generate_interfaces.7z
/tools/generate_emu_config/_DEFAULT/0/steam_misc/tools/generate_interfaces/generate_interfaces.exe
/tools/generate_emu_config/_DEFAULT/0/steam_misc/tools/generate_interfaces/generate_interfaces64.exe

/tools/generate_emu_config/_DEFAULT/0/steam_misc/tools/lobby_connect/lobby_connect.7z
/tools/generate_emu_config/_DEFAULT/0/steam_misc/tools/lobby_connect/lobby_connect.exe
/tools/generate_emu_config/_DEFAULT/0/steam_misc/tools/lobby_connect/lobby_connect64.exe

/tools/generate_emu_config/_OUTPUT/

/tools/generate_emu_config/login_temp/
/tools/generate_emu_config/output/
/tools/generate_emu_config/**/my_login.txt
/tools/generate_emu_config/top_owners_ids.txt

# migrate_gse
/tools/migrate_gse/.py*/
/tools/migrate_gse/.env*/
/tools/migrate_gse/bin

/tools/migrate_gse/_DEFAULT/0/steam_api.dll
/tools/migrate_gse/_DEFAULT/0/steam_api.7z
/tools/migrate_gse/_DEFAULT/0/steam_api64.dll
/tools/migrate_gse/_DEFAULT/0/steam_api64.7z

/tools/migrate_gse/_DEFAULT/0/steam_api.7z
/tools/migrate_gse/_DEFAULT/0/steam_api64.dll
/tools/migrate_gse/_DEFAULT/0/steam_api64.7z

/tools/migrate_gse/_DEFAULT/0/steam_misc/tools/generate_interfaces/generate_interfaces.7z
/tools/migrate_gse/_DEFAULT/0/steam_misc/tools/generate_interfaces/generate_interfaces.exe
/tools/migrate_gse/_DEFAULT/0/steam_misc/tools/generate_interfaces/generate_interfaces64.exe

/tools/migrate_gse/_DEFAULT/0/steam_misc/tools/lobby_connect/lobby_connect.7z
/tools/migrate_gse/_DEFAULT/0/steam_misc/tools/lobby_connect/lobby_connect.exe
/tools/migrate_gse/_DEFAULT/0/steam_misc/tools/lobby_connect/lobby_connect64.exe

/tools/migrate_gse/_OUTPUT/
Loading