Index: openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl,v diff -u -r1.22.2.11 -r1.22.2.12 --- openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl 30 Oct 2021 12:06:43 -0000 1.22.2.11 +++ openacs-4/packages/xotcl-core/tcl/03-doc-procs.tcl 15 Mar 2022 12:01:53 -0000 1.22.2.12 @@ -229,7 +229,7 @@ if {$script eq "" && [info exists ::xotcl::currentScript]} { set script $::xotcl::currentScript } - set root_dir [acs_root_dir] + set root_dir $::acs::rootdir set root_length [string length $root_dir] if { $root_dir eq [string range $script 0 $root_length-1]} { set script [string range $script $root_length+1 end] Index: openacs-4/packages/xotcl-core/tcl/04-library-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/04-library-procs.tcl,v diff -u -r1.6.2.2 -r1.6.2.3 --- openacs-4/packages/xotcl-core/tcl/04-library-procs.tcl 9 Mar 2022 08:23:42 -0000 1.6.2.2 +++ openacs-4/packages/xotcl-core/tcl/04-library-procs.tcl 15 Mar 2022 12:01:53 -0000 1.6.2.3 @@ -65,7 +65,7 @@ if {$package eq ""} { set otherfile $dirname/$filename.tcl } else { - set otherfile [acs_root_dir]/packages/$package/tcl/$filename.tcl + set otherfile $::acs::rootdir/packages/$package/tcl/$filename.tcl } set vn [self] #:log "--exists otherfile $otherfile => [nsv_exists $vn $otherfile]" Index: openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl,v diff -u -r1.148.2.51 -r1.148.2.52 --- openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl 8 Mar 2022 08:56:28 -0000 1.148.2.51 +++ openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl 15 Mar 2022 12:01:53 -0000 1.148.2.52 @@ -1036,7 +1036,7 @@ # Use apm_source instead of source to prevent double # sourcing by the apm_loader (temporary solution, double # sourcing should no happen) - uplevel #1 apm_source "[acs_root_dir]/packages/$package_key/$path" + uplevel #1 apm_source "$::acs::rootdir/packages/$package_key/$path" } set :required_package($package_key) 1 } Index: openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl,v diff -u -r1.41.2.49 -r1.41.2.50 --- openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl 23 Feb 2022 18:40:12 -0000 1.41.2.49 +++ openacs-4/packages/xotcl-core/tcl/06-package-procs.tcl 15 Mar 2022 12:01:53 -0000 1.41.2.50 @@ -115,7 +115,7 @@ set package_key ${:package_key} } foreach location {www resources} { - set fn [acs_root_dir]/packages/$package_key/$location/prototypes/$name.page + set fn $::acs::rootdir/packages/$package_key/$location/prototypes/$name.page if {[file exists $fn]} { if {$location eq "www"} { ns_log warning "deprecated location: you should move prototype page" \ Index: openacs-4/packages/xowf/tcl/test/test-item-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/test/test-item-procs.tcl,v diff -u -r1.1.2.30 -r1.1.2.31 --- openacs-4/packages/xowf/tcl/test/test-item-procs.tcl 3 Feb 2022 12:18:25 -0000 1.1.2.30 +++ openacs-4/packages/xowf/tcl/test/test-item-procs.tcl 15 Mar 2022 12:01:53 -0000 1.1.2.31 @@ -161,7 +161,7 @@ -package_id $package_id \ -creation_user [dict get $user_info user_id]] $file_object set import_file \ - [acs_root_dir]/packages/acs-templating/www/resources/sort-ascending.png + $::acs::rootdir/packages/acs-templating/www/resources/sort-ascending.png $file_object save_new ########################################################### @@ -203,7 +203,7 @@ -package_id $package_id \ -creation_user [dict get $user_info user_id]] $file_object set import_file \ - [acs_root_dir]/packages/acs-templating/www/resources/sort-ascending.png + $::acs::rootdir/packages/acs-templating/www/resources/sort-ascending.png $file_object save_new ########################################################### @@ -240,7 +240,7 @@ -package_id $package_id \ -creation_user [dict get $user_info user_id]] $file_object set import_file \ - [acs_root_dir]/packages/acs-templating/www/resources/sort-ascending.png + $::acs::rootdir/packages/acs-templating/www/resources/sort-ascending.png $file_object save_new ########################################################### Index: openacs-4/packages/xowiki/tcl/package-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v diff -u -r1.332.2.109 -r1.332.2.110 --- openacs-4/packages/xowiki/tcl/package-procs.tcl 21 Feb 2022 11:53:55 -0000 1.332.2.109 +++ openacs-4/packages/xowiki/tcl/package-procs.tcl 15 Mar 2022 12:01:52 -0000 1.332.2.110 @@ -1656,7 +1656,7 @@ foreach location {resources/templates www} { set tmpl /packages/$package_key/$location/$name - set fn [acs_root_dir]/$tmpl + set fn $::acs::rootdir/$tmpl lappend paths $fn #ns_log notice "=== check get_adp_template $fn" Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v diff -u -r1.368.2.114 -r1.368.2.115 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 5 Mar 2022 09:35:19 -0000 1.368.2.114 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 15 Mar 2022 12:01:53 -0000 1.368.2.115 @@ -2157,7 +2157,7 @@ # set __including_page $page - #set __adp_stub [acs_root_dir]/packages/xowiki/www/view-default + #set __adp_stub $::acs::rootdir/packages/xowiki/www/view-default set __adp_stub [::$context_package_id get_adp_template view-default] set template_code [template::adp_compile -string $template]