Browse Source

Fixed an issue where the files in the project folder were being included in the build. Also... I added an append to file ability in the Atomic::File stream. I wanted to log to a file as needed during the build process.

Eugene 9 years ago
parent
commit
cabc4ed7be

+ 4 - 2
Source/Atomic/IO/File.cpp

@@ -43,7 +43,8 @@ static const wchar_t* openMode[] =
     L"rb",
     L"wb",
     L"r+b",
-    L"w+b"
+    L"w+b",
+    L"a+b"
 };
 #else
 static const char* openMode[] =
@@ -51,7 +52,8 @@ static const char* openMode[] =
     "rb",
     "wb",
     "r+b",
-    "w+b"
+    "w+b",
+    "a+b"
 };
 #endif
 

+ 3 - 1
Source/Atomic/IO/File.h

@@ -52,7 +52,9 @@ enum FileMode
 {
     FILE_READ = 0,
     FILE_WRITE,
-    FILE_READWRITE
+    FILE_READWRITE,
+    FILE_WRITE_UPDATE,
+    FILE_APPEND
 };
 
 class PackageFile;

+ 19 - 0
Source/ToolCore/Build/BuildBase.cpp

@@ -323,6 +323,13 @@ void BuildBase::ScanResourceDirectory(const String& resourceDir)
 
 void BuildBase::BuildDefaultResourceEntries()
 {
+    File file(context_, "BuildResource.log", Atomic::FILE_APPEND);
+    if (!file.IsOpen())
+    {
+        file.Open("BuildResource.log", Atomic::FILE_APPEND);
+    }
+    file.WriteLine("*********************************************************");
+
     for (unsigned i = 0; i < resourceDirs_.Size(); i++)
     {
         String resourceDir = resourceDirs_[i];
@@ -337,9 +344,12 @@ void BuildBase::BuildDefaultResourceEntries()
             if (!CheckIncludeResourceFile(resourceDir, filename))
                 continue;
 
+            String fileInfo = resourceDir + filename;
+            file.WriteLine(fileInfo.CString());
             AddToResourcePackager(filename, resourceDir);
         }
     }
+    file.Close();
 }
 
 void BuildBase::BuildProjectResourceEntries()
@@ -358,6 +368,12 @@ void BuildBase::BuildProjectResourceEntries()
 
 void BuildBase::BuildAllProjectResourceEntries()
 {
+    File file(context_, "BuildResource.log", Atomic::FILE_APPEND);
+    if (!file.IsOpen())
+    {
+        file.Open("BuildResource.log", Atomic::FILE_APPEND);
+    }
+    file.WriteLine("*********************************************************");
     for (unsigned i = 0; i < projectResourceDir_.Size(); i++)
     {
         String projectResourceDir = projectResourceDir_[i];
@@ -367,9 +383,12 @@ void BuildBase::BuildAllProjectResourceEntries()
 
         for (unsigned i = 0; i < fileNamesInProject.Size(); i++)
         {
+            String fileInfo = projectResourceDir + fileNamesInProject[i];
+            file.WriteLine(fileInfo.CString());
             AddToResourcePackager(fileNamesInProject[i], projectResourceDir);
         }
     }
+    file.Close();
 }
 
 void BuildBase::BuildFilteredProjectResourceEntries()

+ 1 - 1
Source/ToolCore/Build/BuildWindows.cpp

@@ -61,7 +61,7 @@ void BuildWindows::Initialize()
     BuildDefaultResourceEntries();
     
     // Include the project resources and cache separately
-    AddProjectResourceDir(project->GetProjectPath());
+    AddProjectResourceDir(project->GetResourcePath());
     AssetDatabase* db = GetSubsystem<AssetDatabase>();
     String cachePath = db->GetCachePath();
     AddProjectResourceDir(cachePath);