Skip to content

Commit f86e71f

Browse files
u-235u-235
committed
Apply the GNU guidelines
* The LICENSE file renamed to COPYING.LESSER. * Added the COPYING file with GPL v3 text. https://www.gnu.org/licenses/gpl-howto.en.html
1 parent f655a5b commit f86e71f

12 files changed

+771
-101
lines changed

‎COPYING

Lines changed: 674 additions & 0 deletions
Large diffs are not rendered by default.

‎LICENSE renamed to ‎COPYING.LESSER

File renamed without changes.

‎gcodeshared/include/ui/longjobhelper.h

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
/*
2-
* 25.01.2020 (2020-01-25) created by Nick Egorrov, nicegorov@yandex.ru
2+
* Copyright (C) 2020-2025 Nick Egorrov, nicegorov@yandex.ru
33
*
4-
* Copyright 2020 Nick Egorrov
4+
* This file is part of GCodeWorkShop.
55
*
6-
* Licensed under the Apache License, Version 2.0 (the "License");
7-
* you may not use this file except in compliance with the License.
8-
* You may obtain a copy of the License at
6+
* GCodeWorkShop is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation, either version 2 of the License, or
9+
* (at your option) any later version.
910
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
11+
* This program is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
1115
*
12-
* Unless required by applicable law or agreed to in writing, software
13-
* distributed under the License is distributed on an "AS IS" BASIS,
14-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
* See the License for the specific language governing permissions and
16-
* limitations under the License.
16+
* You should have received a copy of the GNU General Public License
17+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1718
*/
1819

1920
#ifndef LONGJOBHELPER_H

‎gcodeshared/include/utils/configdialog.h

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
1-
/**
2-
* @file
3-
* @brief The ConfigDialog class is used to manage settings.
1+
/*
2+
* Copyright (C) 2020 Nick Egorrov, nicegorov@yandex.ru
3+
*
4+
* This file is part of GCodeWorkShop.
5+
*
6+
* GCodeWorkShop is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation, either version 2 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* This program is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
415
*
5-
* @date 04.05.2020 (2020-05-04) created by Nick Egorrov
6-
* @author Nick Egorrov
7-
* @copyright Copyright (C) 2020 Nick Egorrov
8-
* @copyright
9-
* This program is free software: you can redistribute it and/or modify
10-
* it under the terms of the GNU General Public License as published by
11-
* the Free Software Foundation, either version 3 of the License, or
12-
* (at your option) any later version.
13-
* @copyright
14-
* This program is distributed in the hope that it will be useful,
15-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17-
* GNU General Public License for more details.*
18-
* @copyright
19-
* You should have received a copy of the GNU General Public License
20-
* along with this program. If not, see <https://www.gnu.org/licenses/>.
16+
* You should have received a copy of the GNU General Public License
17+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2118
*/
2219

2320
#ifndef CONFIGDIALOG_H

‎gcodeshared/include/utils/configpage.h

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
1-
/**
2-
* @file
3-
* @brief The ConfigPage class is used to manage settings.
1+
/*
2+
* Copyright (C) 2020 Nick Egorrov, nicegorov@yandex.ru
3+
*
4+
* This file is part of GCodeWorkShop.
5+
*
6+
* GCodeWorkShop is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation, either version 2 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* This program is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
415
*
5-
* @date 04.05.2020 (2020-05-04) created by Nick Egorrov
6-
* @author Nick Egorrov
7-
* @copyright Copyright (C) 2020 Nick Egorrov
8-
* @copyright
9-
* This program is free software: you can redistribute it and/or modify
10-
* it under the terms of the GNU General Public License as published by
11-
* the Free Software Foundation, either version 3 of the License, or
12-
* (at your option) any later version.
13-
* @copyright
14-
* This program is distributed in the hope that it will be useful,
15-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17-
* GNU General Public License for more details.*
18-
* @copyright
19-
* You should have received a copy of the GNU General Public License
20-
* along with this program. If not, see <https://www.gnu.org/licenses/>.
16+
* You should have received a copy of the GNU General Public License
17+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2118
*/
2219

2320
#ifndef CONFIGPAGE_H

‎gcodeshared/ui/longjobhelper.cpp

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
/*
2-
* 25.01.2020 created by Nick Egorrov, nicegorov@yandex.ru
2+
* Copyright (C) 2020-2025 Nick Egorrov, nicegorov@yandex.ru
33
*
4-
* Copyright 2020 Nick Egorrov
4+
* This file is part of GCodeWorkShop.
55
*
6-
* Licensed under the Apache License, Version 2.0 (the "License");
7-
* you may not use this file except in compliance with the License.
8-
* You may obtain a copy of the License at
6+
* GCodeWorkShop is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation, either version 2 of the License, or
9+
* (at your option) any later version.
910
*
10-
* http://www.apache.org/licenses/LICENSE-2.0
11+
* This program is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
1115
*
12-
* Unless required by applicable law or agreed to in writing, software
13-
* distributed under the License is distributed on an "AS IS" BASIS,
14-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
* See the License for the specific language governing permissions and
16-
* limitations under the License.
16+
* You should have received a copy of the GNU General Public License
17+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1718
*/
1819

1920
#include <QApplication> // for QApplication

