Parcourir la source

Fixing an error and simplifying env variables

Signed-off-by: AMZN-Phil <[email protected]>
AMZN-Phil il y a 2 ans
Parent
commit
d534c6a7d1
2 fichiers modifiés avec 1 ajouts et 2 suppressions
  1. 1 1
      python/get_python.sh
  2. 0 1
      scripts/build/Platform/Linux/build_config.json

+ 1 - 1
python/get_python.sh

@@ -28,7 +28,7 @@ install_dependencies () {
     fi
 
     # if we're building a container app, create a package from o3de then install that to remove absolute paths to o3de scripts
-    if [ $O3DE_BUILDING_CONTAINER == 1 ]; then
+    if [ "$O3DE_PACKAGE_TYPE" == "SNAP" ]; then
         pushd $DIR/../scripts/o3de/
         $DIR/python.sh setup.py sdist
         popd

+ 0 - 1
scripts/build/Platform/Linux/build_config.json

@@ -380,7 +380,6 @@
         "CONFIGURATION": "profile",
         "OUTPUT_DIRECTORY": "build/linux",
         "O3DE_PACKAGE_TYPE": "SNAP",
-        "O3DE_BUILDING_CONTAINER": "1",
         "CMAKE_OPTIONS": "-G 'Ninja Multi-Config' -DLY_PARALLEL_LINK_JOBS=4 -DLY_DISABLE_TEST_MODULES=TRUE -DO3DE_ENGINE_NAME=o3de-sdk -DLY_STRIP_DEBUG_SYMBOLS=TRUE",
         "CPACK_OPTIONS": "-D CPACK_UPLOAD_URL=${CPACK_UPLOAD_URL}",
         "CMAKE_TARGET": "all"