Skip to content

Commit eda0fcc

Browse files
committed
back to rgl files
1 parent 265132f commit eda0fcc

File tree

2 files changed

+35
-10
lines changed

2 files changed

+35
-10
lines changed

ci/travis-build-debian.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@
33
#
44
# Build the Travis Debian artifacts
55
#
6-
#set -xe
6+
set -xe
77
sudo apt-get -qq update
88
sudo apt-get install devscripts equivs
99

1010
mkdir build
1111
cd build
12+
ln -s ../ci/control.${OCPN_TARGET} ../ci/control
1213
mk-build-deps ../ci/control
1314
sudo apt-get install ./*all.deb || :
1415
sudo apt-get --allow-unauthenticated install -f
1516

16-
cmake -DCMAKE_BUILD_TYPE=Debug ..
17+
cmake -DCMAKE_BUILD_TYPE=Release ..
1718
make -sj2
1819
make package

ci/travis-build-osx.sh

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,45 @@
77
# bailout on errors and echo commands
88
set -xe
99

10-
brew install cairo libexif xz libarchive python3
10+
brew install cairo libexif xz
11+
export MACOSX_DEPLOYMENT_TARGET=10.9
12+
# We need to build own libarchive
13+
wget https://libarchive.org/downloads/libarchive-3.3.3.tar.gz
14+
tar zxf libarchive-3.3.3.tar.gz
15+
cd libarchive-3.3.3
16+
./configure --without-lzo2 --without-nettle --without-xml2 --without-openssl --with-expat
17+
make
18+
make install
19+
cd ..
20+
1121
wget http://opencpn.navnux.org/build_deps/wx312_opencpn50_macos109.tar.xz
1222
tar xJf wx312_opencpn50_macos109.tar.xz -C /tmp
1323
export PATH="/usr/local/opt/gettext/bin:$PATH"
1424
echo 'export PATH="/usr/local/opt/gettext/bin:$PATH"' >> ~/.bash_profile
15-
16-
mkdir build
25+
26+
mkdir build
1727
cd build
18-
test -z "$TRAVIS_TAG" && CI_BUILD=OFF || CI_BUILD=ON
28+
test -n "$TRAVIS_TAG" && CI_BUILD=OFF || CI_BUILD=ON
29+
1930
cmake -DOCPN_CI_BUILD=$CI_BUILD \
20-
-DOCPN_USE_LIBCPP=ON \
2131
-DwxWidgets_CONFIG_EXECUTABLE=/tmp/wx312_opencpn50_macos109/bin/wx-config \
2232
-DwxWidgets_CONFIG_OPTIONS="--prefix=/tmp/wx312_opencpn50_macos109" \
23-
-DCMAKE_INSTALL_PREFIX=/tmp/opencpn -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 \
24-
..
33+
-DCMAKE_INSTALL_PREFIX=/tmp/opencpn \
34+
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 \
35+
..
36+
2537
make -sj2
26-
make package
38+
#make create-pkg
39+
mkdir -p /tmp/opencpn/bin/ocpn_draw_pi.app/Contents/MacOS
40+
mkdir -p /tmp/opencpn/bin/ocpn_draw_pi.app/Contents/SharedSupport/plugins
2741
chmod 644 /usr/local/lib/lib*.dylib
42+
make install
43+
#make install # Dunno why the second is needed but it is, otherwise
44+
# plugin data is not included in the bundle
45+
# make create-dmg
46+
47+
wget http://opencpn.navnux.org/build_deps/Packages.dmg;
48+
hdiutil attach Packages.dmg;
49+
sudo installer -pkg "/Volumes/Packages 1.2.5/Install Packages.pkg" -target "/";
50+
51+
make create-pkg

0 commit comments

Comments
 (0)