Switch to unified view

a/ohbuild.sh b/ohbuild.sh
...
...
50
{
50
{
51
    cd $topdir
51
    cd $topdir
52
    dir=ohNet
52
    dir=ohNet
53
    echo building $dir
53
    echo building $dir
54
    cd  $dir
54
    cd  $dir
55
  # Oct 28 2014
55
    # Apr 29 2015
56
    git checkout b2207ce19d638b55f660896d5b42c49900e8e2cd
56
    git checkout 5118af2acce9a25123336b9d3526cc87cdb96386
57
    make ohNetCore proxies devices TestFramework bundle || exit 1
57
    make ohNetCore proxies devices TestFramework bundle || exit 1
58
58
59
    cd ..
59
    cd ..
60
}
60
}
61
61
62
build_ohNetGenerated()
62
build_ohNetGenerated()
63
{
63
{
64
    dir=ohNetGenerated
64
    dir=ohNetGenerated
65
    echo building $dir
65
    echo building $dir
66
    cd  $dir
66
    cd  $dir
67
  # Oct 28 2014
67
    # Apr 29 2015
68
    git checkout b436c4f098cd3417c2b1e97f9a94b5875e71f200
68
    git checkout 8deb7ffd2f8e99fdc56449dadcd7d4fbc96cb829
69
    # e.g. Linux-x64, Linux-armhf
69
    # e.g. Linux-x64, Linux-armhf
70
    arch=`basename $topdir/ohNet/Build/Bundles/ohNet-*-*.tar.gz | \
70
    arch=`basename $topdir/ohNet/Build/Bundles/ohNet-*-*.tar.gz | \
71
        sed -e s/ohNet-//  -e s/-[A-Z][a-z][a-z]*\.tar\.gz$//`
71
        sed -e s/ohNet-//  -e s/-[A-Z][a-z][a-z]*\.tar\.gz$//`
72
    # e.g. Debug, Release
72
    # e.g. Debug, Release
73
    debug=`basename $topdir/ohNet/Build/Bundles/ohNet-*-*.tar.gz | \
73
    debug=`basename $topdir/ohNet/Build/Bundles/ohNet-*-*.tar.gz | \
...
...
93
{
93
{
94
    cd $topdir
94
    cd $topdir
95
    dir=ohdevtools
95
    dir=ohdevtools
96
    echo building $dir
96
    echo building $dir
97
    cd  $dir
97
    cd  $dir
98
    git checkout 33d8e940a7737df1b2a500efc28ef1429df8f304
98
    git checkout 52445477e4201b35b4ee5174bf90d25543cd1849
99
    # Nothing to build
99
    # Nothing to build
100
    cd ..
100
    cd ..
101
}
101
}
102
102
103
103
build_ohTopology()
104
build_ohTopology()
104
{
105
{
105
    cd $topdir
106
    cd $topdir
106
    dir=ohTopology
107
    dir=ohTopology
107
    echo building $dir
108
    echo building $dir
108
    cd  $dir
109
    cd  $dir
109
  # Apr 14 2014 Still latest on Feb 9 2015
110
    # Apr 29 2015
110
    git checkout 11767b53dda79564548b522a72db895f24e27437
111
    git checkout 18f004621a7b0dc3add6ddfeec781bd3878ae42e
111
    
112
    
112
    ./go fetch --all --clean 
113
    ./go fetch --all --clean 
113
114
114
    ./waf configure --ohnet=../ohNet --dest-platform=Linux-x86
115
    ./waf configure --ohnet=../ohNet --dest-platform=Linux-x86
115
    # This fails, but it creates what we need.
116
    # This fails, but it creates what we need.
...
...
122
{
123
{
123
    cd $topdir
124
    cd $topdir
124
    dir=ohSongcast
125
    dir=ohSongcast
125
    echo building $dir
126
    echo building $dir
126
    cd  $dir
127
    cd  $dir
127
  # Sep 2 2014. Still latest on Feb 9 2015
128
    git checkout 315fe6a191f512b2faf2502eb07613c4a3335bd3
129
128
129
    # Apr 29 2015.
130
    git checkout d3f6017a1ef133525f75f4d78e399e6fd6b70ce6
131
130
    # This fails because the link options are wrong (-lpthread should be
132
    # This (used to?) fails because the link options are wrong
131
    # at the end of the link line), but it builds the objs we need.
133
    # (-lpthread should be at the end of the link line), but it builds
134
    # the objs we need.
132
    make release=1 Receiver
135
    make release=1 Receiver
133
}
136
}
134
137
135
official_way()
138
official_way()
136
{
139
{