ts-warp-1.5.2, gui-warp-1.0.25 (gui-warp-v1.0.30-mac), ns-warp-1.0.7

Author: mezantrop

CHANGELOG.md

@@ -1,6 +1,8 @@
 # CHANGELOG
 
-* **2024.06.30    Current**
+* **2024.07.12    ts-warp-1.5.2, gui-warp-1.0.25 (gui-warp-v1.0.30-mac), ns-warp-1.0.7**
+  * `GUI-Warp`: `About`-tab displays `CHANGELOG.md`-file
+  * `Makefile`: installs/deinstalls text-files files into/from `<PREFIX>/share/ts-warp` directory
   * `GUI-Warp.app`: `ts-warp.sh` can be run from `CLI` to control `ts-warp` daemon e.g.:
       `sudo /Applications/gui-warp.app/Contents/Resources/ts-warp.sh start /Users/$USER/ts-warp`
   * `GUI-Warp.app`: `build.sh` uses current `openssl` and `libssh2` versions

Makefile

@@ -130,6 +130,12 @@ install: ts-warp.sh ts-warp_autofw.sh ts-pass install-examples
 	install -m 755 man/ts-warp.sh.1 $(PREFIX)/man/man1
 	install -m 755 man/ts-warp.5 $(PREFIX)/man/man5
 	install -m 755 man/ts-warp.8 $(PREFIX)/man/man8
+	install -d $(PREFIX)/share/
+	install -d $(PREFIX)/share/ts-warp/
+	install -m 644 CHANGELOG.md $(PREFIX)/share/ts-warp
+	install -m 644 CONTRIBUTORS.md $(PREFIX)/share/ts-warp
+	install -m 644 LICENSE $(PREFIX)/share/ts-warp
+	install -m 644 README.md $(PREFIX)/share/ts-warp
 
 deinstall: uninstall
 uninstall:
@@ -149,6 +155,11 @@ uninstall:
 	rm -f $(PREFIX)/man/man1/ts-warp.sh.1
 	rm -f $(PREFIX)/man/man5/ts-warp.5
 	rm -f $(PREFIX)/man/man8/ts-warp.8
