-
Notifications
You must be signed in to change notification settings - Fork 235
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/2.1.0' into develop
- Loading branch information
Showing
6 changed files
with
151 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| # Windows i386 executables only | ||
|
|
||
| This project needs to patch boost build system (add extra compilation flags). | ||
|
|
||
| Rename the patches directory for your boost version to ```patches```. | ||
|
|
||
| Start from a clean build directory. The patches will be applied at CMake project generation (```cmake ..```). | ||
|
|
||
| Renaming example: | ||
| * boost-1.61.0: ```patches-boost-1.61.0``` -> ```patches``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| --- a/libs/context/build/Jamfile.v2 | ||
| +++ b/libs/context/build/Jamfile.v2 | ||
| @@ -116,7 +116,7 @@ | ||
|
|
||
| actions masm | ||
| { | ||
| - ml /c /Fo"$(<)" "$(>)" | ||
| + ml /safeseh /c /Fo"$(<)" "$(>)" | ||
| } | ||
|
|
||
| actions masm64 | ||
| --- a/tools/build/src/tools/msvc.jam | ||
| +++ b/tools/build/src/tools/msvc.jam | ||
| @@ -1113,7 +1113,7 @@ | ||
| # Turn on some options for i386 assembler | ||
| # -coff generate COFF format object file (compatible with cl.exe output) | ||
| local default-assembler-amd64 = ml64 ; | ||
| - local default-assembler-i386 = "ml -coff" ; | ||
| + local default-assembler-i386 = "ml -coff -safeseh" ; | ||
| local default-assembler-ia64 = ias ; | ||
| local default-assembler-ia64 = armasm ; | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| # Issues with new google test archive format | ||
|
|
||
| * Rename zip file from ```googletest-release-1.7.0.zip``` to ```gtest-1.7.0.zip``` | ||
| * Rename archive internal root folder from ```googletest-release-1.7.0``` to ```gtest-1.7.0``` | ||
|
|
||
| This will be fixed in a future version. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| #!/bin/bash | ||
| # | ||
| # This script generates an archive release | ||
| # Includes : | ||
| # - SSF binaries | ||
| # - UPXed SSF binaries | ||
| # - tests certs (for test purpose only) | ||
| # | ||
|
|
||
| set -e | ||
|
|
||
| echo "Usage: ./generate_release.sh SSF_VERSION CMAKE_GENERATOR ABS_SSF_SOURCE_DIR OUTPUT_FILEPATH" | ||
|
|
||
| if [ -z "$1" ]; then "First arg is VERSION"; exit 1; else VERSION="$1"; fi | ||
| if [ -z "$2" ]; then "Second arg is CMAKE_GENERATOR"; exit 1; else CMAKE_GENERATOR="$2"; fi | ||
| if [ -z "$3" ]; then "Third arg is ABS_SSF_SOURCE_DIR"; exit 1; else ABS_SSF_SOURCE_DIR="$3"; fi | ||
| if [ -z "$4" ]; then "Fourth arg is OUTPUT_FILE"; exit 1; else OUTPUT_FILEPATH="$4"; fi | ||
|
|
||
| PWD=`pwd` | ||
|
|
||
| TMP_BUILD_DIR="${PWD}/tmp_build_release" | ||
| TARGET="ssf-${VERSION}" | ||
| INSTALL_BIN_PATH="${TMP_BUILD_DIR}/ssf/${TARGET}" | ||
|
|
||
| echo "* VERSION: '${VERSION}'" | ||
| echo "* CMAKE_GENERATOR: '${CMAKE_GENERATOR}'" | ||
| echo "* ABS_SSF_SOURCE_DIR: '${ABS_SSF_SOURCE_DIR}'" | ||
| echo "* OUTPUT_FILEPATH: '${OUTPUT_FILEPATH}'" | ||
|
|
||
| echo "* Create tmp build directory '${TMP_BUILD_DIR}'" | ||
| mkdir -p ${TMP_BUILD_DIR} | ||
|
|
||
| cd ${TMP_BUILD_DIR} | ||
| echo "* CMake pre processing" | ||
| cmake ${ABS_SSF_SOURCE_DIR} -DCMAKE_BUILD_TYPE=Release -G "${CMAKE_GENERATOR}" | ||
|
|
||
| echo "* Build binaries" | ||
| cmake --build . --target install --config Release | ||
|
|
||
| echo "* UPX binaries" | ||
| for BIN_PATH in ${INSTALL_BIN_PATH}/ssf*; | ||
| do | ||
| BIN_NAME=`basename ${BIN_PATH}` | ||
| upx --best -o "${INSTALL_BIN_PATH}/upx-${BIN_NAME}" ${BIN_PATH} | ||
| done | ||
|
|
||
| echo "* Install directory '${INSTALL_BIN_PATH}'" | ||
| cd "${INSTALL_BIN_PATH}/.." | ||
|
|
||
| echo "* Create tar archive '${OUTPUT_FILEPATH}'" | ||
| tar -czf "${OUTPUT_FILEPATH}" "${TARGET}" | ||
|
|
||
| echo "* Clean tmp build directory '${TMP_BUILD_DIR}'" | ||
| rm -rf "${TMP_BUILD_DIR}" |