瀏覽代碼

Minor fixes before open source publication

Signed-off-by: garrieta <[email protected]>
galibzon 4 年之前
父節點
當前提交
bafacbe822
共有 5 個文件被更改,包括 6 次插入17 次删除
  1. 1 1
      prepare_solution_darwin.sh
  2. 1 1
      prepare_solution_linux.sh
  3. 1 1
      prepare_solution_win.bat
  4. 3 14
      test.and.py
  5. 0 0
      tests/launch_tests.sh

+ 1 - 1
prepare_solution_darwin.sh

@@ -26,7 +26,7 @@ then
 fi
 
 echo "Pulling ANTLR from git..."
-python pull_from_git.py --git-url https://github.com/galibzon/antlr4.git --destination-dir src/external --git-tag o3de-4.7.1
+python3 pull_from_git.py --git-url https://github.com/o3de/antlr4.git --destination-dir src/external --git-tag o3de-4.7.1
 
 $CMAKE -DMAKE_BUILD_TYPE=Release -S "src/external/antlr4/runtime/Cpp/" -B "build/release/external/antlr4/runtime/Cpp/"
 pushd build/release/external/antlr4/runtime/Cpp

+ 1 - 1
prepare_solution_linux.sh

@@ -18,7 +18,7 @@ mkdir build/debug/external
 mkdir build/debug/external/antlr-runtime-cpp
 
 echo "Pulling ANTLR from git..."
-python pull_from_git.py --git-url https://github.com/galibzon/antlr4.git --destination-dir src/external --git-tag o3de-4.7.1
+python3 pull_from_git.py --git-url https://github.com/o3de/antlr4.git --destination-dir src/external --git-tag o3de-4.7.1
 
 CMAKE='cmake'
 

+ 1 - 1
prepare_solution_win.bat

@@ -29,7 +29,7 @@ cd ..\..\..\
 
 REM ----------------------------------
 REM Pulling ANTLR from git
-python pull_from_git.py --git-url https://github.com/galibzon/antlr4.git --destination-dir src/external --git-tag o3de-4.7.1 || goto :error
+python pull_from_git.py --git-url https://github.com/o3de/antlr4.git --destination-dir src/external --git-tag o3de-4.7.1 || goto :error
 
 if not exist "%build_path%" mkdir "%build_path%"
 cd "%build_path%" || goto :error

+ 3 - 14
test.and.py

@@ -60,20 +60,9 @@ missingOptional = 0
 
 # Windows
 if os.name == 'nt':
-    criticalCMake = "../lib/CMake/bin/cmake.exe"
-    if not os.path.isfile(criticalCMake):
-        from shutil import which
-        if which("cmake") is None:
-            print ( fg.RED + style.BRIGHT + "[ X ] Expected CMake 3.15+ (in {} or as command)".format(criticalCMake) + style.RESET_ALL )
-            missingCritical = missingCritical + 1
-
-    criticalBoostD = "../lib/boost_1_70_0/"
-    criticalBoostH = criticalBoostD + "boost/regex/regex_traits.hpp"
-    criticalBoostL = criticalBoostD + "libs/boost_regex-vc141-mt-x64-1_70.dll"
-    if not os.path.isfile(criticalBoostH) or not os.path.isfile(criticalBoostL):
-        print ( fg.RED + style.BRIGHT + "[ X ] Expected Boost 1.70 in {}".format(criticalBoostD) + style.RESET_ALL )
-        print ( fg.RED + style.BRIGHT + "      - All relevant headers required for {}".format(criticalBoostH) + style.RESET_ALL )
-        print ( fg.RED + style.BRIGHT + "      - All Boost-Regex libraries, for example {}".format(criticalBoostL) + style.RESET_ALL )
+    from shutil import which
+    if which("cmake") is None:
+        print ( fg.RED + style.BRIGHT + "[ X ] Expected CMake 3.15+ (in {} or as command)".format(criticalCMake) + style.RESET_ALL )
         missingCritical = missingCritical + 1
 
 try:

+ 0 - 0
tests/launch_tests.sh