maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use the new KodeStudio

Browse source
This commit is contained in:
luboslenco 2018-09-21 21:32:45 +02:00
parent 9c9a289aea
commit 19fb599207
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
blender/arm/props_ui.py
View file

@ -605,9 +605,9 @@ class ArmoryKodeStudioButton(bpy.types.Operator):
if not arm.utils.check_saved(self):
return {"CANCELLED"}
if bpy.data.worlds['Arm'].arm_play_runtime != 'Browser' or not os.path.exists(arm.utils.get_fp() + "/khafile.js"):
print('Generating HTML5 project for Kode Studio')
make.build('html5')
if not os.path.exists(arm.utils.get_fp() + "/khafile.js"):
print('Generating Krom project for Kode Studio')
make.build('krom')
arm.utils.kode_studio()
return{'FINISHED'}

26
blender/arm/utils.py
View file

@ -519,32 +519,32 @@ def export_bone_data(bobject):
def kode_studio_mklink_win(sdk_path):
# Fight long-path issues on Windows
if not os.path.exists(sdk_path + '/win32/resources/app/extensions/kha/Kha'):
source = sdk_path + '/win32/resources/app/extensions/kha/Kha'
if not os.path.exists(sdk_path + '/win32/resources/app/kodeExtensions/kha/Kha'):
source = sdk_path + '/win32/resources/app/kodeExtensions/kha/Kha'
target = sdk_path + '/Kha'
subprocess.check_call('mklink /J "%s" "%s"' % (source, target), shell=True)
if not os.path.exists(sdk_path + '/win32/resources/app/extensions/krom/Krom'):
source = sdk_path + '/win32/resources/app/extensions/krom/Krom'
if not os.path.exists(sdk_path + '/win32/resources/app/kodeExtensions/krom/Krom'):
source = sdk_path + '/win32/resources/app/kodeExtensions/krom/Krom'
target = sdk_path + '/Krom'
subprocess.check_call('mklink /J "%s" "%s"' % (source, target), shell=True)
def kode_studio_mklink_linux(sdk_path):
if not os.path.exists(sdk_path + '/linux64/resources/app/extensions/kha/Kha'):
source = sdk_path + '/linux64/resources/app/extensions/kha/Kha'
if not os.path.exists(sdk_path + '/linux64/resources/app/kodeExtensions/kha/Kha'):
source = sdk_path + '/linux64/resources/app/kodeExtensions/kha/Kha'
target = sdk_path + '/Kha'
subprocess.check_call('ln -s "%s" "%s"' % (target, source), shell=True)
if not os.path.exists(sdk_path + '/linux64/resources/app/extensions/krom/Krom'):
source = sdk_path + '/linux64/resources/app/extensions/krom/Krom'
if not os.path.exists(sdk_path + '/linux64/resources/app/kodeExtensions/krom/Krom'):
source = sdk_path + '/linux64/resources/app/kodeExtensions/krom/Krom'
target = sdk_path + '/Krom'
subprocess.check_call('ln -s "%s" "%s"' % (target, source), shell=True)
def kode_studio_mklink_mac(sdk_path):
if not os.path.exists(sdk_path + '/Kode Studio.app/Contents/Resources/app/extensions/kha/Kha'):
source = sdk_path + '/Kode Studio.app/Contents/Resources/app/extensions/kha/Kha'
if not os.path.exists(sdk_path + '/KodeStudio.app/Contents/Resources/app/kodeExtensions/kha/Kha'):
source = sdk_path + '/KodeStudio.app/Contents/Resources/app/kodeExtensions/kha/Kha'
target = sdk_path + '/Kha'
subprocess.check_call('ln -fs "%s" "%s"' % (target, source), shell=True)
if not os.path.exists(sdk_path + '/Kode Studio.app/Contents/Resources/app/extensions/krom/Krom'):
source = sdk_path + '/Kode Studio.app/Contents/Resources/app/extensions/krom/Krom'
if not os.path.exists(sdk_path + '/KodeStudio.app/Contents/Resources/app/kodeExtensions/krom/Krom'):
source = sdk_path + '/KodeStudio.app/Contents/Resources/app/kodeExtensions/krom/Krom'
target = sdk_path + '/Krom'
subprocess.check_call('ln -fs "%s" "%s"' % (target, source), shell=True)
@ -552,7 +552,7 @@ def get_kode_path():
if get_os() == 'win':
return get_sdk_path() + '/win32/Kode Studio.exe'
elif get_os() == 'mac':
return get_sdk_path() + '/Kode Studio.app/Contents/MacOS/Electron'
return get_sdk_path() + '/KodeStudio.app/Contents/MacOS/Electron'
else:
return get_sdk_path() + '/linux64/kodestudio'