Skip to content

Commit ff9f8d8

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 caefe18 commit ff9f8d8

70 files changed

Lines changed: 3105 additions & 191 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: 109 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,10 @@ $(zipdir)/iidx-18.zip: \
327327
dist/iidx/config.bat \
328328
dist/iidx/gamestart-18.bat \
329329
dist/iidx/iidxhook-18.conf \
330+
dist/iidx/launcher-18.xml \
331+
dist/shared/ea3-ident.xml \
332+
dist/shared/ea3-license.xml \
333+
dist/shared/ea3-service.xml \
330334
dist/iidx/vefx.txt \
331335
| $(zipdir)/
332336
$(V)echo ... $@
@@ -339,6 +343,7 @@ $(zipdir)/iidx-18-cn.zip: \
339343
build/bin/indep-32/iidxio.dll \
340344
build/bin/indep-32/vefxio.dll \
341345
build/bin/indep-32/inject.exe \
346+
dist/dwarfstack/32/dwarfstack.dll \
342347
dist/iidx/config.bat \
343348
dist/iidx/gamestart-18-cn.bat \
344349
dist/iidx/iidxhook-18-cn.conf \
@@ -355,9 +360,14 @@ $(zipdir)/iidx-19.zip: \
355360
build/bin/indep-32/geninput.dll \
356361
build/bin/indep-32/iidxio.dll \
357362
build/bin/indep-32/vefxio.dll \
363+
dist/dwarfstack/32/dwarfstack.dll \
358364
dist/iidx/config.bat \
359365
dist/iidx/gamestart-19.bat \
360366
dist/iidx/iidxhook-19.conf \
367+
dist/iidx/launcher-19.xml \
368+
dist/shared/ea3-ident.xml \
369+
dist/shared/ea3-license.xml \
370+
dist/shared/ea3-service.xml \
361371
dist/iidx/vefx.txt \
362372
| $(zipdir)/
363373
$(V)echo ... $@
@@ -371,9 +381,14 @@ $(zipdir)/iidx-20.zip: \
371381
build/bin/indep-32/geninput.dll \
372382
build/bin/indep-32/iidxio.dll \
373383
build/bin/indep-32/vefxio.dll \
384+
dist/dwarfstack/32/dwarfstack.dll \
374385
dist/iidx/config.bat \
375386
dist/iidx/gamestart-20.bat \
376387
dist/iidx/iidxhook-20.conf \
388+
dist/iidx/launcher-20.xml \
389+
dist/shared/ea3-ident.xml \
390+
dist/shared/ea3-license.xml \
391+
dist/shared/ea3-service.xml \
377392
dist/iidx/vefx.txt \
378393
| $(zipdir)/
379394
$(V)echo ... $@
@@ -386,6 +401,7 @@ $(zipdir)/iidx-20-cn.zip: \
386401
build/bin/indep-32/iidxio.dll \
387402
build/bin/indep-32/vefxio.dll \
388403
build/bin/indep-32/inject.exe \
404+
dist/dwarfstack/32/dwarfstack.dll \
389405
dist/iidx/config.bat \
390406
dist/iidx/gamestart-20-cn.bat \
391407
dist/iidx/iidxhook-20-cn.conf \
@@ -402,6 +418,7 @@ $(zipdir)/iidx-21-to-24.zip: \
402418
build/bin/indep-32/geninput.dll \
403419
build/bin/indep-32/iidxio.dll \
404420
build/bin/indep-32/vefxio.dll \
421+
dist/dwarfstack/32/dwarfstack.dll \
405422
dist/iidx/config.bat \
406423
dist/iidx/gamestart-21.bat \
407424
dist/iidx/gamestart-22.bat \
@@ -411,6 +428,13 @@ $(zipdir)/iidx-21-to-24.zip: \
411428
dist/iidx/iidxhook-22.conf \
412429
dist/iidx/iidxhook-23.conf \
413430
dist/iidx/iidxhook-24.conf \
431+
dist/iidx/launcher-21.xml \
432+
dist/iidx/launcher-22.xml \
433+
dist/iidx/launcher-23.xml \
434+
dist/iidx/launcher-24.xml \
435+
dist/shared/ea3-ident.xml \
436+
dist/shared/ea3-license.xml \
437+
dist/shared/ea3-service.xml \
414438
dist/iidx/vefx.txt \
415439
| $(zipdir)/
416440
$(V)echo ... $@
@@ -424,11 +448,17 @@ $(zipdir)/iidx-25-to-26.zip: \
424448
build/bin/indep-64/geninput.dll \
425449
build/bin/indep-64/iidxio.dll \
426450
build/bin/indep-64/vefxio.dll \
451+
dist/dwarfstack/64/dwarfstack.dll \
427452
dist/iidx/config.bat \
428453
dist/iidx/gamestart-25.bat \
429454
dist/iidx/gamestart-26.bat \
430455
dist/iidx/iidxhook-25.conf \
431456
dist/iidx/iidxhook-26.conf \
457+
dist/iidx/launcher-25.xml \
458+
dist/iidx/launcher-26.xml \
459+
dist/shared/ea3-ident.xml \
460+
dist/shared/ea3-license.xml \
461+
dist/shared/ea3-service.xml \
432462
dist/iidx/vefx.txt \
433463
| $(zipdir)/
434464
$(V)echo ... $@
@@ -442,6 +472,7 @@ $(zipdir)/iidx-27-to-30.zip: \
442472
build/bin/indep-64/geninput.dll \
443473
build/bin/indep-64/iidxio.dll \
444474
build/bin/indep-64/vefxio.dll \
475+
dist/dwarfstack/64/dwarfstack.dll \
445476
dist/iidx/config.bat \
446477
dist/iidx/gamestart-27.bat \
447478
dist/iidx/gamestart-28.bat \
@@ -451,6 +482,13 @@ $(zipdir)/iidx-27-to-30.zip: \
451482
dist/iidx/iidxhook-28.conf \
452483
dist/iidx/iidxhook-29.conf \
453484
dist/iidx/iidxhook-30.conf \
485+
dist/iidx/launcher-27.xml \
486+
dist/iidx/launcher-28.xml \
487+
dist/iidx/launcher-29.xml \
488+
dist/iidx/launcher-30.xml \
489+
dist/shared/ea3-ident.xml \
490+
dist/shared/ea3-license.xml \
491+
dist/shared/ea3-service.xml \
454492
dist/iidx/vefx.txt \
455493
| $(zipdir)/
456494
$(V)echo ... $@
@@ -519,8 +557,13 @@ $(zipdir)/jb-03.zip: \
519557
build/bin/indep-32/eamio.dll \
520558
build/bin/indep-32/geninput.dll \
521559
build/bin/indep-32/jbio.dll \
560+
dist/dwarfstack/32/dwarfstack.dll \
522561
dist/jb/config.bat \
523562
dist/jb/gamestart-03.bat \
563+
dist/jb/launcher-03.xml \
564+
dist/shared/ea3-ident.xml \
565+
dist/shared/ea3-license.xml \
566+
dist/shared/ea3-service.xml \
524567
| $(zipdir)/
525568
$(V)echo ... $@
526569
$(V)zip -j $@ $^
@@ -532,8 +575,13 @@ $(zipdir)/jb-04.zip: \
532575
build/bin/indep-32/eamio.dll \
533576
build/bin/indep-32/geninput.dll \
534577
build/bin/indep-32/jbio.dll \
578+
dist/dwarfstack/32/dwarfstack.dll \
535579
dist/jb/config.bat \
536580
dist/jb/gamestart-03.bat \
581+
dist/jb/launcher-03.xml \
582+
dist/shared/ea3-ident.xml \
583+
dist/shared/ea3-license.xml \
584+
dist/shared/ea3-service.xml \
537585
| $(zipdir)/
538586
$(V)echo ... $@
539587
$(V)zip -j $@ $^
@@ -545,8 +593,13 @@ $(zipdir)/jb-05-to-07.zip: \
545593
build/bin/indep-32/eamio.dll \
546594
build/bin/indep-32/geninput.dll \
547595
build/bin/indep-32/jbio.dll \
596+
dist/dwarfstack/32/dwarfstack.dll \
548597
dist/jb/config.bat \
549598
dist/jb/gamestart-04.bat \
599+
dist/jb/launcher-04.xml \
600+
dist/shared/ea3-ident.xml \
601+
dist/shared/ea3-license.xml \
602+
dist/shared/ea3-service.xml \
550603
| $(zipdir)/
551604
$(V)echo ... $@
552605
$(V)zip -j $@ $^
@@ -558,8 +611,13 @@ $(zipdir)/jb-08.zip: \
558611
build/bin/indep-32/eamio.dll \
559612
build/bin/indep-32/geninput.dll \
560613
build/bin/indep-32/jbio.dll \
614+
dist/dwarfstack/32/dwarfstack.dll \
561615
dist/jb/config.bat \
562616
dist/jb/gamestart-04.bat \
617+
dist/jb/launcher-04.xml \
618+
dist/shared/ea3-ident.xml \
619+
dist/shared/ea3-license.xml \
620+
dist/shared/ea3-service.xml \
563621
| $(zipdir)/
564622
$(V)echo ... $@
565623
$(V)zip -j $@ $^
@@ -582,8 +640,13 @@ $(zipdir)/sdvx-01-to-04.zip: \
582640
build/bin/indep-32/eamio.dll \
583641
build/bin/indep-32/geninput.dll \
584642
build/bin/indep-32/sdvxio.dll \
643+
dist/dwarfstack/32/dwarfstack.dll \
585644
dist/sdvx/config.bat \
586645
dist/sdvx/gamestart.bat \
646+
dist/sdvx/launcher.xml \
647+
dist/shared/ea3-ident.xml \
648+
dist/shared/ea3-license.xml \
649+
dist/shared/ea3-service.xml \
587650
| $(zipdir)/
588651
$(V)echo ... $@
589652
$(V)zip -j $@ $^
@@ -595,9 +658,14 @@ $(zipdir)/sdvx-05-to-06.zip: \
595658
build/bin/indep-64/eamio.dll \
596659
build/bin/indep-64/geninput.dll \
597660
build/bin/indep-64/sdvxio.dll \
661+
dist/dwarfstack/64/dwarfstack.dll \
598662
dist/sdvx5/config.bat \
599663
dist/sdvx5/gamestart.bat \
600664
dist/sdvx5/sdvxhook2.conf \
665+
dist/sdvx5/launcher.xml \
666+
dist/shared/ea3-ident.xml \
667+
dist/shared/ea3-license.xml \
668+
dist/shared/ea3-service.xml \
601669
| $(zipdir)/
602670
$(V)echo ... $@
603671
$(V)zip -j $@ $^
@@ -609,9 +677,14 @@ $(zipdir)/sdvx-05-cn.zip: \
609677
build/bin/indep-64/eamio.dll \
610678
build/bin/indep-64/geninput.dll \
611679
build/bin/indep-64/sdvxio.dll \
680+
dist/dwarfstack/64/dwarfstack.dll \
612681
dist/sdvx5/config.bat \
613682
dist/sdvx5/gamestart-cn.bat \
614683
dist/sdvx5/sdvxhook2-cn.conf \
684+
dist/sdvx5/launcher-cn.xml \
685+
dist/shared/ea3-ident.xml \
686+
dist/shared/ea3-license.xml \
687+
dist/shared/ea3-service.xml \
615688
| $(zipdir)/
616689
$(V)echo ... $@
617690
$(V)zip -j $@ $^
@@ -685,8 +758,13 @@ $(zipdir)/ddr-12.zip: \
685758
build/bin/indep-32/ddrio-smx.dll \
686759
build/bin/indep-32/eamio.dll \
687760
build/bin/indep-32/geninput.dll \
761+
dist/dwarfstack/32/dwarfstack.dll \
688762
dist/ddr/config.bat \
689763
dist/ddr/gamestart-12.bat \
764+
dist/ddr/launcher-12.xml \
765+
dist/shared/ea3-ident.xml \
766+
dist/shared/ea3-license.xml \
767+
dist/shared/ea3-service.xml \
690768
| $(zipdir)/
691769
$(V)echo ... $@
692770
$(V)zip -j $@ $^
@@ -701,8 +779,13 @@ $(zipdir)/ddr-13.zip: \
701779
build/bin/indep-32/ddrio-smx.dll \
702780
build/bin/indep-32/eamio.dll \
703781
build/bin/indep-32/geninput.dll \
782+
dist/dwarfstack/32/dwarfstack.dll \
704783
dist/ddr/config.bat \
705784
dist/ddr/gamestart-13.bat \
785+
dist/ddr/launcher-13.xml \
786+
dist/shared/ea3-ident.xml \
787+
dist/shared/ea3-license.xml \
788+
dist/shared/ea3-service.xml \
706789
| $(zipdir)/
707790
$(V)echo ... $@
708791
$(V)zip -j $@ $^
@@ -715,12 +798,21 @@ $(zipdir)/ddr-14-to-18.zip: \
715798
build/bin/indep-32/ddrio.dll \
716799
build/bin/indep-32/eamio.dll \
717800
build/bin/indep-32/geninput.dll \
801+
dist/dwarfstack/32/dwarfstack.dll \
718802
dist/ddr/config.bat \
719-
dist/ddr/gamestart-17.bat \
720-
dist/ddr/gamestart-18.bat \
721803
dist/ddr/gamestart-14.bat \
722804
dist/ddr/gamestart-15.bat \
723805
dist/ddr/gamestart-16.bat \
806+
dist/ddr/gamestart-17.bat \
807+
dist/ddr/gamestart-18.bat \
808+
dist/ddr/launcher-14.xml \
809+
dist/ddr/launcher-15.xml \
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 \
724816
| $(zipdir)/
725817
$(V)echo ... $@
726818
$(V)zip -j $@ $^
@@ -733,10 +825,17 @@ $(zipdir)/ddr-16-to-18-x64.zip: \
733825
build/bin/indep-64/ddrio.dll \
734826
build/bin/indep-64/eamio.dll \
735827
build/bin/indep-64/geninput.dll \
828+
dist/dwarfstack/64/dwarfstack.dll \
736829
dist/ddr/config.bat \
737-
dist/ddr/gamestart-17.bat \
738-
dist/ddr/gamestart-18.bat \
739830
dist/ddr/gamestart-16.bat \
831+
dist/ddr/gamestart-17.bat \
832+
dist/ddr/gamestart-18.bat \
833+
dist/ddr/launcher-16.xml \
834+
dist/ddr/launcher-17.xml \
835+
dist/ddr/launcher-18.xml \
836+
dist/shared/ea3-ident.xml \
837+
dist/shared/ea3-license.xml \
838+
dist/shared/ea3-service.xml \
740839
| $(zipdir)/
741840
$(V)echo ... $@
742841
$(V)zip -j $@ $^
@@ -772,9 +871,15 @@ $(zipdir)/bst.zip: \
772871
build/bin/indep-64/config.exe \
773872
build/bin/indep-64/eamio.dll \
774873
build/bin/indep-64/geninput.dll \
874+
dist/dwarfstack/64/dwarfstack.dll \
775875
dist/bst/config.bat \
776876
dist/bst/gamestart1.bat \
777877
dist/bst/gamestart2.bat \
878+
dist/bst/launcher-01.xml \
879+
dist/bst/launcher-02.xml \
880+
dist/shared/ea3-ident.xml \
881+
dist/shared/ea3-license.xml \
882+
dist/shared/ea3-service.xml \
778883
| $(zipdir)/
779884
$(V)echo ... $@
780885
$(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 %*

0 commit comments

Comments
 (0)