Ros-diffs January 2008

ros-diffs@reactos.org

24 participants
539 discussions

[cwittich] 31972: don't write beyond the arraysize

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Jan 24 20:06:19 2008 New Revision: 31972 URL: http://svn.reactos.org/svn/reactos?rev=31972&view=rev Log: don't write beyond the arraysize Modified: trunk/reactos/dll/win32/shell32/shfldr_mycomp.c Modified: trunk/reactos/dll/win32/shell32/shfldr_mycomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shfldr_m… ============================================================================== --- trunk/reactos/dll/win32/shell32/shfldr_mycomp.c (original) +++ trunk/reactos/dll/win32/shell32/shfldr_mycomp.c Thu Jan 24 20:06:19 2008 @@ -104,7 +104,7 @@ { IGenericSFImpl *sf; DWORD dwSize; - WCHAR szName[100]; + WCHAR szName[MAX_PATH]; TRACE ("unkOut=%p %s\n", pUnkOuter, shdebugstr_guid (riid)); if (!ppv)

16 years, 9 months

[cwittich] 31971: fix build with gcc 4.3.0

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Jan 24 19:42:57 2008 New Revision: 31971 URL: http://svn.reactos.org/svn/reactos?rev=31971&view=rev Log: fix build with gcc 4.3.0 Modified: trunk/reactos/base/applications/network/telnet/src/stl_bids.h Modified: trunk/reactos/base/applications/network/telnet/src/stl_bids.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/telnet/src/stl_bids.h (original) +++ trunk/reactos/base/applications/network/telnet/src/stl_bids.h Thu Jan 24 19:42:57 2008 @@ -12,6 +12,7 @@ // #include <algo.h> #include <vector> #include <algorithm> +#include <limits.h> using namespace std; template <class T>

16 years, 9 months

[cwittich] 31970: do not redefine _pctype

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Jan 24 19:40:11 2008 New Revision: 31970 URL: http://svn.reactos.org/svn/reactos?rev=31970&view=rev Log: do not redefine _pctype Modified: trunk/reactos/include/crt/wctype.h Modified: trunk/reactos/include/crt/wctype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/wctype.h?rev=3… ============================================================================== --- trunk/reactos/include/crt/wctype.h (original) +++ trunk/reactos/include/crt/wctype.h Thu Jan 24 19:40:11 2008 @@ -94,6 +94,7 @@ /* Also in ctype.h */ +#ifndef _CTYPE_H_ #ifdef __DECLSPEC_SUPPORTED # if __MSVCRT_VERSION__ <= 0x0700 __MINGW_IMPORT unsigned short _ctype[]; @@ -118,7 +119,7 @@ # define _pctype (*_imp___pctype_dll) # endif /* CRTDLL */ #endif /* __DECLSPEC_SUPPORTED */ - +#endif #if !(defined (__NO_INLINE__) || defined(__NO_CTYPE_INLINES) \ || defined(__WCTYPE_INLINES_DEFINED))

16 years, 9 months

[cwittich] 31969: use explicit braces to make gcc happy

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu Jan 24 19:17:26 2008 New Revision: 31969 URL: http://svn.reactos.org/svn/reactos?rev=31969&view=rev Log: use explicit braces to make gcc happy Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.h Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xmlstorage.h (original) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.h Thu Jan 24 19:17:26 2008 @@ -2639,9 +2639,10 @@ _out << _format._endl; if (_format._pretty == PRETTY_INDENT) + { for(size_t i=_stack.size(); --i>0; ) _out << XML_INDENT_SPACE; - + } _out << '<' << EncodeXMLString(entry._node_name); //entry._state = PRE; } @@ -2670,9 +2671,10 @@ _out << _format._endl; if (_format._pretty==PRETTY_INDENT && entry._content.empty()) + { for(size_t i=_stack.size(); --i>0; ) _out << XML_INDENT_SPACE; - + } _out << "</" << EncodeXMLString(entry._node_name) << ">"; } else { _out << "/>";

16 years, 9 months

[arty] 31968: Shorten the DLL stub to just what's necessary. This also fixes the stack chain.

by arty＠svn.reactos.org

