Browse Source

Iterated on PR feedback, such as no longer need to add perforce as a dependency, and added missing newlines on EOF.

Signed-off-by: Chris Galvan <[email protected]>
Chris Galvan 3 years ago
parent
commit
688c7a281b

+ 1 - 1
package-system/Qt/build.bat

@@ -87,4 +87,4 @@ exit
 
 :FAILURE
 echo Build failed, see errors above.
-exit 1
+exit 1

+ 1 - 1
package-system/Qt/copy_platform_cmakes.py

@@ -22,7 +22,7 @@ platform_to_pal = {
     "darwin": "Mac"
 }
 
-if not platform_system in platform_to_pal:
+if platform_system not in platform_to_pal:
     print(f"Unknown platform: {platform_system}") 
     sys.exit(1)
 

+ 1 - 1
package-system/Qt/docker/build-linux-docker.bat

@@ -1 +1 @@
-docker build -f %~dp0\linux-build.Dockerfile -t lyeditor/qt-linux-build:5.15 %~dp0
+docker build -f %~dp0\linux-build.Dockerfile -t lyeditor/qt-linux-build:5.15 %~dp0

+ 2 - 5
package-system/Qt/docker/linux-build.Dockerfile

@@ -8,7 +8,7 @@ RUN apt-get -y install git python make g++ clang gperf bison flex libnss3-dev li
 # Developer Tools
 RUN apt-get -y install vim
 
-# LY build dependencies
+# O3DE build dependencies
 RUN apt-get -y install build-essential
 RUN apt-get -y install libgl-dev libglu1-mesa-dev freeglut3-dev mesa-common-dev libsdl2-2.0-0 libsdl2-dev
 RUN apt-get -y install clang-6.0 libc++-dev libc++abi-dev uuid-dev libz-dev libncurses5-dev libcurl4-openssl-dev libjpeg-dev libjbig-dev libpython3.7
@@ -17,9 +17,6 @@ RUN update-alternatives --install /usr/bin/cc cc /usr/bin/clang 100
 RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 100
 
 RUN apt-get -y install wget
-RUN wget -qO - https://package.perforce.com/perforce.pubkey | apt-key add -
-RUN echo "deb http://package.perforce.com/apt/ubuntu bionic release" > /etc/apt/sources.list.d/perforce.list
 RUN apt-get update
-RUN apt-get -y install helix-p4d
 
-VOLUME /data
+VOLUME /data