Skip to content

Commit dc6325a

Browse files
committed
Merge remote-tracking branch 'origin/master' into test-515
2 parents c0f787d + 5ccd22d commit dc6325a

5,252 files changed

Lines changed: 3653596 additions & 374614 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
# po4a Version 0.57 in ubuntu 20 do not write translated adoc as
2+
# UTF-8. Need at least version 0.62 to fix it. Using version 0.66 to
3+
# also get fix for empty asciidoc table cells.
4+
name: Build CI
5+
6+
on:
7+
push:
8+
pull_request:
9+
release:
10+
types: [published]
11+
check_suite:
12+
types: [rerequested]
13+
14+
jobs:
15+
rip-and-test:
16+
runs-on: ubuntu-20.04
17+
steps:
18+
- name: Dump GitHub context
19+
env:
20+
GITHUB_CONTEXT: ${{ toJson(github) }}
21+
run: echo "$GITHUB_CONTEXT"
22+
- uses: actions/checkout@v2
23+
with:
24+
submodules: true
25+
fetch-depth: 0
26+
- run: git fetch --recurse-submodules=no https://github.com/linuxcnc/linuxcnc refs/tags/*:refs/tags/*
27+
- name: Build RIP & test
28+
run: |
29+
./scripts/travis-install-build-deps.sh
30+
sudo apt-get install -y eatmydata
31+
curl -O http://snapshot.debian.org/archive/debian/20220102T084145Z/pool/main/p/po4a/po4a_0.66-1_all.deb
32+
sudo dpkg -i po4a_0.66-1_all.deb
33+
cd src
34+
eatmydata ./autogen.sh
35+
eatmydata ./configure --with-realtime=uspace --disable-check-runtime-deps
36+
eatmydata make -O -j$((1+$(nproc))) default pycheck V=1
37+
# Note that the package build covers html docs
38+
../scripts/rip-environment runtests -p
39+
40+
htmldocs:
41+
runs-on: ubuntu-20.04
42+
steps:
43+
- name: Dump GitHub context
44+
env:
45+
GITHUB_CONTEXT: ${{ toJson(github) }}
46+
run: echo "$GITHUB_CONTEXT"
47+
- uses: actions/checkout@v2
48+
with:
49+
submodules: true
50+
fetch-depth: 0
51+
- run: git fetch --recurse-submodules=no https://github.com/linuxcnc/linuxcnc refs/tags/*:refs/tags/*
52+
- name: Build HTML docmentation
53+
run: |
54+
./scripts/travis-install-build-deps.sh
55+
sudo apt-get install -y eatmydata
56+
curl -O http://snapshot.debian.org/archive/debian/20220102T084145Z/pool/main/p/po4a/po4a_0.66-1_all.deb
57+
sudo dpkg -i po4a_0.66-1_all.deb
58+
cd src
59+
eatmydata ./autogen.sh
60+
eatmydata ./configure --with-realtime=uspace --disable-check-runtime-deps --enable-build-documentation=html
61+
eatmydata make -O -j$((1+$(nproc))) manpages
62+
eatmydata make -O -j$((1+$(nproc))) translateddocs
63+
eatmydata make -O -j$((1+$(nproc))) docs
64+
# Note that the package build covers html docs
65+
66+
package:
67+
runs-on: ubuntu-20.04
68+
steps:
69+
- name: Dump GitHub context
70+
env:
71+
GITHUB_CONTEXT: ${{ toJson(github) }}
72+
run: echo "$GITHUB_CONTEXT"
73+
- uses: actions/checkout@v2
74+
with:
75+
submodules: true
76+
fetch-depth: 0
77+
- name: Build Debian package
78+
run: |
79+
set -x
80+
git fetch --recurse-submodules=no https://github.com/linuxcnc/linuxcnc refs/tags/*:refs/tags/*
81+
./scripts/travis-install-build-deps.sh
82+
sudo apt-get install -y eatmydata
83+
curl -O http://snapshot.debian.org/archive/debian/20220102T084145Z/pool/main/p/po4a/po4a_0.66-1_all.deb
84+
sudo dpkg -i po4a_0.66-1_all.deb
85+
codename=$(lsb_release -cs)
86+
dch --maintmaint --distribution $codename "GitHub test package."
87+
eatmydata debian/configure
88+
eatmydata debuild -us -uc
89+
sudo apt-get install ../*.deb
90+
eatmydata ./scripts/runtests -p tests/
91+
eatmydata lintian --info --display-info --pedantic --display-experimental ../*.deb

.gitignore

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,20 @@ build-stamp
1313
.tmp*
1414
# Ignore generated html files,
1515
/docs/src/*/*.html
16-
# Except Gcode quick-ref cards (en,de,sp,fr) which are maintained by hand
17-
!docs/html/gcode*.html
18-
# Ignore all LyX files, we're done with them now.
19-
*.lyx
16+
# docs/html/.gitignore is for the html directory
2017
debian/*.debhelper.log
2118
rtlib/Module.symvers
2219
share/*/*.desktop
2320
share/menus/CNC.menu
24-
share/desktop-directories/cnc.directory
21+
share/desktop-directories/linuxcnc-cnc.directory
22+
share/desktop-directories/linuxcnc-ref.directory
23+
share/desktop-directories/linuxcnc-doc.directory
2524
src/modules.order
26-
docs/html/drivers
2725
/configs/*/emc.nml
2826
!/configs/common/emc.nml
2927
/docs/src/source-highlight/local
3028
lib/python/gremlin.py
29+
lib/python/qt5_graphics.py
3130
lib/python/touchy
3231
configs/sim/gmoccapy/*.pref
3332
configs/sim/gmoccapy/gmoccapy_plasma/*.pref
@@ -39,5 +38,21 @@ cscope.*
3938
oprofile*
4039
*.log
4140
position.txt
42-
*.9
41+
# *.9
4342
*.glade.h
43+
# Ignore test results
44+
*.result
45+
# Ignore temp files
46+
*.swp
47+
# Ignore po4a temp files
48+
*.failed.po
49+
*-new_??.po
50+
# Ignore stamp files
51+
*.*-stamp
52+
# Ignore po4a-generated files for other languages
53+
docs/help/es/*
54+
docs/help/fr/*
55+
docs/help/hu/*
56+
docs/help/nb/*
57+
docs/help/vi/*
58+
docs/help/zh_CN/*

.travis.yml

Lines changed: 0 additions & 6 deletions
This file was deleted.

README.md

Lines changed: 77 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,87 @@
1-
# DISCLAIMER
21

3-
**THE AUTHORS OF THIS SOFTWARE ACCEPT ABSOLUTELY NO LIABILITY FOR ANY
4-
HARM OR LOSS RESULTING FROM ITS USE.**
2+
[![Badge GPL2]][License]
3+
[![Badge LGPL]][License]
54

6-
**IT IS _EXTREMELY_ UNWISE TO RELY ON SOFTWARE ALONE FOR SAFETY.**
5+
<div align = center>
76

8-
**Any machinery capable of harming persons must have provisions for
9-
completely removing power from all motors, etc, before persons enter
10-
any danger area.**
7+
<br>
8+
9+
# LinuxCNC
10+
11+
*Controlling CNC Machines*
1112

12-
**All machinery must be designed to comply with local and national
13-
safety codes, and the authors of this software can not, and do not,
14-
take any responsibility for such compliance.**
13+
<br>
14+
15+
[![Badge Translation]][Translation]
16+
17+
<br>
18+
19+
---
1520

21+
[<kbd> <br> Website <br> </kbd>][Website]
22+
[<kbd> <br> Install <br> </kbd>][Install]
23+
[<kbd> <br> Build <br> </kbd>][Build]
24+
[<kbd> <br> Documentation <br> </kbd>][Documentation]
25+
26+
---
1627

17-
This software is released under the GPLv2, with some parts under the LGPL.
18-
See the file COPYING for more details.
28+
<br>
29+
30+
It can drive milling machines, lathes, 3D printers, laser <br>
31+
cutters, plasma cutters, robot arms, hexapods, and more.
1932

33+
LinuxCNC was initiated 25 years ago and evolved into a very <br>
34+
international project with contributions from all over the globe.
35+
36+
With release 2.9 of LinuxCNC we also transitioned the <br>
37+
documentation to the use of the public crowd translation <br>
38+
services [Weblate] and invite all our users to contribute.
39+
40+
The translations we expect to help attract practitioners <br>
41+
to the project and also helps educating enthusiasts of <br>
42+
all age groups on automated machining.
2043

21-
# The Build Process
44+
<br>
2245

23-
Refer to the file 'docs/src/code/building-linuxcnc.txt' for information
24-
about building and running the software, or look here:
46+
## DISCLAIMER
47+
48+
<br>
2549

26-
http://linuxcnc.org/docs/devel/html/code/building-linuxcnc.html
50+
```
51+
52+
The authors of this software accept
53+
absolutely no liability for any
54+
harm or loss resulting from its use.
55+
56+
It is EXTREMELY unwise to rely
57+
on software alone for safety.
58+
59+
Any machinery capable of harming persons must have
60+
provisions for completely removing power from all
61+
motors, etc, before persons enter any danger area.
62+
63+
All machinery must be designed to comply with local
64+
and national safety codes, and the authors of this
65+
software cannot and do not, take any responsibility
66+
for such compliance.
67+
68+
```
69+
70+
<br>
71+
72+
</div>
73+
74+
<!----------------------------------------------------------------------------->
75+
76+
[Badge Translation]: https://hosted.weblate.org/widgets/linuxcnc/-/svg-badge.svg
77+
[Badge GPL2]: https://img.shields.io/badge/Most-LGPL_3-blue.svg?style=for-the-badge 'The license this software is under'
78+
[Badge LGPL]: https://img.shields.io/badge/Some-GPL_2-blue.svg?style=for-the-badge 'Some parts are under this license'
79+
80+
[Translation]: https://hosted.weblate.org/engage/linuxcnc/
81+
[Weblate]: https://hosted.weblate.org/projects/linuxcnc/
82+
[Website]: https://linuxcnc.org/
83+
84+
[Documentation]: http://linuxcnc.org/docs/stable/html/
85+
[Install]: http://linuxcnc.org/docs/stable/html/getting-started/getting-linuxcnc.html
86+
[Build]: http://linuxcnc.org/docs/stable/html/code/building-linuxcnc.html
87+
[License]: COPYING

README_es.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# LinuxCNC
2+
3+
LinuxCNC controla máquinas CNC. Puede manejar fresadoras, tornos, impresoras 3D, cortadores láser, cortadores de plasma, brazos de robot, hexápodos y otras. http://linuxcnc.org/
4+
5+
# DESCARGO DE RESPONSABILIDAD
6+
7+
** LOS AUTORES DE ESTE SOFTWARE NO ACEPTAN ABSOLUTAMENTE NINGUNA RESPONSABILIDAD POR NINGÚN DAÑO O PÉRDIDA RESULTANTE DE SU USO. **
8+
9+
** ES _EXTREMADAMENTE_ IMPRUDENTE CONFIAR LA SEGURIDAD SOLO AL SOFTWARE. **
10+
11+
** Cualquier maquinaria capaz de dañar a las personas debe tener prevista la desconexion completa de energía de todos los motores, etc., antes de que las personas entren en cualquier área peligrosa.
12+
13+
** Toda la maquinaria debe estar diseñada para cumplir con las normas y códigos de seguridad locales y nacionales, y los autores de este software no pueden, y no lo hacen, asumir cualquier responsabilidad derivada de dicho cumplimiento. **
14+
15+
16+
Este software se lanza bajo licencia GPLv2, con algunas partes bajo LGPL. Vea el archivo COPYING para más detalles.
17+
18+
La traduccion al español de este software queda adherida a este descargo y a las licencias GPLv2 y partes LGPL.
19+
20+
21+
# El proceso de construcción
22+
23+
Consulte el archivo 'docs/src/code/building-linuxcnc.txt' para obtener información sobre cómo construir y ejecutar el software, o vea:
24+
25+
http://linuxcnc.org/docs/devel/html/code/building-linuxcnc.html

VERSION

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
2.8.0~pre1
1+
2.9.0~pre0
2+

configs/apps/README_es

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
info: crear archivo de información del sistema
2+
3+
Directorios:
4+
5+
gladevcp -- widgets de demostración
6+
halrun ---- inicia halrun en xterm
7+
latency --- aplicaciones para investigar latencia
8+
parport --- pruebas de puerto paralelo
9+
pyvcp ----- demostraciones
10+
xhc-hbo4 -- prueba de colgante inalámbrico usb
11+

configs/apps/gladevcp/README.changes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ For a named widget, use:
2626
To retrieve a list of all widgets in the UI file, use:
2727
wl = self.builder.get_objects()
2828

29-
This works regardless wether the UI is in libglade or GtkBuilder format.
29+
This works regardless whether the UI is in libglade or GtkBuilder format.
3030

3131
persistence.py
3232
==============
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
Nota sobre los cambios API de los manejadores de clase y persistence.py:
2+
3+
Handlers de clase:
4+
=====================
5+
6+
El parámetro 'panel' se eliminó de get_handlers() ya que no es necesario.
7+
En consecuencia, el handler del método __init__() no recibe este
8+
parámetro:
9+
10+
class HandlerClass:
11+
...
12+
def __init__(self, halcomp,builder,useropts):
13+
self.halcomp = halcomp
14+
self.builder = builder
15+
16+
def get_handlers(halcomp,builder,useropts):
17+
18+
return [HandlerClass(halcomp,builder,useropts)]
19+
20+
Acceso a widgets en handlers de clases:
21+
==========================================
22+
23+
Para un widget con nombre, use:
24+
w = self.builder.get_object("widgetname")
25+
26+
Para recuperar una lista de todos los widgets en el archivo UI, use:
27+
wl = self.builder.get_objects()
28+
29+
Esto funciona independientemente de si la interfaz de usuario está en formato libglade o GtkBuilder.
30+
31+
persistence.py
32+
==============
33+
El manejo del parámetro builder se ha simplificado. Se elimina
34+
de los métodos save_state y restore_state, y se agrega en su lugar al método
35+
IniFile.__init__(). Por lo tanto, utilicelo de la siguiente manera:
36+
37+
class HandlerClass:
38+
...
39+
40+
def on_destroy(self,obj,data=None):
41+
# note: save_state(<object to fetch attributes from>) only:
42+
self.ini.save_state(self)
43+
44+
45+
def __init__(self, halcomp,builder,useropts):
46+
self.halcomp = halcomp
47+
self.builder = builder
48+
49+
self.ini_filename = __name__ + '.ini'
50+
self.defaults = { IniFile.vars: dict(),
51+
IniFile.widgets : widget_defaults(select_widgets(self.builder.get_objects(), hal_only=False,output_only = True))
52+
}
53+
# notese parámetro extra self.builder
54+
self.ini = IniFile(self.ini_filename, self.defaults, self.builder)
55+
# nota: solo se pasa el objeto que obtiene el conjunto de atributos:
56+
self.ini.restore_state(self)
57+
58+
59+
Todos los ejemplos y plantillas se han adaptado en consecuencia.
60+
61+
62+
Michael Haberler 19 de diciembre de 2010
63+

configs/apps/gladevcp/README_es

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
Aplicaciones demo gladevcp:
2+
3+
Aplicaciones:
4+
glade-manual
5+
gladevcp-test
6+
7+
Directorios:
8+
animated-backdrop
9+
by-widget
10+
class-callback
11+
colored-label
12+
complex
13+
helloWorld
14+
mdi-command-examples
15+
simple-callback
16+
templates

0 commit comments

Comments
 (0)