You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by se...@apache.org on 2007/06/27 01:58:55 UTC
svn commit: r550991 [11/23] - in /incubator/stdcxx/branches/4.2.0: ./ doc/
doc/stdlibref/ doc/stdlibug/ etc/config/ etc/config/src/
etc/config/windows/ etc/nls/ etc/nls/posix/charmaps/ etc/nls/posix/src/
examples/include/ examples/manual/ examples/manu...
Modified: incubator/stdcxx/branches/4.2.0/doc/stdlibug/VIII.html
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/doc/stdlibug/VIII.html?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/doc/stdlibug/VIII.html (original)
+++ incubator/stdcxx/branches/4.2.0/doc/stdlibug/VIII.html Tue Jun 26 16:58:07 2007
@@ -1,7 +1,7 @@
<HTML>
<HEAD>
<TITLE>Iostreams</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
<BODY BGCOLOR=#FFFFFF>
<A HREF="26-9.html"><IMG SRC="images/bprev.gif" WIDTH=20 HEIGHT=21 ALT="Previous file" BORDER=O></A><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><A HREF="27.html"><IMG SRC="images/bnext.gif" WIDTH=25 HEIGHT=21 ALT="Next file" BORDER=O></A><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
<H1>Part VIII: Iostreams</H1>
@@ -25,7 +25,7 @@
<H3><A HREF="43.html">Chapter 43: Stream Iterators</A></H3>
<H3><A HREF="44.html">Chapter 44: Iostreams and Multithreading</A></H3>
<H3><A HREF="45.html">Chapter 45: Standard vs. Traditional Iostreams</A></H3>
-<H3><A HREF="46.html">Chapter 46: Standard vs. Rogue Wave Iostreams</A></H3>
+<H3><A HREF="46.html">Chapter 46: Standard vs. Apache C++ Standard Library Iostreams</A></H3>
<BR>
Modified: incubator/stdcxx/branches/4.2.0/doc/stdlibug/acknow.html
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/doc/stdlibug/acknow.html?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/doc/stdlibug/acknow.html (original)
+++ incubator/stdcxx/branches/4.2.0/doc/stdlibug/acknow.html Tue Jun 26 16:58:07 2007
@@ -1,7 +1,7 @@
<HTML>
<HEAD>
<TITLE>Acknowledgments</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
<BODY BGCOLOR=#FFFFFF>
<IMG SRC="images/bnoprev.gif" WIDTH=20 HEIGHT=21 ALT="No previous file" BORDER=O><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><IMG SRC="images/bnonext.gif" WIDTH=25 HEIGHT=21 ALT="No next file" BORDER=O><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
<P><EMPHASIS ROLE="bold">SourcePro Core Product Team</EMPHASIS>: Tim Adams, Andrew Black, Jeremy Dean, Erin Foley, Keith Hoaglin, Ravi Inampudi, Amit Jindal, Dennis Kennedy, Shannon Lewis, Liviu Nicoara, Martin Sebor, Nikki Sharma, Marcia Steele, Giai Truong</P><P><EMPHASIS ROLE="bold">Original Team</EMPHASIS>: Timothy Budd, Anna Dahan, Kevin Djang, Donald Fowler, Marlene Hart, <br>Angelika Langer, Phillipe LeMouel, Wendi Minne, Rodney Mishima, Tom Pearson, <br>Randi Prince, Randall Robinson, Randy Smithey, Chun Zhang</P>
Modified: incubator/stdcxx/branches/4.2.0/doc/stdlibug/booktoc.html
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/doc/stdlibug/booktoc.html?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/doc/stdlibug/booktoc.html (original)
+++ incubator/stdcxx/branches/4.2.0/doc/stdlibug/booktoc.html Tue Jun 26 16:58:07 2007
@@ -1,7 +1,7 @@
<HTML>
<HEAD>
<TITLE>Comprehensive Table of Contents</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
<BODY BGCOLOR=#FFFFFF>
<IMG SRC="images/bnoprev.gif" WIDTH=20 HEIGHT=21 ALT="No previous file" BORDER=O><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><IMG SRC="images/bnotoc.gif" WIDTH=56 HEIGHT=21 ALT="No link" BORDER=O><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><IMG SRC="images/bnonext.gif" WIDTH=25 HEIGHT=21 ALT="No next file" BORDER=O><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
<H2>Table of Contents</H2>
@@ -510,7 +510,7 @@
<UL><UL><LI><A HREF="45-3.html#4532">45.3.2 The File Buffer</A></LI></UL></UL>
<UL><LI><A HREF="45-4.html">45.4 String Streams</A></LI></UL>
<UL><LI><A HREF="45-5.html">45.5 Streams with Assign</A></LI></UL>
-<H2><A HREF="46.html">Chapter 46: Standard vs. Rogue Wave Iostreams</A></H2>
+<H2><A HREF="46.html">Chapter 46: Standard vs. Apache C++ Standard Library Iostreams</A></H2>
<UL><LI><A HREF="46-1.html">46.1 Extensions</A></LI></UL>
<UL><UL><LI><A HREF="46-1.html#4611">46.1.1 File Descriptors</A></LI></UL></UL>
<UL><UL><LI><A HREF="46-1.html#4612">46.1.2 Multithreaded Environments</A></LI></UL></UL>
Modified: incubator/stdcxx/branches/4.2.0/doc/stdlibug/contact.html
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/doc/stdlibug/contact.html?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/doc/stdlibug/contact.html (original)
+++ incubator/stdcxx/branches/4.2.0/doc/stdlibug/contact.html Tue Jun 26 16:58:07 2007
@@ -1,7 +1,7 @@
<HTML>
<HEAD>
-<TITLE>Contacting Rogue Wave</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet">
+<TITLE>Contacting the Apache C++ Standard Library Team</TITLE>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet">
</HEAD>
<BODY BGCOLOR=#FFFFFF>
<A HREF="../../index.html"><IMG SRC="images/banner.gif" ALT="Rogue Wave banner" WIDTH=405 HEIGHT=57 BORDER=0></A><br>
@@ -10,16 +10,34 @@
<p>Use your browser's <b>Back</b> button to return to where you were.</p>
<h2>Feedback on the Documentation</h2>
+<p>
-<HR><B>Please do not use this feedback path for technical support issues. Those should be handled through your standard pathway for receiving technical support.</B><HR>
+Please send feedback to one of the Apache C++ Standard Library mailing lists:
-<p>Write to us at <a href="mailto:rwonlinedocs@roguewave.com">rwonlinedocs@roguewave.com</a></p>
-
-<p>Please use this only to:</p>
-<ol><li>Report errors in the documentation.
-<li>Make suggestions on how to improve the documentation.
-<li>Tell us how much you like the documentation.
-</ol>
+ <ul>
+ <li>
+ <a href="mailto:stdcxx-dev@incubator.apache.org">
+ stdcxx-dev@incubator.apache.org
+ </a>
+ </li>
+ <li>
+ <a href="mailto:stdcxx-user@incubator.apache.org">
+ stdcxx-user@incubator.apache.org
+ </a>
+ </li>
+ </ul>
+</p>
<P><IMG SRC="images/bnoprev.gif" WIDTH=20 HEIGHT=21 BORDER=0><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=0></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=0></A><IMG SRC="images/bnonext.gif" WIDTH=19 HEIGHT=21 BORDER=0></P>
-</BODY></HTML>
+
+<!-- Google Analytics tracking code -->
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+ _uacct = "UA-1775151-1";
+ urchinTracker();
+</script>
+<!-- end of Google Analytics tracking code -->
+
+</BODY>
+</HTML>
Modified: incubator/stdcxx/branches/4.2.0/doc/stdlibug/copyright.html
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/doc/stdlibug/copyright.html?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/doc/stdlibug/copyright.html (original)
+++ incubator/stdcxx/branches/4.2.0/doc/stdlibug/copyright.html Tue Jun 26 16:58:07 2007
@@ -1,16 +1,31 @@
<HTML>
<HEAD>
<TITLE>Copyright Information</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
<BODY BGCOLOR=#FFFFFF>
<A HREF="../../index.html"><IMG SRC="images/banner.gif" WIDTH=405 HEIGHT=57 ALT="Rogue Wave banner" BORDER=0></A><BR>
<IMG SRC="images/noprev.gif" WIDTH=20 HEIGHT=21 ALT="No previous file" BORDER=O><A HREF="noframes.html"><IMG SRC="images/top.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/toc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/index.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><IMG SRC="images/nonext.gif" WIDTH=25 HEIGHT=21 ALT="No next file" BORDER=O><A HREF="../../index.html"><IMG SRC="images/blank.gif" WIDTH=56 HEIGHT=21 BORDER=O><IMG SRC="images/end.gif" WIDTH=136 HEIGHT=21 BORDER=O></A>
<DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
-<P>Copyright 2005 Quovadx, Inc. All Rights Reserved. </P><P>Rogue Wave and SourcePro are registered trademarks of Quovadx, Inc. in the United States and other countries. All other trademarks are the property of their respective owners.</P>
+<P>
+
+© Copyright 1994-2007 Rogue Wave Software.
+
+</P>
+<P>
+
+Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>
+
+</P>
+<P>
+
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+</P>
<BR>
<HR>
-<IMG SRC="images/bnoprev.gif" WIDTH=20 HEIGHT=21 ALT="No previous file" BORDER=O><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><IMG SRC="images/bnonext.gif" WIDTH=20 HEIGHT=21 ALT="No next file" BORDER=O><P>©2005 Copyright Quovadx, Inc. All Rights Reserved.<BR>Rogue Wave and SourcePro are registered trademarks of Quovadx, Inc. in the United States and other countries. All other trademarks are the property of their respective owners.<BR><A HREF="contact.html">Contact</A> Rogue Wave about documentation or support issues.</P>
+<IMG SRC="images/bnoprev.gif" WIDTH=20 HEIGHT=21 ALT="No previous file" BORDER=O><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><IMG SRC="images/bnonext.gif" WIDTH=20 HEIGHT=21 ALT="No next file" BORDER=O>
+<P>© 1994-2007 Copyright Rogue Wave Software. All Rights Reserved.<BR>Rogue Wave is a registered trademark of Rogue Wave Software in the United States and other countries. All other trademarks are the property of their respective owners.<BR><A HREF="contact.html">Contact</A> the Apache C++ Standard Library maintainers with documentation and support issues.</P>
<!-- Google Analytics tracking code -->
<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
Modified: incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-banner.html
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-banner.html?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-banner.html (original)
+++ incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-banner.html Tue Jun 26 16:58:07 2007
@@ -4,28 +4,45 @@
<link rel=StyleSheet
href="../rwbanner.css"
type="text/css"
- title="Rogue Wave Standard Stylesheet">
- <base target="toc">
- </head>
- <body bgcolor=#FFFFFF>
+ title="Apache stdcxx Stylesheet"/>
+ <base target="toc"/>
+ <style type="text/css">
+ body {
+ background: url("http://apache.org/images/asf_logo.gif");
+ background-repeat: no-repeat
+ }
+ </style>
+ </head>
+ <body>
<table border=0 cellpadding=4 cellspacing=0 width=100%>
<tr>
<td align=center>
- <h2>Apache C++ Standard Library User's Guide</h2>
- <h4>
+ <h2>
+ <a href="http://incubator.apache.org/stdcxx"
+ target="_top">
+ Apache C++ Standard Library</a> User's Guide
+ </h2>
+ <h5>
<a href="frames-displayarea.html"
target="display">Top</a>
|
<a href="frames-tindex.html"
target="display">Topic Index</a>
|
- <a href="noframes.html" target="_top">No Frames</a>
+ <a href="noframes.html"
+ target="_top">
+ No Frames
+ </a>
<br>
- <a href="frames-contents-chapter.html">Chapter List</a>
+ <a href="frames-contents-chapter.html">
+ Chapter List
+ </a>
or
- <a href="frames-contents-all.html">Detailed Contents</a>
- </h4>
+ <a href="frames-contents-all.html">
+ Detailed Contents
+ </a>
+ </h5>
</td>
</tr>
</table>
Modified: incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-contents-all.html
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-contents-all.html?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-contents-all.html (original)
+++ incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-contents-all.html Tue Jun 26 16:58:07 2007
@@ -1,7 +1,7 @@
<HTML>
<HEAD>
<TITLE>Comprehensive TOC Frames</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet">
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet">
<BASE TARGET="text">
</HEAD>
<BODY BGCOLOR=#FFFFFF>
Modified: incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-contents-chapter.html
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-contents-chapter.html?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-contents-chapter.html (original)
+++ incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-contents-chapter.html Tue Jun 26 16:58:07 2007
@@ -1,7 +1,7 @@
<HTML>
<HEAD>
<TITLE>Chapter List</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet">
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet">
<BASE TARGET="text">
</HEAD>
<BODY BGCOLOR=#FFFFFF>
@@ -64,7 +64,7 @@
<B><A HREF="43.html">43: Stream Iterators</A></B><BR>
<B><A HREF="44.html">44: Iostreams and Multithreading</A></B><BR>
<B><A HREF="45.html">45: Standard vs. Traditional Iostreams</A></B><BR>
- <B><A HREF="46.html">46: Standard vs. Rogue Wave Iostreams</A></B><BR>
+ <B><A HREF="46.html">46: Standard vs. Apache stdcxx Iostreams</A></B><BR>
</SMALL>
</TD>
Modified: incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-displayarea.html
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-displayarea.html?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-displayarea.html (original)
+++ incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-displayarea.html Tue Jun 26 16:58:07 2007
@@ -1,7 +1,7 @@
<HTML>
<HEAD>
<TITLE>Display area frameset</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet">
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet">
</HEAD>
<FRAMESET COLS="20%,*">
Modified: incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-intro-contents.html
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-intro-contents.html?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-intro-contents.html (original)
+++ incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-intro-contents.html Tue Jun 26 16:58:07 2007
@@ -1,7 +1,7 @@
<HTML>
<HEAD>
<TITLE>Introduction Contents</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet">
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet">
<BASE TARGET="text">
</HEAD>
<BODY BGCOLOR=#FFFFFF>
Modified: incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-intro-text.html
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-intro-text.html?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-intro-text.html (original)
+++ incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-intro-text.html Tue Jun 26 16:58:07 2007
@@ -1,7 +1,7 @@
<HTML>
<HEAD>
<TITLE>Welcome</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet">
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet">
</HEAD>
<BODY BGCOLOR=#FFFFFF>
Modified: incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-tindex-contents.html
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-tindex-contents.html?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-tindex-contents.html (original)
+++ incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-tindex-contents.html Tue Jun 26 16:58:07 2007
@@ -2,7 +2,7 @@
<HEAD>
<TITLE>Frame-based index contents frame</TITLE>
<BASE TARGET="text">
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet">
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet">
<BASE TARGET="text">
</HEAD>
<BODY BGCOLOR=#FFFFFF>
Modified: incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-tindex.html
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-tindex.html?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-tindex.html (original)
+++ incubator/stdcxx/branches/4.2.0/doc/stdlibug/frames-tindex.html Tue Jun 26 16:58:07 2007
@@ -1,7 +1,7 @@
<HTML>
<HEAD>
<TITLE>Index frameset</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet">
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet">
</HEAD>
<FRAMESET COLS="20%,*">
Modified: incubator/stdcxx/branches/4.2.0/doc/stdlibug/index.html
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/doc/stdlibug/index.html?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/doc/stdlibug/index.html (original)
+++ incubator/stdcxx/branches/4.2.0/doc/stdlibug/index.html Tue Jun 26 16:58:07 2007
@@ -4,7 +4,7 @@
<link rel=StyleSheet
href="../rw.css"
type="text/css"
- title="Rogue Wave Standard Stylesheet">
+ title="Apache stdcxx Stylesheet">
</head>
<frameset rows="110,*">
Modified: incubator/stdcxx/branches/4.2.0/doc/stdlibug/lists.html
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/doc/stdlibug/lists.html?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/doc/stdlibug/lists.html (original)
+++ incubator/stdcxx/branches/4.2.0/doc/stdlibug/lists.html Tue Jun 26 16:58:07 2007
@@ -1,7 +1,7 @@
<HTML>
<HEAD>
<TITLE>Table, Figure, and Examples List</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
<BODY BGCOLOR=#FFFFFF>
<IMG SRC="images/bnoprev.gif" WIDTH=20 HEIGHT=21 ALT="No previous file" BORDER=O><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><A HREF="tindex.html"><IMG SRC="images/bindex.gif" WIDTH=56 HEIGHT=21 ALT="Index page" BORDER=O></A><IMG SRC="images/bnonext.gif" WIDTH=25 HEIGHT=21 ALT="No next file" BORDER=O><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
Modified: incubator/stdcxx/branches/4.2.0/doc/stdlibug/noframes.html
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/doc/stdlibug/noframes.html?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/doc/stdlibug/noframes.html (original)
+++ incubator/stdcxx/branches/4.2.0/doc/stdlibug/noframes.html Tue Jun 26 16:58:07 2007
@@ -1,7 +1,7 @@
<HTML>
<HEAD>
<TITLE>C++ Standard Library Module User's Guide</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
<BODY BGCOLOR=#FFFFFF>
<H1>C++ Standard Library Module User's Guide</H1>
<P>Welcome to the <I>C++ Standard Library Module User's Guide</I>.</P>
@@ -67,7 +67,7 @@
<H4><A HREF="43.html">Chapter 43: Stream Iterators</A></H4>
<H4><A HREF="44.html">Chapter 44: Iostreams and Multithreading</A></H4>
<H4><A HREF="45.html">Chapter 45: Standard vs. Traditional Iostreams</A></H4>
-<H4><A HREF="46.html">Chapter 46: Standard vs. Rogue Wave Iostreams</A></H4>
+<H4><A HREF="46.html">Chapter 46: Standard vs. Apache C++ Standard Library Iostreams</A></H4>
</UL>
Modified: incubator/stdcxx/branches/4.2.0/doc/stdlibug/tindex.html
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/doc/stdlibug/tindex.html?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/doc/stdlibug/tindex.html (original)
+++ incubator/stdcxx/branches/4.2.0/doc/stdlibug/tindex.html Tue Jun 26 16:58:07 2007
@@ -1,7 +1,7 @@
<HTML>
<HEAD>
<TITLE>Topic Index</TITLE>
-<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Rogue Wave Standard Stylesheet"></HEAD>
+<LINK REL=StyleSheet HREF="../rw.css" TYPE="text/css" TITLE="Apache stdcxx Stylesheet"></HEAD>
<BODY BGCOLOR=#FFFFFF>
<IMG SRC="images/bnoprev.gif" WIDTH=20 HEIGHT=21 ALT="No previous file" BORDER=O><A HREF="noframes.html"><IMG SRC="images/btop.gif" WIDTH=56 HEIGHT=21 ALT="Top of Document" BORDER=O></A><A HREF="booktoc.html"><IMG SRC="images/btoc.gif" WIDTH=56 HEIGHT=21 ALT="Contents" BORDER=O></A><IMG SRC="images/bnoindex.gif" WIDTH=56 HEIGHT=21 ALT="No link" BORDER=O><IMG SRC="images/bnonext.gif" WIDTH=25 HEIGHT=21 ALT="No next file" BORDER=O><DIV CLASS="DOCUMENTNAME"><B>Apache C++ Standard Library User's Guide</B></DIV>
<H2>Topic Index</H2>
@@ -1361,7 +1361,7 @@
internationalization [in <A HREF="45-2.html#idx988">45.2 Internationalization</A>]<BR>
string streams [in <A HREF="45-4.html#idx993">45.4 String Streams</A>]<BR>
templatized types [in <A HREF="45-1.html#idx985">45.1 The Character Type</A>]<BR>
-standard iostreams, Rogue Wave differences [in <A HREF="46-1.html#idx995">46.1 Extensions</A>]<BR>
+standard iostreams, differences of this implementation [in <A HREF="46-1.html#idx995">46.1 Extensions</A>]<BR>
file descriptors [in <A HREF="46-1.html#idx996">46.1.1 File Descriptors</A>]<BR>
multithreading [in <A HREF="46-1.html#idx997">46.1.2 Multithreaded Environments</A>]<BR>
standard iostreams<BR>
Modified: incubator/stdcxx/branches/4.2.0/etc/config/GNUmakefile.cfg
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/etc/config/GNUmakefile.cfg?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/etc/config/GNUmakefile.cfg (original)
+++ incubator/stdcxx/branches/4.2.0/etc/config/GNUmakefile.cfg Tue Jun 26 16:58:07 2007
@@ -278,7 +278,9 @@
# check compiler, linker, and run environment's sanity, determine
# system (or compiler) architecture (word size, address size, etc.)
sane:
- @(echo; echo "configuring for $(CCNAME) on $(PLATFORM)"; echo; \
+ @(echo; \
+ echo "configuring stdcxx $(LIBVER) for $(CCNAME) on $(PLATFORM)"; \
+ echo; \
rm -f a.out ; \
echo "int main () { return 0; }" | tee a.cpp >>$(LOGFILE) ; \
printf "%-50.50s " "checking if the compiler is sane"; \
@@ -306,10 +308,10 @@
clean:
@rm -f a.out core *.o *.i *.ii *.ti vars.sh \
- *$(LIBSUFFIX) $(LOGFILE) $(TARGET)
+ *$(LIBSUFFIX) $(TARGET)
realclean: clean
- rm -f *.d a.cpp config.h
+ rm -f *.d *.o *.a *.so a.cpp
listtarget:
@echo $(TARGET)
Modified: incubator/stdcxx/branches/4.2.0/etc/config/GNUmakefile.exm
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/etc/config/GNUmakefile.exm?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/etc/config/GNUmakefile.exm (original)
+++ incubator/stdcxx/branches/4.2.0/etc/config/GNUmakefile.exm Tue Jun 26 16:58:07 2007
@@ -21,7 +21,9 @@
INCLUDES += -I$(EXMDIR)/include
-RUNFLAGS += -d $(EXMDIR)
+RUNFLAGS += -d $(EXMDIR) --ulimit=as:268435456
+# No example should use more than 256MB of memory (Related to STDCXX-440).
+# The magic number 268435456 is 256MB in bytes.
ifneq ($(RPATH),)
LDFLAGS += $(RPATH)$(LIBDIR)
Modified: incubator/stdcxx/branches/4.2.0/etc/config/GNUmakefile.lib
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/etc/config/GNUmakefile.lib?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/etc/config/GNUmakefile.lib (original)
+++ incubator/stdcxx/branches/4.2.0/etc/config/GNUmakefile.lib Tue Jun 26 16:58:07 2007
@@ -20,7 +20,12 @@
LIBLINK := $(LIBNAME)
ifeq ($(findstring shared,$(BUILDMODE)),shared)
- LIB := $(LIBLINK).$(LIBVER)
+ ifneq ($(LIBSUFFIX),.dll)
+ LIB := $(LIBLINK).$(LIBVER)
+ else
+ # on Cygwin use name libstd${BUILDTYPE}-X.Y.Z.dll
+ LIB := $(basename $(LIBLINK))-$(LIBVER)$(LIBSUFFIX)
+ endif
TARGET := $(LIB) $(LIBLINK)
else
LIB := $(LIBLINK)
Modified: incubator/stdcxx/branches/4.2.0/etc/config/GNUmakefile.tst
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/etc/config/GNUmakefile.tst?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/etc/config/GNUmakefile.tst (original)
+++ incubator/stdcxx/branches/4.2.0/etc/config/GNUmakefile.tst Tue Jun 26 16:58:07 2007
@@ -70,7 +70,9 @@
LDFLAGS += $(RPATH)$(LIBDIR):$(BUILDDIR)/rwtest
endif
-RUNFLAGS += --compat -x "--compat -O -"
+RUNFLAGS += --compat -x "--compat -O -" --ulimit=as:1073741824
+# No test should use more than 1 GB of memory (See STDCXX-440).
+# The magic number 1073741824 is 1 GB in bytes.
##############################################################################
# TARGETS
Modified: incubator/stdcxx/branches/4.2.0/etc/config/acc.config
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/etc/config/acc.config?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/etc/config/acc.config (original)
+++ incubator/stdcxx/branches/4.2.0/etc/config/acc.config Tue Jun 26 16:58:07 2007
@@ -8,7 +8,8 @@
CXX = aCC
-CCVER := $(shell $(CXX) -V 2>&1 | awk '{ print $$6 }')
+CCVER := $(shell $(CXX) -V 2>&1 \
+ | sed "s/.* \(A\.[0-9][0-9]*\.[0-9][0-9]\) .*/\1/")
aCC_MAJOR := $(shell echo $(CCVER) | sed "s/[^.]*\.\([0-9]*\)\..*/\1/")
aCC_MINOR := $(shell echo $(CCVER) | sed "s/[^.]*\.[^.]*\.\([0-9]*\)/\1/")
@@ -35,6 +36,23 @@
# 2401 destructor for base class %t is not virtual
# 2487 inline %n cannot be explicitly instantiated
+ ifeq ($(shell [ $(aCC_MINOR) -gt 10 ] && echo 1),1)
+
+# 4227 padding struct with N bytes to align member
+# 4229 64 bit migration: conversion from "long" to "int" may truncate value
+# 4231 64 bit migration: conversion between types of different sizes
+# 4235 conversion from "T" to "U" may lose significant bits
+# 4237 type cast from "T" to "U" may cause sign extension
+# 4249 64 bit migration: value could be truncated before cast
+# 4255 padding size of struct with N bytes to alignment boundary
+# 4272 conversion from "T" to "unsigned T" may lose sign
+# 4284 operator= does not return reference to *this
+# 4285 operator= does not have a check for the source and destination
+# 4286 return non-const handle to non-public data member
+
+ WARNFLAGS += +W4227 +W4229 +W4231 +W4235 +W4237 +W4249 \
+ +W4255 +W4272 +W4284 +W4285 +W4286
+ endif # aCC > 6.10
endif # aCC 6.x
ifeq ($(shell [ $(aCC_MAJOR) -ge 6 -o $(aCC_MINOR) -ge 38 ] && echo 1),1)
Modified: incubator/stdcxx/branches/4.2.0/etc/config/eccp.config
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/etc/config/eccp.config?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/etc/config/eccp.config (original)
+++ incubator/stdcxx/branches/4.2.0/etc/config/eccp.config Tue Jun 26 16:58:07 2007
@@ -10,6 +10,11 @@
ECCP_MAJOR := $(shell echo "$(CCVER)" | sed -n "s/^\([^\.]*\).*/\1/p")
ECCP_MINOR := $(shell echo "$(CCVER)" | sed -n "s/^.*\.\([0-9]*\).*/\1/p")
+ifeq ($(BUILDDIR),)
+ # set to the CWD when not defined
+ BUILDDIR=$(shell pwd)/build
+endif
+
ifeq ($(ECCP_MAJOR),2)
CPPFLAGS = -I$(TOPDIR)/include/ansi --incl_suffixes ::
CXXFLAGS = -A -B -x
Modified: incubator/stdcxx/branches/4.2.0/etc/config/gcc.config
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/etc/config/gcc.config?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/etc/config/gcc.config (original)
+++ incubator/stdcxx/branches/4.2.0/etc/config/gcc.config Tue Jun 26 16:58:07 2007
@@ -6,12 +6,12 @@
#
##############################################################################
-CXX = gcc
-CCVER := $(shell $(CXX) -dumpversion | sed "s/[^0-9]*\([0-9.]*\).*/\1/g")
+CXX = gcc
+CCVER := $(shell $(CXX) -dumpversion | sed "s/[^0-9]*\([0-9.]*\).*/\1/g")
# determine the major version of gcc
-CXX_MAJOR := $(shell echo "$(CCVER)" | sed "s/^\([1-9][0-9]*\).*/\1/")
-CXX_MINOR := $(shell echo "$(CCVER)" | sed "s/[1-9]*\.\([0-9]*\).*/\1/")
+CXX_MAJOR := $(shell echo "$(CCVER)" | sed "s/^\([1-9][0-9]*\).*/\1/")
+CXX_MINOR := $(shell echo "$(CCVER)" | sed "s/[1-9]*\.\([0-9]*\).*/\1/")
# determine the major and minor version of the OS on AIX
ifeq ($(OSNAME),AIX)
@@ -20,25 +20,25 @@
endif
# -W and -Wextra are the same
-WARNFLAGS = -W -Wall -Wcast-qual -Winline -Wshadow -Wwrite-strings
+WARNFLAGS = -W -Wall -Wcast-qual -Winline -Wshadow -Wwrite-strings
# -Wno-long-long not available prior to 2.90
-ifeq ($(shell [ $(CXX_MAJOR) -gt 2 -o $(CXX_MAJOR) -eq 2 -a $(CXX_MINOR) -ge 90 ] && echo 1), 1)
-WARNFLAGS += -Wno-long-long
+ifeq ($(shell [ $(CXX_MAJOR) -gt 2 -o $(CXX_MAJOR) -eq 2 \
+ -a $(CXX_MINOR) -ge 90 ] && echo 1), 1)
+ WARNFLAGS += -Wno-long-long
endif # gcc >= 2.90
# prevent (bogus?) warnings on SunOS
ifneq ($(OSNAME),SunOS)
-WARNFLAGS += -Wcast-align
+ WARNFLAGS += -Wcast-align
else
-# prevent gcc 3.x warnings about #pragma ident on SunOS
-ifeq ($(CXX_MAJOR),3)
-ifeq ($(shell expr $(CXX_MINOR) \< 4),1)
-WARNFLAGS += -Wno-unknown-pragmas
-endif # gcc < 3.4
-endif # gcc == 3.x
-
+ # prevent gcc 3.x warnings about #pragma ident on SunOS
+ ifeq ($(CXX_MAJOR),3)
+ ifeq ($(shell expr $(CXX_MINOR) \< 4),1)
+ WARNFLAGS += -Wno-unknown-pragmas
+ endif # gcc < 3.4
+ endif # gcc == 3.x
endif # !SunOS
# do not enable -Wunreachable-code: it's useless the way implemented
@@ -47,12 +47,14 @@
# endif # gcc > 3.3
-DEPENDFLAGS = -M
+DEPENDFLAGS = -M
# avoid adding -FPIC on IBM AIX and Cygwin where
# gcc generated code is always position independent
-ifeq (,$(findstring |$(OSNAME)|,|AIX|CYGWIN|))
- PICFLAGS = -fPIC
+ifeq (,$(findstring AIX,$(OSNAME)))
+ ifeq (,$(findstring CYGWIN,$(OSNAME)))
+ PICFLAGS = -fPIC
+ endif
endif
ifeq ($(OSNAME),SunOS)
@@ -62,44 +64,53 @@
endif
ifneq ($(MAPFLAGS),)
- # path to mapfile (relative to $(TOPDIR)) for symbol versioning
- ifneq ($(CXX_MAJOR),2)
- MAPFILE = src/mapfile.$(CXX)
- else
- # gcc 2.x implements a different ABI than gcc 3
- MAPFILE = src/mapfile.$(CXX)-$(CXX_MAJOR)
- endif
+ # path to mapfile (relative to $(TOPDIR)) for symbol versioning
+ ifneq ($(CXX_MAJOR),2)
+ MAPFILE = src/mapfile.$(CXX)
+ else
+ # gcc 2.x implements a different ABI than gcc 3
+ MAPFILE = src/mapfile.$(CXX)-$(CXX_MAJOR)
+ endif
endif
ifneq ($(OSNAME),Darwin)
- # no -shared option for GCC on Mac OS X (Darwin)
- LDSOFLAGS = -shared
+ # no -shared option for GCC on Mac OS X (Darwin)
+ LDSOFLAGS = -shared
else
- # -dynamiclib is needed when linking the library
- LDSOFLAGS = -dynamiclib
+ # -dynamiclib is needed when linking the library
+ LDSOFLAGS = -dynamiclib
endif
# -fPIC needed both to compile and link shared libs on HP-UX 11
ifeq ($(OSNAME),HP-UX)
-LDSOFLAGS += -fPIC
+ LDSOFLAGS += -fPIC
+endif
+
+ifeq ($(CXX_MAJOR),3)
+ ifeq ($(shell [ $(CXX_MINOR) -lt 4 ] && echo 1),1)
+ # for gcc 3 prior to gcc 3.4 force linking with libgcc_s.so
+ # and avoid linking with libgcc_s.a to get stack unwinding
+ # due to exceptions right (see STDCXX-369)
+ LDSOFLAGS += -shared-libgcc
+ endif
endif
-CXXFLAGS = -pedantic -nostdinc++
+CXXFLAGS = -pedantic -nostdinc++
ifeq ($(CXX_MAJOR),2)
-ifeq ($(shell expr $(CXX_MINOR) / 10),9)
-CXXFLAGS += -fhonor-std -ftemplate-depth-32
-else
-CXXFLAGS += -ftemplate-depth-32
-endif
+ ifeq ($(shell expr $(CXX_MINOR) / 10),9)
+ CXXFLAGS += -fhonor-std -ftemplate-depth-32
+ else
+ CXXFLAGS += -ftemplate-depth-32
+ endif
endif
ifeq ($(OSNAME),IRIX64)
ifeq ($(CXX_MAJOR),2)
- # prevent (some) assembler errors caused by overly long symbol names
- # (the option is not supported in gcc 3 and beyond)
- CXXFLAGS += -fsquangle
+ # prevent (some) assembler errors caused by overly long symbol
+ # names (the option is not supported in gcc 3 and beyond)
+ CXXFLAGS += -fsquangle
endif
# disable ld warnings about libs not used to resolve any symbols
@@ -108,59 +119,59 @@
# prevent (some) assemler errors caused by overly long symbol names
ifeq ($(OSNAME),OSF1)
-CXXFLAGS += -fsquangle
+ CXXFLAGS += -fsquangle
endif
-CXXPRELINK =
+CXXPRELINK =
# enable C++ C library headers (the <cname> kind)
-CPPFLAGS = -I$(TOPDIR)/include/ansi
+CPPFLAGS = -I$(TOPDIR)/include/ansi
# decrease warning level to prevent annoying linker warnings
# about duplicate symbols (the linker has no concept of weak symbols)
ifeq ($(OSNAME),AIX)
- LDFLAGS = -Wl,-bh:5
+ LDFLAGS = -Wl,-bh:5
endif
ifneq ($(CXX_MAJOR),2)
- # gcc 3.x needs to explicitly link with libsupc++ for language support
- # g++ 3.x links with it as well as libstdc++ automatically
- LDLIBS = -lsupc++
-
- ifeq ($(OSNAME),Darwin)
- # link with gcc_eh to resolve the _Unwind_xxx functions
- # (shouldn't we link with it on all platforms?)
- LDLIBS += -lgcc_eh
- endif
+ # gcc 3.x needs to explicitly link with libsupc++ for language support
+ # g++ 3.x links with it as well as libstdc++ automatically
+ LDLIBS = -lsupc++
+
+ ifeq ($(OSNAME),Darwin)
+ # link with gcc_eh to resolve the _Unwind_xxx functions
+ # (shouldn't we link with it on all platforms?)
+ LDLIBS += -lgcc_eh
+ endif
endif # gcc > 2
# The flag(s) to use to embed a library search path into generated executables.
ifeq ($(OSNAME),Linux)
- RPATH = -Wl,-R
-else
- ifeq ($(OSNAME),SunOS)
RPATH = -Wl,-R
- else
- ifeq ($(OSNAME),AIX)
- ifeq ($(shell [ $(OS_MAJOR) -gt 5 -o $(OS_MAJOR) -eq 5 -a $(OS_MINOR) \
--ge 3 ] && echo 1), 1)
- # -bsrv4, -R only available on AIX 5.3 and newer
- RPATH = -Wl,-bsvr4,-R
- endif
+else
+ ifeq ($(OSNAME),SunOS)
+ RPATH = -Wl,-R
else
- ifeq ($(OSNAME),HP-UX)
- RPATH = -Wl,+b
- else
- ifeq ($(OSNAME),IRIX64)
- RPATH = -Wl,-rpath,
+ ifeq ($(OSNAME),AIX)
+ ifeq ($(shell [ $(OS_MAJOR) -gt 5 -o $(OS_MAJOR) -eq 5 \
+ -a $(OS_MINOR) -ge 3 ] && echo 1), 1)
+ # -bsrv4, -R only available on AIX 5.3 and newer
+ RPATH = -Wl,-bsvr4,-R
+ endif
else
- ifeq ($(OSNAME),OSF1)
- RPATH = -Wl,-rpath,
- endif
+ ifeq ($(OSNAME),HP-UX)
+ RPATH = -Wl,+b
+ else
+ ifeq ($(OSNAME),IRIX64)
+ RPATH = -Wl,-rpath,
+ else
+ ifeq ($(OSNAME),OSF1)
+ RPATH = -Wl,-rpath,
+ endif
+ endif
+ endif
endif
- endif
endif
- endif
endif
# debug/optimization options
@@ -176,19 +187,19 @@
SHARED_LDFLAGS =
ifeq ($(OSNAME),AIX)
- SHARED_SUFFIX = .a
+ SHARED_SUFFIX = .a
endif
ifeq ($(OSNAME),HP-UX)
- SHARED_SUFFIX = .sl
+ SHARED_SUFFIX = .sl
endif
ifeq ($(OSNAME),Darwin)
- SHARED_SUFFIX = .dylib
+ SHARED_SUFFIX = .dylib
endif
ifneq ($(findstring CYGWIN,$(OSNAME)),)
- SHARED_SUFFIX = .dll
+ SHARED_SUFFIX = .dll
endif
STATIC_CXXFLAGS =
@@ -201,32 +212,32 @@
# the same option is named -pthreads on Solaris
ifeq ($(findstring CYGWIN,$(OSNAME)),)
- ifeq ($(OSNAME),SunOS)
- MULTI_CPPFLAGS_POSIX = -pthreads
- MULTI_LDFLAGS_POSIX = -pthreads
- else
- ifeq ($(OSNAME),IRIX64)
- # no -pthreads option (or similar) on IRIX?
- MULTI_CPPFLAGS_POSIX = -D_REENTRANT
- MULTI_LDFLAGS_POSIX = -lpthread
+ ifeq ($(OSNAME),SunOS)
+ MULTI_CPPFLAGS_POSIX = -pthreads
+ MULTI_LDFLAGS_POSIX = -pthreads
else
- # option doesn't exist in Darwin gcc
- ifneq ($(OSNAME),Darwin)
- MULTI_CPPFLAGS_POSIX = -pthread
- MULTI_LDFLAGS_POSIX = -pthread
- endif
+ ifeq ($(OSNAME),IRIX64)
+ # no -pthreads option (or similar) on IRIX?
+ MULTI_CPPFLAGS_POSIX = -D_REENTRANT
+ MULTI_LDFLAGS_POSIX = -lpthread
+ else
+ # option doesn't exist in Darwin gcc
+ ifneq ($(OSNAME),Darwin)
+ MULTI_CPPFLAGS_POSIX = -pthread
+ MULTI_LDFLAGS_POSIX = -pthread
+ endif
+ endif
endif
- endif
else
- # on Cygwin use MingW-threads by default
- MULTI_CPPFLAGS_POSIX = -mthreads
- MULTI_LDFLAGS_POSIX = -mthreads
+ # on Cygwin use MingW-threads by default
+ MULTI_CPPFLAGS_POSIX = -mthreads
+ MULTI_LDFLAGS_POSIX = -mthreads
- # link with libcatgets and libiconv
- LDLIBS += -lcatgets -liconv
+ # link with libcatgets and libiconv
+ LDLIBS += -lcatgets -liconv
- # set the assembler file suffix to .s
- AS_EXT = .s
+ # set the assembler file suffix to .s
+ AS_EXT = .s
endif
MULTI_CPPFLAGS_SOLARIS = -threads
@@ -248,39 +259,39 @@
arch=$(shell uname -p 2>/dev/null)
ifeq ($(arch),ia64)
- # LP64 is the default (implicit) setting on IA64
- ifeq ($(OSNAME),HP-UX)
- # -milp32, -mlp64, etc. are options specific to HP-UX
- CXXFLAGS.narrow = -milp32
- LDFLAGS.narrow = -milp32
- LDSOFLAGS.narrow = -milp32
- ARFLAGS.narrow =
- endif
+ # LP64 is the default (implicit) setting on IA64
+ ifeq ($(OSNAME),HP-UX)
+ # -milp32, -mlp64, etc. are options specific to HP-UX
+ CXXFLAGS.narrow = -milp32
+ LDFLAGS.narrow = -milp32
+ LDSOFLAGS.narrow = -milp32
+ ARFLAGS.narrow =
+ endif
else
- # determine whether the default compiler invocation produces
- # wide (64-bit) or narrow (32-bit) code and set compiler,
- # linker, and other flags accordingly
- wide = $(shell tmpfile=/tmp/longsize-$$; export tmpfile; \
- echo "int main() { return 8 == sizeof (long); }" \
- > $$tmpfile.c \
- && $(CXX) $$tmpfile.c >/dev/null 2>&1 -o $$tmpfile; \
- $$tmpfile; echo $$?; rm -f $$tmpfile.c $$tmpfile)
-
- ifeq ($(wide),0)
- # wide (64-bit) flags
- CXXFLAGS.wide = -m64
- LDFLAGS.wide = -m64
- LDSOFLAGS.wide = -m64
- ARFLAGS.wide =
-
- # narrow (32-bit) mode is implicit
- else
- # narrow (32-bit) flags
- CXXFLAGS.narrow = -m32
- LDFLAGS.narrow = -m32
- LDSOFLAGS.narrow = -m32
- ARFLAGS.narrow =
+ # determine whether the default compiler invocation produces
+ # wide (64-bit) or narrow (32-bit) code and set compiler,
+ # linker, and other flags accordingly
+ wide = $(shell tmpfile=/tmp/longsize-$$; export tmpfile; \
+ echo "int main() { return 8 == sizeof (long); }" \
+ > $$tmpfile.c \
+ && $(CXX) $$tmpfile.c >/dev/null 2>&1 -o $$tmpfile; \
+ $$tmpfile; echo $$?; rm -f $$tmpfile.c $$tmpfile)
+
+ ifeq ($(wide),0)
+ # wide (64-bit) flags
+ CXXFLAGS.wide = -m64
+ LDFLAGS.wide = -m64
+ LDSOFLAGS.wide = -m64
+ ARFLAGS.wide =
- # wide (64-bit) mode is implicit
- endif
+ # narrow (32-bit) mode is implicit
+ else
+ # narrow (32-bit) flags
+ CXXFLAGS.narrow = -m32
+ LDFLAGS.narrow = -m32
+ LDSOFLAGS.narrow = -m32
+ ARFLAGS.narrow =
+
+ # wide (64-bit) mode is implicit
+ endif
endif
Modified: incubator/stdcxx/branches/4.2.0/etc/config/makefile.rules
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/etc/config/makefile.rules?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/etc/config/makefile.rules (original)
+++ incubator/stdcxx/branches/4.2.0/etc/config/makefile.rules Tue Jun 26 16:58:07 2007
@@ -105,16 +105,42 @@
# a report (set to ALL to run all executables)
# hung or runaway processes are killed after a customizable timeout period
#
+# to avoid filling up disk space with junk files left behind by bad programs
+# creates and sets TMP to a temporary directory before running the programs
+# which is then removed when done
+#
# PlumHall specific:
# for all "top level" tests that failed to build, find and build all
# subtests (the little tests the main test consists of)
+ifneq ($(LIBSUFFIX),.dll)
+
run runall run_all: $(BINDIR)/exec
@(LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(LIBDIR); \
PATH=$$PATH:.; \
TOPDIR=$(TOPDIR); \
- export LD_LIBRARY_PATH PATH TOPDIR; \
+ TMP=$${TMP:-/tmp}/stdcxx-run-$$$$; \
+ export TMP; \
+ export LD_LIBRARY_PATH PATH TMP TOPDIR; \
+ trap "rm -rf $$TMP" HUP INT QUIT TERM EXIT; \
+ mkdir -p $$TMP; \
./run $(RUNFLAGS) $(RUNTARGET); \
exit 0)
+
+else
+# on Cygwin add $(LIBDIR) to PATH
+run runall run_all: $(BINDIR)/exec
+ @(LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(LIBDIR); \
+ PATH=$$PATH:$(LIBDIR):.; \
+ TOPDIR=$(TOPDIR); \
+ TMP=$${TMP:-/tmp}/stdcxx-run-$$$$; \
+ export TMP; \
+ export LD_LIBRARY_PATH PATH TMP TOPDIR; \
+ trap "rm -rf $$TMP" HUP INT QUIT TERM EXIT; \
+ mkdir -p $$TMP; \
+ ./run $(RUNFLAGS) $(RUNTARGET); \
+ exit 0)
+
+endif
# include the automatically generated dependencies unless "clean"
# or similar is one of the targets
Modified: incubator/stdcxx/branches/4.2.0/etc/config/run_locale_utils.sh
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/etc/config/run_locale_utils.sh?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/etc/config/run_locale_utils.sh (original)
+++ incubator/stdcxx/branches/4.2.0/etc/config/run_locale_utils.sh Tue Jun 26 16:58:07 2007
@@ -47,12 +47,21 @@
##############################################################################
-if [ "`uname`" = "OSF1" -a "$BIN_SH" != "xpg4" ]; then
+OSNAME=`uname`
+
+if [ "$OSNAME" = "OSF1" -a "$BIN_SH" != "xpg4" ]; then
# make getopts work on Tru64 by setting the BIN_SH variable
# and re-executing self with the same command line arguments
BIN_SH=xpg4
export BIN_SH
exec $0 $*
+elif [ "$OSNAME" = "AIX" -a -z "$BASH_VERSION" ]; then
+ # use an alternate shell to work around a bug (?) in the AIX system
+ # shell that prevents it from trapping SIGHUP (and invoking the signal
+ # handler)
+ if [ -x /bin/bash ]; then
+ exec /bin/bash $0 $*
+ fi
fi
@@ -374,6 +383,13 @@
dump_charmap $stage_1/$fname $stage_1/charmaps/$charmap
dump_locale $stage_1/$fname $stage_1/$source.src
+ if [ -z "$no_clean" ]; then
+ # remove stage 1 locale to free up disk space but keep
+ # the text dumps for later processing
+ debug_output "rm $stage_1/$fname"
+ rm $stage_1/$fname
+ fi
+
# create a directory for stage 2 charmap source files
debug_output "mkdir -p $stage_2/charmaps"
mkdir -p $stage_2/charmaps
@@ -404,6 +420,13 @@
dump_charmap $stage_2/$fname $stage_2/charmaps/$charmap
dump_locale $stage_2/$fname $stage_2/$source.src
+ if [ -z "$no_clean" ]; then
+ # remove stage 2 locale to free up disk space but keep
+ # the text dumps for later processing
+ debug_output "rm $stage_2/$fname"
+ rm $stage_2/$fname
+ fi
+
assertions=`expr $assertions + 1`
# create a directory for stage 2 charmap source files
@@ -434,6 +457,13 @@
dump_charmap $stage_3/$fname $stage_3/charmaps/$charmap
dump_locale $stage_3/$fname $stage_3/$source.src
+ if [ -z "$no_clean" ]; then
+ # remove stage 3 locale to free up disk space but keep
+ # the text dumps for later processing
+ debug_output "rm $stage_3/$fname"
+ rm $stage_3/$fname
+ fi
+
assertions=`expr $assertions + 1`
# verify that stage 1 and stage 2 charmaps are the same
@@ -466,10 +496,10 @@
failedassertions=`expr $failedassertions + 1`
fi
- if [ "$no_clean" = "" ]; then
+ if [ -z "$no_clean" ]; then
# clean up
debug_output "rm -rf $stage_1 $stage_2 $stage_3"
- rm -rf rm -rf $stage_1 $stage_2 $stage_3
+ rm -rf $stage_1 $stage_2 $stage_3
fi
}
@@ -478,17 +508,20 @@
#
cleanup ()
{
- if [ "$no_clean" = "" ]; then
+ if [ -z "$no_clean" ]; then
# clean up
debug_output "rm -rf $tmpdir"
rm -rf $tmpdir
fi
+
+ exit
}
##############################################################################
# Main code
##############################################################################
+
## assertions
assertions=0
failedassertions=0
@@ -503,10 +536,6 @@
nlsdir=""
locdir=""
-## Temporary (working) directory
-[ -z "$TMP" ] && TMP="/tmp";
-tmpdir=$TMP/locale.$$
-
## Get the options from the command line
while getopts ":nsfdb:i:l:O:L:M:C:D:" opt_name; do
case $opt_name in
@@ -526,6 +555,14 @@
exit 1;;
esac;
done
+
+## set temporary (working) directory
+if [ -z "$TMP" ]; then
+ TMP="/tmp";
+ export TMP;
+fi
+
+tmpdir=$TMP/${locale_db:-unnamed-locale}.$$
## Actual test
if [ "$chk_sanity" = "yes" ]; then
Modified: incubator/stdcxx/branches/4.2.0/etc/config/src/GLOBAL_BAD_ALLOC.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/etc/config/src/GLOBAL_BAD_ALLOC.cpp?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/etc/config/src/GLOBAL_BAD_ALLOC.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/etc/config/src/GLOBAL_BAD_ALLOC.cpp Tue Jun 26 16:58:07 2007
@@ -2,10 +2,17 @@
#include "config.h"
+#if !defined (_RWSTD_NO_NEW_THROWS) && !defined (_RWSTD_NO_NEW_OFLOW_SAFE)
+# include <stddef.h> // for size_t
+#endif // !_RWSTD_NO_NEW_THROWS && !_RWSTD_NO_NEW_OFLOW_SAFE
+
#ifndef _RWSTD_NO_SETRLIMIT
-# include <sys/resource.h> // for setrlimit()
+// test for setrlimit() presence before compiling current file
#endif
+// proclimits.h must be included only after #if[n]def _RWSTD_NO_SETRLIMIT
+#include "proclimits.h"
+
#ifndef _RWSTD_NO_HONOR_STD
# ifdef _RWSTD_NO_STD_TERMINATE
@@ -63,19 +70,14 @@
#ifndef _RWSTD_NO_NEW_THROWS
# ifndef _RWSTD_NO_NEW_OFLOW_SAFE
- void *p = ::operator new ((unsigned long)-1);
+ void *p = ::operator new (size_t (-1));
if (!p)
return 1;
# else // if defined (_RWSTD_NO_NEW_OFLOW_SAFE)
-#ifndef _RWSTD_NO_SETRLIMIT
-
- struct rlimit rl = { 0, 0 };
- setrlimit (RLIMIT_DATA, &rl);
-
-#endif // _RWSTD_NO_SETRLIMIT
+ limit_memory (0);
for (unsigned long n = 1UL << (sizeof (long) * 8 - 1);
0 != n; n |= (n >> 1)) {
Modified: incubator/stdcxx/branches/4.2.0/etc/config/src/LOCALE_NAME_FMAT.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/etc/config/src/LOCALE_NAME_FMAT.cpp?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/etc/config/src/LOCALE_NAME_FMAT.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/etc/config/src/LOCALE_NAME_FMAT.cpp Tue Jun 26 16:58:07 2007
@@ -19,6 +19,9 @@
#undef strcat
+#include "locale_names.h" // for test_locale_names
+
+
// the longest combined locale name handled by the test (GNU glibc
// can generate some awfully long names since in addition to the
// name of the locale name for each category it includes the name
@@ -683,785 +686,3 @@
return 0;
}
-
-/*********************************************************************/
-
-const char* const test_locale_names[] = {
- "ar", "ar_EG.UTF-8", "bg_BG", "bg_BG.ISO8859-5", "ca", "ca_ES",
-
-
- "C.iso88591",
- "C.iso885915",
- "C.utf8",
- "DE_AT",
- "DE_AT.UTF-8",
- "DE_AT.UTF-8@euro",
- "DE_AT@euro",
- "DE_CH",
- "DE_CH.UTF-8",
- "DE_DE",
- "DE_DE.UTF-8",
- "DE_DE.UTF-8@euro",
- "DE_DE@euro",
- "DE_LU",
- "DE_LU.UTF-8",
- "DE_LU.UTF-8@euro",
- "DE_LU@euro",
- "De_CH",
- "De_CH.IBM-850",
- "De_DE",
- "De_DE.IBM-850",
- "FR_BE",
- "FR_BE.UTF-8",
- "FR_BE.UTF-8@euro",
- "FR_BE@euro",
- "FR_CA",
- "FR_CA.UTF-8",
- "FR_CH",
- "FR_CH.UTF-8",
- "FR_FR",
- "FR_FR.UTF-8",
- "FR_FR.UTF-8@euro",
- "FR_FR@euro",
- "FR_LU",
- "FR_LU.UTF-8",
- "FR_LU.UTF-8@euro",
- "FR_LU@euro",
- "Fr_BE",
- "Fr_BE.IBM-850",
- "Fr_CA",
- "Fr_CA.IBM-850",
- "Fr_CH",
- "Fr_CH.IBM-850",
- "Fr_FR",
- "Fr_FR.IBM-850",
- "JA_JP",
- "JA_JP.UTF-8",
- "Ja_JP",
- "Ja_JP.IBM-932",
- "Ja_JP.IBM-943",
- "af_ZA",
- "ar",
- "ar_AE",
- "ar_AE.utf8",
- "ar_BH",
- "ar_BH.utf8",
- "ar_DZ",
- "ar_DZ.arabic8",
- "ar_DZ.utf8",
- "ar_EG",
- "ar_EG.UTF-8",
- "ar_EG.utf8",
- "ar_IN",
- "ar_IQ",
- "ar_IQ.utf8",
- "ar_JO",
- "ar_JO.utf8",
- "ar_KW",
- "ar_KW.utf8",
- "ar_LB",
- "ar_LB.utf8",
- "ar_LY",
- "ar_LY.utf8",
- "ar_MA",
- "ar_MA.utf8",
- "ar_OM",
- "ar_OM.utf8",
- "ar_QA",
- "ar_QA.utf8",
- "ar_SA",
- "ar_SA.arabic8",
- "ar_SA.iso88596",
- "ar_SA.utf8",
- "ar_SD",
- "ar_SD.utf8",
- "ar_SY",
- "ar_SY.utf8",
- "ar_TN",
- "ar_TN.utf8",
- "ar_YE",
- "ar_YE.utf8",
- "be_BY",
- "be_BY.utf8",
- "bg_BG",
- "bg_BG.ISO8859-5",
- "bg_BG.iso88595",
- "bg_BG.utf8",
- "bokmal",
- "bokmål",
- "br",
- "br_FR",
- "bs_BA",
- "ca",
- "ca_ES",
- "ca_ES.ISO8859-1",
- "ca_ES.ISO8859-15",
- "ca_ES.ISO8859-15@euro",
- "ca_ES.utf8",
- "ca_ES.utf8@euro",
- "ca_ES@euro",
- "catalan",
- "chinese",
- "common",
- "croatian",
- "cs",
- "cs.po",
- "cs_CZ",
- "cs_CZ.ISO8859-2",
- "cs_CZ.iso88592",
- "cs_CZ.utf8",
- "cy_GB",
- "cz",
- "czech",
- "da",
- "da.ISO8859-15",
- "da.po",
- "da_DK",
- "da_DK.ISO8859-1",
- "da_DK.ISO8859-15",
- "da_DK.ISO8859-15@euro",
- "da_DK.UTF-8",
- "da_DK.iso88591",
- "da_DK.iso885915@euro",
- "da_DK.roman8",
- "da_DK.utf8",
- "danish",
- "dansk",
- "de",
- "de.ISO8859-15",
- "de.UTF-8",
- "de.po",
- "de_AT",
- "de_AT.8859-15",
- "de_AT.8859-15@euro",
- "de_AT.ISO8859-1",
- "de_AT.ISO8859-15",
- "de_AT.ISO8859-15@euro",
- "de_AT.utf8",
- "de_AT.utf8@euro",
- "de_AT@euro",
- "de_BE",
- "de_BE.utf8",
- "de_BE.utf8@euro",
- "de_BE@euro",
- "de_CH",
- "de_CH.8859-15",
- "de_CH.ISO8859-1",
- "de_CH.ISO8859-15",
- "de_CH.utf8",
- "de_DE",
- "de_DE.8859-15",
- "de_DE.8859-15@euro",
- "de_DE.IBM-1252",
- "de_DE.IBM-1252@euro",
- "de_DE.ISO8859-1",
- "de_DE.ISO8859-15",
- "de_DE.ISO8859-15@euro",
- "de_DE.UTF-8",
- "de_DE.UTF-8@euro",
- "de_DE.iso88591",
- "de_DE.iso885915@euro",
- "de_DE.roman8",
- "de_DE.utf8",
- "de_DE.utf8@euro",
- "de_DE@euro",
- "de_LU",
- "de_LU.8859-15",
- "de_LU.8859-15@euro",
- "de_LU.utf8",
- "de_LU.utf8@euro",
- "de_LU@euro",
- "deutsch",
- "dk",
- "dutch",
- "eesti",
- "el",
- "el.sun_eu_greek",
- "el_GR",
- "el_GR.ISO8859-7",
- "el_GR.ISO8859-7@euro",
- "el_GR.greek8",
- "el_GR.iso88597",
- "el_GR.utf8",
- "en",
- "en_AU",
- "en_AU.ISO8859-1",
- "en_AU.ISO8859-15",
- "en_AU.utf8",
- "en_BW",
- "en_BW.utf8",
- "en_CA",
- "en_CA.ISO8859-1",
- "en_CA.ISO8859-15",
- "en_CA.utf8",
- "en_DK",
- "en_DK.utf8",
- "en_EU.UTF-8@euro",
- "en_GB",
- "en_GB.ISO8859-1",
- "en_GB.ISO8859-15",
- "en_GB.ISO8859-15@euro",
- "en_GB.UTF-8",
- "en_GB.iso88591",
- "en_GB.iso885915@euro",
- "en_GB.roman8",
- "en_GB.utf8",
- "en_HK",
- "en_HK.utf8",
- "en_IE",
- "en_IE.ISO8859-1",
- "en_IE.ISO8859-15",
- "en_IE.ISO8859-15@euro",
- "en_IE.utf8",
- "en_IE.utf8@euro",
- "en_IE@euro",
- "en_IN",
- "en_NZ",
- "en_NZ.ISO8859-1",
- "en_NZ.utf8",
- "en_PH",
- "en_PH.utf8",
- "en_RN",
- "en_SG",
- "en_SG.utf8",
- "en_UK",
- "en_US",
- "en_US.8859-15",
- "en_US.ISO8859-1",
- "en_US.ISO8859-15",
- "en_US.ISO8859-15@euro",
- "en_US.UTF-8",
- "en_US.UTF-8@euro",
- "en_US.cp850",
- "en_US.iso88591",
- "en_US.roman8",
- "en_US.utf8",
- "en_ZA",
- "en_ZA.utf8",
- "en_ZW",
- "en_ZW.utf8",
- "eo",
- "es",
- "es.ISO8859-15",
- "es.UTF-8",
- "es.po",
- "es_AR",
- "es_AR.ISO8859-1",
- "es_AR.ISO8859-15",
- "es_AR.utf8",
- "es_BO",
- "es_BO.ISO8859-1",
- "es_BO.utf8",
- "es_CL",
- "es_CL.ISO8859-1",
- "es_CL.utf8",
- "es_CO",
- "es_CO.ISO8859-1",
- "es_CO.utf8",
- "es_CR",
- "es_CR.ISO8859-1",
- "es_CR.utf8",
- "es_DO",
- "es_DO.utf8",
- "es_EC",
- "es_EC.ISO8859-1",
- "es_EC.utf8",
- "es_ES",
- "es_ES.ISO8859-1",
- "es_ES.ISO8859-15",
- "es_ES.ISO8859-15@euro",
- "es_ES.UTF-8",
- "es_ES.UTF-8@euro",
- "es_ES.iso88591",
- "es_ES.iso885915@euro",
- "es_ES.roman8",
- "es_ES.utf8",
- "es_ES.utf8@euro",
- "es_ES@euro",
- "es_GT",
- "es_GT.ISO8859-1",
- "es_GT.utf8",
- "es_HN",
- "es_HN.utf8",
- "es_MX",
- "es_MX.ISO8859-1",
- "es_MX.ISO8859-15",
- "es_MX.utf8",
- "es_NI",
- "es_NI.ISO8859-1",
- "es_NI.utf8",
- "es_PA",
- "es_PA.ISO8859-1",
- "es_PA.utf8",
- "es_PE",
- "es_PE.ISO8859-1",
- "es_PE.utf8",
- "es_PR",
- "es_PR.utf8",
- "es_PY",
- "es_PY.ISO8859-1",
- "es_PY.utf8",
- "es_SV",
- "es_SV.ISO8859-1",
- "es_SV.utf8",
- "es_US",
- "es_US.utf8",
- "es_UY",
- "es_UY.ISO8859-1",
- "es_UY.utf8",
- "es_VE",
- "es_VE.ISO8859-1",
- "es_VE.utf8",
- "estonian",
- "et",
- "et_EE",
- "et_EE.ISO8859-15",
- "et_EE.utf8",
- "eu_ES",
- "eu_ES.utf8",
- "eu_ES.utf8@euro",
- "eu_ES@euro",
- "fa_IR",
- "fi",
- "fi.ISO8859-15",
- "fi.po",
- "fi_FI",
- "fi_FI.ISO8859-1",
- "fi_FI.ISO8859-15",
- "fi_FI.ISO8859-15@euro",
- "fi_FI.UTF-8",
- "fi_FI.iso88591",
- "fi_FI.iso885915@euro",
- "fi_FI.roman8",
- "fi_FI.utf8",
- "fi_FI.utf8@euro",
- "fi_FI@euro",
- "finnish",
- "fo_FO",
- "fo_FO.utf8",
- "fr",
- "fr.ISO8859-15",
- "fr.UTF-8",
- "fr.po",
- "fr_BE",
- "fr_BE.8859-15",
- "fr_BE.8859-15@euro",
- "fr_BE.IBM-1252",
- "fr_BE.IBM-1252@euro",
- "fr_BE.ISO8859-1",
- "fr_BE.ISO8859-15",
- "fr_BE.ISO8859-15@euro",
- "fr_BE.UTF-8",
- "fr_BE.UTF-8@euro",
- "fr_BE.utf8",
- "fr_BE.utf8@euro",
- "fr_BE@euro",
- "fr_CA",
- "fr_CA.8859-15",
- "fr_CA.ISO8859-1",
- "fr_CA.ISO8859-15",
- "fr_CA.iso88591",
- "fr_CA.iso885915",
- "fr_CA.roman8",
- "fr_CA.utf8",
- "fr_CH",
- "fr_CH.8859-15",
- "fr_CH.ISO8859-1",
- "fr_CH.ISO8859-15",
- "fr_CH.utf8",
- "fr_FR",
- "fr_FR.8859-15",
- "fr_FR.8859-15@euro",
- "fr_FR.IBM-1252",
- "fr_FR.IBM-1252@euro",
- "fr_FR.ISO8859-1",
- "fr_FR.ISO8859-15",
- "fr_FR.ISO8859-15@euro",
- "fr_FR.UTF-8",
- "fr_FR.UTF-8@euro",
- "fr_FR.iso88591",
- "fr_FR.iso885915@euro",
- "fr_FR.roman8",
- "fr_FR.utf8",
- "fr_FR.utf8@euro",
- "fr_FR@euro",
- "fr_LU",
- "fr_LU.8859-15",
- "fr_LU.8859-15@euro",
- "fr_LU.utf8",
- "fr_LU.utf8@euro",
- "fr_LU@euro",
- "french",
- "ga",
- "ga_IE",
- "ga_IE.utf8",
- "ga_IE.utf8@euro",
- "ga_IE@euro",
- "galego",
- "galician",
- "german",
- "gl",
- "gl_ES",
- "gl_ES.utf8",
- "gl_ES.utf8@euro",
- "gl_ES@euro",
- "greek",
- "gv_GB",
- "gv_GB.utf8",
- "he",
- "he_IL",
- "he_IL.UTF-8",
- "he_IL.utf8",
- "hebrew",
- "hi_IN",
- "hi_IN.UTF-8",
- "hr",
- "hr_HR",
- "hr_HR.ISO8859-2",
- "hr_HR.iso88592",
- "hr_HR.utf8",
- "hrvatski",
- "hu",
- "hu_HU",
- "hu_HU.ISO8859-2",
- "hu_HU.iso88592",
- "hu_HU.utf8",
- "hungarian",
- "icelandic",
- "id_ID",
- "id_ID.utf8",
- "in",
- "in_ID",
- "is",
- "is.po",
- "is_IS",
- "is_IS.ISO8859-1",
- "is_IS.ISO8859-15",
- "is_IS.iso88591",
- "is_IS.iso885915@euro",
- "is_IS.roman8",
- "is_IS.utf8",
- "iso_8859_1",
- "iso_8859_13",
- "iso_8859_15",
- "iso_8859_2",
- "iso_8859_5",
- "iso_8859_7",
- "iso_8859_9",
- "it",
- "it.ISO8859-15",
- "it.UTF-8",
- "it_CH",
- "it_CH.ISO8859-15",
- "it_CH.utf8",
- "it_IT",
- "it_IT.ISO8859-1",
- "it_IT.ISO8859-15",
- "it_IT.ISO8859-15@euro",
- "it_IT.UTF-8",
- "it_IT.UTF-8@euro",
- "it_IT.iso88591",
- "it_IT.iso885915@euro",
- "it_IT.roman8",
- "it_IT.utf8",
- "it_IT.utf8@euro",
- "it_IT@euro",
- "italian",
- "iw_IL",
- "iw_IL.hebrew8",
- "iw_IL.iso88598",
- "iw_IL.utf8",
- "ja",
- "ja_JP",
- "ja_JP.EUC",
- "ja_JP.IBM-eucJP",
- "ja_JP.PCK",
- "ja_JP.SJIS",
- "ja_JP.SJIS@ucs4",
- "ja_JP.UTF-8",
- "ja_JP.deckanji",
- "ja_JP.deckanji@ucs4",
- "ja_JP.eucJP",
- "ja_JP.eucjp",
- "ja_JP.kana8",
- "ja_JP.sdeckanji",
- "ja_JP.ujis",
- "ja_JP.utf8",
- "japanese",
- "japanese.euc",
- "japanese.sjis",
- "ka_GE",
- "kl_GL",
- "kl_GL.utf8",
- "ko",
- "ko.UTF-8",
- "ko_KR",
- "ko_KR.EUC",
- "ko_KR.EUC@dict",
- "ko_KR.UTF-8",
- "ko_KR.UTF-8@dict",
- "ko_KR.eucKR",
- "ko_KR.euckr",
- "ko_KR.utf8",
- "korean",
- "korean.euc",
- "kw_GB",
- "kw_GB.utf8",
- "lithuanian",
- "lt",
- "lt_LT",
- "lt_LT.ISO8859-13",
- "lt_LT.utf8",
- "lv",
- "lv_LV",
- "lv_LV.ISO8859-13",
- "lv_LV.utf8",
- "mi_NZ",
- "mk",
- "mk_MK",
- "mk_MK.ISO8859-5",
- "mk_MK.utf8",
- "mr_IN",
- "ms_MY",
- "ms_MY.utf8",
- "mt_MT",
- "mt_MT.utf8",
- "nb_NO",
- "nb_NO.ISO-8859-1",
- "nl",
- "nl.ISO8859-15",
- "nl_BE",
- "nl_BE.ISO8859-1",
- "nl_BE.ISO8859-15",
- "nl_BE.ISO8859-15@euro",
- "nl_BE.UTF-8",
- "nl_BE.utf8",
- "nl_BE.utf8@euro",
- "nl_BE@euro",
- "nl_NL",
- "nl_NL.ISO8859-1",
- "nl_NL.ISO8859-15",
- "nl_NL.ISO8859-15@euro",
- "nl_NL.UTF-8",
- "nl_NL.iso88591",
- "nl_NL.iso885915@euro",
- "nl_NL.roman8",
- "nl_NL.utf8",
- "nl_NL.utf8@euro",
- "nl_NL@euro",
- "nn_NO",
- "nn_NO.utf8",
- "no",
- "no.po",
- "no@nynorsk",
- "no_NO",
- "no_NO.ISO8859-1",
- "no_NO.ISO8859-15",
- "no_NO.ISO8859-1@bokmal",
- "no_NO.ISO8859-1@nynorsk",
- "no_NO.UTF-8",
- "no_NO.iso88591",
- "no_NO.iso885915@euro",
- "no_NO.roman8",
- "no_NO.utf8",
- "no_NY",
- "norwegian",
- "nr",
- "nynorsk",
- "oc_FR",
- "pl",
- "pl.UTF-8",
- "pl.po",
- "pl_PL",
- "pl_PL.ISO8859-2",
- "pl_PL.UTF-8",
- "pl_PL.iso88592",
- "pl_PL.utf8",
- "polish",
- "portuguese",
- "pt",
- "pt.ISO8859-15",
- "pt_BR",
- "pt_BR.ISO8859-1",
- "pt_BR.ISO8859-15",
- "pt_BR.UTF-8",
- "pt_BR.po",
- "pt_BR.utf8",
- "pt_PT",
- "pt_PT.ISO8859-1",
- "pt_PT.ISO8859-15",
- "pt_PT.ISO8859-15@euro",
- "pt_PT.UTF-8",
- "pt_PT.iso88591",
- "pt_PT.iso885915@euro",
- "pt_PT.roman8",
- "pt_PT.utf8",
- "pt_PT.utf8@euro",
- "pt_PT@euro",
- "ro",
- "ro_RO",
- "ro_RO.ISO8859-2",
- "ro_RO.iso88592",
- "ro_RO.utf8",
- "romanian",
- "ru",
- "ru.UTF-8",
- "ru.koi8-r",
- "ru_RU",
- "ru_RU.ANSI1251",
- "ru_RU.ISO8859-5",
- "ru_RU.KOI8-R",
- "ru_RU.UTF-8",
- "ru_RU.iso88595",
- "ru_RU.koi8r",
- "ru_RU.utf8",
- "ru_SU",
- "ru_UA",
- "ru_UA.utf8",
- "russian",
- "se",
- "sh_BA",
- "sh_BA.ISO8859-2@bosnia",
- "sk",
- "sk_SK",
- "sk_SK.ISO8859-2",
- "sk_SK.iso88592",
- "sk_SK.utf8",
- "sl",
- "sl_SI",
- "sl_SI.ISO8859-2",
- "sl_SI.iso88592",
- "sl_SI.utf8",
- "slovak",
- "slovene",
- "slovenian",
- "spanish",
- "sq_AL",
- "sq_AL.ISO8859-2",
- "sq_AL.utf8",
- "sr",
- "sr_SP",
- "sr_YU",
- "sr_YU.ISO8859-5",
- "sr_YU.utf8",
- "sr_YU.utf8@cyrillic",
- "sr_YU@cyrillic",
- "sv",
- "sv.ISO8859-15",
- "sv.UTF-8",
- "sv_FI",
- "sv_FI.utf8",
- "sv_FI.utf8@euro",
- "sv_FI@euro",
- "sv_SE",
- "sv_SE.ISO8859-1",
- "sv_SE.ISO8859-15",
- "sv_SE.ISO8859-15@euro",
- "sv_SE.UTF-8",
- "sv_SE.UTF-8@euro",
- "sv_SE.iso88591",
- "sv_SE.iso885915@euro",
- "sv_SE.roman8",
- "sv_SE.utf8",
- "swedish",
- "ta_IN",
- "te_IN",
- "tg_TJ",
- "th",
- "th_TH",
- "th_TH.ISO8859-11",
- "th_TH.TIS620",
- "th_TH.UTF-8",
- "th_TH.tis620",
- "th_TH.utf8",
- "thai",
- "tl_PH",
- "tr",
- "tr_TR",
- "tr_TR.ISO8859-9",
- "tr_TR.UTF-8",
- "tr_TR.iso88599",
- "tr_TR.turkish8",
- "tr_TR.utf8",
- "turkish",
- "ua",
- "uk",
- "uk_UA",
- "uk_UA.utf8",
- "univ.utf8",
- "universal.UTF-8",
- "universal.utf8@ucs4",
- "ur_PK",
- "uz_UZ",
- "vi_VN",
- "wa",
- "yi_US",
- "zh",
- "zh.GBK",
- "zh.UTF-8",
- "zh_CN",
- "zh_CN.EUC",
- "zh_CN.EUC@pinyin",
- "zh_CN.EUC@radical",
- "zh_CN.EUC@stroke",
- "zh_CN.GB18030",
- "zh_CN.GB18030@pinyin",
- "zh_CN.GB18030@radical",
- "zh_CN.GB18030@stroke",
- "zh_CN.GB2312",
- "zh_CN.GBK",
- "zh_CN.GBK@pinyin",
- "zh_CN.GBK@radical",
- "zh_CN.GBK@stroke",
- "zh_CN.UTF-8",
- "zh_CN.UTF-8@pinyin",
- "zh_CN.UTF-8@radical",
- "zh_CN.UTF-8@stroke",
- "zh_CN.gb18030",
- "zh_CN.gbk",
- "zh_CN.hp15CN",
- "zh_CN.utf8",
- "zh_HK",
- "zh_HK.BIG5HK",
- "zh_HK.BIG5HK@radical",
- "zh_HK.BIG5HK@stroke",
- "zh_HK.UTF-8",
- "zh_HK.UTF-8@radical",
- "zh_HK.UTF-8@stroke",
- "zh_HK.big5",
- "zh_HK.utf8",
- "zh_TW",
- "zh_TW.BIG5",
- "zh_TW.BIG5@pinyin",
- "zh_TW.BIG5@radical",
- "zh_TW.BIG5@stroke",
- "zh_TW.BIG5@zhuyin",
- "zh_TW.Big5",
- "zh_TW.EUC",
- "zh_TW.EUC@pinyin",
- "zh_TW.EUC@radical",
- "zh_TW.EUC@stroke",
- "zh_TW.EUC@zhuyin",
- "zh_TW.UTF-8",
- "zh_TW.UTF-8@pinyin",
- "zh_TW.UTF-8@radical",
- "zh_TW.UTF-8@stroke",
- "zh_TW.UTF-8@zhuyin",
- "zh_TW.big5",
- "zh_TW.ccdc",
- "zh_TW.eucTW",
- "zh_TW.euctw",
- "zh_TW.utf8",
-
- // Windows names
- "ENU", "ENG", "ENA", "ENC", "ENZ", "ENI", "ENS", "ENJ", "ENB", "ENL",
- "ENT", "BGR", "CSY", "DAN", "DEU", "DES", "DEA", "DEL", "DEC", "ELL",
- "ESP", "ESM", "ESN", "ESG", "ESC", "ESA", "ESD", "ESV", "ESO", "ESR",
- "ESS", "ESF", "ESL", "ESY", "ESZ", "ESB", "ESE", "ESH", "ESI", "ESU",
- "FIN", "FRA", "FRB", "FRC", "FRS", "FRL", "HUN", "ISL", "ITA", "ITS",
- "NLD", "NLB", "NOR", "NON", "PLK", "PTB", "PTG", "ROM", "RUS", "HRV",
- "SRL", "SRB", "SKY", "SVE", "SVF", "TRK", "SLV", "AFK", "SQI", "EUQ",
- "BEL", "CAT", "ETI", "FOS", "IND", "LVI", "LTH", "UKR"
-};
-
-const unsigned nlocales = sizeof test_locale_names / sizeof *test_locale_names;
Modified: incubator/stdcxx/branches/4.2.0/etc/config/src/NEW_THROWS.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/etc/config/src/NEW_THROWS.cpp?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/etc/config/src/NEW_THROWS.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/etc/config/src/NEW_THROWS.cpp Tue Jun 26 16:58:07 2007
@@ -5,9 +5,11 @@
#include <stdio.h>
#ifndef _RWSTD_NO_SETRLIMIT
-# include <sys/resource.h> // for setrlimit()
+// test for setrlimit() presence before compiling current file
#endif // _RWSTD_NO_SETRLIMIT
+// proclimits.h must be included only after #if[n]def _RWSTD_NO_SETRLIMIT
+#include "proclimits.h"
#if 2 == __GNUG__
# ifndef _RWSTD_NO_HONOR_STD
@@ -84,15 +86,9 @@
// by passing it a smaller argument
printf ("#define _RWSTD_NO_NEW_OFLOW_SAFE\n");
-#ifndef _RWSTD_NO_SETRLIMIT
-
// decrease resource limit to a minimum to induce a failure
// without unreasonably stressing the system
-
- struct rlimit rl = { 0, 0 };
- setrlimit (RLIMIT_DATA, &rl);
-
-#endif // _RWSTD_NO_SETRLIMIT
+ limit_memory (0);
p = (void*)1;
Modified: incubator/stdcxx/branches/4.2.0/etc/config/src/NONDEDUCED_CONTEXT.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/etc/config/src/NONDEDUCED_CONTEXT.cpp?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/etc/config/src/NONDEDUCED_CONTEXT.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/etc/config/src/NONDEDUCED_CONTEXT.cpp Tue Jun 26 16:58:07 2007
@@ -38,8 +38,6 @@
}
-#ifndef _RWSTD_NO_INLINE_MEMBER_TEMPLATES
-
template <class T>
struct B
{
@@ -56,5 +54,3 @@
b.baz (a, ' ');
}
-
-#endif // _RWSTD_NO_INLINE_MEMBER_TEMPLATES
Modified: incubator/stdcxx/branches/4.2.0/etc/config/src/STD_BAD_ALLOC.cpp
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/etc/config/src/STD_BAD_ALLOC.cpp?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/etc/config/src/STD_BAD_ALLOC.cpp (original)
+++ incubator/stdcxx/branches/4.2.0/etc/config/src/STD_BAD_ALLOC.cpp Tue Jun 26 16:58:07 2007
@@ -2,10 +2,17 @@
#include "config.h"
+#if !defined (_RWSTD_NO_NEW_THROWS) && !defined (_RWSTD_NO_NEW_OFLOW_SAFE)
+# include <stddef.h> // for size_t
+#endif // !_RWSTD_NO_NEW_THROWS && !_RWSTD_NO_NEW_OFLOW_SAFE
+
#ifndef _RWSTD_NO_SETRLIMIT
-# include <sys/resource.h> // for setrlimit()
+// test for setrlimit() presence before compiling current file
#endif
+// proclimits.h must be included only after #if[n]def _RWSTD_NO_SETRLIMIT
+#include "proclimits.h"
+
#ifndef _RWSTD_NO_HONOR_STD
# ifdef _RWSTD_NO_STD_TERMINATE
@@ -70,19 +77,14 @@
#ifndef _RWSTD_NO_NEW_THROWS
# ifndef _RWSTD_NO_NEW_OFLOW_SAFE
- void *p = ::operator new ((unsigned long)-1);
+ void *p = ::operator new (size_t (-1));
if (!p)
return 1;
# else // if defined (_RWSTD_NO_NEW_OFLOW_SAFE)
-#ifndef _RWSTD_NO_SETRLIMIT
-
- struct rlimit rl = { 0, 0 };
- setrlimit (RLIMIT_DATA, &rl);
-
-#endif // _RWSTD_NO_SETRLIMIT
+ limit_memory (0);
for (unsigned long n = 1UL << (sizeof (long) * 8 - 1);
0 != n; n |= (n >> 1)) {
Modified: incubator/stdcxx/branches/4.2.0/etc/config/vacpp.config
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/etc/config/vacpp.config?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/etc/config/vacpp.config (original)
+++ incubator/stdcxx/branches/4.2.0/etc/config/vacpp.config Tue Jun 26 16:58:07 2007
@@ -108,6 +108,12 @@
PRELINKFLAGS += -Wl,-bh:5
endif
LDFLAGS += -Wl,-bh:5
+ else
+ ifeq ($(CXX_MAJOR),6)
+ # also silence ld warning 0711-224 (Duplicate symbol) for shared
+ # library linking with VisualAge C++ 6.0 (see STDCXX-439)
+ LDFLAGS += -Wl,-bh:5
+ endif
endif
# disable assembly files on AIX but leave them enabled (at the default
@@ -148,7 +154,10 @@
DEBUG_CXXFLAGS = -g
DEBUG_CPPFLAGS =
-OPTMZ_CXXFLAGS = -O -qinline
+# -O enables inlining of all functions declared inline
+# -Q (same as -qinline) enables inlining of all functions
+# up to 20 statements big
+OPTMZ_CXXFLAGS = -O -Q
OPTMZ_CPPFLAGS =
# shared/archive library options
Modified: incubator/stdcxx/branches/4.2.0/etc/config/windows/build.wsf
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/etc/config/windows/build.wsf?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/etc/config/windows/build.wsf (original)
+++ incubator/stdcxx/branches/4.2.0/etc/config/windows/build.wsf Tue Jun 26 16:58:07 2007
@@ -73,20 +73,21 @@
// clear output window
outputPane.Clear();
- // delete old BuildLog.htm
- var path = Cfg.Evaluate(Cfg.IntermediateDirectory) + "\\BuildLog.htm";
- if (fso.FileExists(path))
- fso.DeleteFile(path);
+ if (null != Cfg)
+ {
+ // delete old BuildLog.htm
+ var path = Cfg.Evaluate(Cfg.IntermediateDirectory) + "\\BuildLog.htm";
+ if (fso.FileExists(path))
+ fso.DeleteFile(path);
+ }
}
-function event_ProjectBuildFinished(Cfg, Warnings, Errors, Canceled)
+function getBuildLog(path)
{
var log = "";
try
{
- // try get log from BuildLog.htm file
- var path = Cfg.Evaluate(Cfg.IntermediateDirectory) + "\\BuildLog.htm";
var ForReading = 1;
var format = UNICODELOG ? -1 : 0;
var logStrm = fso.OpenTextFile(path, ForReading, false, format);
@@ -99,10 +100,53 @@
}
catch (e)
{
+ log = "";
+ }
+
+ return log;
+}
+
+function event_ProjectBuildFinished(Cfg, Warnings, Errors, Canceled)
+{
+ var log = "";
+ var htm = "BuildLog.htm";
+
+ if (null != Cfg)
+ {
+ try
+ {
+ // try get log from BuildLog.htm file
+ var path = Cfg.Evaluate(Cfg.IntermediateDirectory) + "\\" + htm;
+ log = getBuildLog(path);
+ }
+ catch (e)
+ {
+ log = "";
+ }
+ }
+
+ if (0 == log.length)
+ {
// try get log from output window
var sel = outputPane.TextDocument.Selection;
sel.SelectAll();
log = sel.Text;
+
+ // find BuildLoh.htm path
+ var proto = "file://";
+ var begin = log.indexOf(proto);
+ if (0 <= begin)
+ {
+ begin += proto.length;
+ var end = log.indexOf(htm, begin);
+ if (0 <= end)
+ {
+ var path = log.substring(begin, end + htm.length);
+ var log2 = getBuildLog(path);
+ if (0 < log2.length)
+ log = log2;
+ }
+ }
}
WScript.Echo(log);
@@ -121,7 +165,18 @@
if (null != projectFile)
{
+ var isICC = 0 < projectFile.indexOf(".icproj");
+
+ if (isICC)
+ // event not invoked automatically for Intel projects
+ event_ProjectBuildStarted(null);
+
solutionBuild.BuildProject(longConfName, projectFile, true);
+
+ if (isICC)
+ // event not invoked automatically for Intel projects
+ event_ProjectBuildFinished(null, 0, 0, 0);
+
return solutionBuild.LastBuildInfo;
}
@@ -168,7 +223,33 @@
}
var solutionBuild = solution.SolutionBuild;
- projectEngine = solution.Projects.Item(1).Object.VCProjectEngine;
+
+ // fix 'Call was Rejected By Callee' error
+ // http://msdn2.microsoft.com/en-us/library/ms228772(vs.80).aspx
+ var ntimes = 60;
+ for (var i = 0; i < ntimes; ++i)
+ {
+ try
+ {
+ projectEngine = solution.Projects.Item(1).Object.VCProjectEngine;
+ break;
+ }
+ catch (e)
+ {
+ if (0 > e.description.indexOf("Call was rejected by callee")
+ || i == ntimes - 1)
+ {
+ WScript.StdErr.WriteLine("Build: " + e.description);
+ retCode = 7;
+ break;
+ }
+ else
+ WScript.Sleep(1000);
+ }
+ }
+
+ if (retCode)
+ break;
events = projectEngine.Events;
try
Modified: incubator/stdcxx/branches/4.2.0/etc/config/windows/configure.wsf
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/etc/config/windows/configure.wsf?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/etc/config/windows/configure.wsf (original)
+++ incubator/stdcxx/branches/4.2.0/etc/config/windows/configure.wsf Tue Jun 26 16:58:07 2007
@@ -79,6 +79,27 @@
var description = new configure; // run
+// clean tests folder
+// print msg to the StdErr, if specified
+// quit with exitcode
+function cleanQuit(exitcode, msg)
+{
+ // clean Tests folder
+ if (fso.FolderExists(stageDir))
+ {
+ try
+ {
+ fso.DeleteFolder(stageDir, true);
+ }
+ catch (e) { }
+ }
+
+ if (typeof(msg) != "undefined")
+ WScript.StdErr.WriteLine(msg);
+
+ WScript.Quit(exitcode);
+}
+
// the main function of the script
function configure()
{
@@ -231,13 +252,11 @@
" /NODEFAULTLIB:libcpmt /NODEFAULTLIB:libcpmtd" +
" /NODEFAULTLIB:msvcprt /NODEFAULTLIB:msvcprtd";
+ var exitmsg = "You may see log here: " + logFileNameURI;
+
// sanity check
if (0 == checkSanity())
- {
- WScript.StdErr.WriteLine(
- "You may see log here: " + logFileNameURI);
- WScript.Quit(1);
- }
+ cleanQuit(1, exitmsg);
// check architecture
checkArchitecture();
@@ -247,22 +266,14 @@
// compile .lib.cpp s
if (0 == compileLibs(confInfo.dll))
- {
- WScript.StdErr.WriteLine(
- "You may see log here: " + logFileNameURI);
- WScript.Quit(1);
- }
+ cleanQuit(1, exitmsg);
// compile, link and run .cpp's (if possible)
if (0 == runExeTests())
- {
- WScript.StdErr.WriteLine(
- "You may see log here: " + logFileNameURI);
- WScript.Quit(1);
- }
+ cleanQuit(1, exitmsg);
- fso.MoveFile(stageFile , configFile);
- WScript.Quit(0);
+ fso.MoveFile(stageFile, configFile);
+ cleanQuit(0);
}
// performs compiler and linker sanity checks
Modified: incubator/stdcxx/branches/4.2.0/etc/config/windows/generate.wsf
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/etc/config/windows/generate.wsf?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/etc/config/windows/generate.wsf (original)
+++ incubator/stdcxx/branches/4.2.0/etc/config/windows/generate.wsf Tue Jun 26 16:58:07 2007
@@ -86,8 +86,14 @@
// the replacement of the WScript.Echo()
function Echo(msg)
{
- // WScript.Echo(msg);
- WScript.StdOut.WriteLine(msg);
+ try
+ {
+ // WScript.Echo(msg);
+ WScript.StdOut.WriteLine(msg);
+ }
+ catch(e)
+ {
+ }
}
// print message to the stdout and out the message to the logfile
Modified: incubator/stdcxx/branches/4.2.0/etc/config/windows/projects.js
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/etc/config/windows/projects.js?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/etc/config/windows/projects.js (original)
+++ incubator/stdcxx/branches/4.2.0/etc/config/windows/projects.js Tue Jun 26 16:58:07 2007
@@ -86,6 +86,7 @@
///////////////////////////////////////////////////////////////////////////////
var stdcxxDef = new ProjectDef(".stdcxx", typeLibrary);
stdcxxDef.VCProjDir = ProjectsDir;
+ stdcxxDef.RTTI = true;
stdcxxDef.FilterDefs.push(
new FilterDef(sourceFilterName, sourceFilterUuid, sourceFilterExts, eFileTypeCppCode, false).
addFilesByMask("%SRCDIR%\\src", rxExcludedFolders, null));
@@ -247,7 +248,9 @@
"if exist \"$(OutDir)\\runexamples.log\" del \"$(OutDir)\\runexamples.log\"";
runexamplesDef.CustomBuildFile = "runall.wsf";
runexamplesDef.CustomBuildCmd =
- "set PATH=$(SolutionDir)%CONFIG%\\lib;%PATH%\r\n" +
+ "set PATH=$(SolutionDir)%CONFIG%\\bin;$(SolutionDir)%CONFIG%\\lib;" +
+ "%SRCDIR%\\examples\\manual;%PATH%\r\n" +
+ "set TZ=MST+7\r\n" +
"cscript /nologo \"%CUSTOMFILE%\"" +
" /INOUTDIR:\"%SRCDIR%\\examples\"" +
" /EXEDIR:\"$(OutDir)\"" +
@@ -266,6 +269,7 @@
var testTplDef = new ProjectDef(null, typeApplication);
testTplDef.VCProjDir = ProjectsDir + "\\tests";
+ testTplDef.RTTI = true;
testTplDef.Defines = commonDefines;
testTplDef.Includes = rwtestIncludes;
testTplDef.OutDir = "$(SolutionDir)%CONFIG%\\tests";
@@ -307,7 +311,7 @@
"if exist \"$(OutDir)\\runtests.log\" del \"$(OutDir)\\runtests.log\"";
runtestsDef.CustomBuildFile = "runall.wsf";
runtestsDef.CustomBuildCmd =
- "set PATH=$(SolutionDir)%CONFIG%\\lib;%PATH%\r\n" +
+ "set PATH=$(SolutionDir)%CONFIG%\\bin;$(SolutionDir)%CONFIG%\\lib;%PATH%\r\n" +
"cscript /nologo \"%CUSTOMFILE%\"" +
" /EXEDIR:\"$(OutDir)\"" +
" /PRJDIR:\"" + runtestsDef.VCProjDir + "\"" +
@@ -385,7 +389,7 @@
"summary.js")));
testlocaleTplDef.CustomBuildFile = "runall.wsf";
testlocaleTplDef.CustomBuildCmd =
- "set PATH=$(SolutionDir)%CONFIG%\\lib;%PATH%\r\n" +
+ "set PATH=$(SolutionDir)%CONFIG%\\bin;$(SolutionDir)%CONFIG%\\lib;%PATH%\r\n" +
"cscript /nologo \"%CUSTOMFILE%\"" +
" /EXEDIR:\"$(OutDir)\"" +
" /CONFIG:\"%SOLUTION%\"" +
Modified: incubator/stdcxx/branches/4.2.0/etc/config/windows/runall.wsf
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/etc/config/windows/runall.wsf?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/etc/config/windows/runall.wsf (original)
+++ incubator/stdcxx/branches/4.2.0/etc/config/windows/runall.wsf Tue Jun 26 16:58:07 2007
@@ -36,8 +36,6 @@
required="false" type="string"/>
<named helpstring="Run tests in compat mode" name="COMPAT"
required="false" type="string"/>
- <named helpstring="The lib dll folder" name="LIBDIR"
- required="false" type="string"/>
<named helpstring="The examples extension" name="EXT"
required="false" type="string"/>
<example>
@@ -48,7 +46,7 @@
<usage>
Usage: cscript runexamples.wsf /EXEDIR:@EXEDIR /CONFIG:@CONFIG
[/PRJDIR:@PRJDIR] [/INOUTDIR:@INOUTDIR] [/LOGFILE:@LOGFILE]
-[/COMPAT] [/LIBDIR:@LIBDIR] [/EXT:@EXT]
+[/COMPAT] [/EXT:@EXT]
where
@EXEDIR is the root directory with executables to be run and checked,
@PRJDIR is the directory with .vcproj files of the executables,
@@ -57,7 +55,6 @@
@CONFIG is the compiler configuration (msvc-7.1, icc-9.0, etc),
@LOGFILE is the log file name,
@COMPAT is the option for run tests in compat mode,
-@LIBDIR is the library dll folder,
@EXT is the extension of the example files, default value: "exe".
</usage>
</runtime>
@@ -80,7 +77,6 @@
var logFileName = ""; // the log file name
var logFileDefault = "runexamples.log"; // the default log file name
var compatMode = false;
-var libdllFolder = "";
var ext = "exe";
var varOut = "out";
@@ -97,7 +93,6 @@
var buildlogFile = "BuildLog.htm";
var summaryFileName = "Summary.htm";
var htmFolderName = "temphtm";
-var libFileName = "libstd";
var utlExec = "exec.exe";
var unicodeLog = false;
@@ -165,8 +160,6 @@
if (WScript.Arguments.Named.Exists("INOUTDIR"))
inoutDir = WScript.Arguments.Named("INOUTDIR");
- utlExec = examplesDir + "\\..\\bin\\" + utlExec;
-
if (WScript.Arguments.Named.Exists("LOGFILE"))
logFileName = WScript.Arguments.Named("LOGFILE");
else
@@ -175,9 +168,6 @@
if (WScript.Arguments.Named.Exists("COMPAT"))
compatMode = true;
- if (WScript.Arguments.Named.Exists("LIBDIR"))
- libdllFolder = WScript.Arguments.Named("LIBDIR");
-
if (WScript.Arguments.Named.Exists("EXT"))
ext = WScript.Arguments.Named("EXT");
@@ -308,7 +298,8 @@
itemInfo.exitCode = parseStatus(itemInfo.name + "." + exeExt, execOut);
switch (itemInfo.exitCode)
{
- case 0: // OK
+ case 0: // OK
+ case -7: // OUTPUT
++exRunSucceeded;
fileLog.WriteLine(itemInfo.name + " completed successfully, exit code " +
itemInfo.exitCode);
@@ -351,8 +342,8 @@
{
var res = 0;
- // maxNameLen is the length of the "NAME" column in the exec utility output
- var maxNameLen = 25;
+ // maxNameLen is the width of the "NAME" column in the exec utility output
+ var maxNameLen = 30;
var pos = execOut.indexOf(exeName.substr(0, maxNameLen));
if (0 <= pos)
{
@@ -377,6 +368,9 @@
break;
case " LINK":
res = -6;
+ break;
+ case "OUTPUT":
+ res = -7;
break;
default:
res = -1;
Modified: incubator/stdcxx/branches/4.2.0/etc/config/windows/summary.js
URL: http://svn.apache.org/viewvc/incubator/stdcxx/branches/4.2.0/etc/config/windows/summary.js?view=diff&rev=550991&r1=550990&r2=550991
==============================================================================
--- incubator/stdcxx/branches/4.2.0/etc/config/windows/summary.js (original)
+++ incubator/stdcxx/branches/4.2.0/etc/config/windows/summary.js Tue Jun 26 16:58:07 2007
@@ -68,7 +68,7 @@
return;
}
- var blogData = blogFile.ReadAll();
+ var blogData = blogFile.AtEndOfStream ? "" : blogFile.ReadAll();
var posTmp = getCommandLinesInfo(itemInfo, blogData, 0);
posTmp = getCompilationInfo(itemInfo, blogData, posTmp);
@@ -665,7 +665,7 @@
var blogFile =
fso.OpenTextFile(testFolder.Path + "\\" + htmFileName,
1, false, uniMode);
- var blogData = blogFile.ReadAll();
+ var blogData = blogFile.AtEndOfStream ? "" : blogFile.ReadAll();
var posTmp = getCommandLinesInfo(testInfo, blogData, 0);
posTmp = getCompilationInfo(testInfo, blogData, posTmp);