Skip to content

Commit a356367

Browse files
zilongshanrenzilongshanren
committed
Merge branch 'update-rapidjson-spidermonkey' into v4
Conflicts: build/android.ini build/build.sh
2 parents 04b17ef + 362c318 commit a356367

File tree

8 files changed

+71
-38
lines changed

8 files changed

+71
-38
lines changed

‎build/android.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ cfg_mips_toolchain_bin="${ANDROID_NDK}/toolchains/mipsel-linux-android-${cfg_def
3333

3434
#build arches and build libraries
3535
cfg_all_supported_arches=("arm" "armv7" "x86" "arm64" "mips")
36-
cfg_all_supported_libraries=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d")
36+
cfg_all_supported_libraries=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d" "rapidjson")
3737
cfg_default_arches_all=("arm" "armv7" "x86")
38-
cfg_default_libraries_all=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d")
38+
cfg_default_libraries_all=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d" "rapidjson")
3939

4040

4141
#whether build fat library, use lipo -S create

‎build/build.sh

Lines changed: 36 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -384,23 +384,29 @@ do
384384
original_archive_name=$archive_name
385385
fi
386386

387-
#copy .a archive from install-platform folder
388-
cp $top_dir/contrib/$install_library_path/$arch/lib/lib$original_archive_name.a $local_library_install_path/lib$archive_name.a
389-
390-
#copy dependent .a archive
391-
parse_dependent_archive_list=${lib}_dependent_archive_list
392-
original_dependent_archive_list=${!parse_dependent_archive_list}
393-
if [ ! -z $original_dependent_archive_list ];then
394-
echo "Copying dependent archives..."
395-
original_dependent_archive_list=(${original_dependent_archive_list//,/ })
396-
397-
for dep_archive in ${original_dependent_archive_list[@]}
398-
do
399-
local_library_install_path=$cfg_platform_name/$original_arch_name/libs
400-
mkdir -p $local_library_install_path
401-
cp $top_dir/contrib/$install_library_path/$arch/lib/lib${dep_archive}.a $local_library_install_path/lib${dep_archive}.a
402-
403-
done
387+
#whether to copy the archive file or not
388+
parse_ignore_archive=${lib}_ignore_archive
389+
original_ignore_archive=${!parse_ignore_archive}
390+
if [ "${original_ignore_archive}" != "yes" ];then
391+
392+
#copy .a archive from install-platform folder
393+
cp $top_dir/contrib/$install_library_path/$arch/lib/lib$original_archive_name.a $local_library_install_path/lib$archive_name.a
394+
395+
#copy dependent .a archive
396+
parse_dependent_archive_list=${lib}_dependent_archive_list
397+
original_dependent_archive_list=${!parse_dependent_archive_list}
398+
if [ ! -z $original_dependent_archive_list ];then
399+
echo "copying dependent archives..."
400+
original_dependent_archive_list=(${original_dependent_archive_list//,/ })
401+
402+
for dep_archive in ${original_dependent_archive_list[@]}
403+
do
404+
local_library_install_path=$cfg_platform_name/$original_arch_name/libs
405+
mkdir -p $local_library_install_path
406+
cp $top_dir/contrib/$install_library_path/$arch/lib/lib${dep_archive}.a $local_library_install_path/lib${dep_archive}.a
407+
408+
done
409+
fi
404410
fi
405411

406412

@@ -445,20 +451,22 @@ do
445451
done
446452

447453
# echo $cfg_build_fat_library
448-
if [ $cfg_build_fat_library = "yes" ];then
454+
if [ "${original_ignore_archive}" != "yes" ];then
455+
if [ $cfg_build_fat_library = "yes" ];then
449456

450-
create_fat_library $archive_name
457+
create_fat_library $archive_name
451458

452-
parse_dependent_archive_list=${lib}_dependent_archive_list
453-
original_dependent_archive_list=${!parse_dependent_archive_list}
454-
if [ ! -z $original_dependent_archive_list ];then
455-
echo "create fat library for dependent archives..."
456-
original_dependent_archive_list=(${original_dependent_archive_list//,/ })
459+
parse_dependent_archive_list=${lib}_dependent_archive_list
460+
original_dependent_archive_list=${!parse_dependent_archive_list}
461+
if [ ! -z $original_dependent_archive_list ];then
462+
echo "create fat library for dependent archives..."
463+
original_dependent_archive_list=(${original_dependent_archive_list//,/ })
457464

458-
for dep_archive in ${original_dependent_archive_list[@]}
459-
do
460-
create_fat_library $dep_archive
461-
done
465+
for dep_archive in ${original_dependent_archive_list[@]}
466+
do
467+
create_fat_library $dep_archive
468+
done
469+
fi
462470
fi
463471
fi
464472

‎build/ios.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ cfg_armv7s_host_machine="arm-apple-darwin"
1414
cfg_arm64_host_machine="arm-apple-darwin"
1515

1616
cfg_all_supported_arches=("armv7" "armv7s" "i386" "arm64" "x86_64")
17-
cfg_all_supported_libraries=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d")
17+
cfg_all_supported_libraries=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d" "rapidjson")
1818
cfg_default_arches_all=("armv7" "armv7s" "i386" "arm64" "x86_64")
19-
cfg_default_libraries_all=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d")
19+
cfg_default_libraries_all=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d" "rapidjson")
2020

2121

2222
cfg_build_fat_library=yes

‎build/linux.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ cfg_i386_host_machine="i386-linux-gnu"
1717

1818

1919
cfg_all_supported_arches=("i386" "x86_64")
20-
cfg_all_supported_libraries=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d" "glfw")
20+
cfg_all_supported_libraries=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d" "glfw" "rapidjson")
2121
cfg_default_arches_all=("x86_64")
22-
cfg_default_libraries_all=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d" "glfw")
22+
cfg_default_libraries_all=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d" "glfw" "rapidjson")
2323

2424

2525
cfg_build_fat_library=no

‎build/mac.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ cfg_is_cross_compile=no
2020

2121
#build arches and build libraries
2222
cfg_all_supported_arches=("i386" "x86_64")
23-
cfg_all_supported_libraries=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "glfw" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d")
23+
cfg_all_supported_libraries=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "glfw" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d" "rapidjson")
2424
cfg_default_arches_all=("x86_64")
25-
cfg_default_libraries_all=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "glfw" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d")
25+
cfg_default_libraries_all=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "glfw" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffers" "minizip" "tinyxml2" "cjson" "luasocket" "box2d" "rapidjson")
2626

2727

2828
#whether build fat library, use lipo -S create

‎build/main.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ luasocket_header_files=luasocket
2626
box2d_header_files=Box2D
2727
ssl_header_files=openssl
2828
glfw_header_files=GLFW
29+
rapidjson_header_files=rapidjson
30+
31+
#don't copy archive files for header only libraries, eg. rapidjson
32+
rapidjson_ignore_archive=yes
2933

3034
#header files Folder
3135
box2d_header_files_folder=Box2D

‎build/tizen.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ cfg_armv7_toolchain_bin="${TIZEN_SDK}/tools/arm-linux-gnueabi-gcc-4.8/bin"
1919

2020
#build arches and build libraries
2121
cfg_all_supported_arches=("armv7")
22-
cfg_all_supported_libraries=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffer" "minizip" "tinyxml" "cjson" "luasocket")
22+
cfg_all_supported_libraries=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffer" "minizip" "tinyxml" "cjson" "luasocket" "rapidjson")
2323
cfg_default_arches_all=("armv7")
24-
cfg_default_libraries_all=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffer" "minizip" "tinyxml" "cjson" "luasocket")
24+
cfg_default_libraries_all=("png" "zlib" "lua" "luajit" "websockets" "curl" "freetype" "jpeg" "tiff" "webp" "chipmunk" "openssl" "edtaa3func" "xxhash" "xxtea" "convertutf" "flatbuffer" "minizip" "tinyxml" "cjson" "luasocket" "rapidjson")
2525

2626

2727
#whether build fat library, use lipo -S create

‎contrib/src/rapidjson/rules.mak

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# rapidjson
2+
3+
RAPIDJSON_GITURL := https://github.com/miloyip/rapidjson
4+
5+
6+
$(TARBALLS)/librapidjson-git.tar.xz:
7+
$(call download_git,$(RAPIDJSON_GITURL),master,3a4835e)
8+
9+
.sum-rapidjson: librapidjson-git.tar.xz
10+
$(warning $@ not implemented)
11+
touch $@
12+
13+
14+
rapidjson: librapidjson-git.tar.xz .sum-rapidjson
15+
$(UNPACK)
16+
$(MOVE)
17+
18+
.rapidjson: rapidjson toolchain.cmake
19+
cd $< && $(HOSTVARS) ${CMAKE} -DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF -DRAPIDJSON_BUILD_TESTS=OFF
20+
cd $< && $(MAKE) VERBOSE=1 install
21+
touch $@

0 commit comments

Comments
 (0)