Skip to content

Commit fbadcc9

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 ca91e4c commit fbadcc9

70 files changed

Lines changed: 3069 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: 105 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 ... $@
@@ -337,6 +341,7 @@ $(zipdir)/iidx-18-cn.zip: \
337341
build/bin/indep-32/iidxio.dll \
338342
build/bin/indep-32/vefxio.dll \
339343
build/bin/indep-32/inject.exe \
344+
dist/dwarfstack/32/dwarfstack.dll \
340345
dist/iidx/config.bat \
341346
dist/iidx/gamestart-18-cn.bat \
342347
dist/iidx/iidxhook-18-cn.conf \
@@ -353,9 +358,14 @@ $(zipdir)/iidx-19.zip: \
353358
build/bin/indep-32/geninput.dll \
354359
build/bin/indep-32/iidxio.dll \
355360
build/bin/indep-32/vefxio.dll \
361+
dist/dwarfstack/32/dwarfstack.dll \
356362
dist/iidx/config.bat \
357363
dist/iidx/gamestart-19.bat \
358364
dist/iidx/iidxhook-19.conf \
365+
dist/iidx/launcher-19.xml \
366+
dist/shared/ea3-ident.xml \
367+
dist/shared/ea3-license.xml \
368+
dist/shared/ea3-service.xml \
359369
dist/iidx/vefx.txt \
360370
| $(zipdir)/
361371
$(V)echo ... $@
@@ -369,9 +379,14 @@ $(zipdir)/iidx-20.zip: \
369379
build/bin/indep-32/geninput.dll \
370380
build/bin/indep-32/iidxio.dll \
371381
build/bin/indep-32/vefxio.dll \
382+
dist/dwarfstack/32/dwarfstack.dll \
372383
dist/iidx/config.bat \
373384
dist/iidx/gamestart-20.bat \
374385
dist/iidx/iidxhook-20.conf \
386+
dist/iidx/launcher-20.xml \
387+
dist/shared/ea3-ident.xml \
388+
dist/shared/ea3-license.xml \
389+
dist/shared/ea3-service.xml \
375390
dist/iidx/vefx.txt \
376391
| $(zipdir)/
377392
$(V)echo ... $@
@@ -384,6 +399,7 @@ $(zipdir)/iidx-20-cn.zip: \
384399
build/bin/indep-32/iidxio.dll \
385400
build/bin/indep-32/vefxio.dll \
386401
build/bin/indep-32/inject.exe \
402+
dist/dwarfstack/32/dwarfstack.dll \
387403
dist/iidx/config.bat \
388404
dist/iidx/gamestart-20-cn.bat \
389405
dist/iidx/iidxhook-20-cn.conf \
@@ -400,6 +416,7 @@ $(zipdir)/iidx-21-to-24.zip: \
400416
build/bin/indep-32/geninput.dll \
401417
build/bin/indep-32/iidxio.dll \
402418
build/bin/indep-32/vefxio.dll \
419+
dist/dwarfstack/32/dwarfstack.dll \
403420
dist/iidx/config.bat \
404421
dist/iidx/gamestart-21.bat \
405422
dist/iidx/gamestart-22.bat \
@@ -409,6 +426,13 @@ $(zipdir)/iidx-21-to-24.zip: \
409426
dist/iidx/iidxhook-22.conf \
410427
dist/iidx/iidxhook-23.conf \
411428
dist/iidx/iidxhook-24.conf \
429+
dist/iidx/launcher-21.xml \
430+
dist/iidx/launcher-22.xml \
431+
dist/iidx/launcher-23.xml \
432+
dist/iidx/launcher-24.xml \
433+
dist/shared/ea3-ident.xml \
434+
dist/shared/ea3-license.xml \
435+
dist/shared/ea3-service.xml \
412436
dist/iidx/vefx.txt \
413437
| $(zipdir)/
414438
$(V)echo ... $@
@@ -422,11 +446,17 @@ $(zipdir)/iidx-25-to-26.zip: \
422446
build/bin/indep-64/geninput.dll \
423447
build/bin/indep-64/iidxio.dll \
424448
build/bin/indep-64/vefxio.dll \
449+
dist/dwarfstack/64/dwarfstack.dll \
425450
dist/iidx/config.bat \
426451
dist/iidx/gamestart-25.bat \
427452
dist/iidx/gamestart-26.bat \
428453
dist/iidx/iidxhook-25.conf \
429454
dist/iidx/iidxhook-26.conf \
455+
dist/iidx/launcher-25.xml \
456+
dist/iidx/launcher-26.xml \
457+
dist/shared/ea3-ident.xml \
458+
dist/shared/ea3-license.xml \
459+
dist/shared/ea3-service.xml \
430460
dist/iidx/vefx.txt \
431461
| $(zipdir)/
432462
$(V)echo ... $@
@@ -440,6 +470,7 @@ $(zipdir)/iidx-27-to-30.zip: \
440470
build/bin/indep-64/geninput.dll \
441471
build/bin/indep-64/iidxio.dll \
442472
build/bin/indep-64/vefxio.dll \
473+
dist/dwarfstack/64/dwarfstack.dll \
443474
dist/iidx/config.bat \
444475
dist/iidx/gamestart-27.bat \
445476
dist/iidx/gamestart-28.bat \
@@ -449,6 +480,13 @@ $(zipdir)/iidx-27-to-30.zip: \
449480
dist/iidx/iidxhook-28.conf \
450481
dist/iidx/iidxhook-29.conf \
451482
dist/iidx/iidxhook-30.conf \
483+
dist/iidx/launcher-27.xml \
484+
dist/iidx/launcher-28.xml \
485+
dist/iidx/launcher-29.xml \
486+
dist/iidx/launcher-30.xml \
487+
dist/shared/ea3-ident.xml \
488+
dist/shared/ea3-license.xml \
489+
dist/shared/ea3-service.xml \
452490
dist/iidx/vefx.txt \
453491
| $(zipdir)/
454492
$(V)echo ... $@
@@ -515,8 +553,13 @@ $(zipdir)/jb-03.zip: \
515553
build/bin/indep-32/eamio.dll \
516554
build/bin/indep-32/geninput.dll \
517555
build/bin/indep-32/jbio.dll \
556+
dist/dwarfstack/32/dwarfstack.dll \
518557
dist/jb/config.bat \
519558
dist/jb/gamestart-03.bat \
559+
dist/jb/launcher-03.xml \
560+
dist/shared/ea3-ident.xml \
561+
dist/shared/ea3-license.xml \
562+
dist/shared/ea3-service.xml \
520563
| $(zipdir)/
521564
$(V)echo ... $@
522565
$(V)zip -j $@ $^
@@ -528,8 +571,13 @@ $(zipdir)/jb-04.zip: \
528571
build/bin/indep-32/eamio.dll \
529572
build/bin/indep-32/geninput.dll \
530573
build/bin/indep-32/jbio.dll \
574+
dist/dwarfstack/32/dwarfstack.dll \
531575
dist/jb/config.bat \
532576
dist/jb/gamestart-03.bat \
577+
dist/jb/launcher-03.xml \
578+
dist/shared/ea3-ident.xml \
579+
dist/shared/ea3-license.xml \
580+
dist/shared/ea3-service.xml \
533581
| $(zipdir)/
534582
$(V)echo ... $@
535583
$(V)zip -j $@ $^
@@ -541,8 +589,13 @@ $(zipdir)/jb-05-to-07.zip: \
541589
build/bin/indep-32/eamio.dll \
542590
build/bin/indep-32/geninput.dll \
543591
build/bin/indep-32/jbio.dll \
592+
dist/dwarfstack/32/dwarfstack.dll \
544593
dist/jb/config.bat \
545594
dist/jb/gamestart-04.bat \
595+
dist/jb/launcher-04.xml \
596+
dist/shared/ea3-ident.xml \
597+
dist/shared/ea3-license.xml \
598+
dist/shared/ea3-service.xml \
546599
| $(zipdir)/
547600
$(V)echo ... $@
548601
$(V)zip -j $@ $^
@@ -554,8 +607,13 @@ $(zipdir)/jb-08.zip: \
554607
build/bin/indep-32/eamio.dll \
555608
build/bin/indep-32/geninput.dll \
556609
build/bin/indep-32/jbio.dll \
610+
dist/dwarfstack/32/dwarfstack.dll \
557611
dist/jb/config.bat \
558612
dist/jb/gamestart-04.bat \
613+
dist/jb/launcher-04.xml \
614+
dist/shared/ea3-ident.xml \
615+
dist/shared/ea3-license.xml \
616+
dist/shared/ea3-service.xml \
559617
| $(zipdir)/
560618
$(V)echo ... $@
561619
$(V)zip -j $@ $^
@@ -578,8 +636,13 @@ $(zipdir)/sdvx-01-to-04.zip: \
578636
build/bin/indep-32/eamio.dll \
579637
build/bin/indep-32/geninput.dll \
580638
build/bin/indep-32/sdvxio.dll \
639+
dist/dwarfstack/32/dwarfstack.dll \
581640
dist/sdvx/config.bat \
582641
dist/sdvx/gamestart.bat \
642+
dist/sdvx/launcher.xml \
643+
dist/shared/ea3-ident.xml \
644+
dist/shared/ea3-license.xml \
645+
dist/shared/ea3-service.xml \
583646
| $(zipdir)/
584647
$(V)echo ... $@
585648
$(V)zip -j $@ $^
@@ -591,9 +654,14 @@ $(zipdir)/sdvx-05-to-06.zip: \
591654
build/bin/indep-64/eamio.dll \
592655
build/bin/indep-64/geninput.dll \
593656
build/bin/indep-64/sdvxio.dll \
657+
dist/dwarfstack/64/dwarfstack.dll \
594658
dist/sdvx5/config.bat \
595659
dist/sdvx5/gamestart.bat \
596660
dist/sdvx5/sdvxhook2.conf \
661+
dist/sdvx5/launcher.xml \
662+
dist/shared/ea3-ident.xml \
663+
dist/shared/ea3-license.xml \
664+
dist/shared/ea3-service.xml \
597665
| $(zipdir)/
598666
$(V)echo ... $@
599667
$(V)zip -j $@ $^
@@ -605,9 +673,14 @@ $(zipdir)/sdvx-05-cn.zip: \
605673
build/bin/indep-64/eamio.dll \
606674
build/bin/indep-64/geninput.dll \
607675
build/bin/indep-64/sdvxio.dll \
676+
dist/dwarfstack/64/dwarfstack.dll \
608677
dist/sdvx5/config.bat \
609678
dist/sdvx5/gamestart-cn.bat \
610679
dist/sdvx5/sdvxhook2-cn.conf \
680+
dist/sdvx5/launcher-cn.xml \
681+
dist/shared/ea3-ident.xml \
682+
dist/shared/ea3-license.xml \
683+
dist/shared/ea3-service.xml \
611684
| $(zipdir)/
612685
$(V)echo ... $@
613686
$(V)zip -j $@ $^
@@ -680,8 +753,13 @@ $(zipdir)/ddr-12.zip: \
680753
build/bin/indep-32/ddrio-smx.dll \
681754
build/bin/indep-32/eamio.dll \
682755
build/bin/indep-32/geninput.dll \
756+
dist/dwarfstack/32/dwarfstack.dll \
683757
dist/ddr/config.bat \
684758
dist/ddr/gamestart-12.bat \
759+
dist/ddr/launcher-12.xml \
760+
dist/shared/ea3-ident.xml \
761+
dist/shared/ea3-license.xml \
762+
dist/shared/ea3-service.xml \
685763
| $(zipdir)/
686764
$(V)echo ... $@
687765
$(V)zip -j $@ $^
@@ -696,8 +774,13 @@ $(zipdir)/ddr-13.zip: \
696774
build/bin/indep-32/ddrio-smx.dll \
697775
build/bin/indep-32/eamio.dll \
698776
build/bin/indep-32/geninput.dll \
777+
dist/dwarfstack/32/dwarfstack.dll \
699778
dist/ddr/config.bat \
700779
dist/ddr/gamestart-13.bat \
780+
dist/ddr/launcher-13.xml \
781+
dist/shared/ea3-ident.xml \
782+
dist/shared/ea3-license.xml \
783+
dist/shared/ea3-service.xml \
701784
| $(zipdir)/
702785
$(V)echo ... $@
703786
$(V)zip -j $@ $^
@@ -710,14 +793,21 @@ $(zipdir)/ddr-14-to-18.zip: \
710793
build/bin/indep-32/ddrio.dll \
711794
build/bin/indep-32/eamio.dll \
712795
build/bin/indep-32/geninput.dll \
796+
dist/dwarfstack/32/dwarfstack.dll \
713797
dist/ddr/config.bat \
714-
dist/ddr/gamestart-17.bat \
715-
dist/ddr/gamestart-18.bat \
716798
dist/ddr/gamestart-14.bat \
717799
dist/ddr/gamestart-15.bat \
718800
dist/ddr/gamestart-16.bat \
719801
dist/ddr/gamestart-17.bat \
720802
dist/ddr/gamestart-18.bat \
803+
dist/ddr/launcher-14.xml \
804+
dist/ddr/launcher-15.xml \
805+
dist/ddr/launcher-16.xml \
806+
dist/ddr/launcher-17.xml \
807+
dist/ddr/launcher-18.xml \
808+
dist/shared/ea3-ident.xml \
809+
dist/shared/ea3-license.xml \
810+
dist/shared/ea3-service.xml \
721811
| $(zipdir)/
722812
$(V)echo ... $@
723813
$(V)zip -j $@ $^
@@ -730,12 +820,17 @@ $(zipdir)/ddr-16-to-18-x64.zip: \
730820
build/bin/indep-64/ddrio.dll \
731821
build/bin/indep-64/eamio.dll \
732822
build/bin/indep-64/geninput.dll \
823+
dist/dwarfstack/64/dwarfstack.dll \
733824
dist/ddr/config.bat \
734-
dist/ddr/gamestart-17.bat \
735-
dist/ddr/gamestart-18.bat \
736825
dist/ddr/gamestart-16.bat \
737826
dist/ddr/gamestart-17.bat \
738827
dist/ddr/gamestart-18.bat \
828+
dist/ddr/launcher-16.xml \
829+
dist/ddr/launcher-17.xml \
830+
dist/ddr/launcher-18.xml \
831+
dist/shared/ea3-ident.xml \
832+
dist/shared/ea3-license.xml \
833+
dist/shared/ea3-service.xml \
739834
| $(zipdir)/
740835
$(V)echo ... $@
741836
$(V)zip -j $@ $^
@@ -771,9 +866,15 @@ $(zipdir)/bst.zip: \
771866
build/bin/indep-64/config.exe \
772867
build/bin/indep-64/eamio.dll \
773868
build/bin/indep-64/geninput.dll \
869+
dist/dwarfstack/64/dwarfstack.dll \
774870
dist/bst/config.bat \
775871
dist/bst/gamestart1.bat \
776872
dist/bst/gamestart2.bat \
873+
dist/bst/launcher-01.xml \
874+
dist/bst/launcher-02.xml \
875+
dist/shared/ea3-ident.xml \
876+
dist/shared/ea3-license.xml \
877+
dist/shared/ea3-service.xml \
777878
| $(zipdir)/
778879
$(V)echo ... $@
779880
$(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)