+	rm -f $(PREFIX)/share/ts-warp/CHANGELOG.md
+	rm -f $(PREFIX)/share/ts-warp/CONTRIBUTORS.md
+	rm -f $(PREFIX)/share/ts-warp/LICENSE
+	rm -f $(PREFIX)/share/ts-warp/README.md
+	rmdir $(PREFIX)/share/ts-warp/
 
 clean:
 	rm -rf ts-warp ts-warp.sh ts-warp_autofw.sh ts-pass *.o *.dSYM *.core examples/*.conf examples/*.sh .configured

gui/gui-warp.py.in

@@ -57,7 +57,8 @@ class App:
                  fwfile='/usr/local/etc/ts-warp_pf.conf',
                  logfile='/usr/local/var/log/ts-warp.log',
                  pidfile='/usr/local/var/run/ts-warp.pid',
-                 url_new_vesrsion=''):
+                 url_new_vesrsion='',
+                 relfile=''):
 
         self.password = ''
 
@@ -226,6 +227,7 @@ class App:
         tab_about.rowconfigure(2, weight=0)
         tab_about.rowconfigure(3, weight=0)
         tab_about.rowconfigure(4, weight=1)
+        tab_about.rowconfigure(5, weight=0)
 
         style_url = ttk.Style()
         style_url.configure("URL.TLabel", foreground="orange")
@@ -255,10 +257,21 @@ It is a free and open-source software, but if you want to support it, please do'
 
         ttk.Separator(tab_about, orient='horizontal').grid(column=0, row=3, sticky=tk.EW, columnspan=2, pady=self._pady)
 
+        release_txt = tk.Text(tab_about, highlightthickness=0, state='disabled')
+        release_txt.grid(column=0, row=4, columnspan=2, sticky=tk.NSEW, pady=self._pady)
+        tab_about.bind("<Visibility>", self.readfile_ini(release_txt, relfile))
+        release_txt.config(state='disabled')
+        release_txt.see('1.0')
+
+        scroll_release = ttk.Scrollbar(tab_about, orient=tk.VERTICAL)
+        scroll_release.grid(column=2, row=4, sticky=tk.NSEW, pady=self._pady)
+        scroll_release.config(command=release_txt.yview)
+        release_txt.config(yscrollcommand=scroll_release.set)
+
         lbl_contact_txt = ttk.Label(tab_about, text='Mikhail Zakharov, 2021-2024, BSD-2-Clause license')
-        lbl_contact_txt.grid(column=0, row=4, sticky=tk.SW, padx=self._padx, pady=self._pady)
+        lbl_contact_txt.grid(column=0, row=5, sticky=tk.SW, padx=self._padx, pady=self._pady)
         lbl_contact_url = ttk.Label(tab_about, text='[email protected]', style='URL.TLabel')
-        lbl_contact_url.grid(column=1, row=4, sticky=tk.SE, padx=self._padx, pady=self._pady)
+        lbl_contact_url.grid(column=1, row=5, sticky=tk.SE, padx=self._padx, pady=self._pady)
         lbl_contact_url.bind("<Button-1>", lambda e: webbrowser.open_new(url_contact))
 
         # -- Status bar ---------------------------------------------------------------------------------------------- #
@@ -527,6 +540,7 @@ if __name__ == "__main__":
     logfile = prefix + '/var/log/ts-warp.log'
     pidfile = prefix + '/var/run/ts-warp.pid'
     actfile = prefix + '/var/spool/ts-warp/ts-warp.act'
+    relfile = prefix + '/share/ts-warp/CHANGELOG.md'
 
     # Override defaults by gui-warp.ini
     try:
@@ -552,4 +566,4 @@ if __name__ == "__main__":
 
     app = App(runcmd=runcmd, daemon_options=daemon_options,
               inifile=inifile, fwfile=fwfile, logfile=logfile, pidfile=pidfile,
-              url_new_vesrsion=url_new_vesrsion)
+              url_new_vesrsion=url_new_vesrsion, relfile=relfile)

gui/ports/macOS/gui-warp.py

@@ -207,6 +207,7 @@ def __init__(self, width=800, height=560,
         tab_about.rowconfigure(2, weight=0)
         tab_about.rowconfigure(3, weight=0)
         tab_about.rowconfigure(4, weight=1)
+        tab_about.rowconfigure(5, weight=0)
 
         style_url = ttk.Style()
         style_url.configure("URL.TLabel", foreground="orange")
@@ -236,10 +237,21 @@ def __init__(self, width=800, height=560,
 
         ttk.Separator(tab_about, orient='horizontal').grid(column=0, row=3, sticky=tk.EW, columnspan=2, pady=self._pady)
 
+        release_txt = tk.Text(tab_about, highlightthickness=0, state='disabled')
+        release_txt.grid(column=0, row=4, columnspan=2, sticky=tk.NSEW, pady=self._pady)
+        tab_about.bind("<Visibility>", self.readfile_ini(release_txt, 'CHANGELOG.md'))
+        release_txt.config(state='disabled')
+        release_txt.see('1.0')
+
+        scroll_release = ttk.Scrollbar(tab_about, orient=tk.VERTICAL)
+        scroll_release.grid(column=2, row=4, sticky=tk.NSEW, pady=self._pady)
+        scroll_release.config(command=release_txt.yview)
+        release_txt.config(yscrollcommand=scroll_release.set)
+
         lbl_contact_txt = ttk.Label(tab_about, text='Mikhail Zakharov, 2021-2024, BSD-2-Clause license')
-        lbl_contact_txt.grid(column=0, row=4, sticky=tk.SW, padx=self._padx, pady=self._pady)
+        lbl_contact_txt.grid(column=0, row=5, sticky=tk.SW, padx=self._padx, pady=self._pady)
         lbl_contact_url = ttk.Label(tab_about, text='[email protected]', style='URL.TLabel')
-        lbl_contact_url.grid(column=1, row=4, sticky=tk.SE, padx=self._padx, pady=self._pady)
+        lbl_contact_url.grid(column=1, row=5, sticky=tk.SE, padx=self._padx, pady=self._pady)
         lbl_contact_url.bind("<Button-1>", lambda e: webbrowser.open_new(url_contact))
 
         # -- Status bar ---------------------------------------------------------------------------------------------- #

gui/ports/macOS/setup.py

@@ -40,7 +40,7 @@
     'iconfile': 'media/gui-warp.icns',
     'arch': 'universal2',
     'packages': ['tkinter'],
-    'resources': ['../../../LICENSE']
+    'resources': ['../../../LICENSE', '../../../CHANGELOG.md']
 }
 
 setup(

version.h

@@ -29,7 +29,7 @@
 #define PROG_NAME_SHORT    "TSW"
 #define PROG_VERSION_MAJOR "1"
 #define PROG_VERSION_MINOR "5"
-#define PROG_VERSION_BUILD "1"
+#define PROG_VERSION_BUILD "2"
 #define PROG_VERSION       PROG_VERSION_MAJOR "." PROG_VERSION_MINOR "." PROG_VERSION_BUILD
 #define PROG_NAME_FULL     PROG_NAME " " PROG_VERSION
 #define PROG_NAME_CODE     PROG_NAME_SHORT PROG_VERSION