Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved build dirs out of indra directory. installed.xml and prebuilts are now per-build-target. Added support for v3 prebuilt package layout.

Browse Source
This commit is contained in:
Shyotl
2014-12-03 22:36:42 -06:00
parent 7ddef751ef
commit 958031dbaf
44 changed files with 502 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/develop.py
View File

@@ -115,7 +115,7 @@ class PlatformSetup(object):
This can return more than one directory, e.g. if doing a
32-bit viewer and server build on Linux.'''
return ['build-' + self.platform()]
return ['../build-' + self.platform()]
def cmake_commandline(self, src_dir, build_dir, opts, simple):
'''Return the command line to run cmake with.'''
@@ -277,7 +277,7 @@ class LinuxSetup(UnixSetup):
def build_dirs(self):
platform_build = '%s-%s' % (self.platform(), self.build_type.lower())
return ['viewer-' + platform_build]
return ['../viewer-' + platform_build]
def cmake_commandline(self, src_dir, build_dir, opts, simple):
args = dict(
@@ -502,9 +502,9 @@ class WindowsSetup(PlatformSetup):
def build_dirs(self):
if self.word_size == 64:
return ['build-' + self.generator + '-Win64']
return ['../build-' + self.generator + '-Win64']
else:
return ['build-' + self.generator]
return ['../build-' + self.generator]
def cmake_commandline(self, src_dir, build_dir, opts, simple):
args = dict(