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

Modified bat file code to hopefully print values.

Browse source
This commit is contained in:
Joey Payne 2015-11-11 16:40:14 -07:00
commit 4fbeedc787
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
command_line.py
View file

@ -940,7 +940,7 @@ class CommandBase(object):
for i, ex_dir in enumerate(export_dirs):
opt = export_opts[i]
export_dict[opt+'_dir'] = ex_dir
ex_dir_vars += 'set EXPORT_DIRS[{}]={} & '.format(i, ex_dir)
ex_dir_vars += 'set EXPORT_DIRS[{}]={}\n'.format(i, ex_dir)
env_vars = env_contents.format(proj_dir=self.project_dir(),
proj_name=self.project_name(),
@ -948,11 +948,9 @@ class CommandBase(object):
num_dirs=len(export_dirs),
export_dirs=ex_dir_vars,
**export_dict)
batcontents = '{}{}'.format(env_vars.replace('\n',''), contents.replace('\n', ' & '))
if batcontents.endswith(' & '):
batcontents = batcontents[:-3]
batcontents = '{}{}'.format(env_vars, contents)
command = ['cmd', '/c', "'" + batcontents + "'"]
command = ['cmd', '/c', batcontents]
proc = subprocess.Popen(' '.join(command), stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
output, error = proc.communicate()

12
files/env_vars.bat
View file

@ -1 +1,11 @@
set PROJECT_DIR={proj_dir} & set PROJECT_NAME={proj_name} & set EXPORT_DIR={export_dir} & set MAC64_EXPORT_DIR={mac-x64_dir} & set MAC32_EXPORT_DIR={mac-x32_dir} & set WIN64_EXPORT_DIR={win-x64_dir} & set WIN32_EXPORT_DIR={win-x32_dir} & set LINUX64_EXPORT_DIR={linux-x64_dir} & set LINUX32_EXPORT_DIR={linux-x32_dir} & set NUM_DIRS={num_dirs} & {export_dirs}
set "PROJECT_DIR={proj_dir}"
set "PROJECT_NAME={proj_name}"
set "EXPORT_DIR={export_dir}"
set "MAC64_EXPORT_DIR={mac-x64_dir}"
set "MAC32_EXPORT_DIR={mac-x32_dir}"
set "WIN64_EXPORT_DIR={win-x64_dir}"
set "WIN32_EXPORT_DIR={win-x32_dir}"
set "LINUX64_EXPORT_DIR={linux-x64_dir}"
set "LINUX32_EXPORT_DIR={linux-x32_dir}"
set "NUM_DIRS={num_dirs}"
{export_dirs}