Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

package and houdini.env changes #1459

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

package and houdini.env changes #1459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b1fcb2
package and houdini.env changes
maximcapra Sep 19, 2024
42e3a55
changed $HIH to $HOUDINI_USER_PREF_DIR
maximcapra Sep 20, 2024
32c7d30
package consolidation and windows subprocess call bugfix
maximcapra Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ gallery/backup
.lock*
build/*

.DS_Store
4 changes: 2 additions & 2 deletions MainMenuCommon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ import qlibutils; qlibutils.open_hda_dirs()]]>
<separatorItem />

<scriptItem id="h.ql_browse_HIH_root">
<label>$HIH: User Config Files...</label>
<label>$HOUDINI_USER_PREF_DIR: User Config Files...</label>
<scriptCode><![CDATA[
import qlibutils; qlibutils.open_dir(env="HIH")]]>
import qlibutils; qlibutils.open_dir(env="HOUDINI_USER_PREF_DIR")]]>
</scriptCode>
</scriptItem>

Expand Down
2 changes: 1 addition & 1 deletion config/README.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Configuration-related files
install location:

$HOME/houdiniXX.X/config
$HIH/config
$HOUDINI_USER_PREF_DIR/config



Expand Down
2 changes: 1 addition & 1 deletion help/qlib/mainmenu/index.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Open in File Browser:
Opens the folder(s) that contain the definitions
of the currently selected HDAs or complied plug-in DSOs (DLLs).

$HIH: User Config Files...:
$HOUDINI_USER_PREF_DIR: User Config Files...:
Opens the user's preferences folder
(usually called _houdiniXX.X_).

Expand Down
4 changes: 2 additions & 2 deletions houdini.env_linux → houdini.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
#

# QLIB variable should point to the downloaded and extracted qLib package
# ($HIH is the $HOME/houdiniXX.X folder)
# ($HOUDINI_USER_PREF_DIR is the $HOME/houdiniXX.X folder)
#
QLIB=$HIH/qLib-dev
QLIB=$HOUDINI_USER_PREF_DIR/qLib-master
QOTL=$QLIB/otls

HOUDINI_OTLSCAN_PATH = $QOTL/base:$QOTL/future:$QOTL/experimental:$HOUDINI_OTLSCAN_PATH:&
Expand Down
19 changes: 0 additions & 19 deletions houdini.env_windows
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion qLib_package_linux.json → qLib_package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

"env": [
{
"QLIB": "$HIH/qLib-master"
"QLIB": "$HOUDINI_USER_PREF_DIR/qLib-master"
},
{
"QOTL": "$QLIB/otls"
Expand Down
18 changes: 0 additions & 18 deletions qLib_package_windows.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/OnCreated.py_
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

@brief Automatic coloring of newly created nodes.

Location: $HIH/scripts/
Location: $HOUDINI_USER_PREF_DIR/scripts/

Note: this script is automatically reloaded on each node creation!

Expand Down
2 changes: 1 addition & 1 deletion scripts/python/qlibutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ def open_dir(dir="", env=None):

if oss and cmd:
statmsg("(%s) %s %s" % (oss, cmd, dir, ) )
r = subprocess.call([cmd, dir])
r = subprocess.call(' '.join([cmd, dir]), shell=True)
if r!=0:
statmsg("(%s) FAILED: %s %s" % (oss, cmd, dir, ), warn=True)

Expand Down