diff options
author | Dewey Garrett <dgarrett@panix.com> | 2013-12-16 13:27:12 -0700 |
---|---|---|
committer | Dewey Garrett <dgarrett@panix.com> | 2013-12-16 13:47:00 -0700 |
commit | ed8606f1ca6086d252d64fba80d75855bddfa38e (patch) | |
tree | 983d6f034a120536c245101e2c0e8ba5e81d8d87 | |
parent | cd7c8049206c66afc34b4673e6cc6bab12c1e596 (diff) | |
download | linuxcnc-ed8606f1ca6086d252d64fba80d75855bddfa38e.tar.gz linuxcnc-ed8606f1ca6086d252d64fba80d75855bddfa38e.zip |
sim/gmoccapy/gmoccapy_plasma update
The updated configs directory structure necessitates the following
changes that will allow a runnable sim config to run in both
a RIP build and from an installed deb:
1) inifile references to nc_files dir must be ../../nc_files
2) inifile references to parent directories will not, in
general, work in an installed deb since there is
no guarantee the parent will exist, so
replace SUBROUTINE_PATH=../gmoccapy/macros
with SUBROUTINE_PATH=./macros
AND (since the macros dir is shared with the parent)
create a link so that
./macros --> ../gmoccapy/macros
This link allows ./macros resolution in a RIP install.
The configuration picker (pickconfig.tcl) will now
follow a link to a subdirectory and copy the contents
to the user config dir when the config is selected.
(This is a new behavior that allows configurations
to have subdirectories copied to the user config
directory. Note that such subdirectories
may NOT include an .ini file or they would be
detected as independent configurations).
See configs/maintainer.txt for additional information.
-rwxr-xr-x | configs/sim/gmoccapy/gmoccapy_plasma/gmoccapy_plasma.ini | 4 | ||||
l--------- | configs/sim/gmoccapy/gmoccapy_plasma/macros | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configs/sim/gmoccapy/gmoccapy_plasma/gmoccapy_plasma.ini b/configs/sim/gmoccapy/gmoccapy_plasma/gmoccapy_plasma.ini index 7c8e643d3..469b7a2cc 100755 --- a/configs/sim/gmoccapy/gmoccapy_plasma/gmoccapy_plasma.ini +++ b/configs/sim/gmoccapy/gmoccapy_plasma/gmoccapy_plasma.ini @@ -44,7 +44,7 @@ DEFAULT_LINEAR_VELOCITY = 5 MAX_ANGULAR_VELOCITY = 234 # Prefix to be used -PROGRAM_PREFIX = ../../../nc_files/ +PROGRAM_PREFIX = ../../nc_files/ # Introductory graphic INTRO_GRAPHIC = linuxcnc.gif @@ -70,7 +70,7 @@ CYCLE_TIME = 0.001 [RS274NGC] RS274NGC_STARTUP_CODE = G17 G21 G40 G43H0 G54 G64P0.005 G80 G90 G94 G97 M5 M9 PARAMETER_FILE = sim.var -SUBROUTINE_PATH = ../gmoccapy/macros +SUBROUTINE_PATH = ./macros # Motion control section ------------------------------------------------------ [EMCMOT] diff --git a/configs/sim/gmoccapy/gmoccapy_plasma/macros b/configs/sim/gmoccapy/gmoccapy_plasma/macros index 38a2f8e92..11f9486ed 120000 --- a/configs/sim/gmoccapy/gmoccapy_plasma/macros +++ b/configs/sim/gmoccapy/gmoccapy_plasma/macros @@ -1 +1 @@ -/home/emcmesa/linuxcnc-org/configs/sim/gmoccapy/macros
\ No newline at end of file +../macros
\ No newline at end of file |