Merge pull request #149 from overte-org/fix/cdn_urls

Rebranding and fixing URLs, including CDN ones

.github/workflows/master_build.yml

@@ -64,17 +64,17 @@ jobs:
           echo "PYTHON_EXEC=python3" >> $GITHUB_ENV
           echo "INSTALLER_EXT=tgz" >> $GITHUB_ENV
           echo "CMAKE_BUILD_EXTRA=-- -j$(nproc)" >> $GITHUB_ENV
-          echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE=-msse3 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
+          echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE=-msse3 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
         fi
         # Mac build variables
         if [ "${{ matrix.os }}" = "macOS-10.15" ]; then
           echo "PYTHON_EXEC=python3" >> $GITHUB_ENV
           echo "ZIP_COMMAND=zip" >> $GITHUB_ENV
           echo "ZIP_ARGS=-r" >> $GITHUB_ENV
           echo "INSTALLER_EXT=dmg" >> $GITHUB_ENV
-          echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV
+          echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV
           echo "::set-output name=symbols_archive::${BUILD_NUMBER}-${{ matrix.build_type }}-mac-symbols.zip"
-          echo "APP_TARGET_NAME=Vircadia" >> $GITHUB_ENV
+          echo "APP_TARGET_NAME=Overte" >> $GITHUB_ENV
         fi
         # Windows build variables
         if [ "${{ matrix.os }}" = "windows-2019" ]; then

.github/workflows/pr_build.yml

@@ -76,27 +76,27 @@ jobs:
           echo "CMAKE_BUILD_EXTRA=-- -j$(nproc)" >> $GITHUB_ENV
           # Variables specific to our aarch64 runner
           if [ "${{ matrix.os }}" = "self-hosted_debian-11_aarch64" ]; then
-            echo "VIRCADIA_USE_SYSTEM_QT=true" >> $GITHUB_ENV
+            echo "OVERTE_USE_SYSTEM_QT=true" >> $GITHUB_ENV
             echo "CI_WORKSPACE=${{runner.workspace}}" >> $GITHUB_ENV
             # Don't optimize builds to save build time.
-            echo "VIRCADIA_OPTIMIZE=false" >> $GITHUB_ENV
+            echo "OVERTE_OPTIMIZE=false" >> $GITHUB_ENV
           fi
 
           if [[ "${{ matrix.os }}" = *"aarch64" ]]; then
             echo "VCPKG_FORCE_SYSTEM_BINARIES=true" >> $GITHUB_ENV
             if [ "${{ matrix.build_type }}" = "full" ]; then
-              echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
+              echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE= -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
             else
-              echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DCLIENT_ONLY=1 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
+              echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE= -DCLIENT_ONLY=1 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
             fi
 
           fi
 
           if [[ "${{ matrix.os }}" != *"aarch64" ]]; then
             if [ "${{ matrix.build_type }}" = "full" ]; then
-              echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE=-msse3 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
+              echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE=-msse3 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
             else
-              echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE=-msse3 -DCLIENT_ONLY=1 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
+              echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE=-msse3 -DCLIENT_ONLY=1 -DBUILD_TOOLS:BOOLEAN=FALSE -DHIFI_PYTHON_EXEC:FILEPATH=$(which python3)" >> $GITHUB_ENV
             fi
           fi
         fi
@@ -106,11 +106,11 @@ jobs:
           echo "PYTHON_EXEC=python3" >> $GITHUB_ENV
           echo "INSTALLER_EXT=dmg" >> $GITHUB_ENV
           if [ "${{ matrix.build_type }}" = "full" ]; then
-            echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV
+            echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV
           else
-            echo "CMAKE_EXTRA=-DVIRCADIA_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCLIENT_ONLY=1 -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV
+            echo "CMAKE_EXTRA=-DOVERTE_CPU_ARCHITECTURE= -DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk -DCLIENT_ONLY=1 -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=OFF -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_LIBRARIES=/usr/local/opt/openssl/lib -G Xcode" >> $GITHUB_ENV
           fi
