Skip to content

Commit

Permalink
Rename targets for clarity.
Browse files Browse the repository at this point in the history
  • Loading branch information
gibbed committed Jun 18, 2020
1 parent 8dd84ff commit 285cb1e
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 27 deletions.
12 changes: 6 additions & 6 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ build:

after_build:
- '"%VCVARS_PATH%" x86'
- nmake /nologo /f Makefile.mak TARGET=USv100 bin\USv100\debug.elf.patch
- nmake /nologo /f Makefile.mak TARGET=JPv104 bin\JPv104\debug.elf.patch
- nmake /nologo /f Makefile.mak TARGET=Asiav104 bin\Asiav104\debug.elf.patch
- nmake /nologo /f Makefile.mak TARGET=US_v100 bin\US_v100\debug.elf.patch
- nmake /nologo /f Makefile.mak TARGET=JP_v104 bin\JP_v104\debug.elf.patch
- nmake /nologo /f Makefile.mak TARGET=Asia_v104 bin\Asia_v104\debug.elf.patch
- set TZ=GMT
- git log . > git-log.txt
- 7z a -r -tzip -mx=9 -x!*/LICENSE.txt DemonsSoulsDebug_USv100.zip ./bin/USv100/debug.elf.patch tools/bin/*.exe tools/bin/*.dll ./deploy/USv100/build.bat ./LICENSE.txt ./deploy/README.txt ./git-log.txt
- 7z a -r -tzip -mx=9 -x!*/LICENSE.txt DemonsSoulsDebug_JPv104.zip ./bin/JPv104/debug.elf.patch tools/bin/*.exe tools/bin/*.dll ./deploy/JPv104/build.bat ./LICENSE.txt ./deploy/README.txt ./git-log.txt
- 7z a -r -tzip -mx=9 -x!*/LICENSE.txt DemonsSoulsDebug_Asiav104.zip ./bin/Asiav104/debug.elf.patch tools/bin/*.exe tools/bin/*.dll ./deploy/Asiav104/build.bat ./LICENSE.txt ./deploy/README.txt ./git-log.txt
- 7z a -r -tzip -mx=9 -x!*/LICENSE.txt DemonsSoulsDebug_US_v100.zip ./bin/US_v100/debug.elf.patch tools/bin/*.exe tools/bin/*.dll ./deploy/US_v100/build.bat ./LICENSE.txt ./deploy/README.txt ./git-log.txt
- 7z a -r -tzip -mx=9 -x!*/LICENSE.txt DemonsSoulsDebug_JP_v104.zip ./bin/JP_v104/debug.elf.patch tools/bin/*.exe tools/bin/*.dll ./deploy/JP_v104/build.bat ./LICENSE.txt ./deploy/README.txt ./git-log.txt
- 7z a -r -tzip -mx=9 -x!*/LICENSE.txt DemonsSoulsDebug_Asia_v104.zip ./bin/Asia_v104/debug.elf.patch tools/bin/*.exe tools/bin/*.dll ./deploy/Asia_v104/build.bat ./LICENSE.txt ./deploy/README.txt ./git-log.txt
artifacts:
- path: '*.zip'
8 changes: 4 additions & 4 deletions Makefile.mak
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@
!ENDIF

!IF "$(TARGET)"==""
TARGET=USv100
TARGET=US_v100
!MESSAGE No target specified. Defaulting to USv100.
!ENDIF

!IF "$(TARGET)"=="USv100"
!IF "$(TARGET)"=="US_v100"
TARGET_ID=0
TARGET_DIR=BLUS30443v100
CODE_HASH=83681f6110d33442329073b72b8dc88a2f677172
CAVE_ADDRESS=0x01842d48
CAVE_SIZE=53944
CODE_SIZE=0x01832d48
!ELSE IF "$(TARGET)" == "JPv104"
!ELSE IF "$(TARGET)" == "JP_v104"
TARGET_ID=1
TARGET_DIR=BCJS30022v104
CODE_HASH=68544b29e92609ccb2710f485ae7708e4cb35df1
CODE_SIZE=0x01834248
CAVE_ADDRESS=0x01844248
CAVE_SIZE=48568
!ELSE IF "$(TARGET)" == "Asiav104"
!ELSE IF "$(TARGET)" == "Asia_v104"
TARGET_ID=2
TARGET_DIR=BCAS20071v104
CODE_HASH=9403fe1678487def5d7f3c380b4c4fb275035378
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ Like what I've done? **[Consider supporting me on Patreon](http://patreon.com/gi
### Building From Source
1. Open `tools\Tools.bin` and build the entire solution with the Debug configuration.
1. Place a decrypted copy of Demon's Souls `eboot.bin` in the appropriate `bin` directory.
* For example, US 1.00 you would put it at `bin\USv100\boot.elf`.
* For example, US 1.00 you would put it at `bin\US_v100\boot.elf`.
1. Run the build `.bat` for your release. If all goes well `debug.elf` will be created in the appropriate `bin` directory.
* For example, US 1.00 would be `build_USv100.bat`.
* For example, US 1.00 would be `build_US_v100.bat`.
1. Run it on a real PS3 or otherwise.
* Replace the original `EBOOT.BIN` with `debug.elf` in the game directory.
* *Will probably require turning it into a SELF for running it on a real PS3.*
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 5 additions & 5 deletions build_Asiav104.bat → build_Asia_v104.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ if not exist "tools\bin\PatchElf.exe" (
goto no_patchelf
)

if not exist "bin\Asiav104\boot.elf" (
if not exist "bin\Asia_v104\boot.elf" (
goto no_boot
)

)

if not defined APPVEYOR (
nmake /nologo /f Makefile.mak TARGET=Asiav104
nmake /nologo /f Makefile.mak TARGET=Asia_v104
) else (
nmake /nologo /f Makefile.mak TARGET=Asiav104 bin\Asiav104\debug.elf
nmake /nologo /f Makefile.mak TARGET=Asia_v104 bin\Asia_v104\debug.elf
)

exit /B 0
Expand All @@ -40,7 +40,7 @@ exit /B 0
exit /B 1

:no_boot
echo Could not find bin\Asiav104\boot.elf.
echo Please copy the decrypted EBOOT to bin\Asiav104\boot.elf.
echo Could not find bin\Asia_v104\boot.elf.
echo Please copy the decrypted EBOOT to bin\Asia_v104\boot.elf.
pause
exit /B 1
10 changes: 5 additions & 5 deletions build_JPv104.bat → build_JP_v104.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ if not exist "tools\bin\PatchElf.exe" (
goto no_patchelf
)

if not exist "bin\JPv104\boot.elf" (
if not exist "bin\JP_v104\boot.elf" (
goto no_boot
)

)

if not defined APPVEYOR (
nmake /nologo /f Makefile.mak TARGET=JPv104
nmake /nologo /f Makefile.mak TARGET=JP_v104
) else (
nmake /nologo /f Makefile.mak TARGET=JPv104 bin\JPv104\debug.elf
nmake /nologo /f Makefile.mak TARGET=JP_v104 bin\JP_v104\debug.elf
)

exit /B 0
Expand All @@ -40,7 +40,7 @@ exit /B 0
exit /B 1

:no_boot
echo Could not find bin\JPv104\boot.elf.
echo Please copy the decrypted EBOOT to bin\JPv104\boot.elf.
echo Could not find bin\JP_v104\boot.elf.
echo Please copy the decrypted EBOOT to bin\JP_v104\boot.elf.
pause
exit /B 1
10 changes: 5 additions & 5 deletions build_USv100.bat → build_US_v100.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ if not exist "tools\bin\PatchElf.exe" (
goto no_patchelf
)

if not exist "bin\USv100\boot.elf" (
if not exist "bin\US_v100\boot.elf" (
goto no_boot
)

)

if not defined APPVEYOR (
nmake /nologo /f Makefile.mak TARGET=USv100
nmake /nologo /f Makefile.mak TARGET=US_v100
) else (
nmake /nologo /f Makefile.mak TARGET=USv100 bin\USv100\debug.elf
nmake /nologo /f Makefile.mak TARGET=US_v100 bin\US_v100\debug.elf
)

exit /B 0
Expand All @@ -40,7 +40,7 @@ exit /B 0
exit /B 1

:no_boot
echo Could not find bin\USv100\boot.elf.
echo Please copy the decrypted EBOOT to bin\USv100\boot.elf.
echo Could not find bin\US_v100\boot.elf.
echo Please copy the decrypted EBOOT to bin\US_v100\boot.elf.
pause
exit /B 1
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 285cb1e

Please sign in to comment.