Changeset 3b67bc25 in subsurface


Ignore:
Timestamp:
Jan 29, 2017, 2:59:08 PM (3 weeks ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
49cf493
Parents:
0e57033
git-author:
Stefan Fuchs <sfuchs@…> (01/29/17 12:45:02)
git-committer:
Dirk Hohndel <dirk@…> (01/29/17 14:59:08)
Message:

MXE windows build script mxe-based-build.sh updates

Updates mainly in the comments of the MXE build script:

  • File system layout: different proposal
  • Hint to not use MXE current version from git
  • MXE build JOBS setting to (very) safe value of 1
  • export CXXFLAGS=-std=c++11 added for marble build
File:
1 edited

Legend:

Unmodified
Added
Removed
  • packaging/windows/mxe-based-build.sh

    r4abf619 r3b67bc25  
    44#
    55# this file assumes that you have installed MXE on your system
    6 # and installed a number of dependencies as well
    7 #
    8 # cd ~/src/win
    9 # git clone https://github.com/mxe/mxe
     6# and installed a number of dependencies as well. Latest MXE
     7# version from git may not always work for Qt5 and Subsurface.
     8# Try to select an older release version like build-2016-10-12.
     9#
     10# cd ~/src
     11# git clone --branch build-2016-10-12 https://github.com/mxe/mxe
    1012# cd mxe
    1113#
     
    1416# # This variable controls the number of compilation processes
    1517# # within one package ("intra-package parallelism").
    16 # JOBS := 12
     18# # Set to higher value if you have a powerful machine.
     19# JOBS := 1
    1720#
    1821# # This variable controls the targets that will build.
     
    2831# After quite a while (depending on your machine anywhere from 15-20
    2932# minutes to several hours) you should have a working MXE install in
    30 # ~/src/win/mxe
     33# ~/src/mxe
    3134#
    3235# Now this script will come in:
    3336#
    34 # This makes some assumption about the filesystem layout based
    35 # on the way things are setup on my system so I can build Ubuntu PPA,
    36 # OBS and Windows out of the same sources.
     37# This makes some assumption about the filesystem layout so you
     38# can build linux and windows build out of the same sources
    3739# Something like this:
    3840#
    39 # ~/src/win/mxe                    <- current MXE git with Qt5, automake (see above)
    40 #      /win/grantlee               <- Grantlee 5.0.0 sources from git
    41 #      /win/libssh2                <- from git - v1.6 seems to work
    42 #      /win/libcurl                <- from git - 7.42.1 seems to work
    43 #      /win/subsurface             <- current subsurface git
    44 #      /win/libdivecomputer        <- appropriate libdc/Subsurface-branch branch
    45 #      /win/marble-source          <- appropriate marble/Subsurface-branch branch
    46 #      /win/libgit2                <- libgit2 0.23.1 or similar
    47 #
    48 # ~/src/win/win32                  <- build directory
    49 #
    50 # then start this script from ~/src/win/win32
    51 #
    52 #  cd ~/src/win/win32
    53 #  bash ../../subsurface/packaging/windows/mxe-based-build.sh installer
     41# ~/src/mxe                    <- MXE git with Qt5, automake (see above)
     42#      /grantlee               <- Grantlee 5.0.0 sources from git
     43#      /libssh2                <- from git - v1.6 seems to work
     44#      /libcurl                <- from git - 7.42.1 seems to work - rename folder!
     45#      /subsurface             <- current subsurface git
     46#      /libdivecomputer        <- appropriate libdc/Subsurface-branch branch
     47#      /marble-source          <- appropriate marble/Subsurface-branch branch
     48#      /libgit2                <- libgit2 0.23.1 or similar
     49#
     50# ~/src/win32                  <- build directory
     51#
     52# then start this script from ~/src/win32
     53#
     54#  cd ~/src/win32
     55#  bash ../subsurface/packaging/windows/mxe-based-build.sh installer
    5456#
    5557# this should create the latest daily installer
     
    6163# so if you update one of the other libs do
    6264#
    63 # cd ~/src/win/win32
     65# cd ~/src/win32
    6466# touch build.<component>
    65 # bash ../../subsurface/packaging/windows/mxe-based-build.sh installer
     67# bash ../subsurface/packaging/windows/mxe-based-build.sh installer
    6668#
    6769# and that component gets rebuilt as well. E.g.
     
    9698
    9799export PATH="$BASEDIR"/mxe/usr/bin:$PATH:"$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/qt5/bin/
     100export CXXFLAGS=-std=c++11
    98101
    99102if [[ "$1" == "debug" ]] ; then
     
    200203cd "$BUILDDIR"
    201204if [[ ! -d libdivecomputer || -f build.libdivecomputer ]] ; then
    202         rm build.libdivecomputer
     205        rm -f build.libdivecomputer
    203206        cd "$BASEDIR"/libdivecomputer
    204207        git pull
     
    226229cd "$BUILDDIR"
    227230if [[ ! -d marble || -f build.marble ]] ; then
    228         rm build.marble
     231        rm -f build.marble
    229232        mkdir -p marble
    230233        cd marble
Note: See TracChangeset for help on using the changeset viewer.