-          echo "APP_TARGET_NAME=Vircadia" >> $GITHUB_ENV
+          echo "APP_TARGET_NAME=Overte" >> $GITHUB_ENV
         fi
         # Windows build variables
         if [ "${{ matrix.os }}" = "windows-2019" ]; then
@@ -226,9 +226,9 @@ jobs:
         fi
 
         if [ ${{ env.CI_WORKSPACE }} ]; then
-          find "$CI_WORKSPACE/vircadia-files/vcpkg" -name '*log' -type f -print0 | $TAR --null --force-local -T - -c --xz -v -f "${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz"
+          find "$CI_WORKSPACE/overte-files/vcpkg" -name '*log' -type f -print0 | $TAR --null --force-local -T - -c --xz -v -f "${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz"
         else
-          find "$HOME/vircadia-files/vcpkg" -name '*log' -type f -print0 | $TAR --null --force-local -T - -c --xz -v -f "${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz"
+          find "$HOME/overte-files/vcpkg" -name '*log' -type f -print0 | $TAR --null --force-local -T - -c --xz -v -f "${{ runner.workspace }}/cmake-logs-${{ matrix.os }}-${{ github.event.number }}.tar.xz"
         fi
 
     - name: Archive cmake logs

BUILD.md

@@ -128,7 +128,7 @@ PRODUCTION_BUILD=0|1
 PR_BUILD=0|1
 STABLE_BUILD=0|1
 
