Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make publishing libthemis-src easier #419

Merged
merged 8 commits into from
Mar 11, 2019
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,10 @@ endif
ifndef ERROR
include src/soter/soter.mk
include src/themis/themis.mk
ifndef CARGO
include jni/themis_jni.mk
endif
endif

JSTHEMIS_PACKAGE_VERSION=$(shell cat src/wrappers/themis/jsthemis/package.json \
| grep version \
Expand Down Expand Up @@ -337,8 +339,10 @@ $(AUD_PATH)/%: $(SRC_PATH)/%
@echo -n "compile "
@$(BUILD_CMD)

ifndef CARGO
include tests/test.mk
include tools/afl/fuzzy.mk
endif

err: ; $(ERROR)

Expand Down
9 changes: 9 additions & 0 deletions src/wrappers/themis/rust/libthemis-src/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@ readme = "README.md"
keywords = ["crypto", "Themis"]
categories = ["development-tools::build-utils"]
license = "Apache-2.0"
include = [
"/LICENSE",
"/Cargo.toml",
"/src/**/*",
"/themis/LICENSE",
"/themis/Makefile",
"/themis/src/soter/**/*",
"/themis/src/themis/**/*",
]

[badges]
circle-ci = { repository = "cossacklabs/themis", branch = "master" }
Expand Down
3 changes: 3 additions & 0 deletions src/wrappers/themis/rust/libthemis-src/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ use std::fs;
use std::path::{Path, PathBuf};
use std::process::{Command, Stdio};

// Compile-time check for that we really bundle Themis source code.
const _THEMIS_MAKEFILE: &[u8] = include_bytes!("../themis/Makefile");

/// A builder (literally!) for Themis, produces [`Library`].
///
/// [`Library`]: struct.Library.html
Expand Down
1 change: 0 additions & 1 deletion src/wrappers/themis/rust/libthemis-src/themis/README.md

This file was deleted.

1 change: 0 additions & 1 deletion src/wrappers/themis/rust/libthemis-src/themis/jni

This file was deleted.

1 change: 0 additions & 1 deletion src/wrappers/themis/rust/libthemis-src/themis/tests

This file was deleted.

1 change: 0 additions & 1 deletion src/wrappers/themis/rust/libthemis-src/themis/tools

This file was deleted.