ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-02 15:30:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

move zeroidc to rustybits folder

Browse Source
This commit is contained in:
Grant Limberg 2023-08-03 14:47:50 -07:00
parent c6f07ee19f
commit a6b764bf7c
No known key found for this signature in database
GPG Key ID: 8F2F97D3BE8D7735
15 changed files with 1711 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -138,3 +138,4 @@ __pycache__
*_source.tar.bz2 *_source.tar.bz2
snap/.snapcraft snap/.snapcraft
tcp-proxy/tcp-proxy tcp-proxy/tcp-proxy
rustybits/target

4
make-linux.mk
View File

@ -399,7 +399,7 @@ manpages: FORCE
doc: manpages doc: manpages
clean: FORCE clean: FORCE
rm -rf *.a *.so *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/miniupnpc/*.o ext/libnatpmp/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm .depend debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one doc/node_modules ext/misc/*.o debian/.debhelper debian/debhelper-build-stamp docker/zerotier-one zeroidc/target rm -rf *.a *.so *.o node/*.o controller/*.o osdep/*.o service/*.o ext/http-parser/*.o ext/miniupnpc/*.o ext/libnatpmp/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-cli zerotier-selftest build-* ZeroTierOneInstaller-* *.deb *.rpm .depend debian/files debian/zerotier-one*.debhelper debian/zerotier-one.substvars debian/*.log debian/zerotier-one doc/node_modules ext/misc/*.o debian/.debhelper debian/debhelper-build-stamp docker/zerotier-one rustybits/target
distclean: clean distclean: clean
@ -433,7 +433,7 @@ ifeq ($(ZT_SSO_SUPPORTED), 1)
ifeq ($(ZT_EMBEDDED),) ifeq ($(ZT_EMBEDDED),)
zeroidc: FORCE zeroidc: FORCE
# export PATH=/root/.cargo/bin:$$PATH; cd zeroidc && cargo build -j1 $(RUSTFLAGS) # export PATH=/root/.cargo/bin:$$PATH; cd zeroidc && cargo build -j1 $(RUSTFLAGS)
export PATH=/${HOME}/.cargo/bin:$$PATH; cd zeroidc && cargo build $(RUSTFLAGS) export PATH=/${HOME}/.cargo/bin:$$PATH; cd rustybits/zeroidc && cargo build $(RUSTFLAGS)
endif endif
else else
zeroidc: zeroidc:

14
make-mac.mk
View File

@ -114,7 +114,7 @@ osdep/MacDNSHelper.o: osdep/MacDNSHelper.mm
$(CXX) $(CXXFLAGS) -c osdep/MacDNSHelper.mm -o osdep/MacDNSHelper.o $(CXX) $(CXXFLAGS) -c osdep/MacDNSHelper.mm -o osdep/MacDNSHelper.o
one: zeroidc $(CORE_OBJS) $(ONE_OBJS) one.o mac-agent one: zeroidc $(CORE_OBJS) $(ONE_OBJS) one.o mac-agent
$(CXX) $(CXXFLAGS) -o zerotier-one $(CORE_OBJS) $(ONE_OBJS) one.o $(LIBS) zeroidc/target/libzeroidc.a $(CXX) $(CXXFLAGS) -o zerotier-one $(CORE_OBJS) $(ONE_OBJS) one.o $(LIBS) rustybits/target/libzeroidc.a
# $(STRIP) zerotier-one # $(STRIP) zerotier-one
ln -sf zerotier-one zerotier-idtool ln -sf zerotier-one zerotier-idtool
ln -sf zerotier-one zerotier-cli ln -sf zerotier-one zerotier-cli
@ -122,12 +122,12 @@ one: zeroidc $(CORE_OBJS) $(ONE_OBJS) one.o mac-agent
zerotier-one: one zerotier-one: one
zeroidc: zeroidc/target/libzeroidc.a zeroidc: rustybits/target/libzeroidc.a
zeroidc/target/libzeroidc.a: FORCE rustybits/target/libzeroidc.a: FORCE
cd zeroidc && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build --target=x86_64-apple-darwin $(EXTRA_CARGO_FLAGS) cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build -p zeroidc --target=x86_64-apple-darwin $(EXTRA_CARGO_FLAGS)
cd zeroidc && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build --target=aarch64-apple-darwin $(EXTRA_CARGO_FLAGS) cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build -p zeroidc --target=aarch64-apple-darwin $(EXTRA_CARGO_FLAGS)
cd zeroidc && lipo -create target/x86_64-apple-darwin/$(RUST_VARIANT)/libzeroidc.a target/aarch64-apple-darwin/$(RUST_VARIANT)/libzeroidc.a -output target/libzeroidc.a cd rustybits && lipo -create target/x86_64-apple-darwin/$(RUST_VARIANT)/libzeroidc.a target/aarch64-apple-darwin/$(RUST_VARIANT)/libzeroidc.a -output target/libzeroidc.a
central-controller: central-controller:
make ARCH_FLAGS="-arch x86_64" ZT_CONTROLLER=1 one make ARCH_FLAGS="-arch x86_64" ZT_CONTROLLER=1 one
@ -188,7 +188,7 @@ central-controller-docker: _buildx FORCE
@echo Image: registry.zerotier.com/zerotier-central/ztcentral-controller:${TIMESTAMP} @echo Image: registry.zerotier.com/zerotier-central/ztcentral-controller:${TIMESTAMP}
clean: clean:
rm -rf MacEthernetTapAgent *.dSYM build-* *.a *.pkg *.dmg *.o node/*.o controller/*.o service/*.o osdep/*.o ext/http-parser/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-selftest zerotier-cli zerotier doc/node_modules zt1_update_$(ZT_BUILD_PLATFORM)_$(ZT_BUILD_ARCHITECTURE)_* zeroidc/target/ rm -rf MacEthernetTapAgent *.dSYM build-* *.a *.pkg *.dmg *.o node/*.o controller/*.o service/*.o osdep/*.o ext/http-parser/*.o $(CORE_OBJS) $(ONE_OBJS) zerotier-one zerotier-idtool zerotier-selftest zerotier-cli zerotier doc/node_modules zt1_update_$(ZT_BUILD_PLATFORM)_$(ZT_BUILD_ARCHITECTURE)_* rustybits/target/
distclean: clean distclean: clean

1690
rustybits/Cargo.lock generated Normal file
View File

File diff suppressed because it is too large Load Diff

3
rustybits/Cargo.toml Normal file
View File

@ -0,0 +1,3 @@
[workspace]
members = ["zeroidc"]

0
zeroidc/.cargo/config.toml → rustybits/zeroidc/.cargo/config.toml
View File

0
zeroidc/.gitattributes → rustybits/zeroidc/.gitattributes vendored
View File

0
zeroidc/Cargo.lock → rustybits/zeroidc/Cargo.lock generated
View File

0
zeroidc/Cargo.toml → rustybits/zeroidc/Cargo.toml
View File

14
zeroidc/build.rs → rustybits/zeroidc/build.rs
View File

@ -1,8 +1,8 @@
extern crate cbindgen; extern crate cbindgen;
use cbindgen::{Config, Language};
use std::env; use std::env;
use std::path::PathBuf; use std::path::PathBuf;
use cbindgen::{Config, Language};
fn main() { fn main() {
let crate_dir = env::var("CARGO_MANIFEST_DIR").unwrap(); let crate_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
@ -21,17 +21,19 @@ fn main() {
}; };
cbindgen::generate_with_config(&crate_dir, config) cbindgen::generate_with_config(&crate_dir, config)
.unwrap() .unwrap()
.write_to_file(&output_file); .write_to_file(&output_file);
} }
/// Find the location of the `target/` directory. Note that this may be /// Find the location of the `target/` directory. Note that this may be
/// overridden by `cmake`, so we also need to check the `CARGO_TARGET_DIR` /// overridden by `cmake`, so we also need to check the `CARGO_TARGET_DIR`
/// variable. /// variable.
fn target_dir() -> PathBuf { fn target_dir() -> PathBuf {
if let Ok(target) = env::var("CARGO_TARGET_DIR") { if let Ok(target) = env::var("CARGO_TARGET_DIR") {
PathBuf::from(target) PathBuf::from(target)
} else { } else {
PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap()).join("target") PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap())
.join("..")
.join("target")
} }
} }

0
zeroidc/src/error.rs → rustybits/zeroidc/src/error.rs
View File

0
zeroidc/src/ext.rs → rustybits/zeroidc/src/ext.rs
View File

0
zeroidc/src/lib.rs → rustybits/zeroidc/src/lib.rs
View File

0
zeroidc/zeroidc.vcxproj → rustybits/zeroidc/zeroidc.vcxproj
View File

0
zeroidc/zeroidc.vcxproj.filters → rustybits/zeroidc/zeroidc.vcxproj.filters
View File