StarMirror/sandboxed-api
1
0
Fork 0
mirror of https://github.com/google/sandboxed-api.git synced 2024-03-22 13:11:30 +08:00
Code Issues Projects Releases Wiki Activity

Fixed patch command in cmake. Fixed style

Browse Source
This commit is contained in:
root 2020-09-23 17:12:38 +00:00
parent 0bc5c28cb5
commit 9bc3d123a9
8 changed files with 43 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
oss-internship-2020/sapi_lodepng/.gitignore vendored
View File

@ -1 +1,2 @@
build/ build/
.clang-format

32
oss-internship-2020/sapi_lodepng/CMakeLists.txt
View File

@ -20,36 +20,24 @@ set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED 17) set(CMAKE_CXX_STANDARD_REQUIRED 17)
# Apply the patches to the header file. # Apply the patches to the header file.
file(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/patches")
# Move the original header to a new folder to use as target, apply the patch
# and move it back to build the library.
add_custom_command( add_custom_command(
OUTPUT "${PROJECT_BINARY_DIR}/patches/lodepng.h" OUTPUT "${PROJECT_BINARY_DIR}/lodepng/lodepng.h" "${PROJECT_BINARY_DIR}/lodepng/lodepng.cpp"
COMMENT "Applying patch to header file." COMMENT "Applying patch to header file."
COMMAND cp "${PROJECT_SOURCE_DIR}/patches/header.patch" "${PROJECT_BINARY_DIR}/patches/" COMMAND cp -r "${PROJECT_SOURCE_DIR}/lodepng" "${PROJECT_BINARY_DIR}/"
COMMAND cp "${PROJECT_SOURCE_DIR}/lodepng/lodepng.h" "${PROJECT_BINARY_DIR}/patches/" COMMAND cp "${PROJECT_SOURCE_DIR}/patches/header.patch" "${PROJECT_BINARY_DIR}/lodepng/"
COMMAND cd "${PROJECT_BINARY_DIR}/patches" && patch < header.patch COMMAND cd "${PROJECT_BINARY_DIR}/lodepng" && patch < header.patch
COMMAND cp "${PROJECT_BINARY_DIR}/patches/lodepng.h" "${PROJECT_SOURCE_DIR}/lodepng/"
) )
set_property(
SOURCE
"${PROJECT_SOURCE_DIR}/lodepng/lodepng.h"
APPEND PROPERTY OBJECT_DEPENDS
"${PROJECT_BINARY_DIR}/patches/lodepng.h"
)
# Build static library. # Build static library.
add_library(lodepng STATIC add_library(lodepng STATIC
"${PROJECT_SOURCE_DIR}/lodepng/lodepng.cpp" "${PROJECT_BINARY_DIR}/lodepng/lodepng.cpp"
"${PROJECT_SOURCE_DIR}/lodepng/lodepng.h" "${PROJECT_BINARY_DIR}/lodepng/lodepng.h"
) )
# Build SAPI library target_include_directories(lodepng PUBLIC "${PROJECT_BINARY_DIR}/lodepng")
set(SAPI_ROOT "" CACHE PATH "Path to the Sandboxed API source tree")
# Build SAPI library
set(SAPI_ROOT "${PROJECT_SOURCE_DIR}/../.." CACHE PATH "Path to the Sandboxed API source tree")
add_subdirectory("${SAPI_ROOT}" add_subdirectory("${SAPI_ROOT}"
"${CMAKE_BINARY_DIR}/sandboxed-api-build" "${CMAKE_BINARY_DIR}/sandboxed-api-build"
@ -79,7 +67,7 @@ add_sapi_library(
lodepng_save_file lodepng_save_file
lodepng_load_file lodepng_load_file
INPUTS "${PROJECT_SOURCE_DIR}/lodepng/lodepng.h" INPUTS "${PROJECT_BINARY_DIR}/lodepng/lodepng.h"
LIBRARY lodepng LIBRARY lodepng
LIBRARY_NAME Lodepng LIBRARY_NAME Lodepng
NAMESPACE "" NAMESPACE ""

1
oss-internship-2020/sapi_lodepng/examples/helpers.cc
View File

@ -39,3 +39,4 @@ std::string CreateTempDirAtCWD() {
CHECK(result.ok()) << "Could not create temporary directory"; CHECK(result.ok()) << "Could not create temporary directory";
return result.value(); return result.value();
} }

7
oss-internship-2020/sapi_lodepng/examples/helpers.h
View File

@ -22,9 +22,9 @@
#include "sandboxed_api/sandbox2/util/fileops.h" #include "sandboxed_api/sandbox2/util/fileops.h"
#include "sandboxed_api/sandbox2/util/temp_file.h" #include "sandboxed_api/sandbox2/util/temp_file.h"
constexpr size_t kWidth = 512; inline constexpr size_t kWidth = 512;
constexpr size_t kHeight = 512; inline constexpr size_t kHeight = 512;
constexpr size_t kImgLen = kWidth * kHeight * 4; inline constexpr size_t kImgLen = kWidth * kHeight * 4;
// Returns a vector that contains values used for testing. // Returns a vector that contains values used for testing.
// This part of code is taken from // This part of code is taken from
@ -37,3 +37,4 @@ std::vector<uint8_t> GenerateValues();
std::string CreateTempDirAtCWD(); std::string CreateTempDirAtCWD();
#endif // SAPI_LODEPNG_HELPERS_H #endif // SAPI_LODEPNG_HELPERS_H

1
oss-internship-2020/sapi_lodepng/examples/main_sandboxed.cc
View File

@ -192,3 +192,4 @@ int main(int argc, char *argv[]) {
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

1
oss-internship-2020/sapi_lodepng/examples/main_unit_test.cc
View File

@ -211,3 +211,4 @@ TEST(LodePngTest, EncodeDecodeTwoSteps) {
} }
} // namespace } // namespace

3
oss-internship-2020/sapi_lodepng/examples/main_unsandboxed.cc
View File

@ -16,8 +16,8 @@
#include <iostream> #include <iostream>
#include "../lodepng/lodepng.h"
#include "helpers.h" #include "helpers.h"
#include "lodepng.h"
#include "sandboxed_api/sandbox2/util/fileops.h" #include "sandboxed_api/sandbox2/util/fileops.h"
void EncodeDecodeOneStep(const std::string& images_path) { void EncodeDecodeOneStep(const std::string& images_path) {
@ -112,3 +112,4 @@ int main(int argc, char *argv[]) {
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

1
oss-internship-2020/sapi_lodepng/examples/sandbox.h
View File

@ -47,3 +47,4 @@ class SapiLodepngSandbox : public LodepngSandbox {
}; };
#endif // SAPI_LODEPNG_SANDBOX_H_ #endif // SAPI_LODEPNG_SANDBOX_H_