renil/goldberg_emulator
1
0
Fork 0
mirror of https://gitlab.com/Mr_Goldberg/goldberg_emulator synced 2025-05-23 21:57:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: renil:ed4e4f2fcc5a8fc84d9d4efbbf51954ba912724c
Branches Tags
renil:master
renil:test_ci
renil:inventory_pr
renil:0.2.5
renil:v0.2.4
renil:v0.2.3
renil:v0.2.2
...
compare: renil:7df906f12e16844d88349e4d1330d7f21f8412b0
Branches Tags
renil:master
renil:test_ci
renil:inventory_pr
renil:0.2.5
renil:v0.2.4
renil:v0.2.3
renil:v0.2.2

16 Commits
ed4e4f2fcc ... 7df906f12e

Author SHA1 Message Date
redpolline
7df906f12e Merge branch 'test_ci_fixes' into lobby_connect_relay_daemon_and_game_fix 
Temporary CI fix so that we get valid DLLs/EXEs. Will fix it correctly
in next MR.
 2025-01-31 04:55:31 -05:00
redpolline
80819bd559 Edit generate_build_win_bat.py 
Add lobby_connect.exe
 2025-01-31 04:51:53 -05:00
redpolline
127fddeae8 Update .gitlab-ci.yml file 
Try disabling the DLL_FILES sed commands. (The BATs should handle this anyway....)
 2025-01-31 04:51:53 -05:00
redpolline
a0215595e3 Just include them manually.... 2025-01-31 04:39:35 -05:00
redpolline
005c224408 More fixes. 2025-01-31 04:10:45 -05:00
redpolline
0bf68ab25f Edit generate_build_win_bat.py 2025-01-31 08:41:12 +00:00
redpolline
fec0391a7e Edit generate_build_win_bat.py 
Fix up lobby_connect.
 2025-01-31 08:21:16 +00:00
redpolline
3ff16f75f4 Edit generate_build_win_bat.py 
Add lobby_connect.exe
 2025-01-31 07:58:04 +00:00
redpolline
117ad9ec75 Update .gitlab-ci.yml file 
Try fixing translate cmds.
 2025-01-31 07:15:41 +00:00
redpolline
fcf1ea94a4 Update .gitlab-ci.yml file 
Try fixing translate cmds.
 2025-01-31 07:13:09 +00:00
redpolline
60aac21320 Update .gitlab-ci.yml file 
Try fixing translate cmds.
 2025-01-31 03:38:05 +00:00
redpolline
01e9208d88 Update .gitlab-ci.yml file 
Try fixing translate cmds.
 2025-01-31 03:35:51 +00:00
redpolline
9f4c48cdc6 Update .gitlab-ci.yml file 
Re-enable sed commands.
 2025-01-31 03:32:05 +00:00
redpolline
0276fa99da Update .gitlab-ci.yml file 
Dump the built bat file.
 2025-01-31 03:13:59 +00:00
redpolline
86084d7c6e Update .gitlab-ci.yml file 
Try building lobby_connect win release using the bat file in the repo.
 2025-01-31 03:12:12 +00:00
redpolline
36adbce8fb Update .gitlab-ci.yml file 
Try disabling the DLL_FILES sed commands. (The BATs should handle this anyway....)
 2025-01-31 02:40:46 +00:00
2 changed files with 11 additions and 3 deletions
Show Stats Expand all files Collapse all files

7
.gitlab-ci.yml
View File

@ -69,14 +69,17 @@ build_windows:
- 7za x protobuf_x86-windows-static.7z -oprotobuf_x86-windows-static
- 7za x protobuf_x64-windows-static.7z -oprotobuf_x64-windows-static
- 7za x sdk_standalone.7z -osdk_standalone
- DLL_FILES="$(ls dll/*.cpp | tr "\n" " ")"; sed "s|dll/\*.cpp|$DLL_FILES|g" -i *.bat
- DLL_FILES="$(ls dll/*.proto | tr "\n" " " | sed "s/.proto/.pb.cc/g")"; sed "s|dll/\*.cc|$DLL_FILES|g" -i *.bat
- DLL_FILES="$(ls dll/*.cpp | tr "\n" " " | tr "/" "\\\\")"; sed "s|dll/\*.cpp|$DLL_FILES|g" -i *.bat
- DLL_FILES="$(ls dll/*.proto | tr "\n" " " | tr "/" "\\\\" | sed "s/.proto/.pb.cc/g")"; sed "s|dll/\*.cc|$DLL_FILES|g" -i *.bat
- sed "s| /MP12 | /MP4 |g" -i *.bat
# CI can't produce PDBs. Throws a bunch of errors, and skips building the PEs.
- sed "s| /DDEBUG\:FULL | |g" -i *.bat
# Turn on echo.
- sed "s|echo off|echo on|g" -i *.bat
- python generate_build_win_bat.py
- export WINEDEBUG=-all
- wine cmd /c build_win_release_test.bat
- cp build_win_release_test.bat release/build_win_release_test.bat
artifacts:
paths:
- release/

7
generate_build_win_bat.py
View File

@ -32,6 +32,7 @@ includes_64 = list(map(lambda a: '/I{}'.format(a), ["%PROTOBUF_X64_DIRECTORY%\\i
debug_build_args = []
release_build_args = ["/DEMU_RELEASE_BUILD", "/DNDEBUG"]
steamclient_build_args = ["/DSTEAMCLIENT_DLL"]
lobby_connect_args = ["/DNO_DISK_WRITES", "/DLOBBY_CONNECT"]
experimental_build_args = ["/DEMU_EXPERIMENTAL_BUILD", "/DCONTROLLER_SUPPORT", "/DEMU_OVERLAY"]
steamclient_experimental_build_args = experimental_build_args + steamclient_build_args
@ -62,6 +63,7 @@ mkdir release\experimental
mkdir release\experimental_steamclient
mkdir release\debug_experimental
mkdir release\debug_experimental_steamclient
mkdir release\lobby_connect
call build_set_protobuf_directories.bat
"""
@ -81,7 +83,8 @@ xcopy /s files_example\* release\\
copy Readme_experimental.txt release\experimental\Readme.txt
copy Readme_debug.txt release\debug_experimental\Readme.txt
copy steamclient_loader\ColdClientLoader.ini release\experimental_steamclient\\
call build_win_lobby_connect.bat
REM call build_win_lobby_connect.bat
copy Readme_lobby_connect.txt release\lobby_connect\Readme.txt
call build_win_find_interfaces.bat
"""
@ -114,6 +117,8 @@ def generate_common(include_arch, linker_arch, steam_api_name, steamclient_name)
out += generate_common(includes_32, linker_32, "steam_api.dll", "steamclient.dll")
out += cl_line_exe(files_from_dir("./", "lobby_connect.cpp") + files_from_dir("dll", "flat.cpp") + files_from_dir("dll", "dll.cpp") + lobby_connect_args + normal_build_args + release_build_args + includes_32 + proto_deps + steam_deps + normal_linker_libs + ["Comdlg32.lib", "user32.lib"], linker_32 + ["/debug:none", "/OUT:release\lobby_connect\lobby_connect.exe"])
out += cl_line_exe(files_from_dir("steamclient_loader", ".cpp") + ["advapi32.lib", "user32.lib"] + normal_build_args, ["/debug:none", "/OUT:release\experimental_steamclient\steamclient_loader.exe"])
out += head_64bit