Skip to content

Commit 2ebfd39

Browse files
author
icex2
committed
refactor(dist): Config and .bat files
Move everything to new launcher.xml configuration files. Adjust the bootstrapping of launcher in the .bat files. Features such as copying the default props/ files to nvram are now handled by launcher. Using the PATH variable, bemanitools binaries can live in their own dedicated bemanitools/ subfolder next to props/ and modules/ now. All original binaries are expected to be kept in a modules/ folder like on stock data.
1 parent 2fe21ae commit 2ebfd39

70 files changed

Lines changed: 3050 additions & 209 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Module.mk‎

Lines changed: 86 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,10 @@ $(zipdir)/iidx-18.zip: \
325325
dist/iidx/config.bat \
326326
dist/iidx/gamestart-18.bat \
327327
dist/iidx/iidxhook-18.conf \
328+
dist/iidx/launcher-18.xml \
329+
dist/shared/ea3-ident.xml \
330+
dist/shared/ea3-license.xml \
331+
dist/shared/ea3-service.xml \
328332
dist/iidx/vefx.txt \
329333
| $(zipdir)/
330334
$(V)echo ... $@
@@ -356,6 +360,10 @@ $(zipdir)/iidx-19.zip: \
356360
dist/iidx/config.bat \
357361
dist/iidx/gamestart-19.bat \
358362
dist/iidx/iidxhook-19.conf \
363+
dist/iidx/launcher-19.xml \
364+
dist/shared/ea3-ident.xml \
365+
dist/shared/ea3-license.xml \
366+
dist/shared/ea3-service.xml \
359367
dist/iidx/vefx.txt \
360368
| $(zipdir)/
361369
$(V)echo ... $@
@@ -372,6 +380,10 @@ $(zipdir)/iidx-20.zip: \
372380
dist/iidx/config.bat \
373381
dist/iidx/gamestart-20.bat \
374382
dist/iidx/iidxhook-20.conf \
383+
dist/iidx/launcher-20.xml \
384+
dist/shared/ea3-ident.xml \
385+
dist/shared/ea3-license.xml \
386+
dist/shared/ea3-service.xml \
375387
dist/iidx/vefx.txt \
376388
| $(zipdir)/
377389
$(V)echo ... $@
@@ -409,6 +421,13 @@ $(zipdir)/iidx-21-to-24.zip: \
409421
dist/iidx/iidxhook-22.conf \
410422
dist/iidx/iidxhook-23.conf \
411423
dist/iidx/iidxhook-24.conf \
424+
dist/iidx/launcher-21.xml \
425+
dist/iidx/launcher-22.xml \
426+
dist/iidx/launcher-23.xml \
427+
dist/iidx/launcher-24.xml \
428+
dist/shared/ea3-ident.xml \
429+
dist/shared/ea3-license.xml \
430+
dist/shared/ea3-service.xml \
412431
dist/iidx/vefx.txt \
413432
| $(zipdir)/
414433
$(V)echo ... $@
@@ -427,6 +446,11 @@ $(zipdir)/iidx-25-to-26.zip: \
427446
dist/iidx/gamestart-26.bat \
428447
dist/iidx/iidxhook-25.conf \
429448
dist/iidx/iidxhook-26.conf \
449+
dist/iidx/launcher-25.xml \
450+
dist/iidx/launcher-26.xml \
451+
dist/shared/ea3-ident.xml \
452+
dist/shared/ea3-license.xml \
453+
dist/shared/ea3-service.xml \
430454
dist/iidx/vefx.txt \
431455
| $(zipdir)/
432456
$(V)echo ... $@
@@ -449,6 +473,13 @@ $(zipdir)/iidx-27-to-30.zip: \
449473
dist/iidx/iidxhook-28.conf \
450474
dist/iidx/iidxhook-29.conf \
451475
dist/iidx/iidxhook-30.conf \
476+
dist/iidx/launcher-27.xml \
477+
dist/iidx/launcher-28.xml \
478+
dist/iidx/launcher-29.xml \
479+
dist/iidx/launcher-30.xml \
480+
dist/shared/ea3-ident.xml \
481+
dist/shared/ea3-license.xml \
482+
dist/shared/ea3-service.xml \
452483
dist/iidx/vefx.txt \
453484
| $(zipdir)/
454485
$(V)echo ... $@
@@ -517,6 +548,10 @@ $(zipdir)/jb-03.zip: \
517548
build/bin/indep-32/jbio.dll \
518549
dist/jb/config.bat \
519550
dist/jb/gamestart-03.bat \
551+
dist/jb/launcher-03.xml \
552+
dist/shared/ea3-ident.xml \
553+
dist/shared/ea3-license.xml \
554+
dist/shared/ea3-service.xml \
520555
| $(zipdir)/
521556
$(V)echo ... $@
522557
$(V)zip -j $@ $^
@@ -530,6 +565,10 @@ $(zipdir)/jb-04.zip: \
530565
build/bin/indep-32/jbio.dll \
531566
dist/jb/config.bat \
532567
dist/jb/gamestart-03.bat \
568+
dist/jb/launcher-03.xml \
569+
dist/shared/ea3-ident.xml \
570+
dist/shared/ea3-license.xml \
571+
dist/shared/ea3-service.xml \
533572
| $(zipdir)/
534573
$(V)echo ... $@
535574
$(V)zip -j $@ $^
@@ -543,6 +582,10 @@ $(zipdir)/jb-05-to-07.zip: \
543582
build/bin/indep-32/jbio.dll \
544583
dist/jb/config.bat \
545584
dist/jb/gamestart-04.bat \
585+
dist/jb/launcher-04.xml \
586+
dist/shared/ea3-ident.xml \
587+
dist/shared/ea3-license.xml \
588+
dist/shared/ea3-service.xml \
546589
| $(zipdir)/
547590
$(V)echo ... $@
548591
$(V)zip -j $@ $^
@@ -556,6 +599,10 @@ $(zipdir)/jb-08.zip: \
556599
build/bin/indep-32/jbio.dll \
557600
dist/jb/config.bat \
558601
dist/jb/gamestart-04.bat \
602+
dist/jb/launcher-04.xml \
603+
dist/shared/ea3-ident.xml \
604+
dist/shared/ea3-license.xml \
605+
dist/shared/ea3-service.xml \
559606
| $(zipdir)/
560607
$(V)echo ... $@
561608
$(V)zip -j $@ $^
@@ -580,6 +627,10 @@ $(zipdir)/sdvx-01-to-04.zip: \
580627
build/bin/indep-32/sdvxio.dll \
581628
dist/sdvx/config.bat \
582629
dist/sdvx/gamestart.bat \
630+
dist/sdvx/launcher.xml \
631+
dist/shared/ea3-ident.xml \
632+
dist/shared/ea3-license.xml \
633+
dist/shared/ea3-service.xml \
583634
| $(zipdir)/
584635
$(V)echo ... $@
585636
$(V)zip -j $@ $^
@@ -594,6 +645,10 @@ $(zipdir)/sdvx-05-to-06.zip: \
594645
dist/sdvx5/config.bat \
595646
dist/sdvx5/gamestart.bat \
596647
dist/sdvx5/sdvxhook2.conf \
648+
dist/sdvx5/launcher.xml \
649+
dist/shared/ea3-ident.xml \
650+
dist/shared/ea3-license.xml \
651+
dist/shared/ea3-service.xml \
597652
| $(zipdir)/
598653
$(V)echo ... $@
599654
$(V)zip -j $@ $^
@@ -608,6 +663,10 @@ $(zipdir)/sdvx-05-cn.zip: \
608663
dist/sdvx5/config.bat \
609664
dist/sdvx5/gamestart-cn.bat \
610665
dist/sdvx5/sdvxhook2-cn.conf \
666+
dist/sdvx5/launcher-cn.xml \
667+
dist/shared/ea3-ident.xml \
668+
dist/shared/ea3-license.xml \
669+
dist/shared/ea3-service.xml \
611670
| $(zipdir)/
612671
$(V)echo ... $@
613672
$(V)zip -j $@ $^
@@ -682,6 +741,10 @@ $(zipdir)/ddr-12.zip: \
682741
build/bin/indep-32/geninput.dll \
683742
dist/ddr/config.bat \
684743
dist/ddr/gamestart-12.bat \
744+
dist/ddr/launcher-12.xml \
745+
dist/shared/ea3-ident.xml \
746+
dist/shared/ea3-license.xml \
747+
dist/shared/ea3-service.xml \
685748
| $(zipdir)/
686749
$(V)echo ... $@
687750
$(V)zip -j $@ $^
@@ -698,6 +761,10 @@ $(zipdir)/ddr-13.zip: \
698761
build/bin/indep-32/geninput.dll \
699762
dist/ddr/config.bat \
700763
dist/ddr/gamestart-13.bat \
764+
dist/ddr/launcher-13.xml \
765+
dist/shared/ea3-ident.xml \
766+
dist/shared/ea3-license.xml \
767+
dist/shared/ea3-service.xml \
701768
| $(zipdir)/
702769
$(V)echo ... $@
703770
$(V)zip -j $@ $^
@@ -711,13 +778,19 @@ $(zipdir)/ddr-14-to-18.zip: \
711778
build/bin/indep-32/eamio.dll \
712779
build/bin/indep-32/geninput.dll \
713780
dist/ddr/config.bat \
714-
dist/ddr/gamestart-17.bat \
715-
dist/ddr/gamestart-18.bat \
716781
dist/ddr/gamestart-14.bat \
717782
dist/ddr/gamestart-15.bat \
718783
dist/ddr/gamestart-16.bat \
719784
dist/ddr/gamestart-17.bat \
720785
dist/ddr/gamestart-18.bat \
786+
dist/ddr/launcher-14.xml \
787+
dist/ddr/launcher-15.xml \
788+
dist/ddr/launcher-16.xml \
789+
dist/ddr/launcher-17.xml \
790+
dist/ddr/launcher-18.xml \
791+
dist/shared/ea3-ident.xml \
792+
dist/shared/ea3-license.xml \
793+
dist/shared/ea3-service.xml \
721794
| $(zipdir)/
722795
$(V)echo ... $@
723796
$(V)zip -j $@ $^
@@ -731,11 +804,15 @@ $(zipdir)/ddr-16-to-18-x64.zip: \
731804
build/bin/indep-64/eamio.dll \
732805
build/bin/indep-64/geninput.dll \
733806
dist/ddr/config.bat \
734-
dist/ddr/gamestart-17.bat \
735-
dist/ddr/gamestart-18.bat \
736807
dist/ddr/gamestart-16.bat \
737808
dist/ddr/gamestart-17.bat \
738809
dist/ddr/gamestart-18.bat \
810+
dist/ddr/launcher-16.xml \
811+
dist/ddr/launcher-17.xml \
812+
dist/ddr/launcher-18.xml \
813+
dist/shared/ea3-ident.xml \
814+
dist/shared/ea3-license.xml \
815+
dist/shared/ea3-service.xml \
739816
| $(zipdir)/
740817
$(V)echo ... $@
741818
$(V)zip -j $@ $^
@@ -774,6 +851,11 @@ $(zipdir)/bst.zip: \
774851
dist/bst/config.bat \
775852
dist/bst/gamestart1.bat \
776853
dist/bst/gamestart2.bat \
854+
dist/bst/launcher-01.xml \
855+
dist/bst/launcher-02.xml \
856+
dist/shared/ea3-ident.xml \
857+
dist/shared/ea3-license.xml \
858+
dist/shared/ea3-service.xml \
777859
| $(zipdir)/
778860
$(V)echo ... $@
779861
$(V)zip -j $@ $^