Author: arty Date: Thu Jan 24 07:59:57 2008 New Revision: 31968 URL: http://svn.reactos.org/svn/reactos?rev=31968&view=rev Log: Shorten the DLL stub to just what's necessary. This also fixes the stack chain. Modified: trunk/tools/RosBE/RosBE-PPC/gnu/binutils-2.16.1.diff Modified: trunk/tools/RosBE/RosBE-PPC/gnu/binutils-2.16.1.diff URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-PPC/gnu/binutils… ============================================================================== --- trunk/tools/RosBE/RosBE-PPC/gnu/binutils-2.16.1.diff (original) +++ trunk/tools/RosBE/RosBE-PPC/gnu/binutils-2.16.1.diff Thu Jan 24 07:59:57 2008 @@ -38,6 +38,8 @@ diff -x '*.1' -x '*.info' -ur clean/binutils-2.16.1/binutils/dlltool.c binutils-2.16.1/binutils/dlltool.c --- clean/binutils-2.16.1/binutils/dlltool.c 2005-02-23 04:25:57.000000000 -0800 +++ binutils-2.16.1/binutils/dlltool.c 2007-09-14 23:01:31.000000000 -0700 +--- dlltool.c 2008-01-22 16:57:30.000000000 -0800 ++++ binutils-2.16.1/binutils/dlltool.c 2008-01-23 20:39:38.000000000 -0800 @@ -382,7 +382,7 @@ extern char * program_name; @@ -62,7 +64,7 @@ #define DRECTVE_SECTION_NAME ((machine == MMCORE_ELF || machine == MMCORE_ELF_LE) ? ".exports" : ".drectve") #endif -@@ -507,13 +508,23 @@ +@@ -507,13 +508,16 @@ the glue. */ static const unsigned char ppc_jtab[] = { @@ -73,38 +75,31 @@ - 0xA6, 0x03, 0x89, 0x7D, /* mtctr r12 */ - 0x04, 0x00, 0x4B, 0x80, /* lwz r2,4(r11) */ - 0x20, 0x04, 0x80, 0x4E /* bctr */ -+ 0x38, 0x21, 0xff, 0xf0, /* addi 1,1,-16 */ -+ 0x7c, 0x08, 0x02, 0xa6, /* mflr 0 */ -+ 0x90, 0x01, 0x00, 0x00, /* stw 0,0(1) */ -+ 0x90, 0x61, 0x00, 0x04, /* stw 3,4(1) */ ++ 0x7c, 0x08, 0x02, 0xa6, /* mflr r0 */ + 0x48, 0x00, 0x00, 0x05, /* bl next */ -+ 0x7c, 0x68, 0x02, 0xa6, /* mflr 3 */ -+ 0x38, 0x63, 0x00, 0x2c, /* addi 3,3,44 */ -+ 0x80, 0x63, 0x00, 0x00, /* lwz 3,0(3) */ -+ 0x80, 0x03, 0x00, 0x00, /* lwz 0,0(3) */ -+ 0x80, 0x61, 0x00, 0x04, /* lwz 3,4(1) */ -+ 0x7c, 0x08, 0x03, 0xa6, /* mtlr 0 */ -+ 0x4e, 0x80, 0x00, 0x21, /* blrl */ -+ 0x80, 0x01, 0x00, 0x00, /* lwz 0,0,1 */ -+ 0x7c, 0x08, 0x03, 0xa6, /* mtlr 0 */ -+ 0x38, 0x21, 0x00, 0x10, /* addi 1,1,16 */ -+ 0x4e, 0x80, 0x00, 0x20, /* blr */ ++ 0x7c, 0x48, 0x02, 0xa6, /* mflr r2 */ ++ 0x38, 0x42, 0x00, 0x1c, /* addi r2,r2,28 */ ++ 0x80, 0x42, 0x00, 0x00, /* lwz r2,0(r2) */ ++ 0x80, 0x42, 0x00, 0x00, /* lwz r2,0(r2) */ ++ 0x7c, 0x49, 0x03, 0xa6, /* mtctr r2 */ ++ 0x7c, 0x08, 0x03, 0xa6, /* mtlr r0 */ ++ 0x4e, 0x80, 0x04, 0x20, /* bctr */ + 0x00, 0x00, 0x00, 0x00, /* ; receives address of table entry */ }; #ifdef DLLTOOL_PPC -@@ -567,8 +578,8 @@ +@@ -567,8 +571,8 @@ #define MPPC 2 "ppc", ".byte", ".short", ".long", ".asciz", "#", "jmp *", ".global", ".space", ".align\t2",".align\t4", "", - "pe-powerpcle",bfd_arch_powerpc, - ppc_jtab, sizeof (ppc_jtab), 0 + "powerpc-unknown-linux-gnu", bfd_arch_powerpc, -+ ppc_jtab, sizeof (ppc_jtab), 0x40 ++ ppc_jtab, sizeof (ppc_jtab), 36 } , { -@@ -1351,6 +1362,7 @@ +@@ -1351,6 +1355,7 @@ sprintf (new_exclude->string, "%s", exclude_string); else sprintf (new_exclude->string, "_%s", exclude_string); @@ -112,7 +107,7 @@ new_exclude->next = excludes; excludes = new_exclude; -@@ -1538,7 +1550,7 @@ +@@ -1538,7 +1543,7 @@ fprintf (f, "\n"); for (i = 0, exp = d_exports; exp; i++, exp = exp->next) { @@ -121,7 +116,7 @@ ASM_C, i, exp->name, -@@ -1778,7 +1790,7 @@ +@@ -1778,7 +1783,7 @@ if (d_exports) { @@ -130,7 +125,7 @@ fprintf (f, "\t%s 0 %s Allways 0\n", ASM_LONG, ASM_C); fprintf (f, "\t%s 0x%lx %s Time and date\n", ASM_LONG, (long) time(0), ASM_C); -@@ -1821,13 +1833,31 @@ +@@ -1821,13 +1826,31 @@ if (exp->forward == 0) { @@ -164,7 +159,7 @@ } else fprintf (f, "\t%sf%d%s\t%s %d\n", ASM_RVA_BEFORE, -@@ -2036,8 +2066,6 @@ +@@ -2036,8 +2059,6 @@ unsigned char *data; } sinfo; @@ -173,7 +168,7 @@ #define TEXT 0 #define DATA 1 #define BSS 2 -@@ -2045,8 +2073,16 @@ +@@ -2045,8 +2066,16 @@ #define IDATA5 4 #define IDATA4 5 #define IDATA6 6 @@ -190,7 +185,7 @@ #define TEXT_SEC_FLAGS \ (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_READONLY | SEC_HAS_CONTENTS) -@@ -2057,45 +2093,18 @@ +@@ -2057,45 +2086,18 @@ { id, name, flags, align, NULL, NULL, NULL, 0, NULL } static sinfo secdata[NSECS] = { @@ -244,7 +239,7 @@ /* This is what we're trying to make. We generate the imp symbols with both single and double underscores, for compatibility. -@@ -2143,6 +2152,7 @@ +@@ -2143,6 +2145,7 @@ strcpy (copy, ASM_PREFIX (name)); strcat (copy, prefix); strcat (copy, name); @@ -252,7 +247,7 @@ return copy; } -@@ -2150,14 +2160,14 @@ +@@ -2150,14 +2153,14 @@ make_imp_label (const char *prefix, const char *name) { int len; @@ -269,7 +264,7 @@ } else { -@@ -2167,13 +2177,21 @@ +@@ -2167,13 +2170,21 @@ strcat (copy, ASM_PREFIX (name)); strcat (copy, name); } @@ -293,7 +288,7 @@ asymbol * exp_label; asymbol * iname = 0; asymbol * iname2; -@@ -2188,12 +2206,11 @@ +@@ -2188,12 +2199,11 @@ #ifndef EXTRA #define EXTRA 0 #endif @@ -307,7 +302,7 @@ sprintf (outname, "%s%05d.o", TMP_STUB, i); abfd = bfd_openw (outname, HOW_BFD_WRITE_TARGET); -@@ -2245,19 +2262,8 @@ +@@ -2245,19 +2255,8 @@ if (! exp->data) { exp_label = bfd_make_empty_symbol (abfd); @@ -328,7 +323,7 @@ exp_label->flags = BSF_GLOBAL; exp_label->value = 0; -@@ -2267,6 +2273,15 @@ +@@ -2267,6 +2266,15 @@ #endif ptrs[oidx++] = exp_label; } @@ -344,7 +339,7 @@ /* Generate imp symbols with one underscore for Microsoft compatibility, and with two underscores for backward -@@ -2289,6 +2304,7 @@ +@@ -2289,6 +2297,7 @@ iname_lab = bfd_make_empty_symbol (abfd); iname_lab->name = head_label; @@ -352,7 +347,7 @@ iname_lab->section = (asection *) &bfd_und_section; iname_lab->flags = 0; iname_lab->value = 0; -@@ -2305,17 +2321,48 @@ +@@ -2305,17 +2314,48 @@ /* The symbol referring to the code (.text). */ { asymbol *function_name; @@ -402,7 +397,7 @@ /* The .toc symbol. */ { asymbol *toc_symbol; -@@ -2330,6 +2377,7 @@ +@@ -2330,6 +2370,7 @@ ptrs[oidx++] = toc_symbol; } #endif @@ -410,7 +405,7 @@ ptrs[oidx] = 0; -@@ -2358,18 +2406,8 @@ +@@ -2358,18 +2399,8 @@ rel->address = HOW_JTAB_ROFF; rel->addend = 0; @@ -430,7 +425,7 @@ sec->orelocation = rpp; sec->reloc_count = 1; } -@@ -2400,7 +2438,7 @@ +@@ -2400,7 +2431,7 @@ rel->address = 0; rel->addend = 0; rel->howto = bfd_reloc_type_lookup (abfd, BFD_RELOC_RVA); @@ -439,7 +434,7 @@ sec->orelocation = rpp; } -@@ -2435,6 +2473,7 @@ +@@ -2435,6 +2466,7 @@ sec->reloc_count = 1; break; @@ -447,7 +442,7 @@ #ifdef DLLTOOL_PPC case PDATA: { -@@ -2542,6 +2581,7 @@ +@@ -2542,6 +2574,7 @@ sec->reloc_count = 2; break; #endif /* DLLTOOL_PPC */ @@ -455,7 +450,7 @@ } } -@@ -2556,6 +2596,9 @@ +@@ -2556,6 +2589,9 @@ bfd_set_section_vma (abfd, si->sec, vma); } } @@ -465,7 +460,7 @@ /* Write them out. */ for (i = 0; i < NSECS; i++) { -@@ -2572,7 +2615,6 @@ +@@ -2572,7 +2608,6 @@ si->size); } @@ -473,16 +468,7 @@ bfd_close (abfd); abfd = bfd_openr (outname, HOW_BFD_READ_TARGET); return abfd; -@@ -2592,7 +2634,7 @@ - fprintf (f, "%s IMAGE_IMPORT_DESCRIPTOR\n", ASM_C); - fprintf (f, "\t.section .idata$2\n"); - -- fprintf(f,"\t%s\t%s\n", ASM_GLOBAL,head_label); -+ fprintf (f,"\t%s\t%s\n", ASM_GLOBAL,head_label); - - fprintf (f, "%s:\n", head_label); - -@@ -2617,16 +2659,12 @@ +@@ -2617,16 +2652,12 @@ if (!no_idata5) { fprintf (f, "\t.section\t.idata$5\n"); @@ -499,7 +485,7 @@ fprintf (f, "hname:\n"); } -@@ -2729,9 +2767,11 @@ +@@ -2729,9 +2760,11 @@ for (i = 0; (exp = d_exports_lexically[i]); i++) { bfd *n; @@ -511,7 +497,7 @@ n = make_one_lib_file (exp, i); n->next = head; head = n; -@@ -3091,10 +3131,10 @@ +@@ -3091,10 +3124,10 @@ fprintf (file, _(" -v --verbose Be verbose.\n")); fprintf (file, _(" -V --version Display the program version.\n")); fprintf (file, _(" -h --help Display this information.\n")); @@ -524,7 +510,7 @@ #endif exit (status); } -@@ -3131,6 +3171,7 @@ +@@ -3131,6 +3164,7 @@ {"base-file", required_argument, NULL, 'b'}, {"as", required_argument, NULL, 'S'}, {"as-flags", required_argument, NULL, 'f'}, @@ -532,7 +518,7 @@ {"mcore-elf", required_argument, NULL, 'M'}, {"compat-implib", no_argument, NULL, 'C'}, {"temp-prefix", required_argument, NULL, 't'}, -@@ -3161,7 +3202,7 @@ +@@ -3161,7 +3195,7 @@ #ifdef DLLTOOL_MCORE_ELF "m:e:l:aD:d:z:b:xp:cCuUkAS:f:nvVHhM:L:F:", #else @@ -541,7 +527,7 @@ #endif long_options, 0)) != EOF) -@@ -3256,15 +3297,15 @@ +@@ -3256,15 +3290,15 @@ fatal (_("Unable to open base-file: %s"), optarg); break; @@ -563,7 +549,7 @@ break; #endif case 'C': -@@ -3304,6 +3345,9 @@ +@@ -3304,6 +3338,9 @@ if (as_name == NULL) as_name = deduce_name ("as"); @@ -573,7 +559,7 @@ /* Don't use the default exclude list if we're reading only the symbols in the .drectve section. The default excludes are meant to avoid exporting DLL entry point and Cygwin32 impure_ptr. */ -@@ -3517,8 +3561,8 @@ +@@ -3517,8 +3554,8 @@ ds = dyn_string_new (100); dyn_string_append_cstr (ds, "-r "); @@ -584,7 +570,7 @@ while (ptr->next != NULL) { -@@ -3531,10 +3575,7 @@ +@@ -3531,10 +3568,7 @@ dyn_string_append_cstr (ds, "-o "); dyn_string_append_cstr (ds, MCORE_ELF_TMP_OBJ); @@ -596,7 +582,7 @@ dyn_string_delete (ds); -@@ -3573,8 +3614,8 @@ +@@ -3573,8 +3607,8 @@ dyn_string_append_cstr (ds, "-shared "); @@ -607,7 +593,7 @@ dyn_string_append_cstr (ds, " "); dyn_string_append_cstr (ds, MCORE_ELF_TMP_EXP); -@@ -3583,7 +3624,7 @@ +@@ -3583,7 +3617,7 @@ dyn_string_append_cstr (ds, " -o "); dyn_string_append_cstr (ds, mcore_elf_out_file);

