Merge branch 'BS-26-recover'

scripts/MANIFEST

@@ -1,75 +1,77 @@
 # file GENERATED by distutils, do NOT edit
 README.txt
 setup.py
-CommandBuilders/CleanBuildCommandBuilder.py
+TouchinBuild/__init__.py
-CommandBuilders/CopyCommandBuilder.py
+TouchinBuild/taskRunner.py
-CommandBuilders/CreateBackupCommandBuilder.py
+TouchinBuild/CommandBuilders/CleanBuildCommandBuilder.py
-CommandBuilders/DeleteBackupCommandBuilder.py
+TouchinBuild/CommandBuilders/CopyCommandBuilder.py
-CommandBuilders/InstallProfileCommandBuilder.py
+TouchinBuild/CommandBuilders/CreateBackupCommandBuilder.py
-CommandBuilders/MakeDirsCommandBuilder.py
+TouchinBuild/CommandBuilders/DeleteBackupCommandBuilder.py
-CommandBuilders/PatchCsprojCommandBuilder.py
+TouchinBuild/CommandBuilders/InstallProfileCommandBuilder.py
-CommandBuilders/PatchInfoplistCommandBuilder.py
+TouchinBuild/CommandBuilders/MakeDirsCommandBuilder.py
-CommandBuilders/RemoveProjectCommandBuilder.py
+TouchinBuild/CommandBuilders/PatchCsprojCommandBuilder.py
-CommandBuilders/RestoreBackupCommandBuilder.py
+TouchinBuild/CommandBuilders/PatchInfoplistCommandBuilder.py
-CommandBuilders/ShCommandBuilder.py
+TouchinBuild/CommandBuilders/RemoveProjectCommandBuilder.py
-CommandBuilders/TestflightCommandBuilder.py
+TouchinBuild/CommandBuilders/RestoreBackupCommandBuilder.py
-CommandBuilders/__init__.py
+TouchinBuild/CommandBuilders/ShCommandBuilder.py
-Core/FileContentProvider.py
+TouchinBuild/CommandBuilders/TestflightCommandBuilder.py
-Core/StepsRunner.py
+TouchinBuild/CommandBuilders/__init__.py
-Core/__init__.py
+TouchinBuild/Core/FileContentProvider.py
-Core/LineConveyor/CommentRemover.py
+TouchinBuild/Core/StepsRunner.py
-Core/LineConveyor/MacroResolver.py
+TouchinBuild/Core/__init__.py
-Core/LineConveyor/Stripper.py
+TouchinBuild/Core/LineConveyor/CommentRemover.py
-Core/LineConveyor/TextConveyorPreprocessor.py
+TouchinBuild/Core/LineConveyor/MacroResolver.py
-Core/LineConveyor/TextInclude.py
+TouchinBuild/Core/LineConveyor/Stripper.py
-Core/LineConveyor/__init__.py
+TouchinBuild/Core/LineConveyor/TextConveyorPreprocessor.py
-commands/CopyCommand.py
+TouchinBuild/Core/LineConveyor/TextInclude.py
-commands/CreateBackupCommand.py
+TouchinBuild/Core/LineConveyor/__init__.py
-commands/DeleteBackupCommand.py
+TouchinBuild/commands/CopyCommand.py
-commands/MakeDirsCommand.py
+TouchinBuild/commands/CreateBackupCommand.py
-commands/PatchCsprojCommand.py
+TouchinBuild/commands/DeleteBackupCommand.py
-commands/PatchInfoPlistCommand.py
+TouchinBuild/commands/MakeDirsCommand.py
-commands/RemoveProjectCommand.py
+TouchinBuild/commands/PatchCsprojCommand.py
-commands/RestoreBackupCommand.py
+TouchinBuild/commands/PatchInfoPlistCommand.py
-commands/ShCommand.py
+TouchinBuild/commands/RemoveProjectCommand.py
-commands/TestflightCommand.py
+TouchinBuild/commands/RestoreBackupCommand.py
-commands/ValueProvider.py
+TouchinBuild/commands/ShCommand.py
-commands/__init__.py
+TouchinBuild/commands/TestflightCommand.py
-commands/CleanBuildCommands/BuildCommand.py
+TouchinBuild/commands/ValueProvider.py
-commands/CleanBuildCommands/CleanBuildCommandBase.py
+TouchinBuild/commands/__init__.py
-commands/CleanBuildCommands/CleanCommand.py
+TouchinBuild/commands/CleanBuildCommands/BuildCommand.py
-commands/CleanBuildCommands/__init__.py
+TouchinBuild/commands/CleanBuildCommands/CleanBuildCommandBase.py
-parser/CleanBuildParser.py
+TouchinBuild/commands/CleanBuildCommands/CleanCommand.py
-parser/InstallProfileParser.py
+TouchinBuild/commands/CleanBuildCommands/__init__.py
-parser/LineParser.py
+TouchinBuild/parsers/CleanBuildParser.py
-parser/MakeDirsParser.py
+TouchinBuild/parsers/InstallProfileParser.py
-parser/ShParser.py
+TouchinBuild/parsers/LineParser.py
-parser/TestflightParser.py
+TouchinBuild/parsers/MakeDirsParser.py
-parser/__init__.py
+TouchinBuild/parsers/ShParser.py
-parser/BackupParser/CreateBackupArguments.py
+TouchinBuild/parsers/TestflightParser.py
-parser/BackupParser/CreateBackupParser.py
+TouchinBuild/parsers/__init__.py
-parser/BackupParser/DeleteBackupParser.py
+TouchinBuild/parsers/CopyParser/CopyArguments.py
-parser/BackupParser/RestoreBackupParser.py
+TouchinBuild/parsers/CopyParser/CopyLineParser.py
-parser/BackupParser/__init__.py
+TouchinBuild/parsers/CopyParser/__init__.py
-parser/CopyParser/CopyArguments.py
+TouchinBuild/parsers/InsideParser/InsideRemoveParser.py
-parser/CopyParser/CopyLineParser.py
+TouchinBuild/parsers/InsideParser/InsideSetParser.py
-parser/CopyParser/__init__.py
+TouchinBuild/parsers/InsideParser/__init__.py
-parser/InsideParser/InsideRemoveParser.py
+TouchinBuild/parsers/ParserBackup/CreateBackupArguments.py
-parser/InsideParser/InsideSetParser.py
+TouchinBuild/parsers/ParserBackup/CreateBackupParser.py
-parser/InsideParser/__init__.py
+TouchinBuild/parsers/ParserBackup/DeleteBackupParser.py
-parser/SettingsParser/PathParser.py
+TouchinBuild/parsers/ParserBackup/RestoreBackupParser.py
-parser/SettingsParser/SettingsLineParser.py
+TouchinBuild/parsers/ParserBackup/__init__.py
-parser/SettingsParser/SettingsMerger.py
+TouchinBuild/parsers/SettingsParser/PathParser.py
-parser/SettingsParser/SettingsParser.py
+TouchinBuild/parsers/SettingsParser/SettingsLineParser.py
-parser/SettingsParser/__init__.py
+TouchinBuild/parsers/SettingsParser/SettingsMerger.py
-utils/BuildConfigProvider.py
+TouchinBuild/parsers/SettingsParser/SettingsParser.py
-utils/CsprojPatcher.py
+TouchinBuild/parsers/SettingsParser/__init__.py
-utils/IncludeProcessor.py
+TouchinBuild/utils/BuildConfigProvider.py
-utils/InfoPlistPatcher.py
+TouchinBuild/utils/CsprojPatcher.py
-utils/MacroProcessor.py
+TouchinBuild/utils/IncludeProcessor.py
-utils/SlnPatcher.py
+TouchinBuild/utils/InfoPlistPatcher.py
-utils/TestflightPublisher.py
+TouchinBuild/utils/MacroProcessor.py
-utils/__init__.py
+TouchinBuild/utils/SlnPatcher.py
-utils/SettingsProvider/CmdArgsOverriderSettingsProvider.py
+TouchinBuild/utils/TestflightPublisher.py
-utils/SettingsProvider/FromFileSettingsProvider.py
+TouchinBuild/utils/__init__.py
-utils/SettingsProvider/__init__.py
+TouchinBuild/utils/SettingsProvider/CmdArgsOverriderSettingsProvider.py
+TouchinBuild/utils/SettingsProvider/FromFileSettingsProvider.py
+TouchinBuild/utils/SettingsProvider/__init__.py

