From 8cb19ddd5c6177d9cf47a30b464c1274ff240e39 Mon Sep 17 00:00:00 2001
From: namespace <namespace>
Date: Sun, 1 Oct 2006 14:12:11 +0000
Subject: [PATCH] - Fixed Etb saving custom tags to global tagfile
 (Shaderman/namespace) - Fixed postbuild step for brushexport, shaderplug and
 sunplug (Shaderman) - Added installersupport for new files and plugins
 (Shaderman)

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@108 8a3a26a2-13c4-0310-b231-cf6edde360e5
---
 CHANGES                                    |  6 ++++++
 contrib/brushexport/brushexport.vcproj     |  6 ++++--
 contrib/shaderplug/shaderplug.vcproj       |  6 ++++--
 contrib/sunplug/sunplug.vcproj             |  6 ++++--
 libs/xml/xmltextags.cpp                    | 10 ++++++---
 libs/xml/xmltextags.h                      |  4 ++--
 radiant/build.cpp                          |  2 +-
 radiant/texwindow.cpp                      | 24 ++++++++++------------
 setup/win32/components/et.xml              |  1 +
 setup/win32/components/gtkradiant_data.xml |  4 ++++
 setup/win32/gtkradiant-1.5.0.xml           |  9 ++++++++
 11 files changed, 53 insertions(+), 25 deletions(-)

diff --git a/CHANGES b/CHANGES
index de2083a5..72a1a9c8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,12 @@
 This is the changelog for developers, != changelog for the end user 
 that we distribute with the binaries. (see changelog)
 
+30/09/2006
+namespace
+- Fixed Etb saving custom tags to global tagfile (Shaderman/namespace)
+- Fixed postbuild step for brushexport, shaderplug and sunplug (Shaderman)
+- Added installersupport for new files and plugins (Shaderman)
+
 30/09/2006
 namespace
 - Added LocalLcPath to plugin interface
diff --git a/contrib/brushexport/brushexport.vcproj b/contrib/brushexport/brushexport.vcproj
index a978947a..709aa277 100644
--- a/contrib/brushexport/brushexport.vcproj
+++ b/contrib/brushexport/brushexport.vcproj
@@ -54,7 +54,8 @@
 				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;"/>
+				CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;
+				copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
@@ -121,7 +122,8 @@
 				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;"/>
+				CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;
+				copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
diff --git a/contrib/shaderplug/shaderplug.vcproj b/contrib/shaderplug/shaderplug.vcproj
index 1041b73b..1b9044be 100644
--- a/contrib/shaderplug/shaderplug.vcproj
+++ b/contrib/shaderplug/shaderplug.vcproj
@@ -54,7 +54,8 @@
 				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;"/>
+				CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;
+				copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
@@ -121,7 +122,8 @@
 				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;"/>
+				CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;
+				copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
diff --git a/contrib/sunplug/sunplug.vcproj b/contrib/sunplug/sunplug.vcproj
index 8cf2773b..0c98c31e 100644
--- a/contrib/sunplug/sunplug.vcproj
+++ b/contrib/sunplug/sunplug.vcproj
@@ -50,7 +50,8 @@
 				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;"/>
+				CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;
+				copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
@@ -110,7 +111,8 @@
 				Name="VCMIDLTool"/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;"/>
+				CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;
+				copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;"/>
 			<Tool
 				Name="VCPreBuildEventTool"/>
 			<Tool
diff --git a/libs/xml/xmltextags.cpp b/libs/xml/xmltextags.cpp
index 34b05d54..4ab2c6c3 100644
--- a/libs/xml/xmltextags.cpp
+++ b/libs/xml/xmltextags.cpp
@@ -77,14 +77,18 @@ bool XmlTagBuilder::CreateXmlDocument()
   }
 }
 
-bool XmlTagBuilder::OpenXmlDoc(const char* file)
+bool XmlTagBuilder::OpenXmlDoc(const char* file, const char* savefile)
 {
   /* Reads a XML document from a file
 
      returns TRUE if the document was read successfully or FALSE when failed
   */
 
-  filename = file;
+  if(savefile)
+    m_savefilename = savefile;
+  else
+    m_savefilename = file;
+    
   doc = xmlParseFile(file);	// TODO error checking!
 
   if(!doc)
@@ -98,7 +102,7 @@ bool XmlTagBuilder::OpenXmlDoc(const char* file)
 
 bool XmlTagBuilder::SaveXmlDoc(void)
 {
-	return SaveXmlDoc(filename.c_str());
+	return SaveXmlDoc(m_savefilename.c_str());
 }
 
 bool XmlTagBuilder::SaveXmlDoc(const char* file)
diff --git a/libs/xml/xmltextags.h b/libs/xml/xmltextags.h
index e58c1c14..047fbd70 100644
--- a/libs/xml/xmltextags.h
+++ b/libs/xml/xmltextags.h
@@ -52,7 +52,7 @@ enum TextureType
 class XmlTagBuilder
 {
 private:
-  CopiedString filename;
+  CopiedString m_savefilename;
   xmlDocPtr doc;
   xmlXPathContextPtr context;
   xmlNodeSetPtr nodePtr;
@@ -86,7 +86,7 @@ public:
   ~XmlTagBuilder();
 
   bool CreateXmlDocument();
-  bool OpenXmlDoc(const char* file);
+  bool OpenXmlDoc(const char* file, const char* savefile = 0);
   bool SaveXmlDoc(const char* file);
   bool SaveXmlDoc(void);
   bool AddShaderNode(const char* shader, TextureType textureType, NodeShaderType nodeShaderType);
diff --git a/radiant/build.cpp b/radiant/build.cpp
index 2a0d6313..dcb23a28 100644
--- a/radiant/build.cpp
+++ b/radiant/build.cpp
@@ -606,7 +606,7 @@ bool build_commands_parse(const char* filename)
 
       return true;
     }
-    globalErrorStream() << "failed to parse build menu: " << makeQuoted(filename);
+    globalErrorStream() << "failed to parse build menu: " << makeQuoted(filename) << "\n";
   }
   return false;
 }
diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index a036dbdd..e3b73513 100644
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -1847,44 +1847,42 @@ GtkWidget* TextureBrowser_constructTagToolbar()
 void TextureBrowser_checkTagFile()
 {
   const char SHADERTAG_FILE[] = "shadertags.xml";
-  CopiedString filename;
+  CopiedString default_filename, rc_filename;
   StringOutputStream stream(256);
 
   stream << LocalRcPath_get();
   stream << SHADERTAG_FILE;
-  filename = stream.c_str();
+  rc_filename = stream.c_str();
 
-  if(file_exists(filename.c_str()))
+  if(file_exists(rc_filename.c_str()))
   {
-    g_TextureBrowser.m_tags = TagBuilder.OpenXmlDoc(filename.c_str());
+    g_TextureBrowser.m_tags = TagBuilder.OpenXmlDoc(rc_filename.c_str());
 
     if(g_TextureBrowser.m_tags)
     {
-      globalOutputStream() << "Loading tag file " << filename.c_str() << ".\n";
+      globalOutputStream() << "Loading tag file " << rc_filename.c_str() << ".\n";
     }
   }
   else
   {
-    // default tagfile laden
+    // load default tagfile
 	stream.clear();
     stream << g_pGameDescription->mGameToolsPath.c_str();
     stream << SHADERTAG_FILE;
-    filename = stream.c_str();
+    default_filename = stream.c_str();
 
-    globalErrorStream() << filename.c_str() << "\n";
-
-    if(file_exists(filename.c_str()))
+    if(file_exists(default_filename.c_str()))
     {
-      g_TextureBrowser.m_tags = TagBuilder.OpenXmlDoc(filename.c_str());
+      g_TextureBrowser.m_tags = TagBuilder.OpenXmlDoc(default_filename.c_str(), rc_filename.c_str());
       
       if(g_TextureBrowser.m_tags)
       {
-        globalOutputStream() << "Loading default tag file " << filename.c_str() << ".\n";
+        globalOutputStream() << "Loading default tag file " << default_filename.c_str() << ".\n";
       }
     }
     else
     {
-      globalErrorStream() << "Unable to find default tag file " << filename.c_str() << ". No tag support.\n";
+      globalErrorStream() << "Unable to find default tag file " << default_filename.c_str() << ". No tag support.\n";
     }
   }
 }
diff --git a/setup/win32/components/et.xml b/setup/win32/components/et.xml
index fec48660..8d03843b 100644
--- a/setup/win32/components/et.xml
+++ b/setup/win32/components/et.xml
@@ -6,6 +6,7 @@
   <dir name="et.game">
     <file name="game.xlink"/>
     <file name="default_build_menu.xml"/>
+    <file name="shadertags.xml"/>
     <dir name="bitmaps">
       <file name="splash.bmp"/>
     </dir>
diff --git a/setup/win32/components/gtkradiant_data.xml b/setup/win32/components/gtkradiant_data.xml
index 48ecc9a0..85446242 100644
--- a/setup/win32/components/gtkradiant_data.xml
+++ b/setup/win32/components/gtkradiant_data.xml
@@ -13,13 +13,16 @@
     <file name="cap_ibevel.bmp"/>
     <file name="cap_iendcap.bmp"/>
     <file name="cap_cylinder.bmp"/>
+    <file name="console.bmp"/>
     <file name="curve_cap.bmp"/>
     <file name="dontselectcurve.bmp"/>
     <file name="dontselectmodel.bmp"/>
     <file name="ellipsis.bmp"/>
+    <file name="entities.bmp"/>
     <file name="file_open.bmp"/>
     <file name="file_save.bmp"/>
     <file name="icon.bmp"/>
+    <file name="lightinspector.bmp"/>
     <file name="logo.bmp"/>
     <file name="modify_edges.bmp"/>
     <file name="modify_faces.bmp"/>
@@ -47,6 +50,7 @@
     <file name="select_mouseresize.bmp"/>
     <file name="show_entities.bmp"/>
     <file name="splash.bmp"/>
+    <file name="texture_browser.bmp"/>
     <file name="texture_lock.bmp"/>
     <file name="textures_popup.bmp"/>
     <file name="view_cameratoggle.bmp"/>
diff --git a/setup/win32/gtkradiant-1.5.0.xml b/setup/win32/gtkradiant-1.5.0.xml
index d0c1ac1a..9f5087be 100644
--- a/setup/win32/gtkradiant-1.5.0.xml
+++ b/setup/win32/gtkradiant-1.5.0.xml
@@ -42,6 +42,15 @@
     <feature name="PrtView Plugin" desc="Geoffrey Dewan's Portal Viewer">
       <component name=".\components\prtview.xml" root="..\..\install"/>
     </feature>
+    <feature name="Brush Export Plugin" desc="namespace's Wavefront Brush Export">
+      <component name=".\components\brushexport.xml" root="..\..\install"/>
+    </feature>
+    <feature name="Sunplug Plugin" desc="Topsun's Sunplug for Enemy Territory">
+      <component name=".\components\sunplug.xml" root="..\..\install"/>
+    </feature>
+    <feature name="Shaderplug Plugin" desc="Shaderman's plugin for creating shader tag files">
+      <component name=".\components\shaderplug.xml" root="..\..\install"/>
+    </feature>
     <feature name="GtkRadiant Editor Manual" desc="Documentation for GtkRadiant users.">
       <component name=".\components\radiant_manual.xml" root="..\..\docs\manual"/>
     </feature>
-- 
2.39.2