16 years, 9 months

[peterw] 31967: - Update the changelog and readme, RosBE 1.2 is released.

by peterw＠svn.reactos.org

Author: peterw Date: Thu Jan 24 05:43:40 2008 New Revision: 31967 URL: http://svn.reactos.org/svn/reactos?rev=31967&view=rev Log: - Update the changelog and readme, RosBE 1.2 is released. Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Thu Jan 24 05:43:40 2008 @@ -1,4 +1,4 @@ -*** XXX XXth, 2008 - RosBE 1.2 Released +*** January 23rd, 2008 - RosBE 1.2 Released - Updated: NASM to 2.01 (Peter Ward) - Updated: Subversion to 1.4.6 (Peter Ward) @@ -19,6 +19,7 @@ - Add a macro file for the MinGW prompt and add SCUT to this macro file (Colin Finck) - Add the ability to determine the cpu count based on the inherited process affinity mask to cpucount (only for win32 hosts) (Thomas Weidenmueller) - KDBG is defaulted to 1 now in Config.cmd to reflect changes in svn. (Daniel Reimer) +- Grab the GCC target dynamically as well as the version so chdefgcc will work with mingw64, etc... (Peter Ward) *** December 8th, 2007 - RosBE 1.1 Released Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available.

16 years, 9 months

[cfinck] 31966: Tag the RosBE-Unix 1.1 release

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Jan 24 00:01:30 2008 New Revision: 31966 URL: http://svn.reactos.org/svn/reactos?rev=31966&view=rev Log: Tag the RosBE-Unix 1.1 release Added: tags/RosBE-Unix-1.1/ - copied from r31964, trunk/

