1.6.x windows setup

.github/workflows/ci.yml

@@ -0,0 +1,103 @@
+name: Celestia
+
+on:
+  push:
+    branches: [ 1.6.x ]
+    paths: [ src/**, .github/workflows/ci.yml, celestia.sln, celestia.vcxproj, celestia.iss ]
+  pull_request:
+    branches: [ 1.6.x ]
+    paths: [ src/**, .github/workflows/ci.yml, celestia.sln, celestia.vcxproj, celestia.iss ]
+
+env:
+  VCPKG_BINARY_SOURCES: 'clear;nuget,GitHub,readwrite'
+
+jobs:
+  build-windows:
+    name: "Build and package Windows"
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+
+    steps:
+    - name: Update vcpkg
+      shell: pwsh
+      run: |
+        $vcpkgCommit = '69efe9cc2df0015f0bb2d37d55acde4a75c9a25b'
+        pushd $env:VCPKG_INSTALLATION_ROOT
+        git fetch --depth=1 origin $vcpkgCommit
+        git reset --hard $vcpkgCommit
+        ./bootstrap-vcpkg.bat
+        popd
+
+    - name: Setup Nuget Credentials
+      shell: pwsh
+      run: |
+        $nugetCmd = vcpkg fetch nuget | Select-Object -Last 1
+        $nugetSource = 'https://nuget.pkg.github.com/CelestiaProject/index.json'
+        & "$nugetCmd" sources add `
+          -Source "$nugetSource" `
+          -StorePasswordInClearText `
+          -Name "GitHub" `
+          -Username 'CelestiaProject' `
+          -Password '${{secrets.GITHUB_TOKEN}}'
+        & "$nugetCmd" setapikey '${{secrets.GITHUB_TOKEN}}' `
+          -Source "$nugetSource"
+
+    - name: Setup vcpkg integration
+      shell: pwsh
+      run: |
+        vcpkg integrate install
+
+    - name: Install dependencies (x64)
+      shell: pwsh
+      run: |
+        vcpkg --triplet=x64-windows install --recurse libpng libjpeg-turbo gettext[tools] luajit cspice
+        echo "$env:VCPKG_INSTALLATION_ROOT/installed/x64-windows/tools/gettext/bin" >> $env:GITHUB_PATH
+
+    - name: Install dependencies (x86)
+      shell: pwsh
+      run: |
+        vcpkg --triplet=x86-windows install --recurse libpng libjpeg-turbo gettext luajit cspice
+
+    - name: Checkout source code
+      uses: actions/checkout@v3
+
+    - name: Build Win32
+      shell: pwsh
+      run: |
+        $installationPath = vswhere.exe -prerelease -latest -property installationPath
+        if ($installationPath -and (Test-Path "$installationPath\Common7\Tools\vsdevcmd.bat")) {
+          & "${env:COMSPEC}" /s /c "`"$installationPath\Common7\Tools\vsdevcmd.bat`" -no_logo -arch=x86 -host_arch=amd64 && set" | ForEach-Object {
+            $name, $value = $_ -split '=', 2
+            Set-Content env:\"$name" $value
+          }
+        }
+        $VcpkgIncludeDir32 = "$env:VCPKG_INSTALLATION_ROOT/installed/x86-windows/include"
+        msbuild celestia.sln /p:Configuration=Release /p:Platform=Win32 "/p:IncludePath=`"$VcpkgIncludeDir32/cspice;$VcpkgIncludeDir32/luajit`""
+        perl po/translate_resources.pl Win32
+
+    - name: Build x64
+      shell: pwsh
+      run: |
+        $installationPath = vswhere.exe -prerelease -latest -property installationPath
+        if ($installationPath -and (Test-Path "$installationPath\Common7\Tools\vsdevcmd.bat")) {
+          & "${env:COMSPEC}" /s /c "`"$installationPath\Common7\Tools\vsdevcmd.bat`" -no_logo -arch=amd64 -host_arch=amd64 && set" | ForEach-Object {
+            $name, $value = $_ -split '=', 2
+            Set-Content env:\"$name" $value
+          }
+        }
+        $VcpkgIncludeDir64 = "$env:VCPKG_INSTALLATION_ROOT/installed/x64-windows/include"
+        msbuild celestia.sln /p:Configuration=Release /p:Platform=x64 "/p:IncludePath=`"$VcpkgIncludeDir64/cspice;$VcpkgIncludeDir64/luajit`""
+        perl po/translate_resources.pl x64
+
+    - name: Create installer
+      shell: pwsh
+      run: ISCC celestia.iss
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v3
+      if: success()
+      with:
+        name: celestia-windows-installer
+        path: |
+          ${{github.workspace}}/Output/**.exe

ChangeLog

@@ -1780,3 +1780,19 @@ Bug fixes
 1.6.2.2
 Bug fixes
 * Windows: fix bookmark manager
+
+1.6.3
+Features, backported from 1.7
+* Backport location updates from 1.7 version
+* Allow binary orbits without text sources
+
+Bug fixes
+* Fix out-of-bounds in 3DS read
+* Handle locations in object:localname()
+* macOS: Re-add support for OS X 10.7 to 10.9
+* macOS: Fix flickering edges on some GPU
+* Unix: Fix executable name in celestia.desktop
+* Unix: Fix buffer overflow in eclipse finder
+
+Translations
+* Update Bulgarian translation

celestia.iss

@@ -3,15 +3,18 @@
 
 ; This script was tested with Inno Setup Compiler version 5.1.5
 
+#define CelestiaVersion "1.6.3"
+
 [Setup]
 AppName=Celestia
-AppVersion=1.6.2.2
-VersionInfoVersion=1.6.2.2
+AppVersion={#CelestiaVersion}
+VersionInfoVersion={#CelestiaVersion}
 AppPublisher=Celestia Development Team
 AppPublisherURL=https://celestia.space/
 AppSupportURL=https://celestia.space/
 AppUpdatesURL=https://celestia.space/
-AppCopyright=Copyright (C) 2001-2020 Celestia Development Team
+AppCopyright=Copyright (C) 2001-2023 Celestia Development Team
+OutputBaseFilename=celestia-{#CelestiaVersion}
 DefaultDirName={code:DefDirRoot}\Celestia
 DefaultGroupName=Celestia
 LicenseFile=COPYING
@@ -67,24 +70,22 @@ Name: "{app}\help"
 Name: "{app}\help\CelestiaGuide" 
 
 [Files]
-Source: "x64\Release\celestia.exe";                              DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "win32\Release\celestia.exe";                            DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "c:\tools\vcpkg\installed\x64-windows\bin\cspice.dll";   DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "c:\tools\vcpkg\installed\x86-windows\bin\cspice.dll";   DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "c:\tools\vcpkg\installed\x64-windows\bin\jpeg62.dll";   DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "c:\tools\vcpkg\installed\x86-windows\bin\jpeg62.dll";   DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "c:\tools\vcpkg\installed\x64-windows\bin\libintl.dll";  DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "c:\tools\vcpkg\installed\x86-windows\bin\libintl.dll";  DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "c:\tools\vcpkg\installed\x64-windows\bin\libiconv.dll";  DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "c:\tools\vcpkg\installed\x86-windows\bin\libiconv.dll";  DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "c:\tools\vcpkg\installed\x64-windows\bin\libcharset.dll";  DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "c:\tools\vcpkg\installed\x86-windows\bin\libcharset.dll";  DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "c:\tools\vcpkg\installed\x64-windows\bin\libpng16.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "c:\tools\vcpkg\installed\x86-windows\bin\libpng16.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "c:\tools\vcpkg\installed\x64-windows\bin\lua51.dll";      DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "c:\tools\vcpkg\installed\x86-windows\bin\lua51.dll";      DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
-Source: "c:\tools\vcpkg\installed\x64-windows\bin\zlib1.dll";    DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
-Source: "c:\tools\vcpkg\installed\x86-windows\bin\zlib1.dll";    DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "x64\Release\celestia.exe";   DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "Win32\Release\celestia.exe"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "x64\Release\cspice.dll";     DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "Win32\Release\cspice.dll";   DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "x64\Release\jpeg62.dll";      DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "Win32\Release\jpeg62.dll";    DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "x64\Release\intl-8.dll";     DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "Win32\Release\intl-8.dll";   DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "x64\Release\iconv-2.dll";    DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "Win32\Release\iconv-2.dll";  DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "x64\Release\libpng16.dll";   DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "Win32\Release\libpng16.dll"; DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "x64\Release\lua51.dll";      DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "Win32\Release\lua51.dll";    DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
+Source: "x64\Release\zlib1.dll";      DestDir: "{app}"; Flags: ignoreversion; Check: Is64BitInstallMode
+Source: "Win32\Release\zlib1.dll";    DestDir: "{app}"; Flags: ignoreversion; Check: not Is64BitInstallMode
 Source: "start.cel";    DestDir: "{app}"; Flags: ignoreversion
 Source: "celestia.cfg"; DestDir: "{app}"; Flags: ignoreversion
 Source: "demo.cel";     DestDir: "{app}"; Flags: ignoreversion
@@ -187,8 +188,6 @@ Source: "locale\nb\LC_MESSAGES\celestia.mo";                      DestDir: "{app
 Source: "locale\nb\LC_MESSAGES\celestia_constellations.mo";       DestDir: "{app}/locale/nb/LC_MESSAGES"; Flags: ignoreversion
 Source: "locale\nl\LC_MESSAGES\celestia.mo";                      DestDir: "{app}/locale/nl/LC_MESSAGES"; Flags: ignoreversion
 Source: "locale\nl\LC_MESSAGES\celestia_constellations.mo";       DestDir: "{app}/locale/nl/LC_MESSAGES"; Flags: ignoreversion
-Source: "locale\no\LC_MESSAGES\celestia.mo";                      DestDir: "{app}/locale/no/LC_MESSAGES"; Flags: ignoreversion
-Source: "locale\no\LC_MESSAGES\celestia_constellations.mo";       DestDir: "{app}/locale/no/LC_MESSAGES"; Flags: ignoreversion
 Source: "locale\pl\LC_MESSAGES\celestia.mo";                      DestDir: "{app}/locale/pl/LC_MESSAGES"; Flags: ignoreversion
 Source: "locale\pl\LC_MESSAGES\celestia_constellations.mo";       DestDir: "{app}/locale/pl/LC_MESSAGES"; Flags: ignoreversion
 Source: "locale\pt\LC_MESSAGES\celestia.mo";                      DestDir: "{app}/locale/pt/LC_MESSAGES"; Flags: ignoreversion

celestia.vcxproj

@@ -20,24 +20,24 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{DDDE8EA8-F55A-491B-A102-11C9C01B4B58}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

configure.ac

@@ -4,7 +4,7 @@ dnl Process this file with autoconf to make a configure script
 dnl
 
 AC_PREREQ(2.57)
-AC_INIT([celestia], [1.6.2], [https://github.com/CelestiaProject/Celestia])
+AC_INIT([celestia], [1.6.3], [https://github.com/CelestiaProject/Celestia])
 AC_CONFIG_SRCDIR(acinclude.m4)
 AC_CONFIG_MACRO_DIRS([macros])
 

macosx/Info.plist

@@ -35,7 +35,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.6.2</string>
+	<string>1.6.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

po/ar.po

@@ -1357,7 +1357,7 @@ msgstr "معلومات عن OpenGL"
 
 #: src/celestia/gtk/actions.cpp:728
 #, fuzzy
-msgid "Copyright © 2001-2021 Celestia Development Team"
+msgid "Copyright © 2001-2023 Celestia Development Team"
 msgstr "جميع الحقوق محفوظة 2001-2006, Chris Laurel"
 
 #: src/celestia/gtk/actions.cpp:1046
@@ -4953,7 +4953,7 @@ msgstr "موافق"
 
 #: src/celestia/res/resource_strings.cpp:70
 #, fuzzy
-msgid "Copyright (C) 2001-2021, Celestia Development Team"
+msgid "Copyright (C) 2001-2023, Celestia Development Team"
 msgstr "جميع الحقوق محفوظة 2001-2006, Chris Laurel"
 
 #: src/celestia/res/resource_strings.cpp:71

po/be.po

@@ -1319,7 +1319,7 @@ msgstr "Зьвесткі OpenGL"
 
 #: src/celestia/gtk/actions.cpp:728
 msgid "Copyright © 2001-2020 Celestia Development Team"
-msgstr "Аўтарскія правы © 2001-2021, Каманда распрацоўкі Celestia"
+msgstr "Аўтарскія правы © 2001-2023, Каманда распрацоўкі Celestia"
 
 #: src/celestia/gtk/actions.cpp:1046
 #, c-format
@@ -4546,7 +4546,7 @@ msgstr "Так"
 
 #: src/celestia/res/resource_strings.cpp:70
 msgid "Copyright (C) 2001-2020, Celestia Development Team"
-msgstr "Аўтарскія правы (C) 2001-2021, Каманда распрацоўкі Celestia"
+msgstr "Аўтарскія правы (C) 2001-2023, Каманда распрацоўкі Celestia"
 
 #: src/celestia/res/resource_strings.cpp:71
 msgid "https://celestia.space"

po/bg.po

@@ -1324,8 +1324,8 @@ msgid "Open GL Info"
 msgstr "Информация за „OpenGL“"
 
 #: src/celestia/gtk/actions.cpp:728
-msgid "Copyright © 2001-2021 Celestia Development Team"
-msgstr "Авторско право © 2001-2021, Екипа на „Celestia“"
+msgid "Copyright © 2001-2023 Celestia Development Team"
+msgstr "Авторско право © 2001-2023, Екипа на „Celestia“"
 
 #: src/celestia/gtk/actions.cpp:1046
 #, c-format
@@ -4548,8 +4548,8 @@ msgid "OK"
 msgstr "ОК"
 
 #: src/celestia/res/resource_strings.cpp:70
-msgid "Copyright (C) 2001-2021, Celestia Development Team"
-msgstr "Авторско право (С) 2001-2021, Екипа на „Celestia“"
+msgid "Copyright (C) 2001-2023, Celestia Development Team"
+msgstr "Авторско право (С) 2001-2023, Екипа на „Celestia“"
 
 #: src/celestia/res/resource_strings.cpp:71
 msgid "https://celestia.space"

po/de.po

@@ -1327,7 +1327,7 @@ msgstr "OpenGL-Informationen"
 
 #: src/celestia/gtk/actions.cpp:728
 #, fuzzy
-msgid "Copyright © 2001-2021 Celestia Development Team"
+msgid "Copyright © 2001-2023 Celestia Development Team"
 msgstr "Copyright (C) 2001-2009, Celestia Development Team"
 
 #: src/celestia/gtk/actions.cpp:1046
@@ -4657,7 +4657,7 @@ msgstr "OK"
 
 #: src/celestia/res/resource_strings.cpp:70
 #, fuzzy
-msgid "Copyright (C) 2001-2021, Celestia Development Team"
+msgid "Copyright (C) 2001-2023, Celestia Development Team"
 msgstr "Copyright (C) 2001-2009, Celestia Development Team"
 
 #: src/celestia/res/resource_strings.cpp:71

po/el.po

@@ -1322,7 +1322,7 @@ msgstr "Πληροφορίες OpenGL"
 
 #: src/celestia/gtk/actions.cpp:728
 #, fuzzy
-msgid "Copyright © 2001-2021 Celestia Development Team"
+msgid "Copyright © 2001-2023 Celestia Development Team"
 msgstr "Πνευματική Ιδιοκτησία (C) 2001-2009, Η Ομάδα Συγγραφής του Celestia"
 
 #: src/celestia/gtk/actions.cpp:1046
@@ -4779,7 +4779,7 @@ msgstr "Εντάξει"
 
 #: src/celestia/res/resource_strings.cpp:70
 #, fuzzy
-msgid "Copyright (C) 2001-2021, Celestia Development Team"
+msgid "Copyright (C) 2001-2023, Celestia Development Team"
 msgstr "Πνευματική Ιδιοκτησία (C) 2001-2009, Η Ομάδα Συγγραφής του Celestia"
 
 #: src/celestia/res/resource_strings.cpp:71

po/es.po

@@ -1323,7 +1323,7 @@ msgstr "Información OpenGL"
 
 #: src/celestia/gtk/actions.cpp:728
 #, fuzzy
-msgid "Copyright © 2001-2021 Celestia Development Team"
+msgid "Copyright © 2001-2023 Celestia Development Team"
 msgstr "Copyright (C) 2001-2008, Equipo de Desarrollo de Celestia"
 
 #: src/celestia/gtk/actions.cpp:1046
@@ -4652,7 +4652,7 @@ msgstr "OK"
 
 #: src/celestia/res/resource_strings.cpp:70
 #, fuzzy
-msgid "Copyright (C) 2001-2021, Celestia Development Team"
+msgid "Copyright (C) 2001-2023, Celestia Development Team"
 msgstr "Copyright (C) 2001-2008, Equipo de Desarrollo de Celestia"
 
 #: src/celestia/res/resource_strings.cpp:71

po/fr.po

@@ -1327,7 +1327,7 @@ msgstr "Information OpenGL"
 
 #: src/celestia/gtk/actions.cpp:728
 #, fuzzy
-msgid "Copyright © 2001-2021 Celestia Development Team"
+msgid "Copyright © 2001-2023 Celestia Development Team"
 msgstr "Copyright (C) 2001-2009, L'équipe de développement de Celestia"
 
 #: src/celestia/gtk/actions.cpp:1046
@@ -4659,7 +4659,7 @@ msgstr "OK"
 
 #: src/celestia/res/resource_strings.cpp:70
 #, fuzzy
-msgid "Copyright (C) 2001-2021, Celestia Development Team"
+msgid "Copyright (C) 2001-2023, Celestia Development Team"
 msgstr "Copyright (C) 2001-2020, L'équipe de développement de Celestia"
 
 #: src/celestia/res/resource_strings.cpp:71

po/gl.po

@@ -1328,7 +1328,7 @@ msgstr "Información OpenGL"
 
 #: src/celestia/gtk/actions.cpp:728
 #, fuzzy
-msgid "Copyright © 2001-2021 Celestia Development Team"
+msgid "Copyright © 2001-2023 Celestia Development Team"
 msgstr "Copyright (C) 2001-2009, Celestia Development Team"
 
 #: src/celestia/gtk/actions.cpp:1046
@@ -4661,7 +4661,7 @@ msgstr "OK"
 
 #: src/celestia/res/resource_strings.cpp:70
 #, fuzzy
-msgid "Copyright (C) 2001-2021, Celestia Development Team"
+msgid "Copyright (C) 2001-2023, Celestia Development Team"
 msgstr "Copyright (C) 2001-2009, Celestia Development Team"
 
 #: src/celestia/res/resource_strings.cpp:71