scripts/SimpleEchoSteps.txt

@@ -0,0 +1 @@
+sh echo hello from '{@author}'

scripts/TouchinBuild/CommandBuilders/CleanBuildCommandBuilder.py

@@ -1,6 +1,6 @@
 from commands.CleanBuildCommands.BuildCommand import BuildCommand
 from commands.CleanBuildCommands.CleanCommand import CleanCommand
-from parser.CleanBuildParser import CleanBuildParser
+from parsers.CleanBuildParser import CleanBuildParser
 
 
 class CleanBuildCommandBuilder:

scripts/TouchinBuild/CommandBuilders/CopyCommandBuilder.py

@@ -1,5 +1,5 @@
 from commands.CopyCommand import CopyCommand
-from parser.CopyParser.CopyLineParser import CopyLineParser
+from parsers.CopyParser.CopyLineParser import CopyLineParser
 
 
 class CopyCommandBuilder:

scripts/TouchinBuild/CommandBuilders/CreateBackupCommandBuilder.py

@@ -1,5 +1,5 @@
 from commands.CreateBackupCommand import CreateBackupCommand
-from parser.BackupParser.CreateBackupParser import CreateBackupParser
+from parsers.ParserBackup.CreateBackupParser import CreateBackupParser
 
 
 class CreateBackupCommandBuilder:

scripts/TouchinBuild/CommandBuilders/DeleteBackupCommandBuilder.py

@@ -1,5 +1,5 @@
 from commands.DeleteBackupCommand import DeleteBackupCommand
-from parser.BackupParser.DeleteBackupParser import DeleteBackupParser
+from parsers.ParserBackup.DeleteBackupParser import DeleteBackupParser
 
 
 class DeleteBackupCommandBuilder:

scripts/TouchinBuild/CommandBuilders/InstallProfileCommandBuilder.py

@@ -1,5 +1,5 @@
 from commands.CopyCommand import CopyCommand
-from parser.InstallProfileParser import InstallProfileParser
+from parsers.InstallProfileParser import InstallProfileParser
 
 
 class InstallProfileCommandBuilder:

scripts/TouchinBuild/CommandBuilders/MakeDirsCommandBuilder.py

@@ -1,5 +1,5 @@
 from commands.MakeDirsCommand import MakeDirsCommand
-from parser.MakeDirsParser import MakeDirsParser
+from parsers.MakeDirsParser import MakeDirsParser
 
 
 class MakeDirsCommandBuilder:

scripts/TouchinBuild/CommandBuilders/PatchCsprojCommandBuilder.py

@@ -1,5 +1,5 @@
 from commands.PatchCsprojCommand import PatchCsprojCommand
-from parser.InsideParser.InsideSetParser import InsideSetParser
+from parsers.InsideParser.InsideSetParser import InsideSetParser
 
 
 class PatchCsprojCommandBuilder:

scripts/TouchinBuild/CommandBuilders/PatchInfoplistCommandBuilder.py

@@ -1,5 +1,5 @@
 from commands.PatchInfoPlistCommand import PatchInfoPlistCommand
-from parser.InsideParser.InsideSetParser import InsideSetParser
+from parsers.InsideParser.InsideSetParser import InsideSetParser
 
 
 class PatchInfoplistCommandBuilder:

scripts/TouchinBuild/CommandBuilders/RemoveProjectCommandBuilder.py

@@ -1,5 +1,5 @@
 from commands.RemoveProjectCommand import RemoveProjectCommand
-from parser.InsideParser.InsideRemoveParser import InsideRemoveParser
+from parsers.InsideParser.InsideRemoveParser import InsideRemoveParser
 
 
 class RemoveProjectCommandBuilder:

scripts/TouchinBuild/CommandBuilders/RestoreBackupCommandBuilder.py

@@ -1,5 +1,5 @@
 from commands.RestoreBackupCommand import RestoreBackupCommand
-from parser.BackupParser.RestoreBackupParser import RestoreBackupParser
+from parsers.ParserBackup.RestoreBackupParser import RestoreBackupParser
 
 
 class RestoreBackupCommandBuilder:

scripts/TouchinBuild/CommandBuilders/ShCommandBuilder.py

@@ -1,5 +1,5 @@
 from commands.ShCommand import ShCommand
-from parser.ShParser import ShParser
+from parsers.ShParser import ShParser
 
 
 class ShCommandBuilder:

scripts/TouchinBuild/CommandBuilders/TestflightCommandBuilder.py

@@ -1,5 +1,5 @@
 from commands.TestflightCommand import TestflightCommand
-from parser.TestflightParser import TestflightParser
+from parsers.TestflightParser import TestflightParser
 
 
 class TestflightCommandBuilder:

scripts/TouchinBuild/Tests/UnitTests/CleanBuildParser/test_cleanBuildParser.py

@@ -1,5 +1,5 @@
 import unittest
-from parser.CleanBuildParser import CleanBuildParser
+from parsers.CleanBuildParser import CleanBuildParser
 
 
 class TestCleanBuildParser(unittest.TestCase):

scripts/TouchinBuild/Tests/UnitTests/CopyParser/test_copyArguments.py

@@ -1,5 +1,5 @@
 import unittest
