Minor polish

modesttree · Jan 4, 2016 · a22b159 · a22b159
1 parent 451c2b3
commit a22b159
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/Source/PackageBuildAndRunInstaller.bat b/Source/PackageBuildAndRunInstaller.bat
@@ -0,0 +1,3 @@
+@echo off
+call PackageBuild.bat
+START %~dp0\..\Installer\Dist\ProjenyInstaller.exe
diff --git a/Source/prj/main/PackageManager.py b/Source/prj/main/PackageManager.py
@@ -139,12 +139,15 @@ def createPackage(self, packageName):
         assertThat(not self._sys.directoryExists(newPath), "Found existing package at path '{0}'", newPath)
         self._sys.createDirectory(newPath)
 
-        newInstallInfo = PackageInstallInfo()
-        newInstallInfo.releaseInfo = None
-        newInstallInfo.installDate = datetime.utcnow()
+        # This can be nice when sorting packages by install date, but it adds noise to the directory
+        # Seems nicer to just leave the directory empty for custom packages
 
-        yamlStr = YamlSerializer.serialize(newInstallInfo)
-        self._sys.writeFileAsText(os.path.join(newPath, InstallInfoFileName), yamlStr)
+        #newInstallInfo = PackageInstallInfo()
+        #newInstallInfo.releaseInfo = None
+        #newInstallInfo.installDate = datetime.utcnow()
+
+        #yamlStr = YamlSerializer.serialize(newInstallInfo)
+        #self._sys.writeFileAsText(os.path.join(newPath, InstallInfoFileName), yamlStr)
 
     def deletePackage(self, name):
         self._log.heading("Deleting package '{0}'", name)

diff --git a/UnityPlugin/Projeny/Main/ProjenyConfigValidator.cs b/UnityPlugin/Projeny/Main/ProjenyConfigValidator.cs
@@ -97,15 +97,15 @@ static void VerifyThatAllDirectoriesAreValidJunctions()
                 var badDirectoriesStr = string.Join("\n", badDirectories.Select(x => "Assets/" + x.FullName.Substring(Application.dataPath.Length + 1)).ToArray());
 
                 EditorUtility.DisplayDialog(
-                    "Projeny Error", "Projeny validation failed.  Found some directories that were not created by Projeny.  This could cause data loss.  All user data in Projeny should reside in the UnityPackages directory. See documentation for details.  \n\nThe directories in question are the following: \n\n{0}".Fmt(badDirectoriesStr), "Ok");
+                    "Projeny Error", "Projeny validation failed.\n\nThere are directories in your project that were not created by Projeny.  This could cause data loss.  All user data in Projeny should reside in the UnityPackages directory.  See documentation for details.  \n\nThe directories in question are the following: \n\n{0}".Fmt(badDirectoriesStr), "Ok");
             }
 
             if (brokenJunctions.Any())
             {
                 var brokenJunctionsStr = string.Join("\n", brokenJunctions.Select(x => "Assets/" + x.Substring(Application.dataPath.Length + 1)).ToArray());
 
                 EditorUtility.DisplayDialog(
-                    "Projeny Error", "Projeny validation failed.  Found some broken directory links.  You may have deleted a package without removing the package from the project.  You can fix this by entering package manager and removing the missing packages from your project. See documentation for details.  \n\nThe directories in question are the following: \n\n{0}".Fmt(brokenJunctionsStr), "Ok");
+                    "Projeny Error", "Projeny validation failed.\n\nThere are broken directory links in your project.  You may have deleted a package without removing the package from the project.  You can fix this by entering package manager and removing the missing packages from your project. See documentation for details.  \n\nThe directories in question are the following: \n\n{0}".Fmt(brokenJunctionsStr), "Ok");
             }
         }
     }