Merge branch 'main' of https://git.kj7rrv.com/kj7rrv/navpoint

README.md

@@ -1,4 +1,4 @@
-# Navpoint Desktop
+# Navpoint Desktop v0.10dev
 
 [Navpoint](https://git.kj7rrv.com/kj7rrv/navpoint) makes the user's current
 location available in KML format over a local HTTP server (listening on
@@ -20,7 +20,7 @@ recommended where possible, is from a USB GPS receiver that supports the [NMEA
 0183](https://en.wikipedia.org/wiki/NMEA_0183) protocol. (A handheld GPS
 receiver connected to a computer may or may not work; it does not work with my
 Garmin GPSMAP 64st. Any common USB GPS dongle, such as [this one available from
-Amazon](https://www.amazon.com/VK-162-G-Mouse-External-Navigation-Raspberry/dp/B01EROIUEW/)
+Amazon](https://www.amazon.com/VK-162-G-Mouse-External-Navigation-Raspberry/dp/B01EROIUEW/),
 should work, although, of course, I cannot guarantee that any particular device
 will be compatible with Navpoint. On Windows, USB mode should work
 out-of-the-box with a compatible GPS receiver; on Linux, your user account

build-windows.bat

@@ -1,4 +0,0 @@
-pyinstaller -i=icon.ico --windowed --onefile --hidden-import tornado.web --add-data icon.ico:files --add-data README.md:files --add-data GPL-3.0.txt:files --add-data CC-BY-SA-4.0.txt:files --name=navpoint.exe main.py
-"C:\Program Files (x86)\NSIS\makensis.exe" .\windows_installer.nsi
-move "dist\navpoint.exe" "dist\navpoint-windows-%PROCESSOR_ARCHITECTURE%-portable.exe"
-move "dist\NavpointInstaller.exe" "dist\navpoint-windows-%PROCESSOR_ARCHITECTURE%-installer.exe"

build-windows.ps1

@@ -0,0 +1,14 @@
+$version = (Get-Content -Path README.md -TotalCount 1).Split()[3]
+$distName = "navpoint-$version-windows-$env:PROCESSOR_ARCHITECTURE"
+
+Remove-Item -Path "dist\$distName-*"
+
+pyinstaller --icon "icon.ico" --windowed --onefile --hidden-import "tornado.web" --add-data "icon.ico:files" --add-data "README.md:files" --add-data "GPL-3.0.txt:files" --add-data "CC-BY-SA-4.0.txt:files" --name "navpoint.exe" "main.py"
+
+(Get-Content ".\windows_installer.nsi" -Raw).Replace("<<version>>", "$version").Replace("<<distName>>", "$distName") | Out-File ".\temp_installer.nsi"
+& "C:\Program Files (x86)\NSIS\makensis.exe" ".\temp_installer.nsi"
+Remove-Item -Path ".\temp_installer.nsi"
+
+Move-Item -Path "dist\navpoint.exe" -Destination "dist\$distName-portable.exe"
+
+# Move-Item -Path "dist\NavpointInstaller.exe" -Destination "dist\$distName-installer.exe"

navpoint/run.py

@@ -6,6 +6,9 @@ import navpoint.phone_server
 import navpoint.usb
 import navpoint.about
 
+def _version():
+    with open(navpoint.fix_path.fix_path("README.md")) as f:
+        return f.readline().split()[3]
 
 def run():
     def _usb_clicked():
@@ -37,7 +40,7 @@ def run():
     ttk.Separator(window, orient="horizontal").pack(fill="x", pady=3)
     ttk.Label(window, text="Navpoint is free and open-source.").pack()
     about_button = ttk.Button(
-        window, text="About Navpoint", command=navpoint.about.about
+        window, text="About Navpoint " + _version(), command=navpoint.about.about
     )
     about_button.pack()
 

windows_installer.nsi

@@ -1,5 +1,5 @@
-OutFile "dist\NavpointInstaller.exe"
-# define installation directory
+Name "Navpoint <<version>>"
+OutFile "dist\<<distName>>-installer.exe"
 InstallDir $PROFILE\Navpoint
 
 RequestExecutionLevel user
@@ -9,25 +9,15 @@ Section
     SetOutPath $INSTDIR
 
     File dist\navpoint.exe
- 
-    # create the uninstaller
-    WriteUninstaller "$INSTDIR\uninstall.exe"
- 
-    # create a shortcut named "new shortcut" in the start menu programs directory
-    # point the new shortcut at the program uninstaller
-    CreateShortcut "$SMPROGRAMS\Uninstall Navpoint.lnk" "$INSTDIR\uninstall.exe"
     CreateShortcut "$SMPROGRAMS\Navpoint.lnk" "$INSTDIR\navpoint.exe"
+    CreateShortcut "$DESKTOP\Navpoint.lnk" "$INSTDIR\navpoint.exe"
+ 
+    WriteUninstaller "$INSTDIR\uninstall.exe"
+    CreateShortcut "$SMPROGRAMS\Uninstall Navpoint.lnk" "$INSTDIR\uninstall.exe"
 SectionEnd
  
-# uninstaller section start
 Section "uninstall"
- 
-    # Remove the link from the start menu
     Delete "$SMPROGRAMS\Uninstall Navpoint.lnk"
- 
-    # Delete the uninstaller
     Delete $INSTDIR\uninstaller.exe
- 
     RMDir $INSTDIR
-# uninstaller section end
 SectionEnd