diff --git a/scripts/MANIFEST b/scripts/MANIFEST index 630d501..494e951 100644 --- a/scripts/MANIFEST +++ b/scripts/MANIFEST @@ -1,75 +1,77 @@ # file GENERATED by distutils, do NOT edit README.txt setup.py -CommandBuilders/CleanBuildCommandBuilder.py -CommandBuilders/CopyCommandBuilder.py -CommandBuilders/CreateBackupCommandBuilder.py -CommandBuilders/DeleteBackupCommandBuilder.py -CommandBuilders/InstallProfileCommandBuilder.py -CommandBuilders/MakeDirsCommandBuilder.py -CommandBuilders/PatchCsprojCommandBuilder.py -CommandBuilders/PatchInfoplistCommandBuilder.py -CommandBuilders/RemoveProjectCommandBuilder.py -CommandBuilders/RestoreBackupCommandBuilder.py -CommandBuilders/ShCommandBuilder.py -CommandBuilders/TestflightCommandBuilder.py -CommandBuilders/__init__.py -Core/FileContentProvider.py -Core/StepsRunner.py -Core/__init__.py -Core/LineConveyor/CommentRemover.py -Core/LineConveyor/MacroResolver.py -Core/LineConveyor/Stripper.py -Core/LineConveyor/TextConveyorPreprocessor.py -Core/LineConveyor/TextInclude.py -Core/LineConveyor/__init__.py -commands/CopyCommand.py -commands/CreateBackupCommand.py -commands/DeleteBackupCommand.py -commands/MakeDirsCommand.py -commands/PatchCsprojCommand.py -commands/PatchInfoPlistCommand.py -commands/RemoveProjectCommand.py -commands/RestoreBackupCommand.py -commands/ShCommand.py -commands/TestflightCommand.py -commands/ValueProvider.py -commands/__init__.py -commands/CleanBuildCommands/BuildCommand.py -commands/CleanBuildCommands/CleanBuildCommandBase.py -commands/CleanBuildCommands/CleanCommand.py -commands/CleanBuildCommands/__init__.py -parser/CleanBuildParser.py -parser/InstallProfileParser.py -parser/LineParser.py -parser/MakeDirsParser.py -parser/ShParser.py -parser/TestflightParser.py -parser/__init__.py -parser/BackupParser/CreateBackupArguments.py -parser/BackupParser/CreateBackupParser.py -parser/BackupParser/DeleteBackupParser.py -parser/BackupParser/RestoreBackupParser.py -parser/BackupParser/__init__.py -parser/CopyParser/CopyArguments.py -parser/CopyParser/CopyLineParser.py -parser/CopyParser/__init__.py -parser/InsideParser/InsideRemoveParser.py -parser/InsideParser/InsideSetParser.py -parser/InsideParser/__init__.py -parser/SettingsParser/PathParser.py -parser/SettingsParser/SettingsLineParser.py -parser/SettingsParser/SettingsMerger.py -parser/SettingsParser/SettingsParser.py -parser/SettingsParser/__init__.py -utils/BuildConfigProvider.py -utils/CsprojPatcher.py -utils/IncludeProcessor.py -utils/InfoPlistPatcher.py -utils/MacroProcessor.py -utils/SlnPatcher.py -utils/TestflightPublisher.py -utils/__init__.py -utils/SettingsProvider/CmdArgsOverriderSettingsProvider.py -utils/SettingsProvider/FromFileSettingsProvider.py -utils/SettingsProvider/__init__.py +TouchinBuild/__init__.py +TouchinBuild/taskRunner.py +TouchinBuild/CommandBuilders/CleanBuildCommandBuilder.py +TouchinBuild/CommandBuilders/CopyCommandBuilder.py +TouchinBuild/CommandBuilders/CreateBackupCommandBuilder.py +TouchinBuild/CommandBuilders/DeleteBackupCommandBuilder.py +TouchinBuild/CommandBuilders/InstallProfileCommandBuilder.py +TouchinBuild/CommandBuilders/MakeDirsCommandBuilder.py +TouchinBuild/CommandBuilders/PatchCsprojCommandBuilder.py +TouchinBuild/CommandBuilders/PatchInfoplistCommandBuilder.py +TouchinBuild/CommandBuilders/RemoveProjectCommandBuilder.py +TouchinBuild/CommandBuilders/RestoreBackupCommandBuilder.py +TouchinBuild/CommandBuilders/ShCommandBuilder.py +TouchinBuild/CommandBuilders/TestflightCommandBuilder.py +TouchinBuild/CommandBuilders/__init__.py +TouchinBuild/Core/FileContentProvider.py +TouchinBuild/Core/StepsRunner.py +TouchinBuild/Core/__init__.py +TouchinBuild/Core/LineConveyor/CommentRemover.py +TouchinBuild/Core/LineConveyor/MacroResolver.py +TouchinBuild/Core/LineConveyor/Stripper.py +TouchinBuild/Core/LineConveyor/TextConveyorPreprocessor.py +TouchinBuild/Core/LineConveyor/TextInclude.py +TouchinBuild/Core/LineConveyor/__init__.py +TouchinBuild/commands/CopyCommand.py +TouchinBuild/commands/CreateBackupCommand.py +TouchinBuild/commands/DeleteBackupCommand.py +TouchinBuild/commands/MakeDirsCommand.py +TouchinBuild/commands/PatchCsprojCommand.py +TouchinBuild/commands/PatchInfoPlistCommand.py +TouchinBuild/commands/RemoveProjectCommand.py +TouchinBuild/commands/RestoreBackupCommand.py +TouchinBuild/commands/ShCommand.py +TouchinBuild/commands/TestflightCommand.py +TouchinBuild/commands/ValueProvider.py +TouchinBuild/commands/__init__.py +TouchinBuild/commands/CleanBuildCommands/BuildCommand.py +TouchinBuild/commands/CleanBuildCommands/CleanBuildCommandBase.py +TouchinBuild/commands/CleanBuildCommands/CleanCommand.py +TouchinBuild/commands/CleanBuildCommands/__init__.py +TouchinBuild/parsers/CleanBuildParser.py +TouchinBuild/parsers/InstallProfileParser.py +TouchinBuild/parsers/LineParser.py +TouchinBuild/parsers/MakeDirsParser.py +TouchinBuild/parsers/ShParser.py +TouchinBuild/parsers/TestflightParser.py +TouchinBuild/parsers/__init__.py +TouchinBuild/parsers/CopyParser/CopyArguments.py +TouchinBuild/parsers/CopyParser/CopyLineParser.py +TouchinBuild/parsers/CopyParser/__init__.py +TouchinBuild/parsers/InsideParser/InsideRemoveParser.py +TouchinBuild/parsers/InsideParser/InsideSetParser.py +TouchinBuild/parsers/InsideParser/__init__.py +TouchinBuild/parsers/ParserBackup/CreateBackupArguments.py +TouchinBuild/parsers/ParserBackup/CreateBackupParser.py +TouchinBuild/parsers/ParserBackup/DeleteBackupParser.py +TouchinBuild/parsers/ParserBackup/RestoreBackupParser.py +TouchinBuild/parsers/ParserBackup/__init__.py +TouchinBuild/parsers/SettingsParser/PathParser.py +TouchinBuild/parsers/SettingsParser/SettingsLineParser.py +TouchinBuild/parsers/SettingsParser/SettingsMerger.py +TouchinBuild/parsers/SettingsParser/SettingsParser.py +TouchinBuild/parsers/SettingsParser/__init__.py +TouchinBuild/utils/BuildConfigProvider.py +TouchinBuild/utils/CsprojPatcher.py +TouchinBuild/utils/IncludeProcessor.py +TouchinBuild/utils/InfoPlistPatcher.py +TouchinBuild/utils/MacroProcessor.py +TouchinBuild/utils/SlnPatcher.py +TouchinBuild/utils/TestflightPublisher.py +TouchinBuild/utils/__init__.py +TouchinBuild/utils/SettingsProvider/CmdArgsOverriderSettingsProvider.py +TouchinBuild/utils/SettingsProvider/FromFileSettingsProvider.py +TouchinBuild/utils/SettingsProvider/__init__.py diff --git a/scripts/SimpleEchoSteps.txt b/scripts/SimpleEchoSteps.txt new file mode 100644 index 0000000..6d74ed2 --- /dev/null +++ b/scripts/SimpleEchoSteps.txt @@ -0,0 +1 @@ +sh echo hello from '{@author}' \ No newline at end of file diff --git a/scripts/CommandBuilders/CleanBuildCommandBuilder.py b/scripts/TouchinBuild/CommandBuilders/CleanBuildCommandBuilder.py similarity index 94% rename from scripts/CommandBuilders/CleanBuildCommandBuilder.py rename to scripts/TouchinBuild/CommandBuilders/CleanBuildCommandBuilder.py index 545c61f..06d86db 100644 --- a/scripts/CommandBuilders/CleanBuildCommandBuilder.py +++ b/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: diff --git a/scripts/CommandBuilders/CopyCommandBuilder.py b/scripts/TouchinBuild/CommandBuilders/CopyCommandBuilder.py similarity index 85% rename from scripts/CommandBuilders/CopyCommandBuilder.py rename to scripts/TouchinBuild/CommandBuilders/CopyCommandBuilder.py index f4e735b..bc1b1bd 100644 --- a/scripts/CommandBuilders/CopyCommandBuilder.py +++ b/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: diff --git a/scripts/CommandBuilders/CreateBackupCommandBuilder.py b/scripts/TouchinBuild/CommandBuilders/CreateBackupCommandBuilder.py similarity index 86% rename from scripts/CommandBuilders/CreateBackupCommandBuilder.py rename to scripts/TouchinBuild/CommandBuilders/CreateBackupCommandBuilder.py index 74688b5..c6719da 100644 --- a/scripts/CommandBuilders/CreateBackupCommandBuilder.py +++ b/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: diff --git a/scripts/CommandBuilders/DeleteBackupCommandBuilder.py b/scripts/TouchinBuild/CommandBuilders/DeleteBackupCommandBuilder.py similarity index 86% rename from scripts/CommandBuilders/DeleteBackupCommandBuilder.py rename to scripts/TouchinBuild/CommandBuilders/DeleteBackupCommandBuilder.py index 04f869b..4e66812 100644 --- a/scripts/CommandBuilders/DeleteBackupCommandBuilder.py +++ b/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: diff --git a/scripts/CommandBuilders/InstallProfileCommandBuilder.py b/scripts/TouchinBuild/CommandBuilders/InstallProfileCommandBuilder.py similarity index 86% rename from scripts/CommandBuilders/InstallProfileCommandBuilder.py rename to scripts/TouchinBuild/CommandBuilders/InstallProfileCommandBuilder.py index f477259..1e9668b 100644 --- a/scripts/CommandBuilders/InstallProfileCommandBuilder.py +++ b/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: diff --git a/scripts/CommandBuilders/MakeDirsCommandBuilder.py b/scripts/TouchinBuild/CommandBuilders/MakeDirsCommandBuilder.py similarity index 86% rename from scripts/CommandBuilders/MakeDirsCommandBuilder.py rename to scripts/TouchinBuild/CommandBuilders/MakeDirsCommandBuilder.py index d589888..2d2663e 100644 --- a/scripts/CommandBuilders/MakeDirsCommandBuilder.py +++ b/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: diff --git a/scripts/CommandBuilders/PatchCsprojCommandBuilder.py b/scripts/TouchinBuild/CommandBuilders/PatchCsprojCommandBuilder.py similarity index 92% rename from scripts/CommandBuilders/PatchCsprojCommandBuilder.py rename to scripts/TouchinBuild/CommandBuilders/PatchCsprojCommandBuilder.py index 1901be6..190f17e 100644 --- a/scripts/CommandBuilders/PatchCsprojCommandBuilder.py +++ b/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: diff --git a/scripts/CommandBuilders/PatchInfoplistCommandBuilder.py b/scripts/TouchinBuild/CommandBuilders/PatchInfoplistCommandBuilder.py similarity index 91% rename from scripts/CommandBuilders/PatchInfoplistCommandBuilder.py rename to scripts/TouchinBuild/CommandBuilders/PatchInfoplistCommandBuilder.py index 466c5b4..75af291 100644 --- a/scripts/CommandBuilders/PatchInfoplistCommandBuilder.py +++ b/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: diff --git a/scripts/CommandBuilders/RemoveProjectCommandBuilder.py b/scripts/TouchinBuild/CommandBuilders/RemoveProjectCommandBuilder.py similarity index 85% rename from scripts/CommandBuilders/RemoveProjectCommandBuilder.py rename to scripts/TouchinBuild/CommandBuilders/RemoveProjectCommandBuilder.py index 9288aa6..b81482f 100644 --- a/scripts/CommandBuilders/RemoveProjectCommandBuilder.py +++ b/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: diff --git a/scripts/CommandBuilders/RestoreBackupCommandBuilder.py b/scripts/TouchinBuild/CommandBuilders/RestoreBackupCommandBuilder.py similarity index 86% rename from scripts/CommandBuilders/RestoreBackupCommandBuilder.py rename to scripts/TouchinBuild/CommandBuilders/RestoreBackupCommandBuilder.py index 59768d9..dc9404b 100644 --- a/scripts/CommandBuilders/RestoreBackupCommandBuilder.py +++ b/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: diff --git a/scripts/CommandBuilders/ShCommandBuilder.py b/scripts/TouchinBuild/CommandBuilders/ShCommandBuilder.py similarity index 90% rename from scripts/CommandBuilders/ShCommandBuilder.py rename to scripts/TouchinBuild/CommandBuilders/ShCommandBuilder.py index 8301a32..b555582 100644 --- a/scripts/CommandBuilders/ShCommandBuilder.py +++ b/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: diff --git a/scripts/CommandBuilders/TestflightCommandBuilder.py b/scripts/TouchinBuild/CommandBuilders/TestflightCommandBuilder.py similarity index 87% rename from scripts/CommandBuilders/TestflightCommandBuilder.py rename to scripts/TouchinBuild/CommandBuilders/TestflightCommandBuilder.py index b1a3296..981a413 100644 --- a/scripts/CommandBuilders/TestflightCommandBuilder.py +++ b/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: diff --git a/scripts/CommandBuilders/__init__.py b/scripts/TouchinBuild/CommandBuilders/__init__.py similarity index 100% rename from scripts/CommandBuilders/__init__.py rename to scripts/TouchinBuild/CommandBuilders/__init__.py diff --git a/scripts/Core/FileContentProvider.py b/scripts/TouchinBuild/Core/FileContentProvider.py similarity index 100% rename from scripts/Core/FileContentProvider.py rename to scripts/TouchinBuild/Core/FileContentProvider.py diff --git a/scripts/Core/LineConveyor/CommentRemover.py b/scripts/TouchinBuild/Core/LineConveyor/CommentRemover.py similarity index 100% rename from scripts/Core/LineConveyor/CommentRemover.py rename to scripts/TouchinBuild/Core/LineConveyor/CommentRemover.py diff --git a/scripts/Core/LineConveyor/MacroResolver.py b/scripts/TouchinBuild/Core/LineConveyor/MacroResolver.py similarity index 100% rename from scripts/Core/LineConveyor/MacroResolver.py rename to scripts/TouchinBuild/Core/LineConveyor/MacroResolver.py diff --git a/scripts/Core/LineConveyor/Stripper.py b/scripts/TouchinBuild/Core/LineConveyor/Stripper.py similarity index 100% rename from scripts/Core/LineConveyor/Stripper.py rename to scripts/TouchinBuild/Core/LineConveyor/Stripper.py diff --git a/scripts/Core/LineConveyor/TextConveyorPreprocessor.py b/scripts/TouchinBuild/Core/LineConveyor/TextConveyorPreprocessor.py similarity index 100% rename from scripts/Core/LineConveyor/TextConveyorPreprocessor.py rename to scripts/TouchinBuild/Core/LineConveyor/TextConveyorPreprocessor.py diff --git a/scripts/Core/LineConveyor/TextInclude.py b/scripts/TouchinBuild/Core/LineConveyor/TextInclude.py similarity index 100% rename from scripts/Core/LineConveyor/TextInclude.py rename to scripts/TouchinBuild/Core/LineConveyor/TextInclude.py diff --git a/scripts/Core/LineConveyor/__init__.py b/scripts/TouchinBuild/Core/LineConveyor/__init__.py similarity index 100% rename from scripts/Core/LineConveyor/__init__.py rename to scripts/TouchinBuild/Core/LineConveyor/__init__.py diff --git a/scripts/Core/StepsRunner.py b/scripts/TouchinBuild/Core/StepsRunner.py similarity index 100% rename from scripts/Core/StepsRunner.py rename to scripts/TouchinBuild/Core/StepsRunner.py diff --git a/scripts/Core/__init__.py b/scripts/TouchinBuild/Core/__init__.py similarity index 100% rename from scripts/Core/__init__.py rename to scripts/TouchinBuild/Core/__init__.py diff --git a/scripts/Tests/ManualTests/__init__.py b/scripts/TouchinBuild/Tests/ManualTests/__init__.py similarity index 100% rename from scripts/Tests/ManualTests/__init__.py rename to scripts/TouchinBuild/Tests/ManualTests/__init__.py diff --git a/scripts/Tests/ManualTests/build_test.py b/scripts/TouchinBuild/Tests/ManualTests/build_test.py similarity index 100% rename from scripts/Tests/ManualTests/build_test.py rename to scripts/TouchinBuild/Tests/ManualTests/build_test.py diff --git a/scripts/Tests/ManualTests/clean_test.py b/scripts/TouchinBuild/Tests/ManualTests/clean_test.py similarity index 100% rename from scripts/Tests/ManualTests/clean_test.py rename to scripts/TouchinBuild/Tests/ManualTests/clean_test.py diff --git a/scripts/Tests/ManualTests/copy_test.py b/scripts/TouchinBuild/Tests/ManualTests/copy_test.py similarity index 100% rename from scripts/Tests/ManualTests/copy_test.py rename to scripts/TouchinBuild/Tests/ManualTests/copy_test.py diff --git a/scripts/Tests/ManualTests/create_backup_test.py b/scripts/TouchinBuild/Tests/ManualTests/create_backup_test.py similarity index 100% rename from scripts/Tests/ManualTests/create_backup_test.py rename to scripts/TouchinBuild/Tests/ManualTests/create_backup_test.py diff --git a/scripts/Tests/ManualTests/csproj_test.py b/scripts/TouchinBuild/Tests/ManualTests/csproj_test.py similarity index 100% rename from scripts/Tests/ManualTests/csproj_test.py rename to scripts/TouchinBuild/Tests/ManualTests/csproj_test.py diff --git a/scripts/Tests/ManualTests/delete_backup_test.py b/scripts/TouchinBuild/Tests/ManualTests/delete_backup_test.py similarity index 100% rename from scripts/Tests/ManualTests/delete_backup_test.py rename to scripts/TouchinBuild/Tests/ManualTests/delete_backup_test.py diff --git a/scripts/Tests/ManualTests/infoplist_test.py b/scripts/TouchinBuild/Tests/ManualTests/infoplist_test.py similarity index 100% rename from scripts/Tests/ManualTests/infoplist_test.py rename to scripts/TouchinBuild/Tests/ManualTests/infoplist_test.py diff --git a/scripts/Tests/ManualTests/install_profile.py b/scripts/TouchinBuild/Tests/ManualTests/install_profile.py similarity index 100% rename from scripts/Tests/ManualTests/install_profile.py rename to scripts/TouchinBuild/Tests/ManualTests/install_profile.py diff --git a/scripts/Tests/ManualTests/make_dirs.py b/scripts/TouchinBuild/Tests/ManualTests/make_dirs.py similarity index 100% rename from scripts/Tests/ManualTests/make_dirs.py rename to scripts/TouchinBuild/Tests/ManualTests/make_dirs.py diff --git a/scripts/Tests/ManualTests/path_provider.py b/scripts/TouchinBuild/Tests/ManualTests/path_provider.py similarity index 100% rename from scripts/Tests/ManualTests/path_provider.py rename to scripts/TouchinBuild/Tests/ManualTests/path_provider.py diff --git a/scripts/Tests/ManualTests/remove_project.py b/scripts/TouchinBuild/Tests/ManualTests/remove_project.py similarity index 100% rename from scripts/Tests/ManualTests/remove_project.py rename to scripts/TouchinBuild/Tests/ManualTests/remove_project.py diff --git a/scripts/Tests/ManualTests/restore_backup_test.py b/scripts/TouchinBuild/Tests/ManualTests/restore_backup_test.py similarity index 100% rename from scripts/Tests/ManualTests/restore_backup_test.py rename to scripts/TouchinBuild/Tests/ManualTests/restore_backup_test.py diff --git a/scripts/Tests/ManualTests/run_sh_command.py b/scripts/TouchinBuild/Tests/ManualTests/run_sh_command.py similarity index 100% rename from scripts/Tests/ManualTests/run_sh_command.py rename to scripts/TouchinBuild/Tests/ManualTests/run_sh_command.py diff --git a/scripts/Tests/ManualTests/testflight_test.py b/scripts/TouchinBuild/Tests/ManualTests/testflight_test.py similarity index 100% rename from scripts/Tests/ManualTests/testflight_test.py rename to scripts/TouchinBuild/Tests/ManualTests/testflight_test.py diff --git a/scripts/Tests/UnitTests/BuildConfigProvider/__init__.py b/scripts/TouchinBuild/Tests/UnitTests/BuildConfigProvider/__init__.py similarity index 100% rename from scripts/Tests/UnitTests/BuildConfigProvider/__init__.py rename to scripts/TouchinBuild/Tests/UnitTests/BuildConfigProvider/__init__.py diff --git a/scripts/Tests/UnitTests/BuildConfigProvider/test_BuildConfigProvider.py b/scripts/TouchinBuild/Tests/UnitTests/BuildConfigProvider/test_BuildConfigProvider.py similarity index 100% rename from scripts/Tests/UnitTests/BuildConfigProvider/test_BuildConfigProvider.py rename to scripts/TouchinBuild/Tests/UnitTests/BuildConfigProvider/test_BuildConfigProvider.py diff --git a/scripts/Tests/UnitTests/CleanBuildParser/__init__.py b/scripts/TouchinBuild/Tests/UnitTests/CleanBuildParser/__init__.py similarity index 100% rename from scripts/Tests/UnitTests/CleanBuildParser/__init__.py rename to scripts/TouchinBuild/Tests/UnitTests/CleanBuildParser/__init__.py diff --git a/scripts/Tests/UnitTests/CleanBuildParser/test_cleanBuildParser.py b/scripts/TouchinBuild/Tests/UnitTests/CleanBuildParser/test_cleanBuildParser.py similarity index 85% rename from scripts/Tests/UnitTests/CleanBuildParser/test_cleanBuildParser.py rename to scripts/TouchinBuild/Tests/UnitTests/CleanBuildParser/test_cleanBuildParser.py index 18c6065..d0d025c 100644 --- a/scripts/Tests/UnitTests/CleanBuildParser/test_cleanBuildParser.py +++ b/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): diff --git a/scripts/Tests/UnitTests/CopyParser/__init__.py b/scripts/TouchinBuild/Tests/UnitTests/CopyParser/__init__.py similarity index 100% rename from scripts/Tests/UnitTests/CopyParser/__init__.py rename to scripts/TouchinBuild/Tests/UnitTests/CopyParser/__init__.py diff --git a/scripts/Tests/UnitTests/CopyParser/test_copyArguments.py b/scripts/TouchinBuild/Tests/UnitTests/CopyParser/test_copyArguments.py similarity index 94% rename from scripts/Tests/UnitTests/CopyParser/test_copyArguments.py rename to scripts/TouchinBuild/Tests/UnitTests/CopyParser/test_copyArguments.py index e610773..e549199 100644 --- a/scripts/Tests/UnitTests/CopyParser/test_copyArguments.py +++ b/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): diff --git a/scripts/Tests/UnitTests/CopyParser/test_copyParser.py b/scripts/TouchinBuild/Tests/UnitTests/CopyParser/test_copyParser.py similarity index 92% rename from scripts/Tests/UnitTests/CopyParser/test_copyParser.py rename to scripts/TouchinBuild/Tests/UnitTests/CopyParser/test_copyParser.py index 60e54ca..9cb7a12 100644 --- a/scripts/Tests/UnitTests/CopyParser/test_copyParser.py +++ b/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): diff --git a/scripts/Tests/UnitTests/IncludeProcessor/__init__.py b/scripts/TouchinBuild/Tests/UnitTests/IncludeProcessor/__init__.py similarity index 100% rename from scripts/Tests/UnitTests/IncludeProcessor/__init__.py rename to scripts/TouchinBuild/Tests/UnitTests/IncludeProcessor/__init__.py diff --git a/scripts/Tests/UnitTests/IncludeProcessor/test_IncludeProcessor.py b/scripts/TouchinBuild/Tests/UnitTests/IncludeProcessor/test_IncludeProcessor.py similarity index 100% rename from scripts/Tests/UnitTests/IncludeProcessor/test_IncludeProcessor.py rename to scripts/TouchinBuild/Tests/UnitTests/IncludeProcessor/test_IncludeProcessor.py diff --git a/scripts/Tests/UnitTests/IncludeText/__init__.py b/scripts/TouchinBuild/Tests/UnitTests/IncludeText/__init__.py similarity index 100% rename from scripts/Tests/UnitTests/IncludeText/__init__.py rename to scripts/TouchinBuild/Tests/UnitTests/IncludeText/__init__.py diff --git a/scripts/Tests/UnitTests/IncludeText/test_includeText.py b/scripts/TouchinBuild/Tests/UnitTests/IncludeText/test_includeText.py similarity index 100% rename from scripts/Tests/UnitTests/IncludeText/test_includeText.py rename to scripts/TouchinBuild/Tests/UnitTests/IncludeText/test_includeText.py diff --git a/scripts/Tests/UnitTests/InstallProfile/__init__.py b/scripts/TouchinBuild/Tests/UnitTests/InstallProfile/__init__.py similarity index 100% rename from scripts/Tests/UnitTests/InstallProfile/__init__.py rename to scripts/TouchinBuild/Tests/UnitTests/InstallProfile/__init__.py diff --git a/scripts/Tests/UnitTests/InstallProfile/test_installProfile.py b/scripts/TouchinBuild/Tests/UnitTests/InstallProfile/test_installProfile.py similarity index 78% rename from scripts/Tests/UnitTests/InstallProfile/test_installProfile.py rename to scripts/TouchinBuild/Tests/UnitTests/InstallProfile/test_installProfile.py index 56d0631..ba9313f 100644 --- a/scripts/Tests/UnitTests/InstallProfile/test_installProfile.py +++ b/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): diff --git a/scripts/Tests/UnitTests/LineConveyor/__init__.py b/scripts/TouchinBuild/Tests/UnitTests/LineConveyor/__init__.py similarity index 100% rename from scripts/Tests/UnitTests/LineConveyor/__init__.py rename to scripts/TouchinBuild/Tests/UnitTests/LineConveyor/__init__.py diff --git a/scripts/Tests/UnitTests/LineConveyor/test_commentRemover.py b/scripts/TouchinBuild/Tests/UnitTests/LineConveyor/test_commentRemover.py similarity index 100% rename from scripts/Tests/UnitTests/LineConveyor/test_commentRemover.py rename to scripts/TouchinBuild/Tests/UnitTests/LineConveyor/test_commentRemover.py diff --git a/scripts/Tests/UnitTests/LineConveyor/test_macroResolver.py b/scripts/TouchinBuild/Tests/UnitTests/LineConveyor/test_macroResolver.py similarity index 100% rename from scripts/Tests/UnitTests/LineConveyor/test_macroResolver.py rename to scripts/TouchinBuild/Tests/UnitTests/LineConveyor/test_macroResolver.py diff --git a/scripts/Tests/UnitTests/LineConveyor/test_stripper.py b/scripts/TouchinBuild/Tests/UnitTests/LineConveyor/test_stripper.py similarity index 100% rename from scripts/Tests/UnitTests/LineConveyor/test_stripper.py rename to scripts/TouchinBuild/Tests/UnitTests/LineConveyor/test_stripper.py diff --git a/scripts/Tests/UnitTests/Macro/__init__.py b/scripts/TouchinBuild/Tests/UnitTests/Macro/__init__.py similarity index 100% rename from scripts/Tests/UnitTests/Macro/__init__.py rename to scripts/TouchinBuild/Tests/UnitTests/Macro/__init__.py diff --git a/scripts/Tests/UnitTests/Macro/test_macro.py b/scripts/TouchinBuild/Tests/UnitTests/Macro/test_macro.py similarity index 100% rename from scripts/Tests/UnitTests/Macro/test_macro.py rename to scripts/TouchinBuild/Tests/UnitTests/Macro/test_macro.py diff --git a/scripts/Tests/UnitTests/MakeDirsParser/__init__.py b/scripts/TouchinBuild/Tests/UnitTests/MakeDirsParser/__init__.py similarity index 100% rename from scripts/Tests/UnitTests/MakeDirsParser/__init__.py rename to scripts/TouchinBuild/Tests/UnitTests/MakeDirsParser/__init__.py diff --git a/scripts/Tests/UnitTests/MakeDirsParser/test_makeDirsParser.py b/scripts/TouchinBuild/Tests/UnitTests/MakeDirsParser/test_makeDirsParser.py similarity index 91% rename from scripts/Tests/UnitTests/MakeDirsParser/test_makeDirsParser.py rename to scripts/TouchinBuild/Tests/UnitTests/MakeDirsParser/test_makeDirsParser.py index 6e1178a..655820c 100644 --- a/scripts/Tests/UnitTests/MakeDirsParser/test_makeDirsParser.py +++ b/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): diff --git a/scripts/Tests/UnitTests/ProjectParser/__init__.py b/scripts/TouchinBuild/Tests/UnitTests/ProjectParser/__init__.py similarity index 100% rename from scripts/Tests/UnitTests/ProjectParser/__init__.py rename to scripts/TouchinBuild/Tests/UnitTests/ProjectParser/__init__.py diff --git a/scripts/Tests/UnitTests/ProjectParser/test_projectParser.py b/scripts/TouchinBuild/Tests/UnitTests/ProjectParser/test_projectParser.py similarity index 88% rename from scripts/Tests/UnitTests/ProjectParser/test_projectParser.py rename to scripts/TouchinBuild/Tests/UnitTests/ProjectParser/test_projectParser.py index b1a6afe..9456623 100644 --- a/scripts/Tests/UnitTests/ProjectParser/test_projectParser.py +++ b/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): diff --git a/scripts/Tests/UnitTests/SettingsParser/__init__.py b/scripts/TouchinBuild/Tests/UnitTests/SettingsParser/__init__.py similarity index 100% rename from scripts/Tests/UnitTests/SettingsParser/__init__.py rename to scripts/TouchinBuild/Tests/UnitTests/SettingsParser/__init__.py diff --git a/scripts/Tests/UnitTests/SettingsParser/test_PathParser.py b/scripts/TouchinBuild/Tests/UnitTests/SettingsParser/test_PathParser.py similarity index 76% rename from scripts/Tests/UnitTests/SettingsParser/test_PathParser.py rename to scripts/TouchinBuild/Tests/UnitTests/SettingsParser/test_PathParser.py index 96471aa..26388bf 100644 --- a/scripts/Tests/UnitTests/SettingsParser/test_PathParser.py +++ b/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): diff --git a/scripts/Tests/UnitTests/SettingsParser/test_SettingsLineParser.py b/scripts/TouchinBuild/Tests/UnitTests/SettingsParser/test_SettingsLineParser.py similarity index 84% rename from scripts/Tests/UnitTests/SettingsParser/test_SettingsLineParser.py rename to scripts/TouchinBuild/Tests/UnitTests/SettingsParser/test_SettingsLineParser.py index f4fdcaf..da2be49 100644 --- a/scripts/Tests/UnitTests/SettingsParser/test_SettingsLineParser.py +++ b/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): diff --git a/scripts/Tests/UnitTests/SettingsParser/test_SettingsParser.py b/scripts/TouchinBuild/Tests/UnitTests/SettingsParser/test_SettingsParser.py similarity index 96% rename from scripts/Tests/UnitTests/SettingsParser/test_SettingsParser.py rename to scripts/TouchinBuild/Tests/UnitTests/SettingsParser/test_SettingsParser.py index 23af627..c8081f5 100644 --- a/scripts/Tests/UnitTests/SettingsParser/test_SettingsParser.py +++ b/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 diff --git a/scripts/Tests/UnitTests/ShParser/__init__.py b/scripts/TouchinBuild/Tests/UnitTests/ShParser/__init__.py similarity index 100% rename from scripts/Tests/UnitTests/ShParser/__init__.py rename to scripts/TouchinBuild/Tests/UnitTests/ShParser/__init__.py diff --git a/scripts/Tests/UnitTests/ShParser/test_shPareser.py b/scripts/TouchinBuild/Tests/UnitTests/ShParser/test_shPareser.py similarity index 93% rename from scripts/Tests/UnitTests/ShParser/test_shPareser.py rename to scripts/TouchinBuild/Tests/UnitTests/ShParser/test_shPareser.py index f5eb030..7b10bad 100644 --- a/scripts/Tests/UnitTests/ShParser/test_shPareser.py +++ b/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): diff --git a/scripts/Tests/UnitTests/TestflightParser/__init__.py b/scripts/TouchinBuild/Tests/UnitTests/TestflightParser/__init__.py similarity index 100% rename from scripts/Tests/UnitTests/TestflightParser/__init__.py rename to scripts/TouchinBuild/Tests/UnitTests/TestflightParser/__init__.py diff --git a/scripts/Tests/UnitTests/TestflightParser/test_testflightParser.py b/scripts/TouchinBuild/Tests/UnitTests/TestflightParser/test_testflightParser.py similarity index 93% rename from scripts/Tests/UnitTests/TestflightParser/test_testflightParser.py rename to scripts/TouchinBuild/Tests/UnitTests/TestflightParser/test_testflightParser.py index 9b61ec2..e9c92a7 100644 --- a/scripts/Tests/UnitTests/TestflightParser/test_testflightParser.py +++ b/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): diff --git a/scripts/Tests/UnitTests/ValueProvider/__init__.py b/scripts/TouchinBuild/Tests/UnitTests/ValueProvider/__init__.py similarity index 100% rename from scripts/Tests/UnitTests/ValueProvider/__init__.py rename to scripts/TouchinBuild/Tests/UnitTests/ValueProvider/__init__.py diff --git a/scripts/Tests/UnitTests/ValueProvider/test_valueProvider.py b/scripts/TouchinBuild/Tests/UnitTests/ValueProvider/test_valueProvider.py similarity index 100% rename from scripts/Tests/UnitTests/ValueProvider/test_valueProvider.py rename to scripts/TouchinBuild/Tests/UnitTests/ValueProvider/test_valueProvider.py diff --git a/scripts/Tests/UnitTests/__init__.py b/scripts/TouchinBuild/Tests/UnitTests/__init__.py similarity index 100% rename from scripts/Tests/UnitTests/__init__.py rename to scripts/TouchinBuild/Tests/UnitTests/__init__.py diff --git a/scripts/Tests/UnitTests/readme.txt b/scripts/TouchinBuild/Tests/UnitTests/readme.txt similarity index 100% rename from scripts/Tests/UnitTests/readme.txt rename to scripts/TouchinBuild/Tests/UnitTests/readme.txt diff --git a/scripts/Tests/__init__.py b/scripts/TouchinBuild/Tests/__init__.py similarity index 100% rename from scripts/Tests/__init__.py rename to scripts/TouchinBuild/Tests/__init__.py diff --git a/scripts/__init__.py b/scripts/TouchinBuild/__init__.py similarity index 100% rename from scripts/__init__.py rename to scripts/TouchinBuild/__init__.py diff --git a/scripts/commands/CleanBuildCommands/BuildCommand.py b/scripts/TouchinBuild/commands/CleanBuildCommands/BuildCommand.py similarity index 100% rename from scripts/commands/CleanBuildCommands/BuildCommand.py rename to scripts/TouchinBuild/commands/CleanBuildCommands/BuildCommand.py diff --git a/scripts/commands/CleanBuildCommands/CleanBuildCommandBase.py b/scripts/TouchinBuild/commands/CleanBuildCommands/CleanBuildCommandBase.py similarity index 100% rename from scripts/commands/CleanBuildCommands/CleanBuildCommandBase.py rename to scripts/TouchinBuild/commands/CleanBuildCommands/CleanBuildCommandBase.py diff --git a/scripts/commands/CleanBuildCommands/CleanCommand.py b/scripts/TouchinBuild/commands/CleanBuildCommands/CleanCommand.py similarity index 100% rename from scripts/commands/CleanBuildCommands/CleanCommand.py rename to scripts/TouchinBuild/commands/CleanBuildCommands/CleanCommand.py diff --git a/scripts/commands/CleanBuildCommands/__init__.py b/scripts/TouchinBuild/commands/CleanBuildCommands/__init__.py similarity index 100% rename from scripts/commands/CleanBuildCommands/__init__.py rename to scripts/TouchinBuild/commands/CleanBuildCommands/__init__.py diff --git a/scripts/commands/CopyCommand.py b/scripts/TouchinBuild/commands/CopyCommand.py similarity index 100% rename from scripts/commands/CopyCommand.py rename to scripts/TouchinBuild/commands/CopyCommand.py diff --git a/scripts/commands/CreateBackupCommand.py b/scripts/TouchinBuild/commands/CreateBackupCommand.py similarity index 100% rename from scripts/commands/CreateBackupCommand.py rename to scripts/TouchinBuild/commands/CreateBackupCommand.py diff --git a/scripts/commands/DeleteBackupCommand.py b/scripts/TouchinBuild/commands/DeleteBackupCommand.py similarity index 100% rename from scripts/commands/DeleteBackupCommand.py rename to scripts/TouchinBuild/commands/DeleteBackupCommand.py diff --git a/scripts/commands/MakeDirsCommand.py b/scripts/TouchinBuild/commands/MakeDirsCommand.py similarity index 100% rename from scripts/commands/MakeDirsCommand.py rename to scripts/TouchinBuild/commands/MakeDirsCommand.py diff --git a/scripts/commands/PatchCsprojCommand.py b/scripts/TouchinBuild/commands/PatchCsprojCommand.py similarity index 100% rename from scripts/commands/PatchCsprojCommand.py rename to scripts/TouchinBuild/commands/PatchCsprojCommand.py diff --git a/scripts/commands/PatchInfoPlistCommand.py b/scripts/TouchinBuild/commands/PatchInfoPlistCommand.py similarity index 100% rename from scripts/commands/PatchInfoPlistCommand.py rename to scripts/TouchinBuild/commands/PatchInfoPlistCommand.py diff --git a/scripts/commands/RemoveProjectCommand.py b/scripts/TouchinBuild/commands/RemoveProjectCommand.py similarity index 100% rename from scripts/commands/RemoveProjectCommand.py rename to scripts/TouchinBuild/commands/RemoveProjectCommand.py diff --git a/scripts/commands/RestoreBackupCommand.py b/scripts/TouchinBuild/commands/RestoreBackupCommand.py similarity index 100% rename from scripts/commands/RestoreBackupCommand.py rename to scripts/TouchinBuild/commands/RestoreBackupCommand.py diff --git a/scripts/commands/ShCommand.py b/scripts/TouchinBuild/commands/ShCommand.py similarity index 100% rename from scripts/commands/ShCommand.py rename to scripts/TouchinBuild/commands/ShCommand.py diff --git a/scripts/commands/TestflightCommand.py b/scripts/TouchinBuild/commands/TestflightCommand.py similarity index 100% rename from scripts/commands/TestflightCommand.py rename to scripts/TouchinBuild/commands/TestflightCommand.py diff --git a/scripts/commands/ValueProvider.py b/scripts/TouchinBuild/commands/ValueProvider.py similarity index 100% rename from scripts/commands/ValueProvider.py rename to scripts/TouchinBuild/commands/ValueProvider.py diff --git a/scripts/commands/__init__.py b/scripts/TouchinBuild/commands/__init__.py similarity index 100% rename from scripts/commands/__init__.py rename to scripts/TouchinBuild/commands/__init__.py diff --git a/scripts/parser/CleanBuildParser.py b/scripts/TouchinBuild/parsers/CleanBuildParser.py similarity index 95% rename from scripts/parser/CleanBuildParser.py rename to scripts/TouchinBuild/parsers/CleanBuildParser.py index fc45994..2f7ed14 100644 --- a/scripts/parser/CleanBuildParser.py +++ b/scripts/TouchinBuild/parsers/CleanBuildParser.py @@ -1,6 +1,6 @@ import re -from parser.LineParser import LineParser +from parsers.LineParser import LineParser class CleanBuildParser(LineParser): diff --git a/scripts/parser/CopyParser/CopyArguments.py b/scripts/TouchinBuild/parsers/CopyParser/CopyArguments.py similarity index 100% rename from scripts/parser/CopyParser/CopyArguments.py rename to scripts/TouchinBuild/parsers/CopyParser/CopyArguments.py diff --git a/scripts/parser/CopyParser/CopyLineParser.py b/scripts/TouchinBuild/parsers/CopyParser/CopyLineParser.py similarity index 86% rename from scripts/parser/CopyParser/CopyLineParser.py rename to scripts/TouchinBuild/parsers/CopyParser/CopyLineParser.py index 4d77a66..9a99db9 100644 --- a/scripts/parser/CopyParser/CopyLineParser.py +++ b/scripts/TouchinBuild/parsers/CopyParser/CopyLineParser.py @@ -1,7 +1,7 @@ import re -from parser.CopyParser.CopyArguments import CopyArguments -from parser.LineParser import LineParser +from parsers.CopyParser.CopyArguments import CopyArguments +from parsers.LineParser import LineParser class CopyLineParser(LineParser): diff --git a/scripts/parser/BackupParser/__init__.py b/scripts/TouchinBuild/parsers/CopyParser/__init__.py similarity index 100% rename from scripts/parser/BackupParser/__init__.py rename to scripts/TouchinBuild/parsers/CopyParser/__init__.py diff --git a/scripts/parser/InsideParser/InsideRemoveParser.py b/scripts/TouchinBuild/parsers/InsideParser/InsideRemoveParser.py similarity index 92% rename from scripts/parser/InsideParser/InsideRemoveParser.py rename to scripts/TouchinBuild/parsers/InsideParser/InsideRemoveParser.py index e533c7a..9618259 100644 --- a/scripts/parser/InsideParser/InsideRemoveParser.py +++ b/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): diff --git a/scripts/parser/InsideParser/InsideSetParser.py b/scripts/TouchinBuild/parsers/InsideParser/InsideSetParser.py similarity index 93% rename from scripts/parser/InsideParser/InsideSetParser.py rename to scripts/TouchinBuild/parsers/InsideParser/InsideSetParser.py index 1644a4d..cef95f6 100644 --- a/scripts/parser/InsideParser/InsideSetParser.py +++ b/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): diff --git a/scripts/parser/CopyParser/__init__.py b/scripts/TouchinBuild/parsers/InsideParser/__init__.py similarity index 100% rename from scripts/parser/CopyParser/__init__.py rename to scripts/TouchinBuild/parsers/InsideParser/__init__.py diff --git a/scripts/parser/InstallProfileParser.py b/scripts/TouchinBuild/parsers/InstallProfileParser.py similarity index 87% rename from scripts/parser/InstallProfileParser.py rename to scripts/TouchinBuild/parsers/InstallProfileParser.py index 2075bb3..d70797c 100644 --- a/scripts/parser/InstallProfileParser.py +++ b/scripts/TouchinBuild/parsers/InstallProfileParser.py @@ -1,7 +1,7 @@ import re import os -from parser.CopyParser.CopyArguments import CopyArguments -from parser.LineParser import LineParser +from parsers.CopyParser.CopyArguments import CopyArguments +from parsers.LineParser import LineParser class InstallProfileParser(LineParser): diff --git a/scripts/parser/LineParser.py b/scripts/TouchinBuild/parsers/LineParser.py similarity index 100% rename from scripts/parser/LineParser.py rename to scripts/TouchinBuild/parsers/LineParser.py diff --git a/scripts/parser/MakeDirsParser.py b/scripts/TouchinBuild/parsers/MakeDirsParser.py similarity index 92% rename from scripts/parser/MakeDirsParser.py rename to scripts/TouchinBuild/parsers/MakeDirsParser.py index 2ec28ae..8345596 100644 --- a/scripts/parser/MakeDirsParser.py +++ b/scripts/TouchinBuild/parsers/MakeDirsParser.py @@ -1,6 +1,6 @@ import re -from parser.LineParser import LineParser +from parsers.LineParser import LineParser class MakeDirsParser(LineParser): diff --git a/scripts/parser/BackupParser/CreateBackupArguments.py b/scripts/TouchinBuild/parsers/ParserBackup/CreateBackupArguments.py similarity index 100% rename from scripts/parser/BackupParser/CreateBackupArguments.py rename to scripts/TouchinBuild/parsers/ParserBackup/CreateBackupArguments.py diff --git a/scripts/parser/BackupParser/CreateBackupParser.py b/scripts/TouchinBuild/parsers/ParserBackup/CreateBackupParser.py similarity index 85% rename from scripts/parser/BackupParser/CreateBackupParser.py rename to scripts/TouchinBuild/parsers/ParserBackup/CreateBackupParser.py index acf90ba..f8a782c 100644 --- a/scripts/parser/BackupParser/CreateBackupParser.py +++ b/scripts/TouchinBuild/parsers/ParserBackup/CreateBackupParser.py @@ -1,7 +1,7 @@ import re -from parser.BackupParser.CreateBackupArguments import CreateBackupArguments -from parser.LineParser import LineParser +from parsers.ParserBackup.CreateBackupArguments import CreateBackupArguments +from parsers.LineParser import LineParser class CreateBackupParser(LineParser): diff --git a/scripts/parser/BackupParser/DeleteBackupParser.py b/scripts/TouchinBuild/parsers/ParserBackup/DeleteBackupParser.py similarity index 91% rename from scripts/parser/BackupParser/DeleteBackupParser.py rename to scripts/TouchinBuild/parsers/ParserBackup/DeleteBackupParser.py index 381a694..2b4e3cc 100644 --- a/scripts/parser/BackupParser/DeleteBackupParser.py +++ b/scripts/TouchinBuild/parsers/ParserBackup/DeleteBackupParser.py @@ -1,6 +1,6 @@ import re -from parser.LineParser import LineParser +from parsers.LineParser import LineParser class DeleteBackupParser(LineParser): diff --git a/scripts/parser/BackupParser/RestoreBackupParser.py b/scripts/TouchinBuild/parsers/ParserBackup/RestoreBackupParser.py similarity index 91% rename from scripts/parser/BackupParser/RestoreBackupParser.py rename to scripts/TouchinBuild/parsers/ParserBackup/RestoreBackupParser.py index 6dc834a..6357ed5 100644 --- a/scripts/parser/BackupParser/RestoreBackupParser.py +++ b/scripts/TouchinBuild/parsers/ParserBackup/RestoreBackupParser.py @@ -1,6 +1,6 @@ import re -from parser.LineParser import LineParser +from parsers.LineParser import LineParser class RestoreBackupParser(LineParser): diff --git a/scripts/parser/InsideParser/__init__.py b/scripts/TouchinBuild/parsers/ParserBackup/__init__.py similarity index 100% rename from scripts/parser/InsideParser/__init__.py rename to scripts/TouchinBuild/parsers/ParserBackup/__init__.py diff --git a/scripts/parser/SettingsParser/PathParser.py b/scripts/TouchinBuild/parsers/SettingsParser/PathParser.py similarity index 100% rename from scripts/parser/SettingsParser/PathParser.py rename to scripts/TouchinBuild/parsers/SettingsParser/PathParser.py diff --git a/scripts/parser/SettingsParser/SettingsLineParser.py b/scripts/TouchinBuild/parsers/SettingsParser/SettingsLineParser.py similarity index 86% rename from scripts/parser/SettingsParser/SettingsLineParser.py rename to scripts/TouchinBuild/parsers/SettingsParser/SettingsLineParser.py index b3713e1..e7e6ca2 100644 --- a/scripts/parser/SettingsParser/SettingsLineParser.py +++ b/scripts/TouchinBuild/parsers/SettingsParser/SettingsLineParser.py @@ -1,7 +1,7 @@ import re -from parser.LineParser import LineParser -from parser.SettingsParser.PathParser import PathParser +from parsers.LineParser import LineParser +from parsers.SettingsParser.PathParser import PathParser class SettingsLineParser(LineParser): diff --git a/scripts/parser/SettingsParser/SettingsMerger.py b/scripts/TouchinBuild/parsers/SettingsParser/SettingsMerger.py similarity index 100% rename from scripts/parser/SettingsParser/SettingsMerger.py rename to scripts/TouchinBuild/parsers/SettingsParser/SettingsMerger.py diff --git a/scripts/parser/SettingsParser/SettingsParser.py b/scripts/TouchinBuild/parsers/SettingsParser/SettingsParser.py similarity index 76% rename from scripts/parser/SettingsParser/SettingsParser.py rename to scripts/TouchinBuild/parsers/SettingsParser/SettingsParser.py index 1e55f43..268d8d3 100644 --- a/scripts/parser/SettingsParser/SettingsParser.py +++ b/scripts/TouchinBuild/parsers/SettingsParser/SettingsParser.py @@ -1,5 +1,5 @@ -from parser.SettingsParser.SettingsLineParser import SettingsLineParser -from parser.SettingsParser.SettingsMerger import SettingsMerger +from parsers.SettingsParser.SettingsLineParser import SettingsLineParser +from parsers.SettingsParser.SettingsMerger import SettingsMerger class SettingsParser: diff --git a/scripts/parser/SettingsParser/__init__.py b/scripts/TouchinBuild/parsers/SettingsParser/__init__.py similarity index 100% rename from scripts/parser/SettingsParser/__init__.py rename to scripts/TouchinBuild/parsers/SettingsParser/__init__.py diff --git a/scripts/parser/ShParser.py b/scripts/TouchinBuild/parsers/ShParser.py similarity index 92% rename from scripts/parser/ShParser.py rename to scripts/TouchinBuild/parsers/ShParser.py index 4a65cdb..6e39807 100644 --- a/scripts/parser/ShParser.py +++ b/scripts/TouchinBuild/parsers/ShParser.py @@ -1,6 +1,6 @@ import re -from parser.LineParser import LineParser +from parsers.LineParser import LineParser class ShParser(LineParser): diff --git a/scripts/parser/TestflightParser.py b/scripts/TouchinBuild/parsers/TestflightParser.py similarity index 93% rename from scripts/parser/TestflightParser.py rename to scripts/TouchinBuild/parsers/TestflightParser.py index 8ba1d91..b27f471 100644 --- a/scripts/parser/TestflightParser.py +++ b/scripts/TouchinBuild/parsers/TestflightParser.py @@ -1,4 +1,4 @@ -from parser.LineParser import LineParser +from parsers.LineParser import LineParser import re class TestflightParser(LineParser): diff --git a/scripts/parser/__init__.py b/scripts/TouchinBuild/parsers/__init__.py similarity index 100% rename from scripts/parser/__init__.py rename to scripts/TouchinBuild/parsers/__init__.py diff --git a/scripts/run_manual_tests.py b/scripts/TouchinBuild/run_manual_tests.py similarity index 100% rename from scripts/run_manual_tests.py rename to scripts/TouchinBuild/run_manual_tests.py diff --git a/scripts/taskRunner.py b/scripts/TouchinBuild/taskRunner.py old mode 100644 new mode 100755 similarity index 93% rename from scripts/taskRunner.py rename to scripts/TouchinBuild/taskRunner.py index 07dda9c..6e8cf02 --- a/scripts/taskRunner.py +++ b/scripts/TouchinBuild/taskRunner.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python # -*- coding: utf-8 -*- import os import argparse @@ -13,16 +14,16 @@ from utils.IncludeProcessor import IncludeProcessor from utils.MacroProcessor import MacroProcessor from utils.SettingsProvider.CmdArgsOverriderSettingsProvider import CmdArgsOverriderSettingsProvider from utils.SettingsProvider.FromFileSettingsProvider import FromFileSettingsProvider - -scriptFilePath = os.path.abspath(__file__) - -scriptDir = os.path.dirname(scriptFilePath) -baseDir = os.path.join(scriptDir, os.pardir) - -os.chdir(baseDir) - from Core.StepsRunner import StepsRunner +#scriptFilePath = os.path.abspath(__file__) +# +#scriptDir = os.path.dirname(scriptFilePath) +#baseDir = os.path.join(scriptDir, os.pardir) +# +#os.chdir(baseDir) + + class TaskRunner: def __init__(self, settingsProvider): diff --git a/scripts/utils/BuildConfigProvider.py b/scripts/TouchinBuild/utils/BuildConfigProvider.py similarity index 100% rename from scripts/utils/BuildConfigProvider.py rename to scripts/TouchinBuild/utils/BuildConfigProvider.py diff --git a/scripts/utils/CsprojPatcher.py b/scripts/TouchinBuild/utils/CsprojPatcher.py similarity index 100% rename from scripts/utils/CsprojPatcher.py rename to scripts/TouchinBuild/utils/CsprojPatcher.py diff --git a/scripts/utils/IncludeProcessor.py b/scripts/TouchinBuild/utils/IncludeProcessor.py similarity index 92% rename from scripts/utils/IncludeProcessor.py rename to scripts/TouchinBuild/utils/IncludeProcessor.py index 32545e8..132c0dd 100644 --- a/scripts/utils/IncludeProcessor.py +++ b/scripts/TouchinBuild/utils/IncludeProcessor.py @@ -1,5 +1,5 @@ import re -from parser.LineParser import LineParser +from parsers.LineParser import LineParser class IncludeProcessor(LineParser): diff --git a/scripts/utils/InfoPlistPatcher.py b/scripts/TouchinBuild/utils/InfoPlistPatcher.py similarity index 100% rename from scripts/utils/InfoPlistPatcher.py rename to scripts/TouchinBuild/utils/InfoPlistPatcher.py diff --git a/scripts/utils/MacroProcessor.py b/scripts/TouchinBuild/utils/MacroProcessor.py similarity index 100% rename from scripts/utils/MacroProcessor.py rename to scripts/TouchinBuild/utils/MacroProcessor.py diff --git a/scripts/utils/SettingsProvider/CmdArgsOverriderSettingsProvider.py b/scripts/TouchinBuild/utils/SettingsProvider/CmdArgsOverriderSettingsProvider.py similarity index 91% rename from scripts/utils/SettingsProvider/CmdArgsOverriderSettingsProvider.py rename to scripts/TouchinBuild/utils/SettingsProvider/CmdArgsOverriderSettingsProvider.py index 533c289..c9a7438 100644 --- a/scripts/utils/SettingsProvider/CmdArgsOverriderSettingsProvider.py +++ b/scripts/TouchinBuild/utils/SettingsProvider/CmdArgsOverriderSettingsProvider.py @@ -1,5 +1,5 @@ import select -from parser.SettingsParser.SettingsParser import SettingsParser +from parsers.SettingsParser.SettingsParser import SettingsParser class CmdArgsOverriderSettingsProvider: diff --git a/scripts/utils/SettingsProvider/FromFileSettingsProvider.py b/scripts/TouchinBuild/utils/SettingsProvider/FromFileSettingsProvider.py similarity index 79% rename from scripts/utils/SettingsProvider/FromFileSettingsProvider.py rename to scripts/TouchinBuild/utils/SettingsProvider/FromFileSettingsProvider.py index 7164d9f..3fb9d6e 100644 --- a/scripts/utils/SettingsProvider/FromFileSettingsProvider.py +++ b/scripts/TouchinBuild/utils/SettingsProvider/FromFileSettingsProvider.py @@ -1,4 +1,4 @@ -from parser.SettingsParser.SettingsParser import SettingsParser +from parsers.SettingsParser.SettingsParser import SettingsParser class FromFileSettingsProvider: diff --git a/scripts/utils/SettingsProvider/__init__.py b/scripts/TouchinBuild/utils/SettingsProvider/__init__.py similarity index 100% rename from scripts/utils/SettingsProvider/__init__.py rename to scripts/TouchinBuild/utils/SettingsProvider/__init__.py diff --git a/scripts/utils/SlnPatcher.py b/scripts/TouchinBuild/utils/SlnPatcher.py similarity index 100% rename from scripts/utils/SlnPatcher.py rename to scripts/TouchinBuild/utils/SlnPatcher.py diff --git a/scripts/utils/TestflightPublisher.py b/scripts/TouchinBuild/utils/TestflightPublisher.py similarity index 100% rename from scripts/utils/TestflightPublisher.py rename to scripts/TouchinBuild/utils/TestflightPublisher.py diff --git a/scripts/utils/__init__.py b/scripts/TouchinBuild/utils/__init__.py similarity index 100% rename from scripts/utils/__init__.py rename to scripts/TouchinBuild/utils/__init__.py diff --git a/scripts/build b/scripts/build deleted file mode 100644 index 0f3fb6d..0000000 --- a/scripts/build +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -python setup.py sdist \ No newline at end of file diff --git a/scripts/setup.py b/scripts/setup.py index c51cdf6..027b095 100644 --- a/scripts/setup.py +++ b/scripts/setup.py @@ -1,15 +1,48 @@ +import sys +import os +import stat +import argparse from distutils.core import setup -setup(name= 'TouchinBuild', - version= '0.0.10', - packages= ['Core', 'Core.LineConveyor', - 'utils', 'utils.SettingsProvider', - 'parser', 'parser.CopyParser', 'parser.BackupParser', 'parser.InsideParser', 'parser.SettingsParser', - 'commands', 'commands.CleanBuildCommands', - 'CommandBuilders'], +print sys.argv +parser = argparse.ArgumentParser() +parser.add_argument('install') +args = parser.parse_known_args()[0] + +packageName = 'TouchinBuild' +version = '0.0.13' + +setup(name= packageName, + version= version, + + py_modules=['TouchinBuild.taskRunner'], + packages= ['TouchinBuild.Core', 'TouchinBuild.Core.LineConveyor', + 'TouchinBuild.utils', 'TouchinBuild.utils.SettingsProvider', + 'TouchinBuild.parsers', 'TouchinBuild.parsers.CopyParser', 'TouchinBuild.parsers.ParserBackup', 'TouchinBuild.parsers.InsideParser', 'TouchinBuild.parsers.SettingsParser', + 'TouchinBuild.commands', 'TouchinBuild.commands.CleanBuildCommands', + 'TouchinBuild.CommandBuilders'], + url = 'http://touchin.ru', - license = 'All rights reserved.', + license = 'BSD License', description = 'Build tool for Touchin', author = 'Rustam Zaitov', - author_email = 'rustam.zaitov@touchin.ru' + author_email = 'rustam.zaitov [at] touchin.ru', + maintainer= 'Rustam Zaitov', + maintainer_email='rustam.zaitov [at] touchin.ru', ) + +if args.install == 'install': + libPath = os.path.join(sys.prefix, 'lib') + dirsNames = os.listdir(libPath) + pythonDir = [name for name in dirsNames if name.startswith('python')][0] + executable = os.path.join(libPath, pythonDir, 'site-packages', packageName, 'taskRunner.py') + + symlink = '/usr/local/bin/tibuild' + try: + os.unlink(symlink) + except OSError: + print 'warning: symlink file {0} is not exist'.format(symlink) + + st = os.stat(executable) + os.chmod(executable, st.st_mode | stat.S_IEXEC) + os.symlink(executable, symlink) \ No newline at end of file