birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4184 from aws-lumberyard-dev/LYN6729_AutogenWrongOutputFolder

Browse Source 
LYN6729: Fix AzAutoGen to Output to Proper Path
This commit is contained in:
kberg-amzn
2021-09-17 13:49:50 -07:00
committed by GitHub
parent dc050d4acd 4dab267dc9
commit df9b0714a4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/AzAutoGen.py
+2 -2
View File
@@ -71,10 +71,10 @@ def SearchPaths(filename, paths=[]):
return None return None
def ComputeOutputPath(inputFiles, projectDir, outputDir): def ComputeOutputPath(inputFiles, projectDir, outputDir):
commonInputPath = os.path.commonprefix(inputFiles) # If we've globbed many source files, this finds the common prefix commonInputPath = os.path.commonpath(inputFiles) # If we've globbed many source files, this finds the common path
if os.path.isfile(commonInputPath): # If the commonInputPath resolves to an actual file, slice off the filename if os.path.isfile(commonInputPath): # If the commonInputPath resolves to an actual file, slice off the filename
commonInputPath = os.path.dirname(commonInputPath) commonInputPath = os.path.dirname(commonInputPath)
commonPath = os.path.commonprefix([commonInputPath, projectDir]) # Finds the common path between the data source files and our project directory (//depot/dev/Code/Framework/AzCore/) commonPath = os.path.commonpath([commonInputPath, projectDir]) # Finds the common path between the data source files and our project directory (//depot/dev/Code/Framework/AzCore/)
inputRelativePath = os.path.relpath(commonInputPath, commonPath) # Computes the relative path for the project source directory (Code/Framework/AzCore/AutoGen/) inputRelativePath = os.path.relpath(commonInputPath, commonPath) # Computes the relative path for the project source directory (Code/Framework/AzCore/AutoGen/)
return os.path.join(outputDir, inputRelativePath) # Returns a suitable output directory (//depot/dev/Generated/Code/Framework/AzCore/AutoGen/) return os.path.join(outputDir, inputRelativePath) # Returns a suitable output directory (//depot/dev/Generated/Code/Framework/AzCore/AutoGen/)