Skip to content

Commit 4f4c5e0

Browse files
committed
Rename imageflow_cdylib to imageflow_abi
1 parent 8c23ad8 commit 4f4c5e0

File tree

16 files changed

+34
-31
lines changed

16 files changed

+34
-31
lines changed

.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@
2525
/imageflow_tool/valgrind_suppressions.txt
2626
/imageflow_riapi/.valgrindrc
2727
/imageflow_riapi/valgrind_suppressions.txt
28-
/imageflow_cdylib/.valgrindrc
29-
/imageflow_cdylib/valgrind_suppressions.txt
28+
/imageflow_abi/.valgrindrc
29+
/imageflow_abi/valgrind_suppressions.txt
30+
/c_components/.valgrindrc
31+
/c_components/valgrind_suppressions.txt
3032

3133
# Generated by Cargo
3234
/target/

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[workspace]
2-
members = ["imageflow_serde", "imageflow_core", "imageflow_cdylib", "imageflow_tool", "imageflow_server"]
2+
members = ["imageflow_serde", "imageflow_core", "imageflow_abi", "imageflow_tool", "imageflow_server"]
33

44
[replace]
55
"pkg-config:0.3.8" = { git = "https://github.com/imazen/pkg-config-rs", branch="master"}

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ test_script:
6565
- cargo build --target=%RUST_TARGET% --release
6666
- cargo doc --no-deps
6767
- cd ..
68-
- cd imageflow_cdylib
68+
- cd imageflow_abi
6969
- cargo test
7070
- cargo build --target=%RUST_TARGET% --release
7171
- cargo doc --no-deps

build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ if [[ "$TEST_RUST" == 'True' ]]; then
182182
eval "$VALGRIND_CARGO_COMMAND"
183183
)
184184
(
185-
cd imageflow_cdylib
185+
cd imageflow_abi
186186
eval "$COPY_VALGRINDRC"
187187
eval "$VALGRIND_CARGO_COMMAND"
188188
)
@@ -210,7 +210,7 @@ if [[ "$TEST_RUST" == 'True' ]]; then
210210
cargo test
211211
)
212212
(
213-
cd imageflow_cdylib
213+
cd imageflow_abi
214214
cargo test
215215
)
216216
(
@@ -257,7 +257,7 @@ if [[ "$BUILD_RELEASE" == 'True' ]]; then
257257

258258
echo "Building libimageflow (Release) and docs"
259259
(
260-
cd imageflow_cdylib
260+
cd imageflow_abi
261261
cargo build --release
262262
cargo doc --no-deps
263263
)

imageflow_cdylib/Cargo.toml renamed to imageflow_abi/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package]
2-
name = "imageflow_cdylib"
2+
name = "imageflow_abi"
33
version = "0.1.0"
44
authors = ["Nathanael Jones <[email protected]>"]
55
workspace = "../"

imageflow_cdylib/README.md renamed to imageflow_abi/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Exposes an ABI for other languages; this is the new 'libimageflow'.
66

77
`cargo test` does the most, and tests correctness,
88

9-
`ruby imageflow_cdylib/src/test.rb` (if the FFI gem is installed) will actually make FFI calls happen, in case you're skeptical of symbol name mangling et. al.
9+
`ruby imageflow_abi/src/test.rb` (if the FFI gem is installed) will actually make FFI calls happen, in case you're skeptical of symbol name mangling et. al.
1010

1111
### Documentation
1212

File renamed without changes.

imageflow_abi/imageflow_abi.iml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module type="RUST_MODULE" version="4">
3+
<component name="NewModuleRootManager" inherit-compiler-output="true">
4+
<exclude-output />
5+
<content url="file://$MODULE_DIR$">
6+
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
7+
<sourceFolder url="file://$MODULE_DIR$/../imageflow_abi/examples" isTestSource="false" />
8+
<sourceFolder url="file://$MODULE_DIR$/../imageflow_abi/tests" isTestSource="true" />
9+
<sourceFolder url="file://$MODULE_DIR$/../imageflow_abi/benches" isTestSource="true" />
10+
<excludeFolder url="file://$MODULE_DIR$/../imageflow_abi/target" />
11+
</content>
12+
<orderEntry type="inheritedJdk" />
13+
<orderEntry type="sourceFolder" forTests="false" />
14+
<orderEntry type="library" name="Cargo &lt;imageflow_abi&gt;" level="project" />
15+
<orderEntry type="library" name="Cargo &lt;imageflow_abi&gt;" level="project" />
16+
</component>
17+
</module>
File renamed without changes.
File renamed without changes.

imageflow_cdylib/imageflow_cdylib.iml

Lines changed: 0 additions & 16 deletions
This file was deleted.

imageflow_core/.idea/modules.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

source_guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
* imageflow_core - Defines the FFI exposed in the shared library. Depends on imageflow_serde
88
* imageflow_tool - Command-line app which wraps imageflow_core
99
* imageflow_server - prototype HTTP serve around imageflow_core
10-
* imageflow_cdylib - Empty crate to re-export a dynamic library with dependencies statically linked
10+
* imageflow_abi - Empty crate to re-export a dynamic library with dependencies statically linked
1111
* imageflow_riapia - Eventual home of querystring-command interpreter
1212

1313

1414
C source is located in the root, ./lib, and ./tests
1515

16-
* imageflow.h - NOT what you use when binding to imageflow_cdylib. The header for the C component
16+
* imageflow.h - NOT what you use when binding to imageflow_abi. The header for the C component
1717

1818
Understanding the C data structures
1919

win_build_rust.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ cargo test
1818
cargo build --target=%RUST_TARGET% --release
1919
cargo doc --no-deps
2020
cd ..
21-
cd imageflow_cdylib
21+
cd imageflow_abi
2222
cargo test
2323
cargo build --target=%RUST_TARGET% --release
2424
cargo doc --no-deps

wrappers/ruby/lib/imageflow/ffi.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module Native
33
extend FFI::Library
44

55
def self.dylib_build_dir
6-
File.expand_path("../../../../../imageflow_cdylib", __FILE__)
6+
File.expand_path("../../../../../imageflow_abi", __FILE__)
77
end
88
def self.dylib_path
99
extension = FFI::Platform.is_os("darwin") ? "dylib" : "so"

0 commit comments

Comments
 (0)