improved paths
This commit is contained in:
parent
aab781db5f
commit
905df28711
10 changed files with 242 additions and 129 deletions
|
|
@ -26,90 +26,18 @@ module;
|
|||
#include "json.hpp"
|
||||
#include <filesystem>
|
||||
#include <thread>
|
||||
#include <stdlib.h>
|
||||
module Crafter.Build:ProjectImpl;
|
||||
import :Project;
|
||||
import :Configuration;
|
||||
import :Dependency;
|
||||
using namespace Crafter::Build;
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
Project::Project(std::string name, std::vector<Configuration> configurations) : name(name), configurations(configurations) {
|
||||
Project::Project(std::string name, fs::path path, std::vector<Configuration> configurations) : name(name), path(path), configurations(configurations) {
|
||||
|
||||
}
|
||||
|
||||
struct ConfigData {
|
||||
std::string standard;
|
||||
std::vector<std::string> sourceFiles;
|
||||
std::vector<std::string> moduleFiles;
|
||||
std::string optimizationLevel;
|
||||
std::string buildDir;
|
||||
std::string outputDir;
|
||||
std::string type;
|
||||
std::string target;
|
||||
};
|
||||
|
||||
ConfigData CollapseConfig(nlohmann::json& configs,nlohmann::json& config) {
|
||||
ConfigData data;
|
||||
if(config.contains("standard")) {
|
||||
data.standard = config["standard"].get<std::string>();
|
||||
}
|
||||
if(config.contains("target")) {
|
||||
data.target = config["target"].get<std::string>();
|
||||
}
|
||||
if(config.contains("type")) {
|
||||
data.type = config["type"].get<std::string>();
|
||||
}
|
||||
if(config.contains("source_files")) {
|
||||
data.sourceFiles = config["source_files"].get<std::vector<std::string>>();
|
||||
}
|
||||
if(config.contains("module_files")) {
|
||||
data.moduleFiles = config["module_files"].get<std::vector<std::string>>();
|
||||
}
|
||||
if(config.contains("optimization_level")) {
|
||||
data.optimizationLevel = config["optimization_level"].get<std::string>();
|
||||
}
|
||||
if(config.contains("build_dir")) {
|
||||
data.buildDir = config["build_dir"].get<std::string>();
|
||||
}
|
||||
if(config.contains("output_dir")) {
|
||||
data.outputDir = config["output_dir"].get<std::string>();
|
||||
}
|
||||
if(config.contains("extends")){
|
||||
const std::vector<std::string> extends = config["extends"].get<std::vector<std::string>>();
|
||||
for(const std::string& extendName : extends) {
|
||||
for (nlohmann::json::iterator it = configs.begin(); it != configs.end(); ++it) {
|
||||
if((*it)["name"].get<std::string>() == extendName){
|
||||
ConfigData extendData = CollapseConfig(configs, (*it));
|
||||
if(!extendData.standard.empty() && data.standard.empty()){
|
||||
data.standard = extendData.standard;
|
||||
}
|
||||
if(!extendData.sourceFiles.empty()){
|
||||
data.sourceFiles.insert(data.sourceFiles.end(), extendData.sourceFiles.begin(), extendData.sourceFiles.end());
|
||||
}
|
||||
if(!extendData.moduleFiles.empty()){
|
||||
data.moduleFiles.insert(data.moduleFiles.end(), extendData.moduleFiles.begin(), extendData.moduleFiles.end());
|
||||
}
|
||||
if(!extendData.optimizationLevel.empty() && data.standard.empty()){
|
||||
data.optimizationLevel = extendData.optimizationLevel;
|
||||
}
|
||||
if(!extendData.buildDir.empty() && data.buildDir.empty()) {
|
||||
data.buildDir = extendData.buildDir;
|
||||
}
|
||||
if(!extendData.outputDir.empty() && data.outputDir.empty()) {
|
||||
data.outputDir = extendData.outputDir;
|
||||
}
|
||||
if(!extendData.target.empty() && data.target.empty()) {
|
||||
data.target = extendData.target;
|
||||
}
|
||||
if(!extendData.type.empty() && data.type.empty()) {
|
||||
data.type = extendData.type;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return data;
|
||||
}
|
||||
|
||||
void Project::Build(std::string configuration) {
|
||||
for(const Configuration& config : configurations) {
|
||||
if(config.name == configuration){
|
||||
|
|
@ -120,7 +48,7 @@ void Project::Build(std::string configuration) {
|
|||
throw std::runtime_error("Configuration: " + configuration + " not found.");
|
||||
}
|
||||
|
||||
void Project::Build(std::string configuration, std::string outputDir) {
|
||||
void Project::Build(std::string configuration, fs::path outputDir) {
|
||||
for(const Configuration& config : configurations) {
|
||||
if(config.name == configuration){
|
||||
Build(config, outputDir);
|
||||
|
|
@ -134,19 +62,19 @@ void Project::Build(Configuration configuration) {
|
|||
Build(configuration, configuration.outputDir);
|
||||
}
|
||||
|
||||
void Project::Build(Configuration config, std::string outputDir) {
|
||||
if (!std::filesystem::exists(config.buildDir)) {
|
||||
std::filesystem::create_directory(config.buildDir);
|
||||
void Project::Build(Configuration config, fs::path outputDir) {
|
||||
if (!fs::exists(config.buildDir)) {
|
||||
fs::create_directory(config.buildDir);
|
||||
} else {
|
||||
for (const auto& entry : std::filesystem::directory_iterator(config.buildDir)){
|
||||
std::filesystem::remove_all(entry.path());
|
||||
for (const auto& entry : fs::directory_iterator(config.buildDir)){
|
||||
fs::remove_all(entry.path());
|
||||
}
|
||||
}
|
||||
if (!std::filesystem::exists(outputDir)) {
|
||||
std::filesystem::create_directory(outputDir);
|
||||
if (!fs::exists(outputDir)) {
|
||||
fs::create_directory(outputDir);
|
||||
} else {
|
||||
for (const auto& entry : std::filesystem::directory_iterator(outputDir)){
|
||||
std::filesystem::remove_all(entry.path());
|
||||
for (const auto& entry : fs::directory_iterator(outputDir)){
|
||||
fs:remove_all(entry.path());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -154,67 +82,70 @@ void Project::Build(Configuration config, std::string outputDir) {
|
|||
if(!config.target.empty()){
|
||||
target = std::format("-target {}", config.target);
|
||||
}
|
||||
std::string pcmDir;
|
||||
fs::path pcmDir;
|
||||
if(config.type == "library" || config.type == "shared-library"){
|
||||
pcmDir = outputDir;
|
||||
}else{
|
||||
pcmDir = config.buildDir;
|
||||
}
|
||||
|
||||
std::string clangDir;
|
||||
if(config.target == "wasm32-unknown-wasi" || config.target == "wasm64-unknown-wasi"){
|
||||
clangDir = "${WASI_SDK_PATH}/bin/clang++ --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot";
|
||||
name+=".wasm";
|
||||
} else{
|
||||
clangDir = "clang++";
|
||||
}
|
||||
|
||||
if(config.target == "wasm32" || config.target == "wasm64") {
|
||||
clangDir = "${WASI_SDK_PATH}/bin/clang++ --sysroot=${WASI_SDK_PATH}/share/wasi-sysroot -Wno-unused-command-line-argument";
|
||||
name+=".wasm";
|
||||
} else if(config.target == "wasm32" || config.target == "wasm64") {
|
||||
clangDir = "${WASI_SDK_PATH}/bin/clang++ --no-standard-libraries -Wl,--no-entry -Wl,--export-all -Wno-unused-command-line-argument";
|
||||
name+=".wasm";
|
||||
name+=".wasm";
|
||||
} else {
|
||||
clangDir = "clang++ -Wno-unused-command-line-argument";
|
||||
}
|
||||
|
||||
for(const std::string& moduleFile : config.moduleFiles){
|
||||
system(std::format("{} -std={} {}.cppm --precompile -fprebuilt-module-path={} -o {}/{}.pcm {}", clangDir, config.standard, moduleFile, pcmDir, pcmDir, moduleFile, target).c_str());
|
||||
//clangDir+= std::format(" -I {} ", pcmDir);
|
||||
|
||||
for(const fs::path& moduleFile : config.moduleFiles){
|
||||
system(std::format("{} -std={} {}.cppm --precompile -fprebuilt-module-path={} -o {}.pcm {}", clangDir, config.standard, moduleFile.generic_string(), pcmDir.generic_string(), (pcmDir/moduleFile.filename()).generic_string(), target).c_str());
|
||||
}
|
||||
std::vector<std::thread> threads = std::vector<std::thread>(config.moduleFiles.size() + config.sourceFiles.size());
|
||||
std::string files;
|
||||
for(std::int_fast32_t i = 0; i < config.moduleFiles.size(); i++) {
|
||||
files+=std::format("{}/{}.o ",config.buildDir, config.moduleFiles[i]);
|
||||
files+=std::format("{}.o ",(config.buildDir/config.moduleFiles[i].filename()).generic_string());
|
||||
threads[i] = std::thread([i, config, pcmDir, target, clangDir](){
|
||||
system(std::format("{} -std={} {}/{}.pcm -fprebuilt-module-path={} -c -O{} -o {}/{}.o {}", clangDir, config.standard, pcmDir, config.moduleFiles[i], pcmDir, config.optimizationLevel, config.buildDir, config.moduleFiles[i], target).c_str());
|
||||
system(std::format("{} -std={} {}.pcm -fprebuilt-module-path={} -c -O{} -o {}.o {}", clangDir, config.standard, (pcmDir/config.moduleFiles[i].filename()).generic_string(), pcmDir.generic_string(), config.optimizationLevel, (config.buildDir/config.moduleFiles[i].filename()).generic_string(), target).c_str());
|
||||
});
|
||||
}
|
||||
for(std::int_fast32_t i = 0; i < config.sourceFiles.size(); i++) {
|
||||
files+=std::format("{}/{}_source.o ",config.buildDir, config.sourceFiles[i]);
|
||||
files+=std::format("{}_source.o ",(config.buildDir/config.sourceFiles[i].filename()).generic_string());
|
||||
threads[config.moduleFiles.size()+i] = std::thread([i, config, pcmDir, target, clangDir](){
|
||||
system(std::format("{} -std={} {}.cpp -fprebuilt-module-path={} -c -O{} -o {}/{}_source.o {}", clangDir, config.standard, config.sourceFiles[i], pcmDir, config.optimizationLevel, config.buildDir, config.sourceFiles[i], target).c_str());
|
||||
system(std::format("{} -std={} {}.cpp -fprebuilt-module-path={} -c -O{} -o {}_source.o {}", clangDir, config.standard, config.sourceFiles[i].generic_string(), pcmDir.generic_string(), config.optimizationLevel, (config.buildDir/config.sourceFiles[i].filename()).generic_string(), target).c_str());
|
||||
});
|
||||
}
|
||||
for(std::thread& thread : threads){
|
||||
thread.join();
|
||||
}
|
||||
if(config.type == "executable"){
|
||||
system(std::format("{} {}-O{} -o {}/{} {}", clangDir, files, config.optimizationLevel, outputDir, name, target).c_str());
|
||||
system(std::format("{} {}-O{} -o {} {}", clangDir, files, config.optimizationLevel, (outputDir/name).generic_string(), target).c_str());
|
||||
} else if(config.type == "library"){
|
||||
system(std::format("ar r {}/{}.a {}", clangDir, outputDir, name, files, target).c_str());
|
||||
system(std::format("ar r {}.a {}", (outputDir/name).generic_string(), files).c_str());
|
||||
} else if(config.type == "shared-library"){
|
||||
system(std::format("ar r {}/{}.so {} -shared", outputDir, name, files, target).c_str());
|
||||
system(std::format("ar r {}.so {} -shared", (outputDir/name).generic_string(), files).c_str());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Project Project::LoadFromJSON(std::string file) {
|
||||
if (!std::filesystem::exists(file)) {
|
||||
throw std::runtime_error("Project file: " + file + " not found.");
|
||||
Project Project::LoadFromJSON(fs::path path) {
|
||||
if (!fs::exists(path)) {
|
||||
throw std::runtime_error(std::format("Project file: {} not found.", path.generic_string()));
|
||||
}
|
||||
std::ifstream f(file);
|
||||
|
||||
std::ifstream f(path);
|
||||
nlohmann::json data = nlohmann::json::parse(f);
|
||||
const std::string name = data["name"].get<std::string>();
|
||||
std::vector<Configuration> configurations;
|
||||
nlohmann::json configs = data["configurations"];
|
||||
|
||||
const fs::path workingDir = path.remove_filename();
|
||||
for (nlohmann::json::iterator it = configs.begin(); it != configs.end(); ++it) {
|
||||
ConfigData configData = CollapseConfig(configs, (*it));
|
||||
configurations.emplace_back((*it)["name"].get<std::string>(), configData.standard, configData.sourceFiles, configData.moduleFiles, configData.optimizationLevel, configData.buildDir, configData.outputDir,configData.type, configData.target);
|
||||
configurations.emplace_back(configs, (*it), workingDir);
|
||||
}
|
||||
return Project(name,configurations);
|
||||
return Project(name, workingDir, configurations);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue