Change LinuxCNC to Machinekit or HAL, EVERYWHERE

debian/machinekit-hal-dev.install

@@ -1,6 +1,6 @@
-usr/include/linuxcnc
+usr/include/machinekit
 usr/lib/lib*.so
-usr/share/linuxcnc/Makefile.*
+usr/share/machinekit/Makefile.*
 usr/bin/comp
 usr/bin/instcomp
 usr/bin/runtests

debian/machinekit-hal.install

@@ -1,13 +1,13 @@
-etc/linuxcnc/rtapi.ini
-etc/linuxcnc/machinekit.ini
-etc/modprobe.d/linuxcnc.conf
-etc/rsyslog.d/linuxcnc.conf
+etc/machinekit/rtapi.ini
+etc/machinekit/machinekit.ini
+etc/modprobe.d/hal.conf
+etc/rsyslog.d/hal.conf
 etc/security/limits.d/machinekit.conf
 usr/bin/*
 usr/lib/*.so.*
 usr/lib/compat.so
 usr/lib/hal.so
-usr/lib/linuxcnc
+usr/lib/machinekit
 usr/lib/rtapi.so
 usr/lib/shmcommon.so
 usr/lib/python*/*/*.py
@@ -17,8 +17,5 @@ usr/lib/python*/*/machinekit/*.so
 usr/lib/python*/*/machinetalk/protobuf/*.py
 usr/lib/python*/*/machinetalk/*.py
 usr/lib/python*/*/machinekit/nosetests/*.py
-usr/libexec/linuxcnc
-usr/share/linuxcnc/udev
-usr/share/linuxcnc/examples
-usr/share/linuxcnc/ncfiles
-usr/share/machinekit
+usr/libexec/machinekit
+usr/share/machinekit

debian/machinekit-hal.postinst

@@ -3,23 +3,23 @@
 
 #DEBHELPER#
 
-# if it doesnt exist, create /var/log/linuxcnc.log and make it publically readable
-touch /var/log/linuxcnc.log
-chmod 666 /var/log/linuxcnc.log
+# if it doesnt exist, create /var/log/hal.log and make it publically readable
+touch /var/log/hal.log
+chmod 666 /var/log/hal.log
 
-# restart the rsyslogd to start logging to /var/log/linuxcnc.conf
+# restart the rsyslogd to start logging to /var/log/hal.conf
 service rsyslog restart 2>/dev/null || true
 
 
 ###############################################################################
 
-INIFILE=/etc/linuxcnc/machinekit.ini
+INIFILE=/etc/machinekit/machinekit.ini
 NEWUUID=$(uuidgen)
 MKUUIDFILE=no
 
 # if there is an existing valid mkuuid file - use it
-if [ -f /etc/linuxcnc/mkuuid ]; then
-    UUID=$(echo | cat /etc/linuxcnc/mkuuid)
+if [ -f /etc/machinekit/mkuuid ]; then
+    UUID=$(echo | cat /etc/machinekit/mkuuid)
     if [[ "$UUID" == "a42c8c6b-4025-4f83-ba28-dad21114744a" ]]; then
         echo "Old void MKUUID in mkuuid $UUID - skipping"
     else
@@ -51,6 +51,6 @@ fi
 
 # Ensure mkuuid file holds same UUID
 
-echo "$NEWUUID" > /etc/linuxcnc/mkuuid
+echo "$NEWUUID" > /etc/machinekit/mkuuid
 
 ################################################################################

debian/rules

@@ -130,16 +130,16 @@ install: build
 	(cd debian/extras && cp -a * ../tmp)
 	(cd src; export DESTDIR=`pwd`/../debian/tmp; $(MAKE) V=$(DH_VERBOSE) $@)
 	mkdir -p \
-	    debian/tmp/usr/lib/linuxcnc/modules \
-	    debian/tmp/usr/include/linuxcnc \
-	    debian/tmp/usr/include/linuxcnc/machinetalk/nanopb \
-	    debian/tmp/usr/include/linuxcnc/machinetalk/protobuf
+	    debian/tmp/usr/lib/machinekit/modules \
+	    debian/tmp/usr/include/machinekit \
+	    debian/tmp/usr/include/machinekit/machinetalk/nanopb \
+	    debian/tmp/usr/include/machinekit/machinetalk/protobuf
 
 	mkdir -p debian/tmp/etc/security/limits.d
 	cp src/rtapi/shmdrv/limits.d-machinekit.conf \
 	    debian/tmp/etc/security/limits.d/machinekit.conf
 
-	mkdir -p debian/tmp/usr/lib/linuxcnc/prubin
+	mkdir -p debian/tmp/usr/lib/machinekit/prubin
 
 	dh_install --sourcedir=debian/tmp -Xusr/bin/pasm --fail-missing -v
 #       # These are installed in the -dev package
@@ -165,7 +165,7 @@ binary-arch: build install
 	dh_installmime
 	dh_link
 	dh_strip
-	dh_compress -X.pdf -X.txt -X.hal -X.ini -X.clp -X.var -X.nml \
+	dh_compress -X.pdf -X.txt -X.hal -X.ini -X.clp -X.var \
 	    -X.tbl -X.xml -Xsample-configs
 	dh_fixperms -X/rtapi_app
 	dh_python2 --ignore-shebangs --no-guessing-versions --no-ext-rename

debian/update-dch-from-git

@@ -28,7 +28,7 @@ fi
 
 set -e
 (
-echo "linuxcnc ($NEW_DEB_VERSION) $(lsb_release -cs); urgency=low"
+echo "machinekit ($NEW_DEB_VERSION) $(lsb_release -cs); urgency=low"
 echo
 git log --pretty=format:"  * %w(72,0,6)%s" $GIT_TAG..
 echo

lib/python/.gitignore

@@ -1,7 +1,7 @@
 nf.py
-linuxcncconfig.py
+halconfig.py
 gremlin_view.py
 pyngcgui.py
 gscreen/
 gmoccapy/
-stepconf/
+stepconf/

scripts/.gitignore

@@ -1,12 +1,9 @@
-linuxcnc
 rip-environment
 halrun
 realtime
-linuxcncmkdesktop
 latencyplot
 latencyhistogram
 gen-rtapi.ini.sh
 gen-rtapi.ini.sh.in
-linuxcnc_var
 rtapi.conf
 check-build-vs-configure-sha

scripts/build_docker

@@ -175,8 +175,8 @@ case $CMD in
 	    sudo make -C src setuid || true;  # Don't exit if this fails
 	    . scripts/rip-environment;
 	    echo -e 'ANNOUNCE_IPV4=0\nANNOUNCE_IPV6=0' >> \
-		etc/linuxcnc/machinekit.ini;
-	    tail -2 etc/linuxcnc/machinekit.ini;
+		etc/machinekit/machinekit.ini;
+	    tail -2 etc/machinekit/machinekit.ini;
 
             # Run regression tests
 	    ${RUN_TESTS} ${TEST_ARGS}"

scripts/check-system-configuration.sh

@@ -21,7 +21,7 @@ get-conf-files() {
 }
 
 check-rsyslog() {
-    local logfile=/var/log/linuxcnc.log
+    local logfile=/var/log/hal.log
     local logconfigs="$(get-conf-files /etc/rsyslog.conf /etc/rsyslog.d/*.conf)"
 
     local res=0
@@ -35,7 +35,7 @@ check-rsyslog() {
     echo "          restart rsyslogd"
     echo
     echo "          Hint:"
-    echo "            $ sudo touch /var/log/linuxcnc.log"
+    echo "            $ sudo touch /var/log/hal.log"
     echo "            $ sudo service rsyslog restart"
     echo
     echo "          Gurus:  If you intentionally log to another file,"
@@ -51,7 +51,7 @@ check-rsyslog() {
     echo
     echo "          Please check your syslog configuration for"
     echo "          rate limiting; an example for rsyslogd can be found in"
-    echo "          src/rtapi/rsyslogd-linuxcnc.conf"
+    echo "          src/rtapi/rsyslogd-hal.conf"
     echo
     elif ! grep -q SystemLogRateLimitBurst $logconfigs; then
     res=1
@@ -63,8 +63,8 @@ check-rsyslog() {
     echo "          than Machinekit requires when running in debug mode."
     echo
     echo "          Hint:"
-    echo "            $ sudo cp rtapi/rsyslogd-linuxcnc.conf" \
-	         "/etc/rsyslog.d/linuxcnc.conf"
+    echo "            $ sudo cp rtapi/rsyslogd-hal.conf" \
+	         "/etc/rsyslog.d/hal.conf"
     echo "            $ sudo service rsyslog restart"
     echo
     fi

scripts/machinekit.ini.tmpl.in

@@ -1,7 +1,7 @@
 # this file specifies options which apply globally to several programs, and all services
 
 # having these options in one place avoids repeated ini file changes.
-# it sits at a well-known place ($HAL_HOME//etc/linuxcnc/machinekit.ini), thus
+# it sits at a well-known place ($HAL_HOME/etc/machinekit/machinekit.ini), thus
 # is accessible to all programs.
 
 [MACHINEKIT]

scripts/realtime.in

@@ -181,10 +181,10 @@ Unload(){
         fi
     fi
 
-    # remove any linuxcnc-specific POSIX shm segments if they exist
+    # remove any hal-specific POSIX shm segments if they exist
     # see src/rtapi/rtapi_shmkeys.h: SHM_FMT
 
-    INSTKEY=`printf 'linuxcnc-%d-' $MK_INSTANCE`
+    INSTKEY=`printf 'hal-%d-' $MK_INSTANCE`
     rm  -f  /dev/shm/${INSTKEY}* >/dev/null 2>&1
 
 
@@ -248,7 +248,7 @@ CheckUnloaded(){
     # if any, determine if a process is still using it; complain if so,
     # else remove with a note
 
-    POSIXSHM=`printf '/dev/shm/linuxcnc-%d-*' $MK_INSTANCE`
+    POSIXSHM=`printf '/dev/shm/hal-%d-*' $MK_INSTANCE`
 
     for seg in `ls $POSIXSHM 2>/dev/null` ; do
 	if pids=`fuser $seg  2>/dev/null` ; then

scripts/rip-environment.in

@@ -46,7 +46,7 @@ RIP=@RUN_IN_PLACE@; export RIP
 HAL_HOME=@HAL_HOME@; export HAL_HOME
 HALVERSION="@HALVERSION@"; export HALVERSION
 PATH=@HAL_BIN_DIR@:$HAL_HOME/scripts:"$PATH"
-MACHINEKIT_INI=@HAL_HOME@/etc/linuxcnc/machinekit.ini; export MACHINEKIT_INI
+MACHINEKIT_INI=@HAL_HOME@/etc/machinekit/machinekit.ini; export MACHINEKIT_INI
 
 if [ -z "$LD_LIBRARY_PATH" ]; then
     LD_LIBRARY_PATH=$HAL_HOME/lib

src/.gitignore

@@ -17,7 +17,6 @@
 /config.h.in
 /configure
 /modules.order
-/linuxcncconfig.py-tmp
 /halcomp-srcs/
 /.html-images-stamp
 /.htmldoc-stamp