parsav  Diff

Differences From Artifact [52297260cd]:

• File config.lua — part of check-in [afae276b2f] at 2021-01-29 21:14:57 on branch trunk — rip out json-c, replace with mjson (user: lexi, size: 8428) [annotate] [blame] [check-ins using]

To Artifact [6ab8d1127e]:

• File config.lua — part of check-in [8648683aba] at 2022-11-04 04:27:15 on branch trunk — fixes to make parsav build on modern nix (user: lexi, size: 8637) [annotate] [blame] [check-ins using]

    78     78   	default_ui_accent = tonumber(default('parsav_ui_default_accent',323));
    79     79   }
    80     80   if os.getenv('parsav_let_me_be_an_idiot') == "i know what i'm doing" then
    81     81   	conf.braingeniousmode = true -- SOUND GENERAL QUARTERS
    82     82   end
    83         -if u.ping '.fslckout' or u.ping '_FOSSIL_' then
           83  +if os.getenv 'parsav_build_branch' then
           84  +	conf.build.branch = os.getenv 'parsav_build_branch' 
           85  +	conf.build.checkout = os.getenv 'parsav_build_checkout' 
           86  +elseif u.ping '.fslckout' or u.ping '_FOSSIL_' then
    84     87   	if u.ping '_FOSSIL_' then default_os = 'windows' end
    85     88   	conf.build.branch = u.exec { 'fossil', 'branch', 'current' }
    86     89   	conf.build.checkout = (u.exec { 'fossil', 'sql',
    87     90   		[[select value from localdb.vvar where name = 'checkout-hash']]
    88     91   	}):gsub("^'(.*)'$", '%1')
................................................................................
    89     92   end
    90     93   conf.os    = default('parsav_host_os', default_os)
    91     94   conf.tgtos = default('parsav_target_os', default_os)
    92     95   conf.posix = posixes[conf.os]
    93     96   conf.exe   = u.tobool(default('parsav_link',not conf.tgttrip)) -- turn off for partial builds
    94         -conf.prefix_conf = default('parsav_install_prefix_cfg', conf.prefix)
    95         -conf.prefix_bin = default('parsav_install_prefix_cfg', conf.prefix)
    96         -conf.prefix_static = default('parsav_install_prefix_static', nil)
           97  +conf.prefix_conf = default('parsav_install_prefix_cfg', conf.prefix .. "/etc/parsav")
           98  +conf.prefix_bin = default('parsav_install_prefix_bin', conf.prefix .. "/bin")
           99  +conf.prefix_static = default('parsav_install_prefix_static', conf.prefix_conf .. "/static")
    97    100   conf.build.origin = coalesce(
    98    101   	os.getenv('parsav_builder'),
    99    102   	string.format('%s@%s', coalesce (
   100    103   		os.getenv('USER'),
   101    104   		u.exec{'whoami'}