← Back to branch summary

~ubuntu-branches/ubuntu/raring/xiphos/raring

« back to all changes in this revision

Viewing changes to waffles/cross_linux_win32.py

  • Committer: Bazaar Package Importer
  • Author(s): Dmitrijs Ledkovs, Jonathan Marsden, Dmitrijs Ledkovs
  • Date: 2010-11-25 21:26:48 UTC
  • mfrom: (2.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20101125212648-mc64wvs0nw3xp7bx
Tags: 3.1.4-1
[ Jonathan Marsden ]
* New upstream release 3.1.4
* Removed debian/patch/* since the one patch was included upstream.
* Bumped Standards-Version to 3.9.1 (no changes required).
* debian/README.Debian: Corrected spelling and reworded for clarity.
* debian/control: Add Jonathan Marsden back into Uploaders.

[ Dmitrijs Ledkovs ]
* Added local options dpkg-source to unapply patches and fail on
  upstream source changes (ignoring false positives).
* Added bzr-builddeb hook to generate source-format before build. If you
  are not using bzr-builddeb, you must run "./debian/rules clean" before
  building.
* patches/xul-2.0.patch: bump UPPER_RANGE to allow running against xul20.

Show diffs side-by-side

added added

removed removed

Lines of Context:
waffles/cross_linux_win32.py
11
11
def find_mingw_cc(conf):
12
12
        v = conf.env
13
13
        v['CC'] = None
14
 
        cc = conf.find_program('i686-mingw32-gcc', var='CC')
 
14
        cc = conf.find_program('i686-pc-mingw32-gcc', var='CC')
15
15
        if not cc: cc = conf.find_program('mingw32-cc', var='CC')
16
16
        if not cc: cc = conf.find_program('i586-mingw32msvc-gcc', var='CC')
17
17
        if not cc: cc = conf.find_program('i586-mingw32msvc-cc', var='CC')
29
29
def find_mingw_ar(conf):
30
30
        v = conf.env
31
31
        v['AR'] = None
32
 
        ar = conf.find_program('i686-mingw32-ar', var='AR')
 
32
        ar = conf.find_program('i686-pc-mingw32-ar', var='AR')
33
33
        if not ar: ar = conf.find_program('i586-mingw32msvc-ar', var='AR')
34
34
        if not ar: conf.fatal('mingw32-ar was not found')
35
35
        try:
43
43
def find_mingw_ranlib(conf):
44
44
        v = conf.env
45
45
        v['RANLIB'] = None
46
 
        ranlib = conf.find_program('i686-mingw32-ranlib', var='RANLIB')
 
46
        ranlib = conf.find_program('i686-pc-mingw32-ranlib', var='RANLIB')
47
47
        if not ranlib: ranlib = conf.find_program('i586-mingw32msvc-ranlib', var='RANLIB')
48
48
        if not ranlib: conf.fatal('mingw32-ranlib was not found')
49
49
        try:
58
58
def find_mingw_cxx_cpp(conf):
59
59
        v = conf.env
60
60
        v['CXX'] = None
61
 
        cxx = conf.find_program('i686-mingw32-g++', var='CXX')
 
61
        cxx = conf.find_program('i686-pc-mingw32-g++', var='CXX')
62
62
        if not cxx: cxx = conf.find_program('mingw32-c++', var='CXX')
63
63
        if not cxx: cxx = conf.find_program('i586-mingw32msvc-g++', var='CXX')
64
64
        if not cxx: cxx = conf.find_program('i586-mingw32msvc-c++', var='CXX')
88
88
def mingw_libpath(conf):
89
89
        # We must add the library and includes paths of Windows libs
90
90
        msvc_path = conf.env['MSVC_LIBPATH'] or os.environ.get('MSVC_LIBPATH', '')
91
 
        if not os.path.isdir(msvc_path): msvc_path = '/usr/i686-mingw32'
 
91
        if not os.path.isdir(msvc_path): msvc_path = '/usr/i686-pc-mingw32'
92
92
        if not os.path.isdir(msvc_path): msvc_path = '/usr/mingw32'
93
93
        if not os.path.isdir(msvc_path): msvc_path = '/usr/i586-mingw32msvc'
94
94
        if not os.path.isdir(msvc_path):