Changeset 1819 for trunk/SConstruct


Ignore:
Timestamp:
08/02/10 17:28:20 (15 years ago)
Author:
Kana Sugimoto
Message:

New Development: No

JIRA Issue: No (merge alma branch to trunk)

Ready for Test: Yes

Interface Changes: No

Test Programs: regressions may work

Module(s): all single dish modules

Description:

Merged all changes in alma (r1386:1818) and newfiller (r1774:1818) branch.


File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/SConstruct

    • Property svn:mergeinfo set to
      /branches/alma/SConstruct1386-1818
      /branches/asap-3.x/SConstruct1747-1748,​1750-1751,​1753
    r1740 r1819  
    161161    env = conf.Finish()
    162162
    163 env["version"] = "3.x"
     163env["version"] = "3.0.0"
    164164
    165165if env['mode'] == 'release':
    … …  
    174174
    175175# build externals
    176 env.SConscript("external/SConscript")
     176env.SConscript("external-alma/SConscript")
    177177# build library
    178178so = env.SConscript("src/SConscript", build_dir="build", duplicate=0)
Note: See TracChangeset for help on using the changeset viewer.