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
This commit is contained in:
Martin Fuchs 2006-02-19 23:13:19 +00:00
parent 3fa7cc252d
commit 52ed64bb5e
5 changed files with 43 additions and 63 deletions

View file

@ -1,7 +1,7 @@
# #
# ROS Internet Web Browser # ROS Internet Web Browser
# #
# Makefile.PCH # Makefile-precomp
# #
# MinGW Makefile with precompiled header support # MinGW Makefile with precompiled header support
# #

View file

@ -1,9 +1,9 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
<module name="ibrowser" type="win32gui" installbase="system32" installname="ibrowser.exe" allowwarnings ="true"> <module name="ibrowser" type="win32gui" installbase="system32" installname="ibrowser.exe" allowwarnings ="true">
<linkerflag>-fexceptions</linkerflag> <linkerflag>-fexceptions</linkerflag>
<include base="ibrowser">.</include> <include base="ibrowser">.</include>
<include base="ReactOS">include/reactos/libs</include> <include base="ReactOS">include/expat</include>
<define name="__USE_W32API" /> <define name="__USE_W32API" />
<define name="UNICODE" /> <define name="UNICODE" />
<define name="WIN32" /> <define name="WIN32" />
@ -31,3 +31,4 @@
<file>webchild.cpp</file> <file>webchild.cpp</file>
<file>ibrowser.rc</file> <file>ibrowser.rc</file>
</module> </module>
</rbuild>

View file

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