Skip to content

Commit ce9f1e1

Browse files
sfan5sfan5
committedJun 18, 2014
Update buildbot scripts and add 64-bit buildbot
·
5.11.00.4.10
1 parent c380563 commit ce9f1e1

File tree

4 files changed

+230
-78
lines changed

4 files changed

+230
-78
lines changed
 

‎util/buildbot/buildwin32.sh

+82-75
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/bin/bash
2+
set -e
3+
24
dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
35
if [ $# -ne 1 ]; then
46
echo "Usage: $0 <build directory>"
@@ -11,99 +13,100 @@ packagedir=$builddir/packages
1113
libdir=$builddir/libs
1214

1315
toolchain_file=$dir/toolchain_mingw.cmake
14-
openal_stripped_file=$dir/openal_stripped.zip
15-
mingwm10_dll_file=$dir/mingwm10.dll
16-
irrlicht_version=1.7.2
16+
irrlicht_version=1.8.1
1717
ogg_version=1.2.1
1818
vorbis_version=1.3.3
1919
curl_version=7.18.0
20-
21-
# unzip -l $openal_stripped_file:
22-
# 0 2012-04-03 00:25 openal_stripped/
23-
# 0 2012-04-03 00:25 openal_stripped/bin/
24-
# 109080 2012-04-03 00:03 openal_stripped/bin/OpenAL32.dll
25-
# 0 2012-04-03 00:29 openal_stripped/include/
26-
# 26443 2006-12-08 17:30 openal_stripped/include/al.h
27-
# 8282 2007-04-13 17:02 openal_stripped/include/alc.h
28-
# 0 2012-04-03 00:07 openal_stripped/lib/
29-
# 20552 2005-08-02 08:53 openal_stripped/lib/OpenAL32.lib
20+
gettext_version=0.14.4
21+
freetype_version=2.3.5-1
22+
luajit_version=2.0.1
23+
leveldb_version=1.15
3024

3125
mkdir -p $packagedir
3226
mkdir -p $libdir
3327

3428
cd $builddir
3529

3630
# Get stuff
37-
[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget http://downloads.sourceforge.net/irrlicht/irrlicht-$irrlicht_version.zip \
38-
-c -O $packagedir/irrlicht-$irrlicht_version.zip || exit 1
31+
[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget http://sfan5.pf-control.de/irrlicht-$irrlicht_version-win32.zip \
32+
-c -O $packagedir/irrlicht-$irrlicht_version.zip
3933
[ -e $packagedir/zlib125.zip ] || wget http://www.winimage.com/zLibDll/zlib125.zip \
40-
-c -O $packagedir/zlib125.zip || exit 1
34+
-c -O $packagedir/zlib125.zip
4135
[ -e $packagedir/zlib125dll.zip ] || wget http://www.winimage.com/zLibDll/zlib125dll.zip \
42-
-c -O $packagedir/zlib125dll.zip || exit 1
43-
[ -e $packagedir/libogg-$ogg_version-dev.7z ] || wget http://mirror.transact.net.au/sourceforge/w/project/wi/winlibs/libogg/libogg-$ogg_version-dev.7z \
44-
-c -O $packagedir/libogg-$ogg_version-dev.7z || exit 1
45-
[ -e $packagedir/libogg-$ogg_version-dll.7z ] || wget http://mirror.transact.net.au/sourceforge/w/project/wi/winlibs/libogg/libogg-$ogg_version-dll.7z \
46-
-c -O $packagedir/libogg-$ogg_version-dll.7z || exit 1
47-
[ -e $packagedir/libvorbis-$vorbis_version-dev.7z ] || wget http://minetest.ru/bin/libvorbis-$vorbis_version-dev.7z \
48-
-c -O $packagedir/libvorbis-$vorbis_version-dev.7z || exit 1
49-
[ -e $packagedir/libvorbis-$vorbis_version-dll.7z ] || wget http://minetest.ru/bin/libvorbis-$vorbis_version-dll.7z \
50-
-c -O $packagedir/libvorbis-$vorbis_version-dll.7z || exit 1
36+
-c -O $packagedir/zlib125dll.zip
37+
[ -e $packagedir/libogg-$ogg_version-dev.7z ] || wget http://sfan5.pf-control.de/libogg-$ogg_version-dev.7z \
38+
-c -O $packagedir/libogg-$ogg_version-dev.7z
39+
[ -e $packagedir/libogg-$ogg_version-dll.7z ] || wget http://sfan5.pf-control.de/libogg-$ogg_version-dll.7z \
40+
-c -O $packagedir/libogg-$ogg_version-dll.7z
41+
[ -e $packagedir/libvorbis-$vorbis_version-dev.7z ] || wget http://sfan5.pf-control.de/libvorbis-$vorbis_version-dev.7z \
42+
-c -O $packagedir/libvorbis-$vorbis_version-dev.7z
43+
[ -e $packagedir/libvorbis-$vorbis_version-dll.7z ] || wget http://sfan5.pf-control.de/libvorbis-$vorbis_version-dll.7z \
44+
-c -O $packagedir/libvorbis-$vorbis_version-dll.7z
5145
[ -e $packagedir/libcurl-$curl_version-win32-msvc.zip ] || wget http://curl.haxx.se/download/libcurl-$curl_version-win32-msvc.zip \
52-
-c -O $packagedir/libcurl-$curl_version-win32-msvc.zip || exit 1
53-
wget http://github.com/minetest/minetest/zipball/master \
54-
-c -O $packagedir/minetest.zip --tries=3 || (echo "Please download http://github.com/minetest/minetest/zipball/master manually and save it as $packagedir/minetest.zip"; read -s)
55-
[ -e $packagedir/minetest.zip ] || (echo "minetest.zip not found"; exit 1)
56-
wget http://github.com/minetest/minetest_game/zipball/master \
57-
-c -O $packagedir/minetest_game.zip --tries=3 || (echo "Please download http://github.com/minetest/minetest_game/zipball/master manually and save it as $packagedir/minetest_game.zip"; read -s)
58-
[ -e $packagedir/minetest_game.zip ] || (echo "minetest_game.zip not found"; exit 1)
46+
-c -O $packagedir/libcurl-$curl_version-win32-msvc.zip
47+
[ -e $packagedir/gettext-$gettext_version.zip ] || wget http://sfan5.pf-control.de/gettext-$gettext_version.zip \
48+
-c -O $packagedir/gettext-$gettext_version.zip
49+
[ -e $packagedir/freetype-$freetype_version.zip ] || wget http://sfan5.pf-control.de/freetype-$freetype_version.zip \
50+
-c -O $packagedir/freetype-$freetype_version.zip
51+
[ -e $packagedir/luajit-$luajit_version-static-win32.zip ] || wget http://sfan5.pf-control.de/luajit-$luajit_version-static-win32.zip \
52+
-c -O $packagedir/luajit-$luajit_version-static-win32.zip
53+
[ -e $packagedir/libleveldb-$leveldb_version-win32.zip ] || wget http://sfan5.pf-control.de/libleveldb-$leveldb_version-win32.zip \
54+
-c -O $packagedir/libleveldb-$leveldb_version-win32.zip
5955
[ -e $packagedir/openal_stripped.zip ] || wget http://minetest.ru/bin/openal_stripped.zip \
60-
-c -O $packagedir/openal_stripped.zip || exit 1
56+
-c -O $packagedir/openal_stripped.zip
6157
[ -e $packagedir/mingwm10.dll ] || wget http://minetest.ru/bin/mingwm10.dll \
62-
-c -O $packagedir/mingwm10.dll || exit 1
63-
64-
65-
# Figure out some path names from the packages
66-
minetestdirname=`unzip -l $packagedir/minetest.zip | head -n 7 | tail -n 1 | sed -e 's/^[^m]*//' -e 's/\/.*$//'`
67-
minetestdir=$builddir/$minetestdirname || exit 1
68-
git_hash=`echo $minetestdirname | sed -e 's/minetest-minetest-//'`
69-
minetest_gamedirname=`unzip -l $packagedir/minetest_game.zip | head -n 7 | tail -n 1 | sed -e 's/^[^m]*//' -e 's/\/.*$//'`
58+
-c -O $packagedir/mingwm10.dll
7059

7160
# Extract stuff
72-
cd $libdir || exit 1
73-
unzip -o $packagedir/irrlicht-$irrlicht_version.zip || exit 1
74-
unzip -o $packagedir/zlib125.zip || exit 1
75-
unzip -o $packagedir/zlib125dll.zip -d zlib125dll || exit 1
76-
7z x -y -olibogg $packagedir/libogg-$ogg_version-dev.7z || exit 1
77-
7z x -y -olibogg $packagedir/libogg-$ogg_version-dll.7z || exit 1
78-
7z x -y -olibvorbis $packagedir/libvorbis-$vorbis_version-dev.7z || exit 1
79-
7z x -y -olibvorbis $packagedir/libvorbis-$vorbis_version-dll.7z || exit 1
80-
unzip -o $packagedir/libcurl-$curl_version-win32-msvc.zip -d libcurl || exit 1
81-
unzip -o $packagedir/openal_stripped.zip || exit 1
82-
cd $builddir || exit 1
83-
unzip -o $packagedir/minetest.zip || exit 1
61+
cd $libdir
62+
[ -d irrlicht-$irrlicht_version ] || unzip -o $packagedir/irrlicht-$irrlicht_version.zip
63+
[ -d zlib-1.2.5 ] || unzip -o $packagedir/zlib125.zip
64+
[ -d zlib125dll ] || unzip -o $packagedir/zlib125dll.zip -d zlib125dll
65+
[ -d libogg/include ] || 7z x -y -olibogg $packagedir/libogg-$ogg_version-dev.7z
66+
[ -d libogg/bin ] || 7z x -y -olibogg $packagedir/libogg-$ogg_version-dll.7z
67+
[ -d libvorbis/include ] || 7z x -y -olibvorbis $packagedir/libvorbis-$vorbis_version-dev.7z
68+
[ -d libvorbis/bin ] || 7z x -y -olibvorbis $packagedir/libvorbis-$vorbis_version-dll.7z
69+
[ -d libcurl ] || unzip -o $packagedir/libcurl-$curl_version-win32-msvc.zip -d libcurl
70+
[ -d gettext ] || unzip -o $packagedir/gettext-$gettext_version.zip -d gettext
71+
[ -d freetype ] || unzip -o $packagedir/freetype-$freetype_version.zip -d freetype
72+
[ -d openal_stripped ] || unzip -o $packagedir/openal_stripped.zip
73+
[ -d luajit ] || unzip -o $packagedir/luajit-$luajit_version-static-win32.zip -d luajit
74+
[ -d leveldb ] || unzip -o $packagedir/libleveldb-$leveldb_version-win32.zip -d leveldb
8475

85-
# Symlink minetestdir
86-
rm -rf $builddir/minetest
87-
ln -s $minetestdir $builddir/minetest
76+
# Get minetest
77+
cd $builddir
78+
[ -d minetest ] && (cd minetest && git pull) || (git clone https://github.com/minetest/minetest)
79+
cd minetest
80+
git_hash=`git show | head -c14 | tail -c7`
8881

89-
# Extract minetest_game
90-
cd $minetestdir/games || exit 1
91-
rm -rf minetest_game || exit 1
92-
unzip -o $packagedir/minetest_game.zip || exit 1
93-
minetest_gamedir=$minetestdir/games/$minetest_gamedirname || exit 1
94-
mv $minetest_gamedir $minetestdir/games/minetest_game || exit 1
82+
# Get minetest_game
83+
cd games
84+
[ -d minetest_game ] && (cd minetest_game && git pull) || (git clone https://github.com/minetest/minetest_game)
85+
cd ../..
9586

9687
# Build the thing
97-
cd $minetestdir || exit 1
98-
mkdir -p build || exit 1
99-
cd build || exit 1
100-
cmake $minetestdir -DCMAKE_TOOLCHAIN_FILE=$toolchain_file -DENABLE_SOUND=1 \
88+
cd minetest
89+
[ -d build ] && rm -Rf build/
90+
mkdir build
91+
cd build
92+
cmake .. \
93+
-DCMAKE_INSTALL_PREFIX=/tmp \
94+
-DVERSION_EXTRA=$git_hash \
95+
-DBUILD_CLIENT=1 -DBUILD_SERVER=0 \
96+
-DCMAKE_TOOLCHAIN_FILE=$toolchain_file \
97+
-DENABLE_SOUND=1 \
98+
-DENABLE_CURL=1 \
99+
-DENABLE_GETTEXT=1 \
100+
-DENABLE_FREETYPE=1 \
101+
-DENABLE_LEVELDB=1 \
101102
-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht-$irrlicht_version/include \
102103
-DIRRLICHT_LIBRARY=$libdir/irrlicht-$irrlicht_version/lib/Win32-gcc/libIrrlicht.dll.a \
103104
-DIRRLICHT_DLL=$libdir/irrlicht-$irrlicht_version/bin/Win32-gcc/Irrlicht.dll \
104105
-DZLIB_INCLUDE_DIR=$libdir/zlib-1.2.5 \
105106
-DZLIB_LIBRARIES=$libdir/zlib125dll/dll32/zlibwapi.lib \
106107
-DZLIB_DLL=$libdir/zlib125dll/dll32/zlibwapi.dll \
108+
-DLUA_INCLUDE_DIR=$libdir/luajit/include \
109+
-DLUA_LIBRARY=$libdir/luajit/libluajit.a \
107110
-DOGG_INCLUDE_DIR=$libdir/libogg/include \
108111
-DOGG_LIBRARY=$libdir/libogg/lib/libogg.dll.a \
109112
-DOGG_DLL=$libdir/libogg/bin/libogg-0.dll \
@@ -115,18 +118,22 @@ cmake $minetestdir -DCMAKE_TOOLCHAIN_FILE=$toolchain_file -DENABLE_SOUND=1 \
115118
-DOPENAL_INCLUDE_DIR=$libdir/openal_stripped/include \
116119
-DOPENAL_LIBRARY=$libdir/openal_stripped/lib/OpenAL32.lib \
117120
-DOPENAL_DLL=$libdir/openal_stripped/bin/OpenAL32.dll \
118-
-DENABLE_CURL=1 \
121+
-DMINGWM10_DLL=$packagedir/mingwm10.dll \
119122
-DCURL_DLL=$libdir/libcurl/libcurl.dll \
120123
-DCURL_INCLUDE_DIR=$libdir/libcurl/include \
121124
-DCURL_LIBRARY=$libdir/libcurl/libcurl.lib \
122-
-DMINGWM10_DLL=$packagedir/mingwm10.dll \
123-
-DCMAKE_INSTALL_PREFIX=/tmp \
124-
-DVERSION_EXTRA=$git_hash \
125-
|| exit 1
126-
make -j2 package || exit 1
125+
-DCUSTOM_GETTEXT_PATH=$libdir/gettext \
126+
-DGETTEXT_MSGFMT=`which msgfmt` \
127+
-DGETTEXT_DLL=$libdir/gettext/bin/libintl3.dll \
128+
-DGETTEXT_ICONV_DLL=$libdir/gettext/bin/libiconv2.dll \
129+
-DGETTEXT_INCLUDE_DIR=$libdir/gettext/include \
130+
-DGETTEXT_LIBRARY=$libdir/gettext/lib/libintl.dll.a \
131+
-DFREETYPE_INCLUDE_DIR_freetype2=$libdir/freetype/include/freetype \
132+
-DFREETYPE_INCLUDE_DIR_ft2build=$libdir/freetype/include \
133+
-DFREETYPE_LIBRARY=$libdir/freetype/lib/freetype.lib \
134+
-DLEVELDB_INCLUDE_DIR=$libdir/leveldb/include \
135+
-DLEVELDB_LIBRARY=$libdir/leveldb/lib/libleveldb.dll.a
127136

128-
#pubdir=/home/celeron55/public_html/random/`date +%Y-%m` || exit 1
129-
#mkdir -p $pubdir || exit 1
130-
#cp *autobuild*.zip $pubdir/ || exit 1
137+
make package -j2
131138

132139
# EOF

‎util/buildbot/buildwin64.sh

+129
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
#!/bin/bash
2+
set -e
3+
4+
dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
5+
if [ $# -ne 1 ]; then
6+
echo "Usage: $0 <build directory>"
7+
exit 1
8+
fi
9+
builddir=$1
10+
mkdir -p $builddir
11+
builddir="$( cd "$builddir" && pwd )"
12+
packagedir=$builddir/packages
13+
libdir=$builddir/libs
14+
15+
toolchain_file=$dir/toolchain_mingw64.cmake
16+
irrlicht_version=1.8.1
17+
ogg_version=1.3.1
18+
vorbis_version=1.3.4
19+
curl_version=7.36.0
20+
gettext_version=0.18.2
21+
freetype_version=2.5.3
22+
luajit_version=2.0.3
23+
leveldb_version=1.15
24+
zlib_version=1.2.8
25+
26+
mkdir -p $packagedir
27+
mkdir -p $libdir
28+
29+
cd $builddir
30+
31+
# Get stuff
32+
[ -e $packagedir/irrlicht-$irrlicht_version.zip ] || wget http://sfan5.pf-control.de/irrlicht-$irrlicht_version-win64.zip \
33+
-c -O $packagedir/irrlicht-$irrlicht_version.zip
34+
[ -e $packagedir/zlib-$zlib_version.zip ] || wget http://sfan5.pf-control.de/zlib-$zlib_version-win64.zip \
35+
-c -O $packagedir/zlib-$zlib_version.zip
36+
[ -e $packagedir/libogg-$ogg_version.zip ] || wget http://sfan5.pf-control.de/libogg-$ogg_version-win64.zip \
37+
-c -O $packagedir/libogg-$ogg_version.zip
38+
[ -e $packagedir/libvorbis-$vorbis_version.zip ] || wget http://sfan5.pf-control.de/libvorbis-$vorbis_version-win64.zip \
39+
-c -O $packagedir/libvorbis-$vorbis_version.zip
40+
[ -e $packagedir/libcurl-$curl_version.zip ] || wget http://sfan5.pf-control.de/libcurl-$curl_version-win64.zip \
41+
-c -O $packagedir/libcurl-$curl_version.zip
42+
[ -e $packagedir/gettext-$gettext_version.zip ] || wget http://sfan5.pf-control.de/gettext-$gettext_version-win64.zip \
43+
-c -O $packagedir/gettext-$gettext_version.zip
44+
[ -e $packagedir/freetype-$freetype_version.zip ] || wget http://sfan5.pf-control.de/libfreetype-$freetype_version-win64.zip \
45+
-c -O $packagedir/freetype-$freetype_version.zip
46+
[ -e $packagedir/luajit-$luajit_version.zip ] || wget http://sfan5.pf-control.de/luajit-$luajit_version-static-win64.zip \
47+
-c -O $packagedir/luajit-$luajit_version.zip
48+
[ -e $packagedir/libleveldb-$leveldb_version.zip ] || wget http://sfan5.pf-control.de/libleveldb-$leveldb_version-win64.zip \
49+
-c -O $packagedir/libleveldb-$leveldb_version.zip
50+
[ -e $packagedir/openal_stripped.zip ] || wget http://sfan5.pf-control.de/openal_stripped64.zip \
51+
-c -O $packagedir/openal_stripped.zip
52+
53+
54+
# Extract stuff
55+
cd $libdir
56+
[ -d irrlicht-$irrlicht_version ] || unzip -o $packagedir/irrlicht-$irrlicht_version.zip
57+
[ -d zlib ] || unzip -o $packagedir/zlib-$zlib_version.zip -d zlib
58+
[ -d libogg ] || unzip -o $packagedir/libogg-$ogg_version.zip -d libogg
59+
[ -d libvorbis ] || unzip -o $packagedir/libvorbis-$vorbis_version.zip -d libvorbis
60+
[ -d libcurl ] || unzip -o $packagedir/libcurl-$curl_version.zip -d libcurl
61+
[ -d gettext ] || unzip -o $packagedir/gettext-$gettext_version.zip -d gettext
62+
[ -d freetype ] || unzip -o $packagedir/freetype-$freetype_version.zip -d freetype
63+
[ -d openal_stripped ] || unzip -o $packagedir/openal_stripped.zip
64+
[ -d luajit ] || unzip -o $packagedir/luajit-$luajit_version.zip -d luajit
65+
[ -d leveldb ] || unzip -o $packagedir/libleveldb-$leveldb_version.zip -d leveldb
66+
67+
# Get minetest
68+
cd $builddir
69+
[ -d minetest ] && (cd minetest && git pull) || (git clone https://github.com/minetest/minetest)
70+
cd minetest
71+
git_hash=`git show | head -c14 | tail -c7`
72+
73+
# Get minetest_game
74+
cd games
75+
[ -d minetest_game ] && (cd minetest_game && git pull) || (git clone https://github.com/minetest/minetest_game)
76+
cd ../..
77+
78+
# Build the thing
79+
cd minetest
80+
[ -d build ] && rm -Rf build/
81+
mkdir build
82+
cd build
83+
cmake .. \
84+
-DCMAKE_TOOLCHAIN_FILE=$toolchain_file \
85+
-DCMAKE_INSTALL_PREFIX=/tmp \
86+
-DVERSION_EXTRA=$git_hash \
87+
-DBUILD_CLIENT=1 -DBUILD_SERVER=0 \
88+
-DENABLE_SOUND=1 \
89+
-DENABLE_CURL=1 \
90+
-DENABLE_GETTEXT=1 \
91+
-DENABLE_FREETYPE=1 \
92+
-DENABLE_LEVELDB=1 \
93+
-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht-$irrlicht_version/include \
94+
-DIRRLICHT_LIBRARY=$libdir/irrlicht-$irrlicht_version/lib/Win64-gcc/libIrrlicht.dll.a \
95+
-DIRRLICHT_DLL=$libdir/irrlicht-$irrlicht_version/bin/Win64-gcc/Irrlicht.dll \
96+
-DZLIB_INCLUDE_DIR=$libdir/zlib/include \
97+
-DZLIB_LIBRARIES=$libdir/zlib/lib/libz.dll.a \
98+
-DZLIB_DLL=$libdir/zlib/bin/zlib1.dll \
99+
-DLUA_INCLUDE_DIR=$libdir/luajit/include \
100+
-DLUA_LIBRARY=$libdir/luajit/libluajit.a \
101+
-DOGG_INCLUDE_DIR=$libdir/libogg/include \
102+
-DOGG_LIBRARY=$libdir/libogg/lib/libogg.dll.a \
103+
-DOGG_DLL=$libdir/libogg/bin/libogg-0.dll \
104+
-DVORBIS_INCLUDE_DIR=$libdir/libvorbis/include \
105+
-DVORBIS_LIBRARY=$libdir/libvorbis/lib/libvorbis.dll.a \
106+
-DVORBIS_DLL=$libdir/libvorbis/bin/libvorbis-0.dll \
107+
-DVORBISFILE_LIBRARY=$libdir/libvorbis/lib/libvorbisfile.dll.a \
108+
-DVORBISFILE_DLL=$libdir/libvorbis/bin/libvorbisfile-3.dll \
109+
-DOPENAL_INCLUDE_DIR=$libdir/openal_stripped/include/AL \
110+
-DOPENAL_LIBRARY=$libdir/openal_stripped/lib/libOpenAL32.dll.a \
111+
-DOPENAL_DLL=$libdir/openal_stripped/bin/OpenAL32.dll \
112+
-DCURL_DLL=$libdir/libcurl/bin/libcurl-4.dll \
113+
-DCURL_INCLUDE_DIR=$libdir/libcurl/include \
114+
-DCURL_LIBRARY=$libdir/libcurl/lib/libcurl.dll.a \
115+
-DFREETYPE_INCLUDE_DIR_freetype2=$libdir/freetype/include/freetype2 \
116+
-DFREETYPE_INCLUDE_DIR_ft2build=$libdir/freetype/include/freetype2 \
117+
-DFREETYPE_LIBRARY=$libdir/freetype/lib/libfreetype.dll.a \
118+
-DLEVELDB_INCLUDE_DIR=$libdir/leveldb/include \
119+
-DLEVELDB_LIBRARY=$libdir/leveldb/lib/libleveldb.dll.a \
120+
-DCUSTOM_GETTEXT_PATH=$libdir/gettext \
121+
-DGETTEXT_MSGFMT=`which msgfmt` \
122+
-DGETTEXT_DLL=$libdir/gettext/bin/libintl-8.dll \
123+
-DGETTEXT_ICONV_DLL=$libdir/gettext/bin/libiconv-2.dll \
124+
-DGETTEXT_INCLUDE_DIR=$libdir/gettext/include \
125+
-DGETTEXT_LIBRARY=$libdir/gettext/lib/libintl.dll.a
126+
127+
make package -j2
128+
129+
# EOF

‎util/buildbot/toolchain_mingw.cmake

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
# name of the target operating system
2-
SET(CMAKE_SYSTEM_NAME Windows)
2+
SET(CMAKE_SYSTEM_NAME Windows)
33

44
# which compilers to use for C and C++
55
SET(CMAKE_C_COMPILER i586-mingw32msvc-gcc)
66
SET(CMAKE_CXX_COMPILER i586-mingw32msvc-g++)
77
SET(CMAKE_RC_COMPILER i586-mingw32msvc-windres)
88

99
# here is the target environment located
10-
SET(CMAKE_FIND_ROOT_PATH /usr/i586-mingw32msvc /home/celeron55/mingw-install )
10+
SET(CMAKE_FIND_ROOT_PATH /usr/i586-mingw32msvc)
1111

1212
# adjust the default behaviour of the FIND_XXX() commands:
1313
# search headers and libraries in the target environment, search
1414
# programs in the host environment
1515
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
1616
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
1717
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
18-

‎util/buildbot/toolchain_mingw64.cmake

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# name of the target operating system
2+
SET(CMAKE_SYSTEM_NAME Windows)
3+
4+
# which compilers to use for C and C++
5+
SET(CMAKE_C_COMPILER x86_64-mingw32-gcc)
6+
SET(CMAKE_CXX_COMPILER x86_64-mingw32-g++)
7+
SET(CMAKE_RC_COMPILER x86_64-mingw32-windres)
8+
9+
# here is the target environment located
10+
SET(CMAKE_FIND_ROOT_PATH /usr/x86_64-mingw32)
11+
12+
# adjust the default behaviour of the FIND_XXX() commands:
13+
# search headers and libraries in the target environment, search
14+
# programs in the host environment
15+
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
16+
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
17+
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

0 commit comments

Comments
 (0)
Please sign in to comment.