Skip to content

Commit 5a98d95

Browse files
danoli3danoli3
committed
Visual Studio Fixes for opening correct Version
1 parent 3448f30 commit 5a98d95

File tree

6 files changed

+79
-65
lines changed

6 files changed

+79
-65
lines changed

‎commandLine/src/defines.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#define OFPROJECTGENERATOR_MAJOR_VERSION "0"
2-
#define OFPROJECTGENERATOR_MINOR_VERSION "98"
2+
#define OFPROJECTGENERATOR_MINOR_VERSION "99"
33
#define OFPROJECTGENERATOR_PATCH_VERSION "0"
44

55
#define PG_VERSION (OFPROJECTGENERATOR_MAJOR_VERSION "." OFPROJECTGENERATOR_MINOR_VERSION "." OFPROJECTGENERATOR_PATCH_VERSION)

‎commandLine/src/main.cpp‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -513,13 +513,15 @@ int main(int argc, char ** argv) {
513513
if (options[TEMPLATE].arg != NULL) {
514514
string templateString(options[TEMPLATE].arg);
515515
templateName = templateString;
516+
ofLogNotice() << "{ \"Template\": \"" << templateName << "\" }";
516517
}
517518
}
518519

519520
if (options[PLATFORMS].count() > 0) {
520521
if (options[PLATFORMS].arg != NULL) {
521522
string platformString(options[PLATFORMS].arg);
522523
addPlatforms(platformString);
524+
ofLogNotice() << "{ \"Platform\": \"" << platformString << "\" }";
523525
}
524526
}
525527

