jyapayne/Electrify
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Added more vars to the env scripts.

Browse source
This commit is contained in:
Joey Payne 2015-11-11 17:25:47 -07:00
commit c9bb9dd5ff
3 changed files with 36 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

30
command_line.py
View file

@ -899,13 +899,27 @@ class CommandBase(object):
command = None command = None
bat_file = None bat_file = None
export_dict = {'mac-x64_dir': '',
'mac-x32_dir': '',
'windows-x64_dir': '',
'windows-x32_dir': '',
'linux-x64_dir': '',
'linux-x32_dir': ''}
if ext == '.py': if ext == '.py':
env_file = get_file('files/env_vars.py') env_file = get_file('files/env_vars.py')
env_contents = codecs.open(env_file, 'r', encoding='utf-8').read() env_contents = codecs.open(env_file, 'r', encoding='utf-8').read()
for i, ex_dir in enumerate(export_dirs):
opt = export_opts[i]
export_dict[opt+'_dir'] = ex_dir
env_vars = env_contents.format(proj_dir=self.project_dir(), env_vars = env_contents.format(proj_dir=self.project_dir(),
proj_name=self.project_name(), proj_name=self.project_name(),
export_dir=export_dir, export_dir=export_dir,
export_dirs=str(export_dirs)) export_dirs=str(export_dirs),
num_dirs=len(export_dirs),
**export_dict)
pycontents = '{}\n{}'.format(env_vars, contents) pycontents = '{}\n{}'.format(env_vars, contents)
command = ['python', '-c', pycontents] command = ['python', '-c', pycontents]
@ -916,13 +930,19 @@ class CommandBase(object):
env_contents = codecs.open(env_file, 'r', encoding='utf-8').read() env_contents = codecs.open(env_file, 'r', encoding='utf-8').read()
ex_dir_vars = '' ex_dir_vars = ''
for i, ex_dir in enumerate(export_dirs):
opt = export_opts[i]
export_dict[opt+'_dir'] = ex_dir
for ex_dir in export_dirs: for ex_dir in export_dirs:
ex_dir_vars += "'{}' ".format(ex_dir) ex_dir_vars += "'{}' ".format(ex_dir)
env_vars = env_contents.format(proj_dir=self.project_dir(), env_vars = env_contents.format(proj_dir=self.project_dir(),
proj_name=self.project_name(), proj_name=self.project_name(),
export_dir=export_dir, export_dir=export_dir,
export_dirs=ex_dir_vars) num_dirs=len(export_dirs),
export_dirs=ex_dir_vars,
**export_dict)
shcontents = '{}\n{}'.format(env_vars, contents) shcontents = '{}\n{}'.format(env_vars, contents)
command = ['bash', '-c', shcontents] command = ['bash', '-c', shcontents]
@ -931,12 +951,6 @@ class CommandBase(object):
env_file = get_file('files/env_vars.bat') env_file = get_file('files/env_vars.bat')
env_contents = codecs.open(env_file, 'r', encoding='utf-8').read() env_contents = codecs.open(env_file, 'r', encoding='utf-8').read()
ex_dir_vars = '' ex_dir_vars = ''
export_dict = {'mac-x64_dir': '',
'mac-x32_dir': '',
'windows-x64_dir': '',
'windows-x32_dir': '',
'linux-x64_dir': '',
'linux-x32_dir': ''}
for i, ex_dir in enumerate(export_dirs): for i, ex_dir in enumerate(export_dirs):
opt = export_opts[i] opt = export_opts[i]

7
files/env_vars.bash
View file

@ -2,3 +2,10 @@ PROJECT_DIR='{proj_dir}'
PROJECT_NAME='{proj_name}' PROJECT_NAME='{proj_name}'
EXPORT_DIR='{export_dir}' EXPORT_DIR='{export_dir}'
EXPORT_DIRS=({export_dirs}) EXPORT_DIRS=({export_dirs})
MAC64_EXPORT_DIR='{mac-x64_dir}'
MAC32_EXPORT_DIR='{mac-x32_dir}'
WIN64_EXPORT_DIR='{windows-x64_dir}'
WIN32_EXPORT_DIR='{windows-x32_dir}'
LINUX64_EXPORT_DIR='{linux-x64_dir}'
LINUX32_EXPORT_DIR='{linux-x32_dir}'
NUM_DIRS='{num_dirs}'

7
files/env_vars.py
View file

@ -2,3 +2,10 @@ PROJECT_DIR='{proj_dir}'
PROJECT_NAME='{proj_name}' PROJECT_NAME='{proj_name}'
EXPORT_DIR='{export_dir}' EXPORT_DIR='{export_dir}'
EXPORT_DIRS={export_dirs} EXPORT_DIRS={export_dirs}
MAC64_EXPORT_DIR='{mac-x64_dir}'
MAC32_EXPORT_DIR='{mac-x32_dir}'
WIN64_EXPORT_DIR='{windows-x64_dir}'
WIN32_EXPORT_DIR='{windows-x32_dir}'
LINUX64_EXPORT_DIR='{linux-x64_dir}'
LINUX32_EXPORT_DIR='{linux-x32_dir}'
NUM_DIRS='{num_dirs}'