- 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

diff --git a/CHANGES b/CHANGES
index de2083a52e3165c50b4792efbc29c094a25f0a90..72a1a9c80a8cf1af5a7e475b73e099c84d27b155 100644 (file)
--- 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)
 
 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
 30/09/2006
 namespace
 - Added LocalLcPath to plugin interface

diff --git a/contrib/brushexport/brushexport.vcproj b/contrib/brushexport/brushexport.vcproj
index a978947a81023dbf0139f773b06f99e6b5b51282..709aa2773b352dce51f3e12a035495faba1891f6 100644 (file)
--- a/contrib/brushexport/brushexport.vcproj
+++ b/contrib/brushexport/brushexport.vcproj
@@ -54,7 +54,8 @@
                                Name="VCMIDLTool"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\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
                        <Tool\r
                                Name="VCPreBuildEventTool"/>\r
                        <Tool\r


@@ -121,7 +122,8 @@
                                Name="VCMIDLTool"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\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
                        <Tool\r
                                Name="VCPreBuildEventTool"/>\r
                        <Tool\r

diff --git a/contrib/shaderplug/shaderplug.vcproj b/contrib/shaderplug/shaderplug.vcproj
index 1041b73bd0108da650f0b3f11e1b0483507d7252..1b9044be88ed77958d2f825dce9853fe14bbf553 100644 (file)
--- a/contrib/shaderplug/shaderplug.vcproj
+++ b/contrib/shaderplug/shaderplug.vcproj
@@ -54,7 +54,8 @@
                                Name="VCMIDLTool"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\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
                        <Tool\r
                                Name="VCPreBuildEventTool"/>\r
                        <Tool\r


@@ -121,7 +122,8 @@
                                Name="VCMIDLTool"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\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
                        <Tool\r
                                Name="VCPreBuildEventTool"/>\r
                        <Tool\r

diff --git a/contrib/sunplug/sunplug.vcproj b/contrib/sunplug/sunplug.vcproj
index 8cf2773b88da3293808c80f87a03e2bedb4eee41..0c98c31ea8ca0778f86cd6c8c40c29e9c4b1f50e 100644 (file)
--- a/contrib/sunplug/sunplug.vcproj
+++ b/contrib/sunplug/sunplug.vcproj
@@ -50,7 +50,8 @@
                                Name="VCMIDLTool"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\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
                        <Tool\r
                                Name="VCPreBuildEventTool"/>\r
                        <Tool\r


@@ -110,7 +111,8 @@
                                Name="VCMIDLTool"/>\r
                        <Tool\r
                                Name="VCPostBuildEventTool"\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
                        <Tool\r
                                Name="VCPreBuildEventTool"/>\r
                        <Tool\r

diff --git a/libs/xml/xmltextags.cpp b/libs/xml/xmltextags.cpp
index 34b05d5489117a1a48023f868b81354be1c534e3..4ab2c6c3c0171a489b1fe3aa9dbb4660c1879bf1 100644 (file)
--- a/libs/xml/xmltextags.cpp
+++ b/libs/xml/xmltextags.cpp
@@ -77,14 +77,18 @@ bool XmlTagBuilder::CreateXmlDocument()
   }\r
 }\r
 \r
   }\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
 {\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
   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
 \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
 }\r
 \r
 bool XmlTagBuilder::SaveXmlDoc(const char* file)\r

diff --git a/libs/xml/xmltextags.h b/libs/xml/xmltextags.h
index e58c1c1418432f4bf30dfa08d9050c50d53e2e7f..047fbd70f2c172c43c4e7594f8d4ea1f1d4b145d 100644 (file)
--- a/libs/xml/xmltextags.h
+++ b/libs/xml/xmltextags.h
@@ -52,7 +52,7 @@ enum TextureType
 class XmlTagBuilder\r
 {\r
 private:\r
 class XmlTagBuilder\r
 {\r
 private:\r

-  CopiedString filename;\r
+  CopiedString m_savefilename;\r

   xmlDocPtr doc;\r
   xmlXPathContextPtr context;\r
   xmlNodeSetPtr nodePtr;\r
   xmlDocPtr doc;\r
   xmlXPathContextPtr context;\r
   xmlNodeSetPtr nodePtr;\r


@@ -86,7 +86,7 @@ public:
   ~XmlTagBuilder();\r
 \r
   bool CreateXmlDocument();\r
   ~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
   bool SaveXmlDoc(const char* file);\r
   bool SaveXmlDoc(void);\r
   bool AddShaderNode(const char* shader, TextureType textureType, NodeShaderType nodeShaderType);\r

diff --git a/radiant/build.cpp b/radiant/build.cpp
index 2a0d631332a30aa29b51738f90d5728c6d3d9159..dcb23a28c0b6b1075f666b139908f3bffb4db48d 100644 (file)
--- a/radiant/build.cpp
+++ b/radiant/build.cpp
@@ -606,7 +606,7 @@ bool build_commands_parse(const char* filename)
 
       return true;
     }
 
       return true;
     }

-    globalErrorStream() << "failed to parse build menu: " << makeQuoted(filename);
+    globalErrorStream() << "failed to parse build menu: " << makeQuoted(filename) << "\n";

   }
   return false;
 }
   }
   return false;
 }

diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp
index a036dbdd09557f8fee5afa0e2f72cb023d0e5c68..e3b735137ce4bef6753ed60f4febe797270384d6 100644 (file)
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@ -1847,44 +1847,42 @@ GtkWidget* TextureBrowser_constructTagToolbar()
 void TextureBrowser_checkTagFile()
 {
   const char SHADERTAG_FILE[] = "shadertags.xml";
 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;
   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)
     {
 
     if(g_TextureBrowser.m_tags)
     {

-      globalOutputStream() << "Loading tag file " << filename.c_str() << ".\n";
+      globalOutputStream() << "Loading tag file " << rc_filename.c_str() << ".\n";

     }
   }
   else
   {
     }
   }
   else
   {

-    // default tagfile laden
+    // load default tagfile

        stream.clear();
     stream << g_pGameDescription->mGameToolsPath.c_str();
     stream << SHADERTAG_FILE;
        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)
       {
       
       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
     {
       }
     }
     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 fec4866018504353caf64e5b73b4b40e9d6ac549..8d03843bce8e75a30d73791e9f0f920b50199991 100644 (file)
--- 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"/>
   <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>
     <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 48ecc9a07dbcedc32e5cea7f8f9c237f1a6f380f..85446242063aebe832b31bd05c82d1fc62dfb7f5 100644 (file)
--- 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="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="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="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"/>
     <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="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"/>
     <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 d0c1ac1a76dde17de01021c2534460d5a35483ba..9f5087be69c3c5f8a400b52df0bf3991df726f52 100644 (file)
--- 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="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>
     <feature name="GtkRadiant Editor Manual" desc="Documentation for GtkRadiant users.">
       <component name=".\components\radiant_manual.xml" root="..\..\docs\manual"/>
     </feature>