@@ -581,9 +583,9 @@ int main(int argc, char ** argv) {
581583

582584
// try to get the OF_PATH as an environt variable
583585

584-
if (bVerbose) {
586+
//if (bVerbose) {
585587
ofSetLogLevel(OF_LOG_VERBOSE);
586-
}
588+
//}
587589

588590
if (projectName == "") {
589591
printHelp();
@@ -678,25 +680,22 @@ int main(int argc, char ** argv) {
678680
}
679681
} else {
680682
if (mode == PG_MODE_UPDATE && !isGoodProjectPath(projectPath)) {
681-
ofLogError() << "there is no src folder in this project path to update, maybe use create instead? (or use force to force updating)";
683+
messageError("there is no src folder in this project path to update, maybe use create instead? (or use force to force updating");
682684
} else {
683-
nProjectsCreated += 1;
684-
685+
685686
ofLogNotice() << "setting OF path to: [" << ofPath << "]";
686687
if (busingEnvVar) {
687688
ofLogNotice() << "from PG_OF_PATH environment variable";
688689
} else {
689690
ofLogNotice() << "from -o option";
690691
}
691-
692-
693692
for (auto & t : targets) {
694693
consoleSpace();
695694
ofLogNotice() << "-----------------------------------------------";
696695
ofLogNotice() << "target platform is: [" << t << "]";
697696
// ofLogNotice() << "project path is: [" << projectPath << "]";
698697
if (templateName != "") {
699-
ofLogNotice() << "using additional template " << templateName;
698+
ofLogNotice() << "using additional template [" << templateName << "]";
700699
}
701700
ofLogVerbose() << "setting up new project " << projectPath;
702701

@@ -706,7 +705,7 @@ int main(int argc, char ** argv) {
706705
ofLogNotice() << "project updated! ";
707706
} else {
708707
if (!bDryRun) {
709-
// ofLogNotice() << "project path is: [" << projectPath << "]";
708+
ofLogNotice() << "project path is: [" << projectPath << "]";
710709
auto project = getTargetProject(t);
711710
project->create(projectPath, templateName);
712711
if(bAddonsPassedIn){
@@ -726,6 +725,7 @@ int main(int argc, char ** argv) {
726725
project->save();
727726
}
728727
ofLogNotice() << "project created! ";
728+
nProjectsCreated += 1;
729729
}
730730
ofLogNotice() << "-----------------------------------------------";
731731
}
@@ -734,12 +734,14 @@ int main(int argc, char ** argv) {
734734

735735
consoleSpace();
736736
float elapsedTime = ofGetElapsedTimef() - startTime;
737-
if (nProjectsCreated > 0) std::cout << nProjectsCreated << " project created ";
738-
if (nProjectsUpdated == 1) std::cout << nProjectsUpdated << " project updated ";
737+
if (nProjectsCreated > 0) std::cout << nProjectsCreated << " project created at " << projectPath;
738+
if (nProjectsUpdated == 1) std::cout << nProjectsUpdated << " project updated at " << projectPath;
739739
if (nProjectsUpdated > 1) std::cout << nProjectsUpdated << " projects updated ";
740740
ofLogNotice() << "in " << elapsedTime << " seconds" << std::endl;
741741
consoleSpace();
742-
742+
std::cout << "{ \"inSeconds\": \"" << elapsedTime << "\" }" << std::endl;
743+
std::cout << "{ \"status\": \"" << "EXIT_OK" << "\" }";
743744
messageReturn("status", "EXIT_OK");
745+
744746
return EXIT_OK;
745747
}

‎commandLine/src/projects/baseProject.cpp‎

Lines changed: 26 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ baseProject::baseProject(const string & _target) : target(_target) {
2222
bLoaded = false;
2323
}
2424

25-
fs::path baseProject::getPlatformTemplateDir() {
25+
fs::path baseProject::getPlatformTemplateDir(std::string templateDir) {
2626
string folder { target };
2727
if ( target == "msys2"
2828
|| target == "linux"
@@ -33,12 +33,10 @@ fs::path baseProject::getPlatformTemplateDir() {
3333
) {
3434
folder = "vscode";
3535
}
36-
37-
// if ( target == "qtcreator" ) {
38-
// return getOFRoot()
39-
// }
40-
41-
return getOFRoot() / templatesFolder / folder;
36+
if (templateDir != "") {
37+
folder = templateDir;
38+
}
39+
return fs::weakly_canonical(getOFRoot() / templatesFolder / folder);
4240
}
4341

4442

@@ -139,26 +137,25 @@ bool baseProject::create(const fs::path & _path, string templateName){
139137

140138
addons.clear();
141139
extSrcPaths.clear();
142-
143-
templatePath = normalizePath(getPlatformTemplateDir());
140+
auto pathTemplate = getPlatformTemplateDir(templateName);
141+
if (fs::exists(pathTemplate)) {
142+
templatePath = normalizePath(pathTemplate);
143+
} else {
144+
ofLogError() << "templatePath does not exist: [" << templatePath << "]";
145+
}
146+
if (fs::exists(templatePath)) {
147+
templatePath = normalizePath(pathTemplate);
148+
} else {
149+
ofLogError() << "templatePath does not exist: [" << templatePath << "]";
150+
}
144151
ofLogNotice() << "templatePath: [" << templatePath << "]";
145152
auto projectPath = fs::canonical(fs::current_path() / path);
146-
147153
projectDir = path;
148154
projectPath = normalizePath(projectPath);
149155
ofLogNotice() << "projectPath: [" << projectPath << "]";
150-
151156
projectName = projectPath.filename().string();
152-
153-
// we had this in some projects. if we decide to keep this is the place
154-
// if (!fs::exists(projectDir)) {
155-
// fs::create_directory(projectDir);
156-
// }
157157
bool bDoesSrcDirExist = false;
158-
159-
// it can be only "src"
160158
fs::path projectSrc { projectDir / "src" };
161-
162159
if (fs::exists(projectSrc) && fs::is_directory(projectSrc)) {
163160
bDoesSrcDirExist = true;
164161
} else {
@@ -175,18 +172,14 @@ bool baseProject::create(const fs::path & _path, string templateName){
175172
}
176173
}
177174
bool ret = createProjectFile();
178-
if(!ret) return false;
179-
180-
// cout << "after return : " << templateName << endl;
181-
if(!empty(templateName)){
182-
// cout << "templateName not empty " << templateName << endl;
183-
// return getOFRoot() / templatesFolder / target;
184-
175+
if (!ret) {
176+
ofLogError() << "{ \"errorMessage\": \"" << "baseProject::create createProjectFile failed" << "\", \"status:\" \"EXIT_FAILURE\" }";
177+
return false;
178+
}
179+
if (templateName != "" && !empty(templateName)) {
185180
fs::path templateDir = getOFRoot() / templatesFolder / templateName;
186-
ofLogNotice() << "templateDir: [" << templateDir << "]";
187181
templateDir = normalizePath(templateDir);
188-
// alert("templateDir " + templateDir.string());
189-
182+
ofLogNotice() << "templateDir: [" << templateDir << "]";
190183
auto templateConfig = parseTemplate(templateDir);
191184
if(templateConfig){
192185
recursiveTemplateCopy(templateDir, projectDir);
@@ -208,13 +201,13 @@ bool baseProject::create(const fs::path & _path, string templateName){
208201
ofLogWarning() << "Cannot find " << templateName << " using platform template only";
209202
}
210203
}
211-
212204
ret = loadProjectFile();
213-
214-
if(!ret) return false;
205+
if (!ret) {
206+
ofLogError() << "{ \"errorMessage\": \"" << "baseProject::create loadProjectFile failed" << "\", \"status:\" \"EXIT_FAILURE\" }";
207+
return false;
208+
}
215209

216210
parseConfigMake();
217-
218211
if (bDoesSrcDirExist){
219212
vector <fs::path> fileNames;
220213

@@ -548,7 +541,6 @@ void baseProject::addAddon(ofAddon & addon){
548541
unless there is one addon added which needs another, and it needs another.
549542
550543
*/
551-
// alert("---> dependencies");
552544
for (auto & d : addon.dependencies) {
553545
bool found = false;
554546
for (auto & a : addons) {
@@ -564,12 +556,8 @@ void baseProject::addAddon(ofAddon & addon){
564556
ofLogVerbose() << "trying to add duplicated addon dependency! skipping: " << d;
565557
}
566558
}
567-
// alert("---> dependencies");
568559
addons.emplace_back(addon);
569560

570-
571-
//ofLogVerbose("baseProject") << "libs in addAddon " << addon.libs.size();
572-
573561
addAddonBegin(addon);
574562

575563
addAddonDllsToCopy(addon);

‎commandLine/src/projects/baseProject.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class baseProject {
8282

8383
std::vector<Template> listAvailableTemplates(std::string target);
8484
std::unique_ptr<baseProject::Template> parseTemplate(const fs::path & templateDir);
85-
virtual fs::path getPlatformTemplateDir();
85+
virtual fs::path getPlatformTemplateDir(std::string templateDir);
8686

8787
pugi::xml_document doc;
8888
bool bLoaded;

‎commandLine/src/utils/Utils.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ unique_ptr<baseProject> getTargetProject(const string & targ) {
439439
} else if (targ == "msys2") {
440440
// return unique_ptr<QtCreatorProject>(new QtCreatorProject(targ));
441441
return unique_ptr<VSCodeProject>(new VSCodeProject(targ));
442-
} else if (targ == "vs") {
442+
} else if (targ == "vs" || targ == "vs2019") {
443443
return unique_ptr<visualStudioProject>(new visualStudioProject(targ));
444444
} else if (targ == "linux" ||
445445
targ == "linux64" ||

‎frontend/index.js‎

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ function getDefaultTemplateForPlatform(platformId) {
107107
"linux64": "Linux 64 (VS Code/Make)",
108108
"linuxarmv6l": "Arm 32 (VS Code/Make)",
109109
"linuxaarch64": "Arm 64 (VS Code/Make)",
110-
"vscode": "VS Code"
110+
"vscode": "VS Code",
111+
"vs2019": "Windows (Visual Studio 2019)",
111112
};
112113

113114
return defaultTemplates[platformId] || "Unknown Template";
@@ -252,6 +253,8 @@ const templates = {
252253
"tvOS": "Apple tvOS template",
253254
"unittest": "Unit test no window application",
254255
"vscode": "Visual Studio Code",
256+
"vs2019": "Visual Studio 2019",
257+
255258
};
256259

257260
let defaultOfPath = settings["defaultOfPath"];
@@ -888,7 +891,8 @@ function updateFunction(event, update) {
888891
}
889892

890893
if (templateList != null) {
891-
templateString = `-t"${templateList.join(",")}"`;
894+
const uniqueTemplates = [...new Set(templateList)];
895+
templateString = `-t"${uniqueTemplates.join(",")}"`;
892896
}
893897

894898
if (ofPath != null) {
@@ -1111,7 +1115,8 @@ ipcMain.on('pickUpdatePath', async (event, arg) => {
11111115
});
11121116
if (filenames !== undefined && filenames.filePaths.length > 0) {
11131117
// defaultOfPath = filenames.filePaths[0]; // TODO: IS THIS CORRECT?
1114-
event.sender.send('setUpdatePath', filenames.filePaths[0]);
1118+
const formattedPath = process.platform === "win32" ? filenames.filePaths[0].replace(/\//g, "\\") : filenames.filePaths[0];
1119+
event.sender.send('setUpdatePath', formattedPath);
11151120
}
11161121
} catch(err) {
11171122
console.error('pickUpdatePath', err);
@@ -1133,7 +1138,8 @@ ipcMain.on('pickProjectPath', async (event, arg) => {
11331138
defaultPath: arg
11341139
});
11351140
if (filenames !== undefined && filenames.filePaths.length > 0) {
1136-
event.sender.send('setProjectPath', filenames.filePaths[0]);
1141+
const formattedPath = process.platform === "win32" ? filenames.filePaths[0].replace(/\//g, "\\") : filenames.filePaths[0];
1142+
event.sender.send('setProjectPath', formattedPath);
11371143
}
11381144
} catch(err) {
11391145
console.error('pickProjectPath', err);
@@ -1240,29 +1246,47 @@ async function openVisualStudio(windowsPath) {
12401246
}
12411247

12421248
let isVS2019Project = false;
1243-
const solutionFile = path.join(path.dirname(windowsPath), path.basename(windowsPath));
1244-
1249+
const windowsPathEscaped = windowsPath.replace(/\\/g, '\\\\');
1250+
solutionFile = path.resolve(windowsPath.trim().replace(/^"+|"+$/g, ''));
1251+
console.log("VS Solution File Content: " + solutionFile);
12451252
if (fs.existsSync(solutionFile)) {
12461253
const fileContent = fs.readFileSync(solutionFile, 'utf8');
1247-
if (fileContent.includes("VisualStudioVersion = 16.0")) {
1254+
if (fileContent.match(/VisualStudioVersion = 16\.\d+/)) {
1255+
console.log("Detected VS2019!");
12481256
isVS2019Project = true;
1257+
} else {
1258+
console.log("VS2019 Not Detected.");
12491259
}
1260+
} else {
1261+
console.error("Error: Solution file does not exist: " + solutionFile);
12501262
}
12511263

12521264
try {
12531265
if (isVS2019Project) {
1254-
console.log("Detected VS2019 project, searching for VS2019 installation...");
1266+
console.log("Detected VS2019 project, opening in VS2019...");
12551267
const vs2019Path = await getVisualStudioPath("16");
1256-
exec(`"${vs2019Path}" "${windowsPath}"`);
1268+
const vs2019PathEscaped = vs2019Path.replace(/\\/g, '\\\\');
1269+
console.log(`Opening in VS2022 by default.. path:[${vs2019PathEscaped}] command:start "" "${vs2019PathEscaped}" "${windowsPathEscaped}"`);
1270+
exec(`start "" "${vs2019PathEscaped}" ${windowsPathEscaped}`, (error, stdout, stderr) => {
1271+
if (error) {
1272+
console.error("Error opening in VS2019:", stderr);
1273+
}
1274+
});
12571275
} else {
1258-
console.log("Opening in VS2022 by default...");
12591276
const vs2022Path = await getVisualStudioPath("17");
1260-
exec(`"${vs2022Path}" "${windowsPath}"`);
1277+
const vs2022PathEscaped = vs2022Path.replace(/\\/g, '\\\\');
1278+
console.log(`Opening in VS2022 by default.. path:[${vs2022PathEscaped}] command:start "" "${vs2022PathEscaped}" "${windowsPathEscaped}"`);
1279+
exec(`start "" "${vs2022PathEscaped}" ${windowsPathEscaped}`, (error, stdout, stderr) => {
1280+
if (error) {
1281+
console.error("Error opening in VS2022:", stderr);
1282+
}
1283+
});
1284+
12611285
}
12621286
} catch (error) {
12631287
console.error("Could not open Visual Studio:", error);
12641288
console.log("Falling back to default system handler...");
1265-
exec(`start "" "${windowsPath}"`);
1289+
exec('start "" "' + windowsPath + '"');
12661290
}
12671291
}
12681292

0 commit comments

Comments
 (0)