Merge pull request #850 from defold/xbox-support

Initial XBox support

Author: JCash

server/build-docker.sh

@@ -11,6 +11,7 @@ DOCKER_REGISTRY=$REGISTRY_PREFIX/extender-public-registry
 DOCKER_PS4_PRIVATE_REGISTRY=$REGISTRY_PREFIX/extender-ps4-private-registry
 DOCKER_PS5_PRIVATE_REGISTRY=$REGISTRY_PREFIX/extender-ps5-private-registry
 DOCKER_NINTENDO_PRIVATE_REGISTRY=$REGISTRY_PREFIX/extender-nintendo-private-registry
+DOCKER_XBOX_PRIVATE_REGISTRY=$REGISTRY_PREFIX/extender-xbox-private-registry
 
 MULTI_ARCH="linux/amd64"
 [[ -z "$NO_ARM64" ]] && MULTI_ARCH+=",linux/arm64"
@@ -45,6 +46,9 @@ for request in $REQUESTED; do
         windows)
             INSTALL="wine winsdk-2022"
             ;;
+        xbox)
+            INSTALL="wine winsdk-2022 xbox-251001"
+            ;;
         linux)
             INSTALL="linux"
             ;;
@@ -64,6 +68,9 @@ for request in $REQUESTED; do
         nssdk-*)
             DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_NINTENDO_PRIVATE_REGISTRY/extender-${install}-env:latest -f $SCRIPT_DIR/docker/Dockerfile.$(echo $install | sed 's,-,.,')-env $SCRIPT_DIR/docker
             ;;
+        xbox-*)
+            DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_XBOX_PRIVATE_REGISTRY/extender-${install}-env:latest -f $SCRIPT_DIR/docker/Dockerfile.$(echo $install | sed 's,-,.,')-env $SCRIPT_DIR/docker
+            ;;
         wine)
             DM_PACKAGES_URL=$DM_PACKAGES_URL docker buildx build --secret id=DM_PACKAGES_URL --platform linux/amd64 -t $DOCKER_REGISTRY/extender-wine-env:1.5.0 -t $DOCKER_REGISTRY/extender-wine-env:latest -f $SCRIPT_DIR/docker/Dockerfile.wine-env $SCRIPT_DIR/docker
             ;;

server/configs/application-local-dev-app.yml

@@ -35,5 +35,8 @@ extender:
             winsdk-2022:
                 url: http://winsdk-2022:9000
                 instanceId: winsdk-2022
+            xbox-251001:
+                url: http://xbox-251001:9000
+                instanceId: xbox-251001
 
 logging.pattern.level: "%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-}]"

server/configs/application-test-app.yml

@@ -31,5 +31,8 @@ extender:
             winsdk-2022:
                 url: http://winsdk-2022:9000
                 instanceId: winsdk-2022
+            xbox-251001:
+                url: http://xbox-251001:9000
+                instanceId: xbox-251001
 
 logging.pattern.level: "%5p [${spring.application.name:},%X{traceId:-},%X{spanId:-}]"

server/docker/Dockerfile.xbox.251001-env

@@ -0,0 +1,17 @@
+FROM europe-west1-docker.pkg.dev/extender-426409/extender-public-registry/extender-winsdk-2022-env:latest
+
+ENV XBOX_SDK_VERSION=251001
+ENV XBOX_SDK=${PLATFORMSDK_DIR}/xbox-sdk-${XBOX_SDK_VERSION}
+
+ENV XBOX_SDK_FILENAME=xbox-gdk-${XBOX_SDK_VERSION}.tar.gz
+
+ENV GameDKCoreLatest=${XBOX_SDK}
+ENV GameDKLatest=${XBOX_SDK}
+ENV GameDKXboxLatest=${XBOX_SDK}
+ENV GRDKLatest=${XBOX_SDK}/GRDK
+ENV GXDKLatest=${XBOX_SDK}/GXDK
+
+RUN --mount=type=secret,id=DM_PACKAGES_URL,required=true \
+  echo "XBox ${XBOX_SDK_FILENAME}" && \
+  mkdir -p ${XBOX_SDK} && \
+  wget -q -O - $(cat /run/secrets/DM_PACKAGES_URL)/${XBOX_SDK_FILENAME} | tar xz -C ${XBOX_SDK} --strip-components=1

server/docker/docker-compose.yml

@@ -20,6 +20,7 @@ services:
       - linux
       - windows
       - consoles
+      - xbox
       - nintendo
       - playstation
     networks:
@@ -173,6 +174,21 @@ services:
       default:
         aliases:
           - winsdk-2022
+  xbox_251001-dev:
+    image: europe-west1-docker.pkg.dev/extender-426409/extender-xbox-private-registry/extender-xbox-251001-env:latest
+    extends:
+      file: common-services.yml
+      service: remote_builder
+    environment:
+      - INSTANCE_ID=xbox-251001-local
+    profiles:
+      - all
+      - consoles
+      - xbox
+    networks:
+      default:
+        aliases:
+          - xbox-251001
 
 # services for integration testing
   frontend-integration-test: