- Fixed Etb saving custom tags to global tagfile (Shaderman/namespace)
authornamespace <namespace>
Sun, 1 Oct 2006 14:12:11 +0000 (14:12 +0000)
committernamespace <namespace>
Sun, 1 Oct 2006 14:12:11 +0000 (14:12 +0000)
- 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
contrib/brushexport/brushexport.vcproj
contrib/shaderplug/shaderplug.vcproj
contrib/sunplug/sunplug.vcproj
libs/xml/xmltextags.cpp
libs/xml/xmltextags.h
radiant/build.cpp
radiant/texwindow.cpp
setup/win32/components/et.xml
setup/win32/components/gtkradiant_data.xml
setup/win32/gtkradiant-1.5.0.xml

diff --git a/CHANGES b/CHANGES
index de2083a..72a1a9c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,12 @@ 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
 - Added enhanced Texturebrowser (ETB) by Shaderman
 - Added shaderplug by Shaderman, accompanies the ETB
index a978947..709aa27 100644 (file)
@@ -54,7 +54,8 @@
                                Name="VCMIDLTool"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;"/>\r
+                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;\r
+                               copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;"/>\r
                        <Tool\r
                                Name="VCPreBuildEventTool"/>\r
                        <Tool\r
                                Name="VCMIDLTool"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;"/>\r
+                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;\r
+                               copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;"/>\r
                        <Tool\r
                                Name="VCPreBuildEventTool"/>\r
                        <Tool\r
index 1041b73..1b9044b 100644 (file)
@@ -54,7 +54,8 @@
                                Name="VCMIDLTool"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;"/>\r
+                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;\r
+                               copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;"/>\r
                        <Tool\r
                                Name="VCPreBuildEventTool"/>\r
                        <Tool\r
                                Name="VCMIDLTool"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;"/>\r
+                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;\r
+                               copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;"/>\r
                        <Tool\r
                                Name="VCPreBuildEventTool"/>\r
                        <Tool\r
index 8cf2773..0c98c31 100644 (file)
@@ -50,7 +50,8 @@
                                Name="VCMIDLTool"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;"/>\r
+                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;\r
+                               copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;"/>\r
                        <Tool\r
                                Name="VCPreBuildEventTool"/>\r
                        <Tool\r
                                Name="VCMIDLTool"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\r
-                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;"/>\r
+                               CommandLine="copy &quot;$(TargetPath)&quot; &quot;$(SolutionDir)install\plugins&quot;\r
+                               copy &quot;$(TargetDir)$(TargetName).pdb&quot; &quot;$(SolutionDir)install\plugins&quot;"/>\r
                        <Tool\r
                                Name="VCPreBuildEventTool"/>\r
                        <Tool\r
index 34b05d5..4ab2c6c 100644 (file)
@@ -77,14 +77,18 @@ bool XmlTagBuilder::CreateXmlDocument()
   }\r
 }\r
 \r
-bool XmlTagBuilder::OpenXmlDoc(const char* file)\r
+bool XmlTagBuilder::OpenXmlDoc(const char* file, const char* savefile)\r
 {\r
   /* Reads a XML document from a file\r
 \r
      returns TRUE if the document was read successfully or FALSE when failed\r
   */\r
 \r
-  filename = file;\r
+  if(savefile)\r
+    m_savefilename = savefile;\r
+  else\r
+    m_savefilename = file;\r
+    \r
   doc = xmlParseFile(file);    // TODO error checking!\r
 \r
   if(!doc)\r
@@ -98,7 +102,7 @@ bool XmlTagBuilder::OpenXmlDoc(const char* file)
 \r
 bool XmlTagBuilder::SaveXmlDoc(void)\r
 {\r
-       return SaveXmlDoc(filename.c_str());\r
+       return SaveXmlDoc(m_savefilename.c_str());\r
 }\r
 \r
 bool XmlTagBuilder::SaveXmlDoc(const char* file)\r
index e58c1c1..047fbd7 100644 (file)
@@ -52,7 +52,7 @@ enum TextureType
 class XmlTagBuilder\r
 {\r
 private:\r
-  CopiedString filename;\r
+  CopiedString m_savefilename;\r
   xmlDocPtr doc;\r
   xmlXPathContextPtr context;\r
   xmlNodeSetPtr nodePtr;\r
@@ -86,7 +86,7 @@ public:
   ~XmlTagBuilder();\r
 \r
   bool CreateXmlDocument();\r
-  bool OpenXmlDoc(const char* file);\r
+  bool OpenXmlDoc(const char* file, const char* savefile = 0);\r
   bool SaveXmlDoc(const char* file);\r
   bool SaveXmlDoc(void);\r
   bool AddShaderNode(const char* shader, TextureType textureType, NodeShaderType nodeShaderType);\r
index 2a0d631..dcb23a2 100644 (file)
@@ -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;
 }
index a036dbd..e3b7351 100644 (file)
@@ -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";
     }
   }
 }
index fec4866..8d03843 100644 (file)
@@ -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>
index 48ecc9a..8544624 100644 (file)
     <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"/>
index d0c1ac1..9f5087b 100644 (file)
     <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>