ibrowser: merge changes from audited repository

------------------------------------------------------------------------
r72 | martinf | 2006-02-02 21:20:51 +0100 (Do, 02 Feb 2006) | 1 line

convert *.rbuild files into valid XML files by inserting XML headers and a <rbuild> root nodes
------------------------------------------------------------------------
r34 | martinf | 2006-01-29 16:15:23 +0100 (So, 29 Jan 2006) | 1 line

import ibrowser into the new repository
------------------------------------------------------------------------

- rename Makefiles and Expat license file to better conforming names

svn path=/trunk/; revision=21170

diff --git a/reactos/base/applications/ibrowser/Makefile.MinGW b/reactos/base/applications/ibrowser/Makefile-MinGW
similarity index 100%
rename from reactos/base/applications/ibrowser/Makefile.MinGW
rename to reactos/base/applications/ibrowser/Makefile-MinGW

diff --git a/reactos/base/applications/ibrowser/Makefile.PCH b/reactos/base/applications/ibrowser/Makefile-precomp
similarity index 93%
rename from reactos/base/applications/ibrowser/Makefile.PCH
rename to reactos/base/applications/ibrowser/Makefile-precomp
index 769da64..08b7f25 100644 (file)
--- a/reactos/base/applications/ibrowser/Makefile.PCH
+++ b/reactos/base/applications/ibrowser/Makefile-precomp
@@ -1,7 +1,7 @@
 #\r
 #  ROS Internet Web Browser\r
 #\r
-#  Makefile.PCH\r
+#  Makefile-precomp\r
 #\r
 #  MinGW Makefile with precompiled header support\r
 #\r

diff --git a/reactos/base/applications/ibrowser/expat.license b/reactos/base/applications/ibrowser/expat-license.txt
similarity index 100%
rename from reactos/base/applications/ibrowser/expat.license
rename to reactos/base/applications/ibrowser/expat-license.txt

diff --git a/reactos/base/applications/ibrowser/ibrowser.rbuild b/reactos/base/applications/ibrowser/ibrowser.rbuild
index 7de5df8..a90eb16 100644 (file)
--- a/reactos/base/applications/ibrowser/ibrowser.rbuild
+++ b/reactos/base/applications/ibrowser/ibrowser.rbuild
@@ -1,33 +1,34 @@
 <?xml version="1.0"?>
-<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
-<module name="ibrowser" type="win32gui" installbase="system32" installname="ibrowser.exe"  allowwarnings ="true">
-       <linkerflag>-fexceptions</linkerflag>
-       <include base="ibrowser">.</include>
-       <include base="ReactOS">include/reactos/libs</include>
-       <define name="__USE_W32API" />
-       <define name="UNICODE" />
-       <define name="WIN32" />
-       <define name="_ROS_" />
-       <define name="_WIN32_IE">0x0600</define>
-       <define name="_WIN32_WINNT">0x0501</define>
-       <define name="WINVER">0x0500</define>
-       <library>uuid</library>
-       <library>kernel32</library>
-       <library>gdi32</library>
-       <library>comctl32</library>
-       <library>ole32</library>
-       <library>oleaut32</library>
-       <library>shell32</library>
-       <library>expat</library>
-       <pch>precomp.h</pch>
-       <directory name="utility">
-               <file>utility.cpp</file>
-               <file>window.cpp</file>
-               <file>xmlstorage.cpp</file>
-       </directory>
-       <file>ibrowser.cpp</file>
-       <file>favorites.cpp</file>
-       <file>mainframe.cpp</file>
-       <file>webchild.cpp</file>
-       <file>ibrowser.rc</file>
-</module>
+<rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
+  <module name="ibrowser" type="win32gui" installbase="system32" installname="ibrowser.exe" allowwarnings ="true">
+    <linkerflag>-fexceptions</linkerflag>
+    <include base="ibrowser">.</include>
+    <include base="ReactOS">include/expat</include>
+    <define name="__USE_W32API" />
+    <define name="UNICODE" />
+    <define name="WIN32" />
+    <define name="_ROS_" />
+    <define name="_WIN32_IE">0x0600</define>
+    <define name="_WIN32_WINNT">0x0501</define>
+    <define name="WINVER">0x0500</define>
+    <library>uuid</library>
+    <library>kernel32</library>
+    <library>gdi32</library>
+    <library>comctl32</library>
+    <library>ole32</library>
+    <library>oleaut32</library>
+    <library>shell32</library>
+    <library>expat</library>
+    <pch>precomp.h</pch>
+    <directory name="utility">
+      <file>utility.cpp</file>
+      <file>window.cpp</file>
+      <file>xmlstorage.cpp</file>
+    </directory>
+    <file>ibrowser.cpp</file>
+    <file>favorites.cpp</file>
+    <file>mainframe.cpp</file>
+    <file>webchild.cpp</file>
+    <file>ibrowser.rc</file>
+  </module>
+</rbuild>

