GITechDemo:

*further reduced the size of the included Python distribution

Synesthesia3D:
*added the option to override the default log location for both the texture and model compilers

Author: iftodebogdan

GITechDemo/Code/External/Python27/DLLs/_bsddb.pyd

@@ -5,7 +5,7 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-    <Filter Include="Model Compiler">
+    <Filter Include="Main">
       <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
     </Filter>
@@ -15,26 +15,26 @@
       <Filter>Common</Filter>
     </ClInclude>
     <ClInclude Include="ModelCompiler\ModelCompiler.h">
-      <Filter>Model Compiler</Filter>
+      <Filter>Main</Filter>
     </ClInclude>
     <ClInclude Include="ModelCompiler\stdafx.h">
-      <Filter>Model Compiler</Filter>
+      <Filter>Main</Filter>
     </ClInclude>
     <ClInclude Include="ModelCompiler\targetver.h">
-      <Filter>Model Compiler</Filter>
+      <Filter>Main</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ModelCompiler\ModelCompiler.cpp">
-      <Filter>Model Compiler</Filter>
+      <Filter>Main</Filter>
     </ClCompile>
     <ClCompile Include="ModelCompiler\stdafx.cpp">
-      <Filter>Model Compiler</Filter>
+      <Filter>Main</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Text Include="ModelCompiler\ReadMe.txt">
-      <Filter>Model Compiler</Filter>
+      <Filter>Main</Filter>
     </Text>
   </ItemGroup>
 </Project>

GITechDemo/Code/External/Python27/DLLs/_ctypes.pyd

@@ -26,6 +26,7 @@ void ModelCompiler::Run(int argc, char* argv[])
 	bool bValidCmdParams = false;
 	bool bQuiet = false;
 	char outputDirPath[1024] = "";
+	char outputLogDirPath[1024] = "";
 
 	for (unsigned int arg = 1; arg < (unsigned int)argc; arg++)
 	{
@@ -44,6 +45,13 @@ void ModelCompiler::Run(int argc, char* argv[])
 				continue;
 			}
 
+			if (_stricmp(argv[arg], "-log") == 0)
+			{
+				arg++;
+				strcpy_s(outputLogDirPath, argv[arg]);
+				continue;
+			}
+
 			break;
 		}
 		else
@@ -61,6 +69,7 @@ void ModelCompiler::Run(int argc, char* argv[])
 		cout << "Options:" << endl;
 		cout << "-q\t\tQuiet. Does not produce output to the console window" << endl;
 		cout << "-d output/dir/\tOverride default output directory (output/dir/ must exist!)" << endl;
+		cout << "-log output/dir/\tOverride default log output directory (output/dir/ must exist!)" << endl;
 		return;
 	}
 
@@ -78,13 +87,16 @@ void ModelCompiler::Run(int argc, char* argv[])
 	std::strftime(time, 80, "%Y%m%d%H%M%S", timeinfo);
 	delete timeinfo;
 
-	if (!(CreateDirectoryA("Logs", NULL) || ERROR_ALREADY_EXISTS == GetLastError()))
+	if (strlen(outputLogDirPath) == 0)
+		strcpy_s(outputLogDirPath, "Logs");
+
+	if (!(CreateDirectoryA(outputLogDirPath, NULL) || ERROR_ALREADY_EXISTS == GetLastError()))
 	{
 		cout << "ModelCompiler requires write permission into the current directory";
 		return;
 	}
 
-	sprintf_s(logName, 1024, "Logs\\ModelCompiler_%s_%s.log", time, fileName);
+	sprintf_s(logName, 1024, "%s\\ModelCompiler_%s_%s.log", outputLogDirPath, time, fileName);
 	mstream Log(logName, ofstream::trunc, !bQuiet);
 
 	Log << "Compiling: \"" << argv[argc - 1] << "\"\n";

GITechDemo/Code/External/Python27/DLLs/_ctypes_test.pyd

@@ -5,36 +5,36 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
-    <Filter Include="Texture Compiler">
+    <Filter Include="Main">
       <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
     </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="TextureCompiler\TextureCompiler.h">
-      <Filter>Texture Compiler</Filter>
+      <Filter>Main</Filter>
     </ClInclude>
     <ClInclude Include="TextureCompiler\stdafx.h">
-      <Filter>Texture Compiler</Filter>
+      <Filter>Main</Filter>
     </ClInclude>
     <ClInclude Include="TextureCompiler\targetver.h">
-      <Filter>Texture Compiler</Filter>
+      <Filter>Main</Filter>
     </ClInclude>
     <ClInclude Include="Common\Logging.h">
       <Filter>Common</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="TextureCompiler\stdafx.cpp">
-      <Filter>Texture Compiler</Filter>
+      <Filter>Main</Filter>
     </ClCompile>
     <ClCompile Include="TextureCompiler\TextureCompiler.cpp">
-      <Filter>Texture Compiler</Filter>
+      <Filter>Main</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Text Include="TextureCompiler\ReadMe.txt">
-      <Filter>Texture Compiler</Filter>
+      <Filter>Main</Filter>
     </Text>
   </ItemGroup>
 </Project>

GITechDemo/Code/External/Python27/DLLs/_elementtree.pyd

@@ -245,6 +245,7 @@ void TextureCompiler::Run(int argc, char* argv[])
 	bool bQuiet = false;
 	PixelFormat format = PF_NONE;
 	char outputDirPath[1024] = "";
+	char outputLogDirPath[1024] = "";
 	unsigned int mipCount = 0;
 
 	for (unsigned int arg = 1; arg < (unsigned int)argc; arg++)
@@ -402,6 +403,13 @@ void TextureCompiler::Run(int argc, char* argv[])
 				continue;
 			}
 
+			if (_stricmp(argv[arg], "-log") == 0)
+			{
+				arg++;
+				strcpy_s(outputLogDirPath, argv[arg]);
+				continue;
+			}
+
 			break;
 		}
 		else
@@ -420,6 +428,7 @@ void TextureCompiler::Run(int argc, char* argv[])
 		cout << "-q\t\tQuiet. Does not produce output to the console window" << endl;
 		cout << "-f format\tOptional pixel format (see below) for conversion" << endl;
 		cout << "-d output/dir/\tOverride default output directory (output/dir/ must exist!)" << endl;
+		cout << "-log output/dir/\tOverride default log output directory (output/dir/ must exist!)" << endl;
 		cout << "-mip n\tNumber of generated mip levels: 0 (default) = all, 1 = none, etc." << endl << endl;
 
 		cout << "Pixel formats:" << endl;
@@ -446,13 +455,16 @@ void TextureCompiler::Run(int argc, char* argv[])
 	std::strftime(time, 80, "%Y%m%d%H%M%S", timeinfo);
 	delete timeinfo;
 
-	if (!(CreateDirectoryA("Logs", NULL) || ERROR_ALREADY_EXISTS == GetLastError()))
+	if (strlen(outputLogDirPath) == 0)
+		strcpy_s(outputLogDirPath, "Logs");
+
+	if (!(CreateDirectoryA(outputLogDirPath, NULL) || ERROR_ALREADY_EXISTS == GetLastError()))
 	{
 		cout << "TextureCompiler requires write permission into the current directory";
 		return;
 	}
 
-	sprintf_s(logName, 1024, "Logs\\TextureCompiler_%s_%s.log", time, fileName);
+	sprintf_s(logName, 1024, "%s\\TextureCompiler_%s_%s.log", outputLogDirPath, time, fileName);
 	mstream Log(logName, ofstream::trunc, !bQuiet);
 
 	const unsigned long long startTick = GetTickCount64();

GITechDemo/Code/External/Python27/DLLs/_hashlib.pyd

@@ -89,7 +89,7 @@
 	compiledFileExists = os.path.isfile(modelOutputPath + os.path.splitext(file)[0] + ".s3dmdl")
 	if sourceFileIsNewer or not compiledFileExists or forceRebuildModels:
 		print "Compiling model \"" + rootModelDir.replace(scriptAbsPath + "/", "") + file + "\""
-		subprocess.call([modelCompilerExe, "-q", "-d", modelOutputPath, rootModelDir + file])
+		subprocess.call([modelCompilerExe, "-q", "-d", modelOutputPath, "-log", scriptAbsPath + "/Logs", rootModelDir + file])
 	else:
 		print "Model \"" + rootModelDir.replace(scriptAbsPath + "/", "") + file + "\" is up-to-date"
 
@@ -107,7 +107,7 @@
 			compiledFileExists = os.path.isfile(textureOutputPath + os.path.splitext(name)[0] + ".s3dtex")
 			if sourceFileIsNewer or not compiledFileExists or forceRebuildTextures:
 				print "Compiling texture \"" + os.path.join(root, name).replace(scriptAbsPath + "/", "") + "\""
-				subprocess.call(textureCompilerExe + " " + customArgs[name] + " -d " + textureOutputPath + " " + os.path.join(root, name))
+				subprocess.call(textureCompilerExe + " " + customArgs[name] + " -d " + textureOutputPath + " -log " + scriptAbsPath + "/Logs " + os.path.join(root, name))
 			else:
 				print "Texture \"" + os.path.join(root, name).replace(scriptAbsPath + "/", "") + "\" is up-to-date"
 

GITechDemo/Code/External/Python27/DLLs/_msi.pyd

@@ -78,7 +78,7 @@
 			compiledFileExists = os.path.isfile(outputPath + os.path.splitext(name)[0] + ".s3dtex")
 			if sourceFileIsNewer or not compiledFileExists or defaultForceRebuild:
 				print "Compiling texture \"" + os.path.join(root, name).replace(scriptAbsPath + "/", "") + "\""
-				subprocess.call(textureCompilerExe + " " + customArgs[name] + " -d " + outputPath + " " + os.path.join(root, name))
+				subprocess.call(textureCompilerExe + " " + customArgs[name] + " -d " + outputPath + " -log " + scriptAbsPath + "/Logs " + os.path.join(root, name))
 			else:
 				print "Texture \"" + os.path.join(root, name).replace(scriptAbsPath + "/", "") + "\" is up-to-date"