From c8e829c219c65ff8e93b6c7b66212ff0876441c5 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Tue, 27 Dec 2022 22:52:34 +0200 Subject: [PATCH 1/1] Rearrange sources into subdirectories --- .gitignore | 9 +++ Build | 61 ++++++++++++++++++- .../android}/androidapplicationcomponent.cpp | 12 ++-- .../android}/androidapplicationcomponent.h | 2 +- .../android}/androidarchiver.cpp | 0 {source => plugins/android}/androidarchiver.h | 2 +- .../android}/androidassetpackagingtool.cpp | 4 +- .../android}/androidassetpackagingtool.h | 2 +- .../android}/androidcompiler.cpp | 6 +- {source => plugins/android}/androidcompiler.h | 2 +- {source => plugins/android}/androidlinker.cpp | 0 {source => plugins/android}/androidlinker.h | 2 +- .../android}/androidmanifestfile.cpp | 4 +- .../android}/androidmanifestfile.h | 2 +- .../android}/androidmanifestgenerator.cpp | 7 +-- .../android}/androidmanifestgenerator.h | 2 +- .../android}/androidpackagefile.cpp | 4 +- .../android}/androidpackagefile.h | 2 +- .../android}/androidresourcebundle.cpp | 4 +- .../android}/androidresourcebundle.h | 2 +- .../android}/androidresourcefile.cpp | 2 +- .../android}/androidresourcefile.h | 2 +- {source => plugins/android}/androidtools.cpp | 4 +- {source => plugins/android}/androidtools.h | 2 +- {source => plugins/android}/apkbuilder.cpp | 12 ++-- {source => plugins/android}/apkbuilder.h | 2 +- {source => plugins/android}/jarsigner.cpp | 6 +- {source => plugins/android}/jarsigner.h | 2 +- {source => plugins/builtin}/builtintools.cpp | 0 {source => plugins/builtin}/builtintools.h | 2 +- .../builtin}/compilecommandsgenerator.cpp | 7 +-- .../builtin}/compilecommandsgenerator.h | 2 +- .../builtin}/compilecommandsjson.cpp | 6 +- .../builtin}/compilecommandsjson.h | 4 +- {source => plugins/builtin}/copy.cpp | 5 +- {source => plugins/builtin}/copy.h | 2 +- {source => plugins/builtin}/pkgconfigfile.cpp | 4 +- {source => plugins/builtin}/pkgconfigfile.h | 4 +- .../builtin}/pkgconfiggenerator.cpp | 3 +- .../builtin}/pkgconfiggenerator.h | 2 +- {source => plugins/builtin}/tar.cpp | 5 +- {source => plugins/builtin}/tar.h | 2 +- {source => plugins/builtin}/tarball.cpp | 2 +- {source => plugins/builtin}/tarball.h | 2 +- .../builtin}/vcxprojectfile.cpp | 4 +- {source => plugins/builtin}/vcxprojectfile.h | 2 +- .../builtin}/vcxprojectgenerator.cpp | 9 ++- .../builtin}/vcxprojectgenerator.h | 2 +- .../builtin}/vssolutionfile.cpp | 4 +- {source => plugins/builtin}/vssolutionfile.h | 2 +- .../builtin}/vssolutiongenerator.cpp | 5 +- .../builtin}/vssolutiongenerator.h | 2 +- {source => plugins/clang}/clangcompiler.cpp | 0 {source => plugins/clang}/clangcompiler.h | 2 +- {source => plugins/clang}/clanglinker.cpp | 2 +- {source => plugins/clang}/clanglinker.h | 2 +- {source => plugins/clang}/clangtools.cpp | 2 +- {source => plugins/clang}/clangtools.h | 2 +- .../datafile}/datacollection.cpp | 4 +- {source => plugins/datafile}/datacollection.h | 2 +- {source => plugins/datafile}/datapack.cpp | 4 +- {source => plugins/datafile}/datapack.h | 2 +- .../datafile}/datapackcomponent.cpp | 6 +- .../datafile}/datapackcomponent.h | 2 +- {source => plugins/datafile}/datasourcefile.h | 2 +- {source => plugins/datafile}/datatool.cpp | 8 +-- {source => plugins/datafile}/datatool.h | 2 +- .../datafile}/datatransform.cpp | 10 +-- {source => plugins/datafile}/datatransform.h | 2 +- {source => plugins/gnu}/gnuarchiver.cpp | 15 +++-- {source => plugins/gnu}/gnuarchiver.h | 2 +- {source => plugins/gnu}/gnucompiler.cpp | 16 ++--- {source => plugins/gnu}/gnucompiler.h | 2 +- {source => plugins/gnu}/gnulinker.cpp | 20 +++--- {source => plugins/gnu}/gnulinker.h | 2 +- {source => plugins/gnu}/gnutools.cpp | 2 +- {source => plugins/gnu}/gnutools.h | 2 +- {source => plugins/gnu}/mingwdlltool.cpp | 18 +++--- {source => plugins/gnu}/mingwdlltool.h | 2 +- {source => plugins/msvc}/microsofttools.cpp | 8 +-- {source => plugins/msvc}/microsofttools.h | 2 +- {source => plugins/msvc}/msvcarchiver.cpp | 8 +-- {source => plugins/msvc}/msvcarchiver.h | 2 +- {source => plugins/msvc}/msvccompiler.cpp | 10 +-- {source => plugins/msvc}/msvccompiler.h | 2 +- {source => plugins/msvc}/msvclinker.cpp | 16 ++--- {source => plugins/msvc}/msvclinker.h | 2 +- source/{ => cli}/analyzer.cpp | 14 ++--- source/{ => cli}/analyzer.h | 0 source/{ => cli}/buildercli.cpp | 8 +-- source/{ => cli}/buildercli.h | 2 +- source/{ => lib}/architecture.cpp | 0 source/{ => lib}/architecture.h | 0 source/{ => lib}/binary.cpp | 0 source/{ => lib}/binary.h | 0 source/{ => lib}/binarycomponent.cpp | 0 source/{ => lib}/binarycomponent.h | 0 source/{ => lib}/binarypackage.cpp | 0 source/{ => lib}/binarypackage.h | 0 source/{ => lib}/booleanevaluator.cpp | 0 source/{ => lib}/booleanevaluator.h | 0 source/{ => lib}/builder.cpp | 12 ++-- source/{ => lib}/builder.h | 0 source/{ => lib}/buildgraph.cpp | 0 source/{ => lib}/buildgraph.h | 0 source/{ => lib}/buildinfo.cpp | 0 source/{ => lib}/buildinfo.h | 0 source/{ => lib}/buildtype.cpp | 0 source/{ => lib}/buildtype.h | 0 source/{ => lib}/cache.cpp | 0 source/{ => lib}/cache.h | 0 source/{ => lib}/chainedtask.cpp | 0 source/{ => lib}/chainedtask.h | 0 source/{ => lib}/component.cpp | 0 source/{ => lib}/component.h | 0 source/{ => lib}/conditionalloader.cpp | 0 source/{ => lib}/conditionalloader.h | 0 source/{ => lib}/config.cpp | 0 source/{ => lib}/config.h | 0 source/{ => lib}/csourcefile.cpp | 0 source/{ => lib}/csourcefile.h | 0 source/{ => lib}/customizedtool.cpp | 0 source/{ => lib}/customizedtool.h | 0 source/{ => lib}/executable.cpp | 0 source/{ => lib}/executable.h | 0 source/{ => lib}/exportdefinitions.cpp | 0 source/{ => lib}/exportdefinitions.h | 0 source/{ => lib}/externaltask.cpp | 0 source/{ => lib}/externaltask.h | 0 source/{ => lib}/feature.cpp | 0 source/{ => lib}/feature.h | 0 source/{ => lib}/file.h | 0 source/{ => lib}/filetarget.cpp | 0 source/{ => lib}/filetarget.h | 0 source/{ => lib}/importlibrary.cpp | 0 source/{ => lib}/importlibrary.h | 0 source/{ => lib}/installcomponent.cpp | 0 source/{ => lib}/installcomponent.h | 0 source/{ => lib}/installedfile.cpp | 0 source/{ => lib}/installedfile.h | 0 source/{ => lib}/installmap.cpp | 0 source/{ => lib}/installmap.h | 0 source/{ => lib}/internaltask.cpp | 0 source/{ => lib}/internaltask.h | 0 source/{ => lib}/logger.cpp | 0 source/{ => lib}/logger.h | 0 source/{ => lib}/objcsourcefile.cpp | 0 source/{ => lib}/objcsourcefile.h | 0 source/{ => lib}/objectfile.cpp | 0 source/{ => lib}/objectfile.h | 0 source/{ => lib}/package.cpp | 0 source/{ => lib}/package.h | 0 source/{ => lib}/packagemanager.cpp | 0 source/{ => lib}/packagemanager.h | 0 source/{ => lib}/pattern.cpp | 0 source/{ => lib}/pattern.h | 0 source/{ => lib}/sharedlibrary.cpp | 0 source/{ => lib}/sharedlibrary.h | 0 source/{ => lib}/sourcearchivecomponent.cpp | 0 source/{ => lib}/sourcearchivecomponent.h | 0 source/{ => lib}/sourcefile.cpp | 0 source/{ => lib}/sourcefile.h | 0 source/{ => lib}/sourcegenerator.cpp | 0 source/{ => lib}/sourcegenerator.h | 0 source/{ => lib}/sourcepackage.cpp | 12 ++-- source/{ => lib}/sourcepackage.h | 0 source/{ => lib}/staticlibrary.cpp | 0 source/{ => lib}/staticlibrary.h | 0 source/{ => lib}/sysutils.cpp | 0 source/{ => lib}/sysutils.h | 0 source/{ => lib}/target.cpp | 0 source/{ => lib}/target.h | 0 source/{ => lib}/task.cpp | 0 source/{ => lib}/task.h | 0 source/{ => lib}/templatefile.h | 0 source/{ => lib}/tool.cpp | 0 source/{ => lib}/tool.h | 0 source/{ => lib}/toolchain.cpp | 0 source/{ => lib}/toolchain.h | 0 source/{ => lib}/virtualfilesystem.cpp | 0 source/{ => lib}/virtualfilesystem.h | 0 source/{ => lib}/virtualtarget.cpp | 0 source/{ => lib}/virtualtarget.h | 0 183 files changed, 267 insertions(+), 209 deletions(-) rename {source => plugins/android}/androidapplicationcomponent.cpp (92%) rename {source => plugins/android}/androidapplicationcomponent.h (94%) rename {source => plugins/android}/androidarchiver.cpp (100%) rename {source => plugins/android}/androidarchiver.h (84%) rename {source => plugins/android}/androidassetpackagingtool.cpp (97%) rename {source => plugins/android}/androidassetpackagingtool.h (93%) rename {source => plugins/android}/androidcompiler.cpp (95%) rename {source => plugins/android}/androidcompiler.h (89%) rename {source => plugins/android}/androidlinker.cpp (100%) rename {source => plugins/android}/androidlinker.h (87%) rename {source => plugins/android}/androidmanifestfile.cpp (91%) rename {source => plugins/android}/androidmanifestfile.h (95%) rename {source => plugins/android}/androidmanifestgenerator.cpp (94%) rename {source => plugins/android}/androidmanifestgenerator.h (92%) rename {source => plugins/android}/androidpackagefile.cpp (85%) rename {source => plugins/android}/androidpackagefile.h (90%) rename {source => plugins/android}/androidresourcebundle.cpp (85%) rename {source => plugins/android}/androidresourcebundle.h (90%) rename {source => plugins/android}/androidresourcefile.cpp (93%) rename {source => plugins/android}/androidresourcefile.h (91%) rename {source => plugins/android}/androidtools.cpp (98%) rename {source => plugins/android}/androidtools.h (98%) rename {source => plugins/android}/apkbuilder.cpp (91%) rename {source => plugins/android}/apkbuilder.h (91%) rename {source => plugins/android}/jarsigner.cpp (89%) rename {source => plugins/android}/jarsigner.h (91%) rename {source => plugins/builtin}/builtintools.cpp (100%) rename {source => plugins/builtin}/builtintools.h (81%) rename {source => plugins/builtin}/compilecommandsgenerator.cpp (93%) rename {source => plugins/builtin}/compilecommandsgenerator.h (92%) rename {source => plugins/builtin}/compilecommandsjson.cpp (82%) rename {source => plugins/builtin}/compilecommandsjson.h (80%) rename {source => plugins/builtin}/copy.cpp (95%) rename {source => plugins/builtin}/copy.h (91%) rename {source => plugins/builtin}/pkgconfigfile.cpp (79%) rename {source => plugins/builtin}/pkgconfigfile.h (80%) rename {source => plugins/builtin}/pkgconfiggenerator.cpp (97%) rename {source => plugins/builtin}/pkgconfiggenerator.h (92%) rename {source => plugins/builtin}/tar.cpp (96%) rename {source => plugins/builtin}/tar.h (90%) rename {source => plugins/builtin}/tarball.cpp (88%) rename {source => plugins/builtin}/tarball.h (88%) rename {source => plugins/builtin}/vcxprojectfile.cpp (89%) rename {source => plugins/builtin}/vcxprojectfile.h (89%) rename {source => plugins/builtin}/vcxprojectgenerator.cpp (97%) rename {source => plugins/builtin}/vcxprojectgenerator.h (91%) rename {source => plugins/builtin}/vssolutionfile.cpp (92%) rename {source => plugins/builtin}/vssolutionfile.h (88%) rename {source => plugins/builtin}/vssolutiongenerator.cpp (96%) rename {source => plugins/builtin}/vssolutiongenerator.h (91%) rename {source => plugins/clang}/clangcompiler.cpp (100%) rename {source => plugins/clang}/clangcompiler.h (82%) rename {source => plugins/clang}/clanglinker.cpp (94%) rename {source => plugins/clang}/clanglinker.h (84%) rename {source => plugins/clang}/clangtools.cpp (94%) rename {source => plugins/clang}/clangtools.h (86%) rename {source => plugins/datafile}/datacollection.cpp (90%) rename {source => plugins/datafile}/datacollection.h (93%) rename {source => plugins/datafile}/datapack.cpp (86%) rename {source => plugins/datafile}/datapack.h (92%) rename {source => plugins/datafile}/datapackcomponent.cpp (90%) rename {source => plugins/datafile}/datapackcomponent.h (86%) rename {source => plugins/datafile}/datasourcefile.h (90%) rename {source => plugins/datafile}/datatool.cpp (94%) rename {source => plugins/datafile}/datatool.h (93%) rename {source => plugins/datafile}/datatransform.cpp (91%) rename {source => plugins/datafile}/datatransform.h (90%) rename {source => plugins/gnu}/gnuarchiver.cpp (85%) rename {source => plugins/gnu}/gnuarchiver.h (91%) rename {source => plugins/gnu}/gnucompiler.cpp (96%) rename {source => plugins/gnu}/gnucompiler.h (97%) rename {source => plugins/gnu}/gnulinker.cpp (95%) rename {source => plugins/gnu}/gnulinker.h (96%) rename {source => plugins/gnu}/gnutools.cpp (94%) rename {source => plugins/gnu}/gnutools.h (86%) rename {source => plugins/gnu}/mingwdlltool.cpp (90%) rename {source => plugins/gnu}/mingwdlltool.h (91%) rename {source => plugins/msvc}/microsofttools.cpp (95%) rename {source => plugins/msvc}/microsofttools.h (95%) rename {source => plugins/msvc}/msvcarchiver.cpp (90%) rename {source => plugins/msvc}/msvcarchiver.h (93%) rename {source => plugins/msvc}/msvccompiler.cpp (96%) rename {source => plugins/msvc}/msvccompiler.h (96%) rename {source => plugins/msvc}/msvclinker.cpp (91%) rename {source => plugins/msvc}/msvclinker.h (94%) rename source/{ => cli}/analyzer.cpp (93%) rename source/{ => cli}/analyzer.h (100%) rename source/{ => cli}/buildercli.cpp (98%) rename source/{ => cli}/buildercli.h (96%) rename source/{ => lib}/architecture.cpp (100%) rename source/{ => lib}/architecture.h (100%) rename source/{ => lib}/binary.cpp (100%) rename source/{ => lib}/binary.h (100%) rename source/{ => lib}/binarycomponent.cpp (100%) rename source/{ => lib}/binarycomponent.h (100%) rename source/{ => lib}/binarypackage.cpp (100%) rename source/{ => lib}/binarypackage.h (100%) rename source/{ => lib}/booleanevaluator.cpp (100%) rename source/{ => lib}/booleanevaluator.h (100%) rename source/{ => lib}/builder.cpp (97%) rename source/{ => lib}/builder.h (100%) rename source/{ => lib}/buildgraph.cpp (100%) rename source/{ => lib}/buildgraph.h (100%) rename source/{ => lib}/buildinfo.cpp (100%) rename source/{ => lib}/buildinfo.h (100%) rename source/{ => lib}/buildtype.cpp (100%) rename source/{ => lib}/buildtype.h (100%) rename source/{ => lib}/cache.cpp (100%) rename source/{ => lib}/cache.h (100%) rename source/{ => lib}/chainedtask.cpp (100%) rename source/{ => lib}/chainedtask.h (100%) rename source/{ => lib}/component.cpp (100%) rename source/{ => lib}/component.h (100%) rename source/{ => lib}/conditionalloader.cpp (100%) rename source/{ => lib}/conditionalloader.h (100%) rename source/{ => lib}/config.cpp (100%) rename source/{ => lib}/config.h (100%) rename source/{ => lib}/csourcefile.cpp (100%) rename source/{ => lib}/csourcefile.h (100%) rename source/{ => lib}/customizedtool.cpp (100%) rename source/{ => lib}/customizedtool.h (100%) rename source/{ => lib}/executable.cpp (100%) rename source/{ => lib}/executable.h (100%) rename source/{ => lib}/exportdefinitions.cpp (100%) rename source/{ => lib}/exportdefinitions.h (100%) rename source/{ => lib}/externaltask.cpp (100%) rename source/{ => lib}/externaltask.h (100%) rename source/{ => lib}/feature.cpp (100%) rename source/{ => lib}/feature.h (100%) rename source/{ => lib}/file.h (100%) rename source/{ => lib}/filetarget.cpp (100%) rename source/{ => lib}/filetarget.h (100%) rename source/{ => lib}/importlibrary.cpp (100%) rename source/{ => lib}/importlibrary.h (100%) rename source/{ => lib}/installcomponent.cpp (100%) rename source/{ => lib}/installcomponent.h (100%) rename source/{ => lib}/installedfile.cpp (100%) rename source/{ => lib}/installedfile.h (100%) rename source/{ => lib}/installmap.cpp (100%) rename source/{ => lib}/installmap.h (100%) rename source/{ => lib}/internaltask.cpp (100%) rename source/{ => lib}/internaltask.h (100%) rename source/{ => lib}/logger.cpp (100%) rename source/{ => lib}/logger.h (100%) rename source/{ => lib}/objcsourcefile.cpp (100%) rename source/{ => lib}/objcsourcefile.h (100%) rename source/{ => lib}/objectfile.cpp (100%) rename source/{ => lib}/objectfile.h (100%) rename source/{ => lib}/package.cpp (100%) rename source/{ => lib}/package.h (100%) rename source/{ => lib}/packagemanager.cpp (100%) rename source/{ => lib}/packagemanager.h (100%) rename source/{ => lib}/pattern.cpp (100%) rename source/{ => lib}/pattern.h (100%) rename source/{ => lib}/sharedlibrary.cpp (100%) rename source/{ => lib}/sharedlibrary.h (100%) rename source/{ => lib}/sourcearchivecomponent.cpp (100%) rename source/{ => lib}/sourcearchivecomponent.h (100%) rename source/{ => lib}/sourcefile.cpp (100%) rename source/{ => lib}/sourcefile.h (100%) rename source/{ => lib}/sourcegenerator.cpp (100%) rename source/{ => lib}/sourcegenerator.h (100%) rename source/{ => lib}/sourcepackage.cpp (96%) rename source/{ => lib}/sourcepackage.h (100%) rename source/{ => lib}/staticlibrary.cpp (100%) rename source/{ => lib}/staticlibrary.h (100%) rename source/{ => lib}/sysutils.cpp (100%) rename source/{ => lib}/sysutils.h (100%) rename source/{ => lib}/target.cpp (100%) rename source/{ => lib}/target.h (100%) rename source/{ => lib}/task.cpp (100%) rename source/{ => lib}/task.h (100%) rename source/{ => lib}/templatefile.h (100%) rename source/{ => lib}/tool.cpp (100%) rename source/{ => lib}/tool.h (100%) rename source/{ => lib}/toolchain.cpp (100%) rename source/{ => lib}/toolchain.h (100%) rename source/{ => lib}/virtualfilesystem.cpp (100%) rename source/{ => lib}/virtualfilesystem.h (100%) rename source/{ => lib}/virtualtarget.cpp (100%) rename source/{ => lib}/virtualtarget.h (100%) diff --git a/.gitignore b/.gitignore index f2be0c3..e45ec7e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,13 @@ /.config /builder +/builder.pc /builder-stage1 +/libbuilder.a +/libbuilder.so +/libandroidtools.a +/libbuiltintools.a +/libclangtools.a +/libdatatools.a +/libgnutools.a +/libmsvctools.a /temp diff --git a/Build b/Build index 28ab0e2..74490dd 100644 --- a/Build +++ b/Build @@ -13,9 +13,55 @@ package "builder" standard CXX "c++11"; }; - program "builder" + library "builtintools" + { + source "plugins/builtin"; + default false; + }; + + library "gnutools" + { + source "plugins/gnu"; + default false; + }; + + library "clangtools" + { + source "plugins/clang"; + default false; + }; + + library "msvctools" + { + source "plugins/msvc"; + default false; + }; + + library "androidtools" + { + source "plugins/android"; + default false; + }; + + library "datatools" { - source "source"; + source "plugins/datafile"; + default false; + }; + + library "builder" + { + source "source/lib"; + use "builtintools"; + use "gnutools"; + use "clangtools"; + use "msvctools"; + use "androidtools"; + use "datatools"; + build_info + { + incpath "plugins"; + }; if_arch "windows" { build_info @@ -25,6 +71,17 @@ package "builder" }; }; install true; + install_map + { + map "source/lib" "include/msp/builder"; + }; + }; + + program "builder" + { + source "source/cli"; + use "builder"; + install true; }; source_archive diff --git a/source/androidapplicationcomponent.cpp b/plugins/android/androidapplicationcomponent.cpp similarity index 92% rename from source/androidapplicationcomponent.cpp rename to plugins/android/androidapplicationcomponent.cpp index e4feaa2..be7e31c 100644 --- a/source/androidapplicationcomponent.cpp +++ b/plugins/android/androidapplicationcomponent.cpp @@ -1,15 +1,15 @@ +#include +#include +#include +#include +#include +#include #include #include #include #include "androidapplicationcomponent.h" #include "androidmanifestfile.h" #include "androidresourcefile.h" -#include "builder.h" -#include "installedfile.h" -#include "sharedlibrary.h" -#include "sourcepackage.h" -#include "tool.h" -#include "toolchain.h" using namespace std; using namespace Msp; diff --git a/source/androidapplicationcomponent.h b/plugins/android/androidapplicationcomponent.h similarity index 94% rename from source/androidapplicationcomponent.h rename to plugins/android/androidapplicationcomponent.h index 9e19b6d..e1b30e2 100644 --- a/source/androidapplicationcomponent.h +++ b/plugins/android/androidapplicationcomponent.h @@ -1,7 +1,7 @@ #ifndef ANDROIDAPPLICATIONCOMPONENT_H_ #define ANDROIDAPPLICATIONCOMPONENT_H_ -#include "component.h" +#include class AndroidApplicationComponent: public Component { diff --git a/source/androidarchiver.cpp b/plugins/android/androidarchiver.cpp similarity index 100% rename from source/androidarchiver.cpp rename to plugins/android/androidarchiver.cpp diff --git a/source/androidarchiver.h b/plugins/android/androidarchiver.h similarity index 84% rename from source/androidarchiver.h rename to plugins/android/androidarchiver.h index a39fe54..032f832 100644 --- a/source/androidarchiver.h +++ b/plugins/android/androidarchiver.h @@ -1,7 +1,7 @@ #ifndef ANDROIDARCHIVER_H_ #define ANDROIDARCHIVER_H_ -#include "customizedtool.h" +#include class AndroidNdk; diff --git a/source/androidassetpackagingtool.cpp b/plugins/android/androidassetpackagingtool.cpp similarity index 97% rename from source/androidassetpackagingtool.cpp rename to plugins/android/androidassetpackagingtool.cpp index eb638e9..ba321cb 100644 --- a/source/androidassetpackagingtool.cpp +++ b/plugins/android/androidassetpackagingtool.cpp @@ -1,11 +1,11 @@ +#include +#include #include #include #include "androidassetpackagingtool.h" #include "androidmanifestfile.h" #include "androidresourcebundle.h" #include "androidtools.h" -#include "component.h" -#include "sourcepackage.h" using namespace std; using namespace Msp; diff --git a/source/androidassetpackagingtool.h b/plugins/android/androidassetpackagingtool.h similarity index 93% rename from source/androidassetpackagingtool.h rename to plugins/android/androidassetpackagingtool.h index 252870f..c03c097 100644 --- a/source/androidassetpackagingtool.h +++ b/plugins/android/androidassetpackagingtool.h @@ -1,7 +1,7 @@ #ifndef ANDROIDASSETPACKAGINGTOOL_H_ #define ANDROIDASSETPACKAGINGTOOL_H_ -#include "tool.h" +#include class AndroidResourceBundle; class AndroidSdk; diff --git a/source/androidcompiler.cpp b/plugins/android/androidcompiler.cpp similarity index 95% rename from source/androidcompiler.cpp rename to plugins/android/androidcompiler.cpp index 2321f03..b9d7add 100644 --- a/source/androidcompiler.cpp +++ b/plugins/android/androidcompiler.cpp @@ -1,3 +1,6 @@ +#include +#include +#include #include #include #include @@ -5,9 +8,6 @@ #include #include "androidcompiler.h" #include "androidtools.h" -#include "builder.h" -#include "externaltask.h" -#include "filetarget.h" using namespace std; using namespace Msp; diff --git a/source/androidcompiler.h b/plugins/android/androidcompiler.h similarity index 89% rename from source/androidcompiler.h rename to plugins/android/androidcompiler.h index 86dfa27..7bfbe11 100644 --- a/source/androidcompiler.h +++ b/plugins/android/androidcompiler.h @@ -1,7 +1,7 @@ #ifndef ANDROIDCOMPILER_H_ #define ANDROIDCOMPILER_H_ -#include "customizedtool.h" +#include class AndroidNdk; diff --git a/source/androidlinker.cpp b/plugins/android/androidlinker.cpp similarity index 100% rename from source/androidlinker.cpp rename to plugins/android/androidlinker.cpp diff --git a/source/androidlinker.h b/plugins/android/androidlinker.h similarity index 87% rename from source/androidlinker.h rename to plugins/android/androidlinker.h index 7418d3c..71d6bc4 100644 --- a/source/androidlinker.h +++ b/plugins/android/androidlinker.h @@ -1,7 +1,7 @@ #ifndef ANDROIDLINKER_H_ #define ANDROIDLINKER_H_ -#include "customizedtool.h" +#include class AndroidNdk; diff --git a/source/androidmanifestfile.cpp b/plugins/android/androidmanifestfile.cpp similarity index 91% rename from source/androidmanifestfile.cpp rename to plugins/android/androidmanifestfile.cpp index 2dd1c96..ce41769 100644 --- a/source/androidmanifestfile.cpp +++ b/plugins/android/androidmanifestfile.cpp @@ -1,8 +1,8 @@ +#include +#include #include #include "androidapplicationcomponent.h" #include "androidmanifestfile.h" -#include "builder.h" -#include "sourcepackage.h" using namespace std; using namespace Msp; diff --git a/source/androidmanifestfile.h b/plugins/android/androidmanifestfile.h similarity index 95% rename from source/androidmanifestfile.h rename to plugins/android/androidmanifestfile.h index 9c0ed21..ad6a2da 100644 --- a/source/androidmanifestfile.h +++ b/plugins/android/androidmanifestfile.h @@ -2,7 +2,7 @@ #define ANDROIDMANIFESTFILE_H_ #include -#include "filetarget.h" +#include class AndroidApplicationComponent; class SharedLibrary; diff --git a/source/androidmanifestgenerator.cpp b/plugins/android/androidmanifestgenerator.cpp similarity index 94% rename from source/androidmanifestgenerator.cpp rename to plugins/android/androidmanifestgenerator.cpp index 0c48982..cf03bee 100644 --- a/source/androidmanifestgenerator.cpp +++ b/plugins/android/androidmanifestgenerator.cpp @@ -1,11 +1,10 @@ +#include +#include +#include #include #include #include "androidmanifestfile.h" #include "androidmanifestgenerator.h" -#include "component.h" -#include "internaltask.h" -#include "sharedlibrary.h" -#include "sourcepackage.h" using namespace std; using namespace Msp; diff --git a/source/androidmanifestgenerator.h b/plugins/android/androidmanifestgenerator.h similarity index 92% rename from source/androidmanifestgenerator.h rename to plugins/android/androidmanifestgenerator.h index 58fc0b2..d1d1531 100644 --- a/source/androidmanifestgenerator.h +++ b/plugins/android/androidmanifestgenerator.h @@ -1,7 +1,7 @@ #ifndef ANDROIDMANIFESTGENERATOR_H_ #define ANDROIDMANIFESTGENERATOR_H_ -#include "tool.h" +#include class AndroidManifestFile; diff --git a/source/androidpackagefile.cpp b/plugins/android/androidpackagefile.cpp similarity index 85% rename from source/androidpackagefile.cpp rename to plugins/android/androidpackagefile.cpp index 9dee78f..00b5dad 100644 --- a/source/androidpackagefile.cpp +++ b/plugins/android/androidpackagefile.cpp @@ -1,7 +1,7 @@ +#include +#include #include "androidpackagefile.h" #include "androidresourcebundle.h" -#include "component.h" -#include "sourcepackage.h" using namespace std; diff --git a/source/androidpackagefile.h b/plugins/android/androidpackagefile.h similarity index 90% rename from source/androidpackagefile.h rename to plugins/android/androidpackagefile.h index c5f237a..91b6b36 100644 --- a/source/androidpackagefile.h +++ b/plugins/android/androidpackagefile.h @@ -1,7 +1,7 @@ #ifndef ANDROIDPACKAGEFILE_H_ #define ANDROIDPACKAGEFILE_H_ -#include "filetarget.h" +#include class AndroidResourceBundle; diff --git a/source/androidresourcebundle.cpp b/plugins/android/androidresourcebundle.cpp similarity index 85% rename from source/androidresourcebundle.cpp rename to plugins/android/androidresourcebundle.cpp index 8113c00..5f2c43c 100644 --- a/source/androidresourcebundle.cpp +++ b/plugins/android/androidresourcebundle.cpp @@ -1,7 +1,7 @@ +#include +#include #include "androidmanifestfile.h" #include "androidresourcebundle.h" -#include "component.h" -#include "sourcepackage.h" using namespace std; diff --git a/source/androidresourcebundle.h b/plugins/android/androidresourcebundle.h similarity index 90% rename from source/androidresourcebundle.h rename to plugins/android/androidresourcebundle.h index 18c07e0..bf11509 100644 --- a/source/androidresourcebundle.h +++ b/plugins/android/androidresourcebundle.h @@ -1,7 +1,7 @@ #ifndef ANDROIDRESOURCEBUNDLE_H_ #define ANDROIDRESOURCEBUNDLE_H_ -#include "filetarget.h" +#include class AndroidManifestFile; diff --git a/source/androidresourcefile.cpp b/plugins/android/androidresourcefile.cpp similarity index 93% rename from source/androidresourcefile.cpp rename to plugins/android/androidresourcefile.cpp index d88f786..430c0a8 100644 --- a/source/androidresourcefile.cpp +++ b/plugins/android/androidresourcefile.cpp @@ -1,6 +1,6 @@ +#include #include #include "androidresourcefile.h" -#include "component.h" using namespace std; using namespace Msp; diff --git a/source/androidresourcefile.h b/plugins/android/androidresourcefile.h similarity index 91% rename from source/androidresourcefile.h rename to plugins/android/androidresourcefile.h index 162026c..7b03287 100644 --- a/source/androidresourcefile.h +++ b/plugins/android/androidresourcefile.h @@ -1,7 +1,7 @@ #ifndef ANDROIDRESOURCEFILE_H_ #define ANDROIDRESOURCEFILE_H_ -#include "filetarget.h" +#include /** A file destined to be used as a resource in an Android application. diff --git a/source/androidtools.cpp b/plugins/android/androidtools.cpp similarity index 98% rename from source/androidtools.cpp rename to plugins/android/androidtools.cpp index e086dd0..5053682 100644 --- a/source/androidtools.cpp +++ b/plugins/android/androidtools.cpp @@ -1,3 +1,5 @@ +#include +#include #include #include #include @@ -12,8 +14,6 @@ #include "androidmanifestgenerator.h" #include "androidtools.h" #include "apkbuilder.h" -#include "architecture.h" -#include "builder.h" #include "jarsigner.h" using namespace std; diff --git a/source/androidtools.h b/plugins/android/androidtools.h similarity index 98% rename from source/androidtools.h rename to plugins/android/androidtools.h index a88cdd3..a5fd560 100644 --- a/source/androidtools.h +++ b/plugins/android/androidtools.h @@ -2,8 +2,8 @@ #define ANDROIDTOOLS_H_ #include +#include #include -#include "toolchain.h" class Architecture; class Builder; diff --git a/source/apkbuilder.cpp b/plugins/android/apkbuilder.cpp similarity index 91% rename from source/apkbuilder.cpp rename to plugins/android/apkbuilder.cpp index f62e485..ec20854 100644 --- a/source/apkbuilder.cpp +++ b/plugins/android/apkbuilder.cpp @@ -1,13 +1,13 @@ +#include +#include +#include +#include +#include +#include #include #include "androidpackagefile.h" #include "androidresourcebundle.h" #include "apkbuilder.h" -#include "builder.h" -#include "chainedtask.h" -#include "component.h" -#include "externaltask.h" -#include "filetarget.h" -#include "sourcepackage.h" using namespace std; using namespace Msp; diff --git a/source/apkbuilder.h b/plugins/android/apkbuilder.h similarity index 91% rename from source/apkbuilder.h rename to plugins/android/apkbuilder.h index 8eaaeef..b4e534f 100644 --- a/source/apkbuilder.h +++ b/plugins/android/apkbuilder.h @@ -1,7 +1,7 @@ #ifndef APKBUILDER_H_ #define APKBUILDER_H_ -#include "tool.h" +#include class AndroidPackageFile; diff --git a/source/jarsigner.cpp b/plugins/android/jarsigner.cpp similarity index 89% rename from source/jarsigner.cpp rename to plugins/android/jarsigner.cpp index a2a1c73..9738351 100644 --- a/source/jarsigner.cpp +++ b/plugins/android/jarsigner.cpp @@ -1,9 +1,9 @@ +#include +#include +#include #include #include -#include "component.h" -#include "filetarget.h" #include "jarsigner.h" -#include "sourcepackage.h" using namespace std; using namespace Msp; diff --git a/source/jarsigner.h b/plugins/android/jarsigner.h similarity index 91% rename from source/jarsigner.h rename to plugins/android/jarsigner.h index d836348..6c97373 100644 --- a/source/jarsigner.h +++ b/plugins/android/jarsigner.h @@ -1,7 +1,7 @@ #ifndef JARSIGNER_H_ #define JARSIGNER_H_ -#include "tool.h" +#include class FileTarget; diff --git a/source/builtintools.cpp b/plugins/builtin/builtintools.cpp similarity index 100% rename from source/builtintools.cpp rename to plugins/builtin/builtintools.cpp diff --git a/source/builtintools.h b/plugins/builtin/builtintools.h similarity index 81% rename from source/builtintools.h rename to plugins/builtin/builtintools.h index e3b0256..4771e83 100644 --- a/source/builtintools.h +++ b/plugins/builtin/builtintools.h @@ -1,7 +1,7 @@ #ifndef BUILTINTOOLS_H_ #define BUILTINTOOLS_H_ -#include "toolchain.h" +#include class Builder; diff --git a/source/compilecommandsgenerator.cpp b/plugins/builtin/compilecommandsgenerator.cpp similarity index 93% rename from source/compilecommandsgenerator.cpp rename to plugins/builtin/compilecommandsgenerator.cpp index bbd4e98..61e11db 100644 --- a/source/compilecommandsgenerator.cpp +++ b/plugins/builtin/compilecommandsgenerator.cpp @@ -1,12 +1,11 @@ +#include +#include +#include #include #include #include -#include "builder.h" #include "compilecommandsgenerator.h" #include "compilecommandsjson.h" -#include "internaltask.h" -#include "objectfile.h" -#include "sourcefile.h" using namespace std; using namespace Msp; diff --git a/source/compilecommandsgenerator.h b/plugins/builtin/compilecommandsgenerator.h similarity index 92% rename from source/compilecommandsgenerator.h rename to plugins/builtin/compilecommandsgenerator.h index a6fa6f9..ec4a501 100644 --- a/source/compilecommandsgenerator.h +++ b/plugins/builtin/compilecommandsgenerator.h @@ -1,7 +1,7 @@ #ifndef COMPILECOMMANDSGENERATOR_H_ #define COMPILECOMMANDSGENERATOR_H_ -#include "tool.h" +#include class CompileCommandsJson; diff --git a/source/compilecommandsjson.cpp b/plugins/builtin/compilecommandsjson.cpp similarity index 82% rename from source/compilecommandsjson.cpp rename to plugins/builtin/compilecommandsjson.cpp index ff24d7e..d4adc14 100644 --- a/source/compilecommandsjson.cpp +++ b/plugins/builtin/compilecommandsjson.cpp @@ -1,7 +1,7 @@ -#include "builder.h" -#include "package.h" +#include +#include +#include #include "compilecommandsjson.h" -#include "objectfile.h" CompileCommandsJson::CompileCommandsJson(Builder &b, const SourcePackage &p): FileTarget(b, p, p.get_source_directory()/("compile_commands.json")) diff --git a/source/compilecommandsjson.h b/plugins/builtin/compilecommandsjson.h similarity index 80% rename from source/compilecommandsjson.h rename to plugins/builtin/compilecommandsjson.h index 8798849..be9c448 100644 --- a/source/compilecommandsjson.h +++ b/plugins/builtin/compilecommandsjson.h @@ -1,8 +1,8 @@ #ifndef COMPILECOMMANDSJSON_H_ #define COMPILECOMMANDSJSON_H_ -#include "sourcepackage.h" -#include "filetarget.h" +#include +#include class CompileCommandsJson: public FileTarget { diff --git a/source/copy.cpp b/plugins/builtin/copy.cpp similarity index 95% rename from source/copy.cpp rename to plugins/builtin/copy.cpp index 8f6b81d..0633ff9 100644 --- a/source/copy.cpp +++ b/plugins/builtin/copy.cpp @@ -2,15 +2,14 @@ #include #include #endif +#include +#include #include #include #include #include #include -#include "builder.h" #include "copy.h" -#include "installedfile.h" -#include "internaltask.h" using namespace std; using namespace Msp; diff --git a/source/copy.h b/plugins/builtin/copy.h similarity index 91% rename from source/copy.h rename to plugins/builtin/copy.h index d65bb05..f6f01fb 100644 --- a/source/copy.h +++ b/plugins/builtin/copy.h @@ -1,7 +1,7 @@ #ifndef COPY_H_ #define COPY_H_ -#include "tool.h" +#include class InstalledFile; diff --git a/source/pkgconfigfile.cpp b/plugins/builtin/pkgconfigfile.cpp similarity index 79% rename from source/pkgconfigfile.cpp rename to plugins/builtin/pkgconfigfile.cpp index 7631f9a..70ab59d 100644 --- a/source/pkgconfigfile.cpp +++ b/plugins/builtin/pkgconfigfile.cpp @@ -1,5 +1,5 @@ -#include "builder.h" -#include "package.h" +#include +#include #include "pkgconfigfile.h" PkgConfigFile::PkgConfigFile(Builder &b, const SourcePackage &p): diff --git a/source/pkgconfigfile.h b/plugins/builtin/pkgconfigfile.h similarity index 80% rename from source/pkgconfigfile.h rename to plugins/builtin/pkgconfigfile.h index 81c8cd6..23027e4 100644 --- a/source/pkgconfigfile.h +++ b/plugins/builtin/pkgconfigfile.h @@ -1,8 +1,8 @@ #ifndef PKGCONFIGFILE_H_ #define PKGCONFIGFILE_H_ -#include "sourcepackage.h" -#include "filetarget.h" +#include +#include /** Creates a .pc file to enable other packages fetch build options with pkg-config. diff --git a/source/pkgconfiggenerator.cpp b/plugins/builtin/pkgconfiggenerator.cpp similarity index 97% rename from source/pkgconfiggenerator.cpp rename to plugins/builtin/pkgconfiggenerator.cpp index 46387d3..76ed7d9 100644 --- a/source/pkgconfiggenerator.cpp +++ b/plugins/builtin/pkgconfiggenerator.cpp @@ -1,8 +1,7 @@ +#include #include #include #include -#include "builder.h" -#include "internaltask.h" #include "pkgconfigfile.h" #include "pkgconfiggenerator.h" diff --git a/source/pkgconfiggenerator.h b/plugins/builtin/pkgconfiggenerator.h similarity index 92% rename from source/pkgconfiggenerator.h rename to plugins/builtin/pkgconfiggenerator.h index 761a2c0..2a0e0b1 100644 --- a/source/pkgconfiggenerator.h +++ b/plugins/builtin/pkgconfiggenerator.h @@ -1,7 +1,7 @@ #ifndef PKGCONFIGGENERATOR_H_ #define PKGCONFIGGENERATOR_H_ -#include "tool.h" +#include class PkgConfigFile; diff --git a/source/tar.cpp b/plugins/builtin/tar.cpp similarity index 96% rename from source/tar.cpp rename to plugins/builtin/tar.cpp index 07c14ce..4bac32a 100644 --- a/source/tar.cpp +++ b/plugins/builtin/tar.cpp @@ -1,11 +1,10 @@ #include +#include +#include #include #include #include #include -#include "builder.h" -#include "internaltask.h" -#include "sourcepackage.h" #include "tar.h" #include "tarball.h" diff --git a/source/tar.h b/plugins/builtin/tar.h similarity index 90% rename from source/tar.h rename to plugins/builtin/tar.h index befebb8..9011296 100644 --- a/source/tar.h +++ b/plugins/builtin/tar.h @@ -1,7 +1,7 @@ #ifndef TAR_H_ #define TAR_H_ -#include "tool.h" +#include class TarBall; diff --git a/source/tarball.cpp b/plugins/builtin/tarball.cpp similarity index 88% rename from source/tarball.cpp rename to plugins/builtin/tarball.cpp index 7596a3d..0b2d481 100644 --- a/source/tarball.cpp +++ b/plugins/builtin/tarball.cpp @@ -1,4 +1,4 @@ -#include "sourcepackage.h" +#include #include "tar.h" #include "tarball.h" diff --git a/source/tarball.h b/plugins/builtin/tarball.h similarity index 88% rename from source/tarball.h rename to plugins/builtin/tarball.h index 105a2b1..f63840e 100644 --- a/source/tarball.h +++ b/plugins/builtin/tarball.h @@ -1,7 +1,7 @@ #ifndef TARBALL_H_ #define TARBALL_H_ -#include "filetarget.h" +#include class TarBall: public FileTarget { diff --git a/source/vcxprojectfile.cpp b/plugins/builtin/vcxprojectfile.cpp similarity index 89% rename from source/vcxprojectfile.cpp rename to plugins/builtin/vcxprojectfile.cpp index c591524..3ec7da1 100644 --- a/source/vcxprojectfile.cpp +++ b/plugins/builtin/vcxprojectfile.cpp @@ -1,7 +1,7 @@ +#include +#include #include #include -#include "builder.h" -#include "sourcepackage.h" #include "vcxprojectfile.h" using namespace Msp; diff --git a/source/vcxprojectfile.h b/plugins/builtin/vcxprojectfile.h similarity index 89% rename from source/vcxprojectfile.h rename to plugins/builtin/vcxprojectfile.h index 268d4bb..1f85d0e 100644 --- a/source/vcxprojectfile.h +++ b/plugins/builtin/vcxprojectfile.h @@ -1,7 +1,7 @@ #ifndef VCXPROJECTFILE_H_ #define VCXPROJECTFILE_H_ -#include "filetarget.h" +#include class VcxProjectFile: public FileTarget { diff --git a/source/vcxprojectgenerator.cpp b/plugins/builtin/vcxprojectgenerator.cpp similarity index 97% rename from source/vcxprojectgenerator.cpp rename to plugins/builtin/vcxprojectgenerator.cpp index 8cfc12a..7cb9faf 100644 --- a/source/vcxprojectgenerator.cpp +++ b/plugins/builtin/vcxprojectgenerator.cpp @@ -1,12 +1,11 @@ +#include +#include +#include +#include #include #include #include #include -#include "builder.h" -#include "csourcefile.h" -#include "executable.h" -#include "internaltask.h" -#include "sourcepackage.h" #include "vcxprojectfile.h" #include "vcxprojectgenerator.h" diff --git a/source/vcxprojectgenerator.h b/plugins/builtin/vcxprojectgenerator.h similarity index 91% rename from source/vcxprojectgenerator.h rename to plugins/builtin/vcxprojectgenerator.h index f8283ff..ce96a54 100644 --- a/source/vcxprojectgenerator.h +++ b/plugins/builtin/vcxprojectgenerator.h @@ -1,7 +1,7 @@ #ifndef VCXPROJECTGENERATOR_H_ #define VCXPROJECTGENERATOR_H_ -#include "tool.h" +#include class VcxProjectFile; diff --git a/source/vssolutionfile.cpp b/plugins/builtin/vssolutionfile.cpp similarity index 92% rename from source/vssolutionfile.cpp rename to plugins/builtin/vssolutionfile.cpp index af7e01f..691e1c6 100644 --- a/source/vssolutionfile.cpp +++ b/plugins/builtin/vssolutionfile.cpp @@ -1,6 +1,6 @@ +#include +#include #include -#include "builder.h" -#include "sourcepackage.h" #include "vssolutionfile.h" using namespace std; diff --git a/source/vssolutionfile.h b/plugins/builtin/vssolutionfile.h similarity index 88% rename from source/vssolutionfile.h rename to plugins/builtin/vssolutionfile.h index 0a97d32..402caa7 100644 --- a/source/vssolutionfile.h +++ b/plugins/builtin/vssolutionfile.h @@ -1,7 +1,7 @@ #ifndef VSSOLUTIONFILE_H_ #define VSSOLUTIONFILE_H_ -#include "filetarget.h" +#include class VsSolutionFile: public FileTarget { diff --git a/source/vssolutiongenerator.cpp b/plugins/builtin/vssolutiongenerator.cpp similarity index 96% rename from source/vssolutiongenerator.cpp rename to plugins/builtin/vssolutiongenerator.cpp index 7dce076..60602e1 100644 --- a/source/vssolutiongenerator.cpp +++ b/plugins/builtin/vssolutiongenerator.cpp @@ -1,9 +1,8 @@ #include +#include +#include #include #include -#include "builder.h" -#include "internaltask.h" -#include "sourcepackage.h" #include "vcxprojectfile.h" #include "vssolutionfile.h" #include "vssolutiongenerator.h" diff --git a/source/vssolutiongenerator.h b/plugins/builtin/vssolutiongenerator.h similarity index 91% rename from source/vssolutiongenerator.h rename to plugins/builtin/vssolutiongenerator.h index ca33237..c98fcb2 100644 --- a/source/vssolutiongenerator.h +++ b/plugins/builtin/vssolutiongenerator.h @@ -1,7 +1,7 @@ #ifndef VSSOLUTIONGENERATOR_H_ #define VSSOLUTIONGENERATOR_H_ -#include "tool.h" +#include class VsSolutionFile; diff --git a/source/clangcompiler.cpp b/plugins/clang/clangcompiler.cpp similarity index 100% rename from source/clangcompiler.cpp rename to plugins/clang/clangcompiler.cpp diff --git a/source/clangcompiler.h b/plugins/clang/clangcompiler.h similarity index 82% rename from source/clangcompiler.h rename to plugins/clang/clangcompiler.h index af2c05d..034b636 100644 --- a/source/clangcompiler.h +++ b/plugins/clang/clangcompiler.h @@ -1,7 +1,7 @@ #ifndef CLANGCOMPILER_H_ #define CLANGCOMPILER_H_ -#include "customizedtool.h" +#include class ClangCompiler: public CustomizedTool { diff --git a/source/clanglinker.cpp b/plugins/clang/clanglinker.cpp similarity index 94% rename from source/clanglinker.cpp rename to plugins/clang/clanglinker.cpp index 5089028..fb15451 100644 --- a/source/clanglinker.cpp +++ b/plugins/clang/clanglinker.cpp @@ -1,5 +1,5 @@ +#include #include -#include "builder.h" #include "clanglinker.h" using namespace Msp; diff --git a/source/clanglinker.h b/plugins/clang/clanglinker.h similarity index 84% rename from source/clanglinker.h rename to plugins/clang/clanglinker.h index de65e64..a6518b1 100644 --- a/source/clanglinker.h +++ b/plugins/clang/clanglinker.h @@ -1,7 +1,7 @@ #ifndef CLANGLINKER_H_ #define CLANGLINKER_H_ -#include "customizedtool.h" +#include class ClangLinker: public CustomizedTool { diff --git a/source/clangtools.cpp b/plugins/clang/clangtools.cpp similarity index 94% rename from source/clangtools.cpp rename to plugins/clang/clangtools.cpp index 8e8973d..385a279 100644 --- a/source/clangtools.cpp +++ b/plugins/clang/clangtools.cpp @@ -1,4 +1,4 @@ -#include "architecture.h" +#include #include "clangcompiler.h" #include "clanglinker.h" #include "clangtools.h" diff --git a/source/clangtools.h b/plugins/clang/clangtools.h similarity index 86% rename from source/clangtools.h rename to plugins/clang/clangtools.h index 9faaf1a..971404a 100644 --- a/source/clangtools.h +++ b/plugins/clang/clangtools.h @@ -1,7 +1,7 @@ #ifndef CLANGTOOLS_H_ #define CLANGTOOLS_H_ -#include "toolchain.h" +#include class Architecture; class Builder; diff --git a/source/datacollection.cpp b/plugins/datafile/datacollection.cpp similarity index 90% rename from source/datacollection.cpp rename to plugins/datafile/datacollection.cpp index c34c9cc..189eb61 100644 --- a/source/datacollection.cpp +++ b/plugins/datafile/datacollection.cpp @@ -1,8 +1,8 @@ +#include +#include #include -#include "component.h" #include "datacollection.h" #include "datatransform.h" -#include "sourcepackage.h" using namespace Msp; diff --git a/source/datacollection.h b/plugins/datafile/datacollection.h similarity index 93% rename from source/datacollection.h rename to plugins/datafile/datacollection.h index aeb270f..2fca294 100644 --- a/source/datacollection.h +++ b/plugins/datafile/datacollection.h @@ -1,7 +1,7 @@ #ifndef DATACOLLECTION_H_ #define DATACOLLECTION_H_ -#include "filetarget.h" +#include class DataTransform; diff --git a/source/datapack.cpp b/plugins/datafile/datapack.cpp similarity index 86% rename from source/datapack.cpp rename to plugins/datafile/datapack.cpp index 713120f..2abcd52 100644 --- a/source/datapack.cpp +++ b/plugins/datafile/datapack.cpp @@ -1,6 +1,6 @@ -#include "component.h" +#include +#include #include "datapack.h" -#include "sourcepackage.h" using namespace std; diff --git a/source/datapack.h b/plugins/datafile/datapack.h similarity index 92% rename from source/datapack.h rename to plugins/datafile/datapack.h index b02922f..80a1b0d 100644 --- a/source/datapack.h +++ b/plugins/datafile/datapack.h @@ -1,7 +1,7 @@ #ifndef DATAPACK_H_ #define DATAPACK_H_ -#include "filetarget.h" +#include class DataPack: public FileTarget { diff --git a/source/datapackcomponent.cpp b/plugins/datafile/datapackcomponent.cpp similarity index 90% rename from source/datapackcomponent.cpp rename to plugins/datafile/datapackcomponent.cpp index 5750287..9b628f4 100644 --- a/source/datapackcomponent.cpp +++ b/plugins/datafile/datapackcomponent.cpp @@ -1,9 +1,9 @@ +#include +#include +#include #include -#include "builder.h" #include "datapackcomponent.h" #include "datasourcefile.h" -#include "sourcepackage.h" -#include "tool.h" using namespace std; using namespace Msp; diff --git a/source/datapackcomponent.h b/plugins/datafile/datapackcomponent.h similarity index 86% rename from source/datapackcomponent.h rename to plugins/datafile/datapackcomponent.h index 75eda73..3729922 100644 --- a/source/datapackcomponent.h +++ b/plugins/datafile/datapackcomponent.h @@ -1,7 +1,7 @@ #ifndef DATAPACKCOMPONENT_H_ #define DATAPACKCOMPONENT_H_ -#include "component.h" +#include class DataPackComponent: public Component { diff --git a/source/datasourcefile.h b/plugins/datafile/datasourcefile.h similarity index 90% rename from source/datasourcefile.h rename to plugins/datafile/datasourcefile.h index 7518423..8d2fcd5 100644 --- a/source/datasourcefile.h +++ b/plugins/datafile/datasourcefile.h @@ -1,7 +1,7 @@ #ifndef DATASOURCEFILE_H_ #define DATASOURCEFILE_H_ -#include "sourcefile.h" +#include class DataSourceFile: public SourceFile { diff --git a/source/datatool.cpp b/plugins/datafile/datatool.cpp similarity index 94% rename from source/datatool.cpp rename to plugins/datafile/datatool.cpp index 1bc629e..04592e3 100644 --- a/source/datatool.cpp +++ b/plugins/datafile/datatool.cpp @@ -1,13 +1,13 @@ #include +#include +#include +#include +#include #include -#include "builder.h" -#include "component.h" #include "datacollection.h" #include "datapack.h" #include "datatool.h" #include "datatransform.h" -#include "externaltask.h" -#include "sourcepackage.h" using namespace std; using namespace Msp; diff --git a/source/datatool.h b/plugins/datafile/datatool.h similarity index 93% rename from source/datatool.h rename to plugins/datafile/datatool.h index 1cddebb..a76f7f1 100644 --- a/source/datatool.h +++ b/plugins/datafile/datatool.h @@ -1,7 +1,7 @@ #ifndef DATACOMPILER_H_ #define DATACOMPILER_H_ -#include "tool.h" +#include class DataTool: public Tool { diff --git a/source/datatransform.cpp b/plugins/datafile/datatransform.cpp similarity index 91% rename from source/datatransform.cpp rename to plugins/datafile/datatransform.cpp index 01d237b..c462ce2 100644 --- a/source/datatransform.cpp +++ b/plugins/datafile/datatransform.cpp @@ -1,13 +1,13 @@ +#include +#include +#include +#include +#include #include #include #include #include -#include "builder.h" -#include "cache.h" -#include "component.h" #include "datatransform.h" -#include "file.h" -#include "sourcepackage.h" using namespace std; using namespace Msp; diff --git a/source/datatransform.h b/plugins/datafile/datatransform.h similarity index 90% rename from source/datatransform.h rename to plugins/datafile/datatransform.h index f024973..9b11e61 100644 --- a/source/datatransform.h +++ b/plugins/datafile/datatransform.h @@ -1,7 +1,7 @@ #ifndef DATATRANSFORM_H_ #define DATATRANSFORM_H_ -#include "filetarget.h" +#include class DataTransform: public FileTarget { diff --git a/source/gnuarchiver.cpp b/plugins/gnu/gnuarchiver.cpp similarity index 85% rename from source/gnuarchiver.cpp rename to plugins/gnu/gnuarchiver.cpp index dc0b784..c977eaa 100644 --- a/source/gnuarchiver.cpp +++ b/plugins/gnu/gnuarchiver.cpp @@ -1,13 +1,12 @@ -#include -#include -#include #include -#include "builder.h" -#include "component.h" +#include +#include +#include +#include +#include +#include +#include #include "gnuarchiver.h" -#include "objectfile.h" -#include "sourcepackage.h" -#include "staticlibrary.h" using namespace std; using namespace Msp; diff --git a/source/gnuarchiver.h b/plugins/gnu/gnuarchiver.h similarity index 91% rename from source/gnuarchiver.h rename to plugins/gnu/gnuarchiver.h index 4305827..81ed47e 100644 --- a/source/gnuarchiver.h +++ b/plugins/gnu/gnuarchiver.h @@ -1,7 +1,7 @@ #ifndef GNUARCHIVER_H_ #define GNUARCHIVER_H_ -#include "tool.h" +#include class StaticLibrary; diff --git a/source/gnucompiler.cpp b/plugins/gnu/gnucompiler.cpp similarity index 96% rename from source/gnucompiler.cpp rename to plugins/gnu/gnucompiler.cpp index 3236631..ba74409 100644 --- a/source/gnucompiler.cpp +++ b/plugins/gnu/gnucompiler.cpp @@ -1,16 +1,16 @@ +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include "architecture.h" -#include "builder.h" -#include "component.h" -#include "csourcefile.h" #include "gnucompiler.h" -#include "objcsourcefile.h" -#include "objectfile.h" -#include "sourcefile.h" -#include "sourcepackage.h" using namespace std; using namespace Msp; diff --git a/source/gnucompiler.h b/plugins/gnu/gnucompiler.h similarity index 97% rename from source/gnucompiler.h rename to plugins/gnu/gnucompiler.h index b0d0ec9..98c71ed 100644 --- a/source/gnucompiler.h +++ b/plugins/gnu/gnucompiler.h @@ -1,7 +1,7 @@ #ifndef GNUCOMPILER_H_ #define GNUCOMPILER_H_ -#include "tool.h" +#include class ObjectFile; diff --git a/source/gnulinker.cpp b/plugins/gnu/gnulinker.cpp similarity index 95% rename from source/gnulinker.cpp rename to plugins/gnu/gnulinker.cpp index b726dd5..710c44b 100644 --- a/source/gnulinker.cpp +++ b/plugins/gnu/gnulinker.cpp @@ -1,22 +1,22 @@ #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include #include -#include "builder.h" -#include "component.h" -#include "executable.h" -#include "exportdefinitions.h" #include "gnucompiler.h" #include "gnulinker.h" -#include "importlibrary.h" -#include "installedfile.h" -#include "objectfile.h" -#include "sharedlibrary.h" -#include "sourcepackage.h" -#include "staticlibrary.h" using namespace std; using namespace Msp; diff --git a/source/gnulinker.h b/plugins/gnu/gnulinker.h similarity index 96% rename from source/gnulinker.h rename to plugins/gnu/gnulinker.h index a0632d6..11a0fb1 100644 --- a/source/gnulinker.h +++ b/plugins/gnu/gnulinker.h @@ -1,7 +1,7 @@ #ifndef GNULINKER_H_ #define GNULINKER_H_ -#include "tool.h" +#include class Binary; diff --git a/source/gnutools.cpp b/plugins/gnu/gnutools.cpp similarity index 94% rename from source/gnutools.cpp rename to plugins/gnu/gnutools.cpp index e64bcdb..14c9f11 100644 --- a/source/gnutools.cpp +++ b/plugins/gnu/gnutools.cpp @@ -1,4 +1,4 @@ -#include "builder.h" +#include #include "gnuarchiver.h" #include "gnucompiler.h" #include "gnulinker.h" diff --git a/source/gnutools.h b/plugins/gnu/gnutools.h similarity index 86% rename from source/gnutools.h rename to plugins/gnu/gnutools.h index 5aeb966..59e2908 100644 --- a/source/gnutools.h +++ b/plugins/gnu/gnutools.h @@ -1,7 +1,7 @@ #ifndef GNUTOOLS_H_ #define GNUTOOLS_H_ -#include "toolchain.h" +#include class Architecture; class Builder; diff --git a/source/mingwdlltool.cpp b/plugins/gnu/mingwdlltool.cpp similarity index 90% rename from source/mingwdlltool.cpp rename to plugins/gnu/mingwdlltool.cpp index c6eddc0..c5ffdf5 100644 --- a/source/mingwdlltool.cpp +++ b/plugins/gnu/mingwdlltool.cpp @@ -1,16 +1,16 @@ #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include "builder.h" -#include "component.h" -#include "exportdefinitions.h" -#include "externaltask.h" -#include "importlibrary.h" -#include "installedfile.h" #include "mingwdlltool.h" -#include "objectfile.h" -#include "sharedlibrary.h" -#include "sourcepackage.h" using namespace std; using namespace Msp; diff --git a/source/mingwdlltool.h b/plugins/gnu/mingwdlltool.h similarity index 91% rename from source/mingwdlltool.h rename to plugins/gnu/mingwdlltool.h index d9fb1cb..d35fa19 100644 --- a/source/mingwdlltool.h +++ b/plugins/gnu/mingwdlltool.h @@ -1,7 +1,7 @@ #ifndef DLLTOOL_H_ #define DLLTOOL_H_ -#include "tool.h" +#include class MingwDllTool: public Tool { diff --git a/source/microsofttools.cpp b/plugins/msvc/microsofttools.cpp similarity index 95% rename from source/microsofttools.cpp rename to plugins/msvc/microsofttools.cpp index c320ecb..af435bb 100644 --- a/source/microsofttools.cpp +++ b/plugins/msvc/microsofttools.cpp @@ -1,14 +1,14 @@ +#include +#include +#include +#include #include #include #include -#include "builder.h" -#include "externaltask.h" -#include "logger.h" #include "microsofttools.h" #include "msvcarchiver.h" #include "msvccompiler.h" #include "msvclinker.h" -#include "sysutils.h" using namespace std; using namespace Msp; diff --git a/source/microsofttools.h b/plugins/msvc/microsofttools.h similarity index 95% rename from source/microsofttools.h rename to plugins/msvc/microsofttools.h index f2e3c37..900bb68 100644 --- a/source/microsofttools.h +++ b/plugins/msvc/microsofttools.h @@ -1,8 +1,8 @@ #ifndef MICROSOFTTOOLS_H_ #define MICROSOFTTOOLS_H_ +#include #include -#include "toolchain.h" class Architecture; class Builder; diff --git a/source/msvcarchiver.cpp b/plugins/msvc/msvcarchiver.cpp similarity index 90% rename from source/msvcarchiver.cpp rename to plugins/msvc/msvcarchiver.cpp index d0489cf..adcb8e7 100644 --- a/source/msvcarchiver.cpp +++ b/plugins/msvc/msvcarchiver.cpp @@ -1,10 +1,10 @@ +#include +#include +#include +#include #include -#include "component.h" #include "microsofttools.h" #include "msvcarchiver.h" -#include "objectfile.h" -#include "sourcepackage.h" -#include "staticlibrary.h" using namespace std; using namespace Msp; diff --git a/source/msvcarchiver.h b/plugins/msvc/msvcarchiver.h similarity index 93% rename from source/msvcarchiver.h rename to plugins/msvc/msvcarchiver.h index 7af9571..89d24c6 100644 --- a/source/msvcarchiver.h +++ b/plugins/msvc/msvcarchiver.h @@ -1,7 +1,7 @@ #ifndef MSVCARCHIVER_H_ #define MSVCARCHIVER_H_ -#include "tool.h" +#include class MicrosoftTools; class StaticLibrary; diff --git a/source/msvccompiler.cpp b/plugins/msvc/msvccompiler.cpp similarity index 96% rename from source/msvccompiler.cpp rename to plugins/msvc/msvccompiler.cpp index 56c99c3..2e63335 100644 --- a/source/msvccompiler.cpp +++ b/plugins/msvc/msvccompiler.cpp @@ -1,15 +1,15 @@ +#include +#include +#include +#include +#include #include #include #include #include #include -#include "builder.h" -#include "component.h" -#include "csourcefile.h" #include "microsofttools.h" #include "msvccompiler.h" -#include "objectfile.h" -#include "sourcepackage.h" using namespace std; using namespace Msp; diff --git a/source/msvccompiler.h b/plugins/msvc/msvccompiler.h similarity index 96% rename from source/msvccompiler.h rename to plugins/msvc/msvccompiler.h index 2782c23..ef60e2e 100644 --- a/source/msvccompiler.h +++ b/plugins/msvc/msvccompiler.h @@ -1,7 +1,7 @@ #ifndef MSVCCOMPILER_H_ #define MSVCCOMPILER_H_ -#include "tool.h" +#include class MicrosoftTools; class ObjectFile; diff --git a/source/msvclinker.cpp b/plugins/msvc/msvclinker.cpp similarity index 91% rename from source/msvclinker.cpp rename to plugins/msvc/msvclinker.cpp index 9352c0f..8008791 100644 --- a/source/msvclinker.cpp +++ b/plugins/msvc/msvclinker.cpp @@ -1,16 +1,16 @@ +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include "builder.h" -#include "component.h" -#include "executable.h" -#include "importlibrary.h" #include "microsofttools.h" #include "msvclinker.h" -#include "objectfile.h" -#include "sharedlibrary.h" -#include "sourcepackage.h" -#include "staticlibrary.h" using namespace std; using namespace Msp; diff --git a/source/msvclinker.h b/plugins/msvc/msvclinker.h similarity index 94% rename from source/msvclinker.h rename to plugins/msvc/msvclinker.h index 4320e48..fe98c7d 100644 --- a/source/msvclinker.h +++ b/plugins/msvc/msvclinker.h @@ -1,7 +1,7 @@ #ifndef MSVCLINKER_H_ #define MSVCLINKER_H_ -#include "tool.h" +#include class Binary; class MicrosoftTools; diff --git a/source/analyzer.cpp b/source/cli/analyzer.cpp similarity index 93% rename from source/analyzer.cpp rename to source/cli/analyzer.cpp index f91c298..e12e7fc 100644 --- a/source/analyzer.cpp +++ b/source/cli/analyzer.cpp @@ -1,14 +1,14 @@ +#include +#include +#include +#include +#include +#include +#include #include #include #include #include "analyzer.h" -#include "builder.h" -#include "buildgraph.h" -#include "objectfile.h" -#include "sourcefile.h" -#include "sourcepackage.h" -#include "target.h" -#include "tool.h" using namespace std; using namespace Msp; diff --git a/source/analyzer.h b/source/cli/analyzer.h similarity index 100% rename from source/analyzer.h rename to source/cli/analyzer.h diff --git a/source/buildercli.cpp b/source/cli/buildercli.cpp similarity index 98% rename from source/buildercli.cpp rename to source/cli/buildercli.cpp index bc18eed..cb0897c 100644 --- a/source/buildercli.cpp +++ b/source/cli/buildercli.cpp @@ -1,3 +1,7 @@ +#include +#include +#include +#include #include #include #include @@ -6,10 +10,6 @@ #include #include "analyzer.h" #include "buildercli.h" -#include "filetarget.h" -#include "sourcepackage.h" -#include "tool.h" -#include "toolchain.h" using namespace std; using namespace Msp; diff --git a/source/buildercli.h b/source/cli/buildercli.h similarity index 96% rename from source/buildercli.h rename to source/cli/buildercli.h index 3b15541..f4b2ad7 100644 --- a/source/buildercli.h +++ b/source/cli/buildercli.h @@ -1,8 +1,8 @@ #ifndef BUILDERCLI_H_ #define BUILDERCLI_H_ +#include #include -#include "builder.h" class Analyzer; diff --git a/source/architecture.cpp b/source/lib/architecture.cpp similarity index 100% rename from source/architecture.cpp rename to source/lib/architecture.cpp diff --git a/source/architecture.h b/source/lib/architecture.h similarity index 100% rename from source/architecture.h rename to source/lib/architecture.h diff --git a/source/binary.cpp b/source/lib/binary.cpp similarity index 100% rename from source/binary.cpp rename to source/lib/binary.cpp diff --git a/source/binary.h b/source/lib/binary.h similarity index 100% rename from source/binary.h rename to source/lib/binary.h diff --git a/source/binarycomponent.cpp b/source/lib/binarycomponent.cpp similarity index 100% rename from source/binarycomponent.cpp rename to source/lib/binarycomponent.cpp diff --git a/source/binarycomponent.h b/source/lib/binarycomponent.h similarity index 100% rename from source/binarycomponent.h rename to source/lib/binarycomponent.h diff --git a/source/binarypackage.cpp b/source/lib/binarypackage.cpp similarity index 100% rename from source/binarypackage.cpp rename to source/lib/binarypackage.cpp diff --git a/source/binarypackage.h b/source/lib/binarypackage.h similarity index 100% rename from source/binarypackage.h rename to source/lib/binarypackage.h diff --git a/source/booleanevaluator.cpp b/source/lib/booleanevaluator.cpp similarity index 100% rename from source/booleanevaluator.cpp rename to source/lib/booleanevaluator.cpp diff --git a/source/booleanevaluator.h b/source/lib/booleanevaluator.h similarity index 100% rename from source/booleanevaluator.h rename to source/lib/booleanevaluator.h diff --git a/source/builder.cpp b/source/lib/builder.cpp similarity index 97% rename from source/builder.cpp rename to source/lib/builder.cpp index 3fc60be..92924eb 100644 --- a/source/builder.cpp +++ b/source/lib/builder.cpp @@ -12,15 +12,15 @@ #include #include #include -#include "androidtools.h" +#include "android/androidtools.h" #include "binarypackage.h" #include "builder.h" -#include "builtintools.h" -#include "clangtools.h" -#include "datatool.h" -#include "gnutools.h" +#include "builtin/builtintools.h" +#include "clang/clangtools.h" +#include "datafile/datatool.h" +#include "gnu/gnutools.h" #include "installedfile.h" -#include "microsofttools.h" +#include "msvc/microsofttools.h" #include "package.h" #include "sharedlibrary.h" #include "sourcepackage.h" diff --git a/source/builder.h b/source/lib/builder.h similarity index 100% rename from source/builder.h rename to source/lib/builder.h diff --git a/source/buildgraph.cpp b/source/lib/buildgraph.cpp similarity index 100% rename from source/buildgraph.cpp rename to source/lib/buildgraph.cpp diff --git a/source/buildgraph.h b/source/lib/buildgraph.h similarity index 100% rename from source/buildgraph.h rename to source/lib/buildgraph.h diff --git a/source/buildinfo.cpp b/source/lib/buildinfo.cpp similarity index 100% rename from source/buildinfo.cpp rename to source/lib/buildinfo.cpp diff --git a/source/buildinfo.h b/source/lib/buildinfo.h similarity index 100% rename from source/buildinfo.h rename to source/lib/buildinfo.h diff --git a/source/buildtype.cpp b/source/lib/buildtype.cpp similarity index 100% rename from source/buildtype.cpp rename to source/lib/buildtype.cpp diff --git a/source/buildtype.h b/source/lib/buildtype.h similarity index 100% rename from source/buildtype.h rename to source/lib/buildtype.h diff --git a/source/cache.cpp b/source/lib/cache.cpp similarity index 100% rename from source/cache.cpp rename to source/lib/cache.cpp diff --git a/source/cache.h b/source/lib/cache.h similarity index 100% rename from source/cache.h rename to source/lib/cache.h diff --git a/source/chainedtask.cpp b/source/lib/chainedtask.cpp similarity index 100% rename from source/chainedtask.cpp rename to source/lib/chainedtask.cpp diff --git a/source/chainedtask.h b/source/lib/chainedtask.h similarity index 100% rename from source/chainedtask.h rename to source/lib/chainedtask.h diff --git a/source/component.cpp b/source/lib/component.cpp similarity index 100% rename from source/component.cpp rename to source/lib/component.cpp diff --git a/source/component.h b/source/lib/component.h similarity index 100% rename from source/component.h rename to source/lib/component.h diff --git a/source/conditionalloader.cpp b/source/lib/conditionalloader.cpp similarity index 100% rename from source/conditionalloader.cpp rename to source/lib/conditionalloader.cpp diff --git a/source/conditionalloader.h b/source/lib/conditionalloader.h similarity index 100% rename from source/conditionalloader.h rename to source/lib/conditionalloader.h diff --git a/source/config.cpp b/source/lib/config.cpp similarity index 100% rename from source/config.cpp rename to source/lib/config.cpp diff --git a/source/config.h b/source/lib/config.h similarity index 100% rename from source/config.h rename to source/lib/config.h diff --git a/source/csourcefile.cpp b/source/lib/csourcefile.cpp similarity index 100% rename from source/csourcefile.cpp rename to source/lib/csourcefile.cpp diff --git a/source/csourcefile.h b/source/lib/csourcefile.h similarity index 100% rename from source/csourcefile.h rename to source/lib/csourcefile.h diff --git a/source/customizedtool.cpp b/source/lib/customizedtool.cpp similarity index 100% rename from source/customizedtool.cpp rename to source/lib/customizedtool.cpp diff --git a/source/customizedtool.h b/source/lib/customizedtool.h similarity index 100% rename from source/customizedtool.h rename to source/lib/customizedtool.h diff --git a/source/executable.cpp b/source/lib/executable.cpp similarity index 100% rename from source/executable.cpp rename to source/lib/executable.cpp diff --git a/source/executable.h b/source/lib/executable.h similarity index 100% rename from source/executable.h rename to source/lib/executable.h diff --git a/source/exportdefinitions.cpp b/source/lib/exportdefinitions.cpp similarity index 100% rename from source/exportdefinitions.cpp rename to source/lib/exportdefinitions.cpp diff --git a/source/exportdefinitions.h b/source/lib/exportdefinitions.h similarity index 100% rename from source/exportdefinitions.h rename to source/lib/exportdefinitions.h diff --git a/source/externaltask.cpp b/source/lib/externaltask.cpp similarity index 100% rename from source/externaltask.cpp rename to source/lib/externaltask.cpp diff --git a/source/externaltask.h b/source/lib/externaltask.h similarity index 100% rename from source/externaltask.h rename to source/lib/externaltask.h diff --git a/source/feature.cpp b/source/lib/feature.cpp similarity index 100% rename from source/feature.cpp rename to source/lib/feature.cpp diff --git a/source/feature.h b/source/lib/feature.h similarity index 100% rename from source/feature.h rename to source/lib/feature.h diff --git a/source/file.h b/source/lib/file.h similarity index 100% rename from source/file.h rename to source/lib/file.h diff --git a/source/filetarget.cpp b/source/lib/filetarget.cpp similarity index 100% rename from source/filetarget.cpp rename to source/lib/filetarget.cpp diff --git a/source/filetarget.h b/source/lib/filetarget.h similarity index 100% rename from source/filetarget.h rename to source/lib/filetarget.h diff --git a/source/importlibrary.cpp b/source/lib/importlibrary.cpp similarity index 100% rename from source/importlibrary.cpp rename to source/lib/importlibrary.cpp diff --git a/source/importlibrary.h b/source/lib/importlibrary.h similarity index 100% rename from source/importlibrary.h rename to source/lib/importlibrary.h diff --git a/source/installcomponent.cpp b/source/lib/installcomponent.cpp similarity index 100% rename from source/installcomponent.cpp rename to source/lib/installcomponent.cpp diff --git a/source/installcomponent.h b/source/lib/installcomponent.h similarity index 100% rename from source/installcomponent.h rename to source/lib/installcomponent.h diff --git a/source/installedfile.cpp b/source/lib/installedfile.cpp similarity index 100% rename from source/installedfile.cpp rename to source/lib/installedfile.cpp diff --git a/source/installedfile.h b/source/lib/installedfile.h similarity index 100% rename from source/installedfile.h rename to source/lib/installedfile.h diff --git a/source/installmap.cpp b/source/lib/installmap.cpp similarity index 100% rename from source/installmap.cpp rename to source/lib/installmap.cpp diff --git a/source/installmap.h b/source/lib/installmap.h similarity index 100% rename from source/installmap.h rename to source/lib/installmap.h diff --git a/source/internaltask.cpp b/source/lib/internaltask.cpp similarity index 100% rename from source/internaltask.cpp rename to source/lib/internaltask.cpp diff --git a/source/internaltask.h b/source/lib/internaltask.h similarity index 100% rename from source/internaltask.h rename to source/lib/internaltask.h diff --git a/source/logger.cpp b/source/lib/logger.cpp similarity index 100% rename from source/logger.cpp rename to source/lib/logger.cpp diff --git a/source/logger.h b/source/lib/logger.h similarity index 100% rename from source/logger.h rename to source/lib/logger.h diff --git a/source/objcsourcefile.cpp b/source/lib/objcsourcefile.cpp similarity index 100% rename from source/objcsourcefile.cpp rename to source/lib/objcsourcefile.cpp diff --git a/source/objcsourcefile.h b/source/lib/objcsourcefile.h similarity index 100% rename from source/objcsourcefile.h rename to source/lib/objcsourcefile.h diff --git a/source/objectfile.cpp b/source/lib/objectfile.cpp similarity index 100% rename from source/objectfile.cpp rename to source/lib/objectfile.cpp diff --git a/source/objectfile.h b/source/lib/objectfile.h similarity index 100% rename from source/objectfile.h rename to source/lib/objectfile.h diff --git a/source/package.cpp b/source/lib/package.cpp similarity index 100% rename from source/package.cpp rename to source/lib/package.cpp diff --git a/source/package.h b/source/lib/package.h similarity index 100% rename from source/package.h rename to source/lib/package.h diff --git a/source/packagemanager.cpp b/source/lib/packagemanager.cpp similarity index 100% rename from source/packagemanager.cpp rename to source/lib/packagemanager.cpp diff --git a/source/packagemanager.h b/source/lib/packagemanager.h similarity index 100% rename from source/packagemanager.h rename to source/lib/packagemanager.h diff --git a/source/pattern.cpp b/source/lib/pattern.cpp similarity index 100% rename from source/pattern.cpp rename to source/lib/pattern.cpp diff --git a/source/pattern.h b/source/lib/pattern.h similarity index 100% rename from source/pattern.h rename to source/lib/pattern.h diff --git a/source/sharedlibrary.cpp b/source/lib/sharedlibrary.cpp similarity index 100% rename from source/sharedlibrary.cpp rename to source/lib/sharedlibrary.cpp diff --git a/source/sharedlibrary.h b/source/lib/sharedlibrary.h similarity index 100% rename from source/sharedlibrary.h rename to source/lib/sharedlibrary.h diff --git a/source/sourcearchivecomponent.cpp b/source/lib/sourcearchivecomponent.cpp similarity index 100% rename from source/sourcearchivecomponent.cpp rename to source/lib/sourcearchivecomponent.cpp diff --git a/source/sourcearchivecomponent.h b/source/lib/sourcearchivecomponent.h similarity index 100% rename from source/sourcearchivecomponent.h rename to source/lib/sourcearchivecomponent.h diff --git a/source/sourcefile.cpp b/source/lib/sourcefile.cpp similarity index 100% rename from source/sourcefile.cpp rename to source/lib/sourcefile.cpp diff --git a/source/sourcefile.h b/source/lib/sourcefile.h similarity index 100% rename from source/sourcefile.h rename to source/lib/sourcefile.h diff --git a/source/sourcegenerator.cpp b/source/lib/sourcegenerator.cpp similarity index 100% rename from source/sourcegenerator.cpp rename to source/lib/sourcegenerator.cpp diff --git a/source/sourcegenerator.h b/source/lib/sourcegenerator.h similarity index 100% rename from source/sourcegenerator.h rename to source/lib/sourcegenerator.h diff --git a/source/sourcepackage.cpp b/source/lib/sourcepackage.cpp similarity index 96% rename from source/sourcepackage.cpp rename to source/lib/sourcepackage.cpp index 2c478a8..3648df7 100644 --- a/source/sourcepackage.cpp +++ b/source/lib/sourcepackage.cpp @@ -5,21 +5,21 @@ #include #include #include -#include "androidapplicationcomponent.h" +#include "android/androidapplicationcomponent.h" #include "binarycomponent.h" #include "binarypackage.h" #include "builder.h" -#include "compilecommandsjson.h" -#include "datapackcomponent.h" +#include "builtin/compilecommandsjson.h" +#include "datafile/datapackcomponent.h" #include "file.h" #include "installcomponent.h" -#include "pkgconfigfile.h" +#include "builtin/pkgconfigfile.h" #include "sourcearchivecomponent.h" #include "sourcegenerator.h" #include "sourcepackage.h" #include "tool.h" -#include "vcxprojectfile.h" -#include "vssolutionfile.h" +#include "builtin/vcxprojectfile.h" +#include "builtin/vssolutionfile.h" using namespace std; using namespace Msp; diff --git a/source/sourcepackage.h b/source/lib/sourcepackage.h similarity index 100% rename from source/sourcepackage.h rename to source/lib/sourcepackage.h diff --git a/source/staticlibrary.cpp b/source/lib/staticlibrary.cpp similarity index 100% rename from source/staticlibrary.cpp rename to source/lib/staticlibrary.cpp diff --git a/source/staticlibrary.h b/source/lib/staticlibrary.h similarity index 100% rename from source/staticlibrary.h rename to source/lib/staticlibrary.h diff --git a/source/sysutils.cpp b/source/lib/sysutils.cpp similarity index 100% rename from source/sysutils.cpp rename to source/lib/sysutils.cpp diff --git a/source/sysutils.h b/source/lib/sysutils.h similarity index 100% rename from source/sysutils.h rename to source/lib/sysutils.h diff --git a/source/target.cpp b/source/lib/target.cpp similarity index 100% rename from source/target.cpp rename to source/lib/target.cpp diff --git a/source/target.h b/source/lib/target.h similarity index 100% rename from source/target.h rename to source/lib/target.h diff --git a/source/task.cpp b/source/lib/task.cpp similarity index 100% rename from source/task.cpp rename to source/lib/task.cpp diff --git a/source/task.h b/source/lib/task.h similarity index 100% rename from source/task.h rename to source/lib/task.h diff --git a/source/templatefile.h b/source/lib/templatefile.h similarity index 100% rename from source/templatefile.h rename to source/lib/templatefile.h diff --git a/source/tool.cpp b/source/lib/tool.cpp similarity index 100% rename from source/tool.cpp rename to source/lib/tool.cpp diff --git a/source/tool.h b/source/lib/tool.h similarity index 100% rename from source/tool.h rename to source/lib/tool.h diff --git a/source/toolchain.cpp b/source/lib/toolchain.cpp similarity index 100% rename from source/toolchain.cpp rename to source/lib/toolchain.cpp diff --git a/source/toolchain.h b/source/lib/toolchain.h similarity index 100% rename from source/toolchain.h rename to source/lib/toolchain.h diff --git a/source/virtualfilesystem.cpp b/source/lib/virtualfilesystem.cpp similarity index 100% rename from source/virtualfilesystem.cpp rename to source/lib/virtualfilesystem.cpp diff --git a/source/virtualfilesystem.h b/source/lib/virtualfilesystem.h similarity index 100% rename from source/virtualfilesystem.h rename to source/lib/virtualfilesystem.h diff --git a/source/virtualtarget.cpp b/source/lib/virtualtarget.cpp similarity index 100% rename from source/virtualtarget.cpp rename to source/lib/virtualtarget.cpp diff --git a/source/virtualtarget.h b/source/lib/virtualtarget.h similarity index 100% rename from source/virtualtarget.h rename to source/lib/virtualtarget.h -- 2.43.0