Merge branch 'BS-46'

BuildSample/DroidApp/DroidApp.csproj

@@ -17,6 +17,7 @@
     <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
     <AssemblyName>DroidApp</AssemblyName>
     <TargetFrameworkVersion>v4.1</TargetFrameworkVersion>
+    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -52,6 +53,7 @@
   <ItemGroup>
     <None Include="Resources\AboutResources.txt" />
     <None Include="Assets\AboutAssets.txt" />
+    <None Include="Properties\AndroidManifest.xml" />
   </ItemGroup>
   <ItemGroup>
     <AndroidResource Include="Resources\layout\Main.axml" />

BuildSample/DroidApp/Properties/AndroidManifest.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="DroidApp.DroidApp">
+	<uses-sdk />
+	<application android:label="DroidApp">
+	</application>
+</manifest>

scripts/TouchinBuild/steps.txt

@@ -0,0 +1 @@
+sh echo 'This is default steps file'

scripts/TouchinBuild/taskRunner.py

@@ -26,17 +26,18 @@ scriptDir = os.path.dirname(scriptFilePath)
 
 
 class TaskRunner:
-	def __init__(self, settingsProvider, fileContentProvider, buildConfigProvider, linePreprocessor):
+	def __init__(self, settingsProvider, fileContentProvider, buildConfigProvider, linePreprocessor, defaults):
 		assert settingsProvider is not None
 		assert fileContentProvider is not None
 		assert buildConfigProvider is not None
 		assert linePreprocessor is not None
+		assert defaults is not None
 
 		self.settingsProvider = settingsProvider
 		self.fileContentProvider = fileContentProvider
 		self.configsProvider = buildConfigProvider
 		self.linePreprocessor = linePreprocessor
-
+		self.defaults = defaults
 
 		macroProcessor = MacroProcessor()
 		self.valueProvider = ValueProvider()
@@ -68,7 +69,7 @@ class TaskRunner:
 		stepsRunner.run(content)
 
 	def getStepsContent(self, config):
-		pathToSteps = config['steps']
+		pathToSteps = config.get('steps', self.defaults['steps'])
 
 		content = self.fileContentProvider.fetchContent(pathToSteps)
 		content = self.textPreprocessor.processText(content, self.textPreprocessor)
@@ -77,6 +78,12 @@ class TaskRunner:
 
 if __name__ == "__main__":
 
+	defaults = {
+		'settings': 'settings.txt',
+		'builder_path': scriptDir,
+		'steps': os.path.join(scriptDir, 'steps.txt')
+	}
+
 	parser = argparse.ArgumentParser()
 	parser.add_argument('--settings', required=False)
 	allArgs = parser.parse_known_args()
@@ -92,7 +99,7 @@ if __name__ == "__main__":
 	linePreprocessor.addProcessor(lineStripper)
 
 	# TODO:  перенести в корень комапановки
-	settingsPath = knownArgs.settings or 'settings.txt'
+	settingsPath = knownArgs.settings or defaults['settings']
 	fromFileSettingsProvider = FromFileSettingsProvider(settingsPath, linePreprocessor)
 	overrideWithCmdSetProvider = CmdArgsOverriderSettingsProvider(fromFileSettingsProvider, overrideArgs, linePreprocessor)
 
@@ -100,10 +107,10 @@ if __name__ == "__main__":
 
 	buildConfigProvider = BuildConfigProvider()
 	predefineBuildConfigProvider = PredefinedMacrosBuildConfigProvider(buildConfigProvider)
-	predefineBuildConfigProvider.addPredefineMacro('builder_path', scriptDir)
+	predefineBuildConfigProvider.addPredefineMacro('builder_path', defaults['builder_path'])
 
 	resolvedBuildConfigProvider = ResolvedBuildConfigProvider(predefineBuildConfigProvider)
 
 
-	runner = TaskRunner(overrideWithCmdSetProvider, fContentProvider, resolvedBuildConfigProvider, linePreprocessor)
+	runner = TaskRunner(overrideWithCmdSetProvider, fContentProvider, resolvedBuildConfigProvider, linePreprocessor, defaults)
 	runner.run()

scripts/settings.txt

@@ -6,7 +6,7 @@ project_name = CoolApp
 
 # ios platform settings
 ios.sln_config = Release|iPhone
-ios.steps = 'scripts/IosSteps.txt'
+#ios.steps = 'scripts/IosSteps.txt'
 ios.setup_steps = 'IosSetupSteps.txt'
 ios.assembly_name = 'CoolApp'