Fixed i18n system.

Renamed pbd3 back to pbd, since it's version 4.1 now.
Very minor fixes


git-svn-id: svn://localhost/ardour2/trunk@656 d708f5d6-7413-0410-9779-e7cbd77b26cf

SConstruct

@@ -62,6 +62,13 @@ class LibraryInfo(Environment):
         #doing LINKFLAGS breaks -framework
         #doing LIBS break link order dependency
     
+    def ENV_update(self, src_ENV):
+        for k in src_ENV.keys():
+            if k in self['ENV'].keys() and k in [ 'PATH', 'LD_LIBRARY_PATH',
+                                                  'LIB', 'INCLUDE' ]:
+                self['ENV'][k]=SCons.Util.AppendPath(self['ENV'][k], src_ENV[k])
+            else:
+                self['ENV'][k]=src_ENV[k]
 
 env = LibraryInfo (options = opts,
                    CPPPATH = [ '.' ],
@@ -72,6 +79,7 @@ env = LibraryInfo (options = opts,
                    DISTCHECKDIR = '#ardour-' + version + '/check'
                    )
 
+env.ENV_update(os.environ)
 
 #----------------------------------------------------------------------
 # Builders
@@ -81,58 +89,58 @@ env = LibraryInfo (options = opts,
 #
 
 def do_subst_in_file(targetfile, sourcefile, dict):
-        """Replace all instances of the keys of dict with their values.
+    """Replace all instances of the keys of dict with their values.
-        For example, if dict is {'%VERSION%': '1.2345', '%BASE%': 'MyProg'},
+    For example, if dict is {'%VERSION%': '1.2345', '%BASE%': 'MyProg'},
-        then all instances of %VERSION% in the file will be replaced with 1.2345 etc.
+    then all instances of %VERSION% in the file will be replaced with 1.2345 etc.
-        """
+    """
-        try:
+    try:
-            f = open(sourcefile, 'rb')
+        f = open(sourcefile, 'rb')
-            contents = f.read()
+        contents = f.read()
-            f.close()
+        f.close()
-        except:
+    except:
-            raise SCons.Errors.UserError, "Can't read source file %s"%sourcefile
+        raise SCons.Errors.UserError, "Can't read source file %s"%sourcefile
-        for (k,v) in dict.items():
+    for (k,v) in dict.items():
-            contents = re.sub(k, v, contents)
+        contents = re.sub(k, v, contents)
-        try:
+    try:
-            f = open(targetfile, 'wb')
+        f = open(targetfile, 'wb')
-            f.write(contents)
+        f.write(contents)
-            f.close()
+        f.close()
-        except:
+    except:
-            raise SCons.Errors.UserError, "Can't write target file %s"%targetfile
+        raise SCons.Errors.UserError, "Can't write target file %s"%targetfile
-        return 0 # success
+    return 0 # success
 
 def subst_in_file(target, source, env):
-        if not env.has_key('SUBST_DICT'):
+    if not env.has_key('SUBST_DICT'):
-            raise SCons.Errors.UserError, "SubstInFile requires SUBST_DICT to be set."
+        raise SCons.Errors.UserError, "SubstInFile requires SUBST_DICT to be set."
-        d = dict(env['SUBST_DICT']) # copy it
+    d = dict(env['SUBST_DICT']) # copy it
-        for (k,v) in d.items():
+    for (k,v) in d.items():
-            if callable(v):
+        if callable(v):
-                d[k] = env.subst(v())
+            d[k] = env.subst(v())
-            elif SCons.Util.is_String(v):
+        elif SCons.Util.is_String(v):
-                d[k]=env.subst(v)
+            d[k]=env.subst(v)
-            else:
+        else:
-                raise SCons.Errors.UserError, "SubstInFile: key %s: %s must be a string or callable"%(k, repr(v))
+            raise SCons.Errors.UserError, "SubstInFile: key %s: %s must be a string or callable"%(k, repr(v))
-        for (t,s) in zip(target, source):
+    for (t,s) in zip(target, source):
-            return do_subst_in_file(str(t), str(s), d)
+        return do_subst_in_file(str(t), str(s), d)
 
 def subst_in_file_string(target, source, env):
-        """This is what gets printed on the console."""
+    """This is what gets printed on the console."""
-        return '\n'.join(['Substituting vars from %s into %s'%(str(s), str(t))
+    return '\n'.join(['Substituting vars from %s into %s'%(str(s), str(t))
-                          for (t,s) in zip(target, source)])
+                      for (t,s) in zip(target, source)])
 
 def subst_emitter(target, source, env):
-        """Add dependency from substituted SUBST_DICT to target.
+    """Add dependency from substituted SUBST_DICT to target.
-        Returns original target, source tuple unchanged.
+    Returns original target, source tuple unchanged.
-        """
+    """
-        d = env['SUBST_DICT'].copy() # copy it
+    d = env['SUBST_DICT'].copy() # copy it
-        for (k,v) in d.items():
+    for (k,v) in d.items():
-            if callable(v):
+        if callable(v):
-                d[k] = env.subst(v())
+            d[k] = env.subst(v())
-            elif SCons.Util.is_String(v):
+        elif SCons.Util.is_String(v):
-                d[k]=env.subst(v)
+            d[k]=env.subst(v)
-        Depends(target, SCons.Node.Python.Value(d))
+    Depends(target, SCons.Node.Python.Value(d))
-        # Depends(target, source) # this doesn't help the install-sapphire-linux.sh problem
+    # Depends(target, source) # this doesn't help the install-sapphire-linux.sh problem
-        return target, source
+    return target, source
 
 subst_action = Action (subst_in_file, subst_in_file_string)
 env['BUILDERS']['SubstInFile'] = Builder(action=subst_action, emitter=subst_emitter)
@@ -141,31 +149,31 @@ env['BUILDERS']['SubstInFile'] = Builder(action=subst_action, emitter=subst_emit
 # internationalization
 #
 
-# po_helper
+# po_builder: builder function to copy po files to the parent directory while updating them
-#
-# this is not a builder. we can't list the .po files as a target,
-# because then scons -c will remove them (even Precious doesn't alter
-# this). this function is called whenever a .mo file is being
-# built, and will conditionally update the .po file if necessary.
-#
-
-def po_helper(po,pot):
-    args = [ 'msgmerge',
-             '--update',
-             po,
-             pot,
-             ]
-    print 'Updating ' + po
-    return os.spawnvp (os.P_WAIT, 'msgmerge', args)
-
-# mo_builder: builder function for (binary) message catalogs (.mo)
 #
 # first source:  .po file
 # second source: .pot file
 #
 
+def po_builder(target,source,env):
+    os.spawnvp (os.P_WAIT, 'cp', ['cp', str(source[0]), str(target[0])])
+    args = [ 'msgmerge',
+             '--update',
+             str(target[0]),
+             str(source[1])
+             ]
+    print 'Updating ' + str(target[0])
+    return os.spawnvp (os.P_WAIT, 'msgmerge', args)
+
+po_bld = Builder (action = po_builder)
+env.Append(BUILDERS = {'PoBuild' : po_bld})
+
+# mo_builder: builder function for (binary) message catalogs (.mo)
+#
+# first source:  .po file
+#
+
 def mo_builder(target,source,env):
-    po_helper (source[0].get_path(), source[1].get_path())
     args = [ 'msgfmt',
              '-c',
              '-o',
@@ -209,13 +217,13 @@ def i18n (buildenv, sources, installenv):
     
     p_oze = [ os.path.basename (po) for po in glob.glob ('po/*.po') ]
     languages = [ po.replace ('.po', '') for po in p_oze ]
-    m_oze = [ po.replace (".po", ".mo") for po in p_oze ]
     
-    for mo in m_oze[:]:
+    for po_file in p_oze:
-        po = 'po/' + mo.replace (".mo", ".po")
+        buildenv.PoBuild(po_file, ['po/'+po_file, potfile])
-        installenv.Alias ('install', buildenv.MoBuild (mo, [ po, potfile ]))
+        mo_file = po_file.replace (".po", ".mo")
+        installenv.Alias ('install', buildenv.MoBuild (mo_file, po_file))
     
-    for lang in languages[:]:
+    for lang in languages:
         modir = (os.path.join (install_prefix, 'share/locale/' + lang + '/LC_MESSAGES/'))
         moname = domain + '.mo'
         installenv.Alias('install', installenv.InstallAs (os.path.join (modir, moname), lang + '.mo'))
@@ -420,9 +428,8 @@ libraries['ardour_cp'] = LibraryInfo (LIBS='ardour_cp', LIBPATH='#libs/surfaces/
 
 libraries['ardour'] = LibraryInfo (LIBS='ardour', LIBPATH='#libs/ardour', CPPPATH='#libs/ardour')
 libraries['midi++2'] = LibraryInfo (LIBS='midi++', LIBPATH='#libs/midi++2', CPPPATH='#libs/midi++2')
-libraries['pbd3']    = LibraryInfo (LIBS='pbd', LIBPATH='#libs/pbd3', CPPPATH='#libs/pbd3')
+libraries['pbd']    = LibraryInfo (LIBS='pbd', LIBPATH='#libs/pbd', CPPPATH='#libs/pbd')
 libraries['gtkmm2ext'] = LibraryInfo (LIBS='gtkmm2ext', LIBPATH='#libs/gtkmm2ext', CPPPATH='#libs/gtkmm2ext')
-#libraries['cassowary'] = LibraryInfo(LIBS='cassowary', LIBPATH='#libs/cassowary', CPPPATH='#libs/cassowary')
 
 #
 # Check for libusb
@@ -539,7 +546,7 @@ if env['SYSLIBS']:
     
     subdirs = [
         'libs/libsndfile',
-        'libs/pbd3',
+        'libs/pbd',
         'libs/midi++2',
         'libs/ardour'
         ]
@@ -592,10 +599,9 @@ else:
     ]
     
     subdirs = [
-#	    'libs/cassowary',
         'libs/sigc++2',
         'libs/libsndfile',
-        'libs/pbd3',
+        'libs/pbd',
         'libs/midi++2',
         'libs/ardour'
         ]
@@ -821,35 +827,48 @@ if env['LIBLO']:
 
 env.Merge ([ libraries['core'] ])
 
+#
+# fix scons nitpickiness on APPLE
+#
+
+if env['DIST_TARGET'] == 'panther' or env['DIST_TARGET'] == 'tiger':
+    env.Append(CCFLAGS="-I/opt/local/include", LINKFLAGS="-L/opt/local/lib")
+
 #
 # i18n support
 #
 
 conf = Configure (env)
-
 if env['NLS']:
+    nls_error = 'This system is not configured for internationalized applications.  An english-only version will be built:'
     print 'Checking for internationalization support ...'
     have_gettext = conf.TryAction(Action('xgettext --version'))
     if have_gettext[0] != 1:
-        print 'This system is not configured for internationalized applications (no xgettext command). An english-only version will be built\n'
+        nls_error += ' No xgettext command.'
+        env['NLS'] = 0
+    else:
+        print "Found xgettext"
+    
+    have_msgmerge = conf.TryAction(Action('msgmerge --version'))
+    if have_msgmerge[0] != 1:
+        nls_error += ' No msgmerge command.'
+        env['NLS'] = 0
+    else:
+        print "Found msgmerge"
+    
+    if not conf.CheckCHeader('libintl.h'):
+        nls_error += ' No libintl.h.'
         env['NLS'] = 0
         
-    if conf.CheckCHeader('libintl.h') == None:
+    if env['NLS'] == 0:
-        print 'This system is not configured for internationalized applications (no libintl.h). An english-only version will be built\n'
+        print nls_error
-        env['NLS'] = 0
+    else:
-
+        print "International version will be built."
-    have_intltool = conf.TryAction(Action('intltool-update --version'))
-    if have_intltool[0] != 1:
-        print 'This system is not configured for internationalized applications (no intltool-update command). An english-only version will be built\n'
-        env['NLS'] = 0
-    
-
 env = conf.Finish()
 
 if env['NLS'] == 1:
     env.Append(CCFLAGS="-DENABLE_NLS")
 
-
 Export('env install_prefix final_prefix config_prefix final_config_prefix libraries i18n version subst_dict')
 
 #

ardour.dox

@@ -459,7 +459,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = libs/pbd3 libs/midi++2 libs/ardour libs/gtkmm2ext gtk2_ardour
+INPUT                  = libs/pbd libs/midi++2 libs/ardour libs/gtkmm2ext gtk2_ardour
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 

gtk2_ardour/SConscript

@@ -27,7 +27,7 @@ gtkardour.Merge ([
     libraries['ardour_cp'],
     libraries['gtkmm2ext'],
     libraries['midi++2'],
-    libraries['pbd3'],
+    libraries['pbd'],
     libraries['gtkmm2'],
     libraries['glib2'],
     libraries['libgnomecanvas2'],
@@ -255,8 +255,7 @@ else:
 	env.Alias('install', env.InstallAs(os.path.join(install_prefix, 'bin')+'/ardour2', ardoursh))
 
 if env['NLS']:
-        Export('gtkardour', 'intl_files')
+	i18n (gtkardour, gtkardour_files+skipped_files+fft_analysis_files, env)
-	SConscript ('po/SConscript')
     
 # configuration files
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour2_ui.rc'))

gtk2_ardour/fft_result.cc

@@ -20,9 +20,9 @@
 
 #include <fft_result.h>
 #include <fft_graph.h>
-#include <stdlib.h>
+#include <cstdlib>
-#include <string.h>
+#include <string>
-#include <math.h>
+#include <cmath>
 
 #include <iostream>
 

gtk2_ardour/po/SConscript

@@ -27,7 +27,7 @@ print "Updating pot file: "
 domain = gtkardour['DOMAIN']
 potfile = gtkardour['POTFILE']
 
-poaction = Action('intltool-update -p -g=' + domain)
+poaction = env.Action('intltool-update -p -g=' + domain)
 
 Execute(poaction)
 

gtk2_ardour/route_ui.cc

@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002 Paul Davis 
+    Copyright (C) 2002-2006 Paul Davis 
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by

libs/ardour/SConscript

@@ -198,7 +198,7 @@ ardour.Merge ([
 	     libraries['lrdf'],
 	     libraries['samplerate'],
 	     libraries['sigc2'],
-	     libraries['pbd3'],
+	     libraries['pbd'],
 	     libraries['soundtouch'],
 	     libraries['midi++2'],
 	     libraries['glib2'],

libs/gtkmm2ext/SConscript

@@ -9,7 +9,7 @@ Import('env final_prefix install_prefix libraries i18n')
 gtkmm2ext = env.Copy()
 gtkmm2ext.Merge ([ 
     libraries['sigc2'], 
-    libraries['pbd3'],
+    libraries['pbd'],
     libraries['midi++2'],
     libraries['gtk2'],
     libraries['glibmm2'],

libs/midi++2/SConscript

@@ -7,7 +7,7 @@ import glob
 Import('env libraries install_prefix')
 
 midi2 = env.Copy()
-midi2.Merge([ libraries['sigc2'], libraries['xml'], libraries['glib2'], libraries['pbd3'] ])
+midi2.Merge([ libraries['sigc2'], libraries['xml'], libraries['glib2'], libraries['pbd'] ])
 
 domain = 'midipp'
 

libs/pbd/SConscript

@@ -6,18 +6,18 @@ import glob
 
 Import('env libraries i18n install_prefix')
 
-pbd3 = env.Copy()
+pbd = env.Copy()
 
 domain = 'libpbd'
 
-pbd3.Append(DOMAIN=domain,MAJOR=4,MINOR=1,MICRO=0)
+pbd.Append(DOMAIN=domain,MAJOR=4,MINOR=1,MICRO=0)
-pbd3.Append(CXXFLAGS="-DPACKAGE=\\\"" + domain + "\\\"")
+pbd.Append(CXXFLAGS="-DPACKAGE=\\\"" + domain + "\\\"")
-pbd3.Append(CXXFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
+pbd.Append(CXXFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
-pbd3.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
+pbd.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
-pbd3.Append(PACKAGE=domain)
+pbd.Append(PACKAGE=domain)
-pbd3.Append(POTFILE=domain + '.pot')
+pbd.Append(POTFILE=domain + '.pot')
 
-pbd3_files = Split("""
+pbd_files = Split("""
 basename.cc
 base_ui.cc
 convert.cc
@@ -39,30 +39,30 @@ whitespace.cc
 xml++.cc
 """)
 
-conf = Configure(pbd3)
+conf = Configure(pbd)
 if conf.CheckFunc('getmntent'):
     conf.env.Append(CCFLAGS="-DHAVE_GETMNTENT")
 if conf.CheckCHeader('execinfo.h'):
     conf.env.Append(CXXFLAGS="-DHAVE_EXECINFO")
-pbd3 = conf.Finish()
+pbd = conf.Finish()
 
-pbd3.Merge ([ libraries['sigc2'], libraries['xml'], libraries['glibmm2'], libraries['glib2'] ])
+pbd.Merge ([ libraries['sigc2'], libraries['xml'], libraries['glibmm2'], libraries['glib2'] ])
 
-pbd3.VersionBuild(['version.cc','pbd/version.h'], 'SConscript')
+pbd.VersionBuild(['version.cc','pbd/version.h'], 'SConscript')
 
-libpbd3 = pbd3.SharedLibrary('pbd', pbd3_files)
+libpbd = pbd.SharedLibrary('pbd', pbd_files)
-Default(libpbd3)
+Default(libpbd)
 
-mount_env = Environment(CCFLAGS='-DTEST_MOUNTPOINT -Ilibs/pbd3')
+mount_env = Environment(CCFLAGS='-DTEST_MOUNTPOINT -Ilibs/pbd')
 mount_env.Program('mountpoint', 'mountpoint.cc')
 
 if env['NLS']:
-    i18n (pbd3, pbd3_files, env)
+    i18n (pbd, pbd_files, env)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libpbd3))
+env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libpbd))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'i18n.h', 'gettext.h', 'pbd/abstract_ui.cc' ] +
-                                     pbd3_files +
+                                     pbd_files +
                                      glob.glob('po/*.po') +
                                      glob.glob('pbd/*.h')))

libs/surfaces/control_protocol/SConscript

@@ -34,7 +34,7 @@ cp.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
 cp.Merge ([
     libraries['ardour'],
     libraries['sigc2'],
-    libraries['pbd3'],
+    libraries['pbd'],
     libraries['midi++2'],
     libraries['xml'],
     libraries['usb'],

libs/surfaces/generic_midi/SConscript

@@ -34,7 +34,7 @@ genericmidi.Merge ([
 	libraries['ardour'],
 	libraries['ardour_cp'],
 	libraries['midi++2'],
-	libraries['pbd3'],
+	libraries['pbd'],
 	libraries['sigc2'],
 	libraries['usb'],
 	libraries['xml'],

libs/surfaces/tranzport/SConscript

@@ -34,7 +34,7 @@ tranzport.Merge ([
     libraries['ardour'],
     libraries['ardour_cp'],
     libraries['sigc2'],
-    libraries['pbd3'],
+    libraries['pbd'],
     libraries['midi++2'],
     libraries['xml'],
     libraries['usb'],