Skip to content

Commit 5c17087

Browse files
authored
delete ANT check on setup.py (#19042)
* update submodule * delete ANT check on setup.py
1 parent e1d34fa commit 5c17087

File tree

2 files changed

+5
-31
lines changed

2 files changed

+5
-31
lines changed

setup.py

+4-30
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
https://github.com/cocos2d/cocos2d-console
3131
* NDK_ROOT: used to build android native codes
3232
* ANDROID_SDK_ROOT: used to generate applicatoin on Android through commands
33-
* ANT_ROOT: used to generate applicatoin on Android through commands
3433
* COCOS_X_ROOT: path where cocos2d-x is installed
3534
* COCOS_TEMPLATES_ROOT: path where cocos2d-x's templates are installed
3635
@@ -61,7 +60,6 @@
6160
COCOS_TEMPLATES_ROOT = 'COCOS_TEMPLATES_ROOT'
6261
NDK_ROOT = 'NDK_ROOT'
6362
ANDROID_SDK_ROOT = 'ANDROID_SDK_ROOT'
64-
ANT_ROOT = 'ANT_ROOT'
6563

6664

6765
def _check_python_version():
@@ -341,8 +339,6 @@ def _check_valid(self, var_name, value):
341339
ret = self._is_ndk_root_valid(value)
342340
elif var_name == ANDROID_SDK_ROOT:
343341
ret = self._is_android_sdk_root_valid(value)
344-
elif var_name == ANT_ROOT:
345-
ret = self._is_ant_root_valid(value)
346342
else:
347343
ret = False
348344

@@ -380,19 +376,6 @@ def _is_android_sdk_root_valid(self, android_sdk_root):
380376
else:
381377
return False
382378

383-
def _is_ant_root_valid(self, ant_root):
384-
385-
ant_path = ''
386-
if self._isWindows():
387-
ant_path = os.path.join(ant_root, 'ant.bat')
388-
else:
389-
ant_path = os.path.join(ant_root, 'ant')
390-
391-
if os.path.isfile(ant_path):
392-
return True
393-
else:
394-
return False
395-
396379
def remove_dir_from_win_path(self, remove_dir):
397380
import _winreg
398381
try:
@@ -591,9 +574,6 @@ def _force_update_env(self, var_name, value):
591574
ret = self._force_update_unix_env(var_name, value)
592575
return ret
593576

594-
def _get_ant_path(self):
595-
return self._get_sdkpath_for_cmd("ant", False)
596-
597577
def _get_androidsdk_path(self):
598578
return self._get_sdkpath_for_cmd("android")
599579

@@ -620,9 +600,7 @@ def _get_sdkpath_for_cmd(self, cmd, has_bin_folder=True):
620600
return ret
621601

622602
def _find_value_from_sys(self, var_name):
623-
if var_name == ANT_ROOT:
624-
return self._get_ant_path()
625-
elif var_name == NDK_ROOT:
603+
if var_name == NDK_ROOT:
626604
return self._get_ndkbuild_path()
627605
elif var_name == ANDROID_SDK_ROOT:
628606
return self._get_androidsdk_path()
@@ -680,7 +658,7 @@ def set_variable(self, var_name, value):
680658
else:
681659
return SetEnvVar.RESULT_DO_NOTHING
682660

683-
def set_environment_variables(self, ndk_root, android_sdk_root, ant_root, quiet):
661+
def set_environment_variables(self, ndk_root, android_sdk_root, quiet):
684662

685663
print('\nSetting up cocos2d-x...')
686664

@@ -699,7 +677,6 @@ def set_environment_variables(self, ndk_root, android_sdk_root, ant_root, quiet)
699677
if(quiet) :
700678
ndk_ret = self.set_variable(NDK_ROOT, ndk_root)
701679
sdk_ret = self.set_variable(ANDROID_SDK_ROOT, android_sdk_root)
702-
ant_ret = self.set_variable(ANT_ROOT, ant_root)
703680

704681
# tip the backup file
705682
if (self.backup_file is not None) and (os.path.exists(self.backup_file)):
@@ -723,16 +700,13 @@ def set_environment_variables(self, ndk_root, android_sdk_root, ant_root, quiet)
723700
parser.add_option('-a', '--androidsdkroot',
724701
dest='android_sdk_root', help='directory of android sdk root')
725702
parser.add_option(
726-
'-t', '--antroot', dest='ant_root', help='directory that contains ant/ant.bat')
727-
728-
parser.add_option(
729-
'-q', '--quiet', dest='quiet',action="store_false", default = True, help='setup without setting NDK,SDK,ANT')
703+
'-q', '--quiet', dest='quiet',action="store_false", default = True, help='setup without setting NDK,SDK')
730704
opts, args = parser.parse_args()
731705

732706
# set environment variables
733707
env = SetEnvVar()
734708
env.set_environment_variables(
735-
opts.ndk_root, opts.android_sdk_root, opts.ant_root, opts.quiet)
709+
opts.ndk_root, opts.android_sdk_root, opts.quiet)
736710

737711
if env._isWindows():
738712
import ctypes

0 commit comments

Comments
 (0)