Separate linux-specific components (#18)

Both makes the project cleaner and allows targeting Mac OS / Windows sometime in the future * Move linux-specific files into sub-directory * Patch up paths in various files to reflect moves * Modify travis.yml to invoke linux Docker file from repo root
danstiner · Jan 29, 2018 · a4ea430 · a4ea430
1 parent d339b30
commit a4ea430
Show file tree

Hide file tree

Showing 65 changed files with 16 additions and 19 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -3,11 +3,11 @@ current_version = 0.2.0
 commit = True
 tag = True
 
-[bumpversion:file:system-daemon/Cargo.toml]
+[bumpversion:file:linux/system-daemon/Cargo.toml]
 search = version = "{current_version}"
 replace = version = "{new_version}"
 
-[bumpversion:file:system-daemon/softu2f-system-daemon.spec]
+[bumpversion:file:linux/system-daemon/softu2f-system-daemon.spec]
 search = Version:        {current_version}
 replace = Version:        {new_version}
 
@@ -19,19 +19,19 @@ replace = version = "{new_version}"
 search = version = "{current_version}"
 replace = version = "{new_version}"
 
-[bumpversion:file:linux-uhid-tokio/Cargo.toml]
+[bumpversion:file:linux/uhid-tokio/Cargo.toml]
 search = version = "{current_version}"
 replace = version = "{new_version}"
 
-[bumpversion:file:user-daemon/Cargo.toml]
+[bumpversion:file:linux/user-daemon/Cargo.toml]
 search = version = "{current_version}"
 replace = version = "{new_version}"
 
-[bumpversion:file:user-daemon/softu2f-user-daemon.spec]
+[bumpversion:file:linux/user-daemon/softu2f-user-daemon.spec]
 search = Version:        {current_version}
 replace = Version:        {new_version}
 
-[bumpversion:file:softu2f.spec]
+[bumpversion:file:linux/softu2f.spec]
 search = Version:        {current_version}
 replace = Version:        {new_version}
 
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ services:
   - docker
 
 before_install:
-- docker build -t danstiner/softu2f-linux .
+- docker build -t danstiner/softu2f-linux -f linux/Dockerfile .
 
 script:
 - docker run -t danstiner/softu2f-linux cargo test --all
diff --git a/Cargo.toml → linux/Cargo.toml b/Cargo.toml → linux/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = ["u2f-core", "u2fhid-protocol", "linux-uhid-sys", "linux-uhid-tokio", "linux-uhid-tokio/example", "user-daemon", "system-daemon"]
+members = ["uhid-sys", "uhid-tokio", "uhid-tokio/example", "user-daemon", "system-daemon"]
 
 [profile.release]
 lto = true

diff --git a/Dockerfile → linux/Dockerfile b/Dockerfile → linux/Dockerfile
@@ -1,9 +1,6 @@
+# Run from repository root, for example: `docker build -t danstiner/softu2f-linux -f linux/Dockerfile .`
 FROM rust:latest
-
 RUN apt-get update && apt-get install -y clang-3.9 libdbus-1-dev libssl-dev libsystemd-dev protobuf-compiler
-
-WORKDIR /app
-COPY . .
-
+COPY . /app
+WORKDIR /app/linux
 RUN cargo build
-
diff --git a/Makefile → linux/Makefile b/Makefile → linux/Makefile
diff --git a/debian/README → linux/debian/README b/debian/README → linux/debian/README
diff --git a/debian/changelog → linux/debian/changelog b/debian/changelog → linux/debian/changelog
diff --git a/debian/compat → linux/debian/compat b/debian/compat → linux/debian/compat
diff --git a/debian/control → linux/debian/control b/debian/control → linux/debian/control
diff --git a/debian/copyright → linux/debian/copyright b/debian/copyright → linux/debian/copyright
diff --git a/debian/rules → linux/debian/rules b/debian/rules → linux/debian/rules
diff --git a/debian/softu2f-docs.docs → linux/debian/softu2f-docs.docs b/debian/softu2f-docs.docs → linux/debian/softu2f-docs.docs
diff --git a/debian/source/format → linux/debian/source/format b/debian/source/format → linux/debian/source/format
diff --git a/softu2f.spec → linux/softu2f.spec b/softu2f.spec → linux/softu2f.spec
diff --git a/system-daemon/Cargo.toml → linux/system-daemon/Cargo.toml b/system-daemon/Cargo.toml → linux/system-daemon/Cargo.toml
@@ -27,10 +27,10 @@ tokio-uds = "0.1.7"
 users = "0.6.0"
 
 [dependencies.linux-uhid-tokio]
-path = "../linux-uhid-tokio"
+path = "../uhid-tokio"
 
 [dependencies.u2fhid-protocol]
-path = "../u2fhid-protocol/"
+path = "../../u2fhid-protocol/"
 
 [[bin]]
 name = "softu2f-system-daemon"

diff --git a/system-daemon/Makefile → linux/system-daemon/Makefile b/system-daemon/Makefile → linux/system-daemon/Makefile
diff --git a/system-daemon/build.rs → linux/system-daemon/build.rs b/system-daemon/build.rs → linux/system-daemon/build.rs
diff --git a/system-daemon/maintainer-scripts/postinst → ...system-daemon/maintainer-scripts/postinst b/system-daemon/maintainer-scripts/postinst → ...system-daemon/maintainer-scripts/postinst
diff --git a/system-daemon/maintainer-scripts/prerm → linux/system-daemon/maintainer-scripts/prerm b/system-daemon/maintainer-scripts/prerm → linux/system-daemon/maintainer-scripts/prerm
diff --git a/system-daemon/protos/socket.proto → linux/system-daemon/protos/socket.proto b/system-daemon/protos/socket.proto → linux/system-daemon/protos/socket.proto
diff --git a/system-daemon/selinux-policy/Makefile → linux/system-daemon/selinux-policy/Makefile b/system-daemon/selinux-policy/Makefile → linux/system-daemon/selinux-policy/Makefile
diff --git a/...ux-policy/softu2f-system-daemon-selinux.8 → ...ux-policy/softu2f-system-daemon-selinux.8 b/...ux-policy/softu2f-system-daemon-selinux.8 → ...ux-policy/softu2f-system-daemon-selinux.8
diff --git a/...policy/softu2f-system-daemon-selinux.spec → ...policy/softu2f-system-daemon-selinux.spec b/...policy/softu2f-system-daemon-selinux.spec → ...policy/softu2f-system-daemon-selinux.spec
diff --git a/...n/selinux-policy/softu2f-system-daemon.fc → ...n/selinux-policy/softu2f-system-daemon.fc b/...n/selinux-policy/softu2f-system-daemon.fc → ...n/selinux-policy/softu2f-system-daemon.fc
diff --git a/...n/selinux-policy/softu2f-system-daemon.if → ...n/selinux-policy/softu2f-system-daemon.if b/...n/selinux-policy/softu2f-system-daemon.if → ...n/selinux-policy/softu2f-system-daemon.if
diff --git a/...n/selinux-policy/softu2f-system-daemon.sh → ...n/selinux-policy/softu2f-system-daemon.sh b/...n/selinux-policy/softu2f-system-daemon.sh → ...n/selinux-policy/softu2f-system-daemon.sh
diff --git a/...n/selinux-policy/softu2f-system-daemon.te → ...n/selinux-policy/softu2f-system-daemon.te b/...n/selinux-policy/softu2f-system-daemon.te → ...n/selinux-policy/softu2f-system-daemon.te
diff --git a/system-daemon/softu2f-system-daemon.spec → .../system-daemon/softu2f-system-daemon.spec b/system-daemon/softu2f-system-daemon.spec → .../system-daemon/softu2f-system-daemon.spec
diff --git a/system-daemon/softu2f-tmpfiles.conf → linux/system-daemon/softu2f-tmpfiles.conf b/system-daemon/softu2f-tmpfiles.conf → linux/system-daemon/softu2f-tmpfiles.conf
diff --git a/system-daemon/softu2f.preset → linux/system-daemon/softu2f.preset b/system-daemon/softu2f.preset → linux/system-daemon/softu2f.preset
diff --git a/system-daemon/softu2f.service → linux/system-daemon/softu2f.service b/system-daemon/softu2f.service → linux/system-daemon/softu2f.service
diff --git a/system-daemon/softu2f.socket → linux/system-daemon/softu2f.socket b/system-daemon/softu2f.socket → linux/system-daemon/softu2f.socket
diff --git a/system-daemon/src/bidirectional_pipe.rs → ...x/system-daemon/src/bidirectional_pipe.rs b/system-daemon/src/bidirectional_pipe.rs → ...x/system-daemon/src/bidirectional_pipe.rs
diff --git a/system-daemon/src/codec.rs → linux/system-daemon/src/codec.rs b/system-daemon/src/codec.rs → linux/system-daemon/src/codec.rs
diff --git a/system-daemon/src/definitions.rs → linux/system-daemon/src/definitions.rs b/system-daemon/src/definitions.rs → linux/system-daemon/src/definitions.rs
diff --git a/system-daemon/src/device.rs → linux/system-daemon/src/device.rs b/system-daemon/src/device.rs → linux/system-daemon/src/device.rs
diff --git a/system-daemon/src/lib.rs → linux/system-daemon/src/lib.rs b/system-daemon/src/lib.rs → linux/system-daemon/src/lib.rs
diff --git a/system-daemon/src/main.rs → linux/system-daemon/src/main.rs b/system-daemon/src/main.rs → linux/system-daemon/src/main.rs
diff --git a/system-daemon/src/proto.rs → linux/system-daemon/src/proto.rs b/system-daemon/src/proto.rs → linux/system-daemon/src/proto.rs
diff --git a/system-daemon/src/sequential_stream.rs → linux/system-daemon/src/sequential_stream.rs b/system-daemon/src/sequential_stream.rs → linux/system-daemon/src/sequential_stream.rs
diff --git a/linux-uhid-sys/Cargo.toml → linux/uhid-sys/Cargo.toml b/linux-uhid-sys/Cargo.toml → linux/uhid-sys/Cargo.toml
diff --git a/linux-uhid-sys/build.rs → linux/uhid-sys/build.rs b/linux-uhid-sys/build.rs → linux/uhid-sys/build.rs
diff --git a/linux-uhid-sys/src/lib.rs → linux/uhid-sys/src/lib.rs b/linux-uhid-sys/src/lib.rs → linux/uhid-sys/src/lib.rs
diff --git a/linux-uhid-sys/wrapper.h → linux/uhid-sys/wrapper.h b/linux-uhid-sys/wrapper.h → linux/uhid-sys/wrapper.h
diff --git a/linux-uhid-tokio/Cargo.toml → linux/uhid-tokio/Cargo.toml b/linux-uhid-tokio/Cargo.toml → linux/uhid-tokio/Cargo.toml
@@ -16,4 +16,4 @@ tokio-io = "0.1.3"
 tokio-proto = "0.1.1"
 
 [dependencies.linux-uhid-sys]
-path = "../linux-uhid-sys"
+path = "../uhid-sys"
diff --git a/linux-uhid-tokio/example/.gitignore → linux/uhid-tokio/example/.gitignore b/linux-uhid-tokio/example/.gitignore → linux/uhid-tokio/example/.gitignore
diff --git a/linux-uhid-tokio/example/Cargo.toml → linux/uhid-tokio/example/Cargo.toml b/linux-uhid-tokio/example/Cargo.toml → linux/uhid-tokio/example/Cargo.toml
diff --git a/linux-uhid-tokio/example/src/main.rs → linux/uhid-tokio/example/src/main.rs b/linux-uhid-tokio/example/src/main.rs → linux/uhid-tokio/example/src/main.rs
diff --git a/linux-uhid-tokio/src/character_device.rs → linux/uhid-tokio/src/character_device.rs b/linux-uhid-tokio/src/character_device.rs → linux/uhid-tokio/src/character_device.rs
diff --git a/...x-uhid-tokio/src/character_device_file.rs → ...x/uhid-tokio/src/character_device_file.rs b/...x-uhid-tokio/src/character_device_file.rs → ...x/uhid-tokio/src/character_device_file.rs
diff --git a/linux-uhid-tokio/src/lib.rs → linux/uhid-tokio/src/lib.rs b/linux-uhid-tokio/src/lib.rs → linux/uhid-tokio/src/lib.rs
diff --git a/...id-tokio/src/poll_evented_read_wrapper.rs → ...id-tokio/src/poll_evented_read_wrapper.rs b/...id-tokio/src/poll_evented_read_wrapper.rs → ...id-tokio/src/poll_evented_read_wrapper.rs
diff --git a/linux-uhid-tokio/src/uhid_codec.rs → linux/uhid-tokio/src/uhid_codec.rs b/linux-uhid-tokio/src/uhid_codec.rs → linux/uhid-tokio/src/uhid_codec.rs
diff --git a/linux-uhid-tokio/src/uhid_device.rs → linux/uhid-tokio/src/uhid_device.rs b/linux-uhid-tokio/src/uhid_device.rs → linux/uhid-tokio/src/uhid_device.rs
diff --git a/...-uhid-tokio/test/generate-uhid-requests.c → .../uhid-tokio/test/generate-uhid-requests.c b/...-uhid-tokio/test/generate-uhid-requests.c → .../uhid-tokio/test/generate-uhid-requests.c
diff --git a/user-daemon/Cargo.toml → linux/user-daemon/Cargo.toml b/user-daemon/Cargo.toml → linux/user-daemon/Cargo.toml
@@ -23,10 +23,10 @@ tokio-uds = "0.1.7"
 path = "../system-daemon"
 
 [dependencies.u2f-core]
-path = "../u2f-core"
+path = "../../u2f-core"
 
 [dependencies.u2fhid-protocol]
-path = "../u2fhid-protocol"
+path = "../../u2fhid-protocol"
 
 [dev-dependencies]
 tempdir = "0.3.5"

diff --git a/user-daemon/Makefile → linux/user-daemon/Makefile b/user-daemon/Makefile → linux/user-daemon/Makefile
diff --git a/user-daemon/maintainer-scripts/postinst → ...x/user-daemon/maintainer-scripts/postinst b/user-daemon/maintainer-scripts/postinst → ...x/user-daemon/maintainer-scripts/postinst
diff --git a/user-daemon/maintainer-scripts/prerm → linux/user-daemon/maintainer-scripts/prerm b/user-daemon/maintainer-scripts/prerm → linux/user-daemon/maintainer-scripts/prerm
diff --git a/user-daemon/softu2f-user-daemon.spec → linux/user-daemon/softu2f-user-daemon.spec b/user-daemon/softu2f-user-daemon.spec → linux/user-daemon/softu2f-user-daemon.spec
diff --git a/user-daemon/softu2f.preset → linux/user-daemon/softu2f.preset b/user-daemon/softu2f.preset → linux/user-daemon/softu2f.preset
diff --git a/user-daemon/softu2f.service → linux/user-daemon/softu2f.service b/user-daemon/softu2f.service → linux/user-daemon/softu2f.service
diff --git a/user-daemon/src/file_store.rs → linux/user-daemon/src/file_store.rs b/user-daemon/src/file_store.rs → linux/user-daemon/src/file_store.rs
diff --git a/user-daemon/src/main.rs → linux/user-daemon/src/main.rs b/user-daemon/src/main.rs → linux/user-daemon/src/main.rs
diff --git a/user-daemon/src/user_presence.rs → linux/user-daemon/src/user_presence.rs b/user-daemon/src/user_presence.rs → linux/user-daemon/src/user_presence.rs