From ee72f7448a3795ec8cab58c500614691f79aaba1 Mon Sep 17 00:00:00 2001 From: "Eric B. Ridge" Date: Tue, 19 Jan 2021 13:37:37 -0700 Subject: [PATCH 1/2] fix issue #77: configure_postgres() was failing due to using a relative path to ./configure -- the fix is to use an absolute path, but still make sure that command.current_dir() is set --- cargo-pgx/src/commands/init.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cargo-pgx/src/commands/init.rs b/cargo-pgx/src/commands/init.rs index 3dbbd78dd..b9828457c 100644 --- a/cargo-pgx/src/commands/init.rs +++ b/cargo-pgx/src/commands/init.rs @@ -164,7 +164,9 @@ fn configure_postgres(pg_config: &PgConfig, pgdir: &PathBuf) -> Result<(), std:: pg_config.major_version()?, pg_config.minor_version()? ); - let mut command = std::process::Command::new("./configure"); + let mut configure_path = pgdir.clone(); + configure_path.push("configure"); + let mut command = std::process::Command::new(configure_path); command .arg(format!("--prefix={}", get_pg_installdir(pgdir).display())) From deec571fc4a1d3e390b488df28920f6c1633c35c Mon Sep 17 00:00:00 2001 From: "Eric B. Ridge" Date: Tue, 19 Jan 2021 13:40:01 -0700 Subject: [PATCH 2/2] bump version to v0.1.17 --- Cargo.lock | 14 +++++++------- Cargo.toml | 2 +- cargo-pgx/Cargo.toml | 4 ++-- cargo-pgx/src/templates/cargo_toml | 6 +++--- pgx-macros/Cargo.toml | 4 ++-- pgx-pg-sys/Cargo.toml | 6 +++--- pgx-tests/Cargo.toml | 8 ++++---- pgx-utils/Cargo.toml | 2 +- pgx/Cargo.toml | 6 +++--- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7c484cea9..2c939e3cf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -182,7 +182,7 @@ checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" [[package]] name = "cargo-pgx" -version = "0.1.16" +version = "0.1.17" dependencies = [ "clap", "colored", @@ -987,7 +987,7 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "pgx" -version = "0.1.16" +version = "0.1.17" dependencies = [ "atomic-traits", "bitflags", @@ -1008,7 +1008,7 @@ dependencies = [ [[package]] name = "pgx-macros" -version = "0.1.16" +version = "0.1.17" dependencies = [ "pgx-utils", "proc-macro2", @@ -1019,7 +1019,7 @@ dependencies = [ [[package]] name = "pgx-parent" -version = "0.1.16" +version = "0.1.17" dependencies = [ "cargo-pgx", "pgx", @@ -1030,7 +1030,7 @@ dependencies = [ [[package]] name = "pgx-pg-sys" -version = "0.1.16" +version = "0.1.17" dependencies = [ "bindgen", "build-deps", @@ -1048,7 +1048,7 @@ dependencies = [ [[package]] name = "pgx-tests" -version = "0.1.16" +version = "0.1.17" dependencies = [ "colored", "lazy_static", @@ -1066,7 +1066,7 @@ dependencies = [ [[package]] name = "pgx-utils" -version = "0.1.16" +version = "0.1.17" dependencies = [ "colored", "dirs", diff --git a/Cargo.toml b/Cargo.toml index 47d523716..029a9763e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pgx-parent" -version = "0.1.16" +version = "0.1.17" authors = ["ZomboDB, LLC "] edition = "2018" license = "MIT" diff --git a/cargo-pgx/Cargo.toml b/cargo-pgx/Cargo.toml index 261f9a393..fdeb19df7 100644 --- a/cargo-pgx/Cargo.toml +++ b/cargo-pgx/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "cargo-pgx" -version = "0.1.16" +version = "0.1.17" authors = ["ZomboDB, LLC "] edition = "2018" license = "MIT" @@ -17,7 +17,7 @@ clap = { version = "2.33.3", features = [ "yaml" ] } colored = "2.0.0" env_proxy = "0.4.1" num_cpus = "1.13.0" -pgx-utils = { path = "../pgx-utils", version = "0.1.16"} +pgx-utils = { path = "../pgx-utils", version = "0.1.17"} proc-macro2 = { version = "1.0.24", features = [ "span-locations" ] } quote = "1.0.8" rayon = "1.5.0" diff --git a/cargo-pgx/src/templates/cargo_toml b/cargo-pgx/src/templates/cargo_toml index 72a0914cb..4cc1dbce1 100644 --- a/cargo-pgx/src/templates/cargo_toml +++ b/cargo-pgx/src/templates/cargo_toml @@ -15,11 +15,11 @@ pg13 = ["pgx/pg13", "pgx-tests/pg13" ] pg_test = [] [dependencies] -pgx = "0.1.16" -pgx-macros = "0.1.16" +pgx = "0.1.17" +pgx-macros = "0.1.17" [dev-dependencies] -pgx-tests = "0.1.16" +pgx-tests = "0.1.17" [profile.dev] panic = "unwind" diff --git a/pgx-macros/Cargo.toml b/pgx-macros/Cargo.toml index ed05ce108..98fe0a90f 100644 --- a/pgx-macros/Cargo.toml +++ b/pgx-macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pgx-macros" -version = "0.1.16" +version = "0.1.17" authors = ["ZomboDB, LLC "] edition = "2018" license = "MIT" @@ -14,7 +14,7 @@ readme = "README.md" proc-macro = true [dependencies] -pgx-utils = { path = "../pgx-utils", version = "0.1.16"} +pgx-utils = { path = "../pgx-utils", version = "0.1.17"} proc-macro2 = "1.0.24" quote = "1.0.8" syn = { version = "1.0.58", features = [ "extra-traits", "full", "fold", "parsing" ] } diff --git a/pgx-pg-sys/Cargo.toml b/pgx-pg-sys/Cargo.toml index b23fbb4fe..f6122206d 100644 --- a/pgx-pg-sys/Cargo.toml +++ b/pgx-pg-sys/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pgx-pg-sys" -version = "0.1.16" +version = "0.1.17" authors = ["ZomboDB, LLC "] edition = "2018" license = "MIT" @@ -25,14 +25,14 @@ targets = ["x86_64-unknown-linux-gnu"] [dependencies] memoffset = "0.6.1" once_cell = "1.5.2" -pgx-macros = { path = "../pgx-macros/", version = "0.1.16"} +pgx-macros = { path = "../pgx-macros/", version = "0.1.17"} [build-dependencies] bindgen = "0.56.0" build-deps = "0.1.4" colored = "2.0.0" num_cpus = "1.13.0" -pgx-utils = { path = "../pgx-utils/", version = "0.1.16"} +pgx-utils = { path = "../pgx-utils/", version = "0.1.17"} proc-macro2 = "1.0.24" quote = "1.0.8" rayon = "1.5.0" diff --git a/pgx-tests/Cargo.toml b/pgx-tests/Cargo.toml index 062d950bb..c3adaea2a 100644 --- a/pgx-tests/Cargo.toml +++ b/pgx-tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pgx-tests" -version = "0.1.16" +version = "0.1.17" authors = ["ZomboDB, LLC "] edition = "2018" license = "MIT" @@ -29,9 +29,9 @@ no-default-features = true colored = "2.0.0" lazy_static = "1.4.0" libc = "0.2.82" -pgx = { path = "../pgx", default-features = false, version= "0.1.16"} -pgx-macros = { path = "../pgx-macros", version= "0.1.16"} -pgx-utils = { path = "../pgx-utils", version= "0.1.16"} +pgx = { path = "../pgx", default-features = false, version= "0.1.17"} +pgx-macros = { path = "../pgx-macros", version= "0.1.17"} +pgx-utils = { path = "../pgx-utils", version= "0.1.17"} postgres = "0.19.0" regex = "1.4.3" serde = "1.0.120" diff --git a/pgx-utils/Cargo.toml b/pgx-utils/Cargo.toml index 563d9339f..b3834bca7 100644 --- a/pgx-utils/Cargo.toml +++ b/pgx-utils/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pgx-utils" -version = "0.1.16" +version = "0.1.17" authors = ["ZomboDB, LLC "] edition = "2018" license = "MIT" diff --git a/pgx/Cargo.toml b/pgx/Cargo.toml index 588f2077a..c92117ed5 100644 --- a/pgx/Cargo.toml +++ b/pgx/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pgx" -version = "0.1.16" +version = "0.1.17" authors = ["ZomboDB, LLC "] edition = "2018" license = "MIT" @@ -30,8 +30,8 @@ no-default-features = true enum-primitive-derive = "0.2.1" num-traits = "0.2.14" seahash = "4.1.0" -pgx-macros = { path = "../pgx-macros/", version = "0.1.16" } -pgx-pg-sys = { path = "../pgx-pg-sys", version = "0.1.16" } +pgx-macros = { path = "../pgx-macros/", version = "0.1.17" } +pgx-pg-sys = { path = "../pgx-pg-sys", version = "0.1.17" } serde = { version = "1.0.120", features = [ "derive" ] } serde_cbor = "0.11.1" serde_json = "1.0.61"