diff --git a/reactos/base/applications/ibrowser/make_ibrowser.dsp b/reactos/base/applications/ibrowser/make_ibrowser.dsp
index e83ba69..6485031 100644 (file)
--- a/reactos/base/applications/ibrowser/make_ibrowser.dsp
+++ b/reactos/base/applications/ibrowser/make_ibrowser.dsp
@@ -21,7 +21,6 @@ CFG=make_ibrowser - Win32 bjam
 !MESSAGE "make_ibrowser - Win32 Debug" (based on "Win32 (x86) External Target")\r
 !MESSAGE "make_ibrowser - Win32 Unicode Debug" (based on "Win32 (x86) External Target")\r
 !MESSAGE "make_ibrowser - Win32 Unicode Release" (based on "Win32 (x86) External Target")\r
-!MESSAGE "make_ibrowser - Win32 bjam" (based on "Win32 (x86) External Target")\r
 !MESSAGE \r
 \r
 # Begin Project\r
@@ -44,7 +43,7 @@ CFG=make_ibrowser - Win32 bjam
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "Release"\r
 # PROP Intermediate_Dir "Release"\r
-# PROP Cmd_Line "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make -f Makefile.PCH UNICODE=0"\r
+# PROP Cmd_Line "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make -f Makefile-precomp UNICODE=0"\r
 # PROP Rebuild_Opt "clean all"\r
 # PROP Target_File "ibrowser.exe"\r
 # PROP Bsc_Name ""\r
@@ -65,7 +64,7 @@ CFG=make_ibrowser - Win32 bjam
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "Debug"\r
 # PROP Intermediate_Dir "Debug"\r
-# PROP Cmd_Line "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make -f Makefile.PCH UNICODE=0 DEBUG=1"\r
+# PROP Cmd_Line "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make -f Makefile-precomp UNICODE=0 DEBUG=1"\r
 # PROP Rebuild_Opt "clean all"\r
 # PROP Target_File "ibrowser.exe"\r
 # PROP Bsc_Name "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make -f Makefile.MinGW UNICODE=0 DEBUG=1"\r
@@ -107,33 +106,12 @@ CFG=make_ibrowser - Win32 bjam
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "URelease"\r
 # PROP Intermediate_Dir "URelease"\r
-# PROP Cmd_Line "msdevfilt -gcc make -f Makefile.PCH UNICODE=1"\r
+# PROP Cmd_Line "msdevfilt -gcc make -f Makefile-precomp UNICODE=1"\r
 # PROP Rebuild_Opt "clean all"\r
 # PROP Target_File "ibrowser.exe"\r
 # PROP Bsc_Name ""\r
 # PROP Target_Dir ""\r
 \r
-!ELSEIF  "$(CFG)" == "make_ibrowser - Win32 bjam"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Cmd_Line "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" make -f Makefile.MinGW DEBUG=1"\r
-# PROP BASE Rebuild_Opt "clean all"\r
-# PROP BASE Target_File "ibrowser.exe"\r
-# PROP BASE Bsc_Name ""\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug"\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Cmd_Line "msdevfilt -gcc -pipe "perl d:\tools\gSTLFilt.pl" bjam"\r
-# PROP Rebuild_Opt "clean&bjam release"\r
-# PROP Target_File "ibrowser.exe"\r
-# PROP Bsc_Name ""\r
-# PROP Target_Dir ""\r
-\r
 !ENDIF \r
 \r
 # Begin Target\r
@@ -142,7 +120,6 @@ CFG=make_ibrowser - Win32 bjam
 # Name "make_ibrowser - Win32 Debug"\r
 # Name "make_ibrowser - Win32 Unicode Debug"\r
 # Name "make_ibrowser - Win32 Unicode Release"\r
-# Name "make_ibrowser - Win32 bjam"\r
 \r
 !IF  "$(CFG)" == "make_ibrowser - Win32 Release"\r
 \r
@@ -152,21 +129,23 @@ CFG=make_ibrowser - Win32 bjam
 \r
 !ELSEIF  "$(CFG)" == "make_ibrowser - Win32 Unicode Release"\r
 \r
-!ELSEIF  "$(CFG)" == "make_ibrowser - Win32 bjam"\r
-\r
 !ENDIF \r
 \r
 # Begin Source File\r
 \r
+SOURCE=.\ibrowser.rbuild\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\Makefile\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\Makefile.MinGW\r
+SOURCE=".\Makefile-MinGW"\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\Makefile.PCH\r
+SOURCE=".\Makefile-precomp"\r
 # End Source File\r
 # End Target\r
 # End Project\r