export: fix deprecation notices

larpon · Dec 4, 2024 · 06d16aa · 06d16aa
1 parent 3a588d7
commit 06d16aa
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/export/appimage.v b/export/appimage.v
@@ -34,7 +34,7 @@ pub fn (aif AppImageFormat) ext() string {
 pub struct AppImageOptions {
 	ExportOptions
 pub:
-	work_dir string = os.join_path(paths.tmp_work(), 'export', 'appimage') @[ignore]
+	work_dir string = os.join_path(paths.shy(.temp), 'export', 'appimage') @[ignore]
 	compress bool   @[xdoc: 'Compress executable with `upx` if available']
 	strip    bool   @[xdoc: 'Strip executable symbols with `strip` if available']
 	format   AppImageFormat = .app_image

diff --git a/export/compile.v b/export/compile.v
@@ -124,7 +124,7 @@ pub fn (opt VCompileOptions) uses_gc() bool {
 pub struct VDumpOptions {
 	VCompileOptions
 pub:
-	work_dir string = os.join_path(paths.tmp_work(), 'export', 'v', 'dump') // temporary work directory
+	work_dir string = os.join_path(paths.shy(.temp), 'export', 'v', 'dump') // temporary work directory
 }
 
 pub struct VMetaInfo {
@@ -253,7 +253,7 @@ pub:
 	is_prod   bool
 	cc        string @[required]
 	c_flags   []string // flags to pass to the C compiler(s)
-	work_dir  string = os.join_path(paths.tmp_work(), 'export', 'v', 'cdeps') // temporary work directory
+	work_dir  string = os.join_path(paths.shy(.temp), 'export', 'v', 'cdeps') // temporary work directory
 	v_meta    VMetaInfo
 }
 

diff --git a/export/export.v b/export/export.v
@@ -12,7 +12,7 @@ pub struct ExportOptions {
 pub:
 	// These fields would make little sense to change during a run
 	verbosity int    @[short: v; xdoc: 'Verbosity level 1-3']
-	work_dir  string = os.join_path(paths.tmp_work(), 'export', 'appimage') @[ignore]
+	work_dir  string = os.join_path(paths.shy(.temp), 'export', 'appimage') @[ignore]
 	//
 	run      bool @[ignore]
 	parallel bool = true @[long: 'no-parallel'; xdoc: 'Do not run tasks in parallel.']
@@ -91,7 +91,7 @@ fn (svf &SupportedVFlags) as_v_flags() []string {
 }
 
 pub fn ensure_cache_dir() !string {
-	dir := os.join_path(paths.cache(), 'export')
+	dir := os.join_path(paths.shy(.cache), 'export')
 	paths.ensure(dir)!
 	return dir
 }
diff --git a/export/wasm.v b/export/wasm.v
@@ -21,7 +21,7 @@ pub enum WasmFormat {
 pub struct WasmOptions {
 	ExportOptions
 pub:
-	work_dir string     = os.join_path(paths.tmp_work(), 'export', 'wasm') @[ignore]
+	work_dir string     = os.join_path(paths.shy(.temp), 'export', 'wasm') @[ignore]
 	format   WasmFormat = .emscripten
 	s_flags  []string
 }
@@ -221,7 +221,7 @@ pub fn wasm(opt WasmOptions) !Result {
 	// TODO: cache check?
 	//
 	// TODO: Remove any previous builds??
-	v_c_deps := os.join_path(paths.tmp_work(), 'export', 'v', 'cdeps')
+	v_c_deps := os.join_path(paths.shy(.temp), 'export', 'v', 'cdeps')
 	v_c_c_opt := VCCompileOptions{
 		verbosity: opt.verbosity
 		cache:     opt.cache