-from parser.CopyParser.CopyArguments import CopyArguments
+from parsers.CopyParser.CopyArguments import CopyArguments
 
 
 class TestCopyArguments(unittest.TestCase):

scripts/TouchinBuild/Tests/UnitTests/CopyParser/test_copyParser.py

@@ -1,5 +1,5 @@
 import unittest
-from parser.CopyParser.CopyLineParser import CopyLineParser
+from parsers.CopyParser.CopyLineParser import CopyLineParser
 
 
 class TestCopyParser(unittest.TestCase):

scripts/TouchinBuild/Tests/UnitTests/InstallProfile/test_installProfile.py

@@ -1,5 +1,5 @@
 import unittest
-from parser.InstallProfileParser import InstallProfileParser
+from parsers.InstallProfileParser import InstallProfileParser
 
 
 class TestInstallProfile(unittest.TestCase):

scripts/TouchinBuild/Tests/UnitTests/MakeDirsParser/test_makeDirsParser.py

@@ -1,5 +1,5 @@
 import unittest
-from parser.MakeDirsParser import MakeDirsParser
+from parsers.MakeDirsParser import MakeDirsParser
 
 
 class TestMakeDirsParser(unittest.TestCase):

scripts/TouchinBuild/Tests/UnitTests/ProjectParser/test_projectParser.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import unittest
 from commands.ValueProvider import ValueProvider
-from parser.InsideParser.InsideSetParser import InsideSetParser
+from parsers.InsideParser.InsideSetParser import InsideSetParser
 
 
 class TestCsprojParser(unittest.TestCase):

scripts/TouchinBuild/Tests/UnitTests/SettingsParser/test_PathParser.py

@@ -1,5 +1,5 @@
 import unittest
-from parser.SettingsParser.PathParser import PathParser
+from parsers.SettingsParser.PathParser import PathParser
 
 
 class TestPathParser(unittest.TestCase):

scripts/TouchinBuild/Tests/UnitTests/SettingsParser/test_SettingsLineParser.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import unittest
-from parser.SettingsParser.SettingsLineParser import SettingsLineParser
+from parsers.SettingsParser.SettingsLineParser import SettingsLineParser
 
 
 class TestSettingsLineParser(unittest.TestCase):

scripts/TouchinBuild/Tests/UnitTests/SettingsParser/test_SettingsParser.py

@@ -1,5 +1,5 @@
 import unittest
-from parser.SettingsParser.SettingsParser import SettingsParser
+from parsers.SettingsParser.SettingsParser import SettingsParser
 
 
 

scripts/TouchinBuild/Tests/UnitTests/ShParser/test_shPareser.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import unittest
-from parser.ShParser import ShParser
+from parsers.ShParser import ShParser
 
 
 class TestShParser(unittest.TestCase):

scripts/TouchinBuild/Tests/UnitTests/TestflightParser/test_testflightParser.py

@@ -1,5 +1,5 @@
 import unittest
-from parser.TestflightParser import TestflightParser
+from parsers.TestflightParser import TestflightParser
 
 
 class TesttestflightParser(unittest.TestCase):

scripts/TouchinBuild/parsers/CleanBuildParser.py

@@ -1,6 +1,6 @@
 import re
 
-from parser.LineParser import LineParser
+from parsers.LineParser import LineParser
 
 
 class CleanBuildParser(LineParser):

scripts/TouchinBuild/parsers/CopyParser/CopyLineParser.py

@@ -1,7 +1,7 @@
 import re
 
-from parser.CopyParser.CopyArguments import CopyArguments
+from parsers.CopyParser.CopyArguments import CopyArguments
-from parser.LineParser import LineParser
+from parsers.LineParser import LineParser
 
 
 class CopyLineParser(LineParser):

scripts/TouchinBuild/parsers/InsideParser/InsideRemoveParser.py

@@ -1,6 +1,6 @@
 import re
 
-from parser.LineParser import LineParser
+from parsers.LineParser import LineParser
 
 
 class InsideRemoveParser(LineParser):

scripts/TouchinBuild/parsers/InsideParser/InsideSetParser.py

@@ -1,6 +1,6 @@
 import re
 
-from parser.LineParser import LineParser
+from parsers.LineParser import LineParser
 
 
 class InsideSetParser(LineParser):

scripts/TouchinBuild/parsers/InstallProfileParser.py

@@ -1,7 +1,7 @@
 import re
 import os
-from parser.CopyParser.CopyArguments import CopyArguments
+from parsers.CopyParser.CopyArguments import CopyArguments
-from parser.LineParser import LineParser
+from parsers.LineParser import LineParser
 
 
 class InstallProfileParser(LineParser):