Enabled use of pre-compiled headers by default

ledger · Mar 10, 2009 · 110f0b8 · 110f0b8
1 parent 4f62bb1
commit 110f0b8
Show file tree

Hide file tree

Showing 71 changed files with 170 additions and 27 deletions.
diff --git a/acprep b/acprep
@@ -657,41 +657,26 @@ class PrepareBuild(CommandLineApp):
     def setup_for_johnw(self):
         # jww (2009-03-09): Some peculiarities specific to my system
         if exists('/usr/local/stow/cppunit/include'):
-	    self.sys_include_dirs.append('/usr/local/stow/cppunit/include')
-	    self.sys_library_dirs.append('/usr/local/stow/cppunit/lib')
-
-            self.option_pch()
-            self.option_warn()
+	    self.sys_include_dirs.insert(0, '/usr/local/stow/cppunit/include')
+	    self.sys_library_dirs.insert(0, '/usr/local/stow/cppunit/lib')
 
             if '-march=native' in self.configure_args:
                 self.CXXFLAGS.remove('-march=native')
             self.CXXFLAGS.append('-march=nocona')
             self.CXXFLAGS.append('-msse3')
 
-        # g++ 4.0.1 cannot use PCH headers on OS X 10.5, so we must use a
-        # newer version.  However, it also means I can't use GLIBCXX_DEBUG.
-        if '--enable-pch' not in self.configure_args and \
-           exists('/opt/local/bin/g++-mp-4.4'):
-            self.envvars['CC']  = '/opt/local/bin/gcc-mp-4.4'
-            self.envvars['CXX'] = '/opt/local/bin/g++-mp-4.4'
-            self.envvars['LD']  = '/opt/local/bin/g++-mp-4.4'
-        elif '--enable-pch' not in self.configure_args and \
-             exists('/opt/local/bin/g++-mp-4.3'):
-            self.envvars['CC']  = '/opt/local/bin/gcc-mp-4.3'
-            self.envvars['CXX'] = '/opt/local/bin/g++-mp-4.3'
-            self.envvars['LD']  = '/opt/local/bin/g++-mp-4.3'
-        elif exists('/usr/bin/g++-4.2'):
-            self.envvars['CC']  = '/usr/bin/gcc-4.2'
-            self.envvars['CXX'] = '/usr/bin/g++-4.2'
-            self.envvars['LD']  = '/usr/bin/g++-4.2'
-
     def setup_for_system(self):
         self.setup_system_directories()
 
         system = self.get_stdout('uname', '-s')
 
         self.log.debug('System type is => ' + system)
 
+        # These options are global defaults at the moment
+        self.option_warn()
+        if not self.no_pch:
+            self.option_pch()
+
         if system == 'Linux':
             arch = self.get_stdout('uname', '-m')
             if arch == 'x86_64':
@@ -712,8 +697,29 @@ class PrepareBuild(CommandLineApp):
 
             self.setup_for_johnw()
 
+            # g++ 4.0.1 cannot use PCH headers on OS X 10.5, so we must use a
+            # newer version.
+            if exists('/opt/local/bin/g++-mp-4.4'):
+                self.envvars['CC']  = '/opt/local/bin/gcc-mp-4.4'
+                self.envvars['CXX'] = '/opt/local/bin/g++-mp-4.4'
+                self.envvars['LD']  = '/opt/local/bin/g++-mp-4.4'
+            elif exists('/opt/local/bin/g++-mp-4.3'):
+                self.envvars['CC']  = '/opt/local/bin/gcc-mp-4.3'
+                self.envvars['CXX'] = '/opt/local/bin/g++-mp-4.3'
+                self.envvars['LD']  = '/opt/local/bin/g++-mp-4.3'
+            elif exists('/usr/bin/g++-4.2'):
+                self.envvars['CC']  = '/usr/bin/gcc-4.2'
+                self.envvars['CXX'] = '/usr/bin/g++-4.2'
+                self.envvars['LD']  = '/usr/bin/g++-4.2'
+
+                if '--enable-pch' in self.configure_args:
+                    self.options.use_glibcxx_debug = False
+            else:
+                self.option_no_pch()
+
         if '--enable-pch' not in self.configure_args and \
-           exists('/opt/local/bin/ccache') or exists('/usr/local/bin/ccache'):
+           exists('/opt/local/bin/ccache') or \
+           exists('/usr/local/bin/ccache'):
             self.envvars['CC']  = 'ccache ' + self.envvars['CC']
             self.envvars['CXX'] = 'ccache ' + self.envvars['CXX']
             self.envvars['LD']  = 'ccache ' + self.envvars['LD']