16 years, 9 months

[cfinck] 31965: Tag ReactOS 0.3.4 release

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jan 23 23:58:06 2008 New Revision: 31965 URL: http://svn.reactos.org/svn/reactos?rev=31965&view=rev Log: Tag ReactOS 0.3.4 release Added: tags/ReactOS-0.3.4/ - copied from r31964, branches/ros-branch-0_3_4/ Removed: branches/ros-branch-0_3_4/

16 years, 9 months

[cfinck] 31964: - Add some more information to the README about the tested host systems and a special hint required for using RosBE-Unix under FreeBSD. - Change the version to 1.1. This is the final version!

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jan 23 21:21:21 2008 New Revision: 31964 URL: http://svn.reactos.org/svn/reactos?rev=31964&view=rev Log: - Add some more information to the README about the tested host systems and a special hint required for using RosBE-Unix under FreeBSD. - Change the version to 1.1. This is the final version! Modified: trunk/tools/RosBE/RosBE-Unix/README trunk/tools/RosBE/RosBE-Unix/README.odt trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh trunk/tools/RosBE/RosBE-Unix/scripts/RosBE.sh Modified: trunk/tools/RosBE/RosBE-Unix/README URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/README?rev=… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/README (original) +++ trunk/tools/RosBE/RosBE-Unix/README Wed Jan 23 21:21:21 2008 @@ -53,6 +53,19 @@ package called "texinfo". +Preparing the installation +--------------------------- + Under some operating systems, you need to perform additional steps before +you can install the Build Environment. This section lists them. + + * FreeBSD + - You have to create a symbolic link "/bin/bash", because FreeBSD + installs Bash to "/usr/local/bin/bash". Simply execute the following + command for doing this: + + ln -s /usr/local/bin/bash /bin/bash + + Installation ------------- The Installation of RosBE is very simple, since there are scripts, which do @@ -104,11 +117,14 @@ Tested Operating Systems ------------------------- Although the Build Environment is designed to work on all Unix-based -operating systems, I only tested it on the following systems: +operating systems, it was only tested under the following systems: * Debian GNU/Linux 4.0 + * Fedora 8 * FreeBSD 6.2 - * Ubuntu 7.04 + * Mac OS X 10.5 + * openSUSE 10.2 + * Ubuntu 7.04 and 7.10 You should be able to compile the build tools on both i386 (32-bit) and x86_64 (64-bit) systems. Modified: trunk/tools/RosBE/RosBE-Unix/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/README.odt?… ============================================================================== Binary files - no diff available. Modified: trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/RosBE-Build… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh (original) +++ trunk/tools/RosBE/RosBE-Unix/RosBE-Builder.sh Wed Jan 23 21:21:21 2008 @@ -1,14 +1,14 @@ #!/bin/bash # # RosBE-Builder -# Copyright 2007 Colin Finck <mail(a)colinfinck.de> +# Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> # partially based on the BuildMingwCross script (http://www.mingw.org/MinGWiki/index.php/BuildMingwCross) # # Released under GNU GPL v2 or any later version. # Constants -ROSBE_VERSION="1.1-SVN" -KNOWN_ROSBE_VERSIONS="0.3.6 1.1-SVN" +ROSBE_VERSION="1.1" +KNOWN_ROSBE_VERSIONS="0.3.6 1.1" DEFAULT_INSTALL_DIR="/usr/RosBE" NEEDED_TOOLS="bison flex gcc g++ grep makeinfo" # GNU Make has a special check @@ -91,7 +91,7 @@ echo "* Builder Tool *" echo "* by Colin Finck <mail(a)colinfinck.de> *" echo "* *" -echo "* Version $ROSBE_VERSION *" +echo "* Version $ROSBE_VERSION *" echo "*******************************************************************************" echo Modified: trunk/tools/RosBE/RosBE-Unix/scripts/RosBE.sh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Unix/scripts/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Unix/scripts/RosBE.sh (original) +++ trunk/tools/RosBE/RosBE-Unix/scripts/RosBE.sh Wed Jan 23 21:21:21 2008 @@ -2,7 +2,7 @@ # # Script for initializing RosBE # Part of RosBE for Unix-based Operating Systems -# Copyright 2007 Colin Finck <mail(a)colinfinck.de> +# Copyright 2007-2008 Colin Finck <mail(a)colinfinck.de> # # Released under GNU GPL v2 or any later version. @@ -35,7 +35,7 @@ echo "* ReactOS Build Environment for Unix-based Operating Systems *" echo "* by Colin Finck <mail(a)colinfinck.de> *" echo "* *" -echo "* Version $ROSBE_VERSION *" +echo "* Version $ROSBE_VERSION *" echo "*******************************************************************************" bash --rcfile "$_ROSSCRIPTDIR/RosBE-rc"

