commandLine fixes PG 0.70.0

.gitignore

@@ -100,3 +100,4 @@ commandLine/.vs/commandLine/xs
 commandLine/.vs/
 commandLine/bin
 commandLine/dll
+commandLine/icon.aps

commandLine/src/defines.h

@@ -1,5 +1,5 @@
 #define OFPROJECTGENERATOR_MAJOR_VERSION 0
-#define OFPROJECTGENERATOR_MINOR_VERSION 67
+#define OFPROJECTGENERATOR_MINOR_VERSION 70
 #define OFPROJECTGENERATOR_PATCH_VERSION 0
 
-#define PG_VERSION "69"
+#define PG_VERSION "0.70.0"

commandLine/src/main.cpp

@@ -37,7 +37,6 @@ constexpr option::Descriptor usage[] = {
 	{ LISTTEMPLATES, 0, "l", "listtemplates", option::Arg::None, "  --listtemplates, -l  \tlist templates available for the specified or current platform(s)" },
 	{ PLATFORMS, 0, "p", "platforms", option::Arg::Optional, "  --platforms, -p  \tplatform list (such as osx, ios, winvs)" },
 	{ ADDONS, 0, "a", "addons", option::Arg::Optional, "  --addons, -a  \taddon list (such as ofxOpenCv, ofxGui, ofxXmlSettings)" },
-	{ ADDONS, 0, "a", "addons", option::Arg::Optional, "  --addons, -a  \taddon list (such as ofxOpenCv, ofxGui, ofxXmlSettings)" },
 	{ OFPATH, 0, "o", "ofPath", option::Arg::Optional, "  --ofPath, -o  \tpath to openframeworks (relative or absolute). This *must* be set, or you can also alternatively use an environment variable PG_OF_PATH and if this isn't set, it will use that value instead" },
 	{ VERBOSE, 0, "v", "verbose", option::Arg::None, "  --verbose, -v  \trun verbose" },
 	{ TEMPLATE, 0, "t", "template", option::Arg::Optional, "  --template, -t  \tproject template" },
@@ -444,6 +443,8 @@ int main(int argc, char ** argv) {
 
 	if (options[BACKUP_PROJECT_FILES].count() > 0) {
 		bBackup = true;
+		backupProjectFiles = bBackup;
+		ofLogVerbose() << "Backup project files: true";
 	}
 
 	// templates:
@@ -538,8 +539,8 @@ int main(int argc, char ** argv) {
 
 #ifndef DEBUG_NO_OPTIONS
 	if (options[HELP] || argc == 0) {
-		messageError("No arguments");
 		printHelp();
+		messageError("No arguments");
 		return EXIT_OK;
 	}
 #endif
@@ -566,9 +567,9 @@ int main(int argc, char ** argv) {
 
 
 	if (projectName == "") {
-		messageError("Missing project path");
 		printHelp();
 		consoleSpace();
+		messageError("Missing project path");
 		return EXIT_USAGE;
 	}
 
@@ -633,10 +634,11 @@ int main(int argc, char ** argv) {
 	if (bListTemplates) {
 		auto ret = printTemplates();
 		consoleSpace();
-		if (ret) {
-
+		if (ret) {			
+			messageReturn("status", "EXIT_OK");
 			return EXIT_OK;
 		} else {
+			messageError("printTemplates data error");
 			return EXIT_DATAERR;
 		}
 	}

commandLine/src/projects/VSCodeProject.cpp

@@ -69,6 +69,17 @@ std::string VSCodeProject::LOG_NAME = "VSCodeProject";
 
 bool VSCodeProject::createProjectFile(){
 
+	if (backupProjectFiles) {
+		createBackup({ projectDir / ".vscode" / "c_cpp_properties.json" }, projectDir);
+		createBackup({ projectDir / ".vscode" / "extensions.json" }, projectDir);
+		createBackup({ projectDir / ".vscode" / "launch.json" }, projectDir);
+		createBackup({ projectDir / ".vscode" / "tasks.json" }, projectDir);
+		createBackup({ projectDir / (projectName + ".code-workspace") }, projectDir);
+		createBackup({ projectDir / "addons.make" }, projectDir);
+		createBackup({ projectDir / "config.make" }, projectDir);
+		createBackup({ projectDir / "Makefile" }, projectDir);
+	}
+
 #if defined(__MINGW32__) || defined(__MINGW64__)
 	try {
 		fs::remove_all(projectDir / ".vscode");
@@ -78,7 +89,6 @@ bool VSCodeProject::createProjectFile(){
 	}
 #endif
 
-	createBackup(projectDir / ".vscode");
 	try {
 		fs::copy(templatePath / ".vscode", projectDir / ".vscode", fs::copy_options::update_existing | fs::copy_options::recursive);
 	} catch(fs::filesystem_error& e) {

commandLine/src/projects/visualStudioProject.cpp

@@ -10,7 +10,13 @@ bool visualStudioProject::createProjectFile(){
 
 	ensureDllDirectoriesExist();
 	solution = projectDir / (projectName + ".sln");
-	createBackup(solution);
+	if (backupProjectFiles) {
+		createBackup(solution, projectDir);
+		createBackup({ projectDir / "addons.make" }, projectDir);
+		createBackup({ projectDir / "config.make" }, projectDir);
+		createBackup({ projectDir / "Makefile" }, projectDir);
+		createBackup({ projectDir / (projectName + ".vcxproj") }, projectDir);
+	}
 
 	std::pair <string, string> replacementsForward, replacementsBack;
 	if (!fs::equivalent(getOFRoot(), fs::path{ "../../.." })) {
@@ -508,9 +514,9 @@ void visualStudioProject::addDefine(string define, LibType libType) {
 }
 
 void visualStudioProject::ensureDllDirectoriesExist() {
-	std::vector<fs::path> dirs { "dll\\x64", "dll\\ARM64", "dll\\ARM64EC" };
+	std::vector<fs::path> dirs { { "dll/x64" }, { "dll/ARM64" }, { "dll/ARM64EC" } };
 	for (const auto & dir : dirs) {
-		fs::path dirPath = projectDir / dir;
+		fs::path dirPath = { projectDir / dir };
 		dirPath = normalizePath(dirPath);
 		if (!fs::exists(dirPath)) {
 			ofLogVerbose() << "adding dll folder: [" << dirPath.string() << "]";

commandLine/src/projects/xcodeProject.cpp

@@ -116,12 +116,23 @@ bool xcodeProject::createProjectFile(){
 		   }
 	   }
 
+	if (backupProjectFiles) {
+		createBackup({ xcodeProject / "project.pbxproj" }, projectDir);
+		createBackup({ projectDir / "openFrameworks-Info.plist" }, projectDir);
+		createBackup({ projectDir / "Project.xcconfig" }, projectDir);
+		createBackup({ projectDir / "of.entitlements" }, projectDir);
+		createBackup({ projectDir / "addons.make" }, projectDir);
+		createBackup({ projectDir / "config.make" }, projectDir);
+		createBackup({ projectDir / "Makefile" }, projectDir);
+	}
 
 	saveScheme();
 
 	if(target == "osx" || target == "macos"){
 		saveMakefile();
 	}
+
+
 
 	// Execute all file copy and replacements, including ones in saveScheme, saveMakefile
 	for (auto & c : copyTemplateFiles) {

commandLine/src/utils/Utils.cpp

@@ -552,10 +552,16 @@ bool ofIsPathInPath(const fs::path & path, const fs::path & base) {
 }
 
 
-void createBackup(const fs::path &path) {
+void createBackup(const fs::path & path, const fs::path & backupPath) {
 	if(fs::exists(path)) {
-		fs::path backupDir = path.parent_path();
-		fs::path backupFile = backupDir / (path.filename().string() + ".bak");
+		std::string datetimeStr = ofGetTimestampString("%Y-%m-%d");
+
+		fs::path backupDir = { backupPath / "backups" / datetimeStr };
+		if (fs::exists(backupDir)) {			
+			std::string hour = ofGetTimestampString("%H-%M");
+			backupDir = { backupPath / "backups" / (datetimeStr + "_" + hour) };
+		}
+		fs::path backupFile = backupDir / (path.filename().string());
 		if (!fs::exists(backupDir)) {
 			fs::create_directories(backupDir);
 		}
@@ -651,3 +657,5 @@ fs::path ofRelativeToOFPATH(const fs::path& path) {
 	}
 }
 
+
+

commandLine/src/utils/Utils.h

@@ -20,6 +20,8 @@ using std::vector;
 using std::cout;
 using std::endl;
 
+static bool backupProjectFiles = false;
+
 static std::map <ofTargetPlatform, std::string> platformsToString {
 	{ OF_TARGET_ANDROID, "android" },
 //	{ OF_TARGET_EMSCRIPTEN, "" },
@@ -108,7 +110,7 @@ std::string getPGVersion();
 fs::path makeRelative(const fs::path& from, const fs::path& to);
 
 bool ofIsPathInPath(const fs::path & path, const fs::path & base);
-void createBackup(const fs::path &path);
+void createBackup(const fs::path & path, const fs::path & backupPath);
 
 std::string normalizePath(const std::string& path);
 

scripts/vs/test_cmdline.sh

@@ -5,57 +5,84 @@ SCRIPT_DIR="$( cd "$( dirname "${CURRENT_DIR}"/../../ )" && pwd )"
 PG_DIR="$( cd "$( dirname "${SCRIPT_DIR}"/../../ )" && pwd )"
 
 CMD_DIR="${PG_DIR}/commandLine"
+EXE_FILE="projectGenerator.exe"
 
 echo "CURRENT_DIR:  ${CURRENT_DIR}"
 echo "SCRIPT_DIR:  ${SCRIPT_DIR}"
 echo "PG_DIR:  ${PG_DIR}"
 echo "CMD_DIR:  ${CMD_DIR}"
+
 echo "====== ${CMD_DIR}"
-# Compile commandline tool
+
 cd "${CMD_DIR}/bin"
-echo "Testing projectGenerator: [vs]";
-chmod +x projectGenerator
-./projectGenerator --recursive -pvs -o../../../../ ../../../../examples/
+pwd
+ls
+if [[ -f "${EXE_FILE}" ]]; then
+    echo "File ${EXE_FILE} exists."
+else
+    echo "File ${EXE_FILE} does not exist. trying commandLine.exe"
+    EXE_FILE="commandLine.exe"
+    if [[ -f "${EXE_FILE}" ]]; then
+        echo "File ${EXE_FILE} exists."
+    else
+        echo "No commandLine.exe either! Fail! exiting"
+        exit 1
+    fi
+fi
+echo "Executable File: ${EXE_FILE}"
+echo "Testing projectGenerator: [vs]"
+
+
+chmod +x "${EXE_FILE}"
+
+# Run the project generator executable
+./"${EXE_FILE}" --recursive -pvs -b -o../../../../ ../../../../examples/
 errorcode=$?
 if [[ $errorcode -ne 0 ]]; then
-		exit $errorcode
+    exit $errorcode
 fi
 
-echo "test out of folder -o [vs]";
+echo "Test out of folder -o [vs]"
 rm -rf ../../../../../pg2
-mkdir -p  ../../../../../pg2
+mkdir -p ../../../../../pg2
+
 if ! command -v rsync &> /dev/null
 then      
-    cp -a ./projectGenerator ../../../../../pg2 
+    cp -a ./"${EXE_FILE}" ../../../../../pg2 
 else
-    rsync -azp ./projectGenerator ../../../../../pg2
+    rsync -azp ./"${EXE_FILE}" ../../../../../pg2
 fi
+
 cd ../../../../../pg2
 ls -a
 pwd
-./projectGenerator --recursive -pvs -o"./../openFrameworks" ./../openFrameworks/examples/
+
+# Run the project generator executable again in the new directory
+./"${EXE_FILE}" --recursive -pvs -b -o"./../openFrameworks" ./../openFrameworks/examples/
 errorcode=$?
 if [[ $errorcode -ne 0 ]]; then
-		exit $errorcode
+    exit $errorcode
 fi
 
 echo "Test generate new just name"
-./projectGenerator -o"../openFrameworks" -p"vs" "testingGenerate"
+./"${EXE_FILE}" -o"../openFrameworks" -p"vs" "testingGenerate"
 errorcode=$?
 if [[ $errorcode -ne 0 ]]; then
-		exit $errorcode
+    exit $errorcode
 fi
+
 echo "Test generate new / update full path"
-./projectGenerator -o"../openFrameworks" -p"vs" "../openFrameworks/apps/myApps/testingGenerate"
+./"${EXE_FILE}" -o"../openFrameworks" -p"vs" "../openFrameworks/apps/myApps/testingGenerate"
 errorcode=$?
 if [[ $errorcode -ne 0 ]]; then
-        exit $errorcode
+    exit $errorcode
 fi
 
 echo "Test generate full path"
-./projectGenerator -o"../openFrameworks" -p"vs" "../openFrameworks/apps/myApps/testingGenerate2"
+./"${EXE_FILE}" -o"../openFrameworks" -p"vs" "../openFrameworks/apps/myApps/testingGenerate2"
 errorcode=$?
 if [[ $errorcode -ne 0 ]]; then
-        exit $errorcode
+    exit $errorcode
 fi
-echo "Successful projectGenerator tests for [vs]";
+
+echo "Successful projectGenerator tests for [vs]"