@@ -887,8 +893,8 @@ class PrepareBuild(CommandLineApp):
                 self.sys_include_dirs.remove('/usr/local/stow/cppunit/include')
                 self.sys_library_dirs.remove('/usr/local/stow/cppunit/lib')
 
-            self.sys_include_dirs.append('/usr/local/stow/cppunit-debug/include')
-            self.sys_library_dirs.append('/usr/local/stow/cppunit-debug/lib')
+            self.sys_include_dirs.insert(0, '/usr/local/stow/cppunit-debug/include')
+            self.sys_library_dirs.insert(0, '/usr/local/stow/cppunit-debug/lib')
 
         if exists('/usr/local/lib/libboost_regex-xgcc40-d-1_38.a'):
             self.envvars['BOOST_HOME']   = '/usr/local'

diff --git a/src/account.cc b/src/account.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "account.h"
 #include "post.h"
 #include "xact.h"

diff --git a/src/accum.cc b/src/accum.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "utils.h"
 
 namespace ledger {

diff --git a/src/amount.cc b/src/amount.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "amount.h"
 #include "commodity.h"
 

diff --git a/src/balance.cc b/src/balance.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "balance.h"
 #include "commodity.h"
 #include "unistring.h"		// for justify()

diff --git a/src/chain.cc b/src/chain.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "chain.h"
 #include "predicate.h"
 #include "filters.h"

diff --git a/src/commodity.cc b/src/commodity.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "amount.h"
 #include "commodity.h"
 

diff --git a/src/compare.cc b/src/compare.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "compare.h"
 #include "op.h"
 #include "post.h"

diff --git a/src/derive.cc b/src/derive.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "derive.h"
 #include "xact.h"
 #include "post.h"

diff --git a/src/emacs.cc b/src/emacs.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "emacs.h"
 #include "xact.h"
 #include "post.h"

diff --git a/src/error.cc b/src/error.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "utils.h"
 
 namespace ledger {

diff --git a/src/expr.cc b/src/expr.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "expr.h"
 #include "parser.h"
 

diff --git a/src/filters.cc b/src/filters.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "filters.h"
 #include "iterators.h"
 #include "journal.h"

diff --git a/src/format.cc b/src/format.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "format.h"
 #include "scope.h"
 #include "unistring.h"

diff --git a/src/generate.cc b/src/generate.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "generate.h"
 #include "session.h"
 

diff --git a/src/global.cc b/src/global.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "global.h"
 #if defined(HAVE_BOOST_PYTHON)
 #include "pyinterp.h"

diff --git a/src/interactive.cc b/src/interactive.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "interactive.h"
 
 namespace ledger {

diff --git a/src/item.cc b/src/item.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "item.h"
 
 namespace ledger {

diff --git a/src/iterators.cc b/src/iterators.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "iterators.h"
 #include "journal.h"
 #include "compare.h"

diff --git a/src/journal.cc b/src/journal.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "journal.h"
 #include "xact.h"
 #include "account.h"

diff --git a/src/main.cc b/src/main.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "global.h"		// This is where the meat of main() is, which
 				// was moved there for the sake of clarity here
 #include "session.h"

diff --git a/src/mask.cc b/src/mask.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "mask.h"
 
 namespace ledger {

diff --git a/src/op.cc b/src/op.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "op.h"
 #include "scope.h"
 #include "commodity.h"

diff --git a/src/option.cc b/src/option.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "option.h"
 
 namespace ledger {

diff --git a/src/output.cc b/src/output.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "output.h"
 #include "xact.h"
 #include "post.h"

diff --git a/src/parser.cc b/src/parser.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "parser.h"
 
 namespace ledger {

diff --git a/src/post.cc b/src/post.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "post.h"
 #include "xact.h"
 #include "account.h"

diff --git a/src/precmd.cc b/src/precmd.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "precmd.h"
 #include "xact.h"
 #include "post.h"

diff --git a/src/predicate.cc b/src/predicate.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "predicate.h"
 
 namespace ledger {

diff --git a/src/py_amount.cc b/src/py_amount.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "pyinterp.h"
 #include "pyutils.h"
 #include "pyfstream.h"

diff --git a/src/py_balance.cc b/src/py_balance.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "pyinterp.h"
 
 namespace ledger {

diff --git a/src/py_chain.cc b/src/py_chain.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "pyinterp.h"
 
 namespace ledger {

diff --git a/src/py_commodity.cc b/src/py_commodity.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "pyinterp.h"
 #include "commodity.h"
 

diff --git a/src/py_expr.cc b/src/py_expr.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "pyinterp.h"
 
 namespace ledger {

diff --git a/src/py_flags.cc b/src/py_flags.cc
@@ -29,6 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <system.hh>
+
 #include "pyinterp.h"
 
 namespace ledger {