‎dist/bst/gamestart1.bat‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,34 @@
11
@echo off
22

3+
:: Game doesn't work properly when not run with administrator privileges
4+
>nul 2>&1 net session
5+
6+
if %errorlevel% neq 0 (
7+
echo This script requires administrative privileges.
8+
echo Please run the script as an administrator.
9+
pause
10+
exit 1
11+
)
12+
13+
:: Script expects to be located in a subfolder "bemanitools" in the root folder
14+
:: (contents/) next to the folders modules, data etc.
315
cd /d %~dp0
416

5-
if not exist dev\nvram mkdir dev\nvram
6-
if not exist dev\nvram\coin.xml copy prop\defaults\coin.xml dev\nvram\coin.xml
7-
if not exist dev\nvram\eacoin.xml copy prop\defaults\eacoin.xml dev\nvram\eacoin.xml
8-
if not exist dev\raw mkdir dev\raw
17+
:: Script expects to be located in the root folder (contents/) next to the
18+
:: folders modules, data etc.
19+
set CONTENT_DIR=%CD%\..
20+
set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
21+
set MODULES_DIR=%CONTENT_DIR%\modules
22+
23+
:: Keep that data vanilla, no need to copy these around anymore
24+
:: Just add them to the env PATH so launcher can find the libs and game executable
25+
:: Remark: This also requires admin privileges to propage correctly to launcher
26+
set PATH=^
27+
%MODULES_DIR%;^
28+
%BEMANITOOLS_DIR%;^
29+
%PATH%
30+
31+
:: Current working dir is the game's root folder
32+
cd /d %CONTENT_DIR%
933

