Integrating github/staging through commit ab87ed9

Code/Tools/RC/Config/rc/RCJob_Generic_MakeAuxiliaryContent.xml

@@ -3,10 +3,10 @@
         DefaultProperties can be overriden from command line.
     -->
   <DefaultProperties
-      p="pc"
-      game="automatedtesting"
-      src="cache\${game}\${p}"
-      trg="${game}_${p}_paks"
+      platform="pc"
+      project-path="AutomatedTesting"
+      src="${project-path}\Cache\${platform}"
+      trg="${project-path}\user\paks\${platform}"
     />
 
   <Properties
@@ -14,14 +14,14 @@
       levels_pak_types="levels\*.*"
       levels_pak_excludes="*\leveldata\*;*.pak"
 
-      gems_pak_types="gems\*.json;${game}\gems.json;${game}\gem\*.*"
+      gems_pak_types="gems\*.json;gem\*.*"
       gems_pak_excludes=""
       
       shader_pak_types="shaders\*.ext;shaders\*.cfi;shaders\*.cfx"
       shader_pak_excludes=""
 
-      src_game="${src}\${game}"
-      trg_paks="${trg}\${game}"
+      src_game="${src}"
+      trg_paks="${trg}"
     />
 
   <!--
@@ -31,12 +31,9 @@
     <IfNot SkipLevelPaks="1">
         <Job sourceroot="${src_game}\levels" targetroot="${trg_paks}\levels" input="*.pak" copyonly="1"/>
     </IfNot>
-    <Job sourceroot="${src_game}\config" targetroot="${trg_paks}\config" input="game.xml" copyonly="1"/>
-    <Job sourceroot="${src_game}\config" targetroot="${trg_paks}\config" input="editor.xml" copyonly="1"/>
     <Job sourceroot="${src_game}\config" targetroot="${trg_paks}\config" input="*.awslogicalmappings.json" copyonly="1"/>
     <Job sourceroot="${src_game}\config" targetroot="${trg_paks}\config" input="launcher.deployment.json" copyonly="1"/>
     <Job sourceroot="${src}" targetroot="${trg}" input="engine.json" copyonly="1"/>
-    <Job sourceroot="${src}" targetroot="${trg}" input="engineroot.txt" copyonly="1"/>
     <Job sourceroot="${src}" targetroot="${trg}" input="bootstrap.cfg" copyonly="1" recursive="0"/>
     <Job sourceroot="${src}" targetroot="${trg}" input="system_windows_pc.cfg" copyonly="1" recursive="0"/>
   </CopyJob>