16 years, 9 months

[peterw] 31963: - Grab the GCC target dynamically as well as the version so chdefgcc will work with mingw64, etc... - Display the GCC target. - Change the Bison/Flex errors to warnings.

by peterw＠svn.reactos.org

Author: peterw Date: Wed Jan 23 20:54:10 2008 New Revision: 31963 URL: http://svn.reactos.org/svn/reactos?rev=31963&view=rev Log: - Grab the GCC target dynamically as well as the version so chdefgcc will work with mingw64, etc... - Display the GCC target. - Change the Bison/Flex errors to warnings. Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Wed Jan 23 20:54:10 2008 @@ -24,22 +24,26 @@ :: set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% set _ROSBE_GCCVERSION= +set _ROSBE_GCCTARGET= for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i -set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_MINGWPATH%\libexec\gcc\mingw32\%_ROSBE_GCCVERSION%;%_ROSBE_ORIGINALPATH% +for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i +set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_MINGWPATH%\libexec\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%;%_ROSBE_ORIGINALPATH% set _ROSBE_MINGWMAKE=%_ROSBE_MINGWPATH%\bin\mingw32-make.exe if "%_ROSBE_MODE%" == "MinGW" ( - set C_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION%\include - set CPLUS_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\mingw32;%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION%\include + set C_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include + set CPLUS_INCLUDE_PATH=%_ROSBE_MINGWPATH%\include;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%;%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include ) else ( - set HOST_CFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION%\include" - set HOST_CPPFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\mingw32" -I"%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION%\include" + set HOST_CFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" + set HOST_CPPFLAGS=-I"%_ROSBE_MINGWPATH%\include" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%" -I"%_ROSBE_MINGWPATH%\include\c++\%_ROSBE_GCCVERSION%\%_ROSBE_GCCTARGET%" -I"%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION%\include" ) -set LIBRARY_PATH=%_ROSBE_MINGWPATH%\lib;%_ROSBE_MINGWPATH%\lib\gcc\mingw32\%_ROSBE_GCCVERSION% +set LIBRARY_PATH=%_ROSBE_MINGWPATH%\lib;%_ROSBE_MINGWPATH%\lib\gcc\%_ROSBE_GCCTARGET%\%_ROSBE_GCCVERSION% :: :: Display the current version of GCC, NASM, ld and make. :: gcc -v 2>&1 | find "gcc version" +echo gcc target^: %_ROSBE_GCCTARGET% +ld -v if exist "%_ROSBE_MINGWPATH%\bin\nasm.exe" ( nasm -v ) else ( @@ -51,15 +55,14 @@ bison --version | find "GNU Bison" ) else ( if "%_ROSBE_MODE%" == "RosBE" ( - echo ERROR: Bison is required to build ReactOS, none found in the current MinGW/GCC. + echo WARNING: Bison will soon be required to build ReactOS, none found in the current MinGW/GCC. ) ) if exist "%_ROSBE_MINGWPATH%\bin\flex.exe" ( flex --version ) else ( if "%_ROSBE_MODE%" == "RosBE" ( - echo ERROR: Flex is required to build ReactOS, none found in the current MinGW/GCC. + echo WARNING: Flex will soon be required to build ReactOS, none found in the current MinGW/GCC. ) ) -ld -v mingw32-make -v | find "GNU Make"

16 years, 9 months

← Newer
1
...
8
9
10
11
12
13
14
...
54
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2008