proxmox-mirrors/proxmox-perl-rs
1
0
Fork 0
mirror of https://git.proxmox.com/git/proxmox-perl-rs synced 2025-07-27 14:35:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "move apt to /perl-apt, use PERLMOD_PRODUCT env var"

Browse Source 
This reverts commit 9bc3ab23cb.

This is not the way we're going to organize common code.
This commit is contained in:
Wolfgang Bumiller 2022-02-28 12:01:24 +01:00
parent ba6812a109
commit 15c39cb258
6 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -1,5 +1,5 @@
[workspace] [workspace]
exclude = [ "build", "perl-*" ] exclude = [ "build" ]
members = [ members = [
"pve-rs", "pve-rs",
"pmg-rs", "pmg-rs",

1
Makefile
View File

@ -26,7 +26,6 @@ pve pmg:
build: build:
mkdir build mkdir build
echo system >build/rust-toolchain echo system >build/rust-toolchain
cp -a ./perl-* ./build/
cp -a ./pve-rs ./build cp -a ./pve-rs ./build
cp -a ./pmg-rs ./build cp -a ./pmg-rs ./build

0
perl-apt/mod.rs → pve-rs/src/apt/mod.rs
View File

2
perl-apt/repositories.rs → pve-rs/src/apt/repositories.rs
View File

@ -1,4 +1,4 @@
#[perlmod::package(name = "${PERLMOD_PRODUCT}::RS::APT::Repositories")] #[perlmod::package(name = "PVE::RS::APT::Repositories", lib = "pve_rs")]
mod export { mod export {
use std::convert::TryInto; use std::convert::TryInto;

2
pve-rs/src/lib.rs
View File

@ -1,8 +1,6 @@
//! Rust library for the Proxmox VE code base. //! Rust library for the Proxmox VE code base.
#[path = "../../perl-apt/mod.rs"]
pub mod apt; pub mod apt;
pub mod openid; pub mod openid;
pub mod tfa; pub mod tfa;
pub mod calendar_event; pub mod calendar_event;

2
pve-rs/src/openid/mod.rs
View File

@ -1,4 +1,4 @@
#[perlmod::package(name = "${PERLMOD_PRODUCT}::RS::OpenId")] #[perlmod::package(name = "PVE::RS::OpenId", lib = "pve_rs")]
mod export { mod export {
use std::sync::Mutex; use std::sync::Mutex;
use std::convert::TryFrom; use std::convert::TryFrom;