license fixed... still not a license model found

master
Steffen Pohle 4 years ago
parent 383c49a6e1
commit cc51daddbc

@ -62,17 +62,10 @@ dist: clean
rm -rf $(DISTNAME) rm -rf $(DISTNAME)
mkdir $(DISTNAME) mkdir $(DISTNAME)
cp Makefile* $(DISTNAME) cp Makefile* $(DISTNAME)
cp Readme $(DISTNAME) cp README.md $(DISTNAME)
cp COPYING $(DISTNAME) cp LICENSE $(DISTNAME)
cp Changelog $(DISTNAME) cp Changelog $(DISTNAME)
cp *.ui $(DISTNAME) cp *.ui $(DISTNAME)
mkdir $(DISTNAME)/othersources
cp -r othersources/gdk-pixbuf-2.42.6.tar.xz $(DISTNAME)/othersources
cp -r othersources/glib-main.tar.bz2 $(DISTNAME)/othersources
cp -r othersources/gtk+-3.24.0.tar.xz $(DISTNAME)/othersources
cp -r othersources/libepoxy-master.zip $(DISTNAME)/othersources
cp -r othersources/*.txt $(DISTNAME)/othersources
cp -r othersources/pango-1.48.7.tar.xz $(DISTNAME)/othersources
cp -rf *.h $(DISTNAME) cp -rf *.h $(DISTNAME)
cp -rf *.cc $(DISTNAME) cp -rf *.cc $(DISTNAME)
tar cvzf $(DISTNAME).tgz $(DISTNAME) tar cvzf $(DISTNAME).tgz $(DISTNAME)
@ -107,18 +100,11 @@ buildwindows:
cp testmodbus-server.exe TestModbus-Server-$(VERSION)/ cp testmodbus-server.exe TestModbus-Server-$(VERSION)/
cp testmodbus-server.ui TestModbus-Server-$(VERSION)/ cp testmodbus-server.ui TestModbus-Server-$(VERSION)/
cp testmodbus-server.png TestModbus-Server-$(VERSION)/ cp testmodbus-server.png TestModbus-Server-$(VERSION)/
cp Readme TestModbus-Server-$(VERSION)/ cp README.md TestModbus-Server-$(VERSION)/
cp Changelog TestModbus-Server-$(VERSION)/ cp Changelog TestModbus-Server-$(VERSION)/
cp COPYING TestModbus-Server-$(VERSION)/ cp LICENSE TestModbus-Server-$(VERSION)/
mkdir TestModbus-Server-$(VERSION)/othersources tar xvzf $(CROSSENV)/files/winbuild-dll.tgz -C TestModbus-Server-$(VERSION)/
cp -r othersources/gdk-pixbuf-2.42.6.tar.xz TestModbus-Server-$(VERSION)/othersources tar xvzf $(CROSSENV)/files/winbuild-share.tgz -C TestModbus-Server-$(VERSION)/
cp -r othersources/glib-main.tar.bz2 TestModbus-Server-$(VERSION)/othersources
cp -r othersources/gtk+-3.24.0.tar.xz TestModbus-Server-$(VERSION)/othersources
cp -r othersources/libepoxy-master.zip TestModbus-Server-$(VERSION)/othersources
cp -r othersources/*.txt TestModbus-Server-$(VERSION)/othersources
cp -r othersources/pango-1.48.7.tar.xz TestModbus-Server-$(VERSION)/othersources
tar xvzf othersources/winbuild-dll.tgz -C TestModbus-Server-$(VERSION)/
tar xvzf othersources/winbuild-share.tgz -C TestModbus-Server-$(VERSION)/
-include $(DEPENDFILE) -include $(DEPENDFILE)

@ -1,8 +1,8 @@
TARGET = $(APP).exe TARGET = $(APP).exe
CROSSENV = /opt/W64-cross-compile/
CPP = /usr/bin/x86_64-w64-mingw32-g++ CPP = /usr/bin/x86_64-w64-mingw32-g++
CPPFLAGS = -ggdb -Wall -O0 `PKG_CONFIG_PATH=/opt/W64-cross-compile/lib/pkgconfig pkg-config --cflags gtk+-3.0 gmodule-export-2.0` -Wl,--export-dynamic -DBUILD_WINDOWS=1 -Wdeprecated CPPFLAGS = -ggdb -Wall -O0 `PKG_CONFIG_PATH=$(CROSSENV)/lib/pkgconfig pkg-config --cflags gtk+-3.0 gmodule-export-2.0` -Wl,--export-dynamic -DBUILD_WINDOWS=1 -Wdeprecated
INCLUDES = INCLUDES =
LDFLAGS = -lws2_32 LDFLAGS = -lws2_32
LIBS = `PKG_CONFIG_PATH=/opt/W64-cross-compile/lib/pkgconfig pkg-config --libs gtk+-3.0 gmodule-export-2.0` -L/usr/lib -mwindows LIBS = `PKG_CONFIG_PATH=$(CROSSENV)/lib/pkgconfig pkg-config --libs gtk+-3.0 gmodule-export-2.0` -L/usr/lib -mwindows

@ -1,23 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.2 <!-- Generated with glade 3.38.2
Copyright (C)
This file is part of TestModbus-Server. This file is part of TestModbus-Server.
TestModbus-Server is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
TestModbus-Server is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with TestModbus-Server. If not, see <http://www.gnu.org/licenses/>.
Author: Steffen Pohle <steffen@fampohle.de> Author: Steffen Pohle <steffen@fampohle.de>
--> -->
@ -916,18 +900,12 @@ Author: Steffen Pohle <steffen@fampohle.de>
</object> </object>
<object class="GtkTextBuffer" id="textbuffer1"> <object class="GtkTextBuffer" id="textbuffer1">
<property name="text" translatable="yes"> <property name="text" translatable="yes">
TestModbus-Server program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
TestModbus-Server is distributed in the hope that it will be useful, The license model for this software (TestModbus-Server) is not yet choosen.
but WITHOUT ANY WARRANTY; without even the implied warranty of At the moment you can use this software free of charge at your own risk.
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. 06.Sep.2021 Steffen Pohle
You should have received a copy of the GNU General Public License
along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.
</property> </property>
</object> </object>
<object class="GtkDialog" id="dlgabout"> <object class="GtkDialog" id="dlgabout">

Loading…
Cancel
Save