-// Determine if to utilize testing or stable Metaverse URLs
+// Determine if to utilize testing or stable directory services URLs
 USE_STABLE_GLOBAL_SERVICES=1
 BUILD_GLOBAL_SERVICES=STABLE
 ```
@@ -194,8 +194,8 @@ The following build options can be used when running CMake
 
 ### Optimization build options
 
-* VIRCADIA_OPTIMIZE - This variable defaults to 1 if not set and enables compiler optimization flags on Linux and MacOS. Setting it to 0 will result in unoptimized build.
-* VIRCADIA_CPU_ARCHITECTURE - This variable contains architecture specific compiler flags which are used if `VIRCADIA_OPTIMIZE` is true. If it is not set, it defaults to `-march=native -mtune=native`, which helps yield more performance for locally used build, but for packaging it needs to be set to different value for portability, for example `-msse3`. Setting `VIRCADIA_CPU_ARCHITECTURE` to empty string will use default compiler settings and yield
+* OVERTE_OPTIMIZE - This variable defaults to 1 if not set and enables compiler optimization flags on Linux and MacOS. Setting it to 0 will result in unoptimized build.
+* OVERTE_CPU_ARCHITECTURE - This variable contains architecture specific compiler flags which are used if `OVERTE_OPTIMIZE` is true. If it is not set, it defaults to `-march=native -mtune=native`, which helps yield more performance for locally used build, but for packaging it needs to be set to different value for portability, for example `-msse3`. Setting `OVERTE_CPU_ARCHITECTURE` to empty string will use default compiler settings and yield
 maximum compatibility.
 
 

BUILD_ANDROID.md

@@ -36,7 +36,7 @@ If Android Studio pops open the "Plugin Update Recommeded" dialog, do not click
 ## Environment
 
 ### Create a keystore in Android Studio
-Follow the directions [here](https://developer.android.com/studio/publish/app-signing#generate-key) to create a keystore file. You can save it anywhere (preferably not in the `vircadia` folder).
+Follow the directions [here](https://developer.android.com/studio/publish/app-signing#generate-key) to create a keystore file. You can save it anywhere (preferably not in the `overte` folder).
 
 ### Set up machine specific Gradle properties
 
@@ -87,12 +87,12 @@ SUPPRESS_QUEST_FRAME_PLAYER
 
 * Open Android Studio
 * Choose _Open an existing Android Studio project_
-* Navigate to the `vircadia` repository that had you cloned and choose the `android` folder and select _OK_
+* Navigate to the `overte` repository that had you cloned and choose the `android` folder and select _OK_
 * Wait for Gradle to sync (this should take around 20 minutes the first time)
 * If a dialog pops open saying "Plugin Update Recommeded" dialog, do not click update, just click X on the top right to close.
 * In the _Project_ window click on the project you wish to build (i.e. "questInterface") then click _Build_ in the top menu and choose _Make Module 'questInterface'_
 * By default this will build the "debug" apk, you can change this by opening the _Build Variants_ window along the left side and select other build types such as "release".
-* Your newly build APK should reside in `vircadia\android\apps\questInterface\release` (if you chose release).
+* Your newly build APK should reside in `overte\android\apps\questInterface\release` (if you chose release).
 
 ### Running a Module
 
@@ -140,7 +140,7 @@ With your start menu, search for 'Edit the System Environment Variables' and ope
 
 Some things you can try if you want to do a clean build
 
-* Delete the `build` and `.externalNativeBuild` folders from the folder for each module you're building (for example, `vircadia/android/apps/interface`)
+* Delete the `build` and `.externalNativeBuild` folders from the folder for each module you're building (for example, `overte/android/apps/interface`)
 * If you have set your `HIFI_VCPKG_ROOT` environment variable, delete the contents of that directory; otherwise, delete `AppData/Local/Temp/hifi`
 * In Android Studio, click _File > Invalidate Caches / Restart_ and select _Invalidate and Restart_
 

BUILD_LINUX.md

@@ -101,27 +101,27 @@ git tag
 ### Using a custom Qt build
 
 Qt binaries are only provided for Ubuntu. In order to build on other distributions, a Qt5 install
-needs to be provided by setting the `VIRCADIA_QT_PATH` environment variable to a directory containing
+needs to be provided by setting the `OVERTE_QT_PATH` environment variable to a directory containing
 a Qt install.
 
 ### Using the system's Qt
 
 The system's Qt can be used, if the development packages are installed, by setting the
-`VIRCADIA_USE_SYSTEM_QT` environment variable. The minimum recommended version is Qt 5.15.2, which is
+`OVERTE_USE_SYSTEM_QT` environment variable. The minimum recommended version is Qt 5.15.2, which is
 also the last version available in the Qt 5 branch. It is expected that Linux distributions will have
 Qt 5.15.2 available for a long time.
 
 ### Architecture support
 
-If the build is intended to be packaged for distribution, the `VIRCADIA_CPU_ARCHITECTURE`
+If the build is intended to be packaged for distribution, the `OVERTE_CPU_ARCHITECTURE`
 CMake variable needs to be set to an architecture specific value.
 
 By default, it is set to `-march=native -mtune=native`, which yields builds optimized for a particular
 machine, but these builds will not work on machines lacking same CPU instructions.
 
 For packaging, it is recommended to set it to a different value, for example `-msse3`. This will help ensure that the build will run on all reasonably modern CPUs.
 
-Setting `VIRCADIA_CPU_ARCHITECTURE` to an empty string will use the default compiler settings and yield maximum compatibility.
+Setting `OVERTE_CPU_ARCHITECTURE` to an empty string will use the default compiler settings and yield maximum compatibility.
 
 ### Compiling
 
@@ -137,7 +137,7 @@ Prepare makefiles:
 cmake ..
 ```
 
-If cmake fails with a vcpkg error, then delete `~/vircadia-files/vcpkg/`.  
+If cmake fails with a vcpkg error, then delete `~/overte-files/vcpkg/`.  
 
 #### Server
 
@@ -190,4 +190,4 @@ Go to "localhost" in the running Interface to visit your newly launched Domain s
 If your goal is to set up a development environment, it is desirable to set the directory that vcpkg builds into with the `HIFI_VCPKG_BASE` environment variable.
 For example, you might set `HIFI_VCPKG_BASE` to `/home/$USER/vcpkg`.
 
-By default, vcpkg will build in the `~/vircadia-files/vcpkg/` directory.
+By default, vcpkg will build in the `~/overte-files/vcpkg/` directory.

BUILD_OSX.md

