diff --git a/.gitea/workflows/orbis.yaml b/.gitea/workflows/orbis.yaml index 17ccc275..bb338ea7 100644 --- a/.gitea/workflows/orbis.yaml +++ b/.gitea/workflows/orbis.yaml @@ -7,6 +7,12 @@ on: description: 'Configuration for the build (e.g. Debug, Release).' required: true default: 'Release' + type: choice + options: + - Debug + - Release + - ContentPackage + - ReleaseForArt jobs: build: @@ -14,27 +20,32 @@ jobs: strategy: matrix: - platform: [ORBIS] + platform: [Orbis] steps: - name: Checkout Repository uses: https://github.com/actions/checkout@v4 + with: + fetch-depth: 1 + lfs: false - name: Build Cafeberry run: | + $platform = if ("${{ matrix.platform }}" -eq "Orbis") { "ORBIS" } + & "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" MinecraftConsoles.sln ` /p:Configuration=${{ inputs.configuration }} ` - /p:Platform=${{ matrix.platform }} ` + "/p:Platform=$platform" ` /m - - name: Zip Build (Consoles) - if: matrix.platform != 'Windows64' - run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/* "-x!*.ipdb" "-x!*.iobj" + - name: Zip Build + run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/PS4_GAME/* "-x!*.ipdb" "-x!*.iobj" - name: Stage artifacts run: | New-Item -ItemType Directory -Force -Path staging - Copy-Item LCE${{ matrix.platform }}.zip staging/ + Copy-Item LCE${{ matrix.platform }}.zip staging/ + Copy-Item "./ORBIS_${{ inputs.configuration }}/Minecraft.Client.pkg" staging/LCEOrbis.pkg - name: Upload artifacts uses: https://github.com/actions/upload-artifact@v3 diff --git a/.gitea/workflows/ps3.yaml b/.gitea/workflows/ps3.yaml index 307a607f..d908f44c 100644 --- a/.gitea/workflows/ps3.yaml +++ b/.gitea/workflows/ps3.yaml @@ -7,6 +7,12 @@ on: description: 'Configuration for the build (e.g. Debug, Release).' required: true default: 'Release' + type: choice + options: + - Debug + - Release + - ContentPackage + - ReleaseForArt jobs: build: @@ -19,6 +25,9 @@ jobs: steps: - name: Checkout Repository uses: https://github.com/actions/checkout@v4 + with: + fetch-depth: 1 + lfs: false - name: Build Cafeberry run: | @@ -27,8 +36,7 @@ jobs: /p:Platform=${{ matrix.platform }} ` /m - - name: Zip Build (Consoles) - if: matrix.platform != 'Windows64' + - name: Zip Build run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/* "-x!*.ipdb" "-x!*.iobj" - name: Stage artifacts diff --git a/.gitea/workflows/psvita.yaml b/.gitea/workflows/psvita.yaml index e70bc569..dc2c1132 100644 --- a/.gitea/workflows/psvita.yaml +++ b/.gitea/workflows/psvita.yaml @@ -7,6 +7,12 @@ on: description: 'Configuration for the build (e.g. Debug, Release).' required: true default: 'Release' + type: choice + options: + - Debug + - Release + - ContentPackage + - ReleaseForArt jobs: build: @@ -19,6 +25,9 @@ jobs: steps: - name: Checkout Repository uses: https://github.com/actions/checkout@v4 + with: + fetch-depth: 1 + lfs: false - name: Build Cafeberry run: | @@ -27,14 +36,14 @@ jobs: /p:Platform=${{ matrix.platform }} ` /m - - name: Zip Build (Consoles) - if: matrix.platform != 'Windows64' - run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/* "-x!*.ipdb" "-x!*.iobj" + - name: Zip Build + run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ inputs.configuration }}/PSVITA_GAME/* - name: Stage artifacts run: | New-Item -ItemType Directory -Force -Path staging - Copy-Item LCE${{ matrix.platform }}.zip staging/ + Copy-Item LCE${{ matrix.platform }}.zip staging/ + Copy-Item "./PSVita_${{ inputs.configuration }}/Minecraft.Client.vpk" staging/LCEPSVita.vpk - name: Upload artifacts uses: https://github.com/actions/upload-artifact@v3 diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 341d3bbb..30df8b6c 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -24,41 +24,58 @@ jobs: } build: + needs: validate runs-on: windows-2022 strategy: matrix: configuration: [Release] - platform: [PS3, Windows64] #[PS3, PSVita, Xbox 360, ORBIS, Windows64] + platform: [PS3, Windows64, Orbis] #[PS3, PSVita, Xbox360, ORBIS, Windows64] steps: - name: Checkout Repository uses: https://github.com/actions/checkout@v4 + with: + fetch-depth: 1 + lfs: false - name: Build Cafeberry run: | + $platform = if ("${{ matrix.platform }}" -eq "Xbox360") { "Xbox 360" } elseif ("${{ matrix.platform }}" -eq "Orbis") { "ORBIS" } else { "${{ matrix.platform }}" } + & "C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" MinecraftConsoles.sln ` /p:Configuration=${{ matrix.configuration }} ` - /p:Platform=${{ matrix.platform }} ` + "/p:Platform=$platform" ` /m - - name: Zip Build (Consoles) - if: matrix.platform != 'Windows64' - run: 7z a -r LCE${{ matrix.platform }}.zip ./${{ matrix.platform }}_${{ matrix.configuration }}/* "-x!*.ipdb" "-x!*.iobj" - - - name: Zip Build (Windows64) - if: matrix.platform == 'Windows64' - run: 7z a -r LCE${{ matrix.platform }}.zip ./x64/${{ matrix.configuration }}/* "-x!*.ipdb" "-x!*.iobj" + - name: Zip Build + run: | + if ("${{ matrix.platform }}" -eq "Windows64") { + 7z a -r "LCEWindows64.zip" "./x64/${{ matrix.configuration }}/*" "-x!*.pdb" "-x!*.pch" "-x!*.ilk" + } elseif ("${{ matrix.platform }}" -eq "Orbis") { + 7z a -r "LCEOrbis.zip" "./ORBIS_${{ matrix.configuration }}/PS4_GAME/*" + } elseif ("${{ matrix.platform }}" -eq "PSVita") { + 7z a -r "LCEPSVita.zip" "./PSVita_${{ matrix.configuration }}/PSVITA_GAME/*" + } elseif ("${{ matrix.platform }}" -eq "PS3") { + 7z a -r "LCEPS3.zip" "./PS3_${{ matrix.configuration }}/PS3_GAME/*" + } elseif ("${{ matrix.platform }}" -eq "Xbox360") { + 7z a -r "LCEXbox360.zip" "./X360_${{ matrix.configuration }}/*" "-x!*.pdb" "-x!*.pch" "-x!*.xdb" + } else { + 7z a -r "LCE${{ matrix.platform }}.zip" "./${{ matrix.platform }}/${{ matrix.configuration }}/*" "-x!*.ipdb" "-x!*.iobj" "-x!*.pdb" "-x!*.pch" "-x!*.ilk" + } - name: Stage artifacts run: | New-Item -ItemType Directory -Force -Path staging - Copy-Item LCE${{ matrix.platform }}.zip staging/ + Copy-Item "LCE${{ matrix.platform }}.zip" staging/ - - name: Stage exe - if: matrix.platform == 'Windows64' - run: | - Copy-Item ./x64/${{ matrix.configuration }}/Minecraft.Client.exe staging/ + if ("${{ matrix.platform }}" -eq "Windows64") { + Copy-Item "./x64/${{ matrix.configuration }}/Minecraft.Client.exe" staging/ + } elseif ("${{ matrix.platform }}" -eq "PSVita") { + Copy-Item "./PSVita_${{ matrix.configuration }}/Minecraft.Client.vpk" staging/LCEPSVita.vpk + } elseif ("${{ matrix.platform }}" -eq "Orbis") { + Copy-Item "./ORBIS_${{ matrix.configuration }}/Minecraft.Client.pkg" staging/LCEOrbis.pkg + } - name: Upload artifacts uses: https://github.com/actions/upload-artifact@v3 @@ -88,9 +105,14 @@ jobs: } catch { $body = $fallback } + } else { + $body = $fallback } - "description<$(OutDir)default$(TargetExt) $(OutDir)default.xex $(ProjectDir)\Xbox\Sentient\Include;$(IncludePath) + $(SolutionDir)X360_$(Configuration)\ + X360_$(Configuration)\ false $(OutDir)default$(TargetExt) $(OutDir)default.xex $(ProjectDir)\Xbox\Sentient\Include;$(IncludePath) + $(SolutionDir)X360_$(Configuration)\ + X360_$(Configuration)\ false $(OutDir)default$(TargetExt) $(OutDir)default.xex $(ProjectDir)\Xbox\Sentient\Include;$(IncludePath) + $(SolutionDir)X360_$(Configuration)\ + X360_$(Configuration)\ false $(OutDir)default$(TargetExt) $(OutDir)default.xex $(ProjectDir)\Xbox\Sentient\Include;$(IncludePath) + $(SolutionDir)X360_$(Configuration)\ + X360_$(Configuration)\ false @@ -705,6 +713,9 @@ Run Xbox postbuild script + + true + @@ -2044,7 +2055,7 @@ xcopy /q /y /i /s /e $(ProjectDir)Durango\CU $(LayoutDir)Image\Loose\CUtrue Level2 Orbis\Iggy\include;$(ProjectDir);%(AdditionalIncludeDirectories) - SPLIT_SAVES;_LARGE_WORLDS;_EXTENDED_ACHIEVEMENTS;DEBUG_MENUS_ENABLED + SPLIT_SAVES;_LARGE_WORLDS;_EXTENDED_ACHIEVEMENTS;_DEBUG_MENUS_ENABLED ..\Minecraft.World\ORBIS_Release\Minecraft.World.a;Orbis\4JLibs\libs\4j_Render.a;Orbis\4JLibs\libs\4j_Input_r.a;Orbis\4JLibs\libs\4J_Storage_r.a;Orbis\4JLibs\libs\4J_Profile_r.a;Orbis\Iggy\lib\libiggy_orbis.a;Orbis\Miles\lib\mssorbis.a;Orbis\Miles\lib\binkaorbis.a;Common\Network\Sony\sceRemoteStorage\ps4\lib\sceRemoteStorage.a;-lSceGnmDriver_stub_weak;-lSceGnmx;-lSceGnm;-lSceGpuAddress;-lSceCes;-lSceVideoOut_stub_weak;-lScePad_stub_weak;-lScePngDec_stub_weak;-lScePngEnc_stub_weak;-lSceFios2_stub_weak;-lSceUlt_stub_weak;-lSceShaderBinary;-lSceUserService_stub_weak;-lSceSysmodule_stub_weak;-lSceImeDialog_stub_weak;-lScePosix_stub_weak;-lSceAudioOut_stub_weak;-lSceSaveData_stub_weak;-lSceRtc_stub_weak;-lSceSystemService_stub_weak;-lSceNetCtl_stub_weak;-lSceNpCommon_stub_weak;-lSceNpManager_stub_weak;-lSceNpToolkit;-lSceNpToolkitUtils;-lSceNpWebApi_stub_weak;-lSceNpAuth_stub_weak;-lSceNpTrophy_stub_weak;-lSceInvitationDialog_stub_weak;-lSceGameCustomDataDialog_stub_weak;-lSceNpCommerce_stub_weak;-lSceNet_stub_weak;-lSceHttp_stub_weak;-lSceSsl_stub_weak;-lSceNpMatching2_stub_weak;-lSceNpTus_stub_weak;-lSceNpUtility_stub_weak;-lSceNpScore_stub_weak;-lSceCommonDialog_stub_weak;-lSceNpSns_stub_weak;-lSceNpSnsFacebookDialog_stub_weak;-lSceRudp_stub_weak;-lSceAppContent_stub_weak;-lSceVoice_stub_weak;-lSceAudioIn_stub_weak;-lSceRemoteplay_stub_weak;-lSceSaveDataDialog_stub_weak;-lSceErrorDialog_stub_weak;-lSceMsgDialog_stub_weak;-lSceGameLiveStreaming_stub_weak;%(AdditionalDependencies) diff --git a/MinecraftConsoles.sln b/MinecraftConsoles.sln index 5cb42ba9..876d806f 100644 --- a/MinecraftConsoles.sln +++ b/MinecraftConsoles.sln @@ -101,6 +101,7 @@ Global {F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|Windows64.ActiveCfg = Release|x64 {F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|Windows64.Build.0 = Release|x64 {F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 + {F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.Release|Xbox 360.Build.0 = Release|Xbox 360 {F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ReleaseForArt|Durango.ActiveCfg = ReleaseForArt|x64 {F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ReleaseForArt|ORBIS.ActiveCfg = ReleaseForArt|ORBIS {F046C3CE-9749-4823-B32B-D9CC10B1A2C8}.ReleaseForArt|ORBIS.Build.0 = ReleaseForArt|ORBIS @@ -166,6 +167,7 @@ Global {1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|Windows64.Build.0 = Release|x64 {1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|Windows64.Deploy.0 = Release|x64 {1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 + {1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.Release|Xbox 360.Build.0 = Release|Xbox 360 {1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ReleaseForArt|Durango.ActiveCfg = ReleaseForArt|x64 {1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ReleaseForArt|ORBIS.ActiveCfg = ReleaseForArt|ORBIS {1B9A8C38-DD48-448C-AA24-E1A35E0089A3}.ReleaseForArt|ORBIS.Build.0 = ReleaseForArt|ORBIS