‎gcodeshared/utils/configdialog.cpp

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
1-
/**
2-
* @file
3-
* @brief The ConfigDialog class is used to manage settings.
1+
/*
2+
* Copyright (C) 2020 Nick Egorrov, nicegorov@yandex.ru
43
*
5-
* @date 04.05.2020 (2020-05-04) created by Nick Egorrov
6-
* @author Nick Egorrov
7-
* @copyright Copyright (C) 2020 Nick Egorrov
8-
* @copyright
9-
* This program is free software: you can redistribute it and/or modify
10-
* it under the terms of the GNU General Public License as published by
11-
* the Free Software Foundation, either version 3 of the License, or
12-
* (at your option) any later version.
13-
* @copyright
14-
* This program is distributed in the hope that it will be useful,
15-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17-
* GNU General Public License for more details.*
18-
* @copyright
19-
* You should have received a copy of the GNU General Public License
20-
* along with this program. If not, see <https://www.gnu.org/licenses/>.
4+
* This file is part of GCodeWorkShop.
5+
*
6+
* GCodeWorkShop is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation, either version 2 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* This program is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2118
*/
2219

2320
#include <QPushButton> // for QPushButton

‎gcodeshared/utils/configpage.cpp

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
1-
/**
2-
* @file
3-
* @brief The ConfigPage class is used to manage settings.
1+
/*
2+
* Copyright (C) 2020 Nick Egorrov, nicegorov@yandex.ru
43
*
5-
* @date 04.05.2020 (2020-05-04) created by Nick Egorrov
6-
* @author Nick Egorrov
7-
* @copyright Copyright (C) 2020 Nick Egorrov
8-
* @copyright
9-
* This program is free software: you can redistribute it and/or modify
10-
* it under the terms of the GNU General Public License as published by
11-
* the Free Software Foundation, either version 3 of the License, or
12-
* (at your option) any later version.
13-
* @copyright
14-
* This program is distributed in the hope that it will be useful,
15-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
16-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17-
* GNU General Public License for more details.*
18-
* @copyright
19-
* You should have received a copy of the GNU General Public License
20-
* along with this program. If not, see <https://www.gnu.org/licenses/>.
4+
* This file is part of GCodeWorkShop.
5+
*
6+
* GCodeWorkShop is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation, either version 2 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* This program is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2118
*/
2219

2320
#include <QFrame> // for QFrame

‎gcodeworkshop_top.pro

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ include(lang/lang.pri)
99

1010
examples.files = $$PROJECT_ROOT_PATH/examples/*
1111
doc.files = $$PROJECT_ROOT_PATH/README.md $$PROJECT_ROOT_PATH/doc/SerialTransmission_Help.html
12+
license.files = $$PROJECT_ROOT_PATH/COPYING $$PROJECT_ROOT_PATH/COPYING.LESSER
1213

1314

1415
# target platforms dependencies
@@ -21,6 +22,7 @@ unix {
2122

2223
examples.path = $${PREFIX}/share/gcodeworkshop/examples
2324
doc.path = $${PREFIX}/share/doc/gcodeworkshop
25+
license.path = $${PREFIX}/share/doc/gcodeworkshop
2426
mime.path = $${PREFIX}/share/mime/packages
2527
desktop.path = $${PREFIX}/share/applications
2628

@@ -29,7 +31,7 @@ unix {
2931
icons.files = $$findFiles($$ICONS_BASE_PATH, *.png)
3032
icons.path = $${PREFIX}/share/icons
3133

32-
INSTALLS += mime desktop icons examples doc
34+
INSTALLS += mime desktop icons examples doc license
3335
}
3436

3537
macx {

‎install/MSYS2-deploy.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ echo ""
102102
echo "Application installation."
103103
echo "Destination folder: $INSTALL_DIR"
104104
mkdir -p $INSTALL_DIR/bin $INSTALL_DIR/doc $INSTALL_DIR/examples $INSTALL_DIR/lang
105-
cp -r $PROJECT_ROOT_DIR/LICENSE $INSTALL_DIR
105+
cp -r $PROJECT_ROOT_DIR/COPYING $INSTALL_DIR
106+
cp -r $PROJECT_ROOT_DIR/COPYING.LESSER $INSTALL_DIR
106107
cp -r $APP_BIN_DIR/* $INSTALL_DIR/bin
107108
cp -r $PROJECT_ROOT_DIR/README.md $INSTALL_DIR/doc
108109
cp -r $PROJECT_ROOT_DIR/doc/SerialTransmission_Help.html $INSTALL_DIR/doc

‎install/build-win-msys2.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ deploy()
5656
mkdir -p "$PACKAGE_BIN_DIR"
5757
mkdir -p "$PACKAGE_I18N_DIR"
5858
make install
59-
cp "$SOURCE_DIR"/LICENSE "$PACKAGE_DIR"/LICENSE.txt
59+
cp "$SOURCE_DIR"/COPYING "$PACKAGE_DIR"/LICENSE.txt
60+
cp "$SOURCE_DIR"/COPYING.LESSER "$PACKAGE_DIR"/LICENSE.LESSER.txt
6061

6162
cat <<EOF > "$PACKAGE_BIN_DIR"/qt.conf
6263
; https://doc.qt.io/qt-5/qt-conf.html

‎install/win-installer.nsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
Section "-Install"
102102
SetOutPath "$INSTDIR"
103103
File LICENSE.txt
104+
File LICENSE.LESSER.txt
104105

105106
SetOutPath "$INSTDIR\${PKG_BIN_DIR}"
106107
File /oname=GCodeWorkShop.exe ${APP_BIN_DIR}\gcodeworkshop.exe
@@ -134,6 +135,7 @@ Section "Uninstall"
134135
Delete "$INSTDIR\${PKG_BIN_DIR}\GCodeWorkShop.exe"
135136
Delete "$INSTDIR\${PKG_BIN_DIR}\GCodeFileServer.exe"
136137
Delete "$INSTDIR\LICENSE.txt"
138+
Delete "$INSTDIR\LICENSE.LESSER.txt"
137139
Delete "$INSTDIR\uninst.exe"
138140

139141
RMDir "$INSTDIR\${PKG_BIN_DIR}"

0 commit comments

Comments
 (0)