10-
launcher -K bsthook.dll -E prop/ea3-config-1.xml beatstream1.dll %*
34+
%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-01.xml %*

‎dist/bst/gamestart2.bat‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,34 @@
11
@echo off
22

3+
:: Game doesn't work properly when not run with administrator privileges
4+
>nul 2>&1 net session
5+
6+
if %errorlevel% neq 0 (
7+
echo This script requires administrative privileges.
8+
echo Please run the script as an administrator.
9+
pause
10+
exit 1
11+
)
12+
13+
:: Script expects to be located in a subfolder "bemanitools" in the root folder
14+
:: (contents/) next to the folders modules, data etc.
315
cd /d %~dp0
416

5-
if not exist dev\nvram mkdir dev\nvram
6-
if not exist dev\nvram\coin.xml copy prop\defaults\coin.xml dev\nvram\coin.xml
7-
if not exist dev\nvram\eacoin.xml copy prop\defaults\eacoin.xml dev\nvram\eacoin.xml
8-
if not exist dev\raw mkdir dev\raw
17+
:: Script expects to be located in the root folder (contents/) next to the
18+
:: folders modules, data etc.
19+
set CONTENT_DIR=%CD%\..
20+
set BEMANITOOLS_DIR=%CONTENT_DIR%\bemanitools
21+
set MODULES_DIR=%CONTENT_DIR%\modules
22+
23+
:: Keep that data vanilla, no need to copy these around anymore
24+
:: Just add them to the env PATH so launcher can find the libs and game executable
25+
:: Remark: This also requires admin privileges to propage correctly to launcher
26+
set PATH=^
27+
%MODULES_DIR%;^
28+
%BEMANITOOLS_DIR%;^
29+
%PATH%
30+
31+
:: Current working dir is the game's root folder
32+
cd /d %CONTENT_DIR%
933

10-
launcher -K bsthook.dll -E prop/ea3-config-2.xml beatstream2.dll %*
34+
%BEMANITOOLS_DIR%\launcher %BEMANITOOLS_DIR%\launcher-02.xml %*

‎dist/bst/launcher-01.xml‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
<?xml version="1.0" encoding="Shift-JIS"?>
2+
<launcher version="1">
3+
<bootstrap>
4+
<selector __type="str">bemanitools_local_fs</selector>
5+
<config kind="inline">
6+
<config>
7+
<startup>
8+
<bemanitools_local_fs>
9+
<default>
10+
<file dst="/dev/nvram/ea3-config.xml" src="/prop/eamuse-config-1.xml" />
11+
<file dst="/dev/nvram/coin.xml" src="/prop/coin.xml" />
12+
<file dst="/dev/nvram/eacoin.xml" src="/prop/eacoin.xml" />
13+
</default>
14+
<boot>
15+
<file>prop/avs-config.xml</file>
16+
<heap_avs __type="u32">16777216</heap_avs>
17+
<heap_std __type="u32">16777216</heap_std>
18+
</boot>∂
19+
<log>
20+
<level>info</level>
21+
</log>
22+
<eamuse>
23+
<file>/dev/nvram/ea3-config.xml</file>
24+
</eamuse>
25+
<component>
26+
<file>beatstream1.dll</file>
27+
<param></param>
28+
</component>
29+
</bemanitools_local_fs>
30+
</startup>
31+
</config>
32+
</config>
33+
</bootstrap>
34+
<ea3_ident>
35+
<config kind="file">bemanitools/ea3-ident.xml</config>
36+
<config kind="file">bemanitools/ea3-license.xml</config>
37+
</ea3_ident>
38+
<avs>
39+
<config kind="inline">
40+
<config>
41+
<fs>
42+
<root>
43+
<device __type="str">.</device>
44+
</root>
45+
<nvram>
46+
<device __type="str">dev/nvram</device>
47+
<fstype __type="str">fs</fstype>
48+
<option __type="str">vf=1,posix=1</option>
49+
</nvram>
50+
<raw>
51+
<device __type="str">dev/raw</device>
52+
<fstype __type="str">fs</fstype>
53+
<option __type="str">vf=1,posix=1</option>
54+
</raw>
55+
</fs>
56+
</config>
57+
</config>
58+
</avs>
59+
<eamuse>
60+
<config kind="file">bemanitools/ea3-server.xml</config>
61+
</eamuse>
62+
<hook>
63+
<hook_dlls>
64+
<dll __type="str">bsthook.dll</dll>
65+
</hook_dlls>
66+
<before_hook_dlls>
67+
</before_hook_dlls>
68+
<iat_hook_dlls>
69+
</iat_hook_dlls>
70+
</hook>
71+
<debug>
72+
<remote_debugger __type="bool">0</remote_debugger>
73+
<log_property_configs __type="bool">0</log_property_configs>
74+
</debug>
75+
</launcher>

0 commit comments

Comments
 (0)