From 8b8be7d4a8bba22e90ab64c02ab73469020ebb1e Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Wed, 8 Jan 2025 13:12:40 +0000 Subject: [PATCH] Revert "Change domain to temporary" This reverts commit 72364fd1a4c815d7995301abeddcd472b28a0492. --- README.md | 4 ++-- cmake/Set-Toolchain-vcpkg.cmake | 6 +++--- doc/ReadMe.MFC.txt | 2 +- src/debian/control | 2 +- src/wx/CMakeLists.txt | 2 +- src/wx/autoupdater/macos/autoupdater.cpp | 2 +- src/wx/autoupdater/wxmsw/autoupdater.cpp | 4 ++-- src/wx/cmdevents.cpp | 2 +- src/wx/visualboyadvance-m.metainfo.xml | 12 ++++++------ src/wx/wxplist.in | 4 ++-- src/wx/wxvbam.rc | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 25039b2a..bf98f02f 100644 --- a/README.md +++ b/README.md @@ -35,11 +35,11 @@ Chat](https://web.libera.chat/). Game Boy and Game Boy Advance Emulator -The forums are [here](https://board.visualboyadvance-m-emu.org/). +The forums are [here](https://board.visualboyadvance-m.org/). Windows and Mac builds are in the [releases tab](https://github.com/visualboyadvance-m/visualboyadvance-m/releases). -Nightly builds for Windows and macOS are at [https://nightly.visualboyadvance-m-emu.org/](https://nightly.visualboyadvance-m-emu.org/). +Nightly builds for Windows and macOS are at [https://nightly.visualboyadvance-m.org/](https://nightly.visualboyadvance-m.org/). **PLEASE TEST THE NIGHTLY OR MASTER WITH A FACTORY RESET BEFORE REPORTING ISSUES** diff --git a/cmake/Set-Toolchain-vcpkg.cmake b/cmake/Set-Toolchain-vcpkg.cmake index 076678a8..bcefe78b 100644 --- a/cmake/Set-Toolchain-vcpkg.cmake +++ b/cmake/Set-Toolchain-vcpkg.cmake @@ -247,7 +247,7 @@ function(get_binary_packages vcpkg_exe) foreach(triplet ${triplets}) file( - DOWNLOAD "https://nightly.visualboyadvance-m-emu.org/vcpkg/${triplet}/" "${CMAKE_BINARY_DIR}/binary_package_list_${triplet}.html" + DOWNLOAD "https://nightly.visualboyadvance-m.org/vcpkg/${triplet}/" "${CMAKE_BINARY_DIR}/binary_package_list_${triplet}.html" STATUS pkg_list_status ) list(GET pkg_list_status 1 pkg_list_error) @@ -305,10 +305,10 @@ function(get_binary_packages vcpkg_exe) foreach(pkg ${to_install}) string(REGEX REPLACE "^[^_]+_[^_]+_([^.]+)[.]zip\$" "\\1" pkg_triplet ${pkg}) - message(STATUS "Downloading https://nightly.visualboyadvance-m-emu.org/vcpkg/${pkg_triplet}/${pkg} ...") + message(STATUS "Downloading https://nightly.visualboyadvance-m.org/vcpkg/${pkg_triplet}/${pkg} ...") file( - DOWNLOAD "https://nightly.visualboyadvance-m-emu.org/vcpkg/${pkg_triplet}/${pkg}" "${bin_pkgs_dir}/${pkg}" + DOWNLOAD "https://nightly.visualboyadvance-m.org/vcpkg/${pkg_triplet}/${pkg}" "${bin_pkgs_dir}/${pkg}" STATUS pkg_download_status ) list(GET pkg_download_status 1 pkg_download_error) diff --git a/doc/ReadMe.MFC.txt b/doc/ReadMe.MFC.txt index a71007aa..84336307 100644 --- a/doc/ReadMe.MFC.txt +++ b/doc/ReadMe.MFC.txt @@ -9,7 +9,7 @@ VisualBoyAdvance-M Nintendo Game Boy & Game Boy Advance Emulator -Project Homepage: http://visualboyadvance-m-emu.org +Project Homepage: http://visualboyadvance-m.org This program is distributed under the GNU General Public License http://www.gnu.org/licenses/gpl.html diff --git a/src/debian/control b/src/debian/control index 493bd9a2..2f950c34 100755 --- a/src/debian/control +++ b/src/debian/control @@ -21,7 +21,7 @@ Build-Depends: debhelper (>= 9), zip, zlib1g-dev Standards-Version: 3.9.5 -Homepage: http://visualboyadvance-m-emu.org +Homepage: http://visualboyadvance-m.org Vcs-Svn: svn://svn.code.sf.net/p/vbam/code/trunk Vcs-Browser: http://svn.code.sf.net/p/vbam/code/trunk diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt index 6324e7d3..955735c6 100644 --- a/src/wx/CMakeLists.txt +++ b/src/wx/CMakeLists.txt @@ -715,7 +715,7 @@ if(APPLE AND ENABLE_ONLINEUPDATES) PRIVATE ${SPARKLE_INCLUDE_DIR} ) - set(APPCAST_URL "https://data.visualboyadvance-m-emu.org/appcast.xml") + set(APPCAST_URL "https://data.visualboyadvance-m.org/appcast.xml") set(CCS1 rm -rf ${CMAKE_BINARY_DIR}/visualboyadvance-m.app/Contents/Frameworks/Sparkle.framework) set(CCS2 mkdir -p ${CMAKE_BINARY_DIR}/visualboyadvance-m.app/Contents/Frameworks) # The following commands *should* be run to make sure Sparkle is not going diff --git a/src/wx/autoupdater/macos/autoupdater.cpp b/src/wx/autoupdater/macos/autoupdater.cpp index 1964e9df..cf8f27ef 100644 --- a/src/wx/autoupdater/macos/autoupdater.cpp +++ b/src/wx/autoupdater/macos/autoupdater.cpp @@ -6,7 +6,7 @@ SparkleWrapper autoupdater; void initAutoupdater() { - autoupdater.addAppcastURL("https://data.visualboyadvance-m-emu.org/appcast.xml"); + autoupdater.addAppcastURL("https://data.visualboyadvance-m.org/appcast.xml"); } diff --git a/src/wx/autoupdater/wxmsw/autoupdater.cpp b/src/wx/autoupdater/wxmsw/autoupdater.cpp index 52a91264..7f3a54a5 100644 --- a/src/wx/autoupdater/wxmsw/autoupdater.cpp +++ b/src/wx/autoupdater/wxmsw/autoupdater.cpp @@ -9,9 +9,9 @@ void initAutoupdater() // even if we are a nightly, only check latest stable version const wxString version(kVbamMainVersion); #ifndef NO_HTTPS - win_sparkle_set_appcast_url("https://data.visualboyadvance-m-emu.org/appcast.xml"); + win_sparkle_set_appcast_url("https://data.visualboyadvance-m.org/appcast.xml"); #else - win_sparkle_set_appcast_url("http://data.visualboyadvance-m-emu.org/appcast.xml"); + win_sparkle_set_appcast_url("http://data.visualboyadvance-m.org/appcast.xml"); #endif // NO_HTTPS win_sparkle_set_app_details(L"visualboyadvance-m", L"VisualBoyAdvance-M", version.wc_str()); win_sparkle_init(); diff --git a/src/wx/cmdevents.cpp b/src/wx/cmdevents.cpp index 9fe82af0..907f485d 100644 --- a/src/wx/cmdevents.cpp +++ b/src/wx/cmdevents.cpp @@ -2231,7 +2231,7 @@ EVT_HANDLER(wxID_ABOUT, "About...") ai.SetVersion(version); // setting website, icon, license uses custom aboutbox on win32 & macosx // but at least win32 standard about is nothing special - ai.SetWebSite(wxT("http://visualboyadvance-m-emu.org/")); + ai.SetWebSite(wxT("http://visualboyadvance-m.org/")); ai.SetIcon(GetIcons().GetIcon(wxSize(32, 32), wxIconBundle::FALLBACK_NEAREST_LARGER)); ai.SetDescription(_("Nintendo Game Boy / Color / Advance emulator.")); ai.SetCopyright(_("Copyright (C) 1999-2003 Forgotten\nCopyright (C) 2004-2006 VBA development team\nCopyright (C) 2007-2020 VBA-M development team")); diff --git a/src/wx/visualboyadvance-m.metainfo.xml b/src/wx/visualboyadvance-m.metainfo.xml index ddf1b19e..2214584c 100644 --- a/src/wx/visualboyadvance-m.metainfo.xml +++ b/src/wx/visualboyadvance-m.metainfo.xml @@ -17,16 +17,16 @@

- https://visualboyadvance-m-emu.org/screenshots/1.png - https://visualboyadvance-m-emu.org/screenshots/2.png - https://visualboyadvance-m-emu.org/screenshots/3.png - https://visualboyadvance-m-emu.org/screenshots/4.png + https://visualboyadvance-m.org/screenshots/1.png + https://visualboyadvance-m.org/screenshots/2.png + https://visualboyadvance-m.org/screenshots/3.png + https://visualboyadvance-m.org/screenshots/4.png visualboyadvance-m.desktop - https://visualboyadvance-m-emu.org + https://visualboyadvance-m.org https://github.com/visualboyadvance-m/visualboyadvance-m/issues - zachbacon@visualboyadvance-m-emu.org + zachbacon@visualboyadvance-m.org diff --git a/src/wx/wxplist.in b/src/wx/wxplist.in index d8f7d340..ee3a866d 100644 --- a/src/wx/wxplist.in +++ b/src/wx/wxplist.in @@ -44,7 +44,7 @@ UTTypeIdentifier public.gbarom UTTypeReferenceURL - http://visualboyadvance-m-emu.org/ + http://visualboyadvance-m.org/ UTTypeDescription GameBoy Advance ROM UTTypeIconFile @@ -79,7 +79,7 @@ UTTypeIdentifier public.gbrom UTTypeReferenceURL - http://visualboyadvance-m-emu.org/ + http://visualboyadvance-m.org/ UTTypeDescription GameBoy ROM UTTypeIconFile diff --git a/src/wx/wxvbam.rc b/src/wx/wxvbam.rc index 3dd75ebb..427cb8e9 100644 --- a/src/wx/wxvbam.rc +++ b/src/wx/wxvbam.rc @@ -44,7 +44,7 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "Comments", "VisualBoyAdvance-M comes with NO WARRANTY. Use it at your own risk." - VALUE "CompanyName", "http://visualboyadvance-m-emu.org/" + VALUE "CompanyName", "http://visualboyadvance-m.org/" VALUE "FileDescription", "VisualBoyAdvance-M" VALUE "FileVersion", VER_FILEVERSION_STR VALUE "InternalName", "wxvbam"