@@ -48,7 +48,7 @@ sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer
 cmake ../ -DCMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -G Xcode -DOSX_SDK=10.12  ..
 ```
 
-After running CMake, you will have the make files or Xcode project file necessary to build all of the components. Open the `vircadia.xcodeproj` file, choose `ALL_BUILD` from the Product > Scheme menu (or target drop down), and click Run.
+After running CMake, you will have the make files or Xcode project file necessary to build all of the components. Open the `overte.xcodeproj` file, choose `ALL_BUILD` from the Product > Scheme menu (or target drop down), and click Run.
 
 If the build completes successfully, you will have built targets for all components located in the `build/${target_name}/Debug` directories.
 
@@ -66,15 +66,15 @@ To package the installation, you can simply run `make package` afterwards.
 
 ## Architecture Support
 
-If the build is intended to be packaged for distribution, the `VIRCADIA_CPU_ARCHITECTURE`
+If the build is intended to be packaged for distribution, the `OVERTE_CPU_ARCHITECTURE`
 CMake variable needs to be set to an architecture specific value.
 
 By default, it is set to `-march=native -mtune=native`, which yields builds optimized for a particular
 machine, but these builds will not work on machines lacking same CPU instructions.
 
 For packaging, it is recommended to set it to a different value, for example `-msse3`. This will help ensure that the build will run on all reasonably modern CPUs.
 
-Setting `VIRCADIA_CPU_ARCHITECTURE` to an empty string will use the default compiler settings and yield
+Setting `OVERTE_CPU_ARCHITECTURE` to an empty string will use the default compiler settings and yield
 maximum compatibility.
 
 ## FAQ

BUILD_WIN.md

@@ -89,18 +89,18 @@ To create this variable:
 ## Step 7. Running CMake to Generate Build Files
 
 Run Command Prompt from Start and run the following commands:
-`cd "%VIRCADIA_DIR%"`
+`cd "%OVERTE_DIR%"`
 `mkdir build`
 `cd build`
 
 ### Visual Studio 2019
 Run `cmake .. -G "Visual Studio 16 2019" -A x64`.
 
-Where `%VIRCADIA_DIR%` is the directory for the Overte repository.
+Where `%OVERTE_DIR%` is the directory for the Overte repository.
 
 ## Step 8. Making a Build
 
-Open `%VIRCADIA_DIR%\build\vircadia.sln` using Visual Studio.
+Open `%OVERTE_DIR%\build\overte.sln` using Visual Studio.
 
 Change the Solution Configuration (menu ribbon under the menu bar, next to the green play button) from "Debug" to "Release" for best performance.
 
@@ -118,7 +118,7 @@ In Visual Studio, right-click "interface" under the Apps folder in Solution Expl
 
 Now, you should have a full build of Overte and be able to run the Interface using Visual Studio.
 
-Note: You can also run Interface by launching it from command line or File Explorer from `%VIRCADIA_DIR%\build\interface\Release\interface.exe`
+Note: You can also run Interface by launching it from command line or File Explorer from `%OVERTE_DIR%\build\interface\Release\interface.exe`
 
 # Troubleshooting
 
@@ -130,8 +130,8 @@ For any problems after Step #7, first try this:
 
 ## CMake gives you the same error message repeatedly after the build fails
 
-Remove `CMakeCache.txt` found in the `%VIRCADIA_DIR%\build` directory.
+Remove `CMakeCache.txt` found in the `%OVERTE_DIR%\build` directory.
 
 ## CMake can't find OpenSSL
 
-Remove `CMakeCache.txt` found in the `%VIRCADIA_DIR%\build` directory.  Verify that your HIFI_VCPKG_BASE environment variable is set and pointing to the correct location. Verify that the file `${HIFI_VCPKG_BASE}/installed/x64-windows/include/openssl/ssl.h` exists.
+Remove `CMakeCache.txt` found in the `%OVERTE_DIR%\build` directory.  Verify that your HIFI_VCPKG_BASE environment variable is set and pointing to the correct location. Verify that the file `${HIFI_VCPKG_BASE}/installed/x64-windows/include